F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetAnim: Remove obsolete checks for xml format

Browse Source
This commit is contained in:
John Abraham
2014-01-11 06:26:58 -08:00
parent 22fe0b7120
commit a8caac4db1
2 changed files with 12 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/netanim/model/animation-interface.cc
View File

@@ -64,8 +64,8 @@ std::map <P2pLinkNodeIdPair, LinkProperties, LinkPairCompare> AnimationInterface
Rectangle * AnimationInterface::userBoundary = 0;
AnimationInterface::AnimationInterface (const std::string fn, uint64_t maxPktsPerFile, bool usingXML)
: m_routingF (0), m_xml (usingXML), m_mobilityPollInterval (Seconds (0.25)),
AnimationInterface::AnimationInterface (const std::string fn, uint64_t maxPktsPerFile)
: m_routingF (0), m_mobilityPollInterval (Seconds (0.25)),
m_outputFileName (fn),
m_outputFileSet (false), gAnimUid (0), m_randomPosition (true),
m_writeCallback (0), m_started (false),
@@ -291,12 +291,6 @@ void AnimationInterface::TrackIpv4Route ()
Simulator::Schedule (m_routingPollInterval, &AnimationInterface::TrackIpv4Route, this);
}
void AnimationInterface::SetXMLOutput ()
{
NS_LOG_INFO ("XML output set");
m_xml = true;
}
void AnimationInterface::StartNewTraceFile ()
{
@@ -701,14 +695,7 @@ void AnimationInterface::StartAnimation (bool restart)
AddToIpv4AddressNodeIdTable (GetIpv4Address (dev), n1Id);
AddToIpv4AddressNodeIdTable (GetIpv4Address (chDev), n2Id);
std::ostringstream oss;
if (m_xml)
{
oss << GetXMLOpenClose_link (0, n1Id, 0, n2Id);
}
else
{
oss << "0.0 L " << n1Id << " " << n2Id << std::endl;
}
oss << GetXMLOpenClose_link (0, n1Id, 0, n2Id);
WriteN (oss.str (), m_f);
}
}
@@ -722,7 +709,7 @@ void AnimationInterface::StartAnimation (bool restart)
}
}
linkProperties.clear ();
if (m_xml && !restart)
if (!restart)
{
WriteN (GetXMLClose ("topology"), m_f);
Simulator::Schedule (m_mobilityPollInterval, &AnimationInterface::MobilityAutoCheck, this);
@@ -861,10 +848,8 @@ void AnimationInterface::StopAnimation (bool onlyAnimation)
ResetAnimWriteCallback ();
if (m_f)
{
if (m_xml)
{ // Terminate the anim element
WriteN (GetXMLClose ("anim"), m_f);
}
// Terminate the anim element
WriteN (GetXMLClose ("anim"), m_f);
std::fclose (m_f);
}
m_outputFileSet = false;
@@ -999,23 +984,10 @@ void AnimationInterface::DevTxTrace (std::string context, Ptr<const Packet> p,
double lbTx = (now + txTime).GetSeconds ();
double fbRx = (now + rxTime - txTime).GetSeconds ();
double lbRx = (now + rxTime).GetSeconds ();
if (m_xml)
{
oss << GetXMLOpenClose_p ("p", tx->GetNode ()->GetId (), fbTx, lbTx, rx->GetNode ()->GetId (),
fbRx, lbRx, m_enablePacketMetadata? GetPacketMetadata (p):"");
StartNewTraceFile ();
++m_currentPktCount;
}
else
{
oss << std::setprecision (10);
oss << now.GetSeconds () << " P "
<< tx->GetNode ()->GetId () << " "
<< rx->GetNode ()->GetId () << " "
<< (now + txTime).GetSeconds () << " " // last bit tx time
<< (now + rxTime - txTime).GetSeconds () << " " // first bit rx time
<< (now + rxTime).GetSeconds () << std::endl; // last bit rx time
}
oss << GetXMLOpenClose_p ("p", tx->GetNode ()->GetId (), fbTx, lbTx, rx->GetNode ()->GetId (),
fbRx, lbRx, m_enablePacketMetadata? GetPacketMetadata (p):"");
StartNewTraceFile ();
++m_currentPktCount;
WriteN (oss.str (), m_f);
}
@@ -1708,7 +1680,6 @@ return s;
void AnimationInterface::OutputWirelessPacket (Ptr<const Packet> p, AnimPacketInfo &pktInfo, AnimRxInfo pktrxInfo)
{
StartNewTraceFile ();
NS_ASSERT (m_xml);
std::ostringstream oss;
uint32_t nodeId = 0;
if (pktInfo.m_txnd)
@@ -1727,7 +1698,6 @@ void AnimationInterface::OutputWirelessPacket (Ptr<const Packet> p, AnimPacketIn
void AnimationInterface::OutputCsmaPacket (Ptr<const Packet> p, AnimPacketInfo &pktInfo, AnimRxInfo pktrxInfo)
{
StartNewTraceFile ();
NS_ASSERT (m_xml);
std::ostringstream oss;
NS_ASSERT (pktInfo.m_txnd);
uint32_t nodeId = pktInfo.m_txnd->GetNode ()->GetId ();

6
src/netanim/model/animation-interface.h
View File

@@ -114,12 +114,10 @@ public:
AnimationInterface will create trace files with the following
filenames : filename, filename-1, filename-2..., filename-N
where each file contains packet info for 'maxPktPerFile' number of packets
* \param usingXML Set to true if XML output traces are required
*
*/
AnimationInterface (const std::string filename,
uint64_t maxPktsPerFile = MAX_PKTS_PER_TRACE_FILE,
bool usingXML = true);
uint64_t maxPktsPerFile = MAX_PKTS_PER_TRACE_FILE);
/**
* \brief Destructor for the animator interface.
@@ -435,7 +433,6 @@ private:
FILE * m_routingF; // File handle for routing table output (0 if None);
// Write specified amount of data to the specified handle
int WriteN (const char*, uint32_t, FILE * f);
bool m_xml; // True if xml format desired
Time m_mobilityPollInterval;
std::string m_outputFileName;
bool m_outputFileSet;
@@ -649,6 +646,7 @@ private:
double m_topoMaxY;
static Rectangle * userBoundary;
bool m_enable3105;
std::string GetPacketMetadata (Ptr<const Packet> p);
std::string GetXMLOpen_anim (uint32_t lp);