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
|
--- hald/freebsd/addons/addon-storage.c.orig 2008-05-07 19:24:04.000000000 -0400
+++ hald/freebsd/addons/addon-storage.c 2008-05-19 02:18:59.000000000 -0400
@@ -36,17 +36,23 @@
#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);
+
/* see MMC-3 Working Draft Revision 10 */
static boolean
hf_addon_storage_cdrom_eject_pressed (HFPCDROM *cdrom)
@@ -144,18 +150,49 @@ hf_addon_storage_update (void)
}
}
- hfp_gettimeofday(&addon.next_update);
- hfp_timevaladd(&addon.next_update, &addon.update_interval);
-
return has_media;
}
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", &hfp_error))
+ {
+ hfp_info("... device %s is locked by HAL", addon.device_file);
+ dbus_error_free(&hfp_error);
+ 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;
+ }
+ dbus_error_free(&hfp_error);
+
+ should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error);
+ dbus_error_free(&hfp_error);
+ 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)
{
/*
@@ -175,20 +212,33 @@ poll_for_media (void)
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 +249,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 +267,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 +302,41 @@ 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))
goto end;
dbus_error_free(&hfp_error);
+ syscon = dbus_bus_get(DBUS_BUS_SYSTEM, &hfp_error);
+ dbus_error_free(&hfp_error);
+ 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,
@@ -280,40 +356,32 @@ main (int argc, char **argv)
/* 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:
|
