From 60037b3f9ba9d856ccebf7a2211b51b82f4a557a Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 18 Dec 2019 10:09:28 +0100 Subject: [PATCH] codefactor: malformed whitespace issues --- include/xbt/config.hpp | 5 ++--- include/xbt/functional.hpp | 5 ----- src/bindings/java/jmsg_process.cpp | 6 +++--- src/bindings/java/jmsg_storage.cpp | 1 - src/bindings/java/jmsg_vm.cpp | 1 - src/bindings/java/jxbt_utilities.cpp | 1 - src/instr/instr_paje_events.cpp | 22 ++++++++++------------ src/kernel/activity/ActivityImpl.hpp | 1 + src/kernel/activity/SynchroRaw.cpp | 11 +++++------ src/plugins/host_dvfs.cpp | 2 -- src/surf/network_interface.cpp | 1 - src/surf/network_interface.hpp | 1 - src/surf/network_ns3.cpp | 1 - src/xbt/dict_test.cpp | 1 - src/xbt/dynar_test.cpp | 1 - 15 files changed, 21 insertions(+), 39 deletions(-) diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp index a0406db96d..dbd27f40d2 100644 --- a/include/xbt/config.hpp +++ b/include/xbt/config.hpp @@ -217,7 +217,6 @@ class Flag { std::string name_; public: - /** Constructor * * @param name Flag name @@ -305,7 +304,7 @@ public: XBT_PUBLIC void finalize(); XBT_PUBLIC void show_aliases(); XBT_PUBLIC void help(); -} -} +} // namespace config +} // namespace simgrid #endif diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp index 386830b637..a2ddfa7280 100644 --- a/include/xbt/functional.hpp +++ b/include/xbt/functional.hpp @@ -27,7 +27,6 @@ namespace simgrid { namespace xbt { template class MainFunction { -private: F code_; std::shared_ptr> args_; @@ -109,8 +108,6 @@ template class Task; */ template class Task { -private: - // Placeholder for some class type: struct whatever {}; @@ -189,7 +186,6 @@ public: } private: - template typename std::enable_if()>::type init(F code) @@ -260,7 +256,6 @@ public: template class TaskImpl { -private: F code_; std::tuple args_; typedef decltype(simgrid::xbt::apply(std::move(code_), std::move(args_))) result_type; diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index cb71bba6df..3d941176ae 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -188,9 +188,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject process->resume(); } -JNIEXPORT void -JNICALL Java_org_simgrid_msg_Process_setAutoRestart (JNIEnv *env, jobject jprocess, jboolean jauto_restart) { - +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setAutoRestart(JNIEnv* env, jobject jprocess, + jboolean jauto_restart) +{ msg_process_t process = jprocess_to_native(jprocess, env); if (not process) { jxbt_throw_notbound(env, "process", jprocess); diff --git a/src/bindings/java/jmsg_storage.cpp b/src/bindings/java/jmsg_storage.cpp index 831aeea1f6..70cd55ae24 100644 --- a/src/bindings/java/jmsg_storage.cpp +++ b/src/bindings/java/jmsg_storage.cpp @@ -170,7 +170,6 @@ Java_org_simgrid_msg_Storage_setProperty(JNIEnv *env, jobject jstorage, jobject env->ReleaseStringUTFChars((jstring) jvalue, value_java); env->ReleaseStringUTFChars((jstring) jname, name); - } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage) { diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp index b917e08303..07f20e3d4a 100644 --- a/src/bindings/java/jmsg_vm.cpp +++ b/src/bindings/java/jmsg_vm.cpp @@ -171,7 +171,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm) JNIEXPORT jobject JNICALL Java_org_simgrid_msg_VM_getVMByName(JNIEnv* env, jclass cls, jstring jname) { - /* get the C string from the java string */ if (jname == nullptr) { jxbt_throw_null(env, "No VM can have a null name"); diff --git a/src/bindings/java/jxbt_utilities.cpp b/src/bindings/java/jxbt_utilities.cpp index 896c622609..60432edd15 100644 --- a/src/bindings/java/jxbt_utilities.cpp +++ b/src/bindings/java/jxbt_utilities.cpp @@ -32,7 +32,6 @@ jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, const char *name, const cha id = env->GetMethodID(cls, name, signature); if (not id) { - jmethodID tostr_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;"); jstring jclassname = (jstring) env->CallObjectMethod(cls, tostr_id, nullptr); const char *classname = env->GetStringUTFChars(jclassname, 0); diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp index bba1933edb..e50eda202f 100644 --- a/src/instr/instr_paje_events.cpp +++ b/src/instr/instr_paje_events.cpp @@ -19,7 +19,7 @@ PajeEvent::PajeEvent(Container* container, Type* type, double timestamp, e_event : container_(container), type_(type), timestamp_(timestamp), eventType_(eventType) { XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, eventType_, TRACE_precision(), timestamp_); - if (trace_format == simgrid::instr::TraceFormat::Paje) { + if (trace_format == TraceFormat::Paje) { stream_ << std::fixed << std::setprecision(TRACE_precision()); stream_ << eventType_ << " " << timestamp_ << " " << type_->get_id() << " " << container_->get_id(); } @@ -28,7 +28,7 @@ PajeEvent::PajeEvent(Container* container, Type* type, double timestamp, e_event void PajeEvent::print() { - if (trace_format != simgrid::instr::TraceFormat::Paje) + if (trace_format != TraceFormat::Paje) return; XBT_DEBUG("Dump %s", stream_.str().c_str()); @@ -49,7 +49,7 @@ StateEvent::StateEvent(Container* container, Type* type, e_event_type event_type void NewEvent::print() { - if (trace_format != simgrid::instr::TraceFormat::Paje) + if (trace_format != TraceFormat::Paje) return; stream_ << " " << value->get_id(); @@ -60,7 +60,7 @@ void NewEvent::print() void LinkEvent::print() { - if (trace_format != simgrid::instr::TraceFormat::Paje) + if (trace_format != TraceFormat::Paje) return; stream_ << " " << value_ << " " << endpoint_->get_id() << " " << key_; @@ -74,7 +74,7 @@ void LinkEvent::print() void VariableEvent::print() { - if (trace_format != simgrid::instr::TraceFormat::Paje) + if (trace_format != TraceFormat::Paje) return; stream_ << " " << value_; @@ -85,8 +85,7 @@ void VariableEvent::print() void StateEvent::print() { - if (trace_format == simgrid::instr::TraceFormat::Paje) { - + if (trace_format == TraceFormat::Paje) { if (value != nullptr) // PAJE_PopState Event does not need to have a value stream_ << " " << value->get_id(); @@ -100,7 +99,7 @@ void StateEvent::print() #endif XBT_DEBUG("Dump %s", stream_.str().c_str()); tracing_file << stream_.str() << std::endl; - } else if (trace_format == simgrid::instr::TraceFormat::Ti) { + } else if (trace_format == TraceFormat::Ti) { if (extra_ == nullptr) return; @@ -112,7 +111,7 @@ void StateEvent::print() container_name=std::to_string(stoi(container_name.erase(0, 5)) - 1); } #if HAVE_SMPI - if (simgrid::config::get_value("smpi/trace-call-location")) { + if (config::get_value("smpi/trace-call-location")) { stream_ << container_name << " location " << filename << " " << linenumber << std::endl ; } #endif @@ -121,7 +120,6 @@ void StateEvent::print() } else { THROW_IMPOSSIBLE; } - -} -} } +} // namespace instr +} // namespace simgrid diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp index df0a712d82..275ad451e1 100644 --- a/src/kernel/activity/ActivityImpl.hpp +++ b/src/kernel/activity/ActivityImpl.hpp @@ -36,6 +36,7 @@ enum class State { class XBT_PUBLIC ActivityImpl { std::atomic_int_fast32_t refcount_{0}; + public: virtual ~ActivityImpl(); ActivityImpl() = default; diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp index 8a4cb51ea0..625098ab92 100644 --- a/src/kernel/activity/SynchroRaw.cpp +++ b/src/kernel/activity/SynchroRaw.cpp @@ -78,26 +78,25 @@ void RawImpl::finish() } switch (simcall->call_) { - case SIMCALL_MUTEX_LOCK: - simgrid::xbt::intrusive_erase(simcall_mutex_lock__get__mutex(simcall)->sleeping_, *simcall->issuer_); + xbt::intrusive_erase(simcall_mutex_lock__get__mutex(simcall)->sleeping_, *simcall->issuer_); break; case SIMCALL_COND_WAIT: - simgrid::xbt::intrusive_erase(simcall_cond_wait__get__cond(simcall)->sleeping_, *simcall->issuer_); + xbt::intrusive_erase(simcall_cond_wait__get__cond(simcall)->sleeping_, *simcall->issuer_); break; case SIMCALL_COND_WAIT_TIMEOUT: - simgrid::xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping_, *simcall->issuer_); + xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping_, *simcall->issuer_); simcall_cond_wait_timeout__set__result(simcall, 1); // signal a timeout break; case SIMCALL_SEM_ACQUIRE: - simgrid::xbt::intrusive_erase(simcall_sem_acquire__get__sem(simcall)->sleeping_, *simcall->issuer_); + xbt::intrusive_erase(simcall_sem_acquire__get__sem(simcall)->sleeping_, *simcall->issuer_); break; case SIMCALL_SEM_ACQUIRE_TIMEOUT: - simgrid::xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping_, *simcall->issuer_); + xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping_, *simcall->issuer_); simcall_sem_acquire_timeout__set__result(simcall, 1); // signal a timeout break; diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp index f714b0f787..af145fb790 100644 --- a/src/plugins/host_dvfs.cpp +++ b/src/plugins/host_dvfs.cpp @@ -83,8 +83,6 @@ namespace dvfs { * global configuration */ class Governor { - -private: simgrid::s4u::Host* const host_; double sampling_rate_; int min_pstate; //< Never use a pstate less than this one diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 5a23538984..a2c886abde 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -76,7 +76,6 @@ double NetworkModel::next_occurring_event_full(double now) LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint) : Resource(model, name, constraint), piface_(this) { - if (name != "__loopback__") xbt_assert(not s4u::Link::by_name_or_null(name), "Link '%s' declared several times in the platform.", name.c_str()); diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 69fbcb2cf8..0d92c8dbf3 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -157,7 +157,6 @@ public: Metric latency_ = {0.0, 0, nullptr}; Metric bandwidth_ = {1.0, 0, nullptr}; - }; /********** diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 74d8e40e09..032b69f016 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -310,7 +310,6 @@ void LinkNS3::set_latency_profile(profile::Profile*) NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* src, s4u::Host* dst) : NetworkAction(model, totalBytes, false), src_(src), dst_(dst) { - // If there is no other started actions, we need to move NS-3 forward to be sync with SimGrid if (model->get_started_action_set()->size()==1){ while(double_positive(surf_get_clock() - ns3::Simulator::Now().GetSeconds(), sg_surf_precision)){ diff --git a/src/xbt/dict_test.cpp b/src/xbt/dict_test.cpp index c7588cd735..8fe2f65d0c 100644 --- a/src/xbt/dict_test.cpp +++ b/src/xbt/dict_test.cpp @@ -142,7 +142,6 @@ static int countelems(xbt_dict_t head) TEST_CASE("xbt::dict: dict data container", "dict") { - SECTION("Basic usage: change, retrieve and traverse homogeneous dicts") { INFO("Traversal the null dictionary"); diff --git a/src/xbt/dynar_test.cpp b/src/xbt/dynar_test.cpp index 5f642decae..d549738fde 100644 --- a/src/xbt/dynar_test.cpp +++ b/src/xbt/dynar_test.cpp @@ -14,7 +14,6 @@ constexpr int NB_ELEM = 5000; TEST_CASE("xbt::dynar: generic C vector", "dynar") { - SECTION("Dynars of integers") { /* Vars_decl [doxygen cruft] */ -- 2.20.1