memcached_io_reset passed wrong struct

[awesomized/libmemcached] / clients / memslap.c

diff --git a/clients/memslap.c b/clients/memslap.c
index ddb18f3e7f303b9a95081cf1c269677b3a8c087d..7aa69eadf543f7b039269e89c038857a2b2a578f 100644 (file)
--- a/clients/memslap.c
+++ b/clients/memslap.c
@@ -206,14 +206,7 @@ void scheduler(memcached_server_st *servers, conclusions_st *conclusion)
   */
   pthread_mutex_lock(&counter_mutex);
   while (thread_counter)
-  {
-    struct timespec abstime;
-
-    memset(&abstime, 0, sizeof(struct timespec));
-    abstime.tv_sec= 1;
-
-    pthread_cond_timedwait(&count_threshhold, &counter_mutex, &abstime);
-  }
+    pthread_cond_wait(&count_threshhold, &counter_mutex);
   pthread_mutex_unlock(&counter_mutex);
 
   gettimeofday(&end_time, NULL);
@@ -292,6 +285,7 @@ void options_parse(int argc, char *argv[])
       break;
     case OPT_SLAP_CONCURRENCY:
       opt_concurrency= strtol(optarg, (char **)NULL, 10);
+      break;
     case OPT_SLAP_EXECUTE_NUMBER:
       opt_execute_number= strtol(optarg, (char **)NULL, 10);
       break;