[surf] Move the basic cluster creation logic out of the callbacks

[simgrid.git] / src / surf / surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index f2a889c..f0f7084 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -1,45 +1,51 @@
-/* Copyright (c) 2004-2013. The SimGrid Team.
+/* Copyright (c) 2004-2015. 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. */
+
 #ifndef _SURF_SURF_PRIVATE_H
 #define _SURF_SURF_PRIVATE_H
 
+#include <xbt/base.h>
+
 #include "surf/surf.h"
 #include "surf/maxmin.h"
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"
 #include "surf/surfxml_parse.h"
 #include "surf/random_mgr.h"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "surf/surfxml_parse_values.h"
 
 #define NO_MAX_DURATION -1.0
 
 SG_BEGIN_DECL()
 
-extern xbt_dict_t watched_hosts_lib;
+XBT_PUBLIC_DATA(xbt_dict_t) watched_hosts_lib;
 
-extern const char *surf_action_state_names[6];
+extern XBT_PRIVATE const char *surf_action_state_names[6];
 
+/** @ingroup SURF_interface
+ * @brief Possible update mechanisms
+ */
 typedef enum {
-  UM_FULL,
-  UM_LAZY,
-  UM_UNDEFINED
+  UM_FULL,      /**< [TODO] */
+  UM_LAZY,      /**< [TODO] */
+  UM_UNDEFINED  /**< Mechanism not defined */
 } e_UM_t;
 
 /* Generic functions common to all models */
 
-FILE *surf_fopen(const char *name, const char *mode);
+XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode);
 
-extern tmgr_history_t history;
+extern XBT_PRIVATE tmgr_history_t history;
 
 /* The __surf_is_absolute_file_path() returns 1 if
  * file_path is a absolute file path, in the other
  * case the function returns 0.
  */
-int __surf_is_absolute_file_path(const char *file_path);
+XBT_PRIVATE int __surf_is_absolute_file_path(const char *file_path);
 
 /**
  * Routing logic
@@ -63,10 +69,7 @@ XBT_PUBLIC(void) routing_model_create(void *loopback);
 XBT_PUBLIC(void) routing_exit(void);
 XBT_PUBLIC(void) storage_register_callbacks(void);
 
-/* ***************************************** */
-/* TUTORIAL: New TAG                         */
-XBT_PUBLIC(void) gpu_register_callbacks(void);
-/* ***************************************** */
+XBT_PRIVATE void routing_new_cluster(sg_platf_cluster_cbarg_t cluster);
 
 XBT_PUBLIC(void) routing_register_callbacks(void);
 XBT_PUBLIC(void) generic_free_route(sg_platf_route_cbarg_t route); // FIXME rename to routing_route_free
@@ -82,6 +85,7 @@ XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict
  */
 XBT_PUBLIC(void) surfxml_bufferstack_push(int _new);
 XBT_PUBLIC(void) surfxml_bufferstack_pop(int _new);
+XBT_PUBLIC(void) parse_after_config(void);
 
 XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
 
@@ -90,6 +94,13 @@ XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
 void TRACE_surf_host_set_power(double date, const char *resource, double power);
 void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth);
 
+/********** Instr. **********/
+
+XBT_PRIVATE void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS);
+XBT_PRIVATE void sg_instr_new_router(sg_platf_router_cbarg_t router);
+XBT_PRIVATE void sg_instr_new_host(sg_platf_host_cbarg_t host);
+XBT_PRIVATE void sg_instr_AS_end(void);
+
 SG_END_DECL()
 
 #endif                          /* _SURF_SURF_PRIVATE_H */