static int uevent_netlink_sock;
static pid_t sid;
-static int pipefds[2] = {-1, -1};
+static int signal_pipe[2] = {-1, -1};
static volatile int sigchilds_waiting;
static volatile int run_msg_q;
-static volatile int sig_flag;
static volatile int udev_exit;
static int init_phase = 1;
static int run_exec_q;
if (msg->seqnum == 0) {
dbg("no SEQNUM, move straight to the exec queue");
- list_add(&msg->node, &exec_list);
+ list_add_tail(&msg->node, &exec_list);
run_exec_q = 1;
return;
}
init_phase = 0;
}
- /* don't delay messages with timeout set */
- if (msg->timeout) {
- info("seq %llu with timeout %u seconds will be execute without queuing, '%s' '%s'",
- msg->seqnum, msg->timeout, msg->action, msg->devpath);
- 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)
if (f == -1)
return -1;
- len = read(f, buf, sizeof(buf));
+ len = read(f, buf, sizeof(buf)-1);
close(f);
if (len <= 0)
if (f == -1)
continue;
- len = read(f, line, sizeof(line));
+ len = read(f, line, sizeof(line)-1);
close(f);
if (len <= 0)
/* set timeout for remaining queued events */
if (!list_empty(&msg_list)) {
struct itimerval itv = {{0, 0}, {timeout - msg_age, 0}};
- dbg("next event expires in %li seconds", timeout - msg_age);
+ info("next event expires in %li seconds", timeout - msg_age);
setitimer(ITIMER_REAL, &itv, NULL);
}
}
size = recvmsg(udevd_sock, &smsg, 0);
if (size < 0) {
if (errno != EINTR)
- dbg("unable to receive udevd message");
+ err("unable to receive udevd message");
return NULL;
}
cmsg = CMSG_FIRSTHDR(&smsg);
cred = (struct ucred *) CMSG_DATA(cmsg);
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
- info("no sender credentials received, message ignored");
+ err("no sender credentials received, message ignored");
return NULL;
}
if (cred->uid != 0) {
- info("sender uid=%i, message ignored", cred->uid);
+ err("sender uid=%i, message ignored", cred->uid);
return NULL;
}
if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
- info("message magic '%s' doesn't match, ignore it", usend_msg.magic);
+ err("message magic '%s' doesn't match, ignore it", usend_msg.magic);
return NULL;
}
switch (usend_msg.type) {
case UDEVD_UEVENT_UDEVSEND:
case UDEVD_UEVENT_INITSEND:
- dbg("udevd event message received");
+ info("udevd event message received");
envbuf_size = size - offsetof(struct udevd_msg, envbuf);
dbg("envbuf_size=%i", envbuf_size);
msg = get_msg_from_envbuf(usend_msg.envbuf, envbuf_size);
size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
if (size < 0) {
if (errno != EINTR)
- dbg("unable to receive udevd message");
+ err("unable to receive udevd message");
return NULL;
}
/* validate message */
pos = strchr(buffer, '@');
if (pos == NULL) {
- dbg("invalid uevent '%s'", buffer);
+ err("invalid uevent '%s'", buffer);
free(msg);
return NULL;
}
pos[0] = '\0';
if (msg->action == NULL) {
- dbg("no ACTION in payload found, skip event '%s'", buffer);
+ err("no ACTION in payload found, skip event '%s'", buffer);
free(msg);
return NULL;
}
if (strcmp(msg->action, buffer) != 0) {
- dbg("ACTION in payload does not match uevent, skip event '%s'", buffer);
+ err("ACTION in payload does not match uevent, skip event '%s'", buffer);
free(msg);
return NULL;
}
static void asmlinkage sig_handler(int signum)
{
- int rc;
-
switch (signum) {
case SIGINT:
case SIGTERM:
break;
}
- /* if pipe is empty, write to pipe to force select to return,
- * which will wakeup our mainloop
- */
- if (!sig_flag) {
- rc = write(pipefds[1], &signum, sizeof(signum));
- if (rc >= 0)
- sig_flag = 1;
- }
+ /* write to pipe, which will wakeup select() in our mainloop */
+ write(signal_pipe[WRITE_END], "", 1);
}
static void udev_done(int pid)
list_for_each_entry(msg, &running_list, node) {
if (msg->pid == pid) {
sysinfo(&info);
- info("seq %llu exit, %ld seconds old", msg->seqnum, info.uptime - msg->queue_time);
+ if (msg->queue_time)
+ info("seq %llu, pid [%d] exit, %ld seconds old", msg->seqnum, msg->pid, info.uptime - msg->queue_time);
+ else
+ info("seq 0, pid [%d] exit", msg->pid);
msg_queue_delete(msg);
/* we want to run the exec queue manager since there may
uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
if (uevent_netlink_sock == -1) {
- dbg("error getting socket, %s", strerror(errno));
+ err("error getting socket, %s", strerror(errno));
return -1;
}
retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl,
sizeof(struct sockaddr_nl));
if (retval < 0) {
- dbg("bind failed, %s", strerror(errno));
+ err("bind failed, %s", strerror(errno));
close(uevent_netlink_sock);
uevent_netlink_sock = -1;
return -1;
setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
/* setup signal handler pipe */
- retval = pipe(pipefds);
+ retval = pipe(signal_pipe);
if (retval < 0) {
err("error getting pipes: %s", strerror(errno));
goto exit;
}
- retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
+ retval = fcntl(signal_pipe[READ_END], F_SETFL, O_NONBLOCK);
if (retval < 0) {
err("error fcntl on read pipe: %s", strerror(errno));
goto exit;
}
- retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
+ retval = fcntl(signal_pipe[READ_END], F_SETFD, FD_CLOEXEC);
if (retval < 0)
err("error fcntl on read pipe: %s", strerror(errno));
- retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
+ retval = fcntl(signal_pipe[WRITE_END], F_SETFL, O_NONBLOCK);
if (retval < 0) {
err("error fcntl on write pipe: %s", strerror(errno));
goto exit;
}
- retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
+ retval = fcntl(signal_pipe[WRITE_END], F_SETFD, FD_CLOEXEC);
if (retval < 0)
err("error fcntl on write pipe: %s", strerror(errno));
int fdcount;
FD_ZERO(&readfds);
- FD_SET(pipefds[0], &readfds);
+ FD_SET(signal_pipe[READ_END], &readfds);
FD_SET(udevd_sock, &readfds);
if (uevent_netlink_sock > 0)
FD_SET(uevent_netlink_sock, &readfds);
if (msg) {
/* discard kernel messages if netlink is active */
if (uevent_netlink_active && msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) {
- dbg("skip uevent_helper message, netlink is active");
+ info("skip uevent_helper message with SEQNUM, netlink is active");
free(msg);
- continue;
- }
- msg_queue_insert(msg);
+ } else
+ msg_queue_insert(msg);
}
}
}
/* received a signal, clear our notification pipe */
- if (FD_ISSET(pipefds[0], &readfds)) {
- int sig;
- ssize_t rlen;
-
- while(1) {
- rlen = read(pipefds[0], &sig, sizeof(sig));
- if (rlen <= 0)
- break;
- }
- sig_flag = 0;
+ if (FD_ISSET(signal_pipe[READ_END], &readfds)) {
+ char buf[256];
+
+ read(signal_pipe[READ_END], &buf, sizeof(buf));
}
/* forked child have returned */
}
exit:
- if (pipefds[0] > 0)
- close(pipefds[0]);
- if (pipefds[1] > 0)
- close(pipefds[1]);
+ if (signal_pipe[READ_END] > 0)
+ close(signal_pipe[READ_END]);
+ if (signal_pipe[WRITE_END] > 0)
+ close(signal_pipe[WRITE_END]);
if (udevd_sock > 0)
close(udevd_sock);
~ianmdlvl / elogind.git / blobdiff