From 05bf7d8e4e62e224875308513bc22fe18bcdbcaa Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Sat, 9 Jun 2018 00:19:42 +0200 Subject: [PATCH] cosmetic snake casing --- include/simgrid/s4u/Mailbox.hpp | 8 ++++---- include/simgrid/s4u/VirtualMachine.hpp | 4 ++-- src/plugins/vm/s4u_VirtualMachine.cpp | 20 ++++++++++---------- src/s4u/s4u_Mailbox.cpp | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/simgrid/s4u/Mailbox.hpp b/include/simgrid/s4u/Mailbox.hpp index 687e78393c..ab4db6d1a0 100644 --- a/include/simgrid/s4u/Mailbox.hpp +++ b/include/simgrid/s4u/Mailbox.hpp @@ -151,14 +151,14 @@ public: /** Creates (but don't start) a data emission to that mailbox */ CommPtr put_init(); /** Creates (but don't start) a data emission to that mailbox */ - CommPtr put_init(void* data, uint64_t simulatedSizeInBytes); + CommPtr put_init(void* data, uint64_t simulated_size_in_bytes); /** Creates and start a data emission to that mailbox */ - CommPtr put_async(void* data, uint64_t simulatedSizeInBytes); + CommPtr put_async(void* data, uint64_t simulated_size_in_bytes); /** Blocking data emission */ - void put(void* payload, uint64_t simulatedSizeInBytes); + void put(void* payload, uint64_t simulated_size_in_bytes); /** Blocking data emission with timeout */ - void put(void* payload, uint64_t simulatedSizeInBytes, double timeout); + void put(void* payload, uint64_t simulated_size_in_bytes, double timeout); /** Creates (but don't start) a data reception onto that mailbox */ CommPtr get_init(); diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp index 63f0aaf390..0419fc0313 100644 --- a/include/simgrid/s4u/VirtualMachine.hpp +++ b/include/simgrid/s4u/VirtualMachine.hpp @@ -31,8 +31,8 @@ class XBT_PUBLIC VirtualMachine : public s4u::Host { virtual ~VirtualMachine(); public: - explicit VirtualMachine(const char* name, s4u::Host* hostPm, int coreAmount); - explicit VirtualMachine(const char* name, s4u::Host* hostPm, int coreAmount, size_t ramsize); + explicit VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount); + explicit VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount, size_t ramsize); // No copy/move VirtualMachine(VirtualMachine const&) = delete; diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index 9037014530..5ba43bdf20 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -21,27 +21,27 @@ simgrid::xbt::signal VirtualMachine::on_shutdown; simgrid::xbt::signal VirtualMachine::on_suspend; simgrid::xbt::signal VirtualMachine::on_resume; -VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount) - : VirtualMachine(name, pm, coreAmount, 1024) +VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount) + : VirtualMachine(name, physical_host, core_amount, 1024) { } -VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount, size_t ramsize) - : Host(name), pimpl_vm_(new vm::VirtualMachineImpl(this, pm, coreAmount, ramsize)) +VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount, size_t ramsize) + : Host(name), pimpl_vm_(new vm::VirtualMachineImpl(this, physical_host, core_amount, ramsize)) { XBT_DEBUG("Create VM %s", name); /* Currently, a VM uses the network resource of its physical host */ - pimpl_netpoint = pm->pimpl_netpoint; + pimpl_netpoint = physical_host->pimpl_netpoint; // Create a VCPU for this VM std::vector speeds; - for (int i = 0; i < pm->get_pstate_count(); i++) - speeds.push_back(pm->getPstateSpeed(i)); + for (int i = 0; i < physical_host->get_pstate_count(); i++) + speeds.push_back(physical_host->getPstateSpeed(i)); - surf_cpu_model_vm->create_cpu(this, &speeds, pm->get_core_count()); - if (pm->get_pstate() != 0) - set_pstate(pm->get_pstate()); + surf_cpu_model_vm->create_cpu(this, &speeds, physical_host->get_core_count()); + if (physical_host->get_pstate() != 0) + set_pstate(physical_host->get_pstate()); /* Make a process container */ extension_set(new simgrid::simix::Host()); diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp index 421486f48c..a294219761 100644 --- a/src/s4u/s4u_Mailbox.cpp +++ b/src/s4u/s4u_Mailbox.cpp @@ -75,38 +75,38 @@ CommPtr Mailbox::put_init() res->mailbox_ = this; return res; } -s4u::CommPtr Mailbox::put_init(void* data, uint64_t simulatedSize) +s4u::CommPtr Mailbox::put_init(void* data, uint64_t simulated_size_in_bytes) { s4u::CommPtr res = put_init(); - res->set_remaining(simulatedSize); + res->set_remaining(simulated_size_in_bytes); res->src_buff_ = data; res->src_buff_size_ = sizeof(void*); return res; } -s4u::CommPtr Mailbox::put_async(void* payload, uint64_t simulatedSize) +s4u::CommPtr Mailbox::put_async(void* payload, uint64_t simulated_size_in_bytes) { xbt_assert(payload != nullptr, "You cannot send nullptr"); - s4u::CommPtr res = put_init(payload, simulatedSize); + s4u::CommPtr res = put_init(payload, simulated_size_in_bytes); res->start(); return res; } -void Mailbox::put(void* payload, uint64_t simulatedSize) +void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes) { xbt_assert(payload != nullptr, "You cannot send nullptr"); CommPtr c = put_init(); - c->set_remaining(simulatedSize); + c->set_remaining(simulated_size_in_bytes); c->set_src_data(payload); c->wait(); } /** Blocking send with timeout */ -void Mailbox::put(void* payload, uint64_t simulatedSize, double timeout) +void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeout) { xbt_assert(payload != nullptr, "You cannot send nullptr"); CommPtr c = put_init(); - c->set_remaining(simulatedSize); + c->set_remaining(simulated_size_in_bytes); c->set_src_data(payload); // c->start() is optional. c->wait(timeout); -- 2.20.1