Revision 2f5cc443 src/envir/eventlogfilemgr.cc

View differences:

src/envir/eventlogfilemgr.cc
32 32
#include "ccompoundmodule.h"
33 33
#include "cdisplaystring.h"
34 34
#include "cclassdescriptor.h"
35
#include "casyncmodule.h"
35 36

  
36 37
USING_NAMESPACE
37 38

  
......
161 162
        cMessage *message = *it;
162 163
        if (currentEvent != message->getPreviousEventNumber()) {
163 164
            currentEvent = message->getPreviousEventNumber();
164
            EventLogWriter::recordEventEntry_e_t_m_msg(feventlog, currentEvent, message->getSendingTime(), currentEvent == 0 ? simulation.getSystemModule()->getId() : message->getSenderModuleId(), -1);
165
            EventLogWriter::recordEventEntry_e_t_m_msg_d(feventlog, currentEvent, message->getSendingTime(), currentEvent == 0 ? simulation.getSystemModule()->getId() : message->getSenderModuleId(), -1,0);
165 166
        }
166 167
        if (currentEvent == 0)
167 168
            componentMethodBegin(simulation.getSystemModule(), message->getSenderModule(), "initialize", empty_va);
......
225 226
        const char *runId = ev.getConfigEx()->getVariable(CFGVAR_RUNID);
226 227
        // TODO: we can't use simulation.getEventNumber() and simulation.getSimTime(), because when we start a new run
227 228
        // these numbers are still set from the previous run (i.e. not zero)
228
        EventLogWriter::recordEventEntry_e_t_m_msg(feventlog, 0, 0, simulation.getSystemModule()->getId(), -1);
229
        EventLogWriter::recordEventEntry_e_t_m_msg_d(feventlog, 0, 0, simulation.getSystemModule()->getId(), -1,0);
229 230
        EventLogWriter::recordSimulationBeginEntry_v_rid(feventlog, OMNETPP_VERSION, runId);
230 231
        fflush(feventlog);
231 232
    }
......
273 274

  
274 275
    if (isEventLogRecordingEnabled)
275 276
    {
276
        EventLogWriter::recordEventEntry_e_t_m_ce_msg(feventlog,
277
            simulation.getEventNumber(), simulation.getSimTime(), mod->getId(),
278
            msg->getPreviousEventNumber(), msg->getId());
277
        log_eventNumber = simulation.getEventNumber();
278
        log_simtime = simulation.getSimTime();
279
        log_modid = mod->getId();
280
        log_previd =msg->getPreviousEventNumber();
281
        log_msgid = msg->getId();
282
        log_duration = msg->getEventDuration();
283

  
284
        EventLogWriter::recordEventEntry_e_t_m_ce_msg_d(feventlog,
285
                log_eventNumber, log_simtime, log_modid,
286
                log_previd, log_msgid, log_duration);
287
    }
288
}
289

  
290
void EventlogFileManager::simulationEventEnd(double complexity) {
291
    if (isEventLogRecordingEnabled)
292
    {
293
        EventLogWriter::recordEventEndEntry_e_c(feventlog, log_eventNumber,
294
                        complexity);
279 295
    }
280 296
}
281 297

  

Also available in: Unified diff