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
Simplify the code taking Cpu::m_speedPeak changes into account
[simgrid.git]
/
src
/
surf
/
network_ns3.hpp
diff --git
a/src/surf/network_ns3.hpp
b/src/surf/network_ns3.hpp
index
82bcc7e
..
e9c07a0
100644
(file)
--- a/
src/surf/network_ns3.hpp
+++ b/
src/surf/network_ns3.hpp
@@
-1,11
+1,13
@@
-/* Copyright (c) 2004-201
4
. The SimGrid Team.
+/* Copyright (c) 2004-201
5
. 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. */
* 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 "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_
@@
-13,19
+15,29
@@
/***********
* Classes *
***********/
/***********
* Classes *
***********/
-class NetworkNS3Model;
-class NetworkNS3Action;
+
+namespace simgrid {
+namespace surf {
+
+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();
class NetworkNS3Model : public NetworkModel {
public:
NetworkNS3Model();
@@
-40,8
+52,8
@@
public:
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(
RoutingEdge *src, RoutingEdge
*dst);
- Action *communicate(
RoutingEdge *src, RoutingEdge
*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);
@@
-89,9
+101,11
@@
void resume();
//private:
double m_lastSent;
//private:
double m_lastSent;
-
RoutingEdge
*p_srcElm;
-
RoutingEdge
*p_dstElm;
+
NetCard
*p_srcElm;
+
NetCard
*p_dstElm;
};
};
+}
+}
#endif /* NETWORK_NS3_HPP_ */
#endif /* NETWORK_NS3_HPP_ */