-/* Copyright (c) 2004-2014. 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. */
+#include <xbt/base.h>
+
#include "network_interface.hpp"
-#include "surf/ns3/ns3_interface.h"
+#include "src/surf/ns3/ns3_interface.h"
#ifndef NETWORK_NS3_HPP_
#define NETWORK_NS3_HPP_
/***********
* Classes *
***********/
-class NetworkNS3Model;
-typedef NetworkNS3Model *NetworkNS3ModelPtr;
-class NetworkNS3Link;
-typedef NetworkNS3Link *NetworkNS3LinkPtr;
+namespace simgrid {
+namespace surf {
+
+class XBT_PRIVATE NetworkNS3Model;
+class XBT_PRIVATE NetworkNS3Action;
-class NetworkNS3Action;
-typedef NetworkNS3Action *NetworkNS3ActionPtr;
+}
+}
/*********
* Tools *
*********/
-void net_define_callbacks(void);
+XBT_PRIVATE void net_define_callbacks(void);
/*********
* Model *
*********/
+namespace simgrid {
+namespace surf {
+
class NetworkNS3Model : public NetworkModel {
public:
NetworkNS3Model();
~NetworkNS3Model();
- NetworkLinkPtr createNetworkLink(const char *name,
+ Link* createLink(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
tmgr_trace_t lat_trace,
- e_surf_resource_state_t state_initial,
+ int initiallyOn,
tmgr_trace_t state_trace,
e_surf_link_sharing_policy_t policy,
xbt_dict_t properties);
- xbt_dynar_t getRoute(RoutingEdgePtr src, RoutingEdgePtr dst);
- ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
+ xbt_dynar_t getRoute(NetCard *src, NetCard *dst);
+ Action *communicate(NetCard *src, NetCard *dst,
double size, double rate);
double shareResources(double now);
void updateActionsState(double now, double delta);
void addTraces(){DIE_IMPOSSIBLE;}
+ bool shareResourcesIsIdempotent() {return false;}
};
/************
* Resource *
************/
-class NetworkNS3Link : public NetworkLink {
+class NetworkNS3Link : public Link {
public:
- NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props,
+ NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
double bw_initial, double lat_initial);
~NetworkNS3Link();
**********/
class NetworkNS3Action : public NetworkAction {
public:
- NetworkNS3Action(ModelPtr model, double cost, bool failed);
+ NetworkNS3Action(Model *model, double cost, bool failed);
#ifdef HAVE_LATENCY_BOUND_TRACKING
int getLatencyLimited();
//private:
double m_lastSent;
- RoutingEdgePtr p_srcElm;
- RoutingEdgePtr p_dstElm;
+ NetCard *p_srcElm;
+ NetCard *p_dstElm;
};
+}
+}
#endif /* NETWORK_NS3_HPP_ */