Modify MSG_file_open() implementation

[simgrid.git] / src / surf / surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index be22202..c432691 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -1,3 +1,9 @@
+/* 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"
@@ -25,7 +31,7 @@ static WorkstationVMPtr get_casted_vm_workstation(surf_resource_t resource){
 }
 
 char *surf_routing_edge_name(sg_routing_edge_t edge){
-  return edge->p_name;
+  return edge->getName();
 }
 
 #ifdef CONTEXT_THREADS
@@ -129,7 +135,7 @@ double surf_solve(double max_date)
 
     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{
@@ -165,7 +171,7 @@ double surf_solve(double max_date)
       }
       /* 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);
     }
@@ -272,9 +278,12 @@ surf_action_t surf_workstation_model_communicate(surf_workstation_model_t model,
   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){
@@ -343,12 +352,16 @@ double surf_workstation_get_consumed_energy(surf_resource_t resource){
   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();
 }
 
-surf_action_t surf_workstation_open(surf_resource_t workstation, const char* mount, const char* path){
-  return get_casted_workstation(workstation)->open(mount, path);
+xbt_dynar_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* fullpath){
+  return get_casted_workstation(workstation)->open(fullpath);
 }
 
 surf_action_t surf_workstation_close(surf_resource_t workstation, surf_file_t fd){
@@ -463,6 +476,10 @@ sg_size_t surf_storage_get_size(surf_resource_t resource){
   return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->getSize();
 }
 
+const char* surf_storage_get_host(surf_resource_t resource){
+  return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->p_attach;
+}
+
 void surf_storage_rename(surf_resource_t resource, const char* src, const char* dest){
   static_cast<StoragePtr>(surf_storage_resource_priv(resource))->rename(src, dest);
 }
@@ -523,7 +540,7 @@ e_surf_action_state_t surf_action_get_state(surf_action_t action){
   return action->getState();
 }
 
-int surf_action_get_cost(surf_action_t action){
+double surf_action_get_cost(surf_action_t action){
   return action->getCost();
 }
 
@@ -535,6 +552,12 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound) {
   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;
 }