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
Remove one of the many pimple: HostModel::p_cpuModel
[simgrid.git]
/
src
/
surf
/
ns3
/
my-point-to-point-helper.cc
diff --git
a/src/surf/ns3/my-point-to-point-helper.cc
b/src/surf/ns3/my-point-to-point-helper.cc
index
b5a80b8
..
7ac53db
100644
(file)
--- a/
src/surf/ns3/my-point-to-point-helper.cc
+++ b/
src/surf/ns3/my-point-to-point-helper.cc
@@
-24,7
+24,6
@@
*/
#include <ns3/abort.h>
*/
#include <ns3/abort.h>
-#include "ns3/log.h"
#include "ns3/simulator.h"
#include "ns3/point-to-point-net-device.h"
#include "ns3/point-to-point-channel.h"
#include "ns3/simulator.h"
#include "ns3/point-to-point-net-device.h"
#include "ns3/point-to-point-channel.h"
@@
-40,7
+39,9
@@
#include "ns3/trace-helper.h"
#include "my-point-to-point-helper.h"
#include "ns3/trace-helper.h"
#include "my-point-to-point-helper.h"
-NS_LOG_COMPONENT_DEFINE ("MyPointToPointHelper");
+#include "xbt/log.h"
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
///> RED Parameters see src/node/red-queue.* for details
//.AddAttribute ("Mode",
///> RED Parameters see src/node/red-queue.* for details
//.AddAttribute ("Mode",
@@
-163,7
+164,7
@@
MyPointToPointHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd,
Ptr<PointToPointNetDevice> device = nd->GetObject<PointToPointNetDevice> ();
if (device == 0)
{
Ptr<PointToPointNetDevice> device = nd->GetObject<PointToPointNetDevice> ();
if (device == 0)
{
-
NS_LOG_INFO ("MyPointToPointHelper::EnablePcapInternal(): Device " << device << "
not of type ns3::PointToPointNetDevice");
+
XBT_INFO ("MyPointToPointHelper::EnablePcapInternal(): Device
not of type ns3::PointToPointNetDevice");
return;
}
return;
}
@@
-199,8
+200,7
@@
MyPointToPointHelper::EnableAsciiInternal (
Ptr<PointToPointNetDevice> device = nd->GetObject<PointToPointNetDevice> ();
if (device == 0)
{
Ptr<PointToPointNetDevice> device = nd->GetObject<PointToPointNetDevice> ();
if (device == 0)
{
- NS_LOG_INFO ("MyPointToPointHelper::EnableAsciiInternal(): Device " << device <<
- " not of type ns3::PointToPointNetDevice");
+ XBT_INFO ("MyPointToPointHelper::EnableAsciiInternal(): Device not of type ns3::PointToPointNetDevice");
return;
}
return;
}