reindent (while chasing leaks)

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index f65533f..51315f5 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -73,8 +73,7 @@ void sg_platf_exit(void) {
 /** @brief Add an "host" to the current AS */
 void sg_platf_new_host(sg_platf_host_cbarg_t host)
 {
-  xbt_assert(! sg_host_by_name(host->id),
-      "Refusing to create a second host named '%s'.", host->id);
+  xbt_assert(! sg_host_by_name(host->id), "Refusing to create a second host named '%s'.", host->id);
 
   simgrid::surf::AsImpl* current_routing = routing_get_current();
   if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset)
@@ -112,7 +111,6 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host)
     XBT_DEBUG("Having set host coordinates for '%s'",host->id);
   }
 
-
   simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h,
       host->speed_per_pstate,
       host->core_amount);
@@ -143,7 +141,8 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router)
   xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL),
              "Refusing to create a router named '%s': this name already describes a node.", router->id);
 
-  simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(router->id, SURF_NETWORK_ELEMENT_ROUTER, current_routing);
+  simgrid::surf::NetCard *netcard =
+    new simgrid::surf::NetCardImpl(router->id, SURF_NETWORK_ELEMENT_ROUTER, current_routing);
   netcard->setId(current_routing->addComponent(netcard));
   xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) netcard);
   XBT_DEBUG("Having set name '%s' id '%d'", router->id, netcard->id());

diff --git a/src/surf/virtual_machine.cpp b/src/surf/virtual_machine.cpp
index 2bf24a3..e640cc3 100644 (file)
--- a/src/surf/virtual_machine.cpp
+++ b/src/surf/virtual_machine.cpp
@@ -7,8 +7,7 @@
 #include "cpu_cas01.hpp"
 #include "virtual_machine.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf,
-                                "Logging specific to the SURF VM module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module");
 
 simgrid::surf::VMModel *surf_vm_model = NULL;
 
@@ -42,8 +41,7 @@ VirtualMachine::VirtualMachine(HostModel *model, const char *name, xbt_dict_t pr
 }
 
 /*
- * A physical host does not disappear in the current SimGrid code, but a VM may
- * disappear during a simulation.
+ * A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation.
  */
 VirtualMachine::~VirtualMachine()
 {

diff --git a/src/surf/virtual_machine.hpp b/src/surf/virtual_machine.hpp
index 40395ab..5c6872e 100644 (file)
--- a/src/surf/virtual_machine.hpp
+++ b/src/surf/virtual_machine.hpp
@@ -61,8 +61,7 @@ public:
    * @param props Dictionary of properties associated to this VM
    * @param host The host
    */
-  VirtualMachine(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props,
-            simgrid::s4u::Host *host);
+  VirtualMachine(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props, simgrid::s4u::Host *host);
 
   /** @brief Destructor */
   ~VirtualMachine();
@@ -101,7 +100,6 @@ public:
 protected:
   e_surf_vm_state_t p_vm_state = SURF_VM_STATE_CREATED;
 
-
 public:
   boost::intrusive::list_member_hook<> vm_hook;
 };
@@ -123,7 +121,6 @@ public:
    *
    * @param name The name of the new VM
    * @param host_PM The real machine hosting the VM
-   *
    */
   virtual VirtualMachine *createVM(const char *name, sg_host_t host_PM)=0;
   void adjustWeightOfDummyCpuActions() {};

diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp
index b17a570..aee9b99 100644 (file)
--- a/src/surf/vm_hl13.cpp
+++ b/src/surf/vm_hl13.cpp
@@ -27,14 +27,10 @@ namespace surf {
 /*********
  * Model *
  *********/
-
 VMHL13Model::VMHL13Model() : VMModel() {}
 
 void VMHL13Model::updateActionsState(double /*now*/, double /*delta*/) {}
 
-/* ind means ''indirect'' that this is a reference on the whole dict_elm
- * structure (i.e not on the surf_resource_private infos) */
-
 VirtualMachine *VMHL13Model::createVM(const char *name, sg_host_t host_PM)
 {
   VirtualMachine* vm = new VMHL13(this, name, NULL, host_PM);
@@ -42,10 +38,8 @@ VirtualMachine *VMHL13Model::createVM(const char *name, sg_host_t host_PM)
   return vm;
 }
 
-/* In the real world, processes on the guest operating system will be somewhat
- * degraded due to virtualization overhead. The total CPU share that these
- * processes get is smaller than that of the VM process gets on a host
- * operating system. */
+/* In the real world, processes on the guest operating system will be somewhat degraded due to virtualization overhead.
+ * The total CPU share these processes get is smaller than that of the VM process gets on a host operating system. */
 // const double virt_overhead = 0.95;
 const double virt_overhead = 1;
 
@@ -56,7 +50,6 @@ double VMHL13Model::next_occuring_event(double now)
   /* 1. Now we know how many resource should be assigned to each virtual
    * machine. We update constraints of the virtual machine layer.
    *
-   *
    * If we have two virtual machine (VM1 and VM2) on a physical machine (PM1).
    *     X1 + X2 = C       (Equation 1)
    * where
@@ -74,21 +67,16 @@ double VMHL13Model::next_occuring_event(double now)
    * Equation 1 was solved in the physical machine layer.
    * Equation 2 is solved in the virtual machine layer (here).
    * X1 must be passed to the virtual machine laye as a constraint value.
-   *
    **/
 
   /* iterate for all virtual machines */
-  for (VMModel::vm_list_t::iterator iter =
-         VMModel::ws_vms.begin();
-       iter !=  VMModel::ws_vms.end(); ++iter) {
-
+  for (VMModel::vm_list_t::iterator iter = VMModel::ws_vms.begin(); iter !=  VMModel::ws_vms.end(); ++iter) {
     VirtualMachine *ws_vm = &*iter;
     Cpu *cpu = ws_vm->p_cpu;
     xbt_assert(cpu, "cpu-less host");
 
     double solved_value = ws_vm->p_action->getVariable()->value;
-    XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value,
-        ws_vm->getName(), ws_vm->p_hostPM->name().c_str());
+    XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getName(), ws_vm->p_hostPM->name().c_str());
 
     // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution.
     // cpu_cas01->constraint->bound = solved_value;
@@ -97,7 +85,6 @@ double VMHL13Model::next_occuring_event(double now)
     lmm_update_constraint_bound(vcpu_system, cpu->getConstraint(), virt_overhead * solved_value);
   }
 
-
   /* 2. Calculate resource share at the virtual machine layer. */
   adjustWeightOfDummyCpuActions();
 
@@ -108,7 +95,6 @@ double VMHL13Model::next_occuring_event(double now)
 /************
  * Resource *
  ************/
-
 VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t host_PM)
  : VirtualMachine(model, name, props, host_PM)
 {
@@ -139,8 +125,7 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t hos
   /* FIXME: TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */
   p_action = sub_cpu->execution_start(0);
 
-  XBT_VERB("Create VM(%s)@PM(%s) with %ld mounted disks",
-    name, p_hostPM->name().c_str(), xbt_dynar_length(p_storage));
+  XBT_VERB("Create VM(%s)@PM(%s) with %ld mounted disks", name, p_hostPM->name().c_str(), xbt_dynar_length(p_storage));
 }
 
 void VMHL13::suspend()
@@ -173,9 +158,7 @@ void VMHL13::restore()
   p_vm_state = SURF_VM_STATE_RUNNING;
 }
 
-/*
- * Update the physical host of the given VM
- */
+/* Update the physical host of the given VM */
 void VMHL13::migrate(sg_host_t host_dest)
 {
    HostImpl *surfHost_dst = host_dest->extension<HostImpl>();
@@ -223,6 +206,5 @@ void VMHL13::setAffinity(Cpu *cpu, unsigned long mask){
  p_action->setAffinity(cpu, mask);
 }
 
-
 }
 }