Mark some internal symbols as hidden on ELF in surf

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index a0aa210..316df92 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -4,14 +4,16 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "cpu_interface.hpp"
 
 /***********
  * Classes *
  ***********/
 #include "cpu_interface.hpp"
 
 /***********
  * Classes *
  ***********/

-class CpuCas01Model;
-class CpuCas01;
-class CpuCas01Action;
+class XBT_PRIVATE CpuCas01Model;
+class XBT_PRIVATE CpuCas01;
+class XBT_PRIVATE CpuCas01Action;

 
 /*********
  * Model *
 
 /*********
  * Model *

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index e08d5ca..cf4016b 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -4,6 +4,8 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "cpu_interface.hpp"
 #include "trace_mgr_private.h"
 #include "surf/surf_routing.h"
 #include "cpu_interface.hpp"
 #include "trace_mgr_private.h"
 #include "surf/surf_routing.h"


@@ -14,11 +16,11 @@
 /***********
  * Classes *
  ***********/
 /***********
  * Classes *
  ***********/

-class CpuTiTrace;
-class CpuTiTgmr;
-class CpuTiModel;
-class CpuTi;
-class CpuTiAction;
+class XBT_PRIVATE CpuTiTrace;
+class XBT_PRIVATE CpuTiTgmr;
+class XBT_PRIVATE CpuTiModel;
+class XBT_PRIVATE CpuTi;
+class XBT_PRIVATE CpuTiAction;

 
 struct tiTag;
 
 
 struct tiTag;
 

diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp
index 6018af2..e2d27bb 100644 (file)
--- a/src/surf/host_clm03.hpp
+++ b/src/surf/host_clm03.hpp
@@ -4,6 +4,8 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "storage_interface.hpp"
 #include "cpu_interface.hpp"
 #include "host_interface.hpp"
 #include "storage_interface.hpp"
 #include "cpu_interface.hpp"
 #include "host_interface.hpp"


@@ -16,9 +18,9 @@
  * Classes *
  ***********/
 
  * Classes *
  ***********/
 

-class HostCLM03Model;
-class HostCLM03;
-class HostCLM03Action;
+class XBT_PRIVATE HostCLM03Model;
+class XBT_PRIVATE HostCLM03;
+class XBT_PRIVATE HostCLM03Action;

 
 /*********
  * Model *
 
 /*********
  * Model *

diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp
index 759cb27..39e8780 100644 (file)
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -9,6 +9,8 @@
 #include "cpu_interface.hpp"
 #include "network_interface.hpp"
 
 #include "cpu_interface.hpp"
 #include "network_interface.hpp"
 

+#include <xbt/base.h>
+

 #ifndef SURF_HOST_INTERFACE_HPP_
 #define SURF_HOST_INTERFACE_HPP_
 
 #ifndef SURF_HOST_INTERFACE_HPP_
 #define SURF_HOST_INTERFACE_HPP_
 


@@ -16,9 +18,9 @@
  * Classes *
  ***********/
 
  * Classes *
  ***********/
 

-class HostModel;
-class Host;
-class HostAction;
+class XBT_PRIVATE HostModel;
+class XBT_PRIVATE Host;
+class XBT_PRIVATE HostAction;

 
 /*************
  * Callbacks *
 
 /*************
  * Callbacks *

diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp
index d3466c9..51dd683 100644 (file)
--- a/src/surf/host_ptask_L07.hpp
+++ b/src/surf/host_ptask_L07.hpp
@@ -4,6 +4,8 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "host_interface.hpp"
 
 #ifndef HOST_L07_HPP_
 #include "host_interface.hpp"
 
 #ifndef HOST_L07_HPP_


@@ -13,15 +15,15 @@
  * Classes *
  ***********/
 
  * Classes *
  ***********/
 

-class HostL07Model;
-class CpuL07Model;
-class NetworkL07Model;
+class XBT_PRIVATE HostL07Model;
+class XBT_PRIVATE CpuL07Model;
+class XBT_PRIVATE NetworkL07Model;

 
 

-class HostL07;
-class CpuL07;
-class LinkL07;
+class XBT_PRIVATE HostL07;
+class XBT_PRIVATE CpuL07;
+class XBT_PRIVATE LinkL07;

 
 

-class L07Action;
+class XBT_PRIVATE L07Action;

 
 /*********
  * Tools *
 
 /*********
  * Tools *

diff --git a/src/surf/maxmin_private.hpp b/src/surf/maxmin_private.hpp
index d3ab7f9..48479c8 100644 (file)
--- a/src/surf/maxmin_private.hpp
+++ b/src/surf/maxmin_private.hpp
@@ -7,6 +7,8 @@
 #ifndef _SURF_MAXMIN_PRIVATE_H
 #define _SURF_MAXMIN_PRIVATE_H
 
 #ifndef _SURF_MAXMIN_PRIVATE_H
 #define _SURF_MAXMIN_PRIVATE_H
 

+#include <xbt/base.h>
+

 #include "surf/maxmin.h"
 #include "xbt/swag.h"
 #include "xbt/mallocator.h"
 #include "surf/maxmin.h"
 #include "xbt/swag.h"
 #include "xbt/mallocator.h"


@@ -119,10 +121,10 @@ typedef struct lmm_system {
  * 
  * @param sys A lmm system
  */
  * 
  * @param sys A lmm system
  */

-void lmm_print(lmm_system_t sys);
+XBT_PRIVATE void lmm_print(lmm_system_t sys);

 
 

-extern double (*func_f_def) (lmm_variable_t, double);
-extern double (*func_fp_def) (lmm_variable_t, double);
-extern double (*func_fpi_def) (lmm_variable_t, double);
+extern XBT_PRIVATE double (*func_f_def) (lmm_variable_t, double);
+extern XBT_PRIVATE double (*func_fp_def) (lmm_variable_t, double);
+extern XBT_PRIVATE double (*func_fpi_def) (lmm_variable_t, double);

 
 #endif                          /* _SURF_MAXMIN_PRIVATE_H */
 
 #endif                          /* _SURF_MAXMIN_PRIVATE_H */

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index f384e5f..888907d 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -7,6 +7,8 @@
 #ifndef SURF_NETWORK_CM02_HPP_
 #define SURF_NETWORK_CM02_HPP_
 
 #ifndef SURF_NETWORK_CM02_HPP_
 #define SURF_NETWORK_CM02_HPP_
 

+#include <xbt/base.h>
+

 #include "network_interface.hpp"
 #include "xbt/fifo.h"
 #include "xbt/graph.h"
 #include "network_interface.hpp"
 #include "xbt/fifo.h"
 #include "xbt/graph.h"


@@ -14,14 +16,14 @@
 /***********
  * Classes *
  ***********/
 /***********
  * Classes *
  ***********/

-class NetworkCm02Model;
-class NetworkCm02Action;
+class XBT_PRIVATE NetworkCm02Model;
+class XBT_PRIVATE NetworkCm02Action;

 
 /*********
  * Tools *
  *********/
 
 
 /*********
  * Tools *
  *********/
 

-void net_define_callbacks(void);
+XBT_PRIVATE void net_define_callbacks(void);

 
 /*********
  * Model *
 
 /*********
  * Model *

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 2dc6681..ad40084 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -7,13 +7,15 @@
 #ifndef NETWORK_CONSTANT_HPP_
 #define NETWORK_CONSTANT_HPP_
 
 #ifndef NETWORK_CONSTANT_HPP_
 #define NETWORK_CONSTANT_HPP_
 

+#include <xbt/base.h>
+

 #include "network_interface.hpp"
 
 /***********
  * Classes *
  ***********/
 #include "network_interface.hpp"
 
 /***********
  * Classes *
  ***********/

-class NetworkConstantModel;
-class NetworkConstantAction;
+class XBT_PRIVATE NetworkConstantModel;
+class XBT_PRIVATE NetworkConstantAction;

 
 /*********
  * Model *
 
 /*********
  * Model *

diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp
index 4c39884..26a27ea 100644 (file)
--- a/src/surf/network_ib.hpp
+++ b/src/surf/network_ib.hpp
@@ -7,11 +7,12 @@
 #ifndef SURF_NETWORK_IB_HPP_
 #define SURF_NETWORK_IB_HPP_
 
 #ifndef SURF_NETWORK_IB_HPP_
 #define SURF_NETWORK_IB_HPP_
 

-#include "network_smpi.hpp"
-class IBNode;
+#include <xbt/base.h>

 
 

+#include "network_smpi.hpp"
+class XBT_PRIVATE IBNode;

 
 

-class ActiveComm{
+class XBT_PRIVATE ActiveComm{

 public :
   //IBNode* origin;
   IBNode* destination;
 public :
   //IBNode* origin;
   IBNode* destination;


@@ -34,7 +35,7 @@ public :
   ~IBNode(){};
 };
 
   ~IBNode(){};
 };
 

-class NetworkIBModel : public NetworkSmpiModel {
+class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {

 private:
   void updateIBfactors_rec(IBNode *root, bool* updatedlist);
   void computeIBfactors(IBNode *root);
 private:
   void updateIBfactors_rec(IBNode *root, bool* updatedlist);
   void computeIBfactors(IBNode *root);

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index cef6fbd..bca2f83 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -7,6 +7,8 @@
 #ifndef SURF_NETWORK_INTERFACE_HPP_
 #define SURF_NETWORK_INTERFACE_HPP_
 
 #ifndef SURF_NETWORK_INTERFACE_HPP_
 #define SURF_NETWORK_INTERFACE_HPP_
 

+#include <xbt/base.h>
+

 #include <boost/unordered_map.hpp>
 
 #include "xbt/fifo.h"
 #include <boost/unordered_map.hpp>
 
 #include "xbt/fifo.h"

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 417b15b..f452d94 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -4,6 +4,8 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "network_interface.hpp"
 #include "surf/ns3/ns3_interface.h"
 
 #include "network_interface.hpp"
 #include "surf/ns3/ns3_interface.h"
 


@@ -13,14 +15,14 @@
 /***********
  * Classes *
  ***********/
 /***********
  * Classes *
  ***********/

-class NetworkNS3Model;
-class NetworkNS3Action;
+class XBT_PRIVATE NetworkNS3Model;
+class XBT_PRIVATE NetworkNS3Action;

 
 /*********
  * Tools *
  *********/
 
 
 /*********
  * Tools *
  *********/
 

-void net_define_callbacks(void);
+XBT_PRIVATE void net_define_callbacks(void);

 
 /*********
  * Model *
 
 /*********
  * Model *

diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp
index a8dd24c..ddbfd25 100644 (file)
--- a/src/surf/network_smpi.hpp
+++ b/src/surf/network_smpi.hpp
@@ -4,13 +4,15 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "network_cm02.hpp"
 
 /***********
  * Classes *
  ***********/
 
 #include "network_cm02.hpp"
 
 /***********
  * Classes *
  ***********/
 

-class NetworkSmpiModel;
+class XBT_PRIVATE NetworkSmpiModel;

 
 /*********
  * Tools *
 
 /*********
  * Tools *

diff --git a/src/surf/platf_generator_private.h b/src/surf/platf_generator_private.h
index 9b04b44..ea57365 100644 (file)
--- a/src/surf/platf_generator_private.h
+++ b/src/surf/platf_generator_private.h
@@ -7,15 +7,17 @@
 #ifndef SG_PLATF_GEN_PRIVATE_H
 #define SG_PLATF_GEN_PRIVATE_H
 
 #ifndef SG_PLATF_GEN_PRIVATE_H
 #define SG_PLATF_GEN_PRIVATE_H
 

+#include <xbt/base.h>
+

 #include "xbt/graph.h"
 #include "simgrid/platf.h"
 
 #include "xbt/graph.h"
 #include "simgrid/platf.h"
 

-void platf_graph_init(unsigned long node_count);
+XBT_PRIVATE void platf_graph_init(unsigned long node_count);

 
 

-void platf_node_connect(xbt_node_t node1, xbt_node_t node2);
+XBT_PRIVATE void platf_node_connect(xbt_node_t node1, xbt_node_t node2);

 
 

-double platf_node_distance(xbt_node_t node1, xbt_node_t node2);
+XBT_PRIVATE double platf_node_distance(xbt_node_t node1, xbt_node_t node2);

 
 

-double random_pareto(double min, double max, double K, double P, double ALPHA);
+XBT_PRIVATE double random_pareto(double min, double max, double K, double P, double ALPHA);

 
 #endif      /* SG_PLATF_GEN_PRIVATE_H */
 
 #endif      /* SG_PLATF_GEN_PRIVATE_H */

diff --git a/src/surf/plugins/energy.hpp b/src/surf/plugins/energy.hpp
index 8f8d5bd..ab9d1f3 100644 (file)
--- a/src/surf/plugins/energy.hpp
+++ b/src/surf/plugins/energy.hpp
@@ -4,15 +4,17 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "../cpu_interface.hpp"
 #include <map>
 
 #ifndef CALLBACK_HPP_
 #define CALLBACK_HPP_
 
 #include "../cpu_interface.hpp"
 #include <map>
 
 #ifndef CALLBACK_HPP_
 #define CALLBACK_HPP_
 

-class CpuEnergy;
+class XBT_PRIVATE CpuEnergy;

 
 

-extern std::map<Cpu*, CpuEnergy*> *surf_energy;
+extern XBT_PRIVATE std::map<Cpu*, CpuEnergy*> *surf_energy;

 
 class CpuEnergy {
 public:
 
 class CpuEnergy {
 public:

diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp
index f5debbd..fe0c0d4 100644 (file)
--- a/src/surf/storage_interface.hpp
+++ b/src/surf/storage_interface.hpp
@@ -4,6 +4,8 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "surf_interface.hpp"
 
 #ifndef STORAGE_INTERFACE_HPP_
 #include "surf_interface.hpp"
 
 #ifndef STORAGE_INTERFACE_HPP_

diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp
index d95155e..9cb4522 100644 (file)
--- a/src/surf/storage_n11.hpp
+++ b/src/surf/storage_n11.hpp
@@ -4,6 +4,8 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "storage_interface.hpp"
 
 #ifndef STORAGE_N11_HPP_
 #include "storage_interface.hpp"
 
 #ifndef STORAGE_N11_HPP_


@@ -13,9 +15,9 @@
  * Classes *
  ***********/
 
  * Classes *
  ***********/
 

-class StorageN11Model;
-class StorageN11;
-class StorageN11Action;
+class XBT_PRIVATE StorageN11Model;
+class XBT_PRIVATE StorageN11;
+class XBT_PRIVATE StorageN11Action;

 
 /*********
  * Model *
 
 /*********
  * Model *

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index f9bc342..61bfdca 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -38,7 +38,7 @@
 // 4251: needs to have dll-interface to be used by clients of class
 #endif
 
 // 4251: needs to have dll-interface to be used by clients of class
 #endif
 

-extern tmgr_history_t history;
+extern XBT_PRIVATE tmgr_history_t history;

 #define NO_MAX_DURATION -1.0
 
 using namespace std;
 #define NO_MAX_DURATION -1.0
 
 using namespace std;


@@ -48,23 +48,23 @@ using namespace std;
  *********/
 
 /* user-visible parameters */
  *********/
 
 /* user-visible parameters */

-extern double sg_tcp_gamma;
-extern double sg_sender_gap;
-extern double sg_latency_factor;
-extern double sg_bandwidth_factor;
-extern double sg_weight_S_parameter;
-extern int sg_network_crosstraffic;
-extern xbt_dynar_t surf_path;
+extern XBT_PRIVATE double sg_tcp_gamma;
+extern XBT_PRIVATE double sg_sender_gap;
+extern XBT_PRIVATE double sg_latency_factor;
+extern XBT_PRIVATE double sg_bandwidth_factor;
+extern XBT_PRIVATE double sg_weight_S_parameter;
+extern XBT_PRIVATE int sg_network_crosstraffic;
+extern XBT_PRIVATE xbt_dynar_t surf_path;

 
 extern "C" {
 XBT_PUBLIC(double) surf_get_clock(void);
 }
 
 
 extern "C" {
 XBT_PUBLIC(double) surf_get_clock(void);
 }
 

-extern double sg_sender_gap;
+extern XBT_PRIVATE double sg_sender_gap;

 
 

-extern surf_callback(void, void) surfExitCallbacks;
+extern XBT_PRIVATE surf_callback(void, void) surfExitCallbacks;

 
 

-int __surf_is_absolute_file_path(const char *file_path);
+int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path);

 
 /***********
  * Classes *
 
 /***********
  * Classes *


@@ -91,7 +91,7 @@ XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
 /**********
  * Action *
  **********/
 /**********
  * Action *
  **********/

-void surf_action_lmm_update_index_heap(void *action, int i);
+XBT_PRIVATE void surf_action_lmm_update_index_heap(void *action, int i);

 
 /** @ingroup SURF_interface
  * @brief SURF action interface class
 
 /** @ingroup SURF_interface
  * @brief SURF action interface class

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index e69d8f4..da772b5 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -7,6 +7,8 @@
 #ifndef _SURF_SURF_PRIVATE_H
 #define _SURF_SURF_PRIVATE_H
 
 #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 "surf/surf.h"
 #include "surf/maxmin.h"
 #include "surf/trace_mgr.h"


@@ -22,7 +24,7 @@ SG_BEGIN_DECL()
 
 XBT_PUBLIC_DATA(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
 
 /** @ingroup SURF_interface
  * @brief Possible update mechanisms


@@ -35,15 +37,15 @@ typedef enum {
 
 /* Generic functions common to all models */
 
 
 /* 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.
  */
 
 /* 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
 
 /**
  * Routing logic

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 41c3421..3d4a4ea 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -7,6 +7,8 @@
 #ifndef NETWORK_ROUTING_HPP_
 #define NETWORK_ROUTING_HPP_
 
 #ifndef NETWORK_ROUTING_HPP_
 #define NETWORK_ROUTING_HPP_
 

+#include <xbt/base.h>
+

 #include "surf_interface.hpp"
 #include <float.h>
 
 #include "surf_interface.hpp"
 #include <float.h>
 


@@ -14,17 +16,17 @@ XBT_PUBLIC(void) routing_model_create( void *loopback);
 
 /* ************************************************************************** */
 /* ************************* GRAPH EXPORTING FUNCTIONS ********************** */
 
 /* ************************************************************************** */
 /* ************************* GRAPH EXPORTING FUNCTIONS ********************** */

-xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes);
-xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);
+XBT_PRIVATE xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes);
+XBT_PRIVATE xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);

 
 /***********
  * Classes *
  ***********/
 
 
 /***********
  * Classes *
  ***********/
 

-class As;
-class RoutingModelDescription;
-class Onelink;
-class RoutingPlatf;
+class XBT_PRIVATE As;
+class XBT_PRIVATE RoutingModelDescription;
+class XBT_PRIVATE Onelink;
+class XBT_PRIVATE RoutingPlatf;

 
 /** @ingroup SURF_routing_interface
  * @brief A routing edge
 
 /** @ingroup SURF_routing_interface
  * @brief A routing edge


@@ -96,7 +98,7 @@ public:
   virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
 };
 
   virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
 };
 

-struct RoutingEdgeImpl : public RoutingEdge {
+struct XBT_PRIVATE RoutingEdgeImpl : public RoutingEdge {

 public:
   RoutingEdgeImpl(char *name, int id, e_surf_network_element_type_t rcType, As *rcComponent)
   : p_rcComponent(rcComponent), p_rcType(rcType), m_id(id), p_name(name) {}
 public:
   RoutingEdgeImpl(char *name, int id, e_surf_network_element_type_t rcType, As *rcComponent)
   : p_rcComponent(rcComponent), p_rcType(rcType), m_id(id), p_name(name) {}

diff --git a/src/surf/surf_routing_cluster.hpp b/src/surf/surf_routing_cluster.hpp
index e0f85d6..c7fa8c8 100644 (file)
--- a/src/surf/surf_routing_cluster.hpp
+++ b/src/surf/surf_routing_cluster.hpp
@@ -7,13 +7,15 @@
 #ifndef SURF_ROUTING_CLUSTER_HPP_
 #define SURF_ROUTING_CLUSTER_HPP_
 
 #ifndef SURF_ROUTING_CLUSTER_HPP_
 #define SURF_ROUTING_CLUSTER_HPP_
 

+#include <xbt/base.h>
+

 #include "surf_routing_none.hpp"
 #include "network_interface.hpp"
 
 /***********
  * Classes *
  ***********/
 #include "surf_routing_none.hpp"
 #include "network_interface.hpp"
 
 /***********
  * Classes *
  ***********/

-class AsCluster;
+class XBT_PRIVATE AsCluster;

 
 
 /* ************************************************** */
 
 
 /* ************************************************** */

diff --git a/src/surf/surf_routing_cluster_fat_tree.hpp b/src/surf/surf_routing_cluster_fat_tree.hpp
index 2180d06..91a2c46 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.hpp
+++ b/src/surf/surf_routing_cluster_fat_tree.hpp
@@ -7,6 +7,8 @@
 #ifndef SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
 #define SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
 
 #ifndef SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
 #define SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
 

+#include <xbt/base.h>
+

 #include "surf_routing_cluster.hpp"
 
 
 #include "surf_routing_cluster.hpp"
 
 


@@ -17,8 +19,8 @@
  * address real world constraints, which are not currently enforced. 
  */
 
  * address real world constraints, which are not currently enforced. 
  */
 

-class FatTreeNode;
-class FatTreeLink;
+class XBT_PRIVATE FatTreeNode;
+class XBT_PRIVATE FatTreeLink;

 
 /** \brief A node in a fat tree.
  * A FatTreeNode can either be a switch or a processing node. Switches are
 
 /** \brief A node in a fat tree.
  * A FatTreeNode can either be a switch or a processing node. Switches are


@@ -107,7 +109,7 @@ public:
  *
  * Routing is made using a destination-mod-k scheme.
  */
  *
  * Routing is made using a destination-mod-k scheme.
  */

-class AsClusterFatTree : public AsCluster {
+class XBT_PRIVATE AsClusterFatTree : public AsCluster {

 public:
   AsClusterFatTree();
   ~AsClusterFatTree();
 public:
   AsClusterFatTree();
   ~AsClusterFatTree();

diff --git a/src/surf/surf_routing_cluster_torus.hpp b/src/surf/surf_routing_cluster_torus.hpp
index bd1f9e7..0408989 100644 (file)
--- a/src/surf/surf_routing_cluster_torus.hpp
+++ b/src/surf/surf_routing_cluster_torus.hpp
@@ -8,11 +8,13 @@
 #ifndef SURF_ROUTING_CLUSTER_TORUS_HPP_
 #define SURF_ROUTING_CLUSTER_TORUS_HPP_
 
 #ifndef SURF_ROUTING_CLUSTER_TORUS_HPP_
 #define SURF_ROUTING_CLUSTER_TORUS_HPP_
 

+#include <xbt/base.h>
+

 #include "surf_routing_none.hpp"
 #include "network_interface.hpp"
 #include "surf_routing_cluster.hpp"
 
 #include "surf_routing_none.hpp"
 #include "network_interface.hpp"
 #include "surf_routing_cluster.hpp"
 

-class AsClusterTorus: public AsCluster {
+class XBT_PRIVATE AsClusterTorus: public AsCluster {

 public:
    AsClusterTorus();
    virtual ~AsClusterTorus();
 public:
    AsClusterTorus();
    virtual ~AsClusterTorus();

diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp
index ee2c80c..aa84000 100644 (file)
--- a/src/surf/surf_routing_dijkstra.hpp
+++ b/src/surf/surf_routing_dijkstra.hpp
@@ -4,6 +4,8 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_DIJKSTRA_HPP_
 #include "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_DIJKSTRA_HPP_


@@ -26,7 +28,7 @@ typedef struct route_cache_element {
 /***********
  * Classes *
  ***********/
 /***********
  * Classes *
  ***********/

-class AsDijkstra;
+class XBT_PRIVATE AsDijkstra;

 
 class AsDijkstra : public AsGeneric {
 public:
 
 class AsDijkstra : public AsGeneric {
 public:

diff --git a/src/surf/surf_routing_floyd.hpp b/src/surf/surf_routing_floyd.hpp
index ed39b19..592e0d5 100644 (file)
--- a/src/surf/surf_routing_floyd.hpp
+++ b/src/surf/surf_routing_floyd.hpp
@@ -8,12 +8,14 @@
 #ifndef SURF_ROUTING_FLOYD_HPP_
 #define SURF_ROUTING_FLOYD_HPP_
 
 #ifndef SURF_ROUTING_FLOYD_HPP_
 #define SURF_ROUTING_FLOYD_HPP_
 

+#include <xbt/base.h>
+

 #include "surf_routing_generic.hpp"
 
 /***********
  * Classes *
  ***********/
 #include "surf_routing_generic.hpp"
 
 /***********
  * Classes *
  ***********/

-class AsFloyd;
+class XBT_PRIVATE AsFloyd;

 
 class AsFloyd: public AsGeneric {
 public:
 
 class AsFloyd: public AsGeneric {
 public:

diff --git a/src/surf/surf_routing_full.hpp b/src/surf/surf_routing_full.hpp
index e4bc28d..1a0a011 100644 (file)
--- a/src/surf/surf_routing_full.hpp
+++ b/src/surf/surf_routing_full.hpp
@@ -7,12 +7,14 @@
 #ifndef SURF_ROUTING_FULL_HPP_
 #define SURF_ROUTING_FULL_HPP_
 
 #ifndef SURF_ROUTING_FULL_HPP_
 #define SURF_ROUTING_FULL_HPP_
 

+#include <xbt/base.h>
+

 #include "surf_routing_generic.hpp"
 
 /***********
  * Classes *
  ***********/
 #include "surf_routing_generic.hpp"
 
 /***********
  * Classes *
  ***********/

-class AsFull;
+class XBT_PRIVATE AsFull;

 
 class AsFull: public AsGeneric {
 public:
 
 class AsFull: public AsGeneric {
 public:

diff --git a/src/surf/surf_routing_generic.hpp b/src/surf/surf_routing_generic.hpp
index 7eed697..cf10487 100644 (file)
--- a/src/surf/surf_routing_generic.hpp
+++ b/src/surf/surf_routing_generic.hpp
@@ -4,16 +4,18 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "surf_routing_none.hpp"
 
 #ifndef SURF_ROUTING_GENERIC_HPP_
 #define SURF_ROUTING_GENERIC_HPP_
 
 #include "surf_routing_none.hpp"
 
 #ifndef SURF_ROUTING_GENERIC_HPP_
 #define SURF_ROUTING_GENERIC_HPP_
 

-class AsGeneric;
+class XBT_PRIVATE AsGeneric;

 
 

-void generic_free_route(sg_platf_route_cbarg_t route);
+XBT_PRIVATE void generic_free_route(sg_platf_route_cbarg_t route);

 
 

-class AsGeneric : public AsNone {
+class XBT_PRIVATE AsGeneric : public AsNone {

 public:
   AsGeneric();
   ~AsGeneric();
 public:
   AsGeneric();
   ~AsGeneric();

diff --git a/src/surf/surf_routing_none.hpp b/src/surf/surf_routing_none.hpp
index 3063261..e69fade 100644 (file)
--- a/src/surf/surf_routing_none.hpp
+++ b/src/surf/surf_routing_none.hpp
@@ -4,12 +4,14 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "surf_routing.hpp"
 
 #ifndef SURF_ROUTING_NONE_HPP_
 #define SURF_ROUTING_NONE_HPP_
 
 #include "surf_routing.hpp"
 
 #ifndef SURF_ROUTING_NONE_HPP_
 #define SURF_ROUTING_NONE_HPP_
 

-class AsNone : public As {
+class XBT_PRIVATE AsNone : public As {

 public:
   AsNone();
   ~AsNone();
 public:
   AsNone();
   ~AsNone();

diff --git a/src/surf/surf_routing_private.hpp b/src/surf/surf_routing_private.hpp
index a51a7de..4892818 100644 (file)
--- a/src/surf/surf_routing_private.hpp
+++ b/src/surf/surf_routing_private.hpp
@@ -11,6 +11,7 @@
 #include "internal_config.h"
 
 #include "surf_interface.hpp"
 #include "internal_config.h"
 
 #include "surf_interface.hpp"

+#include "xbt/base.h"

 #include "xbt/dynar.h"
 #include "xbt/str.h"
 #include "xbt/config.h"
 #include "xbt/dynar.h"
 #include "xbt/str.h"
 #include "xbt/config.h"


@@ -21,23 +22,23 @@
 /* ************************************************************************** */
 /* ******************************* NO ROUTING ******************************* */
 /* Only save the AS tree, and forward calls to child ASes */
 /* ************************************************************************** */
 /* ******************************* NO ROUTING ******************************* */
 /* Only save the AS tree, and forward calls to child ASes */

-AS_t model_none_create(void);
-AS_t model_none_create_sized(size_t childsize);
-void model_none_finalize(AS_t as);
+XBT_PRIVATE AS_t model_none_create(void);
+XBT_PRIVATE AS_t model_none_create_sized(size_t childsize);
+XBT_PRIVATE void model_none_finalize(AS_t as);

 /* ************************************************************************** */
 /* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */
 /* ************************************************************************** */
 /* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */

-AS_t model_generic_create_sized(size_t childsize);
-void model_generic_finalize(AS_t as);
+XBT_PRIVATE AS_t model_generic_create_sized(size_t childsize);
+XBT_PRIVATE void model_generic_finalize(AS_t as);

 
 

-int generic_parse_PU(AS_t rc, sg_routing_edge_t elm);
-int generic_parse_AS(AS_t rc, sg_routing_edge_t elm);
-void generic_parse_bypassroute(AS_t rc, sg_platf_route_cbarg_t e_route);
+XBT_PRIVATE int generic_parse_PU(AS_t rc, sg_routing_edge_t elm);
+XBT_PRIVATE int generic_parse_AS(AS_t rc, sg_routing_edge_t elm);
+XBT_PRIVATE void generic_parse_bypassroute(AS_t rc, sg_platf_route_cbarg_t e_route);

 
 /* ************************************************************************** */
 /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
 
 
 /* ************************************************************************** */
 /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
 

-xbt_dynar_t generic_get_onelink_routes(AS_t rc);
-sg_platf_route_cbarg_t generic_get_bypassroute(AS_t rc,
+XBT_PRIVATE xbt_dynar_t generic_get_onelink_routes(AS_t rc);
+XBT_PRIVATE sg_platf_route_cbarg_t generic_get_bypassroute(AS_t rc,

     sg_routing_edge_t src,
     sg_routing_edge_t dst,
     double *lat);
     sg_routing_edge_t src,
     sg_routing_edge_t dst,
     double *lat);


@@ -48,53 +49,53 @@ sg_platf_route_cbarg_t generic_get_bypassroute(AS_t rc,
 /* change a route containing link names into a route containing link entities.
  * If change_order is true, the links are put in reverse order in the
  * produced route */
 /* change a route containing link names into a route containing link entities.
  * If change_order is true, the links are put in reverse order in the
  * produced route */

-sg_platf_route_cbarg_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
+XBT_PRIVATE sg_platf_route_cbarg_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,

                                    sg_platf_route_cbarg_t data, int preserve_order);
                                    sg_platf_route_cbarg_t data, int preserve_order);

-AS_t
+XBT_PRIVATE AS_t

 generic_autonomous_system_exist(AS_t rc, char *element);
 generic_autonomous_system_exist(AS_t rc, char *element);

-AS_t
+XBT_PRIVATE AS_t

 generic_processing_units_exist(AS_t rc, char *element);
 void generic_src_dst_check(AS_t rc, sg_routing_edge_t src,
     sg_routing_edge_t dst);
 
 /* ************************************************************************** */
 /* *************************** FLOYD ROUTING ******************************** */
 generic_processing_units_exist(AS_t rc, char *element);
 void generic_src_dst_check(AS_t rc, sg_routing_edge_t src,
     sg_routing_edge_t dst);
 
 /* ************************************************************************** */
 /* *************************** FLOYD ROUTING ******************************** */

-AS_t model_floyd_create(void);  /* create structures for floyd routing model */
-void model_floyd_end(AS_t as);      /* finalize the creation of floyd routing model */
-void model_floyd_parse_route(AS_t rc, sg_platf_route_cbarg_t route);
+XBT_PRIVATE AS_t model_floyd_create(void);  /* create structures for floyd routing model */
+XBT_PRIVATE void model_floyd_end(AS_t as);      /* finalize the creation of floyd routing model */
+XBT_PRIVATE void model_floyd_parse_route(AS_t rc, sg_platf_route_cbarg_t route);

 
 /* ************************************************** */
 /* **************  Cluster ROUTING   **************** */
 
 
 /* ************************************************** */
 /* **************  Cluster ROUTING   **************** */
 

-As *model_cluster_create(void);      /* create structures for cluster routing model */
-As *model_torus_cluster_create(void);
-As *model_fat_tree_cluster_create(void);
+XBT_PRIVATE As *model_cluster_create(void);      /* create structures for cluster routing model */
+XBT_PRIVATE As *model_torus_cluster_create(void);
+XBT_PRIVATE As *model_fat_tree_cluster_create(void);

 
 /* ************************************************** */
 /* **************  Vivaldi ROUTING   **************** */
 
 /* ************************************************** */
 /* **************  Vivaldi ROUTING   **************** */

-AS_t model_vivaldi_create(void);      /* create structures for vivaldi routing model */
+XBT_PRIVATE AS_t model_vivaldi_create(void);      /* create structures for vivaldi routing model */

 #define HOST_PEER(peername) bprintf("peer_%s", peername)
 #define ROUTER_PEER(peername) bprintf("router_%s", peername)
 #define LINK_PEER(peername) bprintf("link_%s", peername)
 
 /* ************************************************************************** */
 /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */
 #define HOST_PEER(peername) bprintf("peer_%s", peername)
 #define ROUTER_PEER(peername) bprintf("router_%s", peername)
 #define LINK_PEER(peername) bprintf("link_%s", peername)
 
 /* ************************************************************************** */
 /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */

-AS_t model_dijkstra_both_create(int cached);    /* create by calling dijkstra or dijkstracache */
-AS_t model_dijkstra_create(void);       /* create structures for dijkstra routing model */
-AS_t model_dijkstracache_create(void);  /* create structures for dijkstracache routing model */
-void model_dijkstra_both_end(AS_t as);      /* finalize the creation of dijkstra routing model */
-void model_dijkstra_both_parse_route (AS_t rc, sg_platf_route_cbarg_t route);
+XBT_PRIVATE AS_t model_dijkstra_both_create(int cached);    /* create by calling dijkstra or dijkstracache */
+XBT_PRIVATE AS_t model_dijkstra_create(void);       /* create structures for dijkstra routing model */
+XBT_PRIVATE AS_t model_dijkstracache_create(void);  /* create structures for dijkstracache routing model */
+XBT_PRIVATE void model_dijkstra_both_end(AS_t as);      /* finalize the creation of dijkstra routing model */
+XBT_PRIVATE void model_dijkstra_both_parse_route (AS_t rc, sg_platf_route_cbarg_t route);

 
 /* ************************************************************************** */
 /* *************************** FULL ROUTING ********************************* */
 
 /* ************************************************************************** */
 /* *************************** FULL ROUTING ********************************* */

-AS_t model_full_create(void);   /* create structures for full routing model */
-void model_full_end(AS_t as);       /* finalize the creation of full routing model */
-void model_full_set_route(  /* Set the route and ASroute between src and dst */
+XBT_PRIVATE AS_t model_full_create(void);   /* create structures for full routing model */
+XBT_PRIVATE void model_full_end(AS_t as);       /* finalize the creation of full routing model */
+XBT_PRIVATE void model_full_set_route(  /* Set the route and ASroute between src and dst */

     AS_t rc, sg_platf_route_cbarg_t route);
 /* ************************************************************************** */
 /* ************************* GRAPH EXPORTING FUNCTIONS ********************** */
     AS_t rc, sg_platf_route_cbarg_t route);
 /* ************************************************************************** */
 /* ************************* GRAPH EXPORTING FUNCTIONS ********************** */

-xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes);
-xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);
+XBT_PRIVATE xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes);
+XBT_PRIVATE xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);

 
 
 #endif                          /* _SURF_SURF_ROUTING_PRIVATE_H */
 
 
 #endif                          /* _SURF_SURF_ROUTING_PRIVATE_H */

diff --git a/src/surf/surf_routing_vivaldi.hpp b/src/surf/surf_routing_vivaldi.hpp
index 8dd4df6..6d1094c 100644 (file)
--- a/src/surf/surf_routing_vivaldi.hpp
+++ b/src/surf/surf_routing_vivaldi.hpp
@@ -4,6 +4,8 @@
 /* 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. */
 
 /* 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 "xbt/swag.h"
+

 #include "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_VIVALDI_HPP_
 #include "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_VIVALDI_HPP_


@@ -11,7 +13,7 @@
 
 /* ************************************************** */
 /* **************  Vivaldi ROUTING   **************** */
 
 /* ************************************************** */
 /* **************  Vivaldi ROUTING   **************** */

-AS_t model_vivaldi_create(void);      /* create structures for vivaldi routing model */
+XBT_PRIVATE AS_t model_vivaldi_create(void);      /* create structures for vivaldi routing model */

 #define HOST_PEER(peername) bprintf("peer_%s", peername)
 #define ROUTER_PEER(peername) bprintf("router_%s", peername)
 #define LINK_PEER(peername) bprintf("link_%s", peername)
 #define HOST_PEER(peername) bprintf("peer_%s", peername)
 #define ROUTER_PEER(peername) bprintf("router_%s", peername)
 #define LINK_PEER(peername) bprintf("link_%s", peername)


@@ -19,7 +21,7 @@ AS_t model_vivaldi_create(void);      /* create structures for vivaldi routing m
 /***********
  * Classes *
  ***********/
 /***********
  * Classes *
  ***********/

-class AsVivaldi;
+class XBT_PRIVATE AsVivaldi;

 
 class AsVivaldi: public AsGeneric {
 public:
 
 class AsVivaldi: public AsGeneric {
 public:

diff --git a/src/surf/trace_mgr_private.h b/src/surf/trace_mgr_private.h
index 820b245..a84a638 100644 (file)
--- a/src/surf/trace_mgr_private.h
+++ b/src/surf/trace_mgr_private.h
@@ -7,6 +7,7 @@
 #ifndef _SURF_TMGR_PRIVATE_H
 #define _SURF_TMGR_PRIVATE_H
 
 #ifndef _SURF_TMGR_PRIVATE_H
 #define _SURF_TMGR_PRIVATE_H
 

+#include "xbt/base.h"

 #include "xbt/swag.h"
 #include "xbt/heap.h"
 #include "surf/trace_mgr.h"
 #include "xbt/swag.h"
 #include "xbt/heap.h"
 #include "surf/trace_mgr.h"


@@ -70,6 +71,6 @@ typedef struct tmgr_history {
   xbt_heap_t heap;
 } s_tmgr_history_t;
 
   xbt_heap_t heap;
 } s_tmgr_history_t;
 

-double tmgr_event_generator_next_value(probabilist_event_generator_t generator);
+XBT_PRIVATE double tmgr_event_generator_next_value(probabilist_event_generator_t generator);

 
 #endif                          /* _SURF_TMGR_PRIVATE_H */
 
 #endif                          /* _SURF_TMGR_PRIVATE_H */

diff --git a/src/surf/vm_hl13.hpp b/src/surf/vm_hl13.hpp
index 419a826..311c0f8 100644 (file)
--- a/src/surf/vm_hl13.hpp
+++ b/src/surf/vm_hl13.hpp
@@ -4,6 +4,8 @@
 /* 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. */
 
 /* 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 "xbt/base.h"
+

 #include "host_clm03.hpp"
 #include "vm_interface.hpp"
 
 #include "host_clm03.hpp"
 #include "vm_interface.hpp"
 


@@ -17,8 +19,8 @@
  * Classes *
  ***********/
 
  * Classes *
  ***********/
 

-class VMHL13Model;
-class VMHL13;
+class XBT_PRIVATE VMHL13Model;
+class XBT_PRIVATE VMHL13;

 
 /*********
  * Model *
 
 /*********
  * Model *

diff --git a/src/surf/vm_interface.hpp b/src/surf/vm_interface.hpp
index efcefc4..961a04e 100644 (file)
--- a/src/surf/vm_interface.hpp
+++ b/src/surf/vm_interface.hpp
@@ -4,6 +4,8 @@
 /* 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. */
 
 /* 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 <xbt/base.h>
+

 #include "host_interface.hpp"
 
 #ifndef VM_INTERFACE_HPP_
 #include "host_interface.hpp"
 
 #ifndef VM_INTERFACE_HPP_


@@ -16,8 +18,8 @@
  * Classes *
  ***********/
 
  * Classes *
  ***********/
 

-class VMModel;
-class VM;
+class XBT_PRIVATE VMModel;
+class XBT_PRIVATE VM;

 
 /*************
  * Callbacks *
 
 /*************
  * Callbacks *


@@ -26,17 +28,17 @@ class VM;
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM creation. Signature: `void(VM*)`
  */
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM creation. Signature: `void(VM*)`
  */

-extern surf_callback(void, VM*) VMCreatedCallbacks;
+extern XBT_PRIVATE surf_callback(void, VM*) VMCreatedCallbacks;

 
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM destruction. Signature: `void(VM*)`
  */
 
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM destruction. Signature: `void(VM*)`
  */

-extern surf_callback(void, VM*) VMDestructedCallbacks;
+extern XBT_PRIVATE surf_callback(void, VM*) VMDestructedCallbacks;

 
 /** @ingroup SURF_callbacks
  * @brief Callbacks after VM State changes. Signature: `void(VMAction*)`
  */
 
 /** @ingroup SURF_callbacks
  * @brief Callbacks after VM State changes. Signature: `void(VMAction*)`
  */

-extern surf_callback(void, VM*) VMStateChangedCallbacks;
+extern XBT_PRIVATE surf_callback(void, VM*) VMStateChangedCallbacks;

 
 /************
  * Resource *
 
 /************
  * Resource *