chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevd: fix queue export for multiple events for the same device
[elogind.git]
/
udevmonitor.c
diff --git
a/udevmonitor.c
b/udevmonitor.c
index 382cbb19053b47a93ffc6d56ad227f9430beb97e..80c49753f57a8052841bf4053e4c4f32d307c4ba 100644
(file)
--- a/
udevmonitor.c
+++ b/
udevmonitor.c
@@
-23,9
+23,9
@@
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
-#include <time.h>
#include <errno.h>
#include <signal.h>
#include <errno.h>
#include <signal.h>
+#include <sys/time.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/select.h>
@@
-34,8
+34,6
@@
#include "udev.h"
#include "udevd.h"
#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 int uevent_netlink_sock;
static int udev_monitor_sock;
@@
-56,14
+54,14
@@
static int init_udev_monitor_socket(void)
udev_monitor_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (udev_monitor_sock == -1) {
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) {
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;
close(udev_monitor_sock);
udev_monitor_sock = -1;
return -1;
@@
-87,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) {
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) {
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;
close(uevent_netlink_sock);
uevent_netlink_sock = -1;
return -1;
@@
-160,6
+158,9
@@
int main(int argc, char *argv[])
static char buf[UEVENT_BUFFER_SIZE*2];
ssize_t buflen;
int fdcount;
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);
buflen = 0;
FD_ZERO(&readfds);
@@
-171,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)
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;
}
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) {
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;
}
continue;
}
- printf("UEVENT[%
llu] %s\n", (unsigned long long) 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) {
}
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;
}
continue;
}
- printf("UDEV [%
llu] %s\n", (unsigned long long) time(NULL)
, buf);
+ printf("UDEV [%
s] %s\n", timestr
, buf);
}
if (buflen == 0)
}
if (buflen == 0)