release 105

[elogind.git] / udevd.h

diff --git a/udevd.h b/udevd.h
index b3e998b04c3f69aa2f9bbfa2779e5ac0fe426e2d..fce86e71268319eabfb09864e4a8e7ff1f2636bc 100644 (file)
--- 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,49 +13,60 @@
  * 
  *     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 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
 
-/* 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
+
+/* linux/include/linux/kobject.h */
+#define UEVENT_BUFFER_SIZE             2048
+#define UEVENT_NUM_ENVP                        32
 
-/* environment buffer, should match the kernel's size in lib/kobject_uevent.h */
-#define HOTPLUG_BUFFER_SIZE            1024
-#define HOTPLUG_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,
+};
 
-struct udevsend_msg {
-       char magic[20];
-       char envbuf[HOTPLUG_BUFFER_SIZE+256];
+struct udevd_ctrl_msg {
+       char magic[32];
+       enum udevd_ctrl_msg_type type;
+       char buf[256];
 };
 
-struct hotplug_msg {
+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 *physdevpath;
        unsigned int timeout;
-       char *envp[HOTPLUG_NUM_ENVP+1];
+       char *envp[UEVENT_NUM_ENVP+1];
        char envbuf[];
 };