#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
+#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include <sys/time.h>
#include <fcntl.h>
+#include "klibc_fixups.h"
+#include <sys/sysinfo.h>
#include "list.h"
#include "udev.h"
#include "logging.h"
static int pipefds[2];
-static int expected_seqnum = 0;
-volatile static int children_waiting;
-volatile static int run_msg_q;
-volatile static int sig_flag;
+static unsigned long long expected_seqnum = 0;
+static volatile int children_waiting;
+static volatile int run_msg_q;
+static volatile int sig_flag;
static int run_exec_q;
static LIST_HEAD(msg_list);
static void msg_queue_manager(void);
static void user_sighandler(void);
static void reap_kids(void);
+char *udev_bin;
#ifdef LOG
unsigned char logname[LOGNAME_SIZE];
}
#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
struct hotplug_msg *msg;
list_for_each_entry(msg, &msg_list, list)
- dbg("sequence %d in queue", msg->seqnum);
+ dbg("sequence %llu in queue", msg->seqnum);
#endif
}
-static void msg_dump(struct hotplug_msg *msg)
-{
- dbg("sequence %d, '%s', '%s', '%s'",
- msg->seqnum, msg->action, msg->devpath, msg->subsystem);
-}
-
static struct hotplug_msg *msg_create(void)
{
struct hotplug_msg *new_msg;
static void msg_queue_insert(struct hotplug_msg *msg)
{
struct hotplug_msg *loop_msg;
+ struct sysinfo info;
/* sort message by sequence number into list. events
* will tend to come in order, so scan the list backwards
list_for_each_entry_reverse(loop_msg, &msg_list, list)
if (loop_msg->seqnum < msg->seqnum)
break;
- list_add(&msg->list, &loop_msg->list);
- dbg("queued message seq %d", msg->seqnum);
/* store timestamp of queuing */
- msg->queue_time = time(NULL);
+ sysinfo(&info);
+ msg->queue_time = info.uptime;
+
+ list_add(&msg->list, &loop_msg->list);
+ dbg("queued message seq %llu", msg->seqnum);
/* run msg queue manager */
run_msg_q = 1;
pid_t pid;
char action[ACTION_SIZE];
char devpath[DEVPATH_SIZE];
- char *env[] = { action, devpath, NULL };
+ char seqnum[SEQNUM_SIZE];
+ char *env[] = { action, devpath, seqnum, NULL };
- snprintf(action, sizeof(action), "ACTION=%s", msg->action);
- snprintf(devpath, sizeof(devpath), "DEVPATH=%s", msg->devpath);
+ snprintf(action, ACTION_SIZE-1, "ACTION=%s", msg->action);
+ action[ACTION_SIZE-1] = '\0';
+ snprintf(devpath, DEVPATH_SIZE-1, "DEVPATH=%s", msg->devpath);
+ devpath[DEVPATH_SIZE-1] = '\0';
+ sprintf(seqnum, "SEQNUM=%llu", msg->seqnum);
pid = fork();
switch (pid) {
case 0:
/* child */
- execle(UDEV_BIN, "udev", msg->subsystem, NULL, env);
+ execle(udev_bin, "udev", msg->subsystem, NULL, env);
dbg("exec of child failed");
exit(1);
break;
break;
default:
/* get SIGCHLD in main loop */
- dbg("==> exec seq %d [%d] working at '%s'", msg->seqnum, pid, msg->devpath);
+ dbg("==> exec seq %llu [%d] working at '%s'", msg->seqnum, pid, msg->devpath);
msg->pid = pid;
}
}
/* move event to run list */
list_move_tail(&loop_msg->list, &running_list);
udev_run(loop_msg);
- dbg("moved seq %d to running list", loop_msg->seqnum);
+ dbg("moved seq %llu to running list", loop_msg->seqnum);
} else {
- dbg("delay seq %d, cause seq %d already working on '%s'",
+ dbg("delay seq %llu, cause seq %llu already working on '%s'",
loop_msg->seqnum, msg->seqnum, msg->devpath);
}
}
list_move_tail(&msg->list, &exec_list);
run_exec_q = 1;
expected_seqnum = msg->seqnum+1;
- dbg("moved seq %d to exec, next expected is %d",
+ dbg("moved seq %llu to exec, next expected is %llu",
msg->seqnum, expected_seqnum);
}
{
struct hotplug_msg *loop_msg;
struct hotplug_msg *tmp_msg;
- time_t msg_age = 0;
+ struct sysinfo info;
+ long msg_age = 0;
- dbg("msg queue manager, next expected is %d", expected_seqnum);
+ dbg("msg queue manager, next expected is %llu", expected_seqnum);
recheck:
list_for_each_entry_safe(loop_msg, tmp_msg, &msg_list, list) {
/* move event with expected sequence to the exec list */
}
/* move event with expired timeout to the exec list */
- msg_age = time(NULL) - loop_msg->queue_time;
+ sysinfo(&info);
+ msg_age = info.uptime - loop_msg->queue_time;
+ dbg("seq %llu is %li seconds old", loop_msg->seqnum, msg_age);
if (msg_age > EVENT_TIMEOUT_SEC-1) {
msg_move_exec(loop_msg);
goto recheck;
msg_dump_queue();
+ /* set timeout for remaining queued events */
if (list_empty(&msg_list) == 0) {
- /* set timeout for remaining queued events */
struct itimerval itv = {{0, 0}, {EVENT_TIMEOUT_SEC - msg_age, 0}};
- dbg("next event expires in %li seconds",
- EVENT_TIMEOUT_SEC - msg_age);
+ dbg("next event expires in %li seconds", EVENT_TIMEOUT_SEC - msg_age);
setitimer(ITIMER_REAL, &itv, 0);
}
}
}
/* if no seqnum is given, we move straight to exec queue */
- if (msg->seqnum == -1) {
+ if (msg->seqnum == 0) {
list_add(&msg->list, &exec_list);
run_exec_q = 1;
} else {
return;
}
-static void sig_handler(int signum)
+asmlinkage static void sig_handler(int signum)
{
int rc;
+
switch (signum) {
case SIGINT:
case SIGTERM:
goto do_write;
break;
default:
- dbg("unhandled signal");
+ dbg("unhandled signal %d", signum);
return;
}
list_for_each_entry(msg, &running_list, list) {
if (msg->pid == pid) {
- dbg("<== exec seq %d came back", msg->seqnum);
+ dbg("<== exec seq %llu came back", msg->seqnum);
run_queue_delete(msg);
-
+
/* we want to run the exec queue manager since there may
* be events waiting with the devpath of the one that
* just finished
int ssock, maxsockplus;
struct sockaddr_un saddr;
socklen_t addrlen;
- int retval;
+ int retval, fd;
const int on = 1;
struct sigaction act;
fd_set readfds;
dbg("need to be root, exit");
exit(1);
}
-
+ /* make sure we are at top of dir */
+ chdir("/");
+ umask( umask( 077 ) | 022 );
+ /* Set fds to dev/null */
+ fd = open( "/dev/null", O_RDWR );
+ if ( fd < 0 ) {
+ dbg("error opening /dev/null %s", strerror(errno));
+ exit(1);
+ }
+ dup2(fd, 0);
+ dup2(fd, 1);
+ dup2(fd, 2);
+ if (fd > 2)
+ close(fd);
+ /* Get new session id so stray signals don't come our way. */
+ setsid();
+
/* setup signal handler pipe */
- retval = pipe(pipefds);
- if (retval < 0) {
- dbg("error getting pipes: %s", strerror(errno));
- exit(1);
- }
-
- retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
- if (retval < 0) {
- dbg("fcntl on read pipe: %s", strerror(errno));
- exit(1);
- }
-
- retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
- if (retval < 0) {
- dbg("fcntl on write pipe: %s", strerror(errno));
- exit(1);
- }
+ retval = pipe(pipefds);
+ if (retval < 0) {
+ dbg("error getting pipes: %s", strerror(errno));
+ exit(1);
+ }
+
+ retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
+ if (retval < 0) {
+ dbg("error fcntl on read pipe: %s", strerror(errno));
+ exit(1);
+ }
+ retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
+ if (retval < 0) {
+ dbg("error fcntl on read pipe: %s", strerror(errno));
+ exit(1);
+ }
+
+ retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
+ if (retval < 0) {
+ dbg("error fcntl on write pipe: %s", strerror(errno));
+ exit(1);
+ }
+ retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
+ if (retval < 0) {
+ dbg("error fcntl on write pipe: %s", strerror(errno));
+ exit(1);
+ }
+
/* set signal handlers */
act.sa_handler = sig_handler;
sigemptyset(&act.sa_mask);
exit(1);
}
+ set_cloexec_flag(ssock, 1);
+
/* the bind takes care of ensuring only one copy running */
retval = bind(ssock, (struct sockaddr *) &saddr, addrlen);
if (retval < 0) {
dbg("bind failed, exit");
goto exit;
}
+ retval = fcntl(ssock, F_SETFD, FD_CLOEXEC);
+ if (retval < 0) {
+ dbg("error fcntl on ssock: %s", strerror(errno));
+ exit(1);
+ }
/* enable receiving of the sender credentials */
setsockopt(ssock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
- FD_ZERO(&readfds);
- FD_SET(ssock, &readfds);
- FD_SET(pipefds[0], &readfds);
+ /* 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);
+ else
+ udev_bin = UDEV_BIN;
+
+ FD_ZERO(&readfds);
+ FD_SET(ssock, &readfds);
+ FD_SET(pipefds[0], &readfds);
maxsockplus = ssock+1;
while (1) {
fd_set workreadfds = readfds;
retval = select(maxsockplus, &workreadfds, NULL, NULL, NULL);
-
+
if (retval < 0) {
- dbg("error in select: %s", strerror(errno));
+ if (errno != EINTR)
+ dbg("error in select: %s", strerror(errno));
continue;
}
-
+
if (FD_ISSET(ssock, &workreadfds))
handle_msg(ssock);
-
+
if (FD_ISSET(pipefds[0], &workreadfds))
user_sighandler();
-
+
if (children_waiting) {
children_waiting = 0;
reap_kids();
}
-
+
if (run_msg_q) {
run_msg_q = 0;
msg_queue_manager();
}
-
+
if (run_exec_q) {
-
/* this is tricky. exec_queue_manager() loops over exec_list, and
* calls running_with_devpath(), which loops over running_list. This gives
* O(N*M), which can get *nasty*. Clean up running_list before
* calling exec_queue_manager().
*/
-
if (children_waiting) {
children_waiting = 0;
reap_kids();
~ianmdlvl / elogind.git / blobdiff