cosmetics and documentation around VM parameters

[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 eba9452..9c172d4 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -26,14 +26,7 @@ static VM *get_casted_vm(surf_resource_t resource){
   return static_cast<VM*>(surf_host_resource_priv(resource));
 }
 
-char *surf_routing_edge_name(sg_routing_edge_t edge){
-  return edge->getName();
-}
-
 extern double NOW;
-extern double *surf_mins; /* return value of share_resources for each model */
-extern int surf_min_index;       /* current index in surf_mins */
-extern double surf_min;               /* duration determined by surf_solve */
 
 void surf_presolve(void)
 {
@@ -44,8 +37,8 @@ void surf_presolve(void)
   Model *model = NULL;
   unsigned int iter;
 
-  XBT_DEBUG
-      ("First Run! Let's \"purge\" events and put models in the right state");
+  XBT_DEBUG ("First Run! Let's \"purge\" events and put models in the right state");
+
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
     if (next_event_date > NOW)
       break;
@@ -64,7 +57,7 @@ void surf_presolve(void)
 
 double surf_solve(double max_date)
 {
-  surf_min = -1.0; /* duration */
+  double surf_min = -1.0; /* duration */
   double next_event_date = -1.0;
   double model_next_action_end = -1.0;
   double value = -1.0;
@@ -81,31 +74,18 @@ double surf_solve(double max_date)
   }
 
   XBT_DEBUG("Looking for next action end for all models except NS3");
-
-  if (surf_mins == NULL) {
-    surf_mins = xbt_new(double, xbt_dynar_length(model_list_invoke));
-  }
-  surf_min_index = 0;
-
-  /* sequential version */
   xbt_dynar_foreach(model_list_invoke, iter, model) {
          double next_action_end = -1.0;
-         int i = __sync_fetch_and_add(&surf_min_index, 1);
-         if (strcmp(model->getName(), "network NS3")) {
-           XBT_DEBUG("Running for Resource [%s]", model->getName());
+         if (model->shareResourcesIsIdempotent()) {
+           XBT_DEBUG("Running for Resource [%s]", typeid(model).name());
            next_action_end = model->shareResources(NOW);
            XBT_DEBUG("Resource [%s] : next action end = %f",
-               model->getName(), next_action_end);
+               typeid(model).name(), next_action_end);
+         }
+         if ((surf_min < 0.0 || next_action_end < surf_min)
+                         && next_action_end >= 0.0) {
+                 surf_min = next_action_end;
          }
-         surf_mins[i] = next_action_end;
-  }
-
-  unsigned i;
-  for (i = 0; i < xbt_dynar_length(model_list_invoke); i++) {
-    if ((surf_min < 0.0 || surf_mins[i] < surf_min)
-        && surf_mins[i] >= 0.0) {
-      surf_min = surf_mins[i];
-    }
   }
 
   XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", surf_min);
@@ -117,7 +97,7 @@ double surf_solve(double max_date)
 
     next_event_date = tmgr_history_next_date(history);
 
-    if(!strcmp(surf_network_model->getName(), "network NS3")){
+    if(! surf_network_model->shareResourcesIsIdempotent()){ // NS3, I see you
       if(next_event_date!=-1.0 && surf_min!=-1.0) {
         surf_min = MIN(next_event_date - NOW, surf_min);
       } else{
@@ -206,7 +186,7 @@ void surf_as_cluster_set_backbone(AS_t as, void* backbone){
 }
 
 const char *surf_model_name(surf_model_t model){
-  return model->getName();
+  return typeid(model).name();
 }
 
 surf_action_t surf_model_extract_done_action_set(surf_model_t model){
@@ -247,17 +227,13 @@ int surf_model_running_action_set_size(surf_model_t model){
 
 surf_action_t surf_host_model_execute_parallel_task(surf_host_model_t model,
                                                    int host_nb,
-                                            void **host_list,
+                                            sg_host_t *host_list,
                                             double *flops_amount,
                                             double *bytes_amount,
                                             double rate){
   return static_cast<Action*>(model->executeParallelTask(host_nb, host_list, flops_amount, bytes_amount, rate));
 }
 
-surf_action_t surf_host_model_communicate(surf_host_model_t model, surf_resource_t src, surf_resource_t dst, double size, double rate){
-  return model->communicate(get_casted_host(src), get_casted_host(dst), size, rate);
-}
-
 xbt_dynar_t surf_host_model_get_route(surf_host_model_t /*model*/,
                                              surf_resource_t src, surf_resource_t dst){
   xbt_dynar_t route = NULL;
@@ -270,8 +246,8 @@ void surf_vm_model_create(const char *name, surf_resource_t ind_phys_host){
   surf_vm_model->createVM(name, ind_phys_host);
 }
 
-surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_routing_edge_t src, sg_routing_edge_t dst, double size, double rate){
-  return model->communicate(src, dst, size, rate);
+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);
 }
 
 const char *surf_resource_name(surf_cpp_resource_t resource){
@@ -407,11 +383,11 @@ xbt_dynar_t surf_host_get_vms(surf_resource_t host){
   return vms_;
 }
 
-void surf_host_get_params(surf_resource_t host, ws_params_t params){
+void surf_host_get_params(surf_resource_t host, vm_params_t params){
   get_casted_host(host)->getParams(params);
 }
 
-void surf_host_set_params(surf_resource_t host, ws_params_t params){
+void surf_host_set_params(surf_resource_t host, vm_params_t params){
   get_casted_host(host)->setParams(params);
 }