From a7eb882356f3045f6098c3330d42e2337e886fbd Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 18 Jul 2018 22:47:08 +0200 Subject: [PATCH 1/1] snake_case simix::contextes --- src/kernel/context/ContextThread.cpp | 12 ++++++------ src/kernel/context/ContextThread.hpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp index 7362e84138..d18e04cee4 100644 --- a/src/kernel/context/ContextThread.cpp +++ b/src/kernel/context/ContextThread.cpp @@ -115,11 +115,11 @@ void *ThreadContext::wrapper(void *param) try { (*context)(); - if (not context->isMaestro()) // really? + if (not context->is_maestro()) // really? context->Context::stop(); } catch (StopRequest const&) { XBT_DEBUG("Caught a StopRequest"); - xbt_assert(not context->isMaestro(), "I'm not supposed to be maestro here."); + xbt_assert(not context->is_maestro(), "I'm not supposed to be maestro here."); } // Signal to the caller (normally the maestro) that we have finished: @@ -171,13 +171,13 @@ void ThreadContext::attach_start() // We're breaking the layers here by depending on the upper layer: ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_; xbt_os_sem_release(maestro->begin_); - xbt_assert(not this->isMaestro()); + xbt_assert(not this->is_maestro()); this->start(); } void ThreadContext::attach_stop() { - xbt_assert(not this->isMaestro()); + xbt_assert(not this->is_maestro()); this->yield(); ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_; @@ -223,13 +223,13 @@ void ParallelThreadContext::run_all() void ParallelThreadContext::start_hook() { - if (not isMaestro()) /* parallel run */ + if (not is_maestro()) /* parallel run */ xbt_os_sem_acquire(thread_sem_); } void ParallelThreadContext::yield_hook() { - if (not isMaestro()) /* parallel run */ + if (not is_maestro()) /* parallel run */ xbt_os_sem_release(thread_sem_); } diff --git a/src/kernel/context/ContextThread.hpp b/src/kernel/context/ContextThread.hpp index 413afd6f58..819e07c7d3 100644 --- a/src/kernel/context/ContextThread.hpp +++ b/src/kernel/context/ContextThread.hpp @@ -25,7 +25,7 @@ public: void attach_start() override; void attach_stop() override; - bool isMaestro() const { return is_maestro_; } + bool is_maestro() const { return is_maestro_; } void release(); // unblock context's start() void wait(); // wait for context's yield() -- 2.20.1