X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.h;h=20dde8e8b344c8a2021b74e755ead74b97af4ac1;hp=64e1d6ad12105a087c612dad0c469c5404297a48;hb=c2e04d6b8b82e870c6b9ce397f5fdf9c8b4efb5a;hpb=f8a178a35b8dee2ee46a3de298345aa4faa8f41e

diff --git a/udevd.h b/udevd.h
index 64e1d6ad1..20dde8e8b 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,41 +22,54 @@
 #include "list.h"
 
 #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 UDEVD_SOCK_PATH			"/org/kernel/udev/udevd"
 
 #define UDEVD_PRIORITY			-4
 #define UDEV_PRIORITY			-2
 
-/* 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
+#define EVENT_QUEUE_DIR			".udev/queue"
+#define EVENT_FAILED_DIR		".udev/failed"
+#define EVENT_SEQNUM			".udev/uevent_seqnum"
 
+/* 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 THROTTLE_MAX_RUNNING_CHILDS	10
+#define UDEVD_MAX_CHILDS_RUNNING	16
 
 /* environment buffer, should match the kernel's size in lib/kobject_uevent.h */
-#define HOTPLUG_BUFFER_SIZE		1024
-#define HOTPLUG_NUM_ENVP		32
+#define UEVENT_BUFFER_SIZE		2048
+#define UEVENT_NUM_ENVP			64
+
+enum udevd_msg_type {
+	UDEVD_UNKNOWN,
+	UDEVD_UEVENT_NETLINK,
+	UDEVD_STOP_EXEC_QUEUE,
+	UDEVD_START_EXEC_QUEUE,
+	UDEVD_SET_LOG_LEVEL,
+	UDEVD_SET_MAX_CHILDS,
+	UDEVD_RELOAD_RULES,
+};
+
 
-struct udevsend_msg {
-	char magic[20];
-	char envbuf[HOTPLUG_BUFFER_SIZE+256];
+struct udevd_msg {
+	char magic[32];
+	enum udevd_msg_type type;
+	char envbuf[UEVENT_BUFFER_SIZE+512];
 };
 
-struct hotplug_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;
-	char *envp[HOTPLUG_NUM_ENVP+1];
+	unsigned int timeout;
+	char *envp[UEVENT_NUM_ENVP+1];
 	char envbuf[];
 };