X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3b82ab21c706eff03f671a2a997c20b2e29889e..7abffd12021a46a0ac1bd2b4ff48ca4b3cc8c71c:/src/surf/sg_platf.c

diff --git a/src/surf/sg_platf.c b/src/surf/sg_platf.c
index 5cdf39b4bc..df9423db6a 100644
--- a/src/surf/sg_platf.c
+++ b/src/surf/sg_platf.c
@@ -8,10 +8,12 @@
 #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);
 xbt_dynar_t sg_platf_host_cb_list = NULL;   // of sg_platf_host_cb_t
+xbt_dynar_t sg_platf_host_link_cb_list = NULL;   // of sg_platf_host_link_cb_t
 xbt_dynar_t sg_platf_link_cb_list = NULL;   // of sg_platf_link_cb_t
 xbt_dynar_t sg_platf_router_cb_list = NULL; // of sg_platf_router_cb_t
 xbt_dynar_t sg_platf_peer_cb_list = NULL; // of sg_platf_peer_cb_t
@@ -27,10 +29,13 @@ xbt_dynar_t sg_platf_mount_cb_list = NULL; // of sg_platf_storage_cb_t
 
 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) {
   sg_platf_host_cb_list = xbt_dynar_new(sizeof(sg_platf_host_cb_t), NULL);
+  sg_platf_host_link_cb_list = xbt_dynar_new(sizeof(sg_platf_host_link_cb_t), NULL);
   sg_platf_router_cb_list = xbt_dynar_new(sizeof(sg_platf_host_cb_t), NULL);
   sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_host_cb_t), NULL);
   sg_platf_peer_cb_list = xbt_dynar_new(sizeof(sg_platf_peer_cb_t), NULL);
@@ -47,6 +52,7 @@ void sg_platf_init(void) {
 /** Module management function: frees all internal data structures */
 void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_host_cb_list);
+  xbt_dynar_free(&sg_platf_host_link_cb_list);
   xbt_dynar_free(&sg_platf_router_cb_list);
   xbt_dynar_free(&sg_platf_link_cb_list);
   xbt_dynar_free(&sg_platf_postparse_cb_list);
@@ -71,6 +77,13 @@ void sg_platf_new_host(sg_platf_host_cbarg_t h){
     fun(h);
   }
 }
+void sg_platf_new_host_link(sg_platf_host_link_cbarg_t h){
+  unsigned int iterator;
+  sg_platf_host_link_cb_t fun;
+  xbt_dynar_foreach(sg_platf_host_link_cb_list, iterator, fun) {
+    fun(h);
+  }
+}
 void sg_platf_new_router(sg_platf_router_cbarg_t router) {
   unsigned int iterator;
   sg_platf_router_cb_t fun;
@@ -140,7 +153,7 @@ void sg_platf_end() {
 
 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;
 
@@ -178,6 +191,9 @@ void sg_platf_new_AS_end() {
 void sg_platf_host_add_cb(sg_platf_host_cb_t fct) {
   xbt_dynar_push(sg_platf_host_cb_list, &fct);
 }
+void sg_platf_host_link_add_cb(sg_platf_host_link_cb_t fct) {
+  xbt_dynar_push(sg_platf_host_link_cb_list, &fct);
+}
 void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
   xbt_dynar_push(sg_platf_link_cb_list, &fct);
 }
@@ -211,3 +227,20 @@ void sg_platf_mstorage_add_cb(sg_platf_mstorage_cb_t 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;
+}