From e17607b0d3b1bcac8bc39cb356c8c44ac93d8620 Mon Sep 17 00:00:00 2001 From: counterpoint Date: Fri, 3 Oct 2014 15:47:03 +0100 Subject: [PATCH] Minor changes to tests; fix typo; tidy up. --- server/core/buffer.c | 2 -- server/core/config.c | 2 +- server/core/spinlock.c | 2 +- server/core/test/testspinlock.c | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/core/buffer.c b/server/core/buffer.c index aac8f59e4..bb40a8d40 100644 --- a/server/core/buffer.c +++ b/server/core/buffer.c @@ -277,8 +277,6 @@ return_clonebuf: GWBUF * gwbuf_append(GWBUF *head, GWBUF *tail) { -GWBUF *ptr = head; - if (!head) return tail; CHK_GWBUF(head); diff --git a/server/core/config.c b/server/core/config.c index 0255f8c2c..ead016000 100644 --- a/server/core/config.c +++ b/server/core/config.c @@ -131,7 +131,7 @@ CONFIG_PARAMETER *param, *p1; ptr->element = NULL; cntxt->next = ptr; } - /* Check to see if the paramter already exists for the section */ + /* Check to see if the parameter already exists for the section */ p1 = ptr->parameters; while (p1) { diff --git a/server/core/spinlock.c b/server/core/spinlock.c index 3c75e9c94..871ec42bb 100644 --- a/server/core/spinlock.c +++ b/server/core/spinlock.c @@ -128,7 +128,7 @@ spinlock_release(SPINLOCK *lock) lock->max_waiting = lock->waiting; #endif #ifdef __GNUC__ - __sync_synchronize(); // Memory barrier. + __sync_synchronize(); /* Memory barrier. */ lock->lock = 0; #else atomic_add(&(lock->lock), -1); diff --git a/server/core/test/testspinlock.c b/server/core/test/testspinlock.c index a62e995a6..14501cea5 100644 --- a/server/core/test/testspinlock.c +++ b/server/core/test/testspinlock.c @@ -135,7 +135,7 @@ struct timespec sleeptime; * Start multiple threads that obtain spinlock and run process bound */ #define THREADS 5 -#define ITERATIONS 25000 +#define ITERATIONS 50000 #define PROCESS_LOOP 10000 #define SECONDS 15 #define NANOTIME 100000 @@ -184,7 +184,7 @@ time_t rawtime; } active = 0; spinlock_release(&lck); - for (i=0; i<(8*PROCESS_LOOP); i++); + for (i=0; i<(4*PROCESS_LOOP); i++); // nanosleep(&sleeptime, NULL); } spinlock_release(&lck);