[PATCH 00/34] rt-tests fixes and cleanups

[PATCH 00/34] rt-tests fixes and cleanups

[Tommi Rantala]

Hi, various fixes and cleanups to rt-tests, developed on top of the
"unstable/devel/v1.1.1" branch.

Also available here on the devel-11 branch:
https://github.com/rantala/rt-tests

Tommi Rantala (34):
  rt-utils: add cpus_online() helper
  cyclictest: use cpus_online() helper
  cyclictest: always clear stop to avoid -Wmaybe-uninitialized warning
  cyclictest: remove extra argument in warn() and fatal() calls
  cyclictest: fix signed vs unsigned compiler warnings
  cyclictest: fix typo in warn() message
  cyclictest: update --smp help: -n was removed
  cyclictest: adjust whitespace in display_help() output
  cyclictest: use %p for printing void*, and print stack size separately
  cyclictest: use %zd for printing size_t in rt_numa_numa_alloc_onnode()
  cyclictest: max_cpus unused in this variant of
    rt_numa_parse_cpustring()
  cyclictest: fix off-by-one in clocksel check
  cyclictest: check timer_getoverrun() return value for failure
  cyclictest: fix MODE_CYCLIC measurement failure after timer overruns
  cyclictest: param is unused in fifothread()
  cyclictest: normalize next before tsgreater() check
  cyclictest: tsnorm() after adjusting next
  pip_stress: fix missing argument in err_msg() call in
    process_shared_mutex_available()
  pip_stress: getopt.h and long_options[] are unused
  pi_stress: use cpus_online() helper
  pi_stress: use %lu for unsigned long
  pi_stress: add missing argument in pi_error() call
  svsematest: test .mindiff against UINT_MAX
  signaltest: remove unused ARRAY_SIZE macro
  deadline_test: fix stack corruption in setup_ftrace_marker()
  deadline_test: remove unused tid parameter in do_runtime()
  deadline_test: tv_nsec is long
  deadline_test: use %llu for printing unsigned long longs
  cyclicdeadline: fix stack corruption in setup_ftrace_marker()
  cyclicdeadline: remove unused tid parameter from do_runtime()
  cyclicdeadline: avoid signed vs unsigned compiler warnings
  printf format attributes and format string constness in error helpers
  mark unused sighand() parameters with unused attribute
  read-only struct option array constness

 src/backfire/sendme.c                 |  2 +-
 src/cyclictest/cyclictest.c           | 56 ++++++++++++++++++---------------
 src/cyclictest/rt_numa.h              |  4 +--
 src/hackbench/hackbench.c             |  2 +-
 src/include/error.h                   | 16 +++++-----
 src/include/rt-utils.h                |  1 +
 src/lib/error.c                       | 16 +++++-----
 src/lib/rt-utils.c                    | 12 +++++++
 src/pi_tests/classic_pi.c             |  2 +-
 src/pi_tests/pi_stress.c              | 12 +++----
 src/pi_tests/pip_stress.c             |  8 +----
 src/pmqtest/pmqtest.c                 |  4 +--
 src/ptsematest/ptsematest.c           |  4 +--
 src/rt-migrate-test/rt-migrate-test.c |  2 +-
 src/sched_deadline/cyclicdeadline.c   | 14 ++++-----
 src/sched_deadline/deadline_test.c    | 59 +++++++++++++++++------------------
 src/signaltest/signaltest.c           |  6 ++--
 src/sigwaittest/sigwaittest.c         |  4 +--
 src/svsematest/svsematest.c           |  6 ++--
 19 files changed, 120 insertions(+), 110 deletions(-)

-- 
2.9.3

[PATCH 01/34] rt-utils: add cpus_online() helper

[Tommi Rantala]

Add a helper function cpus_online() that returns the count of online CPUs.

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/include/rt-utils.h |  1 +
 src/lib/rt-utils.c     | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/include/rt-utils.h b/src/include/rt-utils.h
index ef0f6ac..d744ded 100644
--- a/src/include/rt-utils.h
+++ b/src/include/rt-utils.h
@@ -23,5 +23,6 @@ const char *policy_to_string(int policy);
 uint32_t string_to_policy(const char *str);
 
 pid_t gettid(void);
+long cpus_online(void);
 
 #endif	/* __RT_UTILS.H */
diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c
index ac6878c..0b1fc1e 100644
--- a/src/lib/rt-utils.c
+++ b/src/lib/rt-utils.c
@@ -320,3 +320,15 @@ pid_t gettid(void)
 {
 	return syscall(SYS_gettid);
 }
+
+long cpus_online(void)
+{
+	long cpus = sysconf(_SC_NPROCESSORS_ONLN);
+
+	if (cpus <= 0)
+		err_msg_n(errno,
+			"WARN: sysconf(_SC_NPROCESSORS_ONLN) returned %ld",
+			cpus);
+
+	return cpus;
+}
-- 
2.9.3

[PATCH 02/34] cyclictest: use cpus_online() helper

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 0912494..b6c2ab7 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -2199,7 +2199,7 @@ int main(int argc, char **argv)
 	sigset_t sigset;
 	int signum = SIGALRM;
 	int mode;
-	int max_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+	int max_cpus = cpus_online();
 	int i, ret = -1;
 	int status;
 
-- 
2.9.3

[PATCH 03/34] cyclictest: always clear stop to avoid -Wmaybe-uninitialized warning

[Tommi Rantala]

src/cyclictest/cyclictest.c: In function 'timerthread':
src/cyclictest/cyclictest.c:427:30: warning: '*((void *)&stop+8)' may be used uninitialized in this function [-Wmaybe-uninitialized]
  diff += ((int) t1.tv_nsec - (int) t2.tv_nsec) / 1000;
                              ^~~~~~~~~~~~~~~~
src/cyclictest/cyclictest.c:978:39: note: '*((void *)&stop+8)' was declared here
  struct timespec now, next, interval, stop;
                                       ^~~~
src/cyclictest/cyclictest.c:426:54: warning: 'stop.tv_sec' may be used uninitialized in this function [-Wmaybe-uninitialized]
  diff = USEC_PER_SEC * (long long)((int) t1.tv_sec - (int) t2.tv_sec);
                                                      ^~~~~~~~~~~~~~~
src/cyclictest/cyclictest.c:978:39: note: 'stop.tv_sec' was declared here
  struct timespec now, next, interval, stop;
                                       ^~~~

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index b6c2ab7..7cd9f29 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1065,8 +1065,8 @@ static void *timerthread(void *param)
 	next.tv_nsec += interval.tv_nsec;
 	tsnorm(&next);
 
+	memset(&stop, 0, sizeof(stop)); /* grrr */
 	if (duration) {
-		memset(&stop, 0, sizeof(stop)); /* grrr */
 		stop = now;
 		stop.tv_sec += duration;
 	}
-- 
2.9.3

[PATCH 04/34] cyclictest: remove extra argument in warn() and fatal() calls

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 7cd9f29..75f1fcd 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -570,14 +570,12 @@ static void debugfs_prepare(void)
 		fatal("could not mount debugfs");
 
 	if (kernelversion >= KV_26_33) {
-		char testname[MAX_PATH];
-
 		fileprefix = get_debugfileprefix();
 		if (!trace_file_exists("tracing_enabled") &&
 		    !trace_file_exists("tracing_on"))
 			warn("tracing_enabled or tracing_on not found\n"
 			    "debug fs not mounted, "
-			    "TRACERs not configured?\n", testname);
+			    "TRACERs not configured?\n");
 	} else
 		fileprefix = procfileprefix;
 }
@@ -1030,7 +1028,7 @@ static void *timerthread(void *param)
 		/* get current smi count to use as base value */
 		if (get_smi_counter(par->msr_fd, &smi_old))
 			fatal("Could not read SMI counter, errno: %d\n",
-				par->cpu, errno);
+				errno);
 	}
 
 	/* Get current time */
@@ -1159,7 +1157,7 @@ static void *timerthread(void *param)
 		if (smi) {
 			if (get_smi_counter(par->msr_fd, &smi_now)) {
 				warn("Could not read SMI counter, errno: %d\n",
-					par->cpu, errno);
+					errno);
 				goto out;
 			}
 			diff_smi = smi_now - smi_old;
-- 
2.9.3

[PATCH 05/34] cyclictest: fix signed vs unsigned compiler warnings

[Tommi Rantala]

src/cyclictest/cyclictest.c: In function 'kernvar':
src/cyclictest/cyclictest.c:357:40: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
    if (write(path, value, sizeofvalue) == sizeofvalue)
                                        ^~
src/cyclictest/cyclictest.c: In function 'raise_soft_prio':
src/cyclictest/cyclictest.c:797:59: warning: signed and unsigned type in conditional expression [-Wsign-compare]
  soft_max = (rlim.rlim_cur == RLIM_INFINITY) ? policy_max : rlim.rlim_cur;
                                                           ^
src/cyclictest/cyclictest.c:798:59: warning: signed and unsigned type in conditional expression [-Wsign-compare]
  hard_max = (rlim.rlim_max == RLIM_INFINITY) ? policy_max : rlim.rlim_max;
                                                           ^

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 75f1fcd..4f94b06 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -354,7 +354,7 @@ static int kernvar(int mode, const char *name, char *value, size_t sizeofvalue)
 				value[got-1] = '\0';
 			}
 		} else if (mode == O_WRONLY) {
-			if (write(path, value, sizeofvalue) == sizeofvalue)
+			if (write(path, value, sizeofvalue) == (ssize_t)sizeofvalue)
 				retval = 0;
 		}
 		close(path);
@@ -792,8 +792,8 @@ static int raise_soft_prio(int policy, const struct sched_param *param)
 		return err;
 	}
 
-	soft_max = (rlim.rlim_cur == RLIM_INFINITY) ? policy_max : rlim.rlim_cur;
-	hard_max = (rlim.rlim_max == RLIM_INFINITY) ? policy_max : rlim.rlim_max;
+	soft_max = (rlim.rlim_cur == RLIM_INFINITY) ? policy_max : (int)rlim.rlim_cur;
+	hard_max = (rlim.rlim_max == RLIM_INFINITY) ? policy_max : (int)rlim.rlim_max;
 
 	if (prio > soft_max && prio <= hard_max) {
 		rlim.rlim_cur = prio;
-- 
2.9.3

[PATCH 06/34] cyclictest: fix typo in warn() message

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 4f94b06..8f7b28c 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1149,7 +1149,7 @@ static void *timerthread(void *param)
 		ret = clock_gettime(par->clock, &now);
 		if (ret != 0) {
 			if (ret != EINTR)
-				warn("clock_getttime() failed. errno: %d\n",
+				warn("clock_gettime() failed. errno: %d\n",
 				     errno);
 			goto out;
 		}
-- 
2.9.3

Re: [PATCH 06/34] cyclictest: fix typo in warn() message

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/cyclictest/cyclictest.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
> index 4f94b06..8f7b28c 100644
> --- a/src/cyclictest/cyclictest.c
> +++ b/src/cyclictest/cyclictest.c
> @@ -1149,7 +1149,7 @@ static void *timerthread(void *param)
>  		ret = clock_gettime(par->clock, &now);
>  		if (ret != 0) {
>  			if (ret != EINTR)
> -				warn("clock_getttime() failed. errno: %d\n",
> +				warn("clock_gettime() failed. errno: %d\n",
>  				     errno);
>  			goto out;
>  		}
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 07/34] cyclictest: update --smp help: -n was removed

[Tommi Rantala]

Update the --smp help, now that -n has been removed.

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 8f7b28c..2630296 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1347,7 +1347,7 @@ static void display_help(int error)
 	       "         --secaligned [USEC] align thread wakeups to the next full second\n"
 	       "                           and apply the optional offset\n"
 	       "-s       --system          use sys_nanosleep and sys_setitimer\n"
-	       "-S       --smp             Standard SMP testing: options -a -t -n and\n"
+	       "-S       --smp             Standard SMP testing: options -a -t and\n"
 	       "                           same priority of all threads\n"
 	       "	--spike=<trigger>  record all spikes > trigger\n"
 	       "	--spike-nodes=[num of nodes]\n"
-- 
2.9.3

Re: [PATCH 07/34] cyclictest: update --smp help: -n was removed

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> Update the --smp help, now that -n has been removed.
> 
> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/cyclictest/cyclictest.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
> index 8f7b28c..2630296 100644
> --- a/src/cyclictest/cyclictest.c
> +++ b/src/cyclictest/cyclictest.c
> @@ -1347,7 +1347,7 @@ static void display_help(int error)
>  	       "         --secaligned [USEC] align thread wakeups to the next full second\n"
>  	       "                           and apply the optional offset\n"
>  	       "-s       --system          use sys_nanosleep and sys_setitimer\n"
> -	       "-S       --smp             Standard SMP testing: options -a -t -n and\n"
> +	       "-S       --smp             Standard SMP testing: options -a -t and\n"
>  	       "                           same priority of all threads\n"
>  	       "	--spike=<trigger>  record all spikes > trigger\n"
>  	       "	--spike-nodes=[num of nodes]\n"
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 08/34] cyclictest: adjust whitespace in display_help() output

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 2630296..0a2cd9e 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1349,8 +1349,8 @@ static void display_help(int error)
 	       "-s       --system          use sys_nanosleep and sys_setitimer\n"
 	       "-S       --smp             Standard SMP testing: options -a -t and\n"
 	       "                           same priority of all threads\n"
-	       "	--spike=<trigger>  record all spikes > trigger\n"
-	       "	--spike-nodes=[num of nodes]\n"
+	       "	 --spike=<trigger> record all spikes > trigger\n"
+	       "	 --spike-nodes=[num of nodes]\n"
 	       "			   These are the maximum number of spikes we can record.\n"
 	       "			   The default is 1024 if not specified\n"
 #ifdef ARCH_HAS_SMI_COUNTER
-- 
2.9.3

Re: [PATCH 08/34] cyclictest: adjust whitespace in display_help() output

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/cyclictest/cyclictest.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
> index 2630296..0a2cd9e 100644
> --- a/src/cyclictest/cyclictest.c
> +++ b/src/cyclictest/cyclictest.c
> @@ -1349,8 +1349,8 @@ static void display_help(int error)
>  	       "-s       --system          use sys_nanosleep and sys_setitimer\n"
>  	       "-S       --smp             Standard SMP testing: options -a -t and\n"
>  	       "                           same priority of all threads\n"
> -	       "	--spike=<trigger>  record all spikes > trigger\n"
> -	       "	--spike-nodes=[num of nodes]\n"
> +	       "	 --spike=<trigger> record all spikes > trigger\n"
> +	       "	 --spike-nodes=[num of nodes]\n"
>  	       "			   These are the maximum number of spikes we can record.\n"
>  	       "			   The default is 1024 if not specified\n"
>  #ifdef ARCH_HAS_SMI_COUNTER
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 09/34] cyclictest: use %p for printing void*, and print stack size separately

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 0a2cd9e..f2747e4 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -2389,8 +2389,9 @@ int main(int argc, char **argv)
 
 			/* set the thread's stack */
 			if (pthread_attr_setstack(&attr, stack, stksize))
-				fatal("failed to set stack addr for thread %d to 0x%x\n",
-				      i, stack+stksize);
+				fatal("failed to set stack addr "
+				      "for thread %d to %p, size %zd\n",
+				      i, stack, stksize);
 		}
 
 		/* allocate the thread's parameter block  */
-- 
2.9.3

[PATCH 10/34] cyclictest: use %zd for printing size_t in rt_numa_numa_alloc_onnode()

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/rt_numa.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cyclictest/rt_numa.h b/src/cyclictest/rt_numa.h
index ec29943..ee25045 100644
--- a/src/cyclictest/rt_numa.h
+++ b/src/cyclictest/rt_numa.h
@@ -64,7 +64,7 @@ static void *rt_numa_numa_alloc_onnode(size_t size, int node, int cpu)
 	void *stack;
 	stack = numa_alloc_onnode(size, node);
 	if (stack == NULL)
-		fatal("failed to allocate %d bytes on node %d for cpu %d\n",
+		fatal("failed to allocate %zd bytes on node %d for cpu %d\n",
 				size, node, cpu);
 	return stack;
 }
-- 
2.9.3

Re: [PATCH 10/34] cyclictest: use %zd for printing size_t in rt_numa_numa_alloc_onnode()

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/cyclictest/rt_numa.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/cyclictest/rt_numa.h b/src/cyclictest/rt_numa.h
> index ec29943..ee25045 100644
> --- a/src/cyclictest/rt_numa.h
> +++ b/src/cyclictest/rt_numa.h
> @@ -64,7 +64,7 @@ static void *rt_numa_numa_alloc_onnode(size_t size, int node, int cpu)
>  	void *stack;
>  	stack = numa_alloc_onnode(size, node);
>  	if (stack == NULL)
> -		fatal("failed to allocate %d bytes on node %d for cpu %d\n",
> +		fatal("failed to allocate %zd bytes on node %d for cpu %d\n",
>  				size, node, cpu);
>  	return stack;
>  }
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 11/34] cyclictest: max_cpus unused in this variant of rt_numa_parse_cpustring()

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/rt_numa.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cyclictest/rt_numa.h b/src/cyclictest/rt_numa.h
index ee25045..457bbd8 100644
--- a/src/cyclictest/rt_numa.h
+++ b/src/cyclictest/rt_numa.h
@@ -90,7 +90,7 @@ static inline unsigned int rt_numa_bitmask_isbitset( const struct bitmask *mask,
 }
 
 static inline struct bitmask* rt_numa_parse_cpustring(const char* s,
-	int max_cpus)
+	int max_cpus __attribute__((unused)))
 {
 #ifdef HAVE_PARSE_CPUSTRING_ALL		/* Currently not defined anywhere.  No
 					   autotools build. */
-- 
2.9.3

[PATCH 12/34] cyclictest: fix off-by-one in clocksel check

[Tommi Rantala]

Fix off-by-one when checking that clocksel is valid index to the array.

Also fix a compiler warning:

src/cyclictest/cyclictest.c: In function 'process_options':
src/cyclictest/cyclictest.c:1828:31: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  if (clocksel < 0 || clocksel > ARRAY_SIZE(clocksources))

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index f2747e4..d89cb0f 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1823,7 +1823,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
 	if (tracelimit)
 		fileprefix = procfileprefix;
 
-	if (clocksel < 0 || clocksel > ARRAY_SIZE(clocksources))
+	if (clocksel < 0 || clocksel >= (int)ARRAY_SIZE(clocksources))
 		error = 1;
 
 	if (oscope_reduction < 1)
-- 
2.9.3

Re: [PATCH 12/34] cyclictest: fix off-by-one in clocksel check

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> Fix off-by-one when checking that clocksel is valid index to the array.
> 
> Also fix a compiler warning:
> 
> src/cyclictest/cyclictest.c: In function 'process_options':
> src/cyclictest/cyclictest.c:1828:31: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
>   if (clocksel < 0 || clocksel > ARRAY_SIZE(clocksources))
> 
> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/cyclictest/cyclictest.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
> index f2747e4..d89cb0f 100644
> --- a/src/cyclictest/cyclictest.c
> +++ b/src/cyclictest/cyclictest.c
> @@ -1823,7 +1823,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
>  	if (tracelimit)
>  		fileprefix = procfileprefix;
>  
> -	if (clocksel < 0 || clocksel > ARRAY_SIZE(clocksources))
> +	if (clocksel < 0 || clocksel >= (int)ARRAY_SIZE(clocksources))
>  		error = 1;
>  
>  	if (oscope_reduction < 1)
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 13/34] cyclictest: check timer_getoverrun() return value for failure

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index d89cb0f..7720fce 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1223,6 +1223,11 @@ static void *timerthread(void *param)
 		next.tv_nsec += interval.tv_nsec;
 		if (par->mode == MODE_CYCLIC) {
 			int overrun_count = timer_getoverrun(timer);
+			if (overrun_count < 0) {
+				warn("timer_getoverrun() failed, errno: %d\n",
+					errno);
+				goto out;
+			}
 			next.tv_sec += overrun_count * interval.tv_sec;
 			next.tv_nsec += overrun_count * interval.tv_nsec;
 		}
-- 
2.9.3

[PATCH 14/34] cyclictest: fix MODE_CYCLIC measurement failure after timer overruns

[Tommi Rantala]

This patch aims to fix nonsensical results sometimes reported by
cyclictest when running in MODE_CYCLIC.

In MODE_CYCLIC if we hit the "now > next" case, we can end up adjusting
the "next" timespec twice: by the tsgreater-while-loop, and after that
on a later iteration of the loop by the result of timer_getoverrun().

After this double adjustment, the results will not be correct.

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 7720fce..517f061 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1230,15 +1230,15 @@ static void *timerthread(void *param)
 			}
 			next.tv_sec += overrun_count * interval.tv_sec;
 			next.tv_nsec += overrun_count * interval.tv_nsec;
+		} else {
+			while (tsgreater(&now, &next)) {
+				next.tv_sec += interval.tv_sec;
+				next.tv_nsec += interval.tv_nsec;
+				tsnorm(&next);
+			}
 		}
 		tsnorm(&next);
 
-		while (tsgreater(&now, &next)) {
-			next.tv_sec += interval.tv_sec;
-			next.tv_nsec += interval.tv_nsec;
-			tsnorm(&next);
-		}
-
 		if (par->max_cycles && par->max_cycles == stat->cycles)
 			break;
 	}
-- 
2.9.3

[PATCH 15/34] cyclictest: param is unused in fifothread()

[Tommi Rantala]

src/cyclictest/cyclictest.c: In function 'fifothread':
src/cyclictest/cyclictest.c:2119:31: warning: unused parameter 'param' [-Wunused-parameter]
 static void *fifothread(void *param)
                               ^~~~~

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 517f061..b4dec98 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -2115,7 +2115,7 @@ static void print_stat(FILE *fp, struct thread_param *par, int index, int verbos
  * thread that creates a named fifo and hands out run stats when someone
  * reads from the fifo.
  */
-static void *fifothread(void *param)
+static void *fifothread(void *param __attribute__((unused)))
 {
 	int ret;
 	int fd;
-- 
2.9.3

Re: [PATCH 15/34] cyclictest: param is unused in fifothread()

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> src/cyclictest/cyclictest.c: In function 'fifothread':
> src/cyclictest/cyclictest.c:2119:31: warning: unused parameter 'param' [-Wunused-parameter]
>  static void *fifothread(void *param)
>                                ^~~~~
> 
> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/cyclictest/cyclictest.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
> index 517f061..b4dec98 100644
> --- a/src/cyclictest/cyclictest.c
> +++ b/src/cyclictest/cyclictest.c
> @@ -2115,7 +2115,7 @@ static void print_stat(FILE *fp, struct thread_param *par, int index, int verbos
>   * thread that creates a named fifo and hands out run stats when someone
>   * reads from the fifo.
>   */
> -static void *fifothread(void *param)
> +static void *fifothread(void *param __attribute__((unused)))
>  {
>  	int ret;
>  	int fd;
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 16/34] cyclictest: normalize next before tsgreater() check

[Tommi Rantala]

We should normalize the next timespec before checking if now > next, so
that the tsgreater() check really works as expected.

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index b4dec98..aae65ef 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1221,6 +1221,8 @@ static void *timerthread(void *param)
 
 		next.tv_sec += interval.tv_sec;
 		next.tv_nsec += interval.tv_nsec;
+		tsnorm(&next);
+
 		if (par->mode == MODE_CYCLIC) {
 			int overrun_count = timer_getoverrun(timer);
 			if (overrun_count < 0) {
-- 
2.9.3

[PATCH 17/34] cyclictest: tsnorm() after adjusting next

[Tommi Rantala]

Only do the normalization right after adjusting next.

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/cyclictest/cyclictest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index aae65ef..369ba04 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1232,6 +1232,7 @@ static void *timerthread(void *param)
 			}
 			next.tv_sec += overrun_count * interval.tv_sec;
 			next.tv_nsec += overrun_count * interval.tv_nsec;
+			tsnorm(&next);
 		} else {
 			while (tsgreater(&now, &next)) {
 				next.tv_sec += interval.tv_sec;
@@ -1239,7 +1240,6 @@ static void *timerthread(void *param)
 				tsnorm(&next);
 			}
 		}
-		tsnorm(&next);
 
 		if (par->max_cycles && par->max_cycles == stat->cycles)
 			break;
-- 
2.9.3

[PATCH 18/34] pip_stress: fix missing argument in err_msg() call in process_shared_mutex_available()

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/pi_tests/pip_stress.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pi_tests/pip_stress.c b/src/pi_tests/pip_stress.c
index e6cf0ce..1245705 100644
--- a/src/pi_tests/pip_stress.c
+++ b/src/pi_tests/pip_stress.c
@@ -244,7 +244,7 @@ long process_shared_mutex_available(void)
 	res = sysconf(_SC_THREAD_PROCESS_SHARED);
 	if (res == -1) {
 		int err = errno;	/* save the error number */
-		err_msg("%s: sysconf(_SC_THREAD_PROCESS_SHARED): ");
+		err_msg("%s: sysconf(_SC_THREAD_PROCESS_SHARED): ", __func__);
 		err_exit(err, NULL);
 	}
 #else
-- 
2.9.3

Re: [PATCH 18/34] pip_stress: fix missing argument in err_msg() call in process_shared_mutex_available()

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/pi_tests/pip_stress.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/pi_tests/pip_stress.c b/src/pi_tests/pip_stress.c
> index e6cf0ce..1245705 100644
> --- a/src/pi_tests/pip_stress.c
> +++ b/src/pi_tests/pip_stress.c
> @@ -244,7 +244,7 @@ long process_shared_mutex_available(void)
>  	res = sysconf(_SC_THREAD_PROCESS_SHARED);
>  	if (res == -1) {
>  		int err = errno;	/* save the error number */
> -		err_msg("%s: sysconf(_SC_THREAD_PROCESS_SHARED): ");
> +		err_msg("%s: sysconf(_SC_THREAD_PROCESS_SHARED): ", __func__);
>  		err_exit(err, NULL);
>  	}
>  #else
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 19/34] pip_stress: getopt.h and long_options[] are unused

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/pi_tests/pip_stress.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pi_tests/pip_stress.c b/src/pi_tests/pip_stress.c
index 1245705..15adf54 100644
--- a/src/pi_tests/pip_stress.c
+++ b/src/pi_tests/pip_stress.c
@@ -57,7 +57,6 @@
 #include "pip_stress.h"
 
 #include <unistd.h>
-#include <getopt.h>
 
 /* default time for low priority thread usleep */
 useconds_t usleep_val = 500;
@@ -79,11 +78,6 @@ struct State *statep;
 const int policy = SCHED_FIFO;
 const int prio_min;	/* Initialized for the minimum priority of policy */
 
-struct option long_options[] = {
-    { "usleep", required_argument, 0, 0 },
-    { 0,        0,                 0, 0 },
-};
-
 int main(void)
 {
 	void *mptr;	/* memory pointer */
-- 
2.9.3

Re: [PATCH 19/34] pip_stress: getopt.h and long_options[] are unused

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/pi_tests/pip_stress.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/src/pi_tests/pip_stress.c b/src/pi_tests/pip_stress.c
> index 1245705..15adf54 100644
> --- a/src/pi_tests/pip_stress.c
> +++ b/src/pi_tests/pip_stress.c
> @@ -57,7 +57,6 @@
>  #include "pip_stress.h"
>  
>  #include <unistd.h>
> -#include <getopt.h>
>  
>  /* default time for low priority thread usleep */
>  useconds_t usleep_val = 500;
> @@ -79,11 +78,6 @@ struct State *statep;
>  const int policy = SCHED_FIFO;
>  const int prio_min;	/* Initialized for the minimum priority of policy */
>  
> -struct option long_options[] = {
> -    { "usleep", required_argument, 0, 0 },
> -    { 0,        0,                 0, 0 },
> -};
> -
>  int main(void)
>  {
>  	void *mptr;	/* memory pointer */
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 20/34] pi_stress: use cpus_online() helper

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/pi_tests/pi_stress.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pi_tests/pi_stress.c b/src/pi_tests/pi_stress.c
index 36b64ca..116869a 100644
--- a/src/pi_tests/pi_stress.c
+++ b/src/pi_tests/pi_stress.c
@@ -270,7 +270,7 @@ int main(int argc, char **argv)
 	setvbuf(stdout, NULL, _IONBF, 0);
 
 	/* get the number of processors */
-	num_processors = sysconf(_SC_NPROCESSORS_ONLN);
+	num_processors = cpus_online();
 
 	/* calculate the number of inversion groups to run */
 	ngroups = num_processors == 1 ? 1 : num_processors - 1;
-- 
2.9.3

[PATCH 21/34] pi_stress: use %lu for unsigned long

[Tommi Rantala]

src/pi_tests/pi_stress.c: In function 'low_priority':
src/pi_tests/pi_stress.c:712:12: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=]
   pi_debug("low_priority[%d]: entering start wait (%d)\n", p->id,
            ^
src/pi_tests/pi_stress.c: In function 'med_priority':
src/pi_tests/pi_stress.c:840:12: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=]
   pi_debug("med_priority[%d]: entering start state (%d)\n", p->id,
            ^
src/pi_tests/pi_stress.c: In function 'high_priority':
src/pi_tests/pi_stress.c:964:12: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=]
   pi_debug("high_priority[%d]: entering start state (%d)\n", p->id,
            ^

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/pi_tests/pi_stress.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pi_tests/pi_stress.c b/src/pi_tests/pi_stress.c
index 116869a..8972122 100644
--- a/src/pi_tests/pi_stress.c
+++ b/src/pi_tests/pi_stress.c
@@ -709,7 +709,7 @@ void *low_priority(void *arg)
 		}
 
 		/* initial state */
-		pi_debug("low_priority[%d]: entering start wait (%d)\n", p->id,
+		pi_debug("low_priority[%d]: entering start wait (%lu)\n", p->id,
 		      count++);
 		status = pthread_barrier_wait(&p->start_barrier);
 		if (status && status != PTHREAD_BARRIER_SERIAL_THREAD) {
@@ -837,7 +837,7 @@ void *med_priority(void *arg)
 		}
 
 		/* start state */
-		pi_debug("med_priority[%d]: entering start state (%d)\n", p->id,
+		pi_debug("med_priority[%d]: entering start state (%lu)\n", p->id,
 		      count++);
 		status = pthread_barrier_wait(&p->start_barrier);
 		if (status && status != PTHREAD_BARRIER_SERIAL_THREAD) {
@@ -961,7 +961,7 @@ void *high_priority(void *arg)
 			}
 			pthread_mutex_unlock(&shutdown_mtx);
 		}
-		pi_debug("high_priority[%d]: entering start state (%d)\n", p->id,
+		pi_debug("high_priority[%d]: entering start state (%lu)\n", p->id,
 		      count++);
 		status = pthread_barrier_wait(&p->start_barrier);
 		if (status && status != PTHREAD_BARRIER_SERIAL_THREAD) {
-- 
2.9.3

Re: [PATCH 21/34] pi_stress: use %lu for unsigned long

[John Kacur]

 

On Mon, 22 May 2017, Tommi Rantala wrote:

> src/pi_tests/pi_stress.c: In function 'low_priority':
> src/pi_tests/pi_stress.c:712:12: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=]
>    pi_debug("low_priority[%d]: entering start wait (%d)\n", p->id,
>             ^
> src/pi_tests/pi_stress.c: In function 'med_priority':
> src/pi_tests/pi_stress.c:840:12: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=]
>    pi_debug("med_priority[%d]: entering start state (%d)\n", p->id,
>             ^
> src/pi_tests/pi_stress.c: In function 'high_priority':
> src/pi_tests/pi_stress.c:964:12: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=]
>    pi_debug("high_priority[%d]: entering start state (%d)\n", p->id,
>             ^
> 
> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/pi_tests/pi_stress.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/pi_tests/pi_stress.c b/src/pi_tests/pi_stress.c
> index 116869a..8972122 100644
> --- a/src/pi_tests/pi_stress.c
> +++ b/src/pi_tests/pi_stress.c
> @@ -709,7 +709,7 @@ void *low_priority(void *arg)
>  		}
>  
>  		/* initial state */
> -		pi_debug("low_priority[%d]: entering start wait (%d)\n", p->id,
> +		pi_debug("low_priority[%d]: entering start wait (%lu)\n", p->id,
>  		      count++);
>  		status = pthread_barrier_wait(&p->start_barrier);
>  		if (status && status != PTHREAD_BARRIER_SERIAL_THREAD) {
> @@ -837,7 +837,7 @@ void *med_priority(void *arg)
>  		}
>  
>  		/* start state */
> -		pi_debug("med_priority[%d]: entering start state (%d)\n", p->id,
> +		pi_debug("med_priority[%d]: entering start state (%lu)\n", p->id,
>  		      count++);
>  		status = pthread_barrier_wait(&p->start_barrier);
>  		if (status && status != PTHREAD_BARRIER_SERIAL_THREAD) {
> @@ -961,7 +961,7 @@ void *high_priority(void *arg)
>  			}
>  			pthread_mutex_unlock(&shutdown_mtx);
>  		}
> -		pi_debug("high_priority[%d]: entering start state (%d)\n", p->id,
> +		pi_debug("high_priority[%d]: entering start state (%lu)\n", p->id,
>  		      count++);
>  		status = pthread_barrier_wait(&p->start_barrier);
>  		if (status && status != PTHREAD_BARRIER_SERIAL_THREAD) {
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 22/34] pi_stress: add missing argument in pi_error() call

[Tommi Rantala]

src/pi_tests/pi_stress.c: In function 'high_priority':
src/pi_tests/pi_stress.c:993:9: warning: format '%x' expects a matching 'unsigned int' argument [-Wformat=]
        ("high_priority[%d]: pthread_barrier_wait(finish): %x",
         ^

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/pi_tests/pi_stress.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pi_tests/pi_stress.c b/src/pi_tests/pi_stress.c
index 8972122..e29956c 100644
--- a/src/pi_tests/pi_stress.c
+++ b/src/pi_tests/pi_stress.c
@@ -991,7 +991,7 @@ void *high_priority(void *arg)
 		if (status && status != PTHREAD_BARRIER_SERIAL_THREAD) {
 			pi_error
 			    ("high_priority[%d]: pthread_barrier_wait(finish): %x",
-			     status);
+			     p->id, status);
 			return NULL;
 		}
 		/* update the group stats */
-- 
2.9.3

Re: [PATCH 22/34] pi_stress: add missing argument in pi_error() call

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> src/pi_tests/pi_stress.c: In function 'high_priority':
> src/pi_tests/pi_stress.c:993:9: warning: format '%x' expects a matching 'unsigned int' argument [-Wformat=]
>         ("high_priority[%d]: pthread_barrier_wait(finish): %x",
>          ^
> 
> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/pi_tests/pi_stress.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/pi_tests/pi_stress.c b/src/pi_tests/pi_stress.c
> index 8972122..e29956c 100644
> --- a/src/pi_tests/pi_stress.c
> +++ b/src/pi_tests/pi_stress.c
> @@ -991,7 +991,7 @@ void *high_priority(void *arg)
>  		if (status && status != PTHREAD_BARRIER_SERIAL_THREAD) {
>  			pi_error
>  			    ("high_priority[%d]: pthread_barrier_wait(finish): %x",
> -			     status);
> +			     p->id, status);
>  			return NULL;
>  		}
>  		/* update the group stats */
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 23/34] svsematest: test .mindiff against UINT_MAX

[Tommi Rantala]

src/svsematest/svsematest.c:637:29: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (receiver[i].mindiff == -1)
                             ^~

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/svsematest/svsematest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c
index eeb8285..9adbb52 100644
--- a/src/svsematest/svsematest.c
+++ b/src/svsematest/svsematest.c
@@ -634,7 +634,7 @@ int main(int argc, char *argv[])
 				    sender[i].cpu, sender[i].samples);
 			}
 			for (i = 0; i < num_threads; i++) {
-				if (receiver[i].mindiff == -1)
+				if (receiver[i].mindiff == UINT_MAX)
 					printf("#%d -> #%d (not yet ready)\n",
 					    i*2+1, i*2);
 				else
-- 
2.9.3

Re: [PATCH 23/34] svsematest: test .mindiff against UINT_MAX

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> src/svsematest/svsematest.c:637:29: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
>      if (receiver[i].mindiff == -1)
>                              ^~
> 
> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/svsematest/svsematest.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c
> index eeb8285..9adbb52 100644
> --- a/src/svsematest/svsematest.c
> +++ b/src/svsematest/svsematest.c
> @@ -634,7 +634,7 @@ int main(int argc, char *argv[])
>  				    sender[i].cpu, sender[i].samples);
>  			}
>  			for (i = 0; i < num_threads; i++) {
> -				if (receiver[i].mindiff == -1)
> +				if (receiver[i].mindiff == UINT_MAX)
>  					printf("#%d -> #%d (not yet ready)\n",
>  					    i*2+1, i*2);
>  				else
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>> 

[PATCH 24/34] signaltest: remove unused ARRAY_SIZE macro

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/signaltest/signaltest.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c
index 59f979e..72a549d 100644
--- a/src/signaltest/signaltest.c
+++ b/src/signaltest/signaltest.c
@@ -30,8 +30,6 @@
 #include "error.h"
 #include "rt-utils.h"
 
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
 /* Ugly, but .... */
 #define gettid() syscall(__NR_gettid)
 
-- 
2.9.3

Re: [PATCH 24/34] signaltest: remove unused ARRAY_SIZE macro

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/signaltest/signaltest.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c
> index 59f979e..72a549d 100644
> --- a/src/signaltest/signaltest.c
> +++ b/src/signaltest/signaltest.c
> @@ -30,8 +30,6 @@
>  #include "error.h"
>  #include "rt-utils.h"
>  
> -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
> -
>  /* Ugly, but .... */
>  #define gettid() syscall(__NR_gettid)
>  
> -- 

NAK

You're right, it could be removed, but it's not really causing in harm 
either. I'm going to leave it in for now.

Thanks

John

Re: [PATCH 24/34] signaltest: remove unused ARRAY_SIZE macro

[Tommi Rantala]

On 22.05.2017 19:44, John Kacur wrote:
> On Mon, 22 May 2017, Tommi Rantala wrote:
> 
>> --- a/src/signaltest/signaltest.c
>> +++ b/src/signaltest/signaltest.c
>> @@ -30,8 +30,6 @@
>>   #include "error.h"
>>   #include "rt-utils.h"
>>   
>> -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
>> -
>>   /* Ugly, but .... */
>>   #define gettid() syscall(__NR_gettid)
>>   
>> -- 
> 
> NAK
> 
> You're right, it could be removed, but it's not really causing in harm
> either. I'm going to leave it in for now.
> 
> Thanks
> 
> John

Hi John,

OK, dropped the patch also from the github repo.

Any comments to the rest of the patches?

-Tommi

Re: [PATCH 24/34] signaltest: remove unused ARRAY_SIZE macro

[John Kacur]

On Mon, 5 Jun 2017, Tommi Rantala wrote:

> On 22.05.2017 19:44, John Kacur wrote:
> > On Mon, 22 May 2017, Tommi Rantala wrote:
> > 
> > > --- a/src/signaltest/signaltest.c
> > > +++ b/src/signaltest/signaltest.c
> > > @@ -30,8 +30,6 @@
> > >   #include "error.h"
> > >   #include "rt-utils.h"
> > >   
> > > -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
> > > -
> > >   /* Ugly, but .... */
> > >   #define gettid() syscall(__NR_gettid)
> > >   
> > > -- 
> > 
> > NAK
> > 
> > You're right, it could be removed, but it's not really causing in harm
> > either. I'm going to leave it in for now.
> > 
> > Thanks
> > 
> > John
> 
> Hi John,
> 
> OK, dropped the patch also from the github repo.
> 
> Any comments to the rest of the patches?
> 

There're coming, give me a little more time to parse them.

Thanks

John

[PATCH 25/34] deadline_test: fix stack corruption in setup_ftrace_marker()

[Tommi Rantala]

Make sure that files[] has correct length.

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/sched_deadline/deadline_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sched_deadline/deadline_test.c b/src/sched_deadline/deadline_test.c
index 2a63c5f..e5621a3 100644
--- a/src/sched_deadline/deadline_test.c
+++ b/src/sched_deadline/deadline_test.c
@@ -435,7 +435,7 @@ static void setup_ftrace_marker(void)
 {
 	struct stat st;
 	const char *debugfs = find_debugfs();
-	char files[strlen(debugfs) + 14];
+	char files[strlen(debugfs) + strlen("/tracing/trace_marker") + 1];
 	int ret;
 
 	if (strlen(debugfs) == 0)
-- 
2.9.3

[PATCH 26/34] deadline_test: remove unused tid parameter in do_runtime()

[Tommi Rantala]

src/sched_deadline/deadline_test.c: In function 'do_runtime':
src/sched_deadline/deadline_test.c:1191:28: warning: unused parameter 'tid' [-Wunused-parameter]
 static u64 do_runtime(long tid, struct sched_data *data, u64 period)
                            ^~~

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/sched_deadline/deadline_test.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/sched_deadline/deadline_test.c b/src/sched_deadline/deadline_test.c
index e5621a3..e5c31d6 100644
--- a/src/sched_deadline/deadline_test.c
+++ b/src/sched_deadline/deadline_test.c
@@ -1165,7 +1165,6 @@ static int read_ctx_switches(int *vol, int *nonvol, int *migrate)
 
 /**
  * do_runtime - Run a loop to simulate a specific task
- * @tid: The thread ID
  * @data: The sched_data descriptor
  * @period: The time of the last period.
  *
@@ -1188,7 +1187,7 @@ static int read_ctx_switches(int *vol, int *nonvol, int *migrate)
  *  @data->total_time - Total time it took to complete all loops
  *  @data->nr_periods - Number of periods that were executed.
  */
-static u64 do_runtime(long tid, struct sched_data *data, u64 period)
+static u64 do_runtime(struct sched_data *data, u64 period)
 {
 	u64 next_period = period + data->deadline_us;
 	u64 now = get_time_us();
@@ -1361,7 +1360,7 @@ void *run_deadline(void *data)
 	period = get_time_us();
 	
 	while (!done) {
-		period = do_runtime(tid, sched_data, period);
+		period = do_runtime(sched_data, period);
 		sched_yield();
 	}
 	ret = sched_getattr(0, &attr, sizeof(attr), 0);
@@ -1722,7 +1721,7 @@ static u64 calculate_loops_per_ms(u64 *overhead)
 	do_sleep(1000);
 
 	start = get_time_us();
-	do_runtime(0, &sd, start + sd.deadline_us);
+	do_runtime(&sd, start + sd.deadline_us);
 	end = get_time_us();
 
 	diff = end - start;
@@ -1751,7 +1750,7 @@ static u64 calculate_loops_per_ms(u64 *overhead)
 	do_sleep(1000);
 
 	start = get_time_us();
-	do_runtime(0, &sd, start + sd.deadline_us);
+	do_runtime(&sd, start + sd.deadline_us);
 	end = get_time_us();
 
 	odiff = end - start;
@@ -1964,7 +1963,7 @@ int main (int argc, char **argv)
 
 		/* Make sure that we can make our deadlines */
 		start_period = get_time_us();
-		do_runtime(gettid(), sd, start_period);
+		do_runtime(sd, start_period);
 		end_period = get_time_us();
 		if (end_period - start_period > sd->runtime_us) {
 			printf("Failed to perform task within runtime: Missed by %lld us\n",
-- 
2.9.3

[PATCH 27/34] deadline_test: tv_nsec is long

[Tommi Rantala]

src/sched_deadline/deadline_test.c: In function 'do_sleep':
src/sched_deadline/deadline_test.c:1683:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  while (req.tv_nsec > 1000000000UL) {
                     ^

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/sched_deadline/deadline_test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sched_deadline/deadline_test.c b/src/sched_deadline/deadline_test.c
index e5c31d6..6958ad9 100644
--- a/src/sched_deadline/deadline_test.c
+++ b/src/sched_deadline/deadline_test.c
@@ -1679,8 +1679,8 @@ static void do_sleep(u64 next)
 
 	req.tv_nsec = next * 1000;
 	req.tv_sec = 0;
-	while (req.tv_nsec > 1000000000UL) {
-		req.tv_nsec -= 1000000000UL;
+	while (req.tv_nsec > 1000000000L) {
+		req.tv_nsec -= 1000000000L;
 		req.tv_sec++;
 	}
 	nanosleep(&req, NULL);
-- 
2.9.3

[PATCH 28/34] deadline_test: use %llu for printing unsigned long longs

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/sched_deadline/deadline_test.c | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/sched_deadline/deadline_test.c b/src/sched_deadline/deadline_test.c
index 6958ad9..c8cf755 100644
--- a/src/sched_deadline/deadline_test.c
+++ b/src/sched_deadline/deadline_test.c
@@ -1334,7 +1334,7 @@ void *run_deadline(void *data)
 	attr.sched_runtime = sched_data->runtime_us * 1000;
 	attr.sched_deadline = sched_data->deadline_us * 1000;
 
-	printf("thread[%ld] runtime=%lldus deadline=%lldus loops=%lld\n",
+	printf("thread[%ld] runtime=%lluus deadline=%lluus loops=%llu\n",
 	       gettid(), sched_data->runtime_us,
 	       sched_data->deadline_us, sched_data->loops_per_period);
 
@@ -1737,8 +1737,8 @@ static u64 calculate_loops_per_ms(u64 *overhead)
 
 	loops = 1000ULL * test_loops / sd.last_time;
 
-	printf("%lld test loops took %lldus total (%lld internal)\n"
-	       "calculated loops for 1000us=%lld\n",
+	printf("%llu test loops took %lluus total (%llu internal)\n"
+	       "calculated loops for 1000us=%llu\n",
 	       test_loops, diff, sd.last_time, loops);
 
 	sd.deadline_us = 2000;
@@ -1763,9 +1763,9 @@ static u64 calculate_loops_per_ms(u64 *overhead)
 
 	*overhead = odiff - sd.last_time;
 
-	printf("%lld test loops took %lldus total (%lld internal)\n"
-	       "New calculated loops for 1000us=%lld\n"
-	       "Diff from last calculation: %lld loops\n",
+	printf("%llu test loops took %lluus total (%llu internal)\n"
+	       "New calculated loops for 1000us=%llu\n"
+	       "Diff from last calculation: %llu loops\n",
 	       test_loops, odiff, sd.last_time, loops, loops - test_loops);
 
 	return loops;
@@ -1919,7 +1919,7 @@ int main (int argc, char **argv)
 	printf(" nr_cpus:%d", nr_cpus);
 	if (setcpu)
 		printf(" (%s)", setcpu);
-	printf(" loops:%lld overhead:%lldus\n", loops, overhead);
+	printf(" loops:%llu overhead:%lluus\n", loops, overhead);
 
  again:
 	/* Set up the data while sill in SCHED_FIFO */
@@ -1931,9 +1931,9 @@ int main (int argc, char **argv)
 		 */
 		runtime = interval * percent / 100;
 		if (runtime < overhead) {
-			fprintf(stderr, "Run time too short: %lld us\n",
+			fprintf(stderr, "Run time too short: %llu us\n",
 				runtime);
-			fprintf(stderr, "Read context takes %lld us\n",
+			fprintf(stderr, "Read context takes %llu us\n",
 				overhead);
 			exit(-1);
 		}
@@ -1966,14 +1966,14 @@ int main (int argc, char **argv)
 		do_runtime(sd, start_period);
 		end_period = get_time_us();
 		if (end_period - start_period > sd->runtime_us) {
-			printf("Failed to perform task within runtime: Missed by %lld us\n",
+			printf("Failed to perform task within runtime: Missed by %llu us\n",
 				end_period - start_period - sd->runtime_us);
 			overhead += end_period - start_period - sd->runtime_us;
-			printf("New overhead=%lldus\n", overhead);
+			printf("New overhead=%lluus\n", overhead);
 			goto again;
 		}
 
-		printf("  Tested at %lldus of %lldus\n",
+		printf("  Tested at %lluus of %lluus\n",
 		       end_period - start_period, sd->runtime_us);
 
 		interval += step;
@@ -2076,18 +2076,18 @@ int main (int argc, char **argv)
 		printf("\n[%d]\n", sd->tid);
 		printf("missed deadlines  = %d\n", sd->missed_deadlines);
 		printf("missed periods    = %d\n", sd->missed_periods);
-		printf("Total adjustments = %lld us\n", sd->total_adjust);
-		printf("# adjustments = %lld avg: %lld us\n",
+		printf("Total adjustments = %llu us\n", sd->total_adjust);
+		printf("# adjustments = %llu avg: %llu us\n",
 		       sd->nr_adjust, sd->total_adjust / sd->nr_adjust);
-		printf("deadline   : %lld us\n", sd->deadline_us);
-		printf("runtime    : %lld us\n", sd->runtime_us);
-		printf("nr_periods : %lld\n", sd->nr_periods);
-		printf("max_time: %lldus", sd->max_time);
-		printf("\tmin_time: %lldus", sd->min_time);
-		printf("\tavg_time: %lldus\n", sd->total_time / sd->nr_periods);
+		printf("deadline   : %llu us\n", sd->deadline_us);
+		printf("runtime    : %llu us\n", sd->runtime_us);
+		printf("nr_periods : %llu\n", sd->nr_periods);
+		printf("max_time: %lluus", sd->max_time);
+		printf("\tmin_time: %lluus", sd->min_time);
+		printf("\tavg_time: %lluus\n", sd->total_time / sd->nr_periods);
 		printf("ctx switches vol:%d nonvol:%d migration:%d\n",
 		       sd->vol, sd->nonvol, sd->migrate);
-		printf("highes prime: %lld\n", sd->prime);
+		printf("highes prime: %llu\n", sd->prime);
 		printf("\n");
 	}
 
-- 
2.9.3

[PATCH 29/34] cyclicdeadline: fix stack corruption in setup_ftrace_marker()

[Tommi Rantala]

Make sure that files[] has correct length.

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/sched_deadline/cyclicdeadline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
index 761f8d7..59f06d5 100644
--- a/src/sched_deadline/cyclicdeadline.c
+++ b/src/sched_deadline/cyclicdeadline.c
@@ -283,7 +283,7 @@ static void setup_ftrace_marker(void)
 {
 	struct stat st;
 	const char *debugfs = find_debugfs();
-	char files[strlen(debugfs) + 14];
+	char files[strlen(debugfs) + strlen("/tracing/trace_marker") + 1];
 	int ret;
 
 	if (strlen(debugfs) == 0)
-- 
2.9.3

[PATCH 30/34] cyclicdeadline: remove unused tid parameter from do_runtime()

[Tommi Rantala]

src/sched_deadline/cyclicdeadline.c:730:28: warning: unused parameter 'tid' [-Wunused-parameter]
 static u64 do_runtime(long tid, struct sched_data *sd, u64 period)
                            ^~~

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/sched_deadline/cyclicdeadline.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
index 59f06d5..e8cc559 100644
--- a/src/sched_deadline/cyclicdeadline.c
+++ b/src/sched_deadline/cyclicdeadline.c
@@ -727,7 +727,7 @@ static void print_stat(FILE *fp, struct sched_data *sd, int index, int verbose,
 	}
 }
 
-static u64 do_runtime(long tid, struct sched_data *sd, u64 period)
+static u64 do_runtime(struct sched_data *sd, u64 period)
 {
 	struct thread_stat *stat = &sd->stat;
 	u64 next_period = period + sd->deadline_us;
@@ -822,7 +822,7 @@ void *run_deadline(void *data)
 	period = get_time_us();
 	
 	while (!shutdown) {
-		period = do_runtime(tid, sd, period);
+		period = do_runtime(sd, period);
 		sched_yield();
 	}
 	ret = sched_getattr(0, &attr, sizeof(attr), 0);
@@ -1167,7 +1167,7 @@ int main (int argc, char **argv)
 
 		/* Make sure that we can make our deadlines */
 		start_period = get_time_us();
-		do_runtime(gettid(), sd, start_period);
+		do_runtime(sd, start_period);
 		end_period = get_time_us();
 		if (end_period - start_period > sd->runtime_us) {
 			fprintf(stderr, "Failed to perform task within runtime: Missed by %lld us\n",
-- 
2.9.3

[PATCH 31/34] cyclicdeadline: avoid signed vs unsigned compiler warnings

[Tommi Rantala]

src/sched_deadline/cyclicdeadline.c: In function 'do_runtime':
src/sched_deadline/cyclicdeadline.c:757:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  if (diff > stat->max)
           ^
src/sched_deadline/cyclicdeadline.c:759:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  if (!stat->min || diff < stat->min)
                         ^

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/sched_deadline/cyclicdeadline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
index e8cc559..5fbfa13 100644
--- a/src/sched_deadline/cyclicdeadline.c
+++ b/src/sched_deadline/cyclicdeadline.c
@@ -754,9 +754,9 @@ static u64 do_runtime(struct sched_data *sd, u64 period)
 
 
 	diff = now - period;
-	if (diff > stat->max)
+	if (diff > (u64)stat->max)
 		stat->max = diff;
-	if (!stat->min || diff < stat->min)
+	if (!stat->min || diff < (u64)stat->min)
 		stat->min = diff;
 	stat->act = diff;
 	stat->avg += (double) diff;
-- 
2.9.3

[PATCH 32/34] printf format attributes and format string constness in error helpers

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/include/error.h | 16 ++++++++--------
 src/lib/error.c     | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/include/error.h b/src/include/error.h
index 4acff49..29999fe 100644
--- a/src/include/error.h
+++ b/src/include/error.h
@@ -6,14 +6,14 @@
 #include <stdarg.h>
 #include <string.h>
 
-void err_exit(int err, char *fmt, ...) __attribute__((noreturn));
-void err_msg(char *fmt, ...);
-void err_msg_n(int err, char *fmt, ...);
-void err_quit(char *fmt, ...) __attribute__((noreturn));
-void debug(char *fmt, ...);
-void info(char *fmt, ...);
-void warn(char *fmt, ...);
-void fatal(char *fmt, ...) __attribute__((noreturn));
+void err_exit(int err, const char *fmt, ...) __attribute__((noreturn)) __attribute__((format (printf, 2, 3)));
+void err_msg(const char *fmt, ...)__attribute__((format (printf, 1, 2)));
+void err_msg_n(int err, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
+void err_quit(const char *fmt, ...) __attribute__((noreturn)) __attribute__((format (printf, 1, 2)));
+void debug(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
+void info(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
+void warn(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
+void fatal(const char *fmt, ...) __attribute__((noreturn)) __attribute__((format (printf, 1, 2)));
 void err_doit(int err, const char *fmt, va_list ap);
 
 #endif	/* __ERROR_H */
diff --git a/src/lib/error.c b/src/lib/error.c
index b32aa02..d10bbce 100644
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -7,7 +7,7 @@
 #include "error.h"
 
 /* Print an error message, plus a message for err and exit with error err */
-void err_exit(int err, char *fmt, ...)
+void err_exit(int err, const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -17,7 +17,7 @@ void err_exit(int err, char *fmt, ...)
 }
 
 /* print an error message and return */
-void err_msg(char *fmt, ...)
+void err_msg(const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -27,7 +27,7 @@ void err_msg(char *fmt, ...)
 }
 
 /* Print an error message, plus a message for err, and return */
-void err_msg_n(int err, char *fmt, ...)
+void err_msg_n(int err, const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -37,7 +37,7 @@ void err_msg_n(int err, char *fmt, ...)
 }
 
 /* print an error message and quit */
-void err_quit(char *fmt, ...)
+void err_quit(const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -46,7 +46,7 @@ void err_quit(char *fmt, ...)
 	exit(1);
 }
 
-void debug(char *fmt, ...)
+void debug(const char *fmt, ...)
 {
 	va_list ap;
 
@@ -56,7 +56,7 @@ void debug(char *fmt, ...)
 	va_end(ap);
 }
 
-void info(char *fmt, ...)
+void info(const char *fmt, ...)
 {
 	va_list ap;
 
@@ -66,7 +66,7 @@ void info(char *fmt, ...)
 	va_end(ap);
 }
 
-void warn(char *fmt, ...)
+void warn(const char *fmt, ...)
 {
 	va_list ap;
 
@@ -76,7 +76,7 @@ void warn(char *fmt, ...)
 	va_end(ap);
 }
 
-void fatal(char *fmt, ...)
+void fatal(const char *fmt, ...)
 {
 	va_list ap;
 
-- 
2.9.3

[PATCH 33/34] mark unused sighand() parameters with unused attribute

[Tommi Rantala]

src/sched_deadline/cyclicdeadline.c: In function 'sighand':
src/sched_deadline/cyclicdeadline.c:1010:25: warning: unused parameter 'sig' [-Wunused-parameter]
 static void sighand(int sig)
                         ^~~

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/pmqtest/pmqtest.c               | 2 +-
 src/ptsematest/ptsematest.c         | 2 +-
 src/sched_deadline/cyclicdeadline.c | 2 +-
 src/signaltest/signaltest.c         | 2 +-
 src/sigwaittest/sigwaittest.c       | 2 +-
 src/svsematest/svsematest.c         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
index 75d5ee8..e2d5f36 100644
--- a/src/pmqtest/pmqtest.c
+++ b/src/pmqtest/pmqtest.c
@@ -380,7 +380,7 @@ static void process_options (int argc, char *argv[])
 
 static int volatile shutdown;
 
-static void sighand(int sig)
+static void sighand(int sig __attribute__((unused)))
 {
 	shutdown = 1;
 }
diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
index a31c745..26e800b 100644
--- a/src/ptsematest/ptsematest.c
+++ b/src/ptsematest/ptsematest.c
@@ -290,7 +290,7 @@ static void process_options (int argc, char *argv[])
 
 static int volatile shutdown;
 
-static void sighand(int sig)
+static void sighand(int sig __attribute__((unused)))
 {
 	shutdown = 1;
 }
diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
index 5fbfa13..9bcfe26 100644
--- a/src/sched_deadline/cyclicdeadline.c
+++ b/src/sched_deadline/cyclicdeadline.c
@@ -1007,7 +1007,7 @@ static int calc_nr_cpus(const char *setcpu, char **buf)
 	return -1;
 }
 
-static void sighand(int sig)
+static void sighand(int sig __attribute__((unused)))
 {
 	shutdown = 1;
 }
diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c
index 72a549d..dff0c56 100644
--- a/src/signaltest/signaltest.c
+++ b/src/signaltest/signaltest.c
@@ -282,7 +282,7 @@ static void check_kernel(void)
 		oldtrace = 1;
 }
 
-static void sighand(int sig)
+static void sighand(int sig __attribute__((unused)))
 {
 	shutdown = 1;
 }
diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c
index 91fcdaa..6e6591f 100644
--- a/src/sigwaittest/sigwaittest.c
+++ b/src/sigwaittest/sigwaittest.c
@@ -331,7 +331,7 @@ static void process_options (int argc, char *argv[])
 
 static int volatile mustshutdown;
 
-static void sighand(int sig)
+static void sighand(int sig __attribute__((unused)))
 {
 	mustshutdown = 1;
 }
diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c
index 9adbb52..b688831 100644
--- a/src/svsematest/svsematest.c
+++ b/src/svsematest/svsematest.c
@@ -378,7 +378,7 @@ static void process_options (int argc, char *argv[])
 
 static int volatile mustshutdown;
 
-static void sighand(int sig)
+static void sighand(int sig __attribute__((unused)))
 {
 	mustshutdown = 1;
 }
-- 
2.9.3

Re: [PATCH 33/34] mark unused sighand() parameters with unused attribute

[John Kacur]

On Mon, 22 May 2017, Tommi Rantala wrote:

> src/sched_deadline/cyclicdeadline.c: In function 'sighand':
> src/sched_deadline/cyclicdeadline.c:1010:25: warning: unused parameter 'sig' [-Wunused-parameter]
>  static void sighand(int sig)
>                          ^~~
> 
> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  src/pmqtest/pmqtest.c               | 2 +-
>  src/ptsematest/ptsematest.c         | 2 +-
>  src/sched_deadline/cyclicdeadline.c | 2 +-
>  src/signaltest/signaltest.c         | 2 +-
>  src/sigwaittest/sigwaittest.c       | 2 +-
>  src/svsematest/svsematest.c         | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
> index 75d5ee8..e2d5f36 100644
> --- a/src/pmqtest/pmqtest.c
> +++ b/src/pmqtest/pmqtest.c
> @@ -380,7 +380,7 @@ static void process_options (int argc, char *argv[])
>  
>  static int volatile shutdown;
>  
> -static void sighand(int sig)
> +static void sighand(int sig __attribute__((unused)))
>  {
>  	shutdown = 1;
>  }
> diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
> index a31c745..26e800b 100644
> --- a/src/ptsematest/ptsematest.c
> +++ b/src/ptsematest/ptsematest.c
> @@ -290,7 +290,7 @@ static void process_options (int argc, char *argv[])
>  
>  static int volatile shutdown;
>  
> -static void sighand(int sig)
> +static void sighand(int sig __attribute__((unused)))
>  {
>  	shutdown = 1;
>  }
> diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
> index 5fbfa13..9bcfe26 100644
> --- a/src/sched_deadline/cyclicdeadline.c
> +++ b/src/sched_deadline/cyclicdeadline.c
> @@ -1007,7 +1007,7 @@ static int calc_nr_cpus(const char *setcpu, char **buf)
>  	return -1;
>  }
>  
> -static void sighand(int sig)
> +static void sighand(int sig __attribute__((unused)))
>  {
>  	shutdown = 1;
>  }
> diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c
> index 72a549d..dff0c56 100644
> --- a/src/signaltest/signaltest.c
> +++ b/src/signaltest/signaltest.c
> @@ -282,7 +282,7 @@ static void check_kernel(void)
>  		oldtrace = 1;
>  }
>  
> -static void sighand(int sig)
> +static void sighand(int sig __attribute__((unused)))
>  {
>  	shutdown = 1;
>  }
> diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c
> index 91fcdaa..6e6591f 100644
> --- a/src/sigwaittest/sigwaittest.c
> +++ b/src/sigwaittest/sigwaittest.c
> @@ -331,7 +331,7 @@ static void process_options (int argc, char *argv[])
>  
>  static int volatile mustshutdown;
>  
> -static void sighand(int sig)
> +static void sighand(int sig __attribute__((unused)))
>  {
>  	mustshutdown = 1;
>  }
> diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c
> index 9adbb52..b688831 100644
> --- a/src/svsematest/svsematest.c
> +++ b/src/svsematest/svsematest.c
> @@ -378,7 +378,7 @@ static void process_options (int argc, char *argv[])
>  
>  static int volatile mustshutdown;
>  
> -static void sighand(int sig)
> +static void sighand(int sig __attribute__((unused)))
>  {
>  	mustshutdown = 1;
>  }
> -- 

Signed-off-by: John Kacur <jkacur@redhat.com>

[PATCH 34/34] read-only struct option array constness

[Tommi Rantala]

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 src/backfire/sendme.c                 | 2 +-
 src/cyclictest/cyclictest.c           | 2 +-
 src/hackbench/hackbench.c             | 2 +-
 src/pi_tests/classic_pi.c             | 2 +-
 src/pi_tests/pi_stress.c              | 2 +-
 src/pmqtest/pmqtest.c                 | 2 +-
 src/ptsematest/ptsematest.c           | 2 +-
 src/rt-migrate-test/rt-migrate-test.c | 2 +-
 src/signaltest/signaltest.c           | 2 +-
 src/sigwaittest/sigwaittest.c         | 2 +-
 src/svsematest/svsematest.c           | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/backfire/sendme.c b/src/backfire/sendme.c
index c1854d9..0da5db9 100644
--- a/src/backfire/sendme.c
+++ b/src/backfire/sendme.c
@@ -130,7 +130,7 @@ static void process_options (int argc, char *argv[])
 	for (;;) {
 		int option_index = 0;
 		/** Options for getopt */
-		static struct option long_options[] = {
+		static const struct option long_options[] = {
 			{"affinity", optional_argument, NULL, 'a'},
 			{"breaktrace", required_argument, NULL, 'b'},
 			{"interval", required_argument, NULL, 'i'},
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 369ba04..9c0a966 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1524,7 +1524,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
 		 * Options for getopt
 		 * Ordered alphabetically by single letter name
 		 */
-		static struct option long_options[] = {
+		static const struct option long_options[] = {
 			{"affinity",         optional_argument, NULL, OPT_AFFINITY},
 			{"notrace",          no_argument,       NULL, OPT_NOTRACE },
 			{"aligned",          optional_argument, NULL, OPT_ALIGNED },
diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
index ba804f5..d7876e2 100644
--- a/src/hackbench/hackbench.c
+++ b/src/hackbench/hackbench.c
@@ -348,7 +348,7 @@ static void process_options (int argc, char *argv[])
 	while( 1 ) {
 		int optind = 0;
 
-		static struct option longopts[] = {
+		static const struct option longopts[] = {
 			{"pipe",      no_argument,	 NULL, 'p'},
 			{"datasize",  required_argument, NULL, 's'},
 			{"loops",     required_argument, NULL, 'l'},
diff --git a/src/pi_tests/classic_pi.c b/src/pi_tests/classic_pi.c
index 695ee4c..f646d4a 100644
--- a/src/pi_tests/classic_pi.c
+++ b/src/pi_tests/classic_pi.c
@@ -68,7 +68,7 @@ int inversions = 1;
 
 int verbose = 0;
 
-struct option options [] = {
+static const struct option options [] = {
 	{ "verbose", no_argument, NULL, 'v' },
 	{ "quiet", no_argument, NULL, 'q' },
 	{ "no-pi", no_argument, NULL, 'n'}, 
diff --git a/src/pi_tests/pi_stress.c b/src/pi_tests/pi_stress.c
index e29956c..1ca40de 100644
--- a/src/pi_tests/pi_stress.c
+++ b/src/pi_tests/pi_stress.c
@@ -145,7 +145,7 @@ int uniprocessor = 0;
 int lockall = 0;
 
 /* command line options */
-struct option options[] = {
+static const struct option options[] = {
 	{"duration", required_argument, NULL, 't'},
 	{"verbose", no_argument, NULL, 'v'},
 	{"quiet", no_argument, NULL, 'q'},
diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
index e2d5f36..bbb3df5 100644
--- a/src/pmqtest/pmqtest.c
+++ b/src/pmqtest/pmqtest.c
@@ -286,7 +286,7 @@ static void process_options (int argc, char *argv[])
 	for (;;) {
 		int option_index = 0;
 		/** Options for getopt */
-		static struct option long_options[] = {
+		static const struct option long_options[] = {
 			{"affinity", optional_argument, NULL, 'a'},
 			{"breaktrace", required_argument, NULL, 'b'},
 			{"distance", required_argument, NULL, 'd'},
diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
index 26e800b..5630e19 100644
--- a/src/ptsematest/ptsematest.c
+++ b/src/ptsematest/ptsematest.c
@@ -203,7 +203,7 @@ static void process_options (int argc, char *argv[])
 	for (;;) {
 		int option_index = 0;
 		/** Options for getopt */
-		static struct option long_options[] = {
+		static const struct option long_options[] = {
 			{"affinity", optional_argument, NULL, 'a'},
 			{"breaktrace", required_argument, NULL, 'b'},
 			{"distance", required_argument, NULL, 'd'},
diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c
index 0a0bb77..a04532f 100644
--- a/src/rt-migrate-test/rt-migrate-test.c
+++ b/src/rt-migrate-test/rt-migrate-test.c
@@ -193,7 +193,7 @@ static void parse_options (int argc, char *argv[])
 	for (;;) {
 		int option_index = 0;
 		/** Options for getopt */
-		static struct option long_options[] = {
+		static const struct option long_options[] = {
 			{"prio", required_argument, NULL, 'p'},
 			{"run-time", required_argument, NULL, 'r'},
 			{"sleep-time", required_argument, NULL, 's'},
diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c
index dff0c56..5c6b8ec 100644
--- a/src/signaltest/signaltest.c
+++ b/src/signaltest/signaltest.c
@@ -230,7 +230,7 @@ static void process_options (int argc, char *argv[])
 	for (;;) {
 		int option_index = 0;
 		/** Options for getopt */
-		static struct option long_options[] = {
+		static const struct option long_options[] = {
 			{"breaktrace", required_argument, NULL, 'b'},
 			{"loops", required_argument, NULL, 'l'},
 			{"priority", required_argument, NULL, 'p'},
diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c
index 6e6591f..36506d4 100644
--- a/src/sigwaittest/sigwaittest.c
+++ b/src/sigwaittest/sigwaittest.c
@@ -248,7 +248,7 @@ static void process_options (int argc, char *argv[])
 	for (;;) {
 		int option_index = 0;
 		/** Options for getopt */
-		static struct option long_options[] = {
+		static const struct option long_options[] = {
 			{"affinity", optional_argument, NULL, 'a'},
 			{"breaktrace", required_argument, NULL, 'b'},
 			{"distance", required_argument, NULL, 'd'},
diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c
index b688831..5a88cd4 100644
--- a/src/svsematest/svsematest.c
+++ b/src/svsematest/svsematest.c
@@ -278,7 +278,7 @@ static void process_options (int argc, char *argv[])
 	for (;;) {
 		int option_index = 0;
 		/** Options for getopt */
-		static struct option long_options[] = {
+		static const struct option long_options[] = {
 			{"affinity", optional_argument, NULL, 'a'},
 			{"breaktrace", required_argument, NULL, 'b'},
 			{"distance", required_argument, NULL, 'd'},
-- 
2.9.3