Made the new memslap code build. Moved config.h include to the beginning of each...

diff --git a/clients/Makefile.am b/clients/Makefile.am
index e5a1f0c0afff8d7e5eb9eea1a84a2117a500fc7e..26b08e64dd32179fc2b3d8e35209b884704aca72 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -33,7 +33,14 @@ memflush_LDADD = $(LDADDS)
 memerror_SOURCES = memerror.c
 memerror_LDADD = $(LDADDS)
 
-memslap_SOURCES = memslap.c
+memslap_SOURCES = \
+               memslap.c \
+               ms_conn.c \
+               ms_setting.c \
+               ms_sigsegv.c \
+               ms_stats.c \
+               ms_task.c \
+               ms_thread.c
 memslap_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 memslap_LDADD = $(PTHREAD_LIBS) libgenexec.la $(LDADDS)
 

diff --git a/clients/ms_conn.c b/clients/ms_conn.c
index f4c7347d531892b0cd462c483aaba3ec82856316..ad12a113b11f5015c7097d0e4345e9ea7bdc7ca6 100644 (file)
--- a/clients/ms_conn.c
+++ b/clients/ms_conn.c
@@ -8,6 +8,9 @@
  * http://www.schoonerinfotech.com/
  *
  */
+
+#include "config.h"
+
 #include <stdio.h>
 #include <limits.h>
 #include <sys/uio.h>

diff --git a/clients/ms_memslap.h b/clients/ms_memslap.h
index a2f6254ddbf7f78159733ffb9a7e2cb849f5487f..94b53a7858bf5fa7c688b24e42e10b87535f8131 100644 (file)
--- a/clients/ms_memslap.h
+++ b/clients/ms_memslap.h
@@ -21,7 +21,6 @@
 #include <pthread.h>
 #include <stdbool.h>
 #include <math.h>
-#include "../config.h"
 
 #include "ms_stats.h"
 

diff --git a/clients/ms_setting.c b/clients/ms_setting.c
index 8bcb4db5962655005d78ea999f5f3bcc41b4e2bf..51f89714ac7c407f1039698444c6e2bbf3d23e70 100644 (file)
--- a/clients/ms_setting.c
+++ b/clients/ms_setting.c
@@ -8,6 +8,9 @@
  * http://www.schoonerinfotech.com/
  *
  */
+
+#include "config.h"
+
 #include <ctype.h>
 #include "ms_setting.h"
 #include "ms_conn.h"
@@ -32,7 +35,7 @@
 const char ALPHANUMBERICS[]=
   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-";
 
-ms_setting_t ms_setting;       /* store the settings specified by user */
+ms_setting_st ms_setting;       /* store the settings specified by user */
 
 
 /* read setting from configuration file */
@@ -818,7 +821,7 @@ static void ms_setting_slapmode_init_pre()
  */
 void ms_setting_init_pre()
 {
-  memset(&ms_setting, 0, sizeof(ms_setting_t));
+  memset(&ms_setting, 0, sizeof(ms_setting));
 
   /* common initialize */
   ms_setting.ncpu= ms_get_cpu_count();

diff --git a/clients/ms_setting.h b/clients/ms_setting.h
index d08998c61ed3ded374744097a8e2811df07568e7..3cccc6ba654ae90b031ed26eaf128744651edd05 100644 (file)
--- a/clients/ms_setting.h
+++ b/clients/ms_setting.h
@@ -156,9 +156,9 @@ typedef struct setting
   bool binary_prot;                     /* whether it use binary protocol */
   int expected_tps;                     /* expected throughput */
   int rep_write_srv;                    /* which servers are used to do replication writing */
-} ms_setting_t;
+} ms_setting_st;
 
-extern ms_setting_t ms_setting;
+extern ms_setting_st ms_setting;
 
 /* previous part of initialization of setting structure */
 void ms_setting_init_pre(void);

diff --git a/clients/ms_sigsegv.c b/clients/ms_sigsegv.c
index 69f038f9328954ae4fd9c1535d9109d5c895c839..a91acc96e8ad4f7cf84691b927eb5741ca4b4579 100644 (file)
--- a/clients/ms_sigsegv.c
+++ b/clients/ms_sigsegv.c
@@ -8,6 +8,9 @@
  * http://www.schoonerinfotech.com/
  *
  */
+
+#include "config.h"
+
 #include <memory.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/clients/ms_stats.c b/clients/ms_stats.c
index 960467fd46c3515704be8eecb39290237d74d73f..7fad7fb8e0aeb1f24a7fbf67ae80284811fab4a8 100644 (file)
--- a/clients/ms_stats.c
+++ b/clients/ms_stats.c
@@ -8,6 +8,9 @@
  * http://www.schoonerinfotech.com/
  *
  */
+
+#include "config.h"
+
 #include "ms_stats.h"
 
 #define array_size(x)    (sizeof(x) / sizeof((x)[0]))

diff --git a/clients/ms_task.c b/clients/ms_task.c
index 21dabe01dbe8443bd6a3a7d437cd54b28cac3220..aadc419ebc2eddf9b4ed5b8fd04f55be2f422880 100644 (file)
--- a/clients/ms_task.c
+++ b/clients/ms_task.c
@@ -8,6 +8,9 @@
  * http://www.schoonerinfotech.com/
  *
  */
+
+#include "config.h"
+
 #include "ms_thread.h"
 #include "ms_setting.h"
 

diff --git a/clients/ms_thread.c b/clients/ms_thread.c
index f8dc1b0165c766f4eaaced013b691366012ddc44..9af3a10b24bf5897150e702aa102c843a37bdb99 100644 (file)
--- a/clients/ms_thread.c
+++ b/clients/ms_thread.c
@@ -8,6 +8,9 @@
  * http://www.schoonerinfotech.com/
  *
  */
+
+#include "config.h"
+
 #include "ms_thread.h"
 #include "ms_setting.h"