X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba10aa5e6f6b5f04c62ee012b8ce76b674acbdef..900cb23da16eeaad345fd16101f2ea986f2706bd:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 85ad1560c6..5b603282d2 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */
@@ -9,6 +8,7 @@
 
 #include "surf_private.h"
 #include "xbt/module.h"
+#include "mc/mc.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");
@@ -103,7 +103,7 @@ int __surf_is_absolute_file_path(const char *file_path)
 #endif
 }
 
-static double NOW = 0;
+double NOW = 0;
 
 xbt_dynar_t model_list = NULL;
 tmgr_history_t history = NULL;
@@ -112,31 +112,31 @@ xbt_dynar_t surf_path = NULL;
 
 /* Don't forget to update the option description in smx_config when you change this */
 s_surf_model_description_t surf_network_model_description[] = {
-  {"Constant", NULL, surf_network_model_init_Constant},
-  {"CM02", NULL, surf_network_model_init_CM02},
-  {"LV08", NULL, surf_network_model_init_LegrandVelho},
+    {"Constant", "Simplistic network model where all communication take a constant time (one second)", NULL, surf_network_model_init_Constant},
+    {"Vivaldi", "Scalable network model using the Vivaldi coordinate ideas", NULL, surf_network_model_init_Vivaldi},
+  {"CM02", "Realistic network model with lmm_solve and no correction factors", NULL, surf_network_model_init_CM02},
+  {"LV08", "Realistic network model with lmm_solve and these correction factors: latency*=10.4, bandwidth*=.92, S=8775" , NULL, surf_network_model_init_LegrandVelho},
 #ifdef HAVE_GTNETS
-  {"GTNets", NULL, surf_network_model_init_GTNETS},
+  {"GTNets", "Network Pseudo-model using the GTNets simulator instead of an analytic model", NULL, surf_network_model_init_GTNETS},
 #endif
-  {"Reno", NULL, surf_network_model_init_Reno},
-  {"Reno2", NULL, surf_network_model_init_Reno2},
-  {"Vegas", NULL, surf_network_model_init_Vegas},
-  {NULL, NULL, NULL}            /* this array must be NULL terminated */
+  {"Reno", "Model using lagrange_solve instead of lmm_solve (experts only)", NULL, surf_network_model_init_Reno},
+  {"Reno2", "Model using lagrange_solve instead of lmm_solve (experts only)", NULL, surf_network_model_init_Reno2},
+  {"Vegas", "Model using lagrange_solve instead of lmm_solve (experts only)", NULL, surf_network_model_init_Vegas},
+  {NULL, NULL, NULL, NULL}            /* this array must be NULL terminated */
 };
 
 s_surf_model_description_t surf_cpu_model_description[] = {
-  {"Cas01_fullupdate", NULL, surf_cpu_model_init_Cas01},
-  {"Cas01", NULL, surf_cpu_model_init_Cas01_im},
-  {"CpuTI", NULL, surf_cpu_model_init_ti},
-  {NULL, NULL, NULL}            /* this array must be NULL terminated */
+  {"Cas01_fullupdate", "CPU classical model time=size/power", NULL, surf_cpu_model_init_Cas01},
+  {"Cas01", "Variation of Cas01_fullupdate with partial invalidation optimization of lmm system. Should produce the same values, only faster", NULL, surf_cpu_model_init_Cas01_im},
+  {"CpuTI", "Variation of Cas01 with also trace integration. Should produce the same values, only faster if you use availability traces", NULL, surf_cpu_model_init_ti},
+  {NULL, NULL, NULL, NULL}            /* this array must be NULL terminated */
 };
 
 s_surf_model_description_t surf_workstation_model_description[] = {
-  {"CLM03", NULL, surf_workstation_model_init_CLM03, create_workstations},
-  {"compound", NULL, surf_workstation_model_init_compound,
-   create_workstations},
-  {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07, NULL},
-  {NULL, NULL, NULL}            /* this array must be NULL terminated */
+  {"CLM03", "Default workstation model, using LV08 and CM02 as network and CPU", NULL, surf_workstation_model_init_CLM03, create_workstations},
+  {"compound", "Workstation model allowing you to use other network and CPU models", NULL, surf_workstation_model_init_compound, create_workstations},
+  {"ptask_L07", "Workstation model with better parallel task modeling", NULL, surf_workstation_model_init_ptask_L07, NULL},
+  {NULL, NULL, NULL, NULL}            /* this array must be NULL terminated */
 };
 
 void update_model_description(s_surf_model_description_t * table,
@@ -146,6 +146,14 @@ void update_model_description(s_surf_model_description_t * table,
   table[i].model = model;
 }
 
+/** Displays the long description of all registered models, and quit */
+void model_help(const char* category, s_surf_model_description_t * table) {
+  int i;
+  printf("Long description of the %s models accepted by this simulator:\n",category);
+  for (i = 0; table[i].name; i++)
+    printf("  %s: %s\n", table[i].name, table[i].description);
+}
+
 int find_model_description(s_surf_model_description_t * table,
                            const char *name)
 {
@@ -244,7 +252,7 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
 #endif
 
 void surf_init(int *argc, char **argv)
-{
+{ 
   /* Connect our log channels: that must be done manually under windows */
   XBT_LOG_CONNECT(surf_cpu, surf);
   XBT_LOG_CONNECT(surf_kernel, surf);
@@ -270,6 +278,9 @@ void surf_init(int *argc, char **argv)
     history = tmgr_history_new();
 
   surf_config_init(argc, argv);
+
+  if (_surf_do_model_check)
+    MC_memory_init();
 }
 
 #ifdef WIN32
@@ -330,7 +341,6 @@ void surf_exit(void)
   surf_parse_free_callbacks();
   xbt_dict_free(&route_table);
   NOW = 0;                      /* Just in case the user plans to restart the simulation afterward */
-  xbt_exit();
 }
 
 void surf_presolve(void)