diff options
author | Abdiel Janulgue <abdiel.janulgue@linux.intel.com> | 2016-11-16 21:38:20 +0200 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-11-29 11:32:44 +0000 |
commit | d529a5748f28bafd2aa74a1166e391c9468bf49d (patch) | |
tree | f16821dc6c578379ac7f685bbeba43433cba1cd5 | |
parent | f2428552bbc43f8aa5714554b6cdf162d21e5303 (diff) |
lib: Make signal helper definitions reusable
Lots of test cases are re-declaring this.
v2: Remove definition in benchmarks/gem_syslatency.c
Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
-rw-r--r-- | benchmarks/gem_syslatency.c | 4 | ||||
-rw-r--r-- | lib/igt_aux.c | 11 | ||||
-rw-r--r-- | lib/igt_aux.h | 10 | ||||
-rw-r--r-- | lib/igt_core.c | 3 | ||||
-rw-r--r-- | tests/drv_hangman.c | 1 |
5 files changed, 10 insertions, 19 deletions
diff --git a/benchmarks/gem_syslatency.c b/benchmarks/gem_syslatency.c index 6cad3a05..83bfac78 100644 --- a/benchmarks/gem_syslatency.c +++ b/benchmarks/gem_syslatency.c @@ -133,10 +133,6 @@ static void *gem_busyspin(void *arg) return NULL; } -#define MSEC_PER_SEC (1000) -#define USEC_PER_SEC (1000 * MSEC_PER_SEC) -#define NSEC_PER_SEC (1000 * USEC_PER_SEC) - static double elapsed(const struct timespec *a, const struct timespec *b) { return 1e9*(b->tv_sec - a->tv_sec) + (b->tv_nsec - a ->tv_nsec); diff --git a/lib/igt_aux.c b/lib/igt_aux.c index 421f6d4e..b5ae8543 100644 --- a/lib/igt_aux.c +++ b/lib/igt_aux.c @@ -75,17 +75,6 @@ * fit into any other topic. */ - -/* signal interrupt helpers */ - -#define MSEC_PER_SEC (1000) -#define USEC_PER_SEC (1000*MSEC_PER_SEC) -#define NSEC_PER_SEC (1000*USEC_PER_SEC) - -/* signal interrupt helpers */ -#define gettid() syscall(__NR_gettid) -#define sigev_notify_thread_id _sigev_un._tid - static struct __igt_sigiter_global { pid_t tid; timer_t timer; diff --git a/lib/igt_aux.h b/lib/igt_aux.h index d30196b9..d4da499a 100644 --- a/lib/igt_aux.h +++ b/lib/igt_aux.h @@ -35,6 +35,16 @@ extern drm_intel_bo **trash_bos; extern int num_trash_bos; +/* signal interrupt helpers */ + +#define MSEC_PER_SEC (1000) +#define USEC_PER_SEC (1000*MSEC_PER_SEC) +#define NSEC_PER_SEC (1000*USEC_PER_SEC) + +/* signal interrupt helpers */ +#define gettid() syscall(__NR_gettid) +#define sigev_notify_thread_id _sigev_un._tid + /* auxialiary igt helpers from igt_aux.c */ /* generally useful helpers */ void igt_fork_signal_helper(void); diff --git a/lib/igt_core.c b/lib/igt_core.c index 9cd5f98d..f64c809a 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -398,9 +398,6 @@ error: return -errno; } -#define MSEC_PER_SEC (1000) -#define USEC_PER_SEC (1000*MSEC_PER_SEC) -#define NSEC_PER_SEC (1000*USEC_PER_SEC) uint64_t igt_nsec_elapsed(struct timespec *start) { struct timespec now; diff --git a/tests/drv_hangman.c b/tests/drv_hangman.c index f80d65d7..db0a0778 100644 --- a/tests/drv_hangman.c +++ b/tests/drv_hangman.c @@ -293,7 +293,6 @@ static void test_error_state_capture(unsigned ring_id, * case and it takes a lot more time to wrap, so the acthd can potentially keep * increasing for a long time */ -#define NSEC_PER_SEC 1000000000LL static void hangcheck_unterminated(void) { int fd; |