summaryrefslogtreecommitdiff
path: root/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
blob: f19b7e92dcead3048712c21ae3401d04f2f3f228 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
--- hald/freebsd/addons/addon-storage.c.orig	2008-08-10 09:50:10.000000000 -0400
+++ hald/freebsd/addons/addon-storage.c	2009-09-13 17:23:52.000000000 -0400
@@ -36,17 +36,24 @@
 #include "../libprobe/hfp.h"
 #include "../libprobe/hfp-cdrom.h"
 
+static boolean is_locked_by_hal = FALSE;
+static boolean check_lock_state = TRUE;
+static boolean polling_disabled = FALSE;
+
 static struct
 {
-  const struct timeval	update_interval;
+  const struct timespec	update_interval;
   char			*device_file;
   char			*parent;
   boolean		is_cdrom;
   boolean		is_scsi_removable;
   boolean		had_media;
-  struct timeval	next_update;
+  struct timespec	next_update;
 } addon = { { 2, 0 } };
 
+static void update_proc_title (const char *device);
+static void unmount_volumes (void);
+
 /* see MMC-3 Working Draft Revision 10 */
 static boolean
 hf_addon_storage_cdrom_eject_pressed (HFPCDROM *cdrom)
@@ -100,8 +107,7 @@ hf_addon_storage_update (void)
 
 	  if (hf_addon_storage_cdrom_eject_pressed(cdrom))
 	    {
-	      libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", &hfp_error);
-	      dbus_error_free(&hfp_error);
+	      libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", NULL);
 	    }
 
 	  hfp_cdrom_free(cdrom);
@@ -144,18 +150,142 @@ hf_addon_storage_update (void)
 	}
     }
 
-  hfp_gettimeofday(&addon.next_update);
-  hfp_timevaladd(&addon.next_update, &addon.update_interval);
-
   return has_media;
 }
 
+static void
+unmount_volumes (void)
+{
+  int num_volumes;
+  char **volumes;
+
+  if ((volumes = libhal_manager_find_device_string_match(hfp_ctx,
+                                                         "block.storage_device",
+							 hfp_udi,
+							 &num_volumes,
+							 NULL)) != NULL)
+    {
+      int i;
+
+      for (i = 0; i < num_volumes; i++)
+        {
+          char *vol_udi;
+
+	  vol_udi = volumes[i];
+
+	  if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", NULL))
+            {
+              DBusMessage *msg = NULL;
+	      DBusMessage *reply = NULL;
+	      DBusConnection *dbus_connection;
+	      unsigned int num_options = 0;
+	      char **options = NULL;
+	      char *devfile;
+
+              hfp_info("Forcing unmount of volume '%s'", vol_udi);
+
+	      dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx);
+	      msg = dbus_message_new_method_call("org.freedesktop.Hal", vol_udi,
+                                                 "org.freedesktop.Hal.Device.Volume",
+						 "Unmount");
+	      if (msg == NULL)
+                {
+                  hfp_warning("Could not create dbus message for %s", vol_udi);
+		  continue;
+		}
+
+	      options = calloc(1, sizeof (char *));
+	      if (options == NULL)
+                {
+                  hfp_warning("Could not allocation memory for options");
+		  dbus_message_unref(msg);
+		  continue;
+		}
+
+	      options[0] = "force";
+	      num_options = 1;
+
+	      devfile = libhal_device_get_property_string(hfp_ctx, vol_udi, "block.device", NULL);
+	      if (devfile != NULL)
+                {
+                  hfp_info("Forcibly attempting to unmount %s as media was removed", devfile);
+		  libhal_free_string(devfile);
+		}
+
+	      if (! dbus_message_append_args(msg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, num_options, DBUS_TYPE_INVALID))
+                 {
+                   hfp_warning("Could not append args to dbus message for %s", vol_udi);
+		   free(options);
+		   dbus_message_unref(msg);
+		   continue;
+		 }
+
+	      if (! (reply = dbus_connection_send_with_reply_and_block(dbus_connection, msg, -1, &hfp_error)))
+                {
+                  hfp_warning("Unmount failed for %s: %s: %s", vol_udi, hfp_error.name, hfp_error.message);
+		  dbus_error_free(&hfp_error);
+		  free(options);
+		  dbus_message_unref(msg);
+		  continue;
+		}
+
+	      if (dbus_error_is_set(&hfp_error))
+                {
+                  hfp_warning("Unmount failed for %s: %s : %s", vol_udi, hfp_error.name, hfp_error.message);
+		  dbus_error_free(&hfp_error);
+		  free(options);
+		  dbus_message_unref(msg);
+		  dbus_message_unref(reply);
+		  continue;
+		}
+
+	      hfp_info("Successfully unmounted udi '%s'", vol_udi);
+	      free(options);
+              dbus_message_unref(msg);
+              dbus_message_unref(reply);
+	    }
+	}
+      libhal_free_string_array(volumes);
+    }
+}
+
 static boolean
-poll_for_media (void)
+poll_for_media (boolean check_only, boolean force)
 {
   boolean has_media;
 
+  if (check_lock_state)
+    {
+      boolean should_poll;
+
+      check_lock_state = FALSE;
+
+      hfp_info("Checking whether device %s is locked by HAL", addon.device_file);
+      if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", NULL))
+        {
+          hfp_info("... device %s is locked by HAL", addon.device_file);
+	  is_locked_by_hal = TRUE;
+	  update_proc_title(addon.device_file);
+	  goto skip_check;
+	}
+      else
+        {
+          hfp_info("... device %s is not locked by HAL", addon.device_file);
+	  is_locked_by_hal = FALSE;
+	}
+
+      should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", NULL);
+      polling_disabled = ! should_poll;
+      update_proc_title(addon.device_file);
+    }
+
+  if (! force && polling_disabled)
+    goto skip_check;
+
   has_media = hf_addon_storage_update();
+  if (check_only)
+    return has_media;
+
   if (has_media != addon.had_media)
     {
       /*
@@ -168,27 +298,47 @@ poll_for_media (void)
        * then hung while rebooting and did not unmount my other
        * filesystems.
        */
+#if __FreeBSD_version >= 800066
+      /*
+       * With newusb, it is safe to force unmount volumes.  This may be
+       * safe on newer versions of the old USB stack, but we'll be
+       * extra cautious.
+       */
+      unmount_volumes();
+#endif
 
-      libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
-      dbus_error_free(&hfp_error);
+      libhal_device_rescan(hfp_ctx, hfp_udi, NULL);
       addon.had_media = has_media;
 
       return TRUE;
     }
+
+skip_check:
+
   return FALSE;
 }
 
 static void
-update_proc_title (const char *device, boolean polling_enabled)
+update_proc_title (const char *device)
 {
-  if (polling_enabled)
-    setproctitle("%s", device);
-  else
+  if (polling_disabled)
     setproctitle("no polling on %s because it is explicitly disabled", device);
+  else if (is_locked_by_hal)
+    setproctitle("no polling on %s because it is locked by HAL", device);
+  else
+    setproctitle("%s", device);
 }
 
 static DBusHandlerResult
-filter_function (DBusConnection *connection, DBusMessage *message, void *user_data)
+dbus_filter_function (DBusConnection *connection, DBusMessage *message, void *user_data)
+{
+  check_lock_state = TRUE;
+
+  return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static DBusHandlerResult
+direct_filter_function (DBusConnection *connection, DBusMessage *message, void *user_data)
 {
   if (dbus_message_is_method_call(message,
 			  	  "org.freedesktop.Hal.Device.Storage.Removable",
@@ -199,7 +349,7 @@ filter_function (DBusConnection *connect
 
       hfp_info("Forcing poll for media becusse CheckForMedia() was called");
 
-      had_effect = poll_for_media();
+      had_effect = poll_for_media(FALSE, TRUE);
 
       reply = dbus_message_new_method_return (message);
       dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &had_effect, DBUS_TYPE_INVALID);
@@ -217,8 +367,9 @@ main (int argc, char **argv)
   char *removable;
   char *bus;
   char *driver;
-  boolean should_poll;
+  char *filter_str;
   DBusConnection *connection;
+  DBusConnection *syscon;
 
   if (! hfp_init(argc, argv))
     goto end;
@@ -251,16 +402,39 @@ main (int argc, char **argv)
   addon.is_scsi_removable = (! strcmp(bus, "scsi") ||
     (! strcmp(bus, "usb") && (! strcmp(driver, "da") || ! strcmp(driver, "sa") ||
     ! strcmp(driver, "cd")))) && ! strcmp(removable, "true");
-  addon.had_media = hf_addon_storage_update();
+  addon.had_media = poll_for_media(TRUE, FALSE);
 
-  if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error))
+  if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, NULL))
     goto end;
-  dbus_error_free(&hfp_error);
+
+  syscon = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+  assert(syscon != NULL);
+  dbus_connection_set_exit_on_disconnect(syscon, 0);
+
+  dbus_bus_add_match(syscon,
+		     "type='signal'"
+		     ",interface='org.freedesktop.Hal.Manager'"
+		     ",sender='org.freedesktop.Hal'",
+		     NULL);
+  dbus_bus_add_match(syscon,
+		     "type='signal'"
+		     ",interface='org.freedesktop.Hal.Manager'"
+		     ",sender='org.freedesktop.Hal'",
+		     NULL);
+  filter_str = hfp_strdup_printf("type='signal'"
+		  	       ",interface='org.freedesktop.Hal.Device'"
+			       ",sender='org.freedesktop.Hal'"
+			       ",path='%s'",
+			       hfp_udi);
+  dbus_bus_add_match(syscon, filter_str, NULL);
+  hfp_free(filter_str);
+
+  dbus_connection_add_filter(syscon, dbus_filter_function, NULL, NULL);
 
   connection = libhal_ctx_get_dbus_connection(hfp_ctx);
   assert(connection != NULL);
   dbus_connection_set_exit_on_disconnect(connection, 0);
-  dbus_connection_add_filter(connection, filter_function, NULL, NULL);
+  dbus_connection_add_filter(connection, direct_filter_function, NULL, NULL);
 
   if (! libhal_device_claim_interface(hfp_ctx,
 			 	      hfp_udi,
@@ -268,52 +442,43 @@ main (int argc, char **argv)
 				      "    <method name=\"CheckForMedia\">\n"
 				      "      <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n"
 				      "    </method>\n",
-				      &hfp_error))
+				      NULL))
     {
       hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'");
       goto end;
     }
-  dbus_error_free(&hfp_error);
 
   while (TRUE)
     {
       /* process dbus traffic until update interval has elapsed */
       while (TRUE)
 	{
-	  struct timeval now;
+	  struct timespec now;
 
-	  hfp_gettimeofday(&now);
-	  if (hfp_timevalcmp(&now, &addon.next_update, <))
+	  hfp_clock_gettime(&now);
+	  if (hfp_timespeccmp(&now, &addon.next_update, <))
 	    {
-	      struct timeval timeout;
+	      struct timespec timeout;
 
 	      timeout = addon.next_update;
-	      hfp_timevalsub(&timeout, &now);
+	      hfp_timespecsub(&timeout, &now);
 
 	      if (timeout.tv_sec < 0) /* current time went backwards */
 		timeout = addon.update_interval;
 
-	      dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
-	      if (! dbus_connection_get_is_connected(connection))
+	      dbus_connection_read_write_dispatch(connection, (int) ((timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000) / 2));
+	      dbus_connection_read_write_dispatch(syscon, (int) ((timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000) / 2));
+	      if (! dbus_connection_get_is_connected(connection) ||
+		  ! dbus_connection_get_is_connected(syscon))
 		goto end;
 	    }
 	  else
 	    break;
 	}
 
-      should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error);
-      dbus_error_free(&hfp_error);
-      update_proc_title(addon.device_file, should_poll);
-
-      if (should_poll)
-        {
-          poll_for_media();
-        }
-      else
-        {
-          hfp_gettimeofday(&addon.next_update);
-	  hfp_timevaladd(&addon.next_update, &addon.update_interval);
-	}
+      poll_for_media(FALSE, FALSE);
+      hfp_clock_gettime(&addon.next_update);
+      hfp_timespecadd(&addon.next_update, &addon.update_interval);
     }
 
  end: