X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f4c74a5d1ee706562ae4f3c0f3927243d9274e5..e33bfee8391fbf3a1a0b4cd5cd33f14a291c8052:/src/simdag/sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 6729f0da9d..ce7651537f 100644
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -2,6 +2,10 @@
 #include "xbt/sysdep.h"
 #include "xbt/dynar.h"
 #include "surf/surf.h"
+#include "xbt/ex.h"
+#include "xbt/log.h"
+#include "xbt/str.h"
+#include "xbt/config.h"
 
 XBT_LOG_NEW_CATEGORY(sd,"Logging specific to SimDag");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel,sd,
@@ -9,6 +13,191 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel,sd,
 
 SD_global_t sd_global = NULL;
 
+/* $Id$ */
+
+/* Copyright (c) 2007 Arnaud Legrand.
+   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. */
+
+static int _sd_init_status = 0;	/* 0: beginning of time; 
+				   1: pre-inited (cfg_set created); 
+				   2: inited (running) */
+static xbt_cfg_t _sd_cfg_set = NULL;
+
+/* callback of the workstation_model variable */
+static void _sd_cfg_cb__workstation_model(const char *name, int pos)
+{
+  char *val;
+
+  xbt_assert0(_sd_init_status < 2,
+	      "Cannot change the model after the initialization");
+
+  val = xbt_cfg_get_string(_sd_cfg_set, name);
+  find_model_description(surf_workstation_model_description,
+			    surf_workstation_model_description_size,
+			    val);
+}
+
+/* callback of the cpu_model variable */
+static void _sd_cfg_cb__cpu_model(const char *name, int pos)
+{
+  char *val;
+
+  xbt_assert0(_sd_init_status < 2,
+	      "Cannot change the model after the initialization");
+
+  val = xbt_cfg_get_string(_sd_cfg_set, name);
+  find_model_description(surf_cpu_model_description,
+			    surf_cpu_model_description_size, val);
+}
+
+/* callback of the workstation_model variable */
+static void _sd_cfg_cb__network_model(const char *name, int pos)
+{
+  char *val;
+
+  xbt_assert0(_sd_init_status < 2,
+	      "Cannot change the model after the initialization");
+
+  val = xbt_cfg_get_string(_sd_cfg_set, name);
+  find_model_description(surf_network_model_description,
+			    surf_network_model_description_size, val);
+}
+
+XBT_LOG_EXTERNAL_CATEGORY(sd_kernel);
+XBT_LOG_EXTERNAL_CATEGORY(sd_task);
+XBT_LOG_EXTERNAL_CATEGORY(sd_workstation);
+
+/* create the config set and register what should be */
+static void sd_config_init(void)
+{
+
+  if (_sd_init_status)
+    return;			/* Already inited, nothing to do */
+
+  /* Connect our log channels: that must be done manually under windows */
+  XBT_LOG_CONNECT(sd_kernel, sd);
+  XBT_LOG_CONNECT(sd_task, sd);
+  XBT_LOG_CONNECT(sd_workstation, sd);
+   
+  _sd_init_status = 1;
+  _sd_cfg_set = xbt_cfg_new();
+
+  xbt_cfg_register(_sd_cfg_set,
+		   "workstation_model", xbt_cfgelm_string, 1, 1,
+		   &_sd_cfg_cb__workstation_model, NULL);
+
+  xbt_cfg_register(_sd_cfg_set,
+		   "cpu_model", xbt_cfgelm_string, 1, 1,
+		   &_sd_cfg_cb__cpu_model, NULL);
+  xbt_cfg_register(_sd_cfg_set,
+		   "network_model", xbt_cfgelm_string, 1, 1,
+		   &_sd_cfg_cb__network_model, NULL);
+
+  xbt_cfg_set_string(_sd_cfg_set, "workstation_model", "ptask_L07");
+}
+
+static void sd_config_finalize(void)
+{
+
+  if (!_sd_init_status)
+    return;			/* Not initialized yet. Nothing to do */
+
+  xbt_cfg_free(&_sd_cfg_set);
+  _sd_init_status = 0;
+}
+
+static void sd_config(const char *name, va_list pa)
+{
+  if (!_sd_init_status) {
+    sd_config_init();
+  }
+  xbt_cfg_set_vargs(_sd_cfg_set, name, pa);
+}
+
+
+static void __sd_config_helper(const char *name, ...)
+{
+  va_list pa;
+  va_start(pa, name);
+
+  sd_config(name, pa);
+
+  va_end(pa);
+}
+
+static void sd_cfg_control_set(const char *control_string)
+{
+  /* To split the string in commands, and the cursors */
+  xbt_dynar_t set_strings;
+  char *str;
+  unsigned int cpt;
+
+  if (!control_string)
+    return;
+  DEBUG1("Parse log settings '%s'", control_string);
+
+  /* split the string, and remove empty entries */
+  set_strings = xbt_str_split_quoted(control_string);
+
+  if (xbt_dynar_length(set_strings) == 0) {	/* vicious user! */
+    xbt_dynar_free(&set_strings);
+    return;
+  }
+  /* Parse each entry and either use it right now (if the category was already
+     created), or store it for further use */
+  xbt_dynar_foreach(set_strings, cpt, str) {
+    char *control_string, *control_string_sav, *name, *value;
+
+
+    control_string = control_string_sav = strdup(str);
+    control_string += strspn(control_string, " ");
+    name = control_string;
+    control_string += strcspn(str, ":=");
+    value = control_string;
+    *value = 0;
+    value++;
+
+    xbt_assert1(strlen(name) != 0, "Invalid name for configuration: '%s'",
+		name);
+    xbt_assert1(strlen(value) != 0,
+		"Invalid value for configuration: '%s'", value);
+    INFO2("setting '%s' to '%s'", name, value);
+
+    __sd_config_helper(name, value);
+
+    free(control_string_sav);
+  }
+  xbt_dynar_free(&set_strings);
+}
+
+static void sd_cfg_init(int *argc, char **argv)
+{
+  int i, j;
+  char *opt;
+
+  for (i = 1; i < *argc; i++) {
+    if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
+      opt = strchr(argv[i], '=');
+      opt++;
+
+      sd_cfg_control_set(opt);
+      DEBUG1("Did apply '%s' as config setting", 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 */
+    }
+  }
+}
+
 /**
  * \brief Initialises SD internal data
  *
@@ -45,6 +234,7 @@ void SD_init(int *argc, char **argv) {
   sd_global->task_number = 0;
 
   surf_init(argc, argv);
+  sd_cfg_init(argc, argv);
 }
 
 /**
@@ -88,8 +278,6 @@ void SD_application_reinit(void) {
 
 }
 
-
-
 /**
  * \brief Creates the environment
  *
@@ -102,7 +290,7 @@ void SD_application_reinit(void) {
  *
  * The XML file follows this DTD:
  *
- *     \include surfxml.dtd
+ *     \include simgrid.dtd
  *
  * Here is a small example of such a platform: 
  *
@@ -113,24 +301,84 @@ void SD_create_environment(const char *platform_file) {
   char *name = NULL;
   void *surf_workstation = NULL;
   void *surf_link = NULL;
+  char *workstation_model_name;
+  int workstation_id = -1;
 
   SD_CHECK_INIT_DONE();
 
   DEBUG0("SD_create_environment");
 
-  surf_timer_resource_init(platform_file);  /* tell Surf to create the environnement */
+  sd_config_init();
+  surf_timer_model_init(platform_file);
+
+  workstation_model_name =
+      xbt_cfg_get_string(_sd_cfg_set, "workstation_model");
+
+  DEBUG1("Model : %s", workstation_model_name);
+  workstation_id =
+      find_model_description(surf_workstation_model_description,
+				surf_workstation_model_description_size,
+				workstation_model_name);
+  if (!strcmp(workstation_model_name, "compound")) {
+    xbt_ex_t e;
+    char *network_model_name = NULL;
+    char *cpu_model_name = NULL;
+    int network_id = -1;
+    int cpu_id = -1;
+
+    TRY {
+      cpu_model_name = xbt_cfg_get_string(_sd_cfg_set, "cpu_model");
+    } CATCH(e) {
+      if (e.category == bound_error) {
+	xbt_assert0(0,
+		    "Set a cpu model to use with the 'compound' workstation model");
+	xbt_ex_free(e);
+      } else {
+	RETHROW;
+      }
+    }
 
-  DEBUG0("Calling surf_workstation_resource_init");
-  surf_workstation_resource_init_KCCFLN05(platform_file);
-  /*  surf_workstation_resource_init_CLM03(platform_file); */
+    TRY {
+      network_model_name =
+	  xbt_cfg_get_string(_sd_cfg_set, "network_model");
+    }
+    CATCH(e) {
+      if (e.category == bound_error) {
+	xbt_assert0(0,
+		    "Set a network model to use with the 'compound' workstation model");
+	xbt_ex_free(e);
+      } else {
+	RETHROW;
+      }
+    }
+
+    network_id =
+	find_model_description(surf_network_model_description,
+				  surf_network_model_description_size,
+				  network_model_name);
+    cpu_id =
+	find_model_description(surf_cpu_model_description,
+				  surf_cpu_model_description_size,
+				  cpu_model_name);
+
+    surf_cpu_model_description[cpu_id].model_init(platform_file);
+    surf_network_model_description[network_id].model_init(platform_file);
+  }
+
+  DEBUG0("Call workstation_model_init");
+  surf_workstation_model_description[workstation_id].
+      model_init(platform_file);
+
+  parse_platform_file(platform_file);
+
+  _sd_init_status = 2;
 
   /* now let's create the SD wrappers for workstations and links */
-  DEBUG0("Creating SimDags hosts and links");
   xbt_dict_foreach(workstation_set, cursor, name, surf_workstation) {
     __SD_workstation_create(surf_workstation, NULL);
   }
 
-  xbt_dict_foreach(network_link_set, cursor, name, surf_link) {
+  xbt_dict_foreach(link_set, cursor, name, surf_link) {
     __SD_link_create(surf_link, NULL);
   }
 
@@ -153,13 +401,13 @@ SD_task_t* SD_simulate(double how_long)
 {
   double total_time = 0.0; /* we stop the simulation when total_time >= how_long */
   double elapsed_time = 0.0;
-  SD_task_t task, dst;
+  SD_task_t task, task_safe, dst;
   SD_dependency_t dependency;
   surf_action_t action;
   SD_task_t *changed_tasks = NULL;
   int changed_task_number = 0;
   int changed_task_capacity = sd_global->task_number + 1;
-  int i;
+  unsigned int iter;
   static int first_time = 1;
 
   SD_CHECK_INIT_DONE();
@@ -175,10 +423,14 @@ SD_task_t* SD_simulate(double how_long)
     first_time = 0;
   }
 
+  if(how_long>0) {
+    surf_timer_model->extension_public->set(surf_get_clock()+how_long,
+					       NULL,NULL);
+  }
   sd_global->watch_point_reached = 0;
 
   /* explore the ready tasks */
-  xbt_swag_foreach(task, sd_global->ready_task_set) {
+  xbt_swag_foreach_safe(task, task_safe, sd_global->ready_task_set) {
     INFO1("Executing task '%s'", SD_task_get_name(task));
     if ((task->state_changed = __SD_task_try_to_run(task))) {
       changed_tasks[changed_task_number++] = task; /* replace NULL by the task */
@@ -197,6 +449,11 @@ SD_task_t* SD_simulate(double how_long)
   while (elapsed_time >= 0.0 &&
 	 (how_long < 0.0 || total_time < how_long) &&
 	 !sd_global->watch_point_reached) {
+    surf_model_t model = NULL;
+    /* dumb variables */
+    void *fun = NULL;
+    void *arg = NULL;
+
 
     DEBUG1("Total time: %f", total_time);
 
@@ -206,76 +463,82 @@ SD_task_t* SD_simulate(double how_long)
       total_time += elapsed_time;
 
     /* let's see which tasks are done */
-    while ((action = xbt_swag_extract(surf_workstation_resource->common_public->states.done_action_set))) {
-      task = action->data;
-      INFO1("Task '%s' done", SD_task_get_name(task));
-      DEBUG0("Calling __SD_task_just_done");
-      __SD_task_just_done(task);
-      DEBUG1("__SD_task_just_done called on task '%s'", SD_task_get_name(task));
-
-      /* the state has changed */
-      if (!task->state_changed) {
-	task->state_changed = 1;
-	changed_tasks[changed_task_number++] = task;
-	/*
-	if (changed_task_number == changed_task_capacity) {
-	  changed_task_capacity *= 2;
-	  changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
+    xbt_dynar_foreach(model_list, iter, model) {
+      while ((action = xbt_swag_extract(model->common_public->
+					states.done_action_set))) {
+	task = action->data;
+	INFO1("Task '%s' done", SD_task_get_name(task));
+	DEBUG0("Calling __SD_task_just_done");
+	__SD_task_just_done(task);
+	DEBUG1("__SD_task_just_done called on task '%s'", SD_task_get_name(task));
+	
+	/* the state has changed */
+	if (!task->state_changed) {
+	  task->state_changed = 1;
+	  changed_tasks[changed_task_number++] = task;
+	  /*
+	    if (changed_task_number == changed_task_capacity) {
+	    changed_task_capacity *= 2;
+	    changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
+	    }
+	  */
+	  changed_tasks[changed_task_number] = NULL;
+	}
+
+	/* remove the dependencies after this task */
+	while (xbt_dynar_length(task->tasks_after) > 0) {
+	  xbt_dynar_get_cpy(task->tasks_after, 0, &dependency);
+	  dst = dependency->dst;
+	  SD_task_dependency_remove(task, dst);
+	  
+	  /* is dst ready now? */
+	  if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) {
+	    INFO1("Executing task '%s'", SD_task_get_name(dst));
+	    if (__SD_task_try_to_run(dst)) {
+	      changed_tasks[changed_task_number++] = dst;
+	      /*
+		if (changed_task_number == changed_task_capacity) {
+		changed_task_capacity *= 2;
+		changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
+		}
+	      */
+	      changed_tasks[changed_task_number] = NULL;
+	    }
+	  }
 	}
-	*/
-	changed_tasks[changed_task_number] = NULL;
       }
 
-      /* remove the dependencies after this task */
-      while (xbt_dynar_length(task->tasks_after) > 0) {
-	xbt_dynar_get_cpy(task->tasks_after, 0, &dependency);
-	dst = dependency->dst;
-	SD_task_dependency_remove(task, dst);
+      /* let's see which tasks have just failed */
+      while ((action = xbt_swag_extract(model->common_public->states.failed_action_set))) {
+	task = action->data;
+	INFO1("Task '%s' failed", SD_task_get_name(task));
+	__SD_task_set_state(task, SD_FAILED);
+	surf_workstation_model->common_public->action_free(action);
+	task->surf_action = NULL;
 	
-	/* is dst ready now? */
-	if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) {
-	  INFO1("Executing task '%s'", SD_task_get_name(dst));
-	  if (__SD_task_try_to_run(dst)) {
-	    changed_tasks[changed_task_number++] = dst;
-	    /*
+	if (!task->state_changed) {
+	  task->state_changed = 1;
+	  changed_tasks[changed_task_number++] = task;
+	  /*
 	    if (changed_task_number == changed_task_capacity) {
-	      changed_task_capacity *= 2;
-	      changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
+	    changed_task_capacity *= 2;
+	    changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
 	    }
-	    */
-	    changed_tasks[changed_task_number] = NULL;
-	  }
+	  */
+	  changed_tasks[changed_task_number] = NULL;
 	}
       }
     }
 
-    /* let's see which tasks have just failed */
-    while ((action = xbt_swag_extract(surf_workstation_resource->common_public->states.failed_action_set))) {
-      task = action->data;
-      INFO1("Task '%s' failed", SD_task_get_name(task));
-      __SD_task_set_state(task, SD_FAILED);
-      surf_workstation_resource->common_public->action_free(action);
-      task->surf_action = NULL;
-
-      if (!task->state_changed) {
-	task->state_changed = 1;
-	changed_tasks[changed_task_number++] = task;
-	/*
-	if (changed_task_number == changed_task_capacity) {
-	  changed_task_capacity *= 2;
-	  changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
-	}
-	*/
-	changed_tasks[changed_task_number] = NULL;
-      }
+    while (surf_timer_model->extension_public->get(&fun,(void*)&arg)) {
     }
   }
 
   /* we must reset every task->state_changed */
-  i = 0;
-  while (changed_tasks[i] != NULL) {
-    changed_tasks[i]->state_changed = 0;
-    i++;
+  iter = 0;
+  while (changed_tasks[iter] != NULL) {
+    changed_tasks[iter]->state_changed = 0;
+    iter++;
   }
 
   INFO0("Simulation finished");