release 105

[elogind.git] / udevd.h

diff --git a/udevd.h b/udevd.h
index 34bfe931bada23cacf393a89a29d229ba08666ac..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,62 +13,57 @@
  * 
  *     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 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
+#define EVENT_QUEUE_DIR                        ".udev/queue"
+#define EVENT_FAILED_DIR               ".udev/failed"
+#define EVENT_SEQNUM                   ".udev/uevent_seqnum"
 
-/* timeout to wait for missing events */
-#define UDEVD_EVENT_TIMEOUT            5
-
-/* maximum limit of runnig childs */
-#define UDEVD_MAX_CHILDS               64
+/* 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       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
+/* linux/include/linux/kobject.h */
+#define UEVENT_BUFFER_SIZE             2048
 #define UEVENT_NUM_ENVP                        32
 
-enum udevd_msg_type {
-       UDEVD_UNKNOWN,
-       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,
-};
+#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 udevd_msg {
+struct udevd_ctrl_msg {
        char magic[32];
-       enum udevd_msg_type type;
-       char envbuf[UEVENT_BUFFER_SIZE+512];
+       enum udevd_ctrl_msg_type type;
+       char buf[256];
 };
 
-struct uevent_msg {
-       enum udevd_msg_type type;
+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;