* TOOLS *
*********/
-static simgrid::surf::Host *get_casted_host(sg_host_t resource){
- return static_cast<simgrid::surf::Host*>(surf_host_resource_priv(resource));
+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 resource){
- return static_cast<simgrid::surf::VirtualMachine*>(surf_host_resource_priv(resource));
+static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
+ return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::Host>());
}
extern double NOW;
simgrid::surf::Model *model = NULL;
unsigned int iter;
- XBT_DEBUG ("First Run! Let's \"purge\" events and put models in the right state");
-
+ XBT_DEBUG ("Consume all trace events occurring before the starting time.");
while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
if (next_event_date > NOW)
break;
}
}
}
+
+ XBT_DEBUG ("Set every models in the right state by updating them to 0.");
xbt_dynar_foreach(all_existing_models, iter, model)
model->updateActionsState(NOW, 0.0);
}
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);
}
surf_host_model_t surf_host_get_model(sg_host_t host)
{
simgrid::surf::Host* surf_host =
- (simgrid::surf::Host*) host->facet<simgrid::surf::Host>();
+ (simgrid::surf::Host*) host->extension<simgrid::surf::Host>();
return (surf_host_model_t) surf_host->getModel();
}
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();
}
-xbt_dict_t surf_resource_get_properties(surf_cpp_resource_t resource){
- return resource->getProperties();
-}
-
-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 get_casted_host(host)->sleep(duration);
+ 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 get_casted_host(host)->execute(size);
+ return host->pimpl_cpu->getAvailableSpeed();
}
double surf_host_get_current_power_peak(sg_host_t host){
- return sg_host_surfcpu(host)->getCurrentPowerPeak();
+ return host->pimpl_cpu->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();
+ return host->pimpl_cpu->getPowerPeakAt(pstate_index);
}
-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();
get_casted_host(host)->setParams(params);
}
-void surf_vm_destroy(sg_host_t resource){
- /* Before clearing the entries in host_lib, we have to pick up resources. */
- const char* name = resource->id().c_str();
- /* 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);
- // TODO, use backlink from simgrid::surf::Host to simgrid::Host
- simgrid::Host::by_name_or_null(name)->set_facet((simgrid::surf::Host*)nullptr);
-
- /* TODO: comment out when VM storage is implemented. */
- // host->set_facet(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))->getUsedSize();
}
-const char* surf_storage_get_host(surf_resource_t resource){
- return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->p_attach;
+xbt_dict_t surf_storage_get_properties(surf_resource_t resource){
+ return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getProperties();
}
-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);
+const char* surf_storage_get_host(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->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) {
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>();
+}
