X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.h;h=afbc3a31b14e6a0e95e8ac88517e5b6eb399a646;hp=60732fe052d774b796e35926f29fbc757ca04451;hb=aab4c0eebef44c5b67d4c9537f1c5149de3ca9c2;hpb=a15f42c46a7b9ceb5850ea4334c95f099ce74a6f

diff --git a/udevd.h b/udevd.h
index 60732fe05..afbc3a31b 100644
--- a/udevd.h
+++ b/udevd.h
@@ -1,11 +1,8 @@
 /*
  * udevd.h
  *
- * Userspace devfs
- *
  * Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -25,24 +22,20 @@
 #include "list.h"
 
 #define UDEV_MAGIC			"udevd_" UDEV_VERSION
-#define UDEVD_SOCK_PATH			"udevd"
+#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"
 
 /* maximum limit of runnig childs */
 #define UDEVD_MAX_CHILDS		64
 /* 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
@@ -50,9 +43,14 @@
 
 enum udevd_msg_type {
 	UDEVD_UNKNOWN,
-	UDEVD_UEVENT,
+	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,
 };
 
 
@@ -63,12 +61,15 @@ struct udevd_msg {
 };
 
 struct uevent_msg {
+	enum udevd_msg_type type;
 	struct list_head node;
 	pid_t pid;
-	long queue_time;
+	int exitstatus;
+	time_t queue_time;
 	char *action;
 	char *devpath;
 	char *subsystem;
+	dev_t devt;
 	unsigned long long seqnum;
 	char *physdevpath;
 	unsigned int timeout;