[PATCH 0/7] rt-tests devel/v0.96

[PATCH 0/7] rt-tests devel/v0.96

[John Kacur]

Nothing too exciting here, mostly small clean-up fixes, and build changes
However, not everything was properly posted to the list, so doing so now.

Please continue to send in any changes for the devel/v0.96

Thanks

John

Clark Williams (3):
  Makefile: add target to create OBJDIR before use
  specfile: add signaltest manpage to files section and remove trailing
    whitespace in changelog
  Makefile: have distclean remove .asc file for tarball

John Kacur (3):
  cyclictest: Clean-ups in timerthread before working on it
  Makefile: OBJDIR should be an order-only-prerequisite
  Makefile: Move TARGETS back to a more logical place in the Makefile

Uwe Kleine-König (1):
  Fix some trivial typos found by codespell(1)

 Makefile                     | 16 +++++++-------
 rt-tests.spec-in             |  3 ++-
 src/cyclictest/cyclictest.c  | 50 +++++++++++++++++++++++++-------------------
 src/pi_tests/classic_pi.c    |  2 +-
 src/pi_tests/pi_stress.c     |  4 ++--
 src/pi_tests/pip_stress.c    |  2 +-
 src/pi_tests/tst-mutexpi10.c |  2 +-
 7 files changed, 45 insertions(+), 34 deletions(-)

-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/7] cyclictest: Clean-ups in timerthread before working on it

[John Kacur]

- Clean this function up a bit before modifying it
	- Don't use assignment in if statements
	- Put spaces before open braces and parentheses
	- Break lines up where possible that go over 80 chars

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 src/cyclictest/cyclictest.c | 50 ++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index b1f99ab22c57..00168e22fc7f 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -785,8 +785,9 @@ static void *timerthread(void *param)
 		CPU_ZERO(&mask);
 		CPU_SET(par->cpu, &mask);
 		thread = pthread_self();
-		if(pthread_setaffinity_np(thread, sizeof(mask), &mask) == -1)
-			warn("Could not set CPU affinity to CPU #%d\n", par->cpu);
+		if (pthread_setaffinity_np(thread, sizeof(mask), &mask) == -1)
+			warn("Could not set CPU affinity to CPU #%d\n",
+			     par->cpu);
 	}
 
 	interval.tv_sec = par->interval / USEC_PER_SEC;
@@ -809,11 +810,12 @@ static void *timerthread(void *param)
 	memset(&schedp, 0, sizeof(schedp));
 	schedp.sched_priority = par->prio;
 	if (setscheduler(0, par->policy, &schedp))
-		fatal("timerthread%d: failed to set priority to %d\n", par->cpu, par->prio);
+		fatal("timerthread%d: failed to set priority to %d\n",
+		      par->cpu, par->prio);
 
 	/* Get current time */
 #ifndef NO_PTHREAD_BARRIER
-	if(aligned || secaligned){
+	if (aligned || secaligned) {
 		pthread_barrier_wait(&globalt_barr);
 		if (par->tnum == 0) {
 			clock_gettime(par->clock, &globalt);
@@ -829,15 +831,14 @@ static void *timerthread(void *param)
 		}
 		pthread_barrier_wait(&align_barr);
 		now = globalt;
-		if(offset) {
+		if (offset) {
 			if (aligned)
 				now.tv_nsec += offset * par->tnum;
 			else
 				now.tv_nsec += offset;
 			tsnorm(&now);
 		}
-	}
-	else
+	} else
 #endif
 		clock_gettime(par->clock, &now);
 
@@ -854,9 +855,8 @@ static void *timerthread(void *param)
 	if (par->mode == MODE_CYCLIC) {
 		if (par->timermode == TIMER_ABSTIME)
 			tspec.it_value = next;
-		else {
+		else
 			tspec.it_value = interval;
-		}
 		timer_settime(timer, par->timermode, &tspec, NULL);
 	}
 
@@ -864,7 +864,7 @@ static void *timerthread(void *param)
 		itimer.it_interval.tv_sec = interval.tv_sec;
 		itimer.it_interval.tv_usec = interval.tv_nsec / 1000;
 		itimer.it_value = itimer.it_interval;
-		setitimer (ITIMER_REAL, &itimer, NULL);
+		setitimer(ITIMER_REAL, &itimer, NULL);
 	}
 
 	stat->threadstarted++;
@@ -884,18 +884,23 @@ static void *timerthread(void *param)
 
 		case MODE_CLOCK_NANOSLEEP:
 			if (par->timermode == TIMER_ABSTIME) {
-				if ((ret = clock_nanosleep(par->clock, TIMER_ABSTIME, &next, NULL))) {
+				ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
+						      &next, NULL);
+				if (ret != 0) {
 					if (ret != EINTR)
 						warn("clock_nanosleep failed. errno: %d\n", errno);
 					goto out;
 				}
 			} else {
-				if ((ret = clock_gettime(par->clock, &now))) {
+				ret = clock_gettime(par->clock, &now);
+				if (ret != 0) {
 					if (ret != EINTR)
 						warn("clock_gettime() failed: %s", strerror(errno));
 					goto out;
 				}
-				if ((ret = clock_nanosleep(par->clock, TIMER_RELTIME, &interval, NULL))) {
+				ret = clock_nanosleep(par->clock,
+					TIMER_RELTIME, &interval, NULL);
+				if (ret != 0) {
 					if (ret != EINTR)
 						warn("clock_nanosleep() failed. errno: %d\n", errno);
 					goto out;
@@ -907,14 +912,16 @@ static void *timerthread(void *param)
 			break;
 
 		case MODE_SYS_NANOSLEEP:
-			if ((ret = clock_gettime(par->clock, &now))) {
+			ret = clock_gettime(par->clock, &now);
+			if (ret != 0) {
 				if (ret != EINTR)
 					warn("clock_gettime() failed: errno %d\n", errno);
 				goto out;
 			}
 			if (nanosleep(&interval, NULL)) {
 				if (errno != EINTR)
-					warn("nanosleep failed. errno: %d\n", errno);
+					warn("nanosleep failed. errno: %d\n",
+					     errno);
 				goto out;
 			}
 			next.tv_sec = now.tv_sec + interval.tv_sec;
@@ -922,10 +929,11 @@ static void *timerthread(void *param)
 			tsnorm(&next);
 			break;
 		}
-
-		if ((ret = clock_gettime(par->clock, &now))) {
+		ret = clock_gettime(par->clock, &now);
+		if (ret != 0) {
 			if (ret != EINTR)
-				warn("clock_getttime() failed. errno: %d\n", errno);
+				warn("clock_getttime() failed. errno: %d\n",
+				     errno);
 			goto out;
 		}
 
@@ -968,9 +976,9 @@ static void *timerthread(void *param)
 				stat->hist_overflow++;
 				if (stat->num_outliers < histogram)
 					stat->outliers[stat->num_outliers++] = stat->cycles;
-			}
-			else
+			} else {
 				stat->hist_array[diff]++;
+			}
 		}
 
 		stat->cycles++;
@@ -1003,7 +1011,7 @@ out:
 		itimer.it_value.tv_usec = 0;
 		itimer.it_interval.tv_sec = 0;
 		itimer.it_interval.tv_usec = 0;
-		setitimer (ITIMER_REAL, &itimer, NULL);
+		setitimer(ITIMER_REAL, &itimer, NULL);
 	}
 
 	/* switch to normal */
-- 
2.4.3

[PATCH 2/7] Fix some trivial typos found by codespell(1)

[John Kacur]

From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Inheritence ==> Inheritance
occured ==> occurred
surpress ==> suppress

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 src/pi_tests/classic_pi.c    | 2 +-
 src/pi_tests/pi_stress.c     | 4 ++--
 src/pi_tests/pip_stress.c    | 2 +-
 src/pi_tests/tst-mutexpi10.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pi_tests/classic_pi.c b/src/pi_tests/classic_pi.c
index 59e907bc98cc..695ee4c4bd03 100644
--- a/src/pi_tests/classic_pi.c
+++ b/src/pi_tests/classic_pi.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
    USA */
 
-/* This program tests Priority Inheritence mutexes and their ability
+/* This program tests Priority Inheritance mutexes and their ability
    to avoid Priority Inversion deadlocks
   
    The basic premise here is to set up a deadlock scenario and confirm that PI
diff --git a/src/pi_tests/pi_stress.c b/src/pi_tests/pi_stress.c
index a4e6e3df1a3d..a02f70629aa4 100644
--- a/src/pi_tests/pi_stress.c
+++ b/src/pi_tests/pi_stress.c
@@ -132,7 +132,7 @@ unsigned long report_interval = (unsigned long)SEC_TO_USEC(0.75);
 int shutdown = 0;		/* global indicating we should shut down */
 pthread_mutex_t shutdown_mtx;	/* associated mutex */
 
-/* indicate if errors have occured */
+/* indicate if errors have occurred */
 int have_errors = 0;
 
 /* indicated that keyboard interrupt has happened */
@@ -1025,7 +1025,7 @@ void usage(void)
 	printf("usage: pi_stress <options>\n");
 	printf("    options:\n");
 	printf("\t--verbose\t- lots of output\n");
-	printf("\t--quiet\t\t- surpress running output\n");
+	printf("\t--quiet\t\t- suppress running output\n");
 	printf
 	    ("\t--duration=<n>- length of the test run in seconds [infinite]\n");
 	printf("\t--groups=<n>\t- set the number of inversion groups [%d]\n",
diff --git a/src/pi_tests/pip_stress.c b/src/pi_tests/pip_stress.c
index 812a7030aa9d..a0477cc2a35d 100644
--- a/src/pi_tests/pip_stress.c
+++ b/src/pi_tests/pip_stress.c
@@ -64,7 +64,7 @@ useconds_t usleep_val = 500;
 
 pthread_mutex_t *resource;
 
-/* This records the state to determine whether a priority inversion occured */
+/* This records the state to determine whether a priority inversion occurred */
 struct State {
 	int low_owns_resource;
 	int high_started;
diff --git a/src/pi_tests/tst-mutexpi10.c b/src/pi_tests/tst-mutexpi10.c
index 0244b4a7a7c1..a63ea23ba621 100644
--- a/src/pi_tests/tst-mutexpi10.c
+++ b/src/pi_tests/tst-mutexpi10.c
@@ -21,7 +21,7 @@
    Boston, MA 02111-1307, USA.  */
 
 
-/* This program tests Priority Inheritence mutexes and their ability
+/* This program tests Priority Inheritance mutexes and their ability
    to avoid Priority Inversion deadlocks
   
    The basic premise here is to set up a deadlock scenario and confirm that PI
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/7] Makefile: add target to create OBJDIR before use

[John Kacur]

From: Clark Williams <williams@redhat.com>

Signed-off-by: Clark Williams <williams@redhat.com>
Signed-off-by: John Kacur <jkacur@redhat.com>
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5d7a23e6bbfd..1c3ae50030d6 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,10 @@ $(OBJDIR)/%.d: %.c
 	@$(CC) -MM $(CFLAGS) $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@ || rm -f $@
 
 .PHONY: all
-all: $(TARGETS) hwlatdetect
+all: $(OBJDIR) $(TARGETS) hwlatdetect
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
 
 # Include dependency files, automatically generate them if needed.
 -include $(addprefix $(OBJDIR)/,$(sources:.c=.d))
-- 
2.4.3

[PATCH 4/7] Makefile: OBJDIR should be an order-only-prerequisite

[John Kacur]

OBJDIR should be an order only prerequisite.
- create the OBJDIR if necessary before .d, .o and before all TARGETS
  including hwlatdetect
- Don't rebuild if the timestamp on the OBJDIR changes

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1c3ae50030d6..37ab159e84f9 100644
--- a/Makefile
+++ b/Makefile
@@ -85,15 +85,15 @@ VPATH	+= src/backfire:
 VPATH	+= src/lib:
 VPATH	+= src/hackbench:
 
-$(OBJDIR)/%.o: %.c
+$(OBJDIR)/%.o: %.c | $(OBJDIR)
 	$(CC) -D VERSION=$(VERSION) -c $< $(CFLAGS) $(CPPFLAGS) -o $@
 
 # Pattern rule to generate dependency files from .c files
-$(OBJDIR)/%.d: %.c
+$(OBJDIR)/%.d: %.c | $(OBJDIR)
 	@$(CC) -MM $(CFLAGS) $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@ || rm -f $@
 
 .PHONY: all
-all: $(OBJDIR) $(TARGETS) hwlatdetect
+all: $(TARGETS) hwlatdetect | $(OBJDIR)
 
 $(OBJDIR):
 	mkdir $(OBJDIR)
-- 
2.4.3

[PATCH 5/7] specfile: add signaltest manpage to files section and remove trailing whitespace in changelog

[John Kacur]

From: Clark Williams <williams@redhat.com>

Signed-off-by: Clark Williams <williams@redhat.com>
Signed-off-by: John Kacur <jkacur@redhat.com>
---
 rt-tests.spec-in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rt-tests.spec-in b/rt-tests.spec-in
index 4ce2d41b978e..25791939ba16 100644
--- a/rt-tests.spec-in
+++ b/rt-tests.spec-in
@@ -66,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man8/svsematest.8.gz
 /usr/share/man/man8/pmqtest.8.gz
 /usr/share/man/man8/hackbench.8.gz
+/usr/share/man/man8/signaltest.8.gz
 
 %changelog
  * Wed Oct 07 2015 John Kacur <jkacur@redhat.com> - 0.95-1
@@ -132,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
   - Change VERSION_STRING to VERSION
   - Create an rt-tests.tar file using git-archive
 
- * Tue Jun 09 2015 John Kacur <jkacur@redhat.com> - 0.92-1 
+ * Tue Jun 09 2015 John Kacur <jkacur@redhat.com> - 0.92-1
 - Anna-Maria Gleixner (2):
   - cyclictest: Convert the offset of the alignment option to microseconds
   - cyclictest: Align measurement threads to the next full second
-- 
2.4.3

Re: [PATCH 5/7] specfile: add signaltest manpage to files section and remove trailing whitespace in changelog

[Uwe Kleine-König]

Hello John,

On Wed, Oct 14, 2015 at 03:32:16PM +0200, John Kacur wrote:
> From: Clark Williams <williams@redhat.com>
> 
> Signed-off-by: Clark Williams <williams@redhat.com>
> Signed-off-by: John Kacur <jkacur@redhat.com>
> ---
>  rt-tests.spec-in | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

huh, where is the manpage?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/7] specfile: add signaltest manpage to files section and remove trailing whitespace in changelog

[Uwe Kleine-König]

On Thu, Oct 15, 2015 at 10:52:15AM +0200, Uwe Kleine-König wrote:
> Hello John,
> 
> On Wed, Oct 14, 2015 at 03:32:16PM +0200, John Kacur wrote:
> > From: Clark Williams <williams@redhat.com>
> > 
> > Signed-off-by: Clark Williams <williams@redhat.com>
> > Signed-off-by: John Kacur <jkacur@redhat.com>
> > ---
> >  rt-tests.spec-in | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> huh, where is the manpage?

ah, noticed that I skipped reading "to files section" in the subject. So
please ignore the noise.

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 6/7] Makefile: have distclean remove .asc file for tarball

[John Kacur]

From: Clark Williams <williams@redhat.com>

Signed-off-by: Clark Williams <williams@redhat.com>
Signed-off-by: John Kacur <jkacur@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 37ab159e84f9..563911d5f6da 100644
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,7 @@ clean:
 RPMDIRS = BUILD BUILDROOT RPMS SRPMS SPECS
 .PHONY: distclean
 distclean: clean
-	rm -rf $(RPMDIRS) releases *.tar.gz rt-tests.spec tmp
+	rm -rf $(RPMDIRS) releases *.tar.gz *.tar.asc rt-tests.spec tmp
 
 .PHONY: rebuild
 rebuild:
-- 
2.4.3

[PATCH 7/7] Makefile: Move TARGETS back to a more logical place in the Makefile

[John Kacur]

Place TARGETS after sources. The evaluation of it doesn't depend on it's
position in the file, so remove the incorrect comment

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 563911d5f6da..703333fe1b42 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ sources = cyclictest.c \
 	  sigwaittest.c \
 	  svsematest.c
 
+TARGETS = $(sources:.c=)
 LIBS	= -lrt -lpthread
 RTTESTLIB = -lrttest -L$(OBJDIR)
 EXTRA_LIBS ?= -ldl	# for get_cpu
@@ -68,10 +69,8 @@ ifdef HAVE_PARSE_CPUSTRING_ALL
 endif
 endif
 
-# Include any arch specific makefiles here. Make sure that TARGETS aren't
-# evaluated until AFTER this include
+# Include any arch specific makefiles here.
 include src/arch/bionic/Makefile
-TARGETS = $(sources:.c=)
 
 VPATH	= src/cyclictest:
 VPATH	+= src/signaltest:
-- 
2.4.3