From b527f16c02842442fbf77131ff132efd9ebb42aa Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 24 Feb 2022 18:05:04 +0100 Subject: [PATCH] Rename MutexObserver to SynchroObserver (semaphore incoming) --- MANIFEST.in | 4 ++-- src/kernel/actor/{MutexObserver.cpp => SynchroObserver.cpp} | 2 +- src/kernel/actor/{MutexObserver.hpp => SynchroObserver.hpp} | 0 src/s4u/s4u_Mutex.cpp | 2 +- tools/cmake/DefinePackages.cmake | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/kernel/actor/{MutexObserver.cpp => SynchroObserver.cpp} (96%) rename src/kernel/actor/{MutexObserver.hpp => SynchroObserver.hpp} (100%) diff --git a/MANIFEST.in b/MANIFEST.in index babfd7718b..b85dab4479 100644 --- 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 f6c454fdb6..a1c0be4bfb 100644 --- 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 c91f07c171..e429dac015 100644 --- a/src/s4u/s4u_Mutex.cpp +++ b/src/s4u/s4u_Mutex.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace simgrid { diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 4dc8fa998e..31ca111183 100644 --- 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} ) -- 2.20.1