From: Daniel Wagner <dwagner@suse.de>
To: Clark Williams <williams@redhat.com>, John Kacur <jkacur@redhat.com>
Cc: linux-rt-users@vger.kernel.org, Daniel Wagner <dwagner@suse.de>
Subject: [RFC v2 1/6] rt-tests: Rename error.h to rt-error.h
Date: Mon, 11 Jan 2021 18:33:46 +0100 [thread overview]
Message-ID: <20210111173351.4971-2-dwagner@suse.de> (raw)
In-Reply-To: <20210111173351.4971-1-dwagner@suse.de>
Avoid confusion with the system header called error.h.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
src/cyclictest/cyclictest.c | 2 +-
src/include/pip_stress.h | 5 +++--
src/include/{error.h => rt-error.h} | 0
src/lib/error.c | 2 +-
src/lib/rt-numa.c | 2 +-
src/lib/rt-utils.c | 3 ++-
src/oslat/oslat.c | 2 +-
src/pi_tests/pi_stress.c | 3 +--
src/pmqtest/pmqtest.c | 6 +++---
src/ptsematest/ptsematest.c | 6 +++---
src/signaltest/signaltest.c | 2 +-
src/sigwaittest/sigwaittest.c | 2 +-
src/svsematest/svsematest.c | 3 ++-
13 files changed, 20 insertions(+), 18 deletions(-)
rename src/include/{error.h => rt-error.h} (100%)
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 5c738005f778..9225e52aa982 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -36,7 +36,7 @@
#include "rt-utils.h"
#include "rt-numa.h"
-#include "error.h"
+#include "rt-error.h"
#include <bionic.h>
diff --git a/src/include/pip_stress.h b/src/include/pip_stress.h
index ee8b545ab117..f03aaf397897 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
similarity index 100%
rename from src/include/error.h
rename to src/include/rt-error.h
diff --git a/src/lib/error.c b/src/lib/error.c
index 4434a842da17..616f70b044e0 100644
--- a/src/lib/error.c
+++ b/src/lib/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 04f2e9adb4b1..4a0865715141 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"
int get_available_cpus(struct bitmask *cpumask)
diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c
index 2d68d62cd875..321a11b1172d 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 0811079d9f04..9e6f70600830 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 538d12c975aa..49f89b7b0136 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 5f7a24d55db6..349b47741003 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 2e392299fdc4..e41b8af127da 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/signaltest/signaltest.c b/src/signaltest/signaltest.c
index 5427db7f8d85..c34bc994d886 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 7e287bd2424f..f10c24914d4a 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 7388efb3f488..7a298e0dea8c 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
--
2.29.2
next prev parent reply other threads:[~2021-01-11 17:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 17:33 [RFC v2 0/6] Generate machine-readable output Daniel Wagner
2021-01-11 17:33 ` Daniel Wagner [this message]
2021-01-11 17:33 ` [RFC v2 2/6] cyclictest: Move thread data to struct thread_param Daniel Wagner
2021-01-11 17:33 ` [RFC v2 3/6] signaltest: " Daniel Wagner
2021-01-11 17:33 ` [RFC v2 4/6] rt-utils: Add JSON common header output helper Daniel Wagner
2021-01-11 17:33 ` [RFC v2 5/6] cyclictest: Add JSON output feature Daniel Wagner
2021-01-11 17:33 ` [RFC v2 6/6] signaltest: " Daniel Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210111173351.4971-2-dwagner@suse.de \
--to=dwagner@suse.de \
--cc=jkacur@redhat.com \
--cc=linux-rt-users@vger.kernel.org \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).