ns-3.24: comparison src/netanim/model/animation-interface.h

equal deleted inserted replaced

-:ce0699130fc4
+:25b20434eba8
 #define HANDLETYPE int
 #endif
 namespace ns3 {
+#define MAX_PKTS_PER_TRACE_FILE 100000
 /**
 * \defgroup netanim Netanim
 *
 * This section documents the API of the ns-3 netanim module. For a generic functional description, please refer to the ns-3 manual.
 */
 ~AnimationInterface ();
 /**
 * \brief Constructor
 * \param filename The Filename for the trace file used by the Animator
+* \param maxPktsPerFile The maximum number of packets per trace file.
+	    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, bool usingXML = true);
+AnimationInterface (const std::string filename,
+	uint64_t maxPktsPerFile = MAX_PKTS_PER_TRACE_FILE,
+	bool usingXML = true);
 /**
 * \brief Constructor
 * \param port Port on which ns-3 should listen to for connection from the
 *        external netanim application
 *
 * Writes the topology information to the appropriate output, depending
 * on prior calls to SetOutputFile, SetServerPort, or SetInternalAnimation.
 * Then creates the callbacks needed for the animator to start processing
 * packets.
 *
-*/
+* \param restart True when restarting animation
-void StartAnimation ();
+*/
+void StartAnimation (bool restart = false);
 /**
 * \brief Closes the interface to the animator.
 *
 */
 * \param enable if true enables writing the packet metadata to the XML trace file
 *        if false disables writing the packet metadata
 */
 void EnablePacketMetadata (bool enable);
+/**
+*
+* \brief Get trace file packet count (This used only for testing)
+*
+* returns Number of packets recorded in the current trace file
+*
+*/
+uint64_t GetTracePktCount ();
 private:
 #ifndef WIN32
 int m_fHandle;  // File handle for output (-1 if none)
 #else
 SOCKET m_fHandle;  // File handle for output (-1 if none)
 int  WriteN (SOCKET, const char*, uint32_t);
 #endif
 bool m_xml;      // True if xml format desired
-Time mobilitypollinterval;
+Time m_mobilityPollInterval;
-bool usingSockets;
+bool m_usingSockets;
-uint16_t mport;
+uint16_t m_port;
-std::string outputfilename;
+std::string m_outputFileName;
-bool OutputFileSet;
+bool m_outputFileSet;
-bool ServerPortSet;
+bool m_serverPortSet;
+uint64_t gAnimUid ;    // Packet unique identifier used by Animtion
+bool m_randomPosition;
+AnimWriteCallback m_writeCallback;
+bool m_started;
+bool m_enablePacketMetadata;
+Time m_startTime;
+Time m_stopTime;
+uint64_t m_maxPktsPerFile;
+std::string m_originalFileName;
 void DevTxTrace (std::string context,
 Ptr<const Packet> p,
 Ptr<NetDevice> tx,
 Ptr<NetDevice> rx,
 void OutputWirelessPacket (Ptr<const Packet> p, AnimPacketInfo& pktInfo, AnimRxInfo pktrxInfo);
 void OutputCsmaPacket (Ptr<const Packet> p, AnimPacketInfo& pktInfo, AnimRxInfo pktrxInfo);
 void MobilityAutoCheck ();
-uint64_t gAnimUid ;    // Packet unique identifier used by Animtion
+std::map<uint64_t, AnimPacketInfo> m_pendingWifiPackets;
-std::map<uint64_t, AnimPacketInfo> pendingWifiPackets;
 void AddPendingWifiPacket (uint64_t AnimUid, AnimPacketInfo&);
 bool WifiPacketIsPending (uint64_t AnimUid);
-std::map<uint64_t, AnimPacketInfo> pendingWimaxPackets;
+std::map<uint64_t, AnimPacketInfo> m_pendingWimaxPackets;
 void AddPendingWimaxPacket (uint64_t AnimUid, AnimPacketInfo&);
 bool WimaxPacketIsPending (uint64_t AnimUid);
-std::map<uint64_t, AnimPacketInfo> pendingLtePackets;
+std::map<uint64_t, AnimPacketInfo> m_pendingLtePackets;
 void AddPendingLtePacket (uint64_t AnimUid, AnimPacketInfo&);
 bool LtePacketIsPending (uint64_t AnimUid);
-std::map<uint64_t, AnimPacketInfo> pendingCsmaPackets;
+std::map<uint64_t, AnimPacketInfo> m_pendingCsmaPackets;
 void AddPendingCsmaPacket (uint64_t AnimUid, AnimPacketInfo&);
 bool CsmaPacketIsPending (uint64_t AnimUid);
 uint64_t GetAnimUidFromPacket (Ptr <const Packet>);
-std::map<uint32_t, Vector> nodeLocation;
+std::map<uint32_t, Vector> m_nodeLocation;
 Vector GetPosition (Ptr <Node> n);
 Vector UpdatePosition (Ptr <Node> n);
 Vector UpdatePosition (Ptr <Node> n, Vector v);
 void WriteDummyPacket ();
 bool NodeHasMoved (Ptr <Node> n, Vector newLocation);
 // Recalculate topology bounds
 void RecalcTopoBounds (Vector v);
 std::vector < Ptr <Node> > RecalcTopoBounds ();
-bool randomPosition;
-AnimWriteCallback m_writeCallback;
 void ConnectCallbacks ();
-bool m_started;
-bool m_enablePacketMetadata;
-Time m_startTime;
-Time m_stopTime;
 std::map <std::string, uint32_t> m_macToNodeIdMap;
 bool IsInTimeWindow ();
 // Path helper
 std::vector<std::string> GetElementsFromContext (std::string context);
 Ptr <NetDevice> GetNetDeviceFromContext (std::string context);
 static std::map <uint32_t, std::string> nodeDescriptions;
+uint64_t m_currentPktCount;
+void StartNewTraceFile();
 // XML helpers
 std::string GetPreamble (void);
 // Topology element dimensions
-double topo_minX;
+double m_topoMinX;
-double topo_minY;
+double m_topoMinY;
-double topo_maxX;
+double m_topoMaxX;
-double topo_maxY;
+double m_topoMaxY;
 std::string GetPacketMetadata (Ptr<const Packet> p);
 std::string GetXMLOpen_anim (uint32_t lp);
 std::string GetXMLOpen_topology (double minX,double minY,double maxX,double maxY);

changeset 8773	25b20434eba8
parent 7823	2a669a0c452e
child 8803	e51a5a77909c