projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
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 378f82688f4510187e3fdbf39410751d83c2c903..f341962061da1a4a17855bc4baaa2ae3856d481a 100644
(file)
--- a/
libtest/blobslap_worker.cc
+++ b/
libtest/blobslap_worker.cc
@@
-20,12
+20,10
@@
*/
*/
+#include <config.h>
#include <libtest/common.h>
#include <libtest/blobslap_worker.h>
#include <libtest/common.h>
#include <libtest/blobslap_worker.h>
-#include <libtest/killpid.h>
-
-using namespace libtest;
#include <cassert>
#include <cerrno>
#include <cassert>
#include <cerrno>
@@
-44,14
+42,14
@@
using namespace libtest;
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
-using namespace libtest;
+namespace libtest {
class BlobslapWorker : public Server
{
private:
public:
BlobslapWorker(in_port_t port_arg) :
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();
}
{
set_pid_file();
}
@@
-120,29
+118,14
@@
public:
return "blobslap_worker";
};
return "blobslap_worker";
};
- const char *executable()
- {
- return GEARMAND_BLOBSLAP_WORKER;
- }
-
- const char *pid_file_option()
+ bool has_port_option() const
{
{
- return "--pid-file=";
- }
-
- const char *daemon_file_option()
- {
- return "--daemon";
- }
-
- const char *log_file_option()
- {
- return "--log-file=";
+ return true;
}
}
- const char *port_option()
+ bool has_log_file_option() const
{
{
- return
"--port="
;
+ return
true
;
}
bool is_libtool()
}
bool is_libtool()
@@
-150,31
+133,27
@@
public:
return true;
}
return true;
}
- bool build(
in
t argc, const char *argv[]);
+ bool build(
size_
t argc, const char *argv[]);
};
#include <sstream>
};
#include <sstream>
-bool BlobslapWorker::build(
in
t argc, const char *argv[])
+bool BlobslapWorker::build(
size_
t argc, const char *argv[])
{
std::stringstream arg_buffer;
{
std::stringstream arg_buffer;
- for (
int x= 1
; x < argc ; x++)
+ for (
size_t x= 0
; x < argc ; x++)
{
{
- a
rg_buffer << " " << argv[x] << " "
;
+ a
dd_option(argv[x])
;
}
}
- set_extra_args(arg_buffer.str());
-
return true;
}
return true;
}
-namespace libtest {
-
Server *build_blobslap_worker(in_port_t try_port)
{
return new BlobslapWorker(try_port);
}
Server *build_blobslap_worker(in_port_t try_port)
{
return new BlobslapWorker(try_port);
}
-}
+}
// namespace libtest