From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Thu, 12 Nov 2015 10:24:19 +0000 (+0100)
Subject: [mc] Remove Process:status_
X-Git-Tag: v3_13~1582^2~4
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/97c735054d7772a511a6933745ef9158e3b2b29d

[mc] Remove Process:status_
---

diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp
index f775ba4833..f0ee0f230c 100644
--- a/src/mc/Process.cpp
+++ b/src/mc/Process.cpp
@@ -213,7 +213,6 @@ Process::Process(pid_t pid, int sockfd) : AddressSpace(this)
   process->socket_ = sockfd;
   process->pid_ = pid;
   process->running_ = true;
-  process->status_ = 0;
   process->memory_map_ = simgrid::xbt::get_memory_map(pid);
   process->cache_flags = MC_PROCESS_CACHE_FLAG_NONE;
   process->init_memory_map_info();
diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp
index 512f6f26af..5d50961f0e 100644
--- a/src/mc/Process.hpp
+++ b/src/mc/Process.hpp
@@ -124,17 +124,11 @@ public:
     return running_;
   }
 
-  void terminate(int status)
+  void terminate()
   {
-    status_ = status;
     running_ = false;
   }
 
-  int status() const
-  {
-    return status_;
-  }
-
   template<class M>
   typename std::enable_if< std::is_class<M>::value && std::is_trivial<M>::value, int >::type
   send_message(M const& m)
@@ -174,7 +168,6 @@ private:
 private:
   pid_t pid_;
   int socket_;
-  int status_;
   bool running_;
   std::vector<simgrid::xbt::VmMap> memory_map_;
   remote_ptr<void> maestro_stack_start_, maestro_stack_end_;
diff --git a/src/mc/Server.cpp b/src/mc/Server.cpp
index 05902d58cc..d490313082 100644
--- a/src/mc/Server.cpp
+++ b/src/mc/Server.cpp
@@ -95,14 +95,10 @@ void Server::shutdown()
   XBT_DEBUG("Shuting down model-checker");
 
   simgrid::mc::Process* process = &mc_model_checker->process();
-  int status = process->status();
   if (process->running()) {
     XBT_DEBUG("Killing process");
     kill(process->pid(), SIGTERM);
-    if (waitpid(process->pid(), &status, 0) == -1)
-      throw std::system_error(errno, std::system_category());
-    // TODO, handle the case when the process does not want to die with a timeout
-    process->terminate(status);
+    process->terminate();
   }
 }
 
@@ -328,7 +324,7 @@ void Server::handle_waitpid()
 
       else if (WIFEXITED(status) || WIFSIGNALED(status)) {
         XBT_DEBUG("Child process is over");
-        mc_model_checker->process().terminate(status);
+        mc_model_checker->process().terminate();
       }
     }
   }