+/* Copyright (c) 2013-2014. The SimGrid Team.
+ * All rights reserved. */
+
+/* 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 "surf_interface.hpp"
#include "workstation_interface.hpp"
#include "vm_workstation_interface.hpp"
}
char *surf_routing_edge_name(sg_routing_edge_t edge){
- return edge->p_name;
+ return edge->getName();
}
#ifdef CONTEXT_THREADS
next_event_date = tmgr_history_next_date(history);
- if(!strcmp(surf_network_model->getName(), "network NS3")){//FIXME: add surf_network_model->m_name &&
+ if(!strcmp(surf_network_model->getName(), "network NS3")){
if(next_event_date!=-1.0 && surf_min!=-1.0) {
surf_min = MIN(next_event_date - NOW, surf_min);
} else{
}
/* update state of model_obj according to 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 %lf",
+ XBT_DEBUG("Calling update_resource_state for resource %s with min %f",
resource->getName(), surf_min);
resource->updateState(event, value, next_event_date);
}
return model->communicate(get_casted_workstation(src), get_casted_workstation(dst), size, rate);
}
-xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t model,
- surf_resource_t src, surf_resource_t dst){
- return model->getRoute(get_casted_workstation(src), get_casted_workstation(dst));
+xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t /*model*/,
+ surf_resource_t src, surf_resource_t dst){
+ xbt_dynar_t route = NULL;
+ routing_platf->getRouteAndLatency(get_casted_workstation(src)->p_netElm,
+ get_casted_workstation(dst)->p_netElm, &route, NULL);
+ return route;
}
void surf_vm_workstation_model_create(const char *name, surf_resource_t ind_phys_host){
return cpuIt->second->getConsumedEnergy();
}
-xbt_dict_t surf_workstation_get_storage_list(surf_resource_t workstation){
- return get_casted_workstation(workstation)->getStorageList();
+xbt_dict_t surf_workstation_get_mounted_storage_list(surf_resource_t workstation){
+ return get_casted_workstation(workstation)->getMountedStorageList();
+}
+
+xbt_dict_t surf_workstation_get_attached_storage_list(surf_resource_t workstation){
+ return get_casted_workstation(workstation)->getAttachedStorageList();
}
surf_action_t surf_workstation_open(surf_resource_t workstation, const char* mount, const char* path){
return action->getState();
}
-int surf_action_get_cost(surf_action_t action){
+double surf_action_get_cost(surf_action_t action){
return action->getCost();
}
static_cast<CpuActionPtr>(action)->setBound(bound);
}
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+double surf_network_action_get_latency_limited(surf_action_t action) {
+ return static_cast<NetworkActionPtr>(action)->getLatencyLimited();
+}
+#endif
+
surf_file_t surf_storage_action_get_file(surf_action_t action){
return static_cast<StorageActionPtr>(action)->p_file;
}