See if this fixes the ICC

[m6w6/libmemcached] / libtest / blobslap_worker.cc

diff --git a/libtest/blobslap_worker.cc b/libtest/blobslap_worker.cc
index 2ac07d681cee9591407a6385f5f4c3f32742a005..8bbd073857ce8d2bdb1430725e603f6221bdefa5 100644 (file)
--- a/libtest/blobslap_worker.cc
+++ b/libtest/blobslap_worker.cc
@@ -4,41 +4,25 @@
  *
  *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
  *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
+ *  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.
  *
- *      * 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.
+ *  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.
  *
+ *  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 <libtest/common.h>
-#include <libtest/blobslap_worker.h>
-#include <libtest/killpid.h>
 
-using namespace libtest;
+#include <libtest/blobslap_worker.h>
 
 #include <cassert>
 #include <cerrno>
@@ -57,7 +41,7 @@ using namespace libtest;
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 
-using namespace libtest;
+namespace libtest {
 
 class BlobslapWorker : public Server
 {
@@ -65,24 +49,35 @@ private:
 public:
   BlobslapWorker(in_port_t port_arg) :
     Server("localhost", port_arg)
-  { }
+  { 
+    set_pid_file();
+  }
 
   pid_t get_pid(bool error_is_ok)
   {
-    if (not pid_file().empty())
+    if (pid_file().empty())
+    {
+      Error << "pid_file was empty";
+      return -1;
+    }
+
+    Wait wait(pid_file(), 0);
+
+    if (error_is_ok and not wait.successful())
     {
-      Wait wait(pid_file(), 0);
+      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()
@@ -100,12 +95,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;
@@ -121,7 +119,7 @@ public:
 
   const char *executable()
   {
-    return GEARMAND_BLOBSLAP_WORKER;
+    return "benchmark/blobslap_worker";
   }
 
   const char *pid_file_option()
@@ -136,7 +134,7 @@ public:
 
   const char *log_file_option()
   {
-    return NULL;
+    return "--log-file=";
   }
 
   const char *port_option()
@@ -169,11 +167,9 @@ bool BlobslapWorker::build(int argc, const char *argv[])
   return true;
 }
 
-namespace libtest {
-
 Server *build_blobslap_worker(in_port_t try_port)
 {
   return new BlobslapWorker(try_port);
 }
 
-}
+} // namespace libtest