X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fblobslap_worker.cc;h=dbd41ac6df19eb9a796f65649cc0fedd92856a67;hb=21f850c451cb7db8a0085ddcc892290ecac859eb;hp=a12df583e7f9db599ac403a2f6b8b006806e5ee0;hpb=ee71b673a9ce3261cd81723262a8516949388be9;p=awesomized%2Flibmemcached diff --git a/libtest/blobslap_worker.cc b/libtest/blobslap_worker.cc index a12df583..dbd41ac6 100644 --- a/libtest/blobslap_worker.cc +++ b/libtest/blobslap_worker.cc @@ -1,31 +1,44 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * libtest * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Data Differential YATL (i.e. libtest) library * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include -#include - -using namespace libtest; #include #include @@ -44,32 +57,43 @@ using namespace libtest; #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) : - Server("localhost", port_arg) - { } + Server("localhost", port_arg, "benchmark/blobslap_worker", true) + { + set_pid_file(); + } pid_t get_pid(bool error_is_ok) { - if (not pid_file().empty()) + if (pid_file().empty()) { - Wait wait(pid_file(), 0); + Error << "pid_file was empty"; + return -1; + } + + Wait wait(pid_file(), 0); + + if (error_is_ok and not wait.successful()) + { + Error << "Pidfile was not found:" << pid_file(); + return -1; + } - if (error_is_ok and not wait.successful()) - { - Error << "Pidfile was not found:" << pid_file(); - return -1; + std::stringstream error_message; + pid_t ret= get_pid_from_file(pid_file(), error_message); - return get_pid_from_file(pid_file()); - } + if (error_is_ok and is_pid_valid(ret) == false) + { + Error << error_message.str(); } - return -1; + return ret; } bool ping() @@ -87,12 +111,15 @@ public: return false; } - pid_t local_pid= get_pid_from_file(pid_file()); - if (local_pid <= 0) + std::stringstream error_message; + pid_t local_pid= get_pid_from_file(pid_file(), error_message); + if (is_pid_valid(local_pid) == false) { + Error << error_message.str(); return false; } + // Use kill to determine is the process exist if (::kill(local_pid, 0) == 0) { return true; @@ -106,29 +133,14 @@ public: return "blobslap_worker"; }; - const char *executable() + bool has_port_option() const { - return GEARMAND_BLOBSLAP_WORKER; - } - - const char *pid_file_option() - { - return "--pid-file="; - } - - const char *daemon_file_option() - { - return "--daemon"; - } - - const char *log_file_option() - { - return NULL; + return true; } - const char *port_option() + bool has_log_file_option() const { - return "--port="; + return true; } bool is_libtool() @@ -136,31 +148,27 @@ public: return true; } - bool build(int argc, const char *argv[]); + bool build(size_t argc, const char *argv[]); }; #include -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++) { - arg_buffer << " " << argv[x] << " "; + add_option(argv[x]); } - set_extra_args(arg_buffer.str()); - return true; } -namespace libtest { - Server *build_blobslap_worker(in_port_t try_port) { return new BlobslapWorker(try_port); } -} +} // namespace libtest