/* 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 "src/surf/HostImpl.hpp"
-#include "surf_interface.hpp"
+#include "VirtualMachineImpl.hpp"
#include "network_interface.hpp"
-#include "surf_routing_cluster.hpp"
-#include "src/instr/instr_private.h"
#include "plugins/energy.hpp"
-#include "virtual_machine.hpp"
+#include "src/instr/instr_private.h"
+#include "src/surf/HostImpl.hpp"
+#include "surf_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
*********/
static simgrid::surf::HostImpl *get_casted_host(sg_host_t host){ //FIXME: killme
- return host->extension<simgrid::surf::HostImpl>();
+ return host->pimpl_;
}
-static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
- return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::HostImpl>());
+static simgrid::surf::VirtualMachineImpl* get_casted_vm(sg_host_t host)
+{
+ return static_cast<simgrid::surf::VirtualMachineImpl*>(host->pimpl_);
}
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);
/* Physical models MUST be resolved first */
XBT_DEBUG("Looking for next event in physical models");
- double next_event_phy = surf_host_model->next_occuring_event(NOW);
+ double next_event_phy = surf_host_model->nextOccuringEvent(NOW);
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);
+ double next_event_virt = surf_vm_model->nextOccuringEvent(NOW);
if ((time_delta < 0.0 || next_event_virt < time_delta) && next_event_virt >= 0.0)
time_delta = next_event_virt;
}
next_event_date = future_evt_set->next_date();
XBT_DEBUG("Next TRACE event: %f", next_event_date);
- if(! surf_network_model->next_occuring_event_isIdempotent()){ // NS3, I see you
+ if(! surf_network_model->nextOccuringEventIsIdempotent()){ // NS3, I see you
if (next_event_date!=-1.0 && time_delta!=-1.0) {
time_delta = MIN(next_event_date - NOW, time_delta);
} else {
XBT_DEBUG("Run the NS3 network at most %fs", time_delta);
// run until min or next flow
- model_next_action_end = surf_network_model->next_occuring_event(time_delta);
+ model_next_action_end = surf_network_model->nextOccuringEvent(time_delta);
XBT_DEBUG("Min for network : %f", model_next_action_end);
if(model_next_action_end>=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();
}
-void surf_vm_model_create(const char *name, sg_host_t ind_phys_host){
- surf_vm_model->createVM(name, ind_phys_host);
-}
-
-surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_host_t src, sg_host_t dst, double size, double rate){
- 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();
-}
-
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);
}
-void surf_vm_destroy(sg_host_t vm){ // FIXME:DEADCODE
- vm->pimpl_cpu = nullptr;
- vm->pimpl_netcard = nullptr;
-}
-
void surf_vm_suspend(sg_host_t vm){
get_casted_vm(vm)->suspend();
}
}
void surf_vm_set_bound(sg_host_t vm, double bound){
- return 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)->setBound(bound);
}
xbt_dict_t surf_storage_get_content(surf_resource_t resource){
}
const char* surf_storage_get_host(surf_resource_t resource){
- return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->p_attach;
+ return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->attach_;
}
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;
+ return static_cast<simgrid::surf::StorageAction*>(action)->file_;
}