From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Fri, 4 Jan 2019 21:12:45 +0000 (+0100)
Subject: track some remaining CamelCase deep inside the context code
X-Git-Tag: v3_22~694
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3f6cb16e7427d1583ab346042e2f27f7cd95f2b8

track some remaining CamelCase deep inside the context code
---

diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp
index 256f677f62..ea98813fd4 100644
--- a/src/kernel/context/ContextBoost.cpp
+++ b/src/kernel/context/ContextBoost.cpp
@@ -19,7 +19,7 @@ namespace context {
 BoostContextFactory::BoostContextFactory()
     : ContextFactory("BoostContextFactory"), parallel_(SIMIX_context_is_parallel())
 {
-  BoostContext::setMaestro(nullptr);
+  BoostContext::set_maestro(nullptr);
   if (parallel_) {
 #if HAVE_THREAD_CONTEXTS
     ParallelBoostContext::initialize();
@@ -167,7 +167,7 @@ void SerialBoostContext::suspend()
   } else {
     /* all processes were run, return to maestro */
     XBT_DEBUG("No more process to run");
-    next_context = static_cast<SerialBoostContext*>(BoostContext::getMaestro());
+    next_context = static_cast<SerialBoostContext*>(BoostContext::get_maestro());
   }
   SIMIX_context_set_current(next_context);
   BoostContext::swap(this, next_context);
@@ -176,7 +176,7 @@ void SerialBoostContext::suspend()
 void SerialBoostContext::resume()
 {
   SIMIX_context_set_current(this);
-  BoostContext::swap(BoostContext::getMaestro(), this);
+  BoostContext::swap(BoostContext::get_maestro(), this);
 }
 
 void SerialBoostContext::run_all()
diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index 8031685067..7b3a58e8e2 100644
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -38,8 +38,8 @@ public:
   virtual void resume() = 0;
 
   static void swap(BoostContext* from, BoostContext* to);
-  static BoostContext* getMaestro() { return maestro_context_; }
-  static void setMaestro(BoostContext* maestro) { maestro_context_ = maestro; }
+  static BoostContext* get_maestro() { return maestro_context_; }
+  static void set_maestro(BoostContext* maestro) { maestro_context_ = maestro; }
 
 private:
   static BoostContext* maestro_context_;
diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index 423f13dc0f..a4b8db5846 100644
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -188,7 +188,7 @@ namespace context {
 
 RawContextFactory::RawContextFactory() : ContextFactory("RawContextFactory"), parallel_(SIMIX_context_is_parallel())
 {
-  RawContext::setMaestro(nullptr);
+  RawContext::set_maestro(nullptr);
   if (parallel_) {
 #if HAVE_THREAD_CONTEXTS
     // TODO: choose dynamically when SIMIX_context_get_parallel_threshold() > 1
@@ -306,7 +306,7 @@ void SerialRawContext::suspend()
   } else {
     /* all processes were run, return to maestro */
     XBT_DEBUG("No more process to run");
-    next_context = static_cast<SerialRawContext*>(RawContext::getMaestro());
+    next_context = static_cast<SerialRawContext*>(RawContext::get_maestro());
   }
   SIMIX_context_set_current(next_context);
   RawContext::swap(this, next_context);
@@ -315,7 +315,7 @@ void SerialRawContext::suspend()
 void SerialRawContext::resume()
 {
   SIMIX_context_set_current(this);
-  RawContext::swap(RawContext::getMaestro(), this);
+  RawContext::swap(RawContext::get_maestro(), this);
 }
 
 void SerialRawContext::run_all()
diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp
index fb17bc6176..6d79a94e6f 100644
--- a/src/kernel/context/ContextRaw.hpp
+++ b/src/kernel/context/ContextRaw.hpp
@@ -31,8 +31,8 @@ public:
   virtual void resume() = 0;
 
   static void swap(RawContext* from, RawContext* to);
-  static RawContext* getMaestro() { return maestro_context_; }
-  static void setMaestro(RawContext* maestro) { maestro_context_ = maestro; }
+  static RawContext* get_maestro() { return maestro_context_; }
+  static void set_maestro(RawContext* maestro) { maestro_context_ = maestro; }
 
 private:
   static RawContext* maestro_context_;
diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp
index 4bd1ddc344..e41289507d 100644
--- a/src/kernel/context/ContextUnix.cpp
+++ b/src/kernel/context/ContextUnix.cpp
@@ -32,7 +32,7 @@ namespace context {
 
 UContextFactory::UContextFactory() : ContextFactory("UContextFactory"), parallel_(SIMIX_context_is_parallel())
 {
-  UContext::setMaestro(nullptr);
+  UContext::set_maestro(nullptr);
   if (parallel_) {
 #if HAVE_THREAD_CONTEXTS
     ParallelUContext::initialize();
@@ -179,7 +179,7 @@ void SerialUContext::suspend()
   } else {
     /* all processes were run, return to maestro */
     XBT_DEBUG("No more process to run");
-    next_context = static_cast<SerialUContext*>(UContext::getMaestro());
+    next_context = static_cast<SerialUContext*>(UContext::get_maestro());
   }
   SIMIX_context_set_current(next_context);
   UContext::swap(this, next_context);
@@ -188,7 +188,7 @@ void SerialUContext::suspend()
 void SerialUContext::resume()
 {
   SIMIX_context_set_current(this);
-  UContext::swap(UContext::getMaestro(), this);
+  UContext::swap(UContext::get_maestro(), this);
 }
 
 void SerialUContext::run_all()
diff --git a/src/kernel/context/ContextUnix.hpp b/src/kernel/context/ContextUnix.hpp
index 88976a8253..60775dfde9 100644
--- a/src/kernel/context/ContextUnix.hpp
+++ b/src/kernel/context/ContextUnix.hpp
@@ -33,8 +33,8 @@ public:
   virtual void resume() = 0;
 
   static void swap(UContext* from, UContext* to);
-  static UContext* getMaestro() { return maestro_context_; }
-  static void setMaestro(UContext* maestro) { maestro_context_ = maestro; }
+  static UContext* get_maestro() { return maestro_context_; }
+  static void set_maestro(UContext* maestro) { maestro_context_ = maestro; }
 
 private:
   static UContext* maestro_context_;