X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166..686dec33de79ebdb24cfc595fd679b63b466bc77:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 1ae58ed587..c5012a408c 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -8,23 +8,84 @@
 #include "surf_private.h"
 #include "xbt/module.h"
 
-static xbt_heap_float_t NOW=0;
+typedef struct surf_resource_object {
+  surf_resource_t resource;
+} s_surf_resource_object_t, *surf_resource_object_t;
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_global, surf,
+				"Logging specific to the SURF global module");
+
+
+static double NOW = 0;
 
 xbt_dynar_t resource_list = NULL;
 tmgr_history_t history = NULL;
 lmm_system_t maxmin_system = NULL;
+xbt_dynar_t surf_path = NULL;
+
+double generic_maxmin_share_resources(xbt_swag_t running_actions,
+				       size_t offset)
+{
+  return  generic_maxmin_share_resources2(running_actions, offset,
+					  maxmin_system);
+}
+
+double generic_maxmin_share_resources2(xbt_swag_t running_actions,
+				       size_t offset,
+				       lmm_system_t sys)
+{
+  surf_action_t action = NULL;
+  double min = -1;
+  double value = -1;
+#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset))))
+
+  lmm_solve(sys);
+
+  xbt_swag_foreach(action, running_actions) {
+    value = lmm_variable_getvalue(VARIABLE(action));
+    if ((value > 0) || (action->max_duration >= 0))
+      break;
+  }
+
+  if (!action)
+    return -1.0;
+
+  if (value > 0) {
+    min = value = action->remains / value;
+    if ((action->max_duration >= 0) && (action->max_duration < min))
+      min = action->max_duration;
+  } else
+    min = action->max_duration;
+
+
+  for (action = xbt_swag_getNext(action, running_actions->offset);
+       action;
+       action = xbt_swag_getNext(action, running_actions->offset)) {
+    value = lmm_variable_getvalue(VARIABLE(action));
+    if (value > 0) {
+      value = action->remains / value;
+      if (value < min)
+	min = value;
+    }
+    if ((action->max_duration >= 0) && (action->max_duration < min))
+      min = action->max_duration;
+  }
+#undef VARIABLE
+  return min;
+}
 
 e_surf_action_state_t surf_action_get_state(surf_action_t action)
 {
-  surf_action_state_t action_state = &(action->resource_type->common_public->states); 
-  
-  if(action->state_set == action_state->ready_action_set)
+  surf_action_state_t action_state =
+      &(action->resource_type->common_public->states);
+
+  if (action->state_set == action_state->ready_action_set)
     return SURF_ACTION_READY;
-  if(action->state_set == action_state->running_action_set)
+  if (action->state_set == action_state->running_action_set)
     return SURF_ACTION_RUNNING;
-  if(action->state_set == action_state->failed_action_set)
+  if (action->state_set == action_state->failed_action_set)
     return SURF_ACTION_FAILED;
-  if(action->state_set == action_state->done_action_set)
+  if (action->state_set == action_state->done_action_set)
     return SURF_ACTION_DONE;
   return SURF_ACTION_NOT_IN_THE_SYSTEM;
 }
@@ -32,82 +93,165 @@ e_surf_action_state_t surf_action_get_state(surf_action_t action)
 void surf_action_free(surf_action_t * action)
 {
   (*action)->resource_type->common_public->action_cancel(*action);
-  xbt_free(*action);
-  *action=NULL;
+  free(*action);
+  *action = NULL;
 }
 
-void surf_action_change_state(surf_action_t action, e_surf_action_state_t state)
+void surf_action_change_state(surf_action_t action,
+			      e_surf_action_state_t state)
 {
-  surf_action_state_t action_state = &(action->resource_type->common_public->states); 
+  surf_action_state_t action_state =
+      &(action->resource_type->common_public->states);
 
   xbt_swag_remove(action, action->state_set);
 
-  if(state == SURF_ACTION_READY) 
+  if (state == SURF_ACTION_READY)
     action->state_set = action_state->ready_action_set;
-  else if(state == SURF_ACTION_RUNNING)
+  else if (state == SURF_ACTION_RUNNING)
     action->state_set = action_state->running_action_set;
-  else if(state == SURF_ACTION_FAILED)
+  else if (state == SURF_ACTION_FAILED)
     action->state_set = action_state->failed_action_set;
-  else if(state == SURF_ACTION_DONE)
+  else if (state == SURF_ACTION_DONE)
     action->state_set = action_state->done_action_set;
-  else action->state_set = NULL;
+  else
+    action->state_set = NULL;
 
-  if(action->state_set) xbt_swag_insert(action, action->state_set);
+  if (action->state_set)
+    xbt_swag_insert(action, action->state_set);
+}
+
+void surf_action_set_data(surf_action_t action,
+			  void *data)
+{
+  action->data=data;
 }
 
 void surf_init(int *argc, char **argv)
 {
+  int i,j;
+  char *opt;
+
   xbt_init(argc, argv);
-  if(!resource_list) resource_list = xbt_dynar_new(sizeof(surf_resource_private_t), NULL);
-  if(!history) history = tmgr_history_new();
-  if(!maxmin_system) maxmin_system = lmm_system_new();
+  if (!surf_path) {
+    const char *initial_path = "./";
+    surf_path = xbt_dynar_new(sizeof(char*), NULL);
+    xbt_dynar_push(surf_path,&initial_path);
+
+    for (i=1; i<*argc; i++) {
+      if (!strncmp(argv[i],"--surf-path=",strlen("--surf-path="))) {
+	opt=strchr(argv[i],'=');
+	opt++;
+	xbt_dynar_push(surf_path,&opt);
+	/*remove this from argv*/
+	for (j=i+1; j<*argc; j++) {
+	  argv[j-1] = argv[j];
+	} 
+	argv[j-1] = NULL;
+	(*argc)--;
+	i--; /* compensate effect of next loop incrementation */
+      }
+    }
+  }
+  if (!resource_list)
+    resource_list = xbt_dynar_new(sizeof(surf_resource_private_t), NULL);
+  if (!history)
+    history = tmgr_history_new();
+  if (!maxmin_system)
+    maxmin_system = lmm_system_new();
+}
+
+static char* path_name = NULL;
+FILE *surf_fopen(const char *name, const char *mode)
+{
+  int i; 
+  char* path = NULL;
+  FILE *file = NULL;
+  int path_name_len = 0; /* don't count '\0' */
+
+  xbt_assert0(name, "Need a non-NULL file name");
+
+  xbt_assert0(surf_path,"surf_init has to be called before using surf_fopen");
+   
+  if (name[0] == '/') { /* don't mess with absolute file names */
+    return fopen(name,mode);
+     
+  } else { /* search relative files in the path */
+   
+    if(!path_name) {
+       path_name_len = strlen(name);
+       path_name=xbt_new0(char,path_name_len+1);
+    }
+
+    xbt_dynar_foreach(surf_path,i,path) {
+      if(path_name_len < strlen(path)+strlen(name)+1) {
+	 path_name_len = strlen(path)+strlen(name)+1; /* plus '/' */
+	 path_name=xbt_realloc(path_name,path_name_len+1);
+      }
+      sprintf(path_name,"%s/%s",path, name);
+      file = fopen(path_name,mode);
+      if (file) return file;
+    }
+  }
+  return file;
 }
 
 void surf_finalize(void)
-{ 
+{
   int i;
   surf_resource_t resource = NULL;
 
-  xbt_dynar_foreach (resource_list,i,resource) {
+  xbt_dynar_foreach(resource_list, i, resource) {
     resource->common_private->finalize();
   }
 
-  if(maxmin_system) {
+  if (maxmin_system) {
     lmm_system_free(maxmin_system);
     maxmin_system = NULL;
   }
-  if(history) {
+  if (history) {
     tmgr_history_free(history);
     history = NULL;
   }
-  if(resource_list) xbt_dynar_free(&resource_list);
+  if (resource_list)
+    xbt_dynar_free(&resource_list);
+
+  if(surf_path) 
+    xbt_dynar_free(&surf_path);
 
   tmgr_finalize();
+  surf_parse_lex_destroy();
+  if(path_name) {
+    free(path_name);
+    path_name = NULL;
+  }
 }
 
-xbt_heap_float_t surf_solve(void)
+double surf_solve(void)
 {
   static int first_run = 1;
 
-  xbt_heap_float_t min = -1.0;
-  xbt_heap_float_t next_event_date = -1.0;
-  xbt_heap_float_t resource_next_action_end = -1.0;
-  xbt_maxmin_float_t value = -1.0;
+  double min = -1.0;
+  double next_event_date = -1.0;
+  double resource_next_action_end = -1.0;
+  double value = -1.0;
   surf_resource_object_t resource_obj = NULL;
   surf_resource_t resource = NULL;
   tmgr_trace_event_t event = NULL;
   int i;
 
-  if(first_run) {
+  if (first_run) {
     while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
-      if(next_event_date > NOW) break;
-      while ((event = tmgr_history_get_next_event_leq(history, next_event_date,
-						      &value, (void **) &resource_obj))) {
-	resource_obj->resource->common_private->update_resource_state(resource_obj,
-								      event, value);
+      if (next_event_date > NOW)
+	break;
+      while ((event =
+	      tmgr_history_get_next_event_leq(history, next_event_date,
+					      &value,
+					      (void **) &resource_obj))) {
+	resource_obj->resource->common_private->
+	    update_resource_state(resource_obj, event, value);
       }
     }
-    xbt_dynar_foreach (resource_list,i,resource) {
+    xbt_dynar_foreach(resource_list, i, resource) {
       resource->common_private->update_actions_state(NOW, 0.0);
     }
     first_run = 0;
@@ -116,39 +260,46 @@ xbt_heap_float_t surf_solve(void)
 
   min = -1.0;
 
-  xbt_dynar_foreach (resource_list,i,resource) {
-    resource_next_action_end = resource->common_private->share_resources(NOW);
-    if(((min<0.0) || (resource_next_action_end<min)) && (resource_next_action_end>=0.0))
+  xbt_dynar_foreach(resource_list, i, resource) {
+    resource_next_action_end =
+	resource->common_private->share_resources(NOW);
+    if (((min < 0.0) || (resource_next_action_end < min))
+	&& (resource_next_action_end >= 0.0))
       min = resource_next_action_end;
   }
 
-  if(min<0.0) return 0.0;
+  if (min < 0.0)
+    return -1.0;
 
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
-    if(next_event_date > NOW+min) break;
-    while ((event=tmgr_history_get_next_event_leq(history, next_event_date,
-						  &value, (void **) &resource_obj))) {
-      if(resource_obj->resource->common_private->resource_used(resource_obj)) {
-	min = next_event_date-NOW;
+    if (next_event_date > NOW + min)
+      break;
+    while ((event =
+	    tmgr_history_get_next_event_leq(history, next_event_date,
+					    &value,
+					    (void **) &resource_obj))) {
+      if (resource_obj->resource->common_private->
+	  resource_used(resource_obj)) {
+	min = next_event_date - NOW;
       }
       /* update state of resource_obj according to new value. Does not touch lmm.
          It will be modified if needed when updating actions */
-      resource_obj->resource->common_private->update_resource_state(resource_obj,
-								    event, value);
+      resource_obj->resource->common_private->
+	  update_resource_state(resource_obj, event, value);
     }
   }
 
 
-  xbt_dynar_foreach (resource_list,i,resource) {
+  xbt_dynar_foreach(resource_list, i, resource) {
     resource->common_private->update_actions_state(NOW, min);
   }
 
-  NOW=NOW+min;
+  NOW = NOW + min;
 
   return min;
 }
 
-xbt_heap_float_t surf_get_clock(void)
+double surf_get_clock(void)
 {
   return NOW;
 }