A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
untangle resource::state (ON/OFF) and VM::state (STARTED/MIGRATING/etc)
[simgrid.git]
/
src
/
surf
/
network_ns3.hpp
diff --git
a/src/surf/network_ns3.hpp
b/src/surf/network_ns3.hpp
index
8aab263
..
55c36b5
100644
(file)
--- a/
src/surf/network_ns3.hpp
+++ b/
src/surf/network_ns3.hpp
@@
-1,9
+1,13
@@
-/* Copyright (c) 2004-2014. The SimGrid Team.
- *
- * This program is free software; you can redistribute it and/or modify it
+/* 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. */
* under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include <xbt/base.h>
+
#include "network_interface.hpp"
#include "network_interface.hpp"
-#include "surf/ns3/ns3_interface.h"
+#include "s
rc/s
urf/ns3/ns3_interface.h"
#ifndef NETWORK_NS3_HPP_
#define NETWORK_NS3_HPP_
#ifndef NETWORK_NS3_HPP_
#define NETWORK_NS3_HPP_
@@
-11,52
+15,58
@@
/***********
* Classes *
***********/
/***********
* Classes *
***********/
-class NetworkNS3Model;
-typedef NetworkNS3Model *NetworkNS3ModelPtr;
-class NetworkNS3Link;
-typedef NetworkNS3Link *NetworkNS3LinkPtr;
+namespace simgrid {
+namespace surf {
-class NetworkNS3Action;
-typedef NetworkNS3Action *NetworkNS3ActionPtr;
+class XBT_PRIVATE NetworkNS3Model;
+class XBT_PRIVATE NetworkNS3Action;
+
+}
+}
/*********
* Tools *
*********/
/*********
* Tools *
*********/
-void net_define_callbacks(void);
+
XBT_PRIVATE
void net_define_callbacks(void);
/*********
* Model *
*********/
/*********
* Model *
*********/
+namespace simgrid {
+namespace surf {
+
class NetworkNS3Model : public NetworkModel {
public:
NetworkNS3Model();
~NetworkNS3Model();
class NetworkNS3Model : public NetworkModel {
public:
NetworkNS3Model();
~NetworkNS3Model();
-
NetworkLinkPtr createResource
(const char *name,
+
Link* createLink
(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
tmgr_trace_t lat_trace,
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);
tmgr_trace_t state_trace,
e_surf_link_sharing_policy_t policy,
xbt_dict_t properties);
- xbt_dynar_t getRoute(
RoutingEdgePtr src, RoutingEdgePtr
dst);
- Action
Ptr 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);
double size, double rate);
double shareResources(double now);
void updateActionsState(double now, double delta);
+ void addTraces(){DIE_IMPOSSIBLE;}
+ bool shareResourcesIsIdempotent() {return false;}
};
/************
* Resource *
************/
};
/************
* Resource *
************/
-class NetworkNS3Link : public
Network
Link {
+class NetworkNS3Link : public Link {
public:
public:
- NetworkNS3Link(NetworkNS3Model
Ptr
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();
double bw_initial, double lat_initial);
~NetworkNS3Link();
@@
-78,7
+88,7
@@
public:
**********/
class NetworkNS3Action : public NetworkAction {
public:
**********/
class NetworkNS3Action : public NetworkAction {
public:
- NetworkNS3Action(Model
Ptr
model, double cost, bool failed);
+ NetworkNS3Action(Model
*
model, double cost, bool failed);
#ifdef HAVE_LATENCY_BOUND_TRACKING
int getLatencyLimited();
#ifdef HAVE_LATENCY_BOUND_TRACKING
int getLatencyLimited();
@@
-90,12
+100,12
@@
void suspend();
void resume();
//private:
void resume();
//private:
-#ifdef HAVE_TRACING
double m_lastSent;
double m_lastSent;
- RoutingEdgePtr p_srcElm;
- RoutingEdgePtr p_dstElm;
-#endif //HAVE_TRACING
+ NetCard *p_srcElm;
+ NetCard *p_dstElm;
};
};
+}
+}
#endif /* NETWORK_NS3_HPP_ */
#endif /* NETWORK_NS3_HPP_ */