X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.h;h=9be34cb0cc944c376321930d7d5c7f41789de5bc;hp=b393a28bf94ad8a55eb646a3d7b7786167450219;hb=7b2aad3343f8523db35ff2edfcfa9fcb816b7264;hpb=4a231017ff6e9f66a685b0d1e4e49dc46645bb40

diff --git a/udevd.h b/udevd.h
index b393a28bf..9be34cb0c 100644
--- a/udevd.h
+++ b/udevd.h
@@ -1,11 +1,6 @@
 /*
- * 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-2006 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
@@ -18,35 +13,62 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 #include "list.h"
 
-#define UDEV_MAGIC			"udevd_" UDEV_VERSION
-#define EVENT_TIMEOUT_SEC		10
-#define UDEVD_SOCK_PATH			"udevd"
-#define SEND_WAIT_MAX_SECONDS		3
-#define SEND_WAIT_LOOP_PER_SECOND	10
+#define UDEVD_PRIORITY			-4
+#define UDEV_PRIORITY			-2
+
+#define EVENT_QUEUE_DIR			".udev/queue"
+#define EVENT_FAILED_DIR		".udev/failed"
+#define EVENT_SEQNUM			".udev/uevent_seqnum"
 
-/* environment buffer, should match the kernel's size in lib/kobject_uevent.h */
-#define HOTPLUG_BUFFER_SIZE		1024
-#define HOTPLUG_NUM_ENVP		32
+/* 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	16
+
+/* linux/include/linux/kobject.h */
+#define UEVENT_BUFFER_SIZE		2048
+#define UEVENT_NUM_ENVP			32
+
+#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_SET_MAX_CHILDS_RUNNING,
+	UDEVD_CTRL_RELOAD_RULES,
+	UDEVD_CTRL_ENV,
+};
 
-struct udevsend_msg {
-	char magic[20];
-	char envbuf[HOTPLUG_BUFFER_SIZE];
+struct udevd_ctrl_msg {
+	char magic[32];
+	enum udevd_ctrl_msg_type type;
+	char buf[256];
 };
 
-struct hotplug_msg {
-	struct list_head list;
+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;
+	char *driver;
+	dev_t devt;
 	unsigned long long seqnum;
-	char *envp[HOTPLUG_NUM_ENVP];
+	char *devpath_old;
+	char *physdevpath;
+	unsigned int timeout;
+	char *envp[UEVENT_NUM_ENVP+1];
 	char envbuf[];
 };