Merge working tree with build tree.

[m6w6/libmemcached] / libtest / blobslap_worker.cc

diff --git a/libtest/blobslap_worker.cc b/libtest/blobslap_worker.cc
index 5bf5f535f38355ae2c43a3d469774863d03cb479..f341962061da1a4a17855bc4baaa2ae3856d481a 100644 (file)
--- a/libtest/blobslap_worker.cc
+++ b/libtest/blobslap_worker.cc
@@ -20,6 +20,7 @@
  */
 
 
+#include <config.h>
 #include <libtest/common.h>
 
 #include <libtest/blobslap_worker.h>
@@ -48,7 +49,7 @@ class BlobslapWorker : public Server
 private:
 public:
   BlobslapWorker(in_port_t port_arg) :
-    Server("localhost", port_arg)
+    Server("localhost", port_arg, "benchmark/blobslap_worker", true)
   { 
     set_pid_file();
   }
@@ -117,16 +118,6 @@ public:
     return "blobslap_worker";
   };
 
-  const char *executable()
-  {
-    return "benchmark/blobslap_worker";
-  }
-
-  const char *daemon_file_option()
-  {
-    return "--daemon";
-  }
-
   bool has_port_option() const
   {
     return true;
@@ -142,17 +133,17 @@ public:
     return true;
   }
 
-  bool build(int argc, const char *argv[]);
+  bool build(size_t argc, const char *argv[]);
 };
 
 
 #include <sstream>
 
-bool BlobslapWorker::build(int argc, const char *argv[])
+bool BlobslapWorker::build(size_t argc, const char *argv[])
 {
   std::stringstream arg_buffer;
 
-  for (int x= 1 ; x < argc ; x++)
+  for (size_t x= 0 ; x < argc ; x++)
   {
     add_option(argv[x]);
   }