chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: really fix endianess bug in linux_raid detection
[elogind.git]
/
udevd.h
diff --git
a/udevd.h
b/udevd.h
index 242c0b690765b96838cbbeef3227dd1c25277ef1..fce86e71268319eabfb09864e4a8e7ff1f2636bc 100644
(file)
--- a/
udevd.h
+++ b/
udevd.h
@@
-1,8
+1,6
@@
/*
/*
- * udevd.h
- *
* Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
* Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
- * Copyright (C) 2004-200
5
Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-200
6
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
*
* 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
@@
-15,53
+13,48
@@
*
* 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.,
*
* 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"
*
*/
#include "list.h"
-#define UDEV_MAGIC "udevd_" UDEV_VERSION
-#define UDEVD_SOCK_PATH "/org/kernel/udev/udevd"
-#define UDEVSEND_WAIT_MAX_SECONDS 3
-#define UDEVSEND_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 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"
/* maximum limit of forked childs */
/* maximum limit of forked childs */
-#define UDEVD_MAX_CHILDS
64
+#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
/* start to throttle forking if maximum number of running childs in our session is reached */
#define UDEVD_MAX_CHILDS_RUNNING 16
-/*
environment buffer, should match the kernel's size in lib/kobject_ueven
t.h */
+/*
linux/include/linux/kobjec
t.h */
#define UEVENT_BUFFER_SIZE 2048
#define UEVENT_BUFFER_SIZE 2048
-#define UEVENT_NUM_ENVP
64
+#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,
- UDEVD_RELOAD_RULES,
-};
+#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];
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;
int exitstatus;
struct list_head node;
pid_t pid;
int exitstatus;
@@
-69,6
+62,7
@@
struct uevent_msg {
char *action;
char *devpath;
char *subsystem;
char *action;
char *devpath;
char *subsystem;
+ char *driver;
dev_t devt;
unsigned long long seqnum;
char *physdevpath;
dev_t devt;
unsigned long long seqnum;
char *physdevpath;