X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c215f8139368ac8b172ad664c05d4f2b4211a961..9003b522ca66f1a3723c63ce1c4753ad7aea9b70:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index 19e441e82a..67cd8a4b34 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -4,8 +4,6 @@ /* 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 - #include "surf_private.h" #include "xbt/module.h" #include "mc/mc.h" @@ -13,6 +11,8 @@ #include "surf/surf_resource.h" #include "xbt/xbt_os_thread.h" +#include + XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); @@ -189,6 +189,16 @@ s_surf_model_description_t surf_storage_model_description[] = { {NULL, NULL, NULL} /* this array must be NULL terminated */ }; +/* ********************************************************************* */ +/* TUTORIAL: New model */ +s_surf_model_description_t surf_new_model_description[] = { + {"default", + "Tutorial model.", + surf_new_model_init_default}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ +}; +/* ********************************************************************* */ + #ifdef CONTEXT_THREADS static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ #endif @@ -381,6 +391,8 @@ void sg_version(int *ver_major,int *ver_minor,int *ver_patch) { *ver_patch = SIMGRID_VERSION_PATCH; } +xbt_dynar_t sg_cmdline = NULL; + void surf_init(int *argc, char **argv) { XBT_DEBUG("Create all Libs"); @@ -401,6 +413,11 @@ void surf_init(int *argc, char **argv) SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free); + sg_cmdline = xbt_dynar_new(sizeof(char*),NULL); + int i; + for (i=0;i<*argc;i++) { + xbt_dynar_push(sg_cmdline,&(argv[i])); + } xbt_init(argc, argv); if (!model_list) model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL); @@ -472,6 +489,7 @@ void surf_exit(void) #endif xbt_dynar_free(&surf_path); + xbt_dynar_free(&sg_cmdline); xbt_lib_free(&host_lib); xbt_lib_free(&link_lib);