tport.cc (5459:b84a60dbf862) tport.cc (5606:6da7a58b0bc8)
1/*
2 * Copyright (c) 2006 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 124 unchanged lines hidden (view full) ---

133 // we get confused by having a non-active packet on transmitList
134 DeferredPacket dp = transmitList.front();
135 transmitList.pop_front();
136 bool success = sendTiming(dp.pkt);
137
138 if (success) {
139 if (!transmitList.empty() && !sendEvent->scheduled()) {
140 Tick time = transmitList.front().tick;
1/*
2 * Copyright (c) 2006 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 124 unchanged lines hidden (view full) ---

133 // we get confused by having a non-active packet on transmitList
134 DeferredPacket dp = transmitList.front();
135 transmitList.pop_front();
136 bool success = sendTiming(dp.pkt);
137
138 if (success) {
139 if (!transmitList.empty() && !sendEvent->scheduled()) {
140 Tick time = transmitList.front().tick;
141 sendEvent->schedule(time <= curTick ? curTick+1 : time);
141 schedule(sendEvent, time <= curTick ? curTick+1 : time);
142 }
143
144 if (transmitList.empty() && drainEvent) {
145 drainEvent->process();
146 drainEvent = NULL;
147 }
148 } else {
149 // Unsuccessful, need to put back on transmitList. Callee

--- 39 unchanged lines hidden --- 		142 }
143
144 if (transmitList.empty() && drainEvent) {
145 drainEvent->process();
146 drainEvent = NULL;
147 }
148 } else {
149 // Unsuccessful, need to put back on transmitList. Callee

--- 39 unchanged lines hidden ---