| OLD | NEW |
| 1 #include <mqueue.h> | 1 #include <mqueue.h> |
| 2 #include <pthread.h> | 2 #include <pthread.h> |
| 3 #include <errno.h> | 3 #include <errno.h> |
| 4 #include <sys/socket.h> | 4 #include <sys/socket.h> |
| 5 #include <signal.h> | 5 #include <signal.h> |
| 6 #include <unistd.h> | 6 #include <unistd.h> |
| 7 #include "syscall.h" | 7 #include "syscall.h" |
| 8 | 8 |
| 9 struct args { | 9 struct args { |
| 10 » pthread_barrier_t barrier; | 10 pthread_barrier_t barrier; |
| 11 » int sock; | 11 int sock; |
| 12 » const struct sigevent *sev; | 12 const struct sigevent* sev; |
| 13 }; | 13 }; |
| 14 | 14 |
| 15 static void *start(void *p) | 15 static void* start(void* p) { |
| 16 { | 16 struct args* args = p; |
| 17 » struct args *args = p; | 17 char buf[32]; |
| 18 » char buf[32]; | 18 ssize_t n; |
| 19 » ssize_t n; | 19 int s = args->sock; |
| 20 » int s = args->sock; | 20 void (*func)(union sigval) = args->sev->sigev_notify_function; |
| 21 » void (*func)(union sigval) = args->sev->sigev_notify_function; | 21 union sigval val = args->sev->sigev_value; |
| 22 » union sigval val = args->sev->sigev_value; | |
| 23 | 22 |
| 24 » pthread_barrier_wait(&args->barrier); | 23 pthread_barrier_wait(&args->barrier); |
| 25 » n = recv(s, buf, sizeof(buf), MSG_NOSIGNAL|MSG_WAITALL); | 24 n = recv(s, buf, sizeof(buf), MSG_NOSIGNAL | MSG_WAITALL); |
| 26 » close(s); | 25 close(s); |
| 27 » if (n==sizeof buf && buf[sizeof buf - 1] == 1) | 26 if (n == sizeof buf && buf[sizeof buf - 1] == 1) |
| 28 » » func(val); | 27 func(val); |
| 29 » return 0; | 28 return 0; |
| 30 } | 29 } |
| 31 | 30 |
| 32 int mq_notify(mqd_t mqd, const struct sigevent *sev) | 31 int mq_notify(mqd_t mqd, const struct sigevent* sev) { |
| 33 { | 32 struct args args = {.sev = sev}; |
| 34 » struct args args = { .sev = sev }; | 33 pthread_attr_t attr; |
| 35 » pthread_attr_t attr; | 34 pthread_t td; |
| 36 » pthread_t td; | 35 int s; |
| 37 » int s; | 36 struct sigevent sev2; |
| 38 » struct sigevent sev2; | 37 static const char zeros[32]; |
| 39 » static const char zeros[32]; | |
| 40 | 38 |
| 41 » if (!sev || sev->sigev_notify != SIGEV_THREAD) | 39 if (!sev || sev->sigev_notify != SIGEV_THREAD) |
| 42 » » return syscall(SYS_mq_notify, mqd, sev); | 40 return syscall(SYS_mq_notify, mqd, sev); |
| 43 | 41 |
| 44 » s = socket(AF_NETLINK, SOCK_RAW|SOCK_CLOEXEC, 0); | 42 s = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, 0); |
| 45 » if (s < 0) return -1; | 43 if (s < 0) |
| 46 » args.sock = s; | 44 return -1; |
| 45 args.sock = s; |
| 47 | 46 |
| 48 » if (sev->sigev_notify_attributes) attr = *sev->sigev_notify_attributes; | 47 if (sev->sigev_notify_attributes) |
| 49 » else pthread_attr_init(&attr); | 48 attr = *sev->sigev_notify_attributes; |
| 50 » pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); | 49 else |
| 51 » pthread_barrier_init(&args.barrier, 0, 2); | 50 pthread_attr_init(&attr); |
| 51 pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); |
| 52 pthread_barrier_init(&args.barrier, 0, 2); |
| 52 | 53 |
| 53 » if (pthread_create(&td, &attr, start, &args)) { | 54 if (pthread_create(&td, &attr, start, &args)) { |
| 54 » » __syscall(SYS_close, s); | 55 __syscall(SYS_close, s); |
| 55 » » errno = EAGAIN; | 56 errno = EAGAIN; |
| 56 » » return -1; | 57 return -1; |
| 57 » } | 58 } |
| 58 | 59 |
| 59 » pthread_barrier_wait(&args.barrier); | 60 pthread_barrier_wait(&args.barrier); |
| 60 » pthread_barrier_destroy(&args.barrier); | 61 pthread_barrier_destroy(&args.barrier); |
| 61 | 62 |
| 62 » sev2.sigev_notify = SIGEV_THREAD; | 63 sev2.sigev_notify = SIGEV_THREAD; |
| 63 » sev2.sigev_signo = s; | 64 sev2.sigev_signo = s; |
| 64 » sev2.sigev_value.sival_ptr = (void *)&zeros; | 65 sev2.sigev_value.sival_ptr = (void*)&zeros; |
| 65 | 66 |
| 66 » if (syscall(SYS_mq_notify, mqd, &sev2) < 0) { | 67 if (syscall(SYS_mq_notify, mqd, &sev2) < 0) { |
| 67 » » pthread_cancel(td); | 68 pthread_cancel(td); |
| 68 » » __syscall(SYS_close, s); | 69 __syscall(SYS_close, s); |
| 69 » » return -1; | 70 return -1; |
| 70 » } | 71 } |
| 71 | 72 |
| 72 » return 0; | 73 return 0; |
| 73 } | 74 } |
| OLD | NEW |