/*
* Copyright (c) 2003, 2004 Ulrich Drepper <drepper@redhat.com>
- * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2005-2016 Dmitry V. Levin <ldv@altlinux.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "defs.h"
-#include <signal.h>
+#include DEF_MPERS_TYPE(struct_sigevent)
+#include "sigevent.h"
+#include MPERS_DEFS
+#include <signal.h>
#include "xlat/sigev_value.h"
-#if SUPPORTED_PERSONALITIES > 1
-static void
-printsigevent32(struct tcb *tcp, long arg)
+MPERS_PRINTER_DECL(void, print_sigevent,
+ struct tcb *const tcp, const kernel_ulong_t addr)
{
- struct {
- int sigev_value;
- int sigev_signo;
- int sigev_notify;
+ struct_sigevent sev;
- union {
- int tid;
- struct {
- int function, attribute;
- } thread;
- } un;
- } sev;
+ if (umove_or_printaddr(tcp, addr, &sev))
+ return;
- if (!umove_or_printaddr(tcp, arg, &sev)) {
- tprintf("{%#x, ", sev.sigev_value);
- if (sev.sigev_notify == SIGEV_SIGNAL)
- tprintf("%s, ", signame(sev.sigev_signo));
- else
- tprintf("%u, ", sev.sigev_signo);
- printxval(sigev_value, sev.sigev_notify, "SIGEV_???");
- tprints(", ");
- if (sev.sigev_notify == SIGEV_THREAD_ID)
- tprintf("{%d}", sev.un.tid);
- else if (sev.sigev_notify == SIGEV_THREAD)
- tprintf("{%#x, %#x}",
- sev.un.thread.function,
- sev.un.thread.attribute);
- else
- tprints("{...}");
- tprints("}");
+ tprints("{");
+ if (sev.sigev_value.sival_ptr) {
+ tprintf("sigev_value={sival_int=%d, sival_ptr=",
+ sev.sigev_value.sival_int);
+ printaddr(sev.sigev_value.sival_ptr);
+ tprints("}, ");
}
-}
-#endif
-void
-printsigevent(struct tcb *tcp, long arg)
-{
- struct sigevent sev;
-
-#if SUPPORTED_PERSONALITIES > 1
- if (current_wordsize == 4) {
- printsigevent32(tcp, arg);
- return;
+ tprints("sigev_signo=");
+ switch (sev.sigev_notify) {
+ case SIGEV_SIGNAL:
+ case SIGEV_THREAD:
+ case SIGEV_THREAD_ID:
+ tprints(signame(sev.sigev_signo));
+ break;
+ default:
+ tprintf("%u", sev.sigev_signo);
}
-#endif
- if (!umove_or_printaddr(tcp, arg, &sev)) {
- tprintf("{%p, ", sev.sigev_value.sival_ptr);
- if (sev.sigev_notify == SIGEV_SIGNAL)
- tprintf("%s, ", signame(sev.sigev_signo));
- else
- tprintf("%u, ", sev.sigev_signo);
- printxval(sigev_value, sev.sigev_notify, "SIGEV_???");
- tprints(", ");
- if (sev.sigev_notify == SIGEV_THREAD_ID)
-#if defined(HAVE_STRUCT_SIGEVENT__SIGEV_UN__PAD)
- /* _pad[0] is the _tid field which might not be
- present in the userlevel definition of the
- struct. */
- tprintf("{%d}", sev._sigev_un._pad[0]);
-#elif defined(HAVE_STRUCT_SIGEVENT___PAD)
- tprintf("{%d}", sev.__pad[0]);
-#else
-# warning unfamiliar struct sigevent => incomplete SIGEV_THREAD_ID decoding
- tprints("{...}");
-#endif
- else if (sev.sigev_notify == SIGEV_THREAD)
- tprintf("{%p, %p}", sev.sigev_notify_function,
- sev.sigev_notify_attributes);
- else
- tprints("{...}");
- tprints("}");
+
+ tprints(", sigev_notify=");
+ printxval(sigev_value, sev.sigev_notify, "SIGEV_???");
+
+ switch (sev.sigev_notify) {
+ case SIGEV_THREAD_ID:
+ tprintf(", sigev_notify_thread_id=%d", sev.sigev_un.tid);
+ break;
+ case SIGEV_THREAD:
+ tprints(", sigev_notify_function=");
+ printaddr(sev.sigev_un.sigev_thread.function);
+ tprints(", sigev_notify_attributes=");
+ printaddr(sev.sigev_un.sigev_thread.attribute);
+ break;
}
+ tprints("}");
}