X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.h;h=ae1d20e5ecfd309f6679ae6610b67c9872159177;hp=e24bc28a78ccf24b91aef8fa36e7c2b8e7c8880e;hb=085cce379a4256cd039ccda3c8198aba058c8720;hpb=53921bfa44129a19661a4aaa4c1647282921fc18

diff --git a/udevd.h b/udevd.h
index e24bc28a7..ae1d20e5e 100644
--- a/udevd.h
+++ b/udevd.h
@@ -24,26 +24,42 @@
 
 #include "list.h"
 
-/*
- * FIXME: udev_root is post compile configurable and may also be
- * mounted over at any time and /var/run/ and /tmp/ is unusable,
- * cause it's cleaned at system startup, long _after_ udevd is
- * already running. Should we use udev_init_config()?
- */
+#define UDEV_MAGIC			"udevd_" UDEV_VERSION
+#define UDEVD_SOCK_PATH			"udevd"
+#define SEND_WAIT_MAX_SECONDS		3
+#define SEND_WAIT_LOOP_PER_SECOND	10
 
-#define UDEV_MAGIC			"udev_" UDEV_VERSION
-#define EVENT_TIMEOUT_SEC		5
-#define UDEVSEND_CONNECT_RETRY		20 /* x 100 millisec */
-#define UDEVD_SOCKET			UDEV_ROOT ".udevd.socket"
-#define UDEVD_LOCK			UDEV_ROOT ".udevd.pid"
+#define UDEVD_PRIORITY			-4
+#define UDEV_PRIORITY			-2
 
-struct hotplug_msg {
+/* duration of initialization phase with shorter timeout */
+#define INIT_TIME_SEC			5
+#define EVENT_INIT_TIMEOUT_SEC		2
+
+/* timeout to wait for missing events */
+#define EVENT_TIMEOUT_SEC		10
+
+/* start to throttle forking if maximum number of running childs in our session is reached */
+#define THROTTLE_MAX_RUNNING_CHILDS	10
+
+/* environment buffer, should match the kernel's size in lib/kobject_uevent.h */
+#define HOTPLUG_BUFFER_SIZE		1024
+#define HOTPLUG_NUM_ENVP		32
+
+struct udevsend_msg {
 	char magic[20];
+	char envbuf[HOTPLUG_BUFFER_SIZE+256];
+};
+
+struct hotplug_msg {
 	struct list_head list;
 	pid_t pid;
-	int seqnum;
-	time_t queue_time;
-	char action[8];
-	char devpath[128];
-	char subsystem[16];
+	long queue_time;
+	char *action;
+	char *devpath;
+	char *subsystem;
+	unsigned long long seqnum;
+	char *physdevpath;
+	char *envp[HOTPLUG_NUM_ENVP+1];
+	char envbuf[];
 };