From: Martin Quinson Date: Sun, 27 Dec 2015 17:52:48 +0000 (+0100) Subject: kill dead code X-Git-Tag: v3_13~1383 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/94f91fddf6aa49b80b881571a2575f1ab3c67755 kill dead code --- diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp index 50afd769c8..1a67830624 100644 --- a/src/surf/host_interface.cpp +++ b/src/surf/host_interface.cpp @@ -151,15 +151,6 @@ void Host::setState(e_surf_resource_state_t state){ p_cpu->setState(state); } -Action *Host::execute(double size) { - xbt_assert(0,"FIXME: DEADCODE"); - return p_cpu->execute(size); -} -Action *Host::sleep(double duration) { - xbt_assert(0,"FIXME: DEADCODE"); - return p_cpu->sleep(duration); -} - simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount) { diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp index 9755b61435..01ceeb6c9d 100644 --- a/src/surf/host_interface.hpp +++ b/src/surf/host_interface.hpp @@ -129,24 +129,6 @@ public: e_surf_resource_state_t getState(); void setState(e_surf_resource_state_t state); - /** - * @brief Execute some quantity of computation - * - * @param flops_amount The value of the processing amount (in flop) needed to process - * @return The CpuAction corresponding to the processing - * @see Cpu - */ - Action *execute(double flops_amount); - - /** - * @brief Make a process sleep for duration seconds - * - * @param duration The number of seconds to sleep - * @return The CpuAction corresponding to the sleeping - * @see Cpu - */ - Action *sleep(double duration); - /** @brief Return the storage of corresponding mount point */ virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage); diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index 89cbef1622..e7b9a42f8a 100644 --- a/src/surf/vm_hl13.cpp +++ b/src/surf/vm_hl13.cpp @@ -328,24 +328,6 @@ void VMHL13::setAffinity(Cpu *cpu, unsigned long mask){ p_action->setAffinity(cpu, mask); } -/* Adding a task to a VM updates the VCPU task on its physical machine. */ -Action *VMHL13::execute(double size) -{ - double old_cost = p_action->getCost(); - double new_cost = old_cost + size; - - XBT_DEBUG("VM(%s)@PM(%s): update dummy action's cost (%f -> %f)", - getName(), p_hostPM->getName().c_str(), - old_cost, new_cost); - - p_action->setCost(new_cost); - - return p_cpu->execute(size); -} - -Action *VMHL13::sleep(double duration) { - return p_cpu->sleep(duration); -} } } diff --git a/src/surf/vm_hl13.hpp b/src/surf/vm_hl13.hpp index 2244a38ba3..aba2143324 100644 --- a/src/surf/vm_hl13.hpp +++ b/src/surf/vm_hl13.hpp @@ -70,9 +70,6 @@ public: //FIXME: remove void updateState(tmgr_trace_event_t event_type, double value, double date); bool isUsed(); - - Action *execute(double size); - Action *sleep(double duration); }; /**********