rename "persistent disk" to "persistent storage"

[elogind.git] / udevmonitor.c

diff --git a/udevmonitor.c b/udevmonitor.c
index 2775b295ceac9bc18e709d77e6660dce23655612..80c49753f57a8052841bf4053e4c4f32d307c4ba 100644 (file)
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -23,8 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
-#include <time.h>
 #include <errno.h>
+#include <signal.h>
+#include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/select.h>
@@ -33,11 +34,10 @@
 
 #include "udev.h"
 #include "udevd.h"
-#include "udev_utils.h"
-#include "udev_libc_wrapper.h"
 
 static int uevent_netlink_sock;
 static int udev_monitor_sock;
+static volatile int udev_exit;
 
 static int init_udev_monitor_socket(void)
 {
@@ -54,15 +54,16 @@ static int init_udev_monitor_socket(void)
 
        udev_monitor_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (udev_monitor_sock == -1) {
-               fprintf(stderr, "error getting socket, %s\n", strerror(errno));
+               fprintf(stderr, "error getting socket: %s\n", strerror(errno));
                return -1;
        }
 
        /* the bind takes care of ensuring only one copy running */
        retval = bind(udev_monitor_sock, (struct sockaddr *) &saddr, addrlen);
        if (retval < 0) {
-               fprintf(stderr, "bind failed, %s\n", strerror(errno));
+               fprintf(stderr, "bind failed: %s\n", strerror(errno));
                close(udev_monitor_sock);
+               udev_monitor_sock = -1;
                return -1;
        }
 
@@ -84,14 +85,14 @@ static int init_uevent_netlink_sock(void)
 
        uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
        if (uevent_netlink_sock == -1) {
-               fprintf(stderr, "error getting socket, %s\n", strerror(errno));
+               fprintf(stderr, "error getting socket: %s\n", strerror(errno));
                return -1;
        }
 
        retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl,
                      sizeof(struct sockaddr_nl));
        if (retval < 0) {
-               fprintf(stderr, "bind failed, %s\n", strerror(errno));
+               fprintf(stderr, "bind failed: %s\n", strerror(errno));
                close(uevent_netlink_sock);
                uevent_netlink_sock = -1;
                return -1;
@@ -100,8 +101,15 @@ static int init_uevent_netlink_sock(void)
        return 0;
 }
 
+static void asmlinkage sig_handler(int signum)
+{
+       if (signum == SIGINT || signum == SIGTERM)
+               udev_exit = 1;
+}
+
 int main(int argc, char *argv[])
 {
+       struct sigaction act;
        int env = 0;
        fd_set readfds;
        int i;
@@ -125,21 +133,34 @@ int main(int argc, char *argv[])
 
        if (getuid() != 0) {
                fprintf(stderr, "need to be root, exit\n\n");
-               exit(1);
+               exit(2);
        }
 
+       /* set signal handlers */
+       memset(&act, 0x00, sizeof(struct sigaction));
+       act.sa_handler = (void (*)(int)) sig_handler;
+       sigemptyset(&act.sa_mask);
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
+
        retval = init_udev_monitor_socket();
        if (retval)
                goto out;
-       init_uevent_netlink_sock();
+       retval = init_uevent_netlink_sock();
+       if (retval)
+               goto out;
 
        printf("udevmonitor prints the received event from the kernel [UEVENT]\n"
               "and the event which udev sends out after rule processing [UDEV]\n\n");
 
-       while (1) {
+       while (!udev_exit) {
                static char buf[UEVENT_BUFFER_SIZE*2];
                ssize_t buflen;
                int fdcount;
+               struct timeval tv;
+               struct timezone tz;
+               char timestr[64];
 
                buflen = 0;
                FD_ZERO(&readfds);
@@ -151,26 +172,32 @@ int main(int argc, char *argv[])
                fdcount = select(UDEV_MAX(uevent_netlink_sock, udev_monitor_sock)+1, &readfds, NULL, NULL, NULL);
                if (fdcount < 0) {
                        if (errno != EINTR)
-                               fprintf(stderr, "error receiving uevent message\n");
+                               fprintf(stderr, "error receiving uevent message: %s\n", strerror(errno));
                        continue;
                }
 
+               if (gettimeofday(&tv, &tz) == 0) {
+                       snprintf(timestr, sizeof(timestr), "%llu.%06u",
+                                (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec);
+               } else
+                       timestr[0] = '\0';
+
                if ((uevent_netlink_sock > 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
                        buflen = recv(uevent_netlink_sock, &buf, sizeof(buf), 0);
                        if (buflen <=  0) {
-                               fprintf(stderr, "error receiving uevent message\n");
+                               fprintf(stderr, "error receiving uevent message: %s\n", strerror(errno));
                                continue;
                        }
-                       printf("UEVENT[%i] %s\n", time(NULL), buf);
+                       printf("UEVENT[%s] %s\n", timestr, buf);
                }
 
                if ((udev_monitor_sock > 0) && FD_ISSET(udev_monitor_sock, &readfds)) {
                        buflen = recv(udev_monitor_sock, &buf, sizeof(buf), 0);
                        if (buflen <=  0) {
-                               fprintf(stderr, "error receiving udev message\n");
+                               fprintf(stderr, "error receiving udev message: %s\n", strerror(errno));
                                continue;
                        }
-                       printf("UDEV  [%i] %s\n", time(NULL), buf);
+                       printf("UDEV  [%s] %s\n", timestr, buf);
                }
 
                if (buflen == 0)
@@ -204,5 +231,7 @@ out:
        if (udev_monitor_sock > 0)
                close(udev_monitor_sock);
 
-       return retval;
+       if (retval)
+               return 3;
+       return 0;
 }