[PATCH 0/4] Android/Bionic cleanup patches

[PATCH 0/4] Android/Bionic cleanup patches

[Henrik Austad]

From: Henrik Austad <henrik@austad.us>

Some of these are a respin of previous patches. I considered adding
bionic.h to src/arch/bionic/include, but that was a horrible path and
the file must be included unconditionally by android-target anyway.

src/arch/bionic was renamed to src/arch/android for the sake of clarity.

Tested on android/arm64.

Henrik Austad (4):
  Android: clean up the bypass ifdeffery
  android: rename arch from bionic to android
  android: Expand match for android in ostype
  rt-sched.h: do not unconditionally define syscall-numbers

 Makefile                    |  2 +-
 src/arch/android/Makefile   | 25 +++++++++++++++++++++++++
 src/arch/bionic/Makefile    | 25 -------------------------
 src/cyclictest/cyclictest.c | 25 +++----------------------
 src/include/bionic.h        | 32 ++++++++++++++++++++++++++++++++
 src/include/rt-sched.h      |  4 ++++
 6 files changed, 65 insertions(+), 48 deletions(-)
 create mode 100644 src/arch/android/Makefile
 delete mode 100644 src/arch/bionic/Makefile
 create mode 100644 src/include/bionic.h

-- 
1.9.1

[PATCH 1/4] Android: clean up the bypass ifdeffery

[Henrik Austad]

88af643971b9 (android: adjust target for android) introduced some really
ugly ifdefs to avoid calling into pthread_barrier_wait and
pthread_barrier_init.

This patch attempts to coalesce this into a single place and let the
compiler handle the linking so that cyclictest.c is untouched by evil
ifdefs.

Compiled and tested on:
- x86_64 (v3.13 kernel)
- tilegx (v3.10 kernel)
- arm64 android (v3.10 kernel)

Note: this includes bionic.h unconditionally, so it makes most sense to
keep bionic.h in src/include/ (and not in src/arch/bionic/).

Cc: John Kacur <jkacur@redhat.com>
Signed-off-by: Henrik Austad <haustad@cisco.com>
---
 src/arch/bionic/Makefile    |  4 +---
 src/cyclictest/cyclictest.c | 25 +++----------------------
 src/include/bionic.h        | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 25 deletions(-)
 create mode 100644 src/include/bionic.h

diff --git a/src/arch/bionic/Makefile b/src/arch/bionic/Makefile
index 410d2c9c7c37..8e169f080adb 100644
--- a/src/arch/bionic/Makefile
+++ b/src/arch/bionic/Makefile
@@ -19,7 +19,5 @@ ifeq (android,$(ostype))
 # and link properly:
 # - cyclictest
 # - hackbench
-# - hwlatdetect
-	sources := cyclictest.c hackbench.c hwlatdetect.c
+	sources := cyclictest.c hackbench.c
 endif
-
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index b1f99ab22c57..5311d52d760d 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -40,6 +40,8 @@
 
 #include "rt-utils.h"
 
+#include <bionic.h>
+
 #define DEFAULT_INTERVAL 1000
 #define DEFAULT_DISTANCE 500
 
@@ -203,14 +205,12 @@ static pthread_mutex_t break_thread_id_lock = PTHREAD_MUTEX_INITIALIZER;
 static pid_t break_thread_id = 0;
 static uint64_t break_thread_value = 0;
 
-#ifndef NO_PTHREAD_BARRIER
 static int aligned = 0;
 static int secaligned = 0;
 static int offset = 0;
 static pthread_barrier_t align_barr;
 static pthread_barrier_t globalt_barr;
 static struct timespec globalt;
-#endif
 
 /* Backup of kernel variables that we modify */
 static struct kvars {
@@ -812,7 +812,6 @@ static void *timerthread(void *param)
 		fatal("timerthread%d: failed to set priority to %d\n", par->cpu, par->prio);
 
 	/* Get current time */
-#ifndef NO_PTHREAD_BARRIER
 	if(aligned || secaligned){
 		pthread_barrier_wait(&globalt_barr);
 		if (par->tnum == 0) {
@@ -838,7 +837,6 @@ static void *timerthread(void *param)
 		}
 	}
 	else
-#endif
 		clock_gettime(par->clock, &now);
 
 	next = now;
@@ -1045,9 +1043,7 @@ static void display_help(int error)
 	       "-a [NUM] --affinity        run thread #N on processor #N, if possible\n"
 	       "                           with NUM pin all threads to the processor NUM\n"
 #endif
-#ifndef NO_PTHREAD_BARRIER
 	       "-A USEC  --aligned=USEC    align thread wakeups to a specific offset\n"
-#endif
 	       "-b USEC  --breaktrace=USEC send break trace command when latency > USEC\n"
 	       "-B       --preemptirqs     both preempt and irqsoff tracing (used with -b)\n"
 	       "-c CLOCK --clock=CLOCK     select clock\n"
@@ -1088,9 +1084,7 @@ static void display_help(int error)
 	       "-R       --resolution      check clock resolution, calling clock_gettime() many\n"
 	       "                           times.  list of clock_gettime() values will be\n"
 	       "                           reported with -X\n"
-#ifndef NO_PTHREAD_BARRIER
 	       "         --secaligned [USEC] align thread wakeups to the next full second,\n"
-#endif
 	       "                           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"
@@ -1240,10 +1234,7 @@ enum option_values {
 	OPT_PRIOSPREAD, OPT_RELATIVE, OPT_RESOLUTION, OPT_SYSTEM, OPT_SMP, OPT_THREADS,
 	OPT_TRACER, OPT_UNBUFFERED, OPT_NUMA, OPT_VERBOSE, OPT_WAKEUP, OPT_WAKEUPRT,
 	OPT_DBGCYCLIC, OPT_POLICY, OPT_HELP, OPT_NUMOPTS,
-#ifndef NO_PTHREAD_BARRIER
-	OPT_ALIGNED, OPT_SECALIGNED,
-#endif
-        OPT_LAPTOP,
+	OPT_ALIGNED, OPT_SECALIGNED, OPT_LAPTOP,
 };
 
 /* Process commandline options */
@@ -1261,9 +1252,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
 		static struct option long_options[] = {
 			{"affinity",         optional_argument, NULL, OPT_AFFINITY},
 			{"notrace",          no_argument,       NULL, OPT_NOTRACE },
-#ifndef NO_PTHREAD_BARRIER
 			{"aligned",          optional_argument, NULL, OPT_ALIGNED },
-#endif
 			{"breaktrace",       required_argument, NULL, OPT_BREAKTRACE },
 			{"preemptirqs",      no_argument,       NULL, OPT_PREEMPTIRQ },
 			{"clock",            required_argument, NULL, OPT_CLOCK },
@@ -1293,9 +1282,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
 			{"priospread",       no_argument,       NULL, OPT_PRIOSPREAD },
 			{"relative",         no_argument,       NULL, OPT_RELATIVE },
 			{"resolution",       no_argument,       NULL, OPT_RESOLUTION },
-#ifndef NO_PTHREAD_BARRIER
 			{"secaligned",       optional_argument, NULL, OPT_SECALIGNED },
-#endif
 			{"system",           no_argument,       NULL, OPT_SYSTEM },
 			{"smp",              no_argument,       NULL, OPT_SMP },
 			{"threads",          optional_argument, NULL, OPT_THREADS },
@@ -1330,7 +1317,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
 				setaffinity = AFFINITY_USEALL;
 			}
 			break;
-#ifndef NO_PTHREAD_BARRIER
 		case 'A':
 		case OPT_ALIGNED:
 			aligned=1;
@@ -1341,7 +1327,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
 			else
 				offset = 0;
 			break;
-#endif
 		case 'b':
 		case OPT_BREAKTRACE:
 			tracelimit = atoi(optarg); break;
@@ -1442,7 +1427,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
 		case OPT_RESOLUTION:
 			check_clock_resolution = 1; break;
 		case 's':
-#ifndef NO_PTHREAD_BARRIER
 		case OPT_SECALIGNED:
 			secaligned = 1;
 			if (optarg != NULL)
@@ -1452,7 +1436,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
 			else
 				offset = 0;
 			break;
-#endif
 		case OPT_SYSTEM:
 			use_system = MODE_SYS_OFFSET; break;
 		case 'S':
@@ -1589,7 +1572,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
 	if (num_threads < 1)
 		error = 1;
 
-#ifndef NO_PTHREAD_BARRIER
 	if (aligned && secaligned)
 		error = 1;
 
@@ -1597,7 +1579,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
 		pthread_barrier_init(&globalt_barr, NULL, num_threads);
 		pthread_barrier_init(&align_barr, NULL, num_threads);
 	}
-#endif
 	if (error) {
 		if (affinity_mask)
 			rt_bitmask_free(affinity_mask);
diff --git a/src/include/bionic.h b/src/include/bionic.h
new file mode 100644
index 000000000000..8526299a75d2
--- /dev/null
+++ b/src/include/bionic.h
@@ -0,0 +1,32 @@
+#ifndef BIONIC_H
+#define BIONIC_H
+
+/* we do not have pthread barriers, add as small an emt */
+#ifdef NO_PTHREAD_BARRIER
+#warning Program is being compiled without PTHREAD_BARRIER support, some options may behave erratic.
+typedef int pthread_barrier_t;
+typedef int pthread_barrierattr_t;
+
+#ifndef PTHREAD_BARRIER_SERIAL_THREAD
+#define PTHREAD_BARRIER_SERIAL_THREAD 0
+#endif
+
+static inline int pthread_barrier_wait(pthread_barrier_t *barrier)
+{
+        return PTHREAD_BARRIER_SERIAL_THREAD;
+}
+
+static inline int pthread_barrier_destroy(pthread_barrier_t *barrier)
+{
+        return 0;
+}
+static inline int pthread_barrier_init(pthread_barrier_t * barrier,
+                                       const pthread_barrierattr_t * attr,
+                                       unsigned count)
+{
+        return 0;
+}
+
+#endif /* NO_PTHREAD_BARRIER */
+
+#endif /* BIONIC_H */
-- 
1.9.1

[PATCH 2/4] android: rename arch from bionic to android

[Henrik Austad]

From: Henrik Austad <henrik@austad.us>

Bionic is the libc implementation used in Android and should not be
confused with the architecture.

Cc: John Kacur <jkacur@redhat.com>
Signed-off-by: Henrik Austad <haustad@cisco.com>
---
 Makefile                  |  2 +-
 src/arch/android/Makefile | 23 +++++++++++++++++++++++
 src/arch/bionic/Makefile  | 23 -----------------------
 3 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 src/arch/android/Makefile
 delete mode 100644 src/arch/bionic/Makefile

diff --git a/Makefile b/Makefile
index c0801db45ced..804eb6824f0e 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ endif
 
 # Include any arch specific makefiles here. Make sure that TARGETS aren't
 # evaluated until AFTER this include
-include src/arch/bionic/Makefile
+include src/arch/android/Makefile
 TARGETS = $(sources:.c=)
 
 VPATH	= src/cyclictest:
diff --git a/src/arch/android/Makefile b/src/arch/android/Makefile
new file mode 100644
index 000000000000..8e169f080adb
--- /dev/null
+++ b/src/arch/android/Makefile
@@ -0,0 +1,23 @@
+
+# Bionic (android) does not have:
+# - pthread barriers
+# - pthread_[gs]etaffinity
+#
+# Typically see something like "aarch64-linux-android"
+ifeq (android,$(ostype))
+	USE_BIONIC := 1
+	CFLAGS += -DNO_PTHREAD_BARRIER
+	CFLAGS += -DNO_PTHREAD_SETAFFINITY
+
+	LDFLAGS += -pie
+# -lrt and -lpthread is in standard bionic library, no standalone library
+	LIBS := $(filter-out -lrt,$(LIBS))
+	LIBS := $(filter-out -lpthread,$(LIBS))
+
+# BIONIC does not support PI, barriers and has different files in
+# include/. This means that currently, only these binaries will compile
+# and link properly:
+# - cyclictest
+# - hackbench
+	sources := cyclictest.c hackbench.c
+endif
diff --git a/src/arch/bionic/Makefile b/src/arch/bionic/Makefile
deleted file mode 100644
index 8e169f080adb..000000000000
--- a/src/arch/bionic/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Bionic (android) does not have:
-# - pthread barriers
-# - pthread_[gs]etaffinity
-#
-# Typically see something like "aarch64-linux-android"
-ifeq (android,$(ostype))
-	USE_BIONIC := 1
-	CFLAGS += -DNO_PTHREAD_BARRIER
-	CFLAGS += -DNO_PTHREAD_SETAFFINITY
-
-	LDFLAGS += -pie
-# -lrt and -lpthread is in standard bionic library, no standalone library
-	LIBS := $(filter-out -lrt,$(LIBS))
-	LIBS := $(filter-out -lpthread,$(LIBS))

[PATCH 3/4] android: Expand match for android in ostype

[Henrik Austad]

From: Henrik Austad <henrik@austad.us>

Some buildsystems use androidabe, so an exact match will break in those
circumstances.

Cc: John Kacur <jkacur@redhat.com>
Signed-off-by: Henrik Austad <haustad@cisco.com>
---
 src/arch/android/Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/arch/android/Makefile b/src/arch/android/Makefile
index 8e169f080adb..4249311577f4 100644
--- a/src/arch/android/Makefile
+++ b/src/arch/android/Makefile
@@ -1,10 +1,14 @@
 
-# Bionic (android) does not have:
+# Android use Bionic for libc, and this does not have
 # - pthread barriers
 # - pthread_[gs]etaffinity
 #
-# Typically see something like "aarch64-linux-android"
-ifeq (android,$(ostype))
+# This is all handled by bionic.h based on flags we set here.
+
+# Typically see something like "aarch64-linux-android". However, in some
+# buildsystems, it will be a variation of -androidabe.
+ost=$(findstring android, $(ostype))
+ifeq (android,$(ost))
 	USE_BIONIC := 1
 	CFLAGS += -DNO_PTHREAD_BARRIER
 	CFLAGS += -DNO_PTHREAD_SETAFFINITY
@@ -14,9 +18,7 @@ ifeq (android,$(ostype))
 	LIBS := $(filter-out -lrt,$(LIBS))
 	LIBS := $(filter-out -lpthread,$(LIBS))
 
-# BIONIC does not support PI, barriers and has different files in
-# include/. This means that currently, only these binaries will compile
-# and link properly:
+# Currently, only these binaries will compile and link properly for android
 # - cyclictest
 # - hackbench
 	sources := cyclictest.c hackbench.c
-- 
1.9.1

[PATCH 4/4] rt-sched.h: do not unconditionally define syscall-numbers

[Henrik Austad]

These could be defined elsewhere, be careful when defining these

Cc: John Kacur <jkacur@redhat.com>
Signed-off-by: Henrik Austad <haustad@cisco.com>
---
 src/include/rt-sched.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/include/rt-sched.h b/src/include/rt-sched.h
index b46b1b16606f..679c4bd10ae2 100644
--- a/src/include/rt-sched.h
+++ b/src/include/rt-sched.h
@@ -43,9 +43,13 @@
 #endif
 
 #ifdef __arm__
+#ifndef __NR_sched_setattr
 #define __NR_sched_setattr		380
+#endif
+#ifndef __NR_sched_getattr
 #define __NR_sched_getattr		381
 #endif
+#endif
 
 #ifdef __tilegx__
 #define __NR_sched_setattr		274
-- 
1.9.1

Re: [PATCH 1/4] Android: clean up the bypass ifdeffery

[John Kacur]

On Wed, 21 Oct 2015, Henrik Austad wrote:

> 88af643971b9 (android: adjust target for android) introduced some really
> ugly ifdefs to avoid calling into pthread_barrier_wait and
> pthread_barrier_init.
> 
> This patch attempts to coalesce this into a single place and let the
> compiler handle the linking so that cyclictest.c is untouched by evil
> ifdefs.
> 
> Compiled and tested on:
> - x86_64 (v3.13 kernel)
> - tilegx (v3.10 kernel)
> - arm64 android (v3.10 kernel)
> 
> Note: this includes bionic.h unconditionally, so it makes most sense to
> keep bionic.h in src/include/ (and not in src/arch/bionic/).
> 
> Cc: John Kacur <jkacur@redhat.com>
> Signed-off-by: Henrik Austad <haustad@cisco.com>
> ---
>  src/arch/bionic/Makefile    |  4 +---
>  src/cyclictest/cyclictest.c | 25 +++----------------------
>  src/include/bionic.h        | 32 ++++++++++++++++++++++++++++++++
>  3 files changed, 36 insertions(+), 25 deletions(-)
>  create mode 100644 src/include/bionic.h
> 
> diff --git a/src/arch/bionic/Makefile b/src/arch/bionic/Makefile
> index 410d2c9c7c37..8e169f080adb 100644
> --- a/src/arch/bionic/Makefile
> +++ b/src/arch/bionic/Makefile
> @@ -19,7 +19,5 @@ ifeq (android,$(ostype))
>  # and link properly:
>  # - cyclictest
>  # - hackbench
> -# - hwlatdetect
> -	sources := cyclictest.c hackbench.c hwlatdetect.c
> +	sources := cyclictest.c hackbench.c
>  endif
> -
> diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
> index b1f99ab22c57..5311d52d760d 100644
> --- a/src/cyclictest/cyclictest.c
> +++ b/src/cyclictest/cyclictest.c
> @@ -40,6 +40,8 @@
>  
>  #include "rt-utils.h"
>  
> +#include <bionic.h>
> +
>  #define DEFAULT_INTERVAL 1000
>  #define DEFAULT_DISTANCE 500
>  
> @@ -203,14 +205,12 @@ static pthread_mutex_t break_thread_id_lock = PTHREAD_MUTEX_INITIALIZER;
>  static pid_t break_thread_id = 0;
>  static uint64_t break_thread_value = 0;
>  
> -#ifndef NO_PTHREAD_BARRIER
>  static int aligned = 0;
>  static int secaligned = 0;
>  static int offset = 0;
>  static pthread_barrier_t align_barr;
>  static pthread_barrier_t globalt_barr;
>  static struct timespec globalt;
> -#endif
>  
>  /* Backup of kernel variables that we modify */
>  static struct kvars {
> @@ -812,7 +812,6 @@ static void *timerthread(void *param)
>  		fatal("timerthread%d: failed to set priority to %d\n", par->cpu, par->prio);
>  
>  	/* Get current time */
> -#ifndef NO_PTHREAD_BARRIER
>  	if(aligned || secaligned){
>  		pthread_barrier_wait(&globalt_barr);
>  		if (par->tnum == 0) {
> @@ -838,7 +837,6 @@ static void *timerthread(void *param)
>  		}
>  	}
>  	else
> -#endif
>  		clock_gettime(par->clock, &now);
>  
>  	next = now;
> @@ -1045,9 +1043,7 @@ static void display_help(int error)
>  	       "-a [NUM] --affinity        run thread #N on processor #N, if possible\n"
>  	       "                           with NUM pin all threads to the processor NUM\n"
>  #endif
> -#ifndef NO_PTHREAD_BARRIER
>  	       "-A USEC  --aligned=USEC    align thread wakeups to a specific offset\n"
> -#endif
>  	       "-b USEC  --breaktrace=USEC send break trace command when latency > USEC\n"
>  	       "-B       --preemptirqs     both preempt and irqsoff tracing (used with -b)\n"
>  	       "-c CLOCK --clock=CLOCK     select clock\n"
> @@ -1088,9 +1084,7 @@ static void display_help(int error)
>  	       "-R       --resolution      check clock resolution, calling clock_gettime() many\n"
>  	       "                           times.  list of clock_gettime() values will be\n"
>  	       "                           reported with -X\n"
> -#ifndef NO_PTHREAD_BARRIER
>  	       "         --secaligned [USEC] align thread wakeups to the next full second,\n"
> -#endif
>  	       "                           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"
> @@ -1240,10 +1234,7 @@ enum option_values {
>  	OPT_PRIOSPREAD, OPT_RELATIVE, OPT_RESOLUTION, OPT_SYSTEM, OPT_SMP, OPT_THREADS,
>  	OPT_TRACER, OPT_UNBUFFERED, OPT_NUMA, OPT_VERBOSE, OPT_WAKEUP, OPT_WAKEUPRT,
>  	OPT_DBGCYCLIC, OPT_POLICY, OPT_HELP, OPT_NUMOPTS,
> -#ifndef NO_PTHREAD_BARRIER
> -	OPT_ALIGNED, OPT_SECALIGNED,
> -#endif
> -        OPT_LAPTOP,
> +	OPT_ALIGNED, OPT_SECALIGNED, OPT_LAPTOP,
>  };
>  
>  /* Process commandline options */
> @@ -1261,9 +1252,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
>  		static struct option long_options[] = {
>  			{"affinity",         optional_argument, NULL, OPT_AFFINITY},
>  			{"notrace",          no_argument,       NULL, OPT_NOTRACE },
> -#ifndef NO_PTHREAD_BARRIER
>  			{"aligned",          optional_argument, NULL, OPT_ALIGNED },
> -#endif
>  			{"breaktrace",       required_argument, NULL, OPT_BREAKTRACE },
>  			{"preemptirqs",      no_argument,       NULL, OPT_PREEMPTIRQ },
>  			{"clock",            required_argument, NULL, OPT_CLOCK },
> @@ -1293,9 +1282,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
>  			{"priospread",       no_argument,       NULL, OPT_PRIOSPREAD },
>  			{"relative",         no_argument,       NULL, OPT_RELATIVE },
>  			{"resolution",       no_argument,       NULL, OPT_RESOLUTION },
> -#ifndef NO_PTHREAD_BARRIER
>  			{"secaligned",       optional_argument, NULL, OPT_SECALIGNED },
> -#endif
>  			{"system",           no_argument,       NULL, OPT_SYSTEM },
>  			{"smp",              no_argument,       NULL, OPT_SMP },
>  			{"threads",          optional_argument, NULL, OPT_THREADS },
> @@ -1330,7 +1317,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
>  				setaffinity = AFFINITY_USEALL;
>  			}
>  			break;
> -#ifndef NO_PTHREAD_BARRIER
>  		case 'A':
>  		case OPT_ALIGNED:
>  			aligned=1;
> @@ -1341,7 +1327,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
>  			else
>  				offset = 0;
>  			break;
> -#endif
>  		case 'b':
>  		case OPT_BREAKTRACE:
>  			tracelimit = atoi(optarg); break;
> @@ -1442,7 +1427,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
>  		case OPT_RESOLUTION:
>  			check_clock_resolution = 1; break;
>  		case 's':
> -#ifndef NO_PTHREAD_BARRIER
>  		case OPT_SECALIGNED:
>  			secaligned = 1;
>  			if (optarg != NULL)
> @@ -1452,7 +1436,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
>  			else
>  				offset = 0;
>  			break;
> -#endif
>  		case OPT_SYSTEM:
>  			use_system = MODE_SYS_OFFSET; break;
>  		case 'S':
> @@ -1589,7 +1572,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
>  	if (num_threads < 1)
>  		error = 1;
>  
> -#ifndef NO_PTHREAD_BARRIER
>  	if (aligned && secaligned)
>  		error = 1;
>  
> @@ -1597,7 +1579,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
>  		pthread_barrier_init(&globalt_barr, NULL, num_threads);
>  		pthread_barrier_init(&align_barr, NULL, num_threads);
>  	}
> -#endif
>  	if (error) {
>  		if (affinity_mask)
>  			rt_bitmask_free(affinity_mask);
> diff --git a/src/include/bionic.h b/src/include/bionic.h
> new file mode 100644
> index 000000000000..8526299a75d2
> --- /dev/null
> +++ b/src/include/bionic.h
> @@ -0,0 +1,32 @@
> +#ifndef BIONIC_H
> +#define BIONIC_H
> +
> +/* we do not have pthread barriers, add as small an emt */

I'm not sure what the above comment means? What is an "emt"

> +#ifdef NO_PTHREAD_BARRIER
> +#warning Program is being compiled without PTHREAD_BARRIER support, some options may behave erratic.

Small grammar correction, change "erratic" to "erratically"

> +typedef int pthread_barrier_t;
> +typedef int pthread_barrierattr_t;
> +
> +#ifndef PTHREAD_BARRIER_SERIAL_THREAD
> +#define PTHREAD_BARRIER_SERIAL_THREAD 0
> +#endif
> +
> +static inline int pthread_barrier_wait(pthread_barrier_t *barrier)
> +{
> +        return PTHREAD_BARRIER_SERIAL_THREAD;
> +}
> +
> +static inline int pthread_barrier_destroy(pthread_barrier_t *barrier)
> +{
> +        return 0;
> +}
> +static inline int pthread_barrier_init(pthread_barrier_t * barrier,
> +                                       const pthread_barrierattr_t * attr,
> +                                       unsigned count)
> +{
> +        return 0;
> +}
> +
> +#endif /* NO_PTHREAD_BARRIER */
> +
> +#endif /* BIONIC_H */
> -- 
> 1.9.1
> 
> --


I really like where this patch is going, very nice clean-up
However, you said you were going to create the patch against the latest 
development version, and I don't think you did, since it didn't apply, it 
didn't take very much for me to fix-it up, but I'm going to let you do it 
again anyway.

You also need to apply your trick to remove the #ifdef code out of 
cyclictest for NO_PTHREAD_SETAFFINITY, ie int pthread_setaffinity_np()

Finally, please review the other patches again before I get to them to 
make sure they will apply clearly.

Cheers, and thanks

John