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,
+ while ((event = future_evt_set->pop_leq(next_event_date,
&value,
(void **) &resource))) {
if (value >= 0){
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)
do {
XBT_DEBUG("Next TRACE event : %f", next_event_date);
- next_event_date = tmgr_history_next_date(history);
+ next_event_date = future_evt_set->next_date();
if(! surf_network_model->shareResourcesIsIdempotent()){ // NS3, I see you
if(next_event_date!=-1.0 && surf_min!=-1.0) {
if ((surf_min == -1.0) || (next_event_date > NOW + surf_min)) break;
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,
+ while ((event = future_evt_set->pop_leq(next_event_date,
&value,
(void **) &resource))) {
if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->getName())) {
* 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;
return host->pimpl_cpu->getAvailableSpeed();
}
-double surf_host_get_current_power_peak(sg_host_t host){
- return host->pimpl_cpu->getCurrentPowerPeak();
-}
-
-double surf_host_get_power_peak_at(sg_host_t host, int pstate_index){
- return host->pimpl_cpu->getPowerPeakAt(pstate_index);
-}
-
-
-xbt_dict_t surf_host_get_mounted_storage_list(sg_host_t host){
- return get_casted_host(host)->getMountedStorageList();
-}
-
xbt_dynar_t surf_host_get_attached_storage_list(sg_host_t host){
return get_casted_host(host)->getAttachedStorageList();
}
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_);
}
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);
}
#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>();
-}
