chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] klibc: version 1.0.7
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index 1376cf05c777a4a331f13c0d758deff240d895de..91033b068844a42965d48d46db91dc2c6b2558da 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-21,7
+21,6
@@
*/
#include <stddef.h>
*/
#include <stddef.h>
-#include <sys/wait.h>
#include <signal.h>
#include <unistd.h>
#include <errno.h>
#include <signal.h>
#include <unistd.h>
#include <errno.h>
@@
-31,6
+30,8
@@
#include <ctype.h>
#include <dirent.h>
#include <fcntl.h>
#include <ctype.h>
#include <dirent.h>
#include <fcntl.h>
+#include <sys/select.h>
+#include <sys/wait.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
@@
-39,6
+40,7
@@
#include <sys/stat.h>
#include "list.h"
#include <sys/stat.h>
#include "list.h"
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_version.h"
#include "udev_utils.h"
#include "udev.h"
#include "udev_version.h"
#include "udev_utils.h"
@@
-68,20
+70,19
@@
static void reap_sigchilds(void);
char *udev_bin;
#ifdef USE_LOG
char *udev_bin;
#ifdef USE_LOG
-void log_message (int
level
, const char *format, ...)
+void log_message (int
priority
, const char *format, ...)
{
{
- va_list args;
+ va_list args;
+
+ if (priority > udev_log_priority)
+ return;
va_start(args, format);
va_start(args, format);
- vsyslog(
level
, format, args);
+ vsyslog(
priority
, format, args);
va_end(args);
}
#endif
va_end(args);
}
#endif
-#define msg_dump(msg) \
- dbg("msg_dump: sequence %llu, '%s', '%s', '%s'", \
- msg->seqnum, msg->action, msg->devpath, msg->subsystem);
-
static void msg_dump_queue(void)
{
#ifdef DEBUG
static void msg_dump_queue(void)
{
#ifdef DEBUG
@@
-111,13
+112,21
@@
static void msg_queue_insert(struct hotplug_msg *msg)
return;
}
return;
}
+ /* don't delay messages with timeout set */
+ if (msg->timeout) {
+ dbg("move seq %llu with timeout %u to exec queue", msg->seqnum, msg->timeout);
+ list_add(&msg->node, &exec_list);
+ run_exec_q = 1;
+ return;
+ }
+
/* sort message by sequence number into list */
list_for_each_entry_reverse(loop_msg, &msg_list, node) {
if (loop_msg->seqnum < msg->seqnum)
break;
if (loop_msg->seqnum == msg->seqnum) {
/* sort message by sequence number into list */
list_for_each_entry_reverse(loop_msg, &msg_list, node) {
if (loop_msg->seqnum < msg->seqnum)
break;
if (loop_msg->seqnum == msg->seqnum) {
-
dbg
("ignoring duplicate message seq %llu", msg->seqnum);
+
info
("ignoring duplicate message seq %llu", msg->seqnum);
return;
}
}
return;
}
}
@@
-136,7
+145,7
@@
static void msg_queue_insert(struct hotplug_msg *msg)
}
/* forks event and removes event from run queue when finished */
}
/* forks event and removes event from run queue when finished */
-static void
udev_run
(struct hotplug_msg *msg)
+static void
execute_udev
(struct hotplug_msg *msg)
{
char *const argv[] = { "udev", msg->subsystem, NULL };
pid_t pid;
{
char *const argv[] = { "udev", msg->subsystem, NULL };
pid_t pid;
@@
-150,11
+159,11
@@
static void udev_run(struct hotplug_msg *msg)
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
execve(udev_bin, argv, msg->envp);
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
execve(udev_bin, argv, msg->envp);
-
dbg
("exec of child failed");
+
err
("exec of child failed");
_exit(1);
break;
case -1:
_exit(1);
break;
case -1:
-
dbg
("fork of child failed");
+
err
("fork of child failed");
run_queue_delete(msg);
break;
default:
run_queue_delete(msg);
break;
default:
@@
-262,7
+271,7
@@
static int compare_devpath(const char *running, const char *waiting)
{
int i;
{
int i;
- for (i = 0; i <
DEV
PATH_SIZE; i++) {
+ for (i = 0; i < PATH_SIZE; i++) {
/* identical device event found */
if (running[i] == '\0' && waiting[i] == '\0')
return 1;
/* identical device event found */
if (running[i] == '\0' && waiting[i] == '\0')
return 1;
@@
-291,6
+300,10
@@
static struct hotplug_msg *running_with_devpath(struct hotplug_msg *msg)
if (msg->devpath == NULL)
return NULL;
if (msg->devpath == NULL)
return NULL;
+ /* skip any events with a timeout set */
+ if (msg->timeout)
+ return NULL;
+
list_for_each_entry(loop_msg, &running_list, node) {
if (loop_msg->devpath == NULL)
continue;
list_for_each_entry(loop_msg, &running_list, node) {
if (loop_msg->devpath == NULL)
continue;
@@
-336,7
+349,7
@@
static void exec_queue_manager(void)
if (!msg) {
/* move event to run list */
list_move_tail(&loop_msg->node, &running_list);
if (!msg) {
/* move event to run list */
list_move_tail(&loop_msg->node, &running_list);
-
udev_run
(loop_msg);
+
execute_udev
(loop_msg);
running++;
dbg("moved seq %llu to running list", loop_msg->seqnum);
} else {
running++;
dbg("moved seq %llu to running list", loop_msg->seqnum);
} else {
@@
-438,17
+451,17
@@
static struct hotplug_msg *get_udevsend_msg(void)
cred = (struct ucred *) CMSG_DATA(cmsg);
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
cred = (struct ucred *) CMSG_DATA(cmsg);
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
-
dbg
("no sender credentials received, message ignored");
+
info
("no sender credentials received, message ignored");
return NULL;
}
if (cred->uid != 0) {
return NULL;
}
if (cred->uid != 0) {
-
dbg
("sender uid=%i, message ignored", cred->uid);
+
info
("sender uid=%i, message ignored", cred->uid);
return NULL;
}
if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
return NULL;
}
if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
-
dbg
("message magic '%s' doesn't match, ignore it", usend_msg.magic);
+
info
("message magic '%s' doesn't match, ignore it", usend_msg.magic);
return NULL;
}
return NULL;
}
@@
-488,6
+501,9
@@
static struct hotplug_msg *get_udevsend_msg(void)
if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
msg->physdevpath = &key[12];
if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
msg->physdevpath = &key[12];
+
+ if (strncmp(key, "TIMEOUT=", 8) == 0)
+ msg->timeout = strtoull(&key[8], NULL, 10);
}
msg->envp[i++] = "UDEVD_EVENT=1";
msg->envp[i] = NULL;
}
msg->envp[i++] = "UDEVD_EVENT=1";
msg->envp[i] = NULL;
@@
-588,14
+604,14
@@
static int init_udevsend_socket(void)
udevsendsock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (udevsendsock == -1) {
udevsendsock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (udevsendsock == -1) {
-
dbg
("error getting socket, %s", strerror(errno));
+
err
("error getting socket, %s", strerror(errno));
return -1;
}
/* the bind takes care of ensuring only one copy running */
retval = bind(udevsendsock, (struct sockaddr *) &saddr, addrlen);
if (retval < 0) {
return -1;
}
/* the bind takes care of ensuring only one copy running */
retval = bind(udevsendsock, (struct sockaddr *) &saddr, addrlen);
if (retval < 0) {
-
dbg
("bind failed, %s", strerror(errno));
+
err
("bind failed, %s", strerror(errno));
close(udevsendsock);
return -1;
}
close(udevsendsock);
return -1;
}
@@
-617,10
+633,11
@@
int main(int argc, char *argv[], char *envp[])
const char *udevd_expected_seqnum;
logging_init("udevd");
const char *udevd_expected_seqnum;
logging_init("udevd");
+ udev_init_config();
dbg("version %s", UDEV_VERSION);
if (getuid() != 0) {
dbg("version %s", UDEV_VERSION);
if (getuid() != 0) {
-
dbg
("need to be root, exit");
+
err
("need to be root, exit");
goto exit;
}
goto exit;
}
@@
-634,7
+651,7
@@
int main(int argc, char *argv[], char *envp[])
dbg("damonized fork running");
break;
case -1:
dbg("damonized fork running");
break;
case -1:
-
dbg
("fork of daemon failed");
+
err
("fork of daemon failed");
goto exit;
default:
logging_close();
goto exit;
default:
logging_close();
@@
-662,36
+679,36
@@
int main(int argc, char *argv[], char *envp[])
if (fd > 2)
close(fd);
} else
if (fd > 2)
close(fd);
} else
-
dbg
("error opening /dev/null %s", strerror(errno));
+
err
("error opening /dev/null %s", strerror(errno));
/* setup signal handler pipe */
retval = pipe(pipefds);
if (retval < 0) {
/* setup signal handler pipe */
retval = pipe(pipefds);
if (retval < 0) {
-
dbg
("error getting pipes: %s", strerror(errno));
+
err
("error getting pipes: %s", strerror(errno));
goto exit;
}
retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
if (retval < 0) {
goto exit;
}
retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
if (retval < 0) {
-
dbg
("error fcntl on read pipe: %s", strerror(errno));
+
err
("error fcntl on read pipe: %s", strerror(errno));
goto exit;
}
retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
if (retval < 0)
goto exit;
}
retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
if (retval < 0)
-
dbg
("error fcntl on read pipe: %s", strerror(errno));
+
err
("error fcntl on read pipe: %s", strerror(errno));
retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
if (retval < 0) {
retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
if (retval < 0) {
-
dbg
("error fcntl on write pipe: %s", strerror(errno));
+
err
("error fcntl on write pipe: %s", strerror(errno));
goto exit;
}
retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
if (retval < 0)
goto exit;
}
retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
if (retval < 0)
-
dbg
("error fcntl on write pipe: %s", strerror(errno));
+
err
("error fcntl on write pipe: %s", strerror(errno));
/* set signal handlers */
memset(&act, 0x00, sizeof(struct sigaction));
/* set signal handlers */
memset(&act, 0x00, sizeof(struct sigaction));
- act.sa_handler = (void (*)
(int))
sig_handler;
+ act.sa_handler = (void (*)
(int))
sig_handler;
sigemptyset(&act.sa_mask);
act.sa_flags = SA_RESTART;
sigaction(SIGINT, &act, NULL);
sigemptyset(&act.sa_mask);
act.sa_flags = SA_RESTART;
sigaction(SIGINT, &act, NULL);
@@
-711,7
+728,7
@@
int main(int argc, char *argv[], char *envp[])
/* possible override of udev binary, used for testing */
udev_bin = getenv("UDEV_BIN");
if (udev_bin != NULL)
/* possible override of udev binary, used for testing */
udev_bin = getenv("UDEV_BIN");
if (udev_bin != NULL)
-
dbg
("udev binary is set to '%s'", udev_bin);
+
info
("udev binary is set to '%s'", udev_bin);
else
udev_bin = UDEV_BIN;
else
udev_bin = UDEV_BIN;
@@
-719,7
+736,7
@@
int main(int argc, char *argv[], char *envp[])
udevd_expected_seqnum = getenv("UDEVD_EXPECTED_SEQNUM");
if (udevd_expected_seqnum != NULL) {
expected_seqnum = strtoull(udevd_expected_seqnum, NULL, 10);
udevd_expected_seqnum = getenv("UDEVD_EXPECTED_SEQNUM");
if (udevd_expected_seqnum != NULL) {
expected_seqnum = strtoull(udevd_expected_seqnum, NULL, 10);
-
dbg
("initialize expected_seqnum to %llu", expected_seqnum);
+
info
("initialize expected_seqnum to %llu", expected_seqnum);
}
/* get current time to provide shorter timeout on startup */
}
/* get current time to provide shorter timeout on startup */