X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.h;h=b852b5224d40f000851cd2654b06e6dd5764954a;hp=db510ab24a438dae70af89b7695da68d70913372;hb=9824e9a76426eef53713349c0464e9d1411e3b66;hpb=c895fd002763d6ae808e820020dc54e74c347fc2

diff --git a/udevd.h b/udevd.h
index db510ab24..b852b5224 100644
--- a/udevd.h
+++ b/udevd.h
@@ -21,54 +21,45 @@
 
 #include "list.h"
 
-#define UDEV_MAGIC			"udevd_" UDEV_VERSION
-#define UDEVD_SOCK_PATH			"/org/kernel/udev/udevd"
-#define UDEVSEND_WAIT_MAX_SECONDS	3
-#define UDEVSEND_WAIT_LOOP_PER_SECOND	10
-
 #define UDEVD_PRIORITY			-4
 #define UDEV_PRIORITY			-2
 
-/* duration of initialization phase with shorter timeout */
-#define UDEVD_INIT_TIME			5
-#define UDEVD_INIT_EVENT_TIMEOUT	2
-
-/* timeout to wait for missing events */
-#define UDEVD_EVENT_TIMEOUT		5
+#define EVENT_QUEUE_DIR			".udev/queue"
+#define EVENT_FAILED_DIR		".udev/failed"
+#define EVENT_SEQNUM			".udev/uevent_seqnum"
 
-/* maximum limit of runnig childs */
-#define UDEVD_MAX_CHILDS		64
+/* maximum limit of forked childs */
+#define UDEVD_MAX_CHILDS		256
 /* start to throttle forking if maximum number of running childs in our session is reached */
-#define UDEVD_MAX_CHILDS_RUNNING	8
+#define UDEVD_MAX_CHILDS_RUNNING	16
 
-/* environment buffer, should match the kernel's size in lib/kobject_uevent.h */
-#define UEVENT_BUFFER_SIZE		1024
+/* linux/include/linux/kobject.h */
+#define UEVENT_BUFFER_SIZE		2048
 #define UEVENT_NUM_ENVP			32
 
-enum udevd_msg_type {
-	UDEVD_UNKNOWN,
-	UDEVD_UEVENT_UDEVSEND,
-	UDEVD_UEVENT_INITSEND,
-	UDEVD_UEVENT_NETLINK,
-	UDEVD_STOP_EXEC_QUEUE,
-	UDEVD_START_EXEC_QUEUE,
-	UDEVD_SET_LOG_LEVEL,
-	UDEVD_SET_MAX_CHILDS,
-	UDEVD_RELOAD_RULES,
-};
+#define UDEVD_CTRL_SOCK_PATH		"/org/kernel/udev/udevd"
+#define UDEVD_CTRL_MAGIC		"udevd_" UDEV_VERSION
 
+enum udevd_ctrl_msg_type {
+	UDEVD_CTRL_UNKNOWN,
+	UDEVD_CTRL_STOP_EXEC_QUEUE,
+	UDEVD_CTRL_START_EXEC_QUEUE,
+	UDEVD_CTRL_SET_LOG_LEVEL,
+	UDEVD_CTRL_SET_MAX_CHILDS,
+	UDEVD_CTRL_RELOAD_RULES,
+};
 
-struct udevd_msg {
+struct udevd_ctrl_msg {
 	char magic[32];
-	enum udevd_msg_type type;
-	char envbuf[UEVENT_BUFFER_SIZE+512];
+	enum udevd_ctrl_msg_type type;
+	char buf[256];
 };
 
-struct uevent_msg {
-	enum udevd_msg_type type;
+struct udevd_uevent_msg {
 	struct list_head node;
 	pid_t pid;
-	long queue_time;
+	int exitstatus;
+	time_t queue_time;
 	char *action;
 	char *devpath;
 	char *subsystem;