Revision 636cbdd5

View differences:

src/envir/eventlogfilemgr.cc
162 162
        cMessage *message = *it;
163 163
        if (currentEvent != message->getPreviousEventNumber()) {
164 164
            currentEvent = message->getPreviousEventNumber();
165
            EventLogWriter::recordEventEntry_e_t_m_msg_d(feventlog, currentEvent, message->getSendingTime(), currentEvent == 0 ? simulation.getSystemModule()->getId() : message->getSenderModuleId(), -1,0);
165
            EventLogWriter::recordEventEntry_e_t_m_ce_msg_d(feventlog, currentEvent, message->getSendingTime(), currentEvent == 0 ? simulation.getSystemModule()->getId() : message->getSenderModuleId(), 0, -1,0);
166 166
            EventLogWriter::recordEventEndEntry_e_c(feventlog, currentEvent,0);
167 167
        }
168 168
        if (currentEvent == 0)
......
227 227
        const char *runId = ev.getConfigEx()->getVariable(CFGVAR_RUNID);
228 228
        // TODO: we can't use simulation.getEventNumber() and simulation.getSimTime(), because when we start a new run
229 229
        // these numbers are still set from the previous run (i.e. not zero)
230
        EventLogWriter::recordEventEntry_e_t_m_msg_d(feventlog, 0, 0, simulation.getSystemModule()->getId(), -1,0);
231
        EventLogWriter::recordEventEndEntry_e_c(feventlog, 0,0);
230
        EventLogWriter::recordEventEntry_e_t_m_ce_msg_d(feventlog, 0, 0, simulation.getSystemModule()->getId(), 0 ,  -1,0);
232 231
        EventLogWriter::recordSimulationBeginEntry_v_rid(feventlog, OMNETPP_VERSION, runId);
233 232
        fflush(feventlog);
234 233
    }
src/eventlog/event.cc
123 123

  
124 124
        if (!line) {
125 125
            Assert(eventEntry);
126
            Assert(eventEndEntry);
127 126
            endOffset = reader->getFileSize();
128 127
            return endOffset;
129 128
        }
......
181 180
        if (dynamic_cast<BeginSendEntry *>(eventLogEntry))
182 181
            numBeginSendEntries++;
183 182
    }
184
    Assert(eventEndEntry);
185 183
    return endOffset = reader->getCurrentLineStartOffset();
186 184
}
187 185

  
src/eventlog/eventlogentries.txt
96 96
   m int moduleId                       // id of the processing module
97 97
   ce eventnumber_t causeEventNumber -1 // event number from which the message being processed was sent, or -1 if the message was sent from initialize
98 98
   msg long messageId                   // lifetime-unique id of the message being processed
99
   d simtime_t duration                 // duration of the event
99
   d simtime_t duration               0 // duration of the event
100 100
}
101 101

  
102 102
EE EventEndEntry //indicates end of an event
src/eventlog/sequencechartfacade.cc
622 622
        for (IEvent *event = eventLog->getFirstEvent();event != eventLog->getLastEvent(); event = event->getNextEvent()) {
623 623
             if (event->getEventEndEntry()) {
624 624
                 complexity = event->getEventEndEntry()->complexity;
625
             } else {
626
                 continue;
625 627
             }
626 628
             if (complexity < smallestComplexity || smallestComplexity < 0) {
627 629
                 smallestComplexity = complexity;

Also available in: Unified diff