Protect shared affinity table with mutex

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/test_mutex.c b/test_mutex.c
index 4cf1d32c29151e54f1aa3dd67461bc4f3e1b8098..e82498070f675ea74330eb2e3d4acf8bddd7cbe5 100644 (file)
--- a/test_mutex.c
+++ b/test_mutex.c
@@ -98,22 +98,33 @@ static unsigned int cpu_affinities[NR_CPUS];
 static unsigned int next_aff = 0;
 static int use_affinity = 0;
 
+pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 static void set_affinity(void)
 {
        cpu_set_t mask;
        int cpu;
+       int ret;
 
        if (!use_affinity)
                return;
 
+       ret = pthread_mutex_lock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex lock");
+               exit(-1);
+       }
        cpu = cpu_affinities[next_aff++];
+       ret = pthread_mutex_unlock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex unlock");
+               exit(-1);
+       }
        CPU_ZERO(&mask);
        CPU_SET(cpu, &mask);
        sched_setaffinity(0, sizeof(mask), &mask);
 }
 
-
-
 /*
  * returns 0 if test should end.
  */

diff --git a/test_perthreadlock.c b/test_perthreadlock.c
index 5bbe72b1637af9adbaa099cb4c4631a74a3fc50e..31b7721d631a2ea8e4470029da35d66d3bb89e7f 100644 (file)
--- a/test_perthreadlock.c
+++ b/test_perthreadlock.c
@@ -102,22 +102,33 @@ static unsigned int cpu_affinities[NR_CPUS];
 static unsigned int next_aff = 0;
 static int use_affinity = 0;
 
+pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 static void set_affinity(void)
 {
        cpu_set_t mask;
        int cpu;
+       int ret;
 
        if (!use_affinity)
                return;
 
+       ret = pthread_mutex_lock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex lock");
+               exit(-1);
+       }
        cpu = cpu_affinities[next_aff++];
+       ret = pthread_mutex_unlock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex unlock");
+               exit(-1);
+       }
        CPU_ZERO(&mask);
        CPU_SET(cpu, &mask);
        sched_setaffinity(0, sizeof(mask), &mask);
 }
 
-
-
 /*
  * returns 0 if test should end.
  */

diff --git a/test_qsbr.c b/test_qsbr.c
index af5ccfd58317d06d5c1e2d6c37ac0f268b0c5e16..2617629743e15a80b77da08b33de7cc7206e25f0 100644 (file)
--- a/test_qsbr.c
+++ b/test_qsbr.c
@@ -92,22 +92,33 @@ static unsigned int cpu_affinities[NR_CPUS];
 static unsigned int next_aff = 0;
 static int use_affinity = 0;
 
+pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 static void set_affinity(void)
 {
        cpu_set_t mask;
        int cpu;
+       int ret;
 
        if (!use_affinity)
                return;
 
+       ret = pthread_mutex_lock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex lock");
+               exit(-1);
+       }
        cpu = cpu_affinities[next_aff++];
+       ret = pthread_mutex_unlock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex unlock");
+               exit(-1);
+       }
        CPU_ZERO(&mask);
        CPU_SET(cpu, &mask);
        sched_setaffinity(0, sizeof(mask), &mask);
 }
 
-
-
 /*
  * returns 0 if test should end.
  */

diff --git a/test_qsbr_gc.c b/test_qsbr_gc.c
index 0b2d5df8ddd8dd13cc36c1b40998f78e2a646322..98094a6c80da23c90d738d9f11d8e29fa6e278bf 100644 (file)
--- a/test_qsbr_gc.c
+++ b/test_qsbr_gc.c
@@ -101,22 +101,33 @@ static unsigned int cpu_affinities[NR_CPUS];
 static unsigned int next_aff = 0;
 static int use_affinity = 0;
 
+pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 static void set_affinity(void)
 {
        cpu_set_t mask;
        int cpu;
+       int ret;
 
        if (!use_affinity)
                return;
 
+       ret = pthread_mutex_lock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex lock");
+               exit(-1);
+       }
        cpu = cpu_affinities[next_aff++];
+       ret = pthread_mutex_unlock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex unlock");
+               exit(-1);
+       }
        CPU_ZERO(&mask);
        CPU_SET(cpu, &mask);
        sched_setaffinity(0, sizeof(mask), &mask);
 }
 
-
-
 /*
  * returns 0 if test should end.
  */

diff --git a/test_rwlock.c b/test_rwlock.c
index b7909019f8b1df843e25512bad4367d427a1bbfe..4cc4c07f953dc5f1ae4d43ce96fb860bcc3f5f55 100644 (file)
--- a/test_rwlock.c
+++ b/test_rwlock.c
@@ -98,22 +98,33 @@ static unsigned int cpu_affinities[NR_CPUS];
 static unsigned int next_aff = 0;
 static int use_affinity = 0;
 
+pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 static void set_affinity(void)
 {
        cpu_set_t mask;
        int cpu;
+       int ret;
 
        if (!use_affinity)
                return;
 
+       ret = pthread_mutex_lock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex lock");
+               exit(-1);
+       }
        cpu = cpu_affinities[next_aff++];
+       ret = pthread_mutex_unlock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex unlock");
+               exit(-1);
+       }
        CPU_ZERO(&mask);
        CPU_SET(cpu, &mask);
        sched_setaffinity(0, sizeof(mask), &mask);
 }
 
-
-
 /*
  * returns 0 if test should end.
  */

diff --git a/test_urcu_gc.c b/test_urcu_gc.c
index f1cce248a8b604709ffcb9e3a265c1f983bc03f7..66b714ba072f786e1bc519382543e036f03df50a 100644 (file)
--- a/test_urcu_gc.c
+++ b/test_urcu_gc.c
@@ -105,22 +105,33 @@ static unsigned int cpu_affinities[NR_CPUS];
 static unsigned int next_aff = 0;
 static int use_affinity = 0;
 
+pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 static void set_affinity(void)
 {
        cpu_set_t mask;
        int cpu;
+       int ret;
 
        if (!use_affinity)
                return;
 
+       ret = pthread_mutex_lock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex lock");
+               exit(-1);
+       }
        cpu = cpu_affinities[next_aff++];
+       ret = pthread_mutex_unlock(&affinity_mutex);
+       if (ret) {
+               perror("Error in pthread mutex unlock");
+               exit(-1);
+       }
        CPU_ZERO(&mask);
        CPU_SET(cpu, &mask);
        sched_setaffinity(0, sizeof(mask), &mask);
 }
 
-
-
 /*
  * returns 0 if test should end.
  */