/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "host_interface.hpp"
+#include "src/surf/HostImpl.hpp"
#include "surf_interface.hpp"
#include "network_interface.hpp"
-#include "surf_routing_cluster.hpp"
#include "src/instr/instr_private.h"
#include "plugins/energy.hpp"
#include "virtual_machine.hpp"
* TOOLS *
*********/
-static simgrid::surf::Host *get_casted_host(sg_host_t host){ //FIXME: killme
- return host->extension<simgrid::surf::Host>();
+static simgrid::surf::HostImpl *get_casted_host(sg_host_t host){ //FIXME: killme
+ return host->extension<simgrid::surf::HostImpl>();
}
static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
- return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::Host>());
+ return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::HostImpl>());
}
extern double NOW;
-void surf_presolve(void)
+void surf_presolve()
{
double next_event_date = -1.0;
- tmgr_trace_iterator_t event = NULL;
+ tmgr_trace_iterator_t event = nullptr;
double value = -1.0;
- simgrid::surf::Resource *resource = NULL;
- simgrid::surf::Model *model = NULL;
- unsigned int iter;
+ simgrid::surf::Resource *resource = nullptr;
XBT_DEBUG ("Consume all trace events occurring before the starting time.");
while ((next_event_date = future_evt_set->next_date()) != -1.0) {
}
XBT_DEBUG ("Set every models in the right state by updating them to 0.");
- xbt_dynar_foreach(all_existing_models, iter, model)
+ for (auto model : *all_existing_models)
model->updateActionsState(NOW, 0.0);
}
double next_event_date = -1.0;
double model_next_action_end = -1.0;
double value = -1.0;
- simgrid::surf::Resource *resource = NULL;
- simgrid::surf::Model *model = NULL;
- tmgr_trace_iterator_t event = NULL;
- unsigned int iter;
+ simgrid::surf::Resource *resource = nullptr;
+ tmgr_trace_iterator_t event = nullptr;
if (max_date > 0.0) {
xbt_assert(max_date > NOW,"You asked to simulate up to %f, but that's in the past already", max_date);
if ((time_delta < 0.0 || next_event_phy < time_delta) && next_event_phy >= 0.0) {
time_delta = next_event_phy;
}
- if (surf_vm_model != NULL) {
+ if (surf_vm_model != nullptr) {
XBT_DEBUG("Looking for next event in virtual models");
double next_event_virt = surf_vm_model->next_occuring_event(NOW);
if ((time_delta < 0.0 || next_event_virt < time_delta) && next_event_virt >= 0.0)
NOW = NOW + time_delta;
// Inform the models of the date change
- xbt_dynar_foreach(all_existing_models, iter, model) {
+ for (auto model : *all_existing_models) {
model->updateActionsState(NOW, time_delta);
}
surf_action_t surf_model_extract_done_action_set(surf_model_t model){
if (model->getDoneActionSet()->empty())
- return NULL;
+ return nullptr;
surf_action_t res = &model->getDoneActionSet()->front();
model->getDoneActionSet()->pop_front();
return res;
surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
if (model->getFailedActionSet()->empty())
- return NULL;
+ return nullptr;
surf_action_t res = &model->getFailedActionSet()->front();
model->getFailedActionSet()->pop_front();
return res;
return model->getRunningActionSet()->size();
}
-xbt_dynar_t surf_host_model_get_route(surf_host_model_t /*model*/,
- sg_host_t src, sg_host_t dst){
- xbt_dynar_t route = NULL;
- routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, NULL);
- return route;
-}
-
void surf_vm_model_create(const char *name, sg_host_t ind_phys_host){
surf_vm_model->createVM(name, ind_phys_host);
}
return model->communicate(src->pimpl_netcard, dst->pimpl_netcard, size, rate);
}
-const char *surf_resource_name(surf_cpp_resource_t resource){
- return resource->getName();
-}
-
surf_action_t surf_host_sleep(sg_host_t host, double duration){
return host->pimpl_cpu->sleep(duration);
}
-
-double surf_host_get_available_speed(sg_host_t host){
- return host->pimpl_cpu->getAvailableSpeed();
-}
-
-xbt_dynar_t surf_host_get_attached_storage_list(sg_host_t host){
- return get_casted_host(host)->getAttachedStorageList();
-}
-
surf_action_t surf_host_open(sg_host_t host, const char* fullpath){
return get_casted_host(host)->open(fullpath);
}
return get_casted_host(host)->fileMove(fd, fullpath);
}
-xbt_dynar_t surf_host_get_vms(sg_host_t host){
- xbt_dynar_t vms = get_casted_host(host)->getVms();
- xbt_dynar_t vms_ = xbt_dynar_new(sizeof(sg_host_t), NULL);
- unsigned int cpt;
- simgrid::surf::VirtualMachine *vm;
- xbt_dynar_foreach(vms, cpt, vm) {
- sg_host_t cpy_ = vm->getHost();
- xbt_dynar_push(vms_, &cpy_);
- }
- xbt_dynar_free(&vms);
- return vms_;
-}
-
-void surf_host_get_params(sg_host_t host, vm_params_t params){
- get_casted_host(host)->getParams(params);
-}
-
-void surf_host_set_params(sg_host_t host, vm_params_t params){
- get_casted_host(host)->setParams(params);
-}
-
void surf_vm_destroy(sg_host_t vm){ // FIXME:DEADCODE
vm->pimpl_cpu = nullptr;
vm->pimpl_netcard = nullptr;
}
void surf_vm_set_bound(sg_host_t vm, double bound){
- return get_casted_vm(vm)->setBound(bound);
+ get_casted_vm(vm)->setBound(bound);
}
void surf_vm_set_affinity(sg_host_t vm, sg_host_t host, unsigned long mask){
- return get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask);
+ get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask);
}
xbt_dict_t surf_storage_get_content(surf_resource_t resource){
return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->p_attach;
}
-double surf_action_get_start_time(surf_action_t action){
- return action->getStartTime();
-}
-
-double surf_action_get_finish_time(surf_action_t action){
- return action->getFinishTime();
-}
-
-double surf_action_get_remains(surf_action_t action){
- return action->getRemains();
-}
-
-void surf_action_set_category(surf_action_t action, const char *category){
- action->setCategory(category);
-}
-
-void *surf_action_get_data(surf_action_t action){
- return action->getData();
-}
-
-void surf_action_set_data(surf_action_t action, void *data){
- action->setData(data);
-}
-
-e_surf_action_state_t surf_action_get_state(surf_action_t action){
- return action->getState();
-}
-
-double surf_action_get_cost(surf_action_t action){
- return action->getCost();
-}
-
-void surf_cpu_action_set_affinity(surf_action_t action, sg_host_t host, unsigned long mask) {
- static_cast<simgrid::surf::CpuAction*>(action)->setAffinity(host->pimpl_cpu, mask);
-}
-
void surf_cpu_action_set_bound(surf_action_t action, double bound) {
static_cast<simgrid::surf::CpuAction*>(action)->setBound(bound);
}
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-double surf_network_action_get_latency_limited(surf_action_t action) {
- return static_cast<simgrid::surf::NetworkAction*>(action)->getLatencyLimited();
-}
-#endif
-
surf_file_t surf_storage_action_get_file(surf_action_t action){
return static_cast<simgrid::surf::StorageAction*>(action)->p_file;
}
