MC: rename remote/EventLoop into remote/CheckerSide

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 212c528..5a4bb25 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_MC_MODEL_CHECKER_HPP
 #define SIMGRID_MC_MODEL_CHECKER_HPP
 
-#include "src/mc/remote/EventLoop.hpp"
+#include "src/mc/remote/CheckerSide.hpp"
 #include "src/mc/sosp/PageStore.hpp"
 #include "xbt/base.h"
 
@@ -20,7 +20,7 @@ namespace mc {
 /** State of the model-checker (global variables for the model checker)
  */
 class ModelChecker {
-  EventLoop event_loop_;
+  CheckerSide event_loop_;
   /** String pool for host names */
   std::set<std::string> hostnames_;
   // This is the parent snapshot of the current state:

diff --git a/src/mc/remote/EventLoop.cpp b/src/mc/remote/CheckerSide.cpp
similarity index 75%
rename from src/mc/remote/EventLoop.cpp
rename to src/mc/remote/CheckerSide.cpp
index 3b1b1b9..b6732f6 100644 (file)
--- a/src/mc/remote/EventLoop.cpp
+++ b/src/mc/remote/CheckerSide.cpp
@@ -3,11 +3,11 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/mc/remote/EventLoop.hpp"
+#include "src/mc/remote/CheckerSide.hpp"
 #include <signal.h>
 #include <sys/wait.h>
 
-simgrid::mc::EventLoop::~EventLoop()
+simgrid::mc::CheckerSide::~CheckerSide()
 {
   if (socket_event_ != nullptr)
     event_free(socket_event_);
@@ -17,7 +17,7 @@ simgrid::mc::EventLoop::~EventLoop()
     event_base_free(base_);
 }
 
-void simgrid::mc::EventLoop::start(int socket, void (*handler)(int, short, void*))
+void simgrid::mc::CheckerSide::start(int socket, void (*handler)(int, short, void*))
 {
   base_ = event_base_new();
 
@@ -28,12 +28,12 @@ void simgrid::mc::EventLoop::start(int socket, void (*handler)(int, short, void*
   event_add(signal_event_, NULL);
 }
 
-void simgrid::mc::EventLoop::dispatch()
+void simgrid::mc::CheckerSide::dispatch()
 {
   event_base_dispatch(base_);
 }
 
-void simgrid::mc::EventLoop::break_loop()
+void simgrid::mc::CheckerSide::break_loop()
 {
   event_base_loopbreak(base_);
 }

diff --git a/src/mc/remote/EventLoop.hpp b/src/mc/remote/CheckerSide.hpp
similarity index 94%
rename from src/mc/remote/EventLoop.hpp
rename to src/mc/remote/CheckerSide.hpp
index 6cecdc0..19ebd59 100644 (file)
--- a/src/mc/remote/EventLoop.hpp
+++ b/src/mc/remote/CheckerSide.hpp
@@ -12,13 +12,13 @@
 namespace simgrid {
 namespace mc {
 
-class EventLoop {
+class CheckerSide {
   struct event_base* base_    = nullptr;
   struct event* socket_event_ = nullptr;
   struct event* signal_event_ = nullptr;
 
 public:
-  ~EventLoop();
+  ~CheckerSide();
 
   void start(int socket, void (*handler)(int, short, void*));
   void dispatch();

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 94738af..d4a8b9e 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -624,12 +624,12 @@ set(MC_SRC
   src/mc/inspect/mc_unw.cpp
   src/mc/inspect/mc_unw_vmread.cpp
 
-  src/mc/remote/Channel.cpp
-  src/mc/remote/Channel.hpp
   src/mc/remote/AppSide.cpp
   src/mc/remote/AppSide.hpp
-  src/mc/remote/EventLoop.cpp
-  src/mc/remote/EventLoop.hpp
+  src/mc/remote/Channel.cpp
+  src/mc/remote/Channel.hpp
+  src/mc/remote/CheckerSide.cpp
+  src/mc/remote/CheckerSide.hpp
   src/mc/remote/RemoteClient.hpp
   src/mc/remote/RemoteClient.cpp
   src/mc/remote/RemotePtr.hpp