Put the different model in the dtd. Permit the xml validation before parsing.

[simgrid.git] / src / surf / sg_platf.c

diff --git a/src/surf/sg_platf.c b/src/surf/sg_platf.c
index 35d18ef..d836e9f 100644 (file)
--- a/src/surf/sg_platf.c
+++ b/src/surf/sg_platf.c
@@ -8,6 +8,7 @@
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/dict.h"

+#include "xbt/RngStream.h"

 #include "simgrid/platf_interface.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 #include "simgrid/platf_interface.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);


@@ -19,10 +20,16 @@ xbt_dynar_t sg_platf_cluster_cb_list = NULL; // of sg_platf_cluster_cb_t
 xbt_dynar_t sg_platf_AS_begin_cb_list = NULL; //of sg_platf_AS_begin_cb_t
 xbt_dynar_t sg_platf_AS_end_cb_list = NULL; //of void_f_void_t
 xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t
 xbt_dynar_t sg_platf_AS_begin_cb_list = NULL; //of sg_platf_AS_begin_cb_t
 xbt_dynar_t sg_platf_AS_end_cb_list = NULL; //of void_f_void_t
 xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t

+

 xbt_dynar_t sg_platf_storage_cb_list = NULL; // of sg_platf_storage_cb_t
 xbt_dynar_t sg_platf_storage_cb_list = NULL; // of sg_platf_storage_cb_t

+xbt_dynar_t sg_platf_storage_type_cb_list = NULL; // of sg_platf_storage_cb_t
+xbt_dynar_t sg_platf_mstorage_cb_list = NULL; // of sg_platf_storage_cb_t
+xbt_dynar_t sg_platf_mount_cb_list = NULL; // of sg_platf_storage_cb_t

 
 static int surf_parse_models_setup_already_called;
 
 
 static int surf_parse_models_setup_already_called;
 

+/* one RngStream for the platform, to respect some statistic rules */
+static RngStream sg_platf_rng_stream = NULL;

 
 /** Module management function: creates all internal data structures */
 void sg_platf_init(void) {
 
 /** Module management function: creates all internal data structures */
 void sg_platf_init(void) {


@@ -34,7 +41,11 @@ void sg_platf_init(void) {
   sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t),NULL);
   sg_platf_AS_begin_cb_list = xbt_dynar_new(sizeof(sg_platf_AS_begin_cb_t),NULL);
   sg_platf_AS_end_cb_list = xbt_dynar_new(sizeof(void_f_void_t),NULL);
   sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t),NULL);
   sg_platf_AS_begin_cb_list = xbt_dynar_new(sizeof(sg_platf_AS_begin_cb_t),NULL);
   sg_platf_AS_end_cb_list = xbt_dynar_new(sizeof(void_f_void_t),NULL);

+

   sg_platf_storage_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
   sg_platf_storage_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);

+  sg_platf_storage_type_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
+  sg_platf_mstorage_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
+  sg_platf_mount_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);

 }
 /** Module management function: frees all internal data structures */
 void sg_platf_exit(void) {
 }
 /** Module management function: frees all internal data structures */
 void sg_platf_exit(void) {


@@ -46,7 +57,11 @@ void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_cluster_cb_list);
   xbt_dynar_free(&sg_platf_AS_begin_cb_list);
   xbt_dynar_free(&sg_platf_AS_end_cb_list);
   xbt_dynar_free(&sg_platf_cluster_cb_list);
   xbt_dynar_free(&sg_platf_AS_begin_cb_list);
   xbt_dynar_free(&sg_platf_AS_end_cb_list);

+

   xbt_dynar_free(&sg_platf_storage_cb_list);
   xbt_dynar_free(&sg_platf_storage_cb_list);

+  xbt_dynar_free(&sg_platf_storage_type_cb_list);
+  xbt_dynar_free(&sg_platf_mstorage_cb_list);
+  xbt_dynar_free(&sg_platf_mount_cb_list);

 
   /* make sure that we will reinit the models while loading the platf once reinited */
   surf_parse_models_setup_already_called = 0;
 
   /* make sure that we will reinit the models while loading the platf once reinited */
   surf_parse_models_setup_already_called = 0;


@@ -94,6 +109,27 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage){
     fun(storage);
   }
 }
     fun(storage);
   }
 }

+void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){
+  unsigned int iterator;
+  sg_platf_storage_type_cb_t fun;
+  xbt_dynar_foreach(sg_platf_storage_type_cb_list, iterator, fun) {
+    fun(storage_type);
+  }
+}
+void sg_platf_new_mstorage(sg_platf_mstorage_cbarg_t mstorage){
+  unsigned int iterator;
+  sg_platf_mstorage_cb_t fun;
+  xbt_dynar_foreach(sg_platf_mstorage_cb_list, iterator, fun) {
+    fun(mstorage);
+  }
+}
+void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){
+  unsigned int iterator;
+  sg_platf_mount_cb_t fun;
+  xbt_dynar_foreach(sg_platf_mount_cb_list, iterator, fun) {
+    fun(mount);
+  }
+}

 
 void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
 
 
 void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
 


@@ -107,7 +143,7 @@ void sg_platf_end() {
 
 static int surf_parse_models_setup_already_called = 0;
 
 
 static int surf_parse_models_setup_already_called = 0;
 

-void sg_platf_new_AS_begin(const char *id, const char *routing) {
+void sg_platf_new_AS_begin(const char *id, int routing) {

   unsigned int iterator;
   sg_platf_AS_begin_cb_t fun;
 
   unsigned int iterator;
   sg_platf_AS_begin_cb_t fun;
 


@@ -169,4 +205,29 @@ void sg_platf_AS_end_add_cb(void_f_void_t fct) {
 void sg_platf_storage_add_cb(sg_platf_storage_cb_t fct) {
   xbt_dynar_push(sg_platf_storage_cb_list, &fct);
 }
 void sg_platf_storage_add_cb(sg_platf_storage_cb_t fct) {
   xbt_dynar_push(sg_platf_storage_cb_list, &fct);
 }

+void sg_platf_storage_type_add_cb(sg_platf_storage_type_cb_t fct) {
+  xbt_dynar_push(sg_platf_storage_type_cb_list, &fct);
+}
+void sg_platf_mstorage_add_cb(sg_platf_mstorage_cb_t fct) {
+  xbt_dynar_push(sg_platf_mstorage_cb_list, &fct);
+}
+void sg_platf_mount_add_cb(sg_platf_mount_cb_t fct) {
+  xbt_dynar_push(sg_platf_mount_cb_list, &fct);
+}

 
 

+
+void sg_platf_rng_stream_init(unsigned long seed[6]) {
+  RngStream_SetPackageSeed(seed);
+  sg_platf_rng_stream = RngStream_CreateStream(NULL);
+}
+
+RngStream sg_platf_rng_stream_get(const char* id) {
+  RngStream stream = NULL;
+  unsigned int id_hash;
+  
+  stream = RngStream_CopyStream(sg_platf_rng_stream);
+  id_hash = xbt_str_hash(id);
+  RngStream_AdvanceState(stream, 0, (long)id_hash);
+  
+  return stream;
+}