Revision 3e97003d

View differences:

src/sim/cmessageheap.cc
48 48
}
49 49
*/
50 50

  
51
// /*
52 51
inline bool operator > (cMessage& a, cMessage& b)
53 52
{
54
    return a.getArrivalTime() > b.getArrivalTime() ? true :                         // 1. criterion: starting time
53
    return a.getArrivalTime() > b.getArrivalTime() ? true :                       // 1. criterion: starting time
55 54
           a.getArrivalTime() < b.getArrivalTime() ? false :
56
           (a.getSchedulingPriority() > b.getSchedulingPriority()) ? true :         // 2. criterion: priority
57
           (a.getSchedulingPriority() < b.getSchedulingPriority()) ? false :
58
           (a.getParentStartTime() < b.getParentStartTime()) ? true :               // 3. criterion: parent starting time
59
           (a.getParentStartTime() > b.getParentStartTime()) ? false :
60
           (a.getParentExecutionOrderId() < b.getParentExecutionOrderId()) ? true : // 4. criterion: parent execution order
61
           (a.getParentExecutionOrderId() > b.getParentExecutionOrderId()) ? false :
62
           (a.getSchedulingOrderId() < b.getSchedulingOrderId()) ? true :           // 5. criterion: scheduling order
63
           (a.getSchedulingOrderId() > b.getSchedulingOrderId());
55
           a.getSchedulingPriority() > b.getSchedulingPriority() ? true :         // 2. criterion: priority
56
           a.getSchedulingPriority() < b.getSchedulingPriority() ? false :
57
           a.getParentStartTime() > b.getParentStartTime() ? true :               // 3. criterion: parent starting time
58
           a.getParentStartTime() < b.getParentStartTime() ? false :
59
           a.getParentExecutionOrderId() > b.getParentExecutionOrderId() ? true : // 4. criterion: parent execution order
60
           a.getParentExecutionOrderId() < b.getParentExecutionOrderId() ? false :
61
           a.getSchedulingOrderId() > b.getSchedulingOrderId() ? true :           // 5. criterion: scheduling order
62
           a.getSchedulingOrderId() < b.getSchedulingOrderId() ? false :
63
	   a.getInsertOrder() > b.getInsertOrder();                               // 6. criterion: final tie breaker (needed during init)
64 64
}
65
// */
66 65

  
67 66
inline bool operator <= (cMessage& a, cMessage& b)
68 67
{

Also available in: Unified diff