Move parser of struct sigevent to a separate file
* print_sigevent.c: New file. * Makefile.am (strace_SOURCES): Add it. * time.c (printsigevent32, printsigevent): Move to print_sigevent.c.
This commit is contained in:
parent
644a8093a2
commit
d6b0558ad6
@ -100,6 +100,7 @@ strace_SOURCES = \
|
||||
prctl.c \
|
||||
print_mq_attr.c \
|
||||
print_msgbuf.c \
|
||||
print_sigevent.c \
|
||||
print_time.c \
|
||||
printmode.c \
|
||||
printrusage.c \
|
||||
|
||||
111
print_sigevent.c
Normal file
111
print_sigevent.c
Normal file
@ -0,0 +1,111 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2004 Ulrich Drepper <drepper@redhat.com>
|
||||
* Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "defs.h"
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
#include "xlat/sigev_value.h"
|
||||
|
||||
#if SUPPORTED_PERSONALITIES > 1
|
||||
static void
|
||||
printsigevent32(struct tcb *tcp, long arg)
|
||||
{
|
||||
struct {
|
||||
int sigev_value;
|
||||
int sigev_signo;
|
||||
int sigev_notify;
|
||||
|
||||
union {
|
||||
int tid;
|
||||
struct {
|
||||
int function, attribute;
|
||||
} thread;
|
||||
} un;
|
||||
} sev;
|
||||
|
||||
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("}");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
printsigevent(struct tcb *tcp, long arg)
|
||||
{
|
||||
struct sigevent sev;
|
||||
|
||||
#if SUPPORTED_PERSONALITIES > 1
|
||||
if (current_wordsize == 4) {
|
||||
printsigevent32(tcp, arg);
|
||||
return;
|
||||
}
|
||||
#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("}");
|
||||
}
|
||||
}
|
||||
80
time.c
80
time.c
@ -509,86 +509,6 @@ SYS_FUNC(clock_adjtime)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#include "xlat/sigev_value.h"
|
||||
|
||||
#if SUPPORTED_PERSONALITIES > 1
|
||||
static void
|
||||
printsigevent32(struct tcb *tcp, long arg)
|
||||
{
|
||||
struct {
|
||||
int sigev_value;
|
||||
int sigev_signo;
|
||||
int sigev_notify;
|
||||
|
||||
union {
|
||||
int tid;
|
||||
struct {
|
||||
int function, attribute;
|
||||
} thread;
|
||||
} un;
|
||||
} sev;
|
||||
|
||||
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("}");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
printsigevent(struct tcb *tcp, long arg)
|
||||
{
|
||||
struct sigevent sev;
|
||||
|
||||
#if SUPPORTED_PERSONALITIES > 1
|
||||
if (current_wordsize == 4) {
|
||||
printsigevent32(tcp, arg);
|
||||
return;
|
||||
}
|
||||
#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("}");
|
||||
}
|
||||
}
|
||||
|
||||
SYS_FUNC(timer_create)
|
||||
{
|
||||
if (entering(tcp)) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user