Skip to content

Commit e3d5854

Browse files
levylevy
committed
all: Removed all updateDisplayString() calls because this functionality is moved to refreshDisplay().
1 parent 5e52f6f commit e3d5854

File tree

74 files changed

+0
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+0
-164
lines changed

‎src/inet/clock/base/ClockBase.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ void ClockBase::initialize(int stage)
2424
}
2525
else if (stage == INITSTAGE_LAST) {
2626
referenceClockModule.reference(this, "referenceClock", false);
27-
updateDisplayString();
2827
emit(timeChangedSignal, getClockTime().asSimTime());
2928
}
3029
}
@@ -46,7 +45,6 @@ void ClockBase::finish()
4645

4746
void ClockBase::refreshDisplay() const
4847
{
49-
updateDisplayString();
5048
}
5149

5250
void ClockBase::updateDisplayString() const

‎src/inet/clock/base/DriftingOscillatorBase.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ void DriftingOscillatorBase::setDriftRate(ppm newDriftRate)
5858
origin = currentSimTime;
5959
emit(driftRateChangedSignal, driftRate.get<ppm>());
6060
emit(postOscillatorStateChangedSignal, this);
61-
updateDisplayString();
6261
}
6362
}
6463

@@ -78,7 +77,6 @@ void DriftingOscillatorBase::setTickOffset(simtime_t newTickOffset)
7877
else
7978
nextTickFromOrigin = currentTickLength - newTickOffset;
8079
emit(postOscillatorStateChangedSignal, this);
81-
updateDisplayString();
8280
}
8381
}
8482

‎src/inet/clock/base/OscillatorBase.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ void OscillatorBase::initialize(int stage)
1515
{
1616
if (stage == INITSTAGE_LOCAL)
1717
displayStringTextFormat = par("displayStringTextFormat");
18-
else if (stage == INITSTAGE_LAST)
19-
updateDisplayString();
2018
}
2119

2220
void OscillatorBase::updateDisplayString() const

‎src/inet/common/MessageDispatcher.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ void MessageDispatcher::arrived(cMessage *message, cGate *inGate, const SendOpti
112112
outGate = handleMessage(check_and_cast<Message *>(message), inGate);
113113
outGate->deliver(message, options, time);
114114
#ifdef INET_WITH_QUEUEING
115-
updateDisplayString();
116115
#endif // #ifdef INET_WITH_QUEUEING
117116
}
118117

@@ -145,7 +144,6 @@ void MessageDispatcher::pushPacket(Packet *packet, const cGate *inGate)
145144
consumer.reference(outGate, false);
146145
handlePacketProcessed(packet);
147146
pushOrSendPacket(packet, outGate, consumer);
148-
updateDisplayString();
149147
}
150148

151149
void MessageDispatcher::pushPacketStart(Packet *packet, const cGate *inGate, bps datarate)
@@ -156,7 +154,6 @@ void MessageDispatcher::pushPacketStart(Packet *packet, const cGate *inGate, bps
156154
queueing::PassivePacketSinkRef consumer;
157155
consumer.reference(outGate, false);
158156
pushOrSendPacketStart(packet, outGate, consumer, datarate, packet->getTransmissionId());
159-
updateDisplayString();
160157
}
161158

162159
void MessageDispatcher::pushPacketEnd(Packet *packet, const cGate *inGate)
@@ -168,7 +165,6 @@ void MessageDispatcher::pushPacketEnd(Packet *packet, const cGate *inGate)
168165
consumer.reference(outGate, false);
169166
handlePacketProcessed(packet);
170167
pushOrSendPacketEnd(packet, outGate, consumer, packet->getTransmissionId());
171-
updateDisplayString();
172168
}
173169

174170
void MessageDispatcher::handleCanPushPacketChanged(const cGate *outGate)

‎src/inet/common/packet/recorder/PcapRecorder.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ void PcapRecorder::handleMessage(cMessage *msg)
159159

160160
void PcapRecorder::refreshDisplay() const
161161
{
162-
updateDisplayString();
163162
}
164163

165164
std::string PcapRecorder::resolveDirective(char directive) const

‎src/inet/linklayer/ethernet/common/MacForwardingTable.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ void MacForwardingTable::handleMessageWhenUp(cMessage *)
105105

106106
void MacForwardingTable::refreshDisplay() const
107107
{
108-
updateDisplayString();
109108
}
110109

111110
void MacForwardingTable::updateDisplayString() const

‎src/inet/linklayer/ethernet/common/MacRelayUnit.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ void MacRelayUnit::handleLowerPacket(Packet *incomingPacket)
8585
broadcastPacket(outgoingPacket, destinationAddress, incomingInterface);
8686
}
8787
numProcessedFrames++;
88-
updateDisplayString();
8988
delete incomingPacket;
9089
}
9190

‎src/inet/linklayer/ethernet/common/RelayInterfaceSelector.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ void RelayInterfaceSelector::pushPacket(Packet *packet, const cGate *gates)
9595
}
9696
}
9797
numProcessedFrames++;
98-
updateDisplayString();
9998
}
10099

101100
void RelayInterfaceSelector::broadcastPacket(Packet *outgoingPacket, const MacAddress& destinationAddress, NetworkInterface *incomingInterface)

‎src/inet/linklayer/ethernet/modular/EthernetCutthroughSource.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ void EthernetCutthroughSource::pushPacketStart(Packet *packet, const cGate *gate
8080
b cutthroughPosition = getCutthroughSwitchingHeaderSize(packet);
8181
simtime_t delay = (cutthroughPosition / datarate).get<s>();
8282
scheduleAt(simTime() + delay, cutthroughTimer);
83-
updateDisplayString();
8483
}
8584
}
8685

@@ -100,7 +99,6 @@ void EthernetCutthroughSource::pushPacketEnd(Packet *packet, const cGate *gate)
10099
numProcessedPackets++;
101100
processedTotalLength += packet->getTotalLength();
102101
delete packet;
103-
updateDisplayString();
104102
}
105103
else
106104
PacketDestreamer::pushPacketEnd(packet, gate);

‎src/inet/linklayer/ethernet/modular/EthernetSocketPacketProcessor.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ void EthernetSocketPacketProcessor::pushPacket(Packet *packet, const cGate *gate
6060
delete packet;
6161
else
6262
pushOrSendPacket(packet, outputGate, consumer);
63-
updateDisplayString();
6463
}
6564

6665
} // namespace inet

‎src/inet/linklayer/ieee80211/mac/coordinationfunction/Dcf.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ void Dcf::handleMessage(cMessage *msg)
6060
if (msg == startRxTimer) {
6161
if (!isReceptionInProgress()) {
6262
frameSequenceHandler->handleStartRxTimeout();
63-
updateDisplayString();
6463
}
6564
}
6665
else
@@ -84,7 +83,6 @@ void Dcf::channelGranted(IChannelAccess *channelAccess)
8483
if (!frameSequenceHandler->isSequenceRunning()) {
8584
frameSequenceHandler->startFrameSequence(new DcfFs(), buildContext(), this);
8685
emit(IFrameSequenceHandler::frameSequenceStartedSignal, frameSequenceHandler->getContext());
87-
updateDisplayString();
8886
}
8987
}
9088

@@ -150,7 +148,6 @@ void Dcf::processLowerFrame(Packet *packet, const Ptr<const Ieee80211MacHeader>&
150148
// TODO always call processResponses
151149
if ((!isForUs(header) && !startRxTimer->isScheduled()) || isForUs(header)) {
152150
frameSequenceHandler->processResponse(packet);
153-
updateDisplayString();
154151
}
155152
else {
156153
EV_INFO << "This frame is not for us" << std::endl;
@@ -252,7 +249,6 @@ void Dcf::transmissionComplete(Packet *packet, const Ptr<const Ieee80211MacHeade
252249
Enter_Method("transmissionComplete");
253250
if (frameSequenceHandler->isSequenceRunning()) {
254251
frameSequenceHandler->transmissionComplete();
255-
updateDisplayString();
256252
}
257253
else
258254
recipientProcessTransmittedControlResponseFrame(packet, header);
@@ -387,7 +383,6 @@ void Dcf::corruptedFrameReceived()
387383
Enter_Method("corruptedFrameReceived");
388384
if (frameSequenceHandler->isSequenceRunning() && !startRxTimer->isScheduled()) {
389385
frameSequenceHandler->handleStartRxTimeout();
390-
updateDisplayString();
391386
}
392387
else
393388
EV_DEBUG << "Ignoring received corrupt frame.\n";

‎src/inet/linklayer/ieee80211/mac/coordinationfunction/Hcf.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ void Hcf::handleMessage(cMessage *msg)
7474
if (msg == startRxTimer) {
7575
if (!isReceptionInProgress()) {
7676
frameSequenceHandler->handleStartRxTimeout();
77-
updateDisplayString();
7877
}
7978
}
8079
else if (msg == inactivityTimer) {
@@ -159,7 +158,6 @@ void Hcf::processLowerFrame(Packet *packet, const Ptr<const Ieee80211MacHeader>&
159158
// TODO always call processResponse?
160159
if ((!isForUs(header) && !startRxTimer->isScheduled()) || isForUs(header)) {
161160
frameSequenceHandler->processResponse(packet);
162-
updateDisplayString();
163161
}
164162
else {
165163
EV_INFO << "This frame is not for us" << std::endl;
@@ -214,7 +212,6 @@ void Hcf::startFrameSequence(AccessCategory ac)
214212
{
215213
frameSequenceHandler->startFrameSequence(new HcfFs(), buildContext(ac), this);
216214
emit(IFrameSequenceHandler::frameSequenceStartedSignal, frameSequenceHandler->getContext());
217-
updateDisplayString();
218215
}
219216

220217
void Hcf::handleInternalCollision(std::vector<Edcaf *> internallyCollidedEdcafs)
@@ -361,7 +358,6 @@ void Hcf::transmissionComplete(Packet *packet, const Ptr<const Ieee80211MacHeade
361358
auto edcaf = edca->getChannelOwner();
362359
if (edcaf) {
363360
frameSequenceHandler->transmissionComplete();
364-
updateDisplayString();
365361
}
366362
else if (hcca->isOwning())
367363
throw cRuntimeError("Hcca is unimplemented!");
@@ -755,7 +751,6 @@ void Hcf::corruptedFrameReceived()
755751
Enter_Method("corruptedFrameReceived");
756752
if (frameSequenceHandler->isSequenceRunning() && !startRxTimer->isScheduled()) {
757753
frameSequenceHandler->handleStartRxTimeout();
758-
updateDisplayString();
759754
}
760755
else
761756
EV_DEBUG << "Ignoring received corrupt frame.\n";

‎src/inet/linklayer/ieee80211/mac/queue/InProgressFrames.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ void InProgressFrames::initialize(int stage)
2323
pendingQueue = check_and_cast<queueing::IPacketQueue *>(getModuleByPath(par("pendingQueueModule")));
2424
dataService = check_and_cast<IOriginatorMacDataService *>(getModuleByPath(par("originatorMacDataServiceModule")));
2525
ackHandler = check_and_cast<IAckHandler *>(getModuleByPath(par("ackHandlerModule")));
26-
updateDisplayString();
2726
}
2827
}
2928

@@ -74,7 +73,6 @@ void InProgressFrames::ensureHasFrameToTransmit()
7473
ackHandler->frameGotInProgress(frame->peekAtFront<Ieee80211DataOrMgmtHeader>());
7574
inProgressFrames.push_back(frame);
7675
frame->setArrivalTime(simTime());
77-
updateDisplayString();
7876
emit(packetEnqueuedSignal, frame);
7977
}
8078
delete frames;
@@ -110,7 +108,6 @@ Packet *InProgressFrames::getPendingFrameFor(Packet *frame)
110108
ackHandler->frameGotInProgress(frame->peekAtFront<Ieee80211DataOrMgmtHeader>());
111109
inProgressFrames.push_back(frame);
112110
frame->setArrivalTime(simTime());
113-
updateDisplayString();
114111
emit(packetEnqueuedSignal, frame);
115112
}
116113
delete frames;
@@ -128,7 +125,6 @@ void InProgressFrames::dropFrame(Packet *packet)
128125
EV_DEBUG << "Dropping frame " << packet->getName() << ".\n";
129126
inProgressFrames.erase(std::remove(inProgressFrames.begin(), inProgressFrames.end(), packet), inProgressFrames.end());
130127
droppedFrames.push_back(packet);
131-
updateDisplayString();
132128
emit(packetDequeuedSignal, packet);
133129
}
134130

@@ -143,7 +139,6 @@ void InProgressFrames::dropFrames(std::set<std::pair<MacAddress, std::pair<Tid,
143139
EV_DEBUG << "Dropping frame " << frame->getName() << ".\n";
144140
it = inProgressFrames.erase(it);
145141
droppedFrames.push_back(frame);
146-
updateDisplayString();
147142
emit(packetDequeuedSignal, frame);
148143
}
149144
else

‎src/inet/linklayer/ieee80211/mac/ratecontrol/AarfRateControl.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ void AarfRateControl::initialize(int stage)
3232
WATCH(numberOfConsSuccTransmissions);
3333
}
3434
else if (stage == INITSTAGE_LINK_LAYER) {
35-
updateDisplayString();
3635
}
3736
}
3837

@@ -54,7 +53,6 @@ void AarfRateControl::frameTransmitted(Packet *frame, int retryCount, bool isSuc
5453
numberOfConsSuccTransmissions = 0;
5554
currentMode = decreaseRateIfPossible(currentMode);
5655
emitDatarateChangedSignal();
57-
updateDisplayString();
5856
EV_DETAIL << "Decreased rate to " << *currentMode << endl;
5957
multiplyIncreaseThreshold(factor);
6058
resetTimer();
@@ -63,7 +61,6 @@ void AarfRateControl::frameTransmitted(Packet *frame, int retryCount, bool isSuc
6361
numberOfConsSuccTransmissions = 0;
6462
currentMode = decreaseRateIfPossible(currentMode);
6563
emitDatarateChangedSignal();
66-
updateDisplayString();
6764
EV_DETAIL << "Decreased rate to " << *currentMode << endl;
6865
resetIncreaseThreshdold();
6966
resetTimer();
@@ -75,7 +72,6 @@ void AarfRateControl::frameTransmitted(Packet *frame, int retryCount, bool isSuc
7572
numberOfConsSuccTransmissions = 0;
7673
currentMode = increaseRateIfPossible(currentMode);
7774
emitDatarateChangedSignal();
78-
updateDisplayString();
7975
EV_DETAIL << "Increased rate to " << *currentMode << endl;
8076
resetTimer();
8177
probing = true;
@@ -106,7 +102,6 @@ void AarfRateControl::increaseRateIfTimerIsExpired()
106102
if (simTime() - timer >= interval) {
107103
currentMode = increaseRateIfPossible(currentMode);
108104
emitDatarateChangedSignal();
109-
updateDisplayString();
110105
EV_DETAIL << "Increased rate to " << *currentMode << endl;
111106
resetTimer();
112107
}

‎src/inet/linklayer/ieee80211/mac/ratecontrol/OnoeRateControl.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ void OnoeRateControl::initialize(int stage)
2424
WATCH(numOfSuccTransmissions);
2525
WATCH(numOfGivenUpTransmissions);
2626
WATCH(avgRetriesPerFrame);
27-
updateDisplayString();
2827
}
2928
}
3029

@@ -77,7 +76,6 @@ void OnoeRateControl::computeMode()
7776
if (numOfFrameTransmitted >= 10 && avgRetriesPerFrame > 1) {
7877
currentMode = decreaseRateIfPossible(currentMode);
7978
emitDatarateChangedSignal();
80-
updateDisplayString();
8179
EV_DETAIL << "Decreased rate to " << *currentMode << endl;
8280
credit = 0;
8381
}
@@ -89,7 +87,6 @@ void OnoeRateControl::computeMode()
8987
if (credit >= 10) {
9088
currentMode = increaseRateIfPossible(currentMode);
9189
emitDatarateChangedSignal();
92-
updateDisplayString();
9390
EV_DETAIL << "Increased rate to " << *currentMode << endl;
9491
credit = 0;
9592
}

‎src/inet/linklayer/ieee8021d/relay/Ieee8021dRelay.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ void Ieee8021dRelay::handleLowerPacket(Packet *incomingPacket)
159159
}
160160
delete incomingPacket;
161161
}
162-
updateDisplayString();
163162
}
164163

165164
void Ieee8021dRelay::handleUpperPacket(Packet *packet)

‎src/inet/linklayer/ieee8021q/Ieee8021qSocketPacketProcessor.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ void Ieee8021qSocketPacketProcessor::pushPacket(Packet *packet, const cGate *gat
5757
delete packet;
5858
else
5959
pushOrSendPacket(packet, outputGate, consumer);
60-
updateDisplayString();
6160
}
6261

6362
} // namespace inet

‎src/inet/linklayer/mrp/Mrp.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,6 @@ void Mrp::colorLink(NetworkInterface *ie, bool forwarding) const
19571957

19581958
void Mrp::refreshDisplay() const
19591959
{
1960-
updateDisplayString();
19611960

19621961
if (visualize) {
19631962
for (unsigned int i = 0; i < interfaceTable->getNumInterfaces(); i++) {

‎src/inet/linklayer/mrp/MrpRelay.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ void MrpRelay::handleLowerPacket(Packet *incomingPacket)
202202
numDispatchedNonMRPFrames++;
203203
delete incomingPacket;
204204
}
205-
updateDisplayString();
206205
}
207206

208207
bool MrpRelay::isForwardingInterface(NetworkInterface *networkInterface) const

‎src/inet/networklayer/common/NetworkInterface.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ void NetworkInterface::pushPacketEnd(Packet *packet, const cGate *gate)
279279

280280
void NetworkInterface::refreshDisplay() const
281281
{
282-
updateDisplayString();
283282
}
284283

285284
void NetworkInterface::updateDisplayString() const

‎src/inet/networklayer/ipv4/Ipv4NetworkLayer.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Define_Module(Ipv4NetworkLayer);
1515

1616
void Ipv4NetworkLayer::refreshDisplay() const
1717
{
18-
updateDisplayString();
1918
}
2019

2120
void Ipv4NetworkLayer::updateDisplayString() const

‎src/inet/physicallayer/wired/ethernet/EthernetFragmentPhyHeaderInserter.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ void EthernetFragmentPhyHeaderInserter::pushPacketStart(Packet *packet, const cG
5050
startPacketStreaming(packet);
5151
processPacket(packet);
5252
pushOrSendPacketProgress(packet, outputGate, consumer, datarate, B(8), b(0), packet->getTransmissionId());
53-
updateDisplayString();
5453
}
5554

5655
} // namespace physicallayer

‎src/inet/physicallayer/wired/ethernet/EthernetPhyHeaderInserter.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ void EthernetPhyHeaderInserter::pushPacketStart(Packet *packet, const cGate *gat
3434
startPacketStreaming(packet);
3535
processPacket(packet);
3636
pushOrSendPacketProgress(packet, outputGate, consumer, datarate, B(8), b(0), packet->getTransmissionId());
37-
updateDisplayString();
3837
}
3938

4039
} // namespace physicallayer

‎src/inet/power/storage/SimpleCcBattery.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ void SimpleCcBattery::initialize(int stage)
3636

3737
void SimpleCcBattery::refreshDisplay() const
3838
{
39-
updateDisplayString();
4039
}
4140

4241
void SimpleCcBattery::updateDisplayString() const

‎src/inet/power/storage/SimpleEpEnergyStorage.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ void SimpleEpEnergyStorage::handleMessage(cMessage *message)
5454

5555
void SimpleEpEnergyStorage::refreshDisplay() const
5656
{
57-
updateDisplayString();
5857
}
5958

6059
void SimpleEpEnergyStorage::updateDisplayString() const

0 commit comments

Comments
 (0)