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

fix the Simulation event replayer: make it build

Browse Source
This commit is contained in:
Mathieu Lacage
2006-12-12 14:59:13 +01:00
parent 262d09de55
commit bdc613c1df
2 changed files with 110 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
utils/replay-simulation.cc
View File

@@ -20,9 +20,8 @@
*/
#include "ns3/simulator.h"
#include "ns3/event.h"
#include "ns3/event.tcc"
#include "ns3/wall-clock-ms.h"
#include "ns3/nstime.h"
#include "ns3/system-wall-clock-ms.h"
#include <vector>
#include <deque>
#include <fstream>
@@ -32,9 +31,9 @@ using namespace ns3;
class LogReader {
public:
void readFrom_filename (char const *filename);
void run (void);
void printStats (void);
void ReadFromFilename (char const *filename);
void Run (void);
void PrintStats (void);
private:
struct Command {
enum {
@@ -60,11 +59,11 @@ private:
} insertRemove;
};
};
void executeLogCommands (uint32_t uid);
void ExecuteLogCommands (uint32_t uid);
typedef std::deque<struct Command> Commands;
typedef std::deque<struct Command>::iterator CommandsI;
typedef std::deque<Event > RemoveEvents;
typedef std::deque<EventId> RemoveEvents;
Commands m_commands;
@@ -77,16 +76,18 @@ typedef std::vector<std::pair<uint32_t, uint32_t> > Removes;
typedef std::vector<std::pair<uint32_t, uint32_t> >::iterator RemovesI;
void
LogReader::ReadFrom_filename (char const *filename)
LogReader::ReadFromFilename (char const *filename)
{
std::ifstream log;
std::cout << "read log..." << std::endl;
Removes removes;
log.open (filename);
while (!log.eof ()) {
while (!log.eof ())
{
std::string type;
log >> type;
if (type == "i") {
if (type == "i")
{
uint32_t nowUid, evUid;
uint64_t nowUs, evUs;
log >> nowUid >> nowUs >> evUid >> evUs;
@@ -95,7 +96,9 @@ LogReader::ReadFrom_filename (char const *filename)
cmd.m_uid = nowUid;
cmd.insert.m_evUs = evUs;
m_commands.push_back (cmd);
} else if (type == "r") {
}
else if (type == "r")
{
uint32_t nowUid, evUid;
uint64_t nowUs, evUs;
log >> nowUid >> nowUs >> evUid >> evUs;
@@ -103,8 +106,10 @@ LogReader::ReadFrom_filename (char const *filename)
cmd.m_type = Command::REMOVE;
cmd.m_uid = nowUid;
m_commands.push_back (cmd);
removes.push_back (std::Make_pair (nowUid, evUid));
} else if (type == "il") {
removes.push_back (std::make_pair (nowUid, evUid));
}
else if (type == "il")
{
uint32_t nowUid, evUid;
uint64_t nowUs, evUs;
log >> nowUid >> nowUs >> evUid >> evUs;
@@ -112,15 +117,19 @@ LogReader::ReadFrom_filename (char const *filename)
cmd.m_type = Command::INSERT_LATER;
cmd.m_uid = nowUid;
m_commands.push_back (cmd);
}
}
}
}
log.close ();
std::cout << "gather insert removes..." << std::endl;
for (CommandsI i = m_commands.begin (); i != m_commands.end (); i++) {
if (i->m_type == Command::INSERT) {
for (RemovesI j = removes.begin (); j != removes.end (); j++) {
if (j->second == i->m_uid) {
for (CommandsI i = m_commands.begin (); i != m_commands.end (); i++)
{
if (i->m_type == Command::INSERT)
{
for (RemovesI j = removes.begin (); j != removes.end (); j++)
{
if (j->second == i->m_uid)
{
// this insert will be removed later.
uint64_t us = i->insert.m_evUs;
uint32_t uid = i->m_uid;
@@ -129,63 +138,71 @@ LogReader::ReadFrom_filename (char const *filename)
i->insertRemove.m_evUs = us;
i->insertRemove.m_evLoc = j->first;
break;
}
}
}
}
}
}
}
}
std::cout << "calculate remove locations..." << std::endl;
// calculate the final insert/remove location.
for (CommandsI i = m_commands.begin (); i != m_commands.end (); i++) {
if (i->m_type == Command::INSERT_REMOVE) {
for (CommandsI i = m_commands.begin (); i != m_commands.end (); i++)
{
if (i->m_type == Command::INSERT_REMOVE)
{
uint32_t loc = 0;
for (CommandsI tmp = i; tmp != m_commands.end (); tmp++) {
for (CommandsI tmp = i; tmp != m_commands.end (); tmp++)
{
if (tmp->m_type == Command::REMOVE &&
tmp->m_uid == i->insertRemove.m_evLoc) {
tmp->m_uid == i->insertRemove.m_evLoc)
{
i->insertRemove.m_evLoc = loc;
break;
}
}
loc++;
}
}
}
}
}
}
}
void
LogReader::ExecuteLogCommands (uint32_t uid)
{
if (m_command == m_commands.end ()) {
if (m_command == m_commands.end ())
{
return;
}
}
//std::cout << "one event, uid=" <<m_uid<< std::endl;
struct Command cmd = *m_command;
//std::cout << "cmd uid=" <<cmd.m_uid<< std::endl;
while (cmd.m_uid == uid) {
while (cmd.m_uid == uid)
{
m_command++;
switch (cmd.m_type) {
case Command::INSERT:
//std::Cout << "exec insert now=" << Simulator::nowUs ()
//<< ", time=" << cmd.insert.m_evUs << std::endl;
Simulator::ScheduleAbsUs (cmd.insert.m_evUs,
makeEvent (&LogReader::executeLogCommands, this, m_uid));
m_uid++;
break;
//std::Cout << "exec insert now=" << Simulator::nowUs ()
//<< ", time=" << cmd.insert.m_evUs << std::endl;
Simulator::Schedule (MicroSeconds (cmd.insert.m_evUs) - Now (),
&LogReader::ExecuteLogCommands, this, m_uid);
m_uid++;
break;
case Command::INSERT_LATER:
//std::cout << "exec insert later" << std::endl;
Simulator::ScheduleNow (makeEvent (&LogReader::executeLogCommands, this, m_uid));
Simulator::ScheduleNow (&LogReader::ExecuteLogCommands, this, m_uid);
m_uid++;
break;
case Command::REMOVE: {
case Command::REMOVE:
{
//std::cout << "exec remove" << std::endl;
Event ev = m_removeEvents.front ();
EventId id = m_removeEvents.front ();
m_removeEvents.pop_front ();
Simulator::Remove (ev);
} break;
case Command::INSERT_REMOVE: {
Simulator::Remove (id);
} break;
case Command::INSERT_REMOVE:
{
//std::cout << "exec insert remove" << std::endl;
Event ev = makeEvent (&LogReader::executeLogCommands, this, m_uid);
Simulator::ScheduleAbsUs (cmd.insertRemove.m_evUs, ev);
m_removeEvents[cmd.insertRemove.m_evLoc] = ev;
EventId id = Simulator::Schedule (MicroSeconds (cmd.insertRemove.m_evUs) - Now (),
&LogReader::ExecuteLogCommands, this, m_uid);
m_removeEvents[cmd.insertRemove.m_evLoc] = id;
m_uid++;
} break;
} break;
}
cmd = *m_command;
}
@@ -196,7 +213,8 @@ LogReader::PrintStats (void)
{
uint32_t nInserts = 0;
uint32_t nRemoves = 0;
for (CommandsI i = m_commands.begin (); i != m_commands.end (); i++) {
for (CommandsI i = m_commands.begin (); i != m_commands.end (); i++)
{
switch (i->m_type) {
case Command::INSERT:
nInserts++;
@@ -211,7 +229,7 @@ LogReader::PrintStats (void)
nRemoves++;
break;
}
}
}
std::cout << "inserts="<<nInserts<<", removes="<<nRemoves<<std::endl;
std::cout << "run simulation..."<<std::endl;
}
@@ -220,12 +238,12 @@ void
LogReader::Run (void)
{
m_uid = 0;
WallClockMs time;
time.start ();
SystemWallClockMs time;
time.Start ();
m_command = m_commands.begin ();
executeLogCommands (m_uid);
ExecuteLogCommands (m_uid);
Simulator::Run ();
unsigned long long delta = time.end ();
unsigned long long delta = time.End ();
double delay = ((double)delta)/1000;
std::cout << "runtime="<<delay<<"s"<<std::endl;
}
@@ -235,31 +253,45 @@ int main (int argc, char *argv[])
{
char const *input = 0;
uint32_t n = 1;
while (argc > 0) {
if (strcmp ("--list", argv[0]) == 0) {
while (argc > 0)
{
if (strcmp ("--list", argv[0]) == 0)
{
Simulator::SetLinkedList ();
} else if (strcmp ("--heap", argv[0]) == 0) {
}
else if (strcmp ("--heap", argv[0]) == 0)
{
Simulator::SetBinaryHeap ();
} else if (strcmp ("--map", argv[0]) == 0) {
}
else if (strcmp ("--map", argv[0]) == 0)
{
Simulator::SetStdMap ();
} else if (strncmp ("--n=", argv[0], strlen("--n=")) == 0) {
}
else if (strncmp ("--n=", argv[0], strlen("--n=")) == 0)
{
n = atoi (argv[0]+strlen ("--n="));
} else if (strncmp ("--input=", argv[0],strlen ("--input=")) == 0) {
}
else if (strncmp ("--input=", argv[0],strlen ("--input=")) == 0)
{
input = argv[0] + strlen ("--input=");
} else if (strncmp ("--log=", argv[0],strlen ("--log=")) == 0) {
}
else if (strncmp ("--log=", argv[0],strlen ("--log=")) == 0)
{
char const *filename = argv[0] + strlen ("--log=");
Simulator::EnableLogTo (filename);
}
}
argc--;
argv++;
}
if (input == 0) {
}
if (input == 0)
{
std::cerr << "need --input=[filename] option" << std::endl;
return 1;
}
}
LogReader log;
log.readFrom_filename (input);
for (uint32_t i = 0; i < n; i++) {
log.run ();
}
log.ReadFromFilename (input);
for (uint32_t i = 0; i < n; i++)
{
log.Run ();
}
}