* TOOLS *
*********/
-static simgrid::surf::Host *get_casted_host(sg_host_t host){
+static simgrid::surf::Host *get_casted_host(sg_host_t host){ //FIXME: killme
return host->extension<simgrid::surf::Host>();
}
void surf_presolve(void)
{
double next_event_date = -1.0;
- tmgr_trace_event_t event = NULL;
+ tmgr_trace_iterator_t event = NULL;
double value = -1.0;
simgrid::surf::Resource *resource = NULL;
simgrid::surf::Model *model = NULL;
unsigned int iter;
XBT_DEBUG ("Consume all trace events occurring before the starting time.");
- while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
+ while ((next_event_date = future_evt_set->next_date()) != -1.0) {
if (next_event_date > NOW)
break;
- while ((event =
- tmgr_history_get_next_event_leq(history, next_event_date,
- &value,
- (void **) &resource))) {
+
+ while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
if (value >= 0){
resource->updateState(event, value, NOW);
}
double value = -1.0;
simgrid::surf::Resource *resource = NULL;
simgrid::surf::Model *model = NULL;
- tmgr_trace_event_t event = NULL;
+ tmgr_trace_iterator_t event = NULL;
unsigned int iter;
if(!host_that_restart)
surf_min = next_event_virt;
}
- XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", surf_min);
+ XBT_DEBUG("Min for resources (remember that NS3 don't update that value): %f", surf_min);
XBT_DEBUG("Looking for next trace event");
- do {
- XBT_DEBUG("Next TRACE event : %f", next_event_date);
-
- next_event_date = tmgr_history_next_date(history);
+ while (1) { // Handle next occurring events until none remains
+ next_event_date = future_evt_set->next_date();
+ XBT_DEBUG("Next TRACE event: %f", next_event_date);
if(! surf_network_model->shareResourcesIsIdempotent()){ // NS3, I see you
- if(next_event_date!=-1.0 && surf_min!=-1.0) {
+ if (next_event_date!=-1.0 && surf_min!=-1.0) {
surf_min = MIN(next_event_date - NOW, surf_min);
} else{
surf_min = MAX(next_event_date - NOW, surf_min);
}
- XBT_DEBUG("Run for network at most %f", surf_min);
+ XBT_DEBUG("Run the NS3 network at most %fs", surf_min);
// run until min or next flow
model_next_action_end = surf_network_model->shareResources(surf_min);
break;
}
- if ((surf_min == -1.0) || (next_event_date > NOW + surf_min)) break;
+ if ((surf_min == -1.0) || (next_event_date > NOW + surf_min))
+ break; // next event occurs after the next resource change, bail out
XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", surf_min, NOW, next_event_date);
- while ((event =
- tmgr_history_get_next_event_leq(history, next_event_date,
- &value,
- (void **) &resource))) {
+
+ while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->getName())) {
surf_min = next_event_date - NOW;
- XBT_DEBUG
- ("This event will modify model state. Next event set to %f",
- surf_min);
+ XBT_DEBUG("This event will modify model state. Next event set to %f", surf_min);
}
- /* update state of model_obj according to new value. Does not touch lmm.
+ /* update state of the corresponding resource to the new value. Does not touch lmm.
It will be modified if needed when updating actions */
- XBT_DEBUG("Calling update_resource_state for resource %s with min %f",
- resource->getName(), surf_min);
+ XBT_DEBUG("Calling update_resource_state for resource %s with min %f", resource->getName(), surf_min);
resource->updateState(event, value, next_event_date);
}
- } while (1);
+ }
/* FIXME: Moved this test to here to avoid stopping simulation if there are actions running on cpus and all cpus are with availability = 0.
* This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.
* The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */
if (surf_min == -1.0) {
- XBT_DEBUG("No next event at all. Bail out now.");
+ XBT_DEBUG("No next event at all. Bail out now.");
return -1.0;
}
XBT_DEBUG("Duration set to %f", surf_min);
+ // Bump the time: jump into the future
NOW = NOW + surf_min;
- /* FIXME: model_list or model_list_invoke? revisit here later */
- /* sequential version */
+
+ // Inform the models of the date change
xbt_dynar_foreach(all_existing_models, iter, model) {
model->updateActionsState(NOW, surf_min);
}
return surf_min;
}
-void routing_get_route_and_latency(sg_netcard_t src, sg_netcard_t dst,
- xbt_dynar_t * route, double *latency){
- routing_platf->getRouteAndLatency(src, dst, route, latency);
-}
-
/*********
* MODEL *
*********/
-surf_host_model_t surf_host_get_model(sg_host_t host)
-{
- simgrid::surf::Host* surf_host =
- (simgrid::surf::Host*) host->extension<simgrid::surf::Host>();
- return (surf_host_model_t) surf_host->getModel();
-}
-
surf_action_t surf_model_extract_done_action_set(surf_model_t model){
if (model->getDoneActionSet()->empty())
return NULL;
return res;
}
-surf_action_t surf_model_extract_ready_action_set(surf_model_t model){
- if (model->getReadyActionSet()->empty())
- return NULL;
- surf_action_t res = &model->getReadyActionSet()->front();
- model->getReadyActionSet()->pop_front();
- return res;
-}
-
-surf_action_t surf_model_extract_running_action_set(surf_model_t model){
- if (model->getRunningActionSet()->empty())
- return NULL;
- surf_action_t res = &model->getRunningActionSet()->front();
- model->getRunningActionSet()->pop_front();
- return res;
-}
-
int surf_model_running_action_set_size(surf_model_t model){
return model->getRunningActionSet()->size();
}
-surf_action_t surf_host_model_execute_parallel_task(surf_host_model_t model,
- int host_nb,
- sg_host_t *host_list,
- double *flops_amount,
- double *bytes_amount,
- double rate){
- return static_cast<simgrid::surf::Action*>(
- model->executeParallelTask(host_nb, host_list, flops_amount, bytes_amount, rate));
-}
-
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(
- get_casted_host(src)->p_netElm,
- get_casted_host(dst)->p_netElm, &route, NULL);
+ routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, NULL);
return route;
}
}
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->p_netcard, dst->p_netcard, size, rate);
+ return model->communicate(src->pimpl_netcard, dst->pimpl_netcard, size, rate);
}
const char *surf_resource_name(surf_cpp_resource_t resource){
}
surf_action_t surf_host_sleep(sg_host_t host, double duration){
- return host->p_cpu->sleep(duration);
+ return host->pimpl_cpu->sleep(duration);
}
-xbt_dict_t sg_host_get_properties(sg_host_t host) {
- return get_casted_host(host)->getProperties();
-}
double surf_host_get_available_speed(sg_host_t host){
- return host->p_cpu->getAvailableSpeed();
-}
-
-surf_action_t surf_host_execute(sg_host_t host, double size){
- return host->p_cpu->execute(size);
-}
-
-double surf_host_get_current_power_peak(sg_host_t host){
- return host->p_cpu->getCurrentPowerPeak();
-}
-
-double surf_host_get_power_peak_at(sg_host_t host, int pstate_index){
- return host->p_cpu->getPowerPeakAt(pstate_index);
-}
-
-int surf_host_get_nb_pstates(sg_host_t host){
- return host->p_cpu->getNbPStates();
-}
-
-void surf_host_set_pstate(sg_host_t host, int pstate_index){
- host->p_cpu->setPState(pstate_index);
-}
-int surf_host_get_pstate(sg_host_t host){
- return host->p_cpu->getPState();
-}
-
-using simgrid::energy::HostEnergy;
-using simgrid::energy::surf_energy;
-
-double surf_host_get_wattmin_at(sg_host_t resource, int pstate){
- xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
- std::map<simgrid::surf::Host*, HostEnergy*>::iterator hostIt = surf_energy->find(get_casted_host(resource));
- return hostIt->second->getWattMinAt(pstate);
-}
-double surf_host_get_wattmax_at(sg_host_t resource, int pstate){
- xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
- std::map<simgrid::surf::Host*, HostEnergy*>::iterator hostIt = surf_energy->find(get_casted_host(resource));
- return hostIt->second->getWattMaxAt(pstate);
-}
-
-double surf_host_get_consumed_energy(sg_host_t resource){
- xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
- std::map<simgrid::surf::Host*, HostEnergy*>::iterator hostIt = surf_energy->find(get_casted_host(resource));
- return hostIt->second->getConsumedEnergy();
-}
-
-xbt_dict_t surf_host_get_mounted_storage_list(sg_host_t host){
- return get_casted_host(host)->getMountedStorageList();
+ return host->pimpl_cpu->getAvailableSpeed();
}
xbt_dynar_t surf_host_get_attached_storage_list(sg_host_t host){
unsigned int cpt;
simgrid::surf::VirtualMachine *vm;
xbt_dynar_foreach(vms, cpt, vm) {
- // TODO, use a backlink from simgrid::surf::Host to simgrid::Host
+ // TODO, use a backlink from simgrid::surf::Host to simgrid::s4u::Host
sg_host_t vm_ = (sg_host_t) xbt_dict_get_elm_or_null(host_list, vm->getName());
xbt_dynar_push(vms_, &vm_);
}
}
void surf_vm_destroy(sg_host_t vm){ // FIXME:DEADCODE
- vm->p_cpu = nullptr;
- vm->p_netcard = nullptr;
+ vm->pimpl_cpu = nullptr;
+ vm->pimpl_netcard = nullptr;
}
void surf_vm_suspend(sg_host_t vm){
}
void surf_vm_set_affinity(sg_host_t vm, sg_host_t host, unsigned long mask){
- return get_casted_vm(vm)->setAffinity(host->p_cpu, mask);
+ return get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask);
}
xbt_dict_t surf_storage_get_content(surf_resource_t resource){
return action->getRemains();
}
-void surf_action_suspend(surf_action_t action){
- action->suspend();
-}
-
-void surf_action_resume(surf_action_t action){
- action->resume();
-}
-
-void surf_action_cancel(surf_action_t action){
- action->cancel();
-}
-
-void surf_action_set_priority(surf_action_t action, double priority){
- action->setPriority(priority);
-}
-
void surf_action_set_category(surf_action_t action, const char *category){
action->setCategory(category);
}
}
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->p_cpu, mask);
+ static_cast<simgrid::surf::CpuAction*>(action)->setAffinity(host->pimpl_cpu, mask);
}
void surf_cpu_action_set_bound(surf_action_t action, double bound) {
#ifdef HAVE_LATENCY_BOUND_TRACKING
double surf_network_action_get_latency_limited(surf_action_t action) {
- return static_cast<NetworkActionPtr>(action)->getLatencyLimited();
+ 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;
}
-
-surf_host_t surf_host_resource_priv(sg_host_t host) {
- return host->extension<simgrid::surf::Host>();
-}
