diff options
author | Daniel Wagner <dwagner@suse.de> | 2020-11-19 16:55:30 +0100 |
---|---|---|
committer | John Kacur <jkacur@redhat.com> | 2021-02-16 20:08:00 -0500 |
commit | 07445ec798c588d5b80b7812cd8947c3697dcf82 (patch) | |
tree | bcdbd1fb4fa9289a32c5fbe612d68e9416c3c832 | |
parent | af0a1e97581308223424314a51929d381503e7f9 (diff) | |
download | rt-tests-07445ec798c588d5b80b7812cd8947c3697dcf82.tar.gz |
rt-tests: Rename error.h to rt-error.h
Avoid confusion with the system header called error.h.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
- Fixed a conflict in cyclictest.c
- Fixed up rt_numa.h
Signed-off-by: John Kacur <jkacur@redhat.com>
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | src/cyclictest/cyclictest.c | 1 | ||||
-rw-r--r-- | src/cyclictest/rt_numa.h | 2 | ||||
-rw-r--r-- | src/include/pip_stress.h | 5 | ||||
-rw-r--r-- | src/include/rt-error.h (renamed from src/include/error.h) | 0 | ||||
-rw-r--r-- | src/lib/rt-error.c (renamed from src/lib/error.c) | 2 | ||||
-rw-r--r-- | src/lib/rt-numa.c | 2 | ||||
-rw-r--r-- | src/lib/rt-utils.c | 3 | ||||
-rw-r--r-- | src/oslat/oslat.c | 2 | ||||
-rw-r--r-- | src/pi_tests/pi_stress.c | 3 | ||||
-rw-r--r-- | src/pmqtest/pmqtest.c | 6 | ||||
-rw-r--r-- | src/ptsematest/ptsematest.c | 6 | ||||
-rw-r--r-- | src/sched_deadline/cyclicdeadline.c | 6 | ||||
-rw-r--r-- | src/signaltest/signaltest.c | 2 | ||||
-rw-r--r-- | src/sigwaittest/sigwaittest.c | 2 | ||||
-rw-r--r-- | src/svsematest/svsematest.c | 3 |
16 files changed, 25 insertions, 22 deletions
@@ -177,7 +177,7 @@ oslat: $(OBJDIR)/oslat.o $(OBJDIR)/librttest.a $(OBJDIR)/librttestnuma.a %.8.bz2: %.8 bzip2 -c $< > $@ -LIBOBJS =$(addprefix $(OBJDIR)/,error.o rt-get_cpu.o rt-sched.o rt-utils.o) +LIBOBJS =$(addprefix $(OBJDIR)/,rt-error.o rt-get_cpu.o rt-sched.o rt-utils.o) $(OBJDIR)/librttest.a: $(LIBOBJS) $(AR) rcs $@ $^ diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c index 99846e7..6c0fc5d 100644 --- a/src/cyclictest/cyclictest.c +++ b/src/cyclictest/cyclictest.c @@ -37,6 +37,7 @@ #include "rt-utils.h" #include "rt-numa.h" +#include "rt-error.h" #include <bionic.h> diff --git a/src/cyclictest/rt_numa.h b/src/cyclictest/rt_numa.h index 8d02f41..87f5d3b 100644 --- a/src/cyclictest/rt_numa.h +++ b/src/cyclictest/rt_numa.h @@ -11,7 +11,7 @@ #define _RT_NUMA_H #include "rt-utils.h" -#include "error.h" +#include "rt-error.h" #include <numa.h> diff --git a/src/include/pip_stress.h b/src/include/pip_stress.h index ee8b545..f03aaf3 100644 --- a/src/include/pip_stress.h +++ b/src/include/pip_stress.h @@ -14,8 +14,9 @@ #include <sys/wait.h> #include <signal.h> #include <sched.h> -#include <rt-utils.h> -#include "error.h" + +#include "rt-utils.h" +#include "rt-error.h" void low(pid_t pid); /* low priority process */ void medium(void); /* medium priority process */ diff --git a/src/include/error.h b/src/include/rt-error.h index d205e49..d205e49 100644 --- a/src/include/error.h +++ b/src/include/rt-error.h diff --git a/src/lib/error.c b/src/lib/rt-error.c index 4434a84..616f70b 100644 --- a/src/lib/error.c +++ b/src/lib/rt-error.c @@ -5,7 +5,7 @@ * error routines, similar to those found in * Advanced Programming in the UNIX Environment 2nd ed. */ -#include "error.h" +#include "rt-error.h" /* Print an error message, plus a message for err and exit with error err */ void err_exit(int err, char *fmt, ...) diff --git a/src/lib/rt-numa.c b/src/lib/rt-numa.c index 33fddba..dbeaef6 100644 --- a/src/lib/rt-numa.c +++ b/src/lib/rt-numa.c @@ -10,7 +10,7 @@ #include <sched.h> #include <pthread.h> -#include "error.h" +#include "rt-error.h" #include "rt-numa.h" /* numa_available() must be called before any other calls to the numa library */ diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c index 2d68d62..321a11b 100644 --- a/src/lib/rt-utils.c +++ b/src/lib/rt-utils.c @@ -20,9 +20,10 @@ #include <sys/stat.h> #include <unistd.h> #include <sys/syscall.h> /* For SYS_gettid definitions */ + #include "rt-utils.h" #include "rt-sched.h" -#include "error.h" +#include "rt-error.h" #define TRACEBUFSIZ 1024 diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c index 2a3be39..0c2fce4 100644 --- a/src/oslat/oslat.c +++ b/src/oslat/oslat.c @@ -43,7 +43,7 @@ #include "rt-utils.h" #include "rt-numa.h" -#include "error.h" +#include "rt-error.h" #ifdef __GNUC__ # define atomic_inc(ptr) __sync_add_and_fetch((ptr), 1) diff --git a/src/pi_tests/pi_stress.c b/src/pi_tests/pi_stress.c index 538d12c..49f89b7 100644 --- a/src/pi_tests/pi_stress.c +++ b/src/pi_tests/pi_stress.c @@ -47,8 +47,7 @@ #include "rt-sched.h" #include "rt-utils.h" - -#include "error.h" +#include "rt-error.h" /* test timeout */ #define TIMEOUT 2 diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c index 5f7a24d..349b477 100644 --- a/src/pmqtest/pmqtest.c +++ b/src/pmqtest/pmqtest.c @@ -21,11 +21,11 @@ #include <linux/unistd.h> #include <utmpx.h> #include <mqueue.h> +#include <pthread.h> + #include "rt-utils.h" #include "rt-get_cpu.h" -#include "error.h" - -#include <pthread.h> +#include "rt-error.h" #define SYNCMQ_NAME "/syncmsg%d" #define TESTMQ_NAME "/testmsg%d" diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c index f8f0755..7d4ca97 100644 --- a/src/ptsematest/ptsematest.c +++ b/src/ptsematest/ptsematest.c @@ -19,11 +19,11 @@ #include <sys/mman.h> #include <linux/unistd.h> #include <utmpx.h> +#include <pthread.h> + #include "rt-utils.h" #include "rt-get_cpu.h" -#include "error.h" - -#include <pthread.h> +#include "rt-error.h" enum { AFFINITY_UNSPECIFIED, diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c index 6dcfd60..71cde57 100644 --- a/src/sched_deadline/cyclicdeadline.c +++ b/src/sched_deadline/cyclicdeadline.c @@ -30,9 +30,9 @@ #include <linux/unistd.h> #include <linux/magic.h> -#include <rt-utils.h> -#include <rt-sched.h> -#include <error.h> +#include "rt-utils.h" +#include "rt-sched.h" +#include "rt-error.h" #define _STR(x) #x #define STR(x) _STR(x) diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c index b3a82f8..d2b90d9 100644 --- a/src/signaltest/signaltest.c +++ b/src/signaltest/signaltest.c @@ -31,7 +31,7 @@ #include <sys/time.h> #include <sys/mman.h> -#include "error.h" +#include "rt-error.h" #include "rt-utils.h" #include "rt-numa.h" diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c index 7e287bd..f10c249 100644 --- a/src/sigwaittest/sigwaittest.c +++ b/src/sigwaittest/sigwaittest.c @@ -42,7 +42,7 @@ #include "rt-utils.h" #include "rt-get_cpu.h" -#include "error.h" +#include "rt-error.h" enum { AFFINITY_UNSPECIFIED, diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c index 7388efb..7a298e0 100644 --- a/src/svsematest/svsematest.c +++ b/src/svsematest/svsematest.c @@ -28,9 +28,10 @@ #include <sys/sem.h> #include <sys/time.h> #include <sys/mman.h> + #include "rt-utils.h" #include "rt-get_cpu.h" -#include "error.h" +#include "rt-error.h" #define SEM_WAIT_FOR_RECEIVER 0 #define SEM_WAIT_FOR_SENDER 1 |