From 15cc2f5364888cbcf270cfa814628a9127d06bfa Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 7 Aug 2017 12:49:44 +0000 Subject: [PATCH] Make sysent_shorthand_defs.h suitable for tests * sysent_shorthand_defs.h [STRACE_TESTS_H]: Add shorthand notations from tests/ksysent.c and tests/nsyscalls.c. * tests/ksysent.c: Remove shorthand notations. * tests/nsyscalls.c: Likewise. --- sysent_shorthand_defs.h | 66 ++++++++++++++++++++++++++++----------- sysent_shorthand_undefs.h | 2 +- tests/ksysent.c | 23 ++------------ tests/nsyscalls.c | 23 ++------------ 4 files changed, 54 insertions(+), 60 deletions(-) diff --git a/sysent_shorthand_defs.h b/sysent_shorthand_defs.h index 52b591c3..911fc33d 100644 --- a/sysent_shorthand_defs.h +++ b/sysent_shorthand_defs.h @@ -1,19 +1,47 @@ -#define TD TRACE_DESC -#define TF TRACE_FILE -#define TI TRACE_IPC -#define TN TRACE_NETWORK -#define TP TRACE_PROCESS -#define TS TRACE_SIGNAL -#define TM TRACE_MEMORY -#define TST TRACE_STAT -#define TLST TRACE_LSTAT -#define TFST TRACE_FSTAT -#define TSTA TRACE_STAT_LIKE -#define TSF TRACE_STATFS -#define TFSF TRACE_FSTATFS -#define TSFA TRACE_STATFS_LIKE -#define NF SYSCALL_NEVER_FAILS -#define MA MAX_ARGS -#define SI STACKTRACE_INVALIDATE_CACHE -#define SE STACKTRACE_CAPTURE_ON_ENTER -#define CST COMPAT_SYSCALL_TYPES +#ifdef STRACE_TESTS_H + +# define TD 0 +# define TF 0 +# define TI 0 +# define TN 0 +# define TP 0 +# define TS 0 +# define TM 0 +# define TST 0 +# define TLST 0 +# define TFST 0 +# define TSTA 0 +# define TSF 0 +# define TFSF 0 +# define TSFA 0 +# define NF 0 +# define MA 0 +# define SI 0 +# define SE 0 +# define CST 0 +# define SEN(a) 0, 0 + +#else /* !STRACE_TESTS_H */ + +# define TD TRACE_DESC +# define TF TRACE_FILE +# define TI TRACE_IPC +# define TN TRACE_NETWORK +# define TP TRACE_PROCESS +# define TS TRACE_SIGNAL +# define TM TRACE_MEMORY +# define TST TRACE_STAT +# define TLST TRACE_LSTAT +# define TFST TRACE_FSTAT +# define TSTA TRACE_STAT_LIKE +# define TSF TRACE_STATFS +# define TFSF TRACE_FSTATFS +# define TSFA TRACE_STATFS_LIKE +# define NF SYSCALL_NEVER_FAILS +# define MA MAX_ARGS +# define SI STACKTRACE_INVALIDATE_CACHE +# define SE STACKTRACE_CAPTURE_ON_ENTER +# define CST COMPAT_SYSCALL_TYPES +/* SEN(a) is defined elsewhere */ + +#endif diff --git a/sysent_shorthand_undefs.h b/sysent_shorthand_undefs.h index d44dc88c..5232b648 100644 --- a/sysent_shorthand_undefs.h +++ b/sysent_shorthand_undefs.h @@ -1,4 +1,3 @@ -#undef SEN #undef TD #undef TF #undef TI @@ -18,3 +17,4 @@ #undef SI #undef SE #undef CST +#undef SEN diff --git a/tests/ksysent.c b/tests/ksysent.c index 860e21e4..7e25def4 100644 --- a/tests/ksysent.c +++ b/tests/ksysent.c @@ -34,31 +34,14 @@ #include #include -#define TD 0 -#define TF 0 -#define TI 0 -#define TN 0 -#define TP 0 -#define TS 0 -#define TM 0 -#define TST 0 -#define TLST 0 -#define TFST 0 -#define TSTA 0 -#define TSF 0 -#define TFSF 0 -#define TSFA 0 -#define NF 0 -#define MA 0 -#define SI 0 -#define SE 0 -#define CST 0 -#define SEN(arg) 0, 0 +#include "sysent_shorthand_defs.h" static const struct_sysent syscallent[] = { #include "syscallent.h" }; +#include "sysent_shorthand_undefs.h" + typedef const char *pstr_t; static const pstr_t ksyslist[] = { #include "ksysent.h" diff --git a/tests/nsyscalls.c b/tests/nsyscalls.c index d6b989c4..29f444a2 100644 --- a/tests/nsyscalls.c +++ b/tests/nsyscalls.c @@ -35,31 +35,14 @@ #include #include -#define TD 0 -#define TF 0 -#define TI 0 -#define TN 0 -#define TP 0 -#define TS 0 -#define TM 0 -#define TST 0 -#define TLST 0 -#define TFST 0 -#define TSTA 0 -#define TSF 0 -#define TFSF 0 -#define TSFA 0 -#define NF 0 -#define MA 0 -#define SI 0 -#define SE 0 -#define CST 0 -#define SEN(arg) 0, 0 +#include "sysent_shorthand_defs.h" static const struct_sysent syscallent[] = { #include "syscallent.h" }; +#include "sysent_shorthand_undefs.h" + #if defined __X32_SYSCALL_BIT && defined __NR_read \ && (__X32_SYSCALL_BIT & __NR_read) != 0 # define SYSCALL_BIT __X32_SYSCALL_BIT -- 2.40.0