* TOOLS *
*********/
-static simgrid::surf::Host *get_casted_host(sg_host_t host){
- return static_cast<simgrid::surf::Host*>(surf_host_resource_priv(host));
+static simgrid::surf::Host *get_casted_host(sg_host_t host){ //FIXME: killme
+ return host->extension<simgrid::surf::Host>();
}
static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
- return static_cast<simgrid::surf::VirtualMachine*>(surf_host_resource_priv(host));
+ return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::Host>());
}
extern double NOW;
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;
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)
return surf_min;
}
-void routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst,
+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(sg_host_edge(src), sg_host_edge(dst), size, 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();
}
-e_surf_resource_state_t surf_resource_get_state(surf_cpp_resource_t resource){
- return resource->getState();
-}
-
-void surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state_t state){
- resource->setState(state);
-}
-
surf_action_t surf_host_sleep(sg_host_t host, double duration){
- return host->extension(simgrid::surf::Cpu::EXTENSION_ID)->sleep(duration);
-}
-
-xbt_dict_t sg_host_get_properties(sg_host_t host) {
- return get_casted_host(host)->getProperties();
+ return host->pimpl_cpu->sleep(duration);
}
-double surf_host_get_speed(sg_host_t host, double load){
- return sg_host_surfcpu(host)->getSpeed(load);
-}
double surf_host_get_available_speed(sg_host_t host){
- return sg_host_surfcpu(host)->getAvailableSpeed();
-}
-
-int surf_host_get_core(sg_host_t host){
- return sg_host_surfcpu(host)->getCore();
-}
-
-surf_action_t surf_host_execute(sg_host_t host, double size){
- return host->extension(simgrid::surf::Cpu::EXTENSION_ID)->execute(size);
-}
-
-double surf_host_get_current_power_peak(sg_host_t host){
- return sg_host_surfcpu(host)->getCurrentPowerPeak();
-}
-
-double surf_host_get_power_peak_at(sg_host_t host, int pstate_index){
- return sg_host_surfcpu(host)->getPowerPeakAt(pstate_index);
-}
-
-int surf_host_get_nb_pstates(sg_host_t host){
- return sg_host_surfcpu(host)->getNbPStates();
-}
-
-void surf_host_set_pstate(sg_host_t host, int pstate_index){
- sg_host_surfcpu(host)->setPState(pstate_index);
-}
-int surf_host_get_pstate(sg_host_t host){
- return sg_host_surfcpu(host)->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_);
}
get_casted_host(host)->setParams(params);
}
-void surf_vm_destroy(sg_host_t resource){
- /* We deregister objects from host_lib, without invoking the freeing callback
- * of each level.
- *
- * Do not call xbt_lib_remove() here. It deletes all levels of the key,
- * including MSG_HOST_LEVEL and others. We should unregister only what we know.
- */
- sg_host_surfcpu_destroy(resource);
- sg_host_edge_destroy(resource,1);
- resource->extension_set<simgrid::surf::Host>(nullptr);
-
- /* TODO: comment out when VM storage is implemented. */
- // host->extension_set(SURF_STORAGE_LEVEL, nullptr);
+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){
return get_casted_vm(vm)->setBound(bound);
}
-void surf_vm_set_affinity(sg_host_t vm, sg_host_t cpu, unsigned long mask){
- return get_casted_vm(vm)->setAffinity(sg_host_surfcpu(cpu), mask);
+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);
}
xbt_dict_t surf_storage_get_content(surf_resource_t resource){
return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->p_attach;
}
-surf_action_t surf_cpu_execute(sg_host_t cpu, double size){
- return sg_host_surfcpu(cpu)->execute(size);
-}
-
-surf_action_t surf_cpu_sleep(sg_host_t cpu, double duration){
- return sg_host_surfcpu(cpu)->sleep(duration);
-}
-
double surf_action_get_start_time(surf_action_t action){
return action->getStartTime();
}
return action->getRemains();
}
-void surf_action_unref(surf_action_t action){
- action->unref();
-}
-
void surf_action_suspend(surf_action_t action){
action->suspend();
}
return action->getCost();
}
-void surf_cpu_action_set_affinity(surf_action_t action, sg_host_t cpu, unsigned long mask) {
- static_cast<simgrid::surf::CpuAction*>(action)->setAffinity(sg_host_surfcpu(cpu), mask);
+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) {
#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::EXTENSION_ID);
-}
