From 0c586d7f087b772253980cafd92796edcbd58c50 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 6 Jan 2022 21:11:00 +0100 Subject: [PATCH] Cosmetics to please codefactor.io. --- docs/source/tuto_network_calibration/Dockerfile | 4 ++-- include/simgrid/s4u/Engine.hpp | 1 + include/simgrid/s4u/NetZone.hpp | 1 + include/simgrid/s4u/VirtualMachine.hpp | 1 + src/bindings/java/jmsg_task.cpp | 1 - src/kernel/EngineImpl.cpp | 1 - src/kernel/activity/ExecImpl.cpp | 1 - src/kernel/activity/IoImpl.hpp | 1 + 8 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/source/tuto_network_calibration/Dockerfile b/docs/source/tuto_network_calibration/Dockerfile index 5a90527f27..ec26042bc8 100644 --- a/docs/source/tuto_network_calibration/Dockerfile +++ b/docs/source/tuto_network_calibration/Dockerfile @@ -52,8 +52,8 @@ RUN pip install --no-cache-dir --no-dependencies \ descartes==1.1.0 # R package not available at debian's cran -RUN R -e "install.packages('remotes', dependencies=TRUE, repos='http://cran.rstudio.com/')" -RUN R -e "require(remotes); install_version('Ckmeans.1d.dp','4.3.3', dependencies=TRUE, repos='http://cran.rstudio.com/')" +RUN R -e "install.packages('remotes', dependencies=TRUE, repos='http://cran.rstudio.com/')" && \ + R -e "require(remotes); install_version('Ckmeans.1d.dp','4.3.3', dependencies=TRUE, repos='http://cran.rstudio.com/')" # python jupyterlab packages RUN pip install --no-cache-dir --upgrade pip && \ diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp index 28f59a7b4c..43be0eba37 100644 --- a/include/simgrid/s4u/Engine.hpp +++ b/include/simgrid/s4u/Engine.hpp @@ -217,6 +217,7 @@ public: static xbt::signal on_platform_created; static xbt::signal on_platform_creation; #endif + private: static xbt::signal on_simulation_end; static xbt::signal on_time_advance; diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp index b03f9065e0..ebfb662796 100644 --- a/include/simgrid/s4u/NetZone.hpp +++ b/include/simgrid/s4u/NetZone.hpp @@ -119,6 +119,7 @@ private: static xbt::signal on_creation; static xbt::signal on_seal; #endif + public: static void on_creation_cb(const std::function& cb) { on_creation.connect(cb); } static void on_seal_cb(const std::function& cb) { on_seal.connect(cb); } diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp index d8ac9a2d60..41be4d1974 100644 --- a/include/simgrid/s4u/VirtualMachine.hpp +++ b/include/simgrid/s4u/VirtualMachine.hpp @@ -90,6 +90,7 @@ public: static xbt::signal on_migration_end; static xbt::signal on_destruction; #endif + private: static xbt::signal on_creation; static xbt::signal on_start; diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index 48ccb6094d..02d2d3314a 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -212,7 +212,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jt env->SetObjectField(jtask, jtask_field_Task_name, jname); MSG_task_set_name(task, name); - } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setPriority(JNIEnv * env, jobject jtask, jdouble priority) diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 4cad60893a..3a8229bb7e 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -857,7 +857,6 @@ void EngineImpl::run(double max_date) maestro_->kill(kv.second); } } - } while ((vetoed_activities == nullptr || vetoed_activities->empty()) && ((elapsed_time > -1.0 && not double_equals(max_date, NOW, 0.00001)) || has_actors_to_run())); diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 9b97aab59e..d1d016776b 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -203,7 +203,6 @@ void ExecImpl::finish() * list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the * simcall */ if (auto* observer = dynamic_cast(simcall->observer_)) { - const auto& execs = observer->get_execs(); for (auto* exec : execs) diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp index 7c794f7da0..bb0b666d2c 100644 --- a/src/kernel/activity/IoImpl.hpp +++ b/src/kernel/activity/IoImpl.hpp @@ -20,6 +20,7 @@ class XBT_PUBLIC IoImpl : public ActivityImpl_T { s4u::Io::OpType type_ = s4u::Io::OpType::READ; sg_size_t performed_ioops_ = 0; resource::Action* timeout_detector_ = nullptr; + public: IoImpl(); -- 2.20.1