X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9f3bc989ac7b641f38385167dbd3063e209d88e..a96fee701e6134a05471e7f796d0b156bbfee8a3:/src/include/simgrid/platf_interface.h

diff --git a/src/include/simgrid/platf_interface.h b/src/include/simgrid/platf_interface.h
index 3956166784..00a5fd63f5 100644
--- a/src/include/simgrid/platf_interface.h
+++ b/src/include/simgrid/platf_interface.h
@@ -1,6 +1,6 @@
 /* platf_interface.h - Internal interface to the SimGrid platforms          */
 
-/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010, 2011. The SimGrid Team.
+/* Copyright (c) 2004-2007, 2009-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,49 +9,29 @@
 #ifndef SG_PLATF_INTERFACE_H
 #define SG_PLATF_INTERFACE_H
 
+#include <xbt/dict.h>
+
 #include "simgrid/platf.h" /* public interface */
+#include "xbt/RngStream.h"
+
+#include <simgrid/forward.h>
+
+SG_BEGIN_DECL()
 
 /* Module management functions */
-void sg_platf_init(void);
-void sg_platf_exit(void);
-
-/* Managing the parsing callbacks */
-
-typedef void (*sg_platf_host_cb_t)(sg_platf_host_cbarg_t);
-typedef void (*sg_platf_router_cb_t)(sg_platf_router_cbarg_t);
-typedef void (*sg_platf_link_cb_t)(sg_platf_link_cbarg_t);
-typedef void (*sg_platf_peer_cb_t)(sg_platf_peer_cbarg_t);
-typedef void (*sg_platf_cluster_cb_t)(sg_platf_cluster_cbarg_t);
-typedef void (*sg_platf_AS_begin_cb_t)(const char*id, const char*routing);
-
-typedef void (*sg_platf_storage_cb_t)(sg_platf_storage_cbarg_t);
-typedef void (*sg_platf_storage_type_cb_t)(sg_platf_storage_type_cbarg_t);
-typedef void (*sg_platf_mount_cb_t)(sg_platf_mount_cbarg_t);
-typedef void (*sg_platf_mstorage_cb_t)(sg_platf_mstorage_cbarg_t);
-
-void sg_platf_host_add_cb(sg_platf_host_cb_t);
-void sg_platf_router_add_cb(sg_platf_router_cb_t);
-void sg_platf_link_add_cb(sg_platf_link_cb_t);
-void sg_platf_peer_add_cb(sg_platf_peer_cb_t fct);
-void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct);
-void sg_platf_postparse_add_cb(void_f_void_t fct);
-void sg_platf_AS_begin_add_cb(sg_platf_AS_begin_cb_t fct);
-void sg_platf_AS_end_add_cb(void_f_void_t fct);
-
-void sg_platf_storage_add_cb(sg_platf_storage_cb_t fct);
-void sg_platf_mstorage_add_cb(sg_platf_mstorage_cb_t fct);
-void sg_platf_storage_type_add_cb(sg_platf_storage_type_cb_t fct);
-void sg_platf_mount_add_cb(sg_platf_mount_cb_t fct);
-
-/** \brief Pick the right models for CPU, net and workstation, and call their model_init_preparse
+XBT_PUBLIC(void) sg_platf_init(void);
+XBT_PUBLIC(void) sg_platf_exit(void);
+
+/** \brief Pick the right models for CPU, net and host, and call their model_init_preparse
  *
  * Must be called within parsing/creating the environment (after the <config>s, if any, and before <AS> or friends such as <cluster>)
  */
-void surf_config_models_setup(void);
+XBT_PUBLIC(void) surf_config_models_setup(void);
 
 /* RngStream management functions */
-typedef struct RngStream_InfoState *RngStream; //Not to have to include RngStream.h
-void sg_platf_rng_stream_init(unsigned long seed[6]);
-RngStream sg_platf_rng_stream_get(const char* id);
+XBT_PUBLIC(void) sg_platf_rng_stream_init(unsigned long seed[6]);
+XBT_PUBLIC(RngStream) sg_platf_rng_stream_get(const char* id);
+
+SG_END_DECL()
 
 #endif                          /* SG_PLATF_INTERFACE_H */