Rename MutexObserver to SynchroObserver (semaphore incoming)

diff --git a/MANIFEST.in b/MANIFEST.in
index babfd77..b85dab4 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2261,10 +2261,10 @@ include src/kernel/actor/ActorImpl.cpp
 include src/kernel/actor/ActorImpl.hpp
 include src/kernel/actor/CommObserver.cpp
 include src/kernel/actor/CommObserver.hpp
-include src/kernel/actor/MutexObserver.cpp
-include src/kernel/actor/MutexObserver.hpp
 include src/kernel/actor/SimcallObserver.cpp
 include src/kernel/actor/SimcallObserver.hpp
+include src/kernel/actor/SynchroObserver.cpp
+include src/kernel/actor/SynchroObserver.hpp
 include src/kernel/context/Context.cpp
 include src/kernel/context/Context.hpp
 include src/kernel/context/ContextBoost.cpp

diff --git a/src/kernel/actor/MutexObserver.cpp b/src/kernel/actor/SynchroObserver.cpp
similarity index 96%
rename from src/kernel/actor/MutexObserver.cpp
rename to src/kernel/actor/SynchroObserver.cpp
index f6c454f..a1c0be4 100644 (file)
--- a/src/kernel/actor/MutexObserver.cpp
+++ b/src/kernel/actor/SynchroObserver.cpp
@@ -3,7 +3,7 @@
 /* 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/kernel/actor/MutexObserver.hpp"
+#include "src/kernel/actor/SynchroObserver.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/activity/MutexImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"

diff --git a/src/kernel/actor/MutexObserver.hpp b/src/kernel/actor/SynchroObserver.hpp
similarity index 100%
rename from src/kernel/actor/MutexObserver.hpp
rename to src/kernel/actor/SynchroObserver.hpp

diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp
index c91f07c..e429dac 100644 (file)
--- a/src/s4u/s4u_Mutex.cpp
+++ b/src/s4u/s4u_Mutex.cpp
@@ -7,7 +7,7 @@
 #include <simgrid/mutex.h>
 #include <simgrid/s4u/Mutex.hpp>
 #include <src/kernel/activity/MutexImpl.hpp>
-#include <src/kernel/actor/MutexObserver.hpp>
+#include <src/kernel/actor/SynchroObserver.hpp>
 #include <src/mc/mc_replay.hpp>
 
 namespace simgrid {

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 4dc8fa9..31ca111 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -415,10 +415,10 @@ set(SIMIX_SRC
   src/kernel/actor/ActorImpl.hpp
   src/kernel/actor/CommObserver.cpp
   src/kernel/actor/CommObserver.hpp
-  src/kernel/actor/MutexObserver.cpp
-  src/kernel/actor/MutexObserver.hpp
   src/kernel/actor/SimcallObserver.cpp
   src/kernel/actor/SimcallObserver.hpp
+  src/kernel/actor/SynchroObserver.cpp
+  src/kernel/actor/SynchroObserver.hpp
 
   ${SIMIX_GENERATED_SRC}
   )