Skip to contentSkip to conversation

udevd - allow to bypass sequence number

PATCH Applied Kay Sievers 2 participants 2 messages Feb 5, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 udevd - allow to bypass sequence number

This patch allows udevsend to be called by the user and not only by the kernel with its SEQNUM. If no SEQNUM is given, we move the event straight to the exec queue and don't look if something is missing.

I don't know if this is really needed, but some people seem trying to send events trough udevd instead of calling udev directly with their scripts and confuse the reorder logic with that.

So at least, we may remove this source of confusion and udevsend is much much faster back than udev itself and it will also block concurrent events for the same devpath.

thanks,
Kay

===== udevd.c 1.10 vs edited =====

udevd.c +19 -7
@@ -205,16 +205,20 @@
 	}
 }
 
-/* move message from incoming to exec queue */
-static void msg_move_exec(struct list_head *head)
+static void exec_queue_activate(void)
 {
-	list_move_tail(head, &exec_list);
-	/* signal queue activity to manager */
 	pthread_mutex_lock(&exec_active_lock);
 	pthread_cond_signal(&exec_active);
 	pthread_mutex_unlock(&exec_active_lock);
 }
 
+/* move message from incoming to exec queue */
+static void msg_move_exec(struct list_head *head)
+{
+	list_move_tail(head, &exec_list);
+	exec_queue_activate();
+}
+
 /* queue management thread handles the timeouts and dispatches the events */
 static void *msg_queue_manager(void * parm)
 {
@@ -298,9 +302,17 @@
 		goto exit;
 	}
 
-	pthread_mutex_lock(&msg_lock);
-	msg_queue_insert(msg);
-	pthread_mutex_unlock(&msg_lock);
+	/* if no seqnum is given, we move straight to exec queue */
+	if (msg->seqnum == 0) {
+		pthread_mutex_lock(&exec_lock);
+		list_add(&msg->list, &exec_list);
+		exec_queue_activate();
+		pthread_mutex_unlock(&exec_lock);
+	} else {
+		pthread_mutex_lock(&msg_lock);
+		msg_queue_insert(msg);
+		pthread_mutex_unlock(&msg_lock);
+	}
 
 exit:
 	close(sock);

===== udevsend.c 1.14 vs edited =====

udevsend.c +4 -5
@@ -148,11 +148,10 @@
 	}
 
 	seqnum = get_seqnum();
-	if (seqnum == NULL) {
-		dbg("no seqnum");
-		goto exit;
-	}
-	seq = atoi(seqnum);
+	if (seqnum == NULL)
+		seq = 0;
+	else
+		seq = atoi(seqnum);
 
 	sock = socket(AF_LOCAL, SOCK_STREAM, 0);
 	if (sock == -1) {
Applied
#1 lore raw
Quoted 11 lines · Kay Sievers

This patch allows udevsend to be called by the user and not only by the kernel with its SEQNUM. If no SEQNUM is given, we move the event straight to the exec queue and don't look if something is missing.

I don't know if this is really needed, but some people seem trying to send events trough udevd instead of calling udev directly with their scripts and confuse the reorder logic with that.

So at least, we may remove this source of confusion and udevsend is much much faster back than udev itself and it will also block concurrent events for the same devpath.

Applied, thanks.

greg k-h

-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel