Unify models apis

[simgrid.git] / src / surf / network_interface.hpp

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index f85abe1..b654419 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -10,6 +10,7 @@
 #ifndef SURF_NETWORK_INTERFACE_HPP_
 #define SURF_NETWORK_INTERFACE_HPP_
 
+
 /***********
  * Classes *
  ***********/
@@ -59,8 +60,9 @@ XBT_PUBLIC_DATA( surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, Routi
 /*********
  * Tools *
  *********/
+XBT_PUBLIC(void) netlink_parse_init(sg_platf_link_cbarg_t link);
 
-void net_define_callbacks(void);
+XBT_PUBLIC(void) net_add_traces();
 
 /*********
  * Model *
@@ -113,7 +115,7 @@ public:
    * @param properties Dictionary of properties associated to this Resource
    * @return The created NetworkLink
    */
-  virtual NetworkLinkPtr createResource(const char *name,
+  virtual NetworkLinkPtr createNetworkLink(const char *name,
                                    double bw_initial,
                                    tmgr_trace_t bw_trace,
                                    double lat_initial,
@@ -123,7 +125,6 @@ public:
                                    e_surf_link_sharing_policy_t policy,
                                    xbt_dict_t properties)=0;
 
-
   virtual void gapAppend(double /*size*/, const NetworkLinkPtr /*link*/, NetworkActionPtr /*action*/) {};
 
   /**