From 8e3525c475262f259a70a3f9a2a4f12d36b3d243 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 25 Apr 2022 14:54:12 +0200 Subject: [PATCH] Rely on template argument deduction (sonar, c++17). --- .../s4u-synchro-condition-variable-waituntil.cpp | 4 ++-- .../s4u-synchro-condition-variable.cpp | 2 +- examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp | 2 +- src/include/xbt/parmap.hpp | 8 ++++---- src/s4u/s4u_ConditionVariable.cpp | 2 +- src/xbt/OsSemaphore.hpp | 4 ++-- src/xbt/random.cpp | 8 ++++---- src/xbt/random_test.cpp | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp b/examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp index 69ccef1feb..e64a76b429 100644 --- a/examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp +++ b/examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp @@ -16,7 +16,7 @@ bool ready = false; static void competitor(int id) { XBT_INFO("Entering the race..."); - std::unique_lock lck(*mtx); + std::unique_lock lck(*mtx); while (not ready) { auto now = sg4::Engine::get_clock(); if (cv->wait_until(lck, now + (id+1)*0.25) == std::cv_status::timeout) { @@ -33,7 +33,7 @@ static void go() { XBT_INFO("Are you ready? ..."); sg4::this_actor::sleep_for(3); - std::unique_lock lck(*mtx); + std::unique_lock lck(*mtx); XBT_INFO("Go go go!"); ready = true; cv->notify_all(); diff --git a/examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp b/examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp index 2805c7cb0b..3602e1dd3c 100644 --- a/examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp +++ b/examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp @@ -14,7 +14,7 @@ bool done = false; static void worker_fun(sg4::ConditionVariablePtr cv, sg4::MutexPtr mutex) { - std::unique_lock lock(*mutex); + std::unique_lock lock(*mutex); XBT_INFO("Start processing data which is '%s'.", data.c_str()); data += std::string(" after processing"); diff --git a/examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp b/examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp index faa8d2b989..a17d574533 100644 --- a/examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp +++ b/examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp @@ -33,7 +33,7 @@ static void workerLockGuard(sg4::MutexPtr mutex, int& result) { // Simply use the std::lock_guard like this // It's like a lock() that would do the unlock() automatically when getting out of scope - std::lock_guard lock(*mutex); + std::lock_guard lock(*mutex); // then you are in a safe zone XBT_INFO("Hello s4u, I'm ready to compute after a lock_guard"); diff --git a/src/include/xbt/parmap.hpp b/src/include/xbt/parmap.hpp index 48ce17e83c..be13332983 100644 --- a/src/include/xbt/parmap.hpp +++ b/src/include/xbt/parmap.hpp @@ -310,7 +310,7 @@ template void Parmap::worker_main(ThreadData* data) template void Parmap::PosixSynchro::master_signal() { - std::unique_lock lk(ready_mutex); + std::unique_lock lk(ready_mutex); this->parmap.thread_counter = 1; this->parmap.work_round++; /* wake all workers */ @@ -319,14 +319,14 @@ template void Parmap::PosixSynchro::master_signal() template void Parmap::PosixSynchro::master_wait() { - std::unique_lock lk(done_mutex); + std::unique_lock lk(done_mutex); /* wait for all workers to be ready */ done_cond.wait(lk, [this]() { return this->parmap.thread_counter >= this->parmap.num_workers; }); } template void Parmap::PosixSynchro::worker_signal() { - std::unique_lock lk(done_mutex); + std::unique_lock lk(done_mutex); this->parmap.thread_counter++; if (this->parmap.thread_counter == this->parmap.num_workers) { /* all workers have finished, wake the controller */ @@ -336,7 +336,7 @@ template void Parmap::PosixSynchro::worker_signal() template void Parmap::PosixSynchro::worker_wait(unsigned expected_round) { - std::unique_lock lk(ready_mutex); + std::unique_lock lk(ready_mutex); /* wait for more work */ ready_cond.wait(lk, [this, expected_round]() { return this->parmap.work_round == expected_round; }); } diff --git a/src/s4u/s4u_ConditionVariable.cpp b/src/s4u/s4u_ConditionVariable.cpp index 6ad846cffc..2558b0478a 100644 --- a/src/s4u/s4u_ConditionVariable.cpp +++ b/src/s4u/s4u_ConditionVariable.cpp @@ -111,7 +111,7 @@ void sg_cond_wait(sg_cond_t cond, sg_mutex_t mutex) int sg_cond_wait_for(sg_cond_t cond, sg_mutex_t mutex, double delay) { - std::unique_lock lock(*mutex); + std::unique_lock lock(*mutex); return cond->wait_for(lock, delay) == std::cv_status::timeout; } diff --git a/src/xbt/OsSemaphore.hpp b/src/xbt/OsSemaphore.hpp index 47a946c9a6..b29a66550d 100644 --- a/src/xbt/OsSemaphore.hpp +++ b/src/xbt/OsSemaphore.hpp @@ -16,14 +16,14 @@ public: inline void acquire() { - std::unique_lock lock(mutex_); + std::unique_lock lock(mutex_); condition_.wait(lock, [this]() { return capa_ > 0; }); --capa_; } inline void release() { - std::unique_lock lock(mutex_); + std::unique_lock lock(mutex_); ++capa_; condition_.notify_one(); } diff --git a/src/xbt/random.cpp b/src/xbt/random.cpp index 449207c9bb..af2cfd45cb 100644 --- a/src/xbt/random.cpp +++ b/src/xbt/random.cpp @@ -41,25 +41,25 @@ bool Random::write_state(const std::string& filename) const int StdRandom::uniform_int(int min, int max) { - std::uniform_int_distribution<> dist(min, max); + std::uniform_int_distribution dist(min, max); return dist(mt19937_gen); } double StdRandom::uniform_real(double min, double max) { - std::uniform_real_distribution<> dist(min, max); + std::uniform_real_distribution dist(min, max); return dist(mt19937_gen); } double StdRandom::exponential(double lambda) { - std::exponential_distribution<> dist(lambda); + std::exponential_distribution dist(lambda); return dist(mt19937_gen); } double StdRandom::normal(double mean, double sd) { - std::normal_distribution<> dist(mean, sd); + std::normal_distribution dist(mean, sd); return dist(mt19937_gen); } diff --git a/src/xbt/random_test.cpp b/src/xbt/random_test.cpp index eed3783cde..f743898d9f 100644 --- a/src/xbt/random_test.cpp +++ b/src/xbt/random_test.cpp @@ -43,10 +43,10 @@ TEST_CASE("xbt::random: Random Number Generation") simgrid::xbt::random::set_implem_std(); simgrid::xbt::random::set_mersenne_seed(12345); - std::exponential_distribution<> distA(25); - std::uniform_int_distribution<> distB(1, 6); - std::uniform_real_distribution<> distC(0, 1); - std::normal_distribution<> distD(0, 2); + std::exponential_distribution distA(25.0); + std::uniform_int_distribution distB(1, 6); + std::uniform_real_distribution distC(0.0, 1.0); + std::normal_distribution distD(0.0, 2.0); REQUIRE_THAT(simgrid::xbt::random::exponential(25), EpsilonApprox(distA(gen))); REQUIRE(simgrid::xbt::random::uniform_int(1, 6) == distB(gen)); -- 2.20.1