Skip to contentSkip to conversation

Udev integration: add semaphore IPC to wait for udev rule completion

PATCH New Peter Rajnoha 1 participant 2 messages May 25, 2009 – May 27, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 3/9 Udev integration: add semaphore IPC to wait for udev rule completion

I've added these functions :

dm_udev_notif_enable -- enable wait for udev's completion dm_udev_notif_disable -- disable wait for udev's completion dm_udev_notif_is_enabled -- is it enabled? :)

I added the conditional compilation, too, so when the wait for udev completion is disabled at compilation time, we use only dummy functions.

I use a global var as enable/disable flag to enable/disable the wait in runtime. I think it's better this way than having IFs all around the code. It's cleaner and less complicated...

Peter

libdm/.exported_symbols +9 -0
index 2c80b05..ff2e103 100644
@@ -21,6 +21,7 @@ dm_task_get_uuid
 dm_task_get_read_ahead
 dm_task_set_ro
 dm_task_set_newname
+dm_task_set_cookie
 dm_task_set_event_nr
 dm_task_set_major
 dm_task_set_minor
@@ -149,3 +150,11 @@ dm_list_last
 dm_list_prev
 dm_list_next
 dm_list_size
+dm_udev_notif_enable
+dm_udev_notif_disable
+dm_udev_notif_is_enabled
+dm_udev_notif_sem_open
+dm_udev_notif_sem_inc
+dm_udev_notif_sem_dec
+dm_udev_notif_sem_wait_zero
+dm_udev_notif_sem_close
libdm/ioctl/libdm-iface.c +7 -0
index 3698eda..935a3ea 100644
@@ -864,6 +864,13 @@ int dm_check_version(void)
 	return 0;
 }
 
+int dm_cookie_supported(void)
+{
+	return (dm_check_version() &&
+	        _dm_version >= 4 &&
+	        _dm_version_minor >= 15);
+}
+
 void *dm_get_next_target(struct dm_task *dmt, void *next,
 			 uint64_t *start, uint64_t *length,
 			 char **target_type, char **params)
libdm/libdevmapper.h +19 -0
index 09b1036..7674e04 100644
@@ -155,6 +155,7 @@ int dm_task_set_major(struct dm_task *dmt, int major);
 int dm_task_set_uid(struct dm_task *dmt, uid_t uid);
 int dm_task_set_gid(struct dm_task *dmt, gid_t gid);
 int dm_task_set_mode(struct dm_task *dmt, mode_t mode);
+int dm_task_set_cookie(struct dm_task *dmt, uint32_t cookie);
 int dm_task_set_event_nr(struct dm_task *dmt, uint32_t event_nr);
 int dm_task_set_geometry(struct dm_task *dmt, const char *cylinders, const char *heads, const char *sectors, const char *start);
 int dm_task_set_message(struct dm_task *dmt, const char *message);
@@ -984,4 +985,22 @@ int dm_report_field_uint64(struct dm_report *rh, struct dm_report_field *field,
 void dm_report_field_set_value(struct dm_report_field *field, const void *value,
 			       const void *sortvalue);
 
+int dm_cookie_supported(void);
+
+/*
+ * Functions to set simple notification channel between instances of libdm
+ * code by means of using semaphore identified by a cookie. Primarily used
+ * to provide a way of notification that related udev rule is completed as
+ * a consequence of libdm actions fired before and marked by the value of
+ * the cookie.
+ */
+void dm_udev_notif_enable(void);
+void dm_udev_notif_disable(void);
+int dm_udev_notif_is_enabled(void);
+int dm_udev_notif_sem_open(uint32_t *cookie);
+int dm_udev_notif_sem_inc(uint32_t cookie);
+int dm_udev_notif_sem_dec(uint32_t cookie);
+int dm_udev_notif_sem_wait_zero(uint32_t cookie);
+int dm_udev_notif_sem_close(uint32_t cookie);
+
 #endif				/* LIB_DEVICE_MAPPER_H */
libdm/libdm-common.c +215 -0

236 lines not on this page · raw message

#1 lore raw

PATCH 3/9 Udev integration: add semaphore IPC to wait for udev rule completion

We should set the cookie value to 0 if the notification is disabled!

Peter

libdm/libdm-common.c +3 -1
index ef249dc..d24584d 100644
@@ -794,8 +794,10 @@ int dm_udev_notif_sem_open(uint32_t *cookie)
 	int fd;
 	uint32_t gen_cookie;
 
-	if (!dm_udev_notif_is_enabled() || !dm_cookie_supported())
+	if (!dm_udev_notif_is_enabled() || !dm_cookie_supported()) {
+		*cookie = 0;
 		return 1;
+	}
 
 	if ((fd = open("/dev/urandom", O_RDONLY)) < 0) {
 		log_error("Failed to open /dev/urandom to create random cookie value.");