Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various C++ fixes #224

Merged
merged 17 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d117a43
LteMacEnb: check all accepted amcType value, throws error when not re…
ZoltanBojthe Apr 23, 2024
082eae4
CbrSender, VoIPSender: rename 'PacketSize' parameter to 'packetSize'
ZoltanBojthe Apr 15, 2024
49214bc
simulations: follow "CbrSender, VoIPSender: rename 'PacketSize' param…
ZoltanBojthe Apr 15, 2024
4840844
MecAppBase: fixed uninitialized pointer in HttpMessageStatus::process…
ZoltanBojthe Apr 16, 2024
b5f75ed
UERequestApp: fixed documentation
ZoltanBojthe Apr 19, 2024
c97285d
LteNicBase: fixed delegation of interfaceTableModule, routingTableMod…
ZoltanBojthe Apr 19, 2024
d32ab25
apps: mec: remove unused interfaceTableModule parameter
ZoltanBojthe Apr 19, 2024
725aaf3
LteMacEnb: fix: get const reference to HarqBuffers instead of copying it
ZoltanBojthe Apr 23, 2024
96b9dad
MecServiceBase: initialize(): call base class initialize() at the top
ZoltanBojthe May 9, 2024
b34f6f5
UALCMPApp: initialize(): call base class initialize() at the top
ZoltanBojthe May 9, 2024
efe5a7f
ServiceRegistry: initialize(): remove redundant call to indirect base…
ZoltanBojthe May 9, 2024
12eef8e
LteHarqProcessTx, LteHarqUnitTx, LteHarqBufferTx, etc: make classes n…
ZoltanBojthe May 28, 2024
8e9319c
LtePdcpRrc: removed redundant initialization of nodeId_
ZoltanBojthe May 28, 2024
d17c739
BackgroundTrafficManager: fix access of module parameter by the wrong…
ZoltanBojthe May 31, 2024
c321bf2
all: change calls to registerSignal(), as it is a *static* member fun…
ZoltanBojthe May 7, 2024
a2da3e0
LteRealisticChannelModel: remove duplicate binder_ member, already ex…
ZoltanBojthe May 21, 2024
727b1ec
LteDlFeedbackGenerator: replace getAncestorPar() call with par()
ZoltanBojthe Jun 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion simulations/LTE/d2d/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ output-vector-file = ${resultdir}/${configname}/pos2=${pos2}-${repetition}.vec
# Transmitter
*.ueD2DTx[0].app[*].typename = "VoIPSender"
*.ueD2DTx[0].app[*].silences = false
*.ueD2DTx[0].app[*].PacketSize = 2500B
*.ueD2DTx[0].app[*].packetSize = 2500B
*.ueD2DTx[0].app[*].sampling_time = 0.001s
*.ueD2DTx[0].app[*].localPort = 3088+ancestorIndex(0)
*.ueD2DTx[0].app[*].startTime = uniform(0s,0.02s)
Expand Down
18 changes: 9 additions & 9 deletions simulations/LTE/demo/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ description = 4 Ues downloading a video from a server while 2 of them having a v
**.ue2*.macCellId = 2

# VoIP source config
**.ue11.app[1].PacketSize = 40B
**.ue11.app[1].packetSize = 40B
**.ue11.app[1].destAddress = "ue22"
**.ue11.app[1].destPort = 1000
**.ue11.app[1].localPort = 3088
Expand Down Expand Up @@ -139,7 +139,7 @@ network = simu5g.simulations.LTE.networks.SingleCell
*.ue[*].app[*].typename = "VoIPReceiver"
*.ue[*].app[0].localPort = 3000

*.server.app[*].PacketSize = 40B
*.server.app[*].packetSize = 40B
*.server.app[*].destAddress = "ue["+string(ancestorIndex(0))+"]" # obtain the address of the client by reading its index in the array of udp Apps
*.server.app[*].destPort = 3000
*.server.app[*].localPort = 3088+ancestorIndex(0)
Expand Down Expand Up @@ -189,7 +189,7 @@ network = simu5g.simulations.LTE.networks.SingleCell
*.server.app[0..24].typename = "VoIPReceiver"
*.server.app[0..24].localPort = 4000+ancestorIndex(0)

*.ue[*].app[1].PacketSize = 40B
*.ue[*].app[1].packetSize = 40B
*.ue[*].app[1].destAddress = "server"
*.ue[*].app[1].destPort = 4000+ancestorIndex(1)
*.ue[*].app[1].localPort = 4088
Expand All @@ -202,7 +202,7 @@ network = simu5g.simulations.LTE.networks.SingleCell
*.ue[*].app[0].localPort = 3000

*.server.app[25..].typename = "VoIPSender"
*.server.app[25..].PacketSize = 40B
*.server.app[25..].packetSize = 40B
*.server.app[25..].destAddress = "ue["+string(ancestorIndex(0)-25)+"]"
*.server.app[25..].destPort = 3000
*.server.app[25..].localPort = 3088+ancestorIndex(0)
Expand Down Expand Up @@ -256,7 +256,7 @@ sim-time-limit=20s
*.ue[*].app[0].localPort = 3000

*.server.app[*].typename = "VoIPSender"
*.server.app[*].PacketSize = 40B
*.server.app[*].packetSize = 40B
*.server.app[*].destAddress = "ue["+string(ancestorIndex(0))+"]" # obtain the address of the client by reading its index in the array of udp Apps
*.server.app[*].destPort = 3000
*.server.app[*].localPort = 3088+ancestorIndex(0)
Expand Down Expand Up @@ -296,7 +296,7 @@ sim-time-limit=20s
*.server.app[*].typename = "VoIPReceiver"
*.server.app[*].localPort = 3000+ancestorIndex(0)

*.ue[*].app[*].PacketSize = 40B
*.ue[*].app[*].packetSize = 40B
# obtain the address of the client by reading its index in the array of udp Apps
*.ue[*].app[*].destAddress = "server"
*.ue[*].app[*].destPort = 3000+ancestorIndex(1)
Expand Down Expand Up @@ -331,7 +331,7 @@ description = Constant BitRate (CBR) uplink scenario
**.ue[*].app[*].startTime = uniform(0s, 0.02s)
**.ue[*].app[*].finishTime = ${cbrEnd}
**.ue[*].app[*].sampling_time = 0.02s
**.ue[*].app[*].PacketSize = 100B
**.ue[*].app[*].packetSize = 100B

**.server.app[*].typename = "CbrReceiver"
**.server.app[*].localPort = 3000+ancestorIndex(0)
Expand Down Expand Up @@ -364,7 +364,7 @@ description = Constant BitRate (CBR) downlink scenario
**.server.app[*].startTime = uniform(0s, 0.02s)
**.server.app[*].finishTime = ${cbrEnd}
**.server.app[*].sampling_time = 0.02s
**.server.app[*].PacketSize = 100B
**.server.app[*].packetSize = 100B



Expand All @@ -389,7 +389,7 @@ seed-set = ${repetition}
**.schedulingDisciplineDl = ${sched="PF","MAXCI"}

**.numUe = ${numUEs=50,100,150}
*.server.app[*].PacketSize = ${pktSize=30B,40B,50B,60B}
*.server.app[*].packetSize = ${pktSize=30B,40B,50B,60B}

*.server.numApps = ${numUEs}

Expand Down
2 changes: 1 addition & 1 deletion simulations/LTE/multicell/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ seed-set = ${repetition}
*.ue*.app[*].typename = "VoIPReceiver"
*.ue*.app[0].localPort = 3000

*.server.app[*].PacketSize = 40B
*.server.app[*].packetSize = 40B
*.server.app[0].destAddress = "ue11"
*.server.app[1].destAddress = "ue12"
*.server.app[2].destAddress = "ue21"
Expand Down
8 changes: 4 additions & 4 deletions simulations/NR/bgTraffic/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ description = "CBR Downlink (standalone, with background traffic)"
*.ue[*].app[0].localPort = 3000

*.server.app[*].typename = "CbrSender"
*.server.app[*].PacketSize = ${msgLen=1000B}
*.server.app[*].packetSize = ${msgLen=1000B}
*.server.app[*].sampling_time = ${sndInt=0.01s}
*.server.app[*].destAddress = "ue[0]"
*.server.app[*].startTime = uniform(0s,0.05s)
Expand Down Expand Up @@ -200,7 +200,7 @@ description = "CBR Uplink (standalone, with background traffic)"

*.ue[*].app[*].typename = "CbrSender"
*.ue[*].app[*].destAddress = "server"
*.ue[*].app[*].PacketSize = ${msgLen=1000B}
*.ue[*].app[*].packetSize = ${msgLen=1000B}
*.ue[*].app[*].sampling_time = ${sndInt=0.01s}
*.ue[*].app[*].startTime = uniform(0s,0.05s)
*.ue[*].app[*].finishTime = 19s
Expand Down Expand Up @@ -246,7 +246,7 @@ description = "CBR Downlink and Uplink (standalone, with background traffic)"
*.ue[*].app[0].localPort = 3000

*.server.app[0].typename = "CbrSender"
*.server.app[0].PacketSize = ${msgLen=1000B}
*.server.app[0].packetSize = ${msgLen=1000B}
*.server.app[0].sampling_time = ${sndInt=0.01s}
*.server.app[0].destAddress = "ue[0]"
*.server.app[0].destPort = 3000
Expand All @@ -261,7 +261,7 @@ description = "CBR Downlink and Uplink (standalone, with background traffic)"
*.ue[*].app[1].typename = "CbrSender"
*.ue[*].app[1].destAddress = "server"
*.ue[*].app[1].destPort = 3001
*.ue[*].app[1].PacketSize = ${msgLen}
*.ue[*].app[1].packetSize = ${msgLen}
*.ue[*].app[1].sampling_time = ${sndInt}
*.ue[*].app[1].startTime = uniform(0s,0.05s)
*.ue[*].app[1].finishTime = 19s
Expand Down
6 changes: 3 additions & 3 deletions simulations/NR/d2d/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ extends=SinglePair
# Traffic between UEs (ueD2DTx[0] --> ueD2DRx[0])
# Transmitter
*.ueD2DTx[0].app[*].typename = "CbrSender"
*.ueD2DTx[0].app[*].PacketSize = 1000B
*.ueD2DTx[0].app[*].packetSize = 1000B
*.ueD2DTx[0].app[*].sampling_time = 0.01s
*.ueD2DTx[0].app[*].localPort = 3088+ancestorIndex(0)
*.ueD2DTx[0].app[*].startTime = uniform(0s,0.02s)
Expand Down Expand Up @@ -221,7 +221,7 @@ extends=MultiplePairs
# Traffic between pairs of UEs (e.g. ueD2DTx[0] --> ueD2DRx[0] )
# Transmitters
*.ueD2DTx[*].app[*].typename = "CbrSender"
*.ueD2DTx[*].app[*].PacketSize = 1000B
*.ueD2DTx[*].app[*].packetSize = 1000B
*.ueD2DTx[*].app[*].sampling_time = 0.01s
*.ueD2DTx[*].app[*].localPort = 3088+ancestorIndex(0)
*.ueD2DTx[*].app[*].startTime = uniform(0s,0.02s)
Expand Down Expand Up @@ -422,7 +422,7 @@ extends=SinglePair-modeSwitching
# Traffic between UEs (ueD2DTx[0] --> ueD2DRx[0])
# Transmitter
*.ueD2DTx[0].app[*].typename = "CbrSender"
*.ueD2DTx[0].app[*].PacketSize = 1000B
*.ueD2DTx[0].app[*].packetSize = 1000B
*.ueD2DTx[0].app[*].sampling_time = 0.01s
*.ueD2DTx[0].app[*].localPort = 3088+ancestorIndex(0)
*.ueD2DTx[0].app[*].startTime = uniform(0s,0.02s)
Expand Down
2 changes: 1 addition & 1 deletion simulations/NR/dualConnectivity/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ description = "Base configuration, do not run this config!"
*.ue[*].app[*].localPort = 3000+ancestorIndex(0)

*.server.app[*].typename = "VoIPSender"
*.server.app[*].PacketSize = 40B
*.server.app[*].packetSize = 40B
*.server.app[*].destAddress = "ue[0]" # obtain the address of the client by reading its index in the array of udp Apps
*.server.app[*].localPort = 3088+ancestorIndex(0)
*.server.app[*].destPort = 3000+ancestorIndex(0)
Expand Down
10 changes: 5 additions & 5 deletions simulations/NR/dualConnectivity_multicell/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ description = "one CBR downlink connection - if gNB out of range, use eNB"
*.server.app[*].destAddress = "ue[" + string(ancestorIndex(0)) + "]" # obtain the address of the client by reading its index in the array of apps
*.server.app[*].localPort = 3088+ancestorIndex(0)
*.server.app[*].destPort = 3000
*.server.app[*].PacketSize = 1000B
*.server.app[*].packetSize = 1000B
*.server.app[*].sampling_time = 0.05s
*.server.app[*].startTime = uniform(0.02s, 0.05s)
*.server.app[*].finishTime = 39.9s
Expand Down Expand Up @@ -204,7 +204,7 @@ description = "one CBR uplink connection - if gNB out of range, use eNB"

*.ue[*].app[*].typename = "CbrSender"
*.ue[*].app[*].destAddress = "server"
*.ue[*].app[*].PacketSize = 1000B
*.ue[*].app[*].packetSize = 1000B
*.ue[*].app[*].sampling_time = 0.05s
*.ue[*].app[*].localPort = 3088
*.ue[*].app[*].destPort = 3000
Expand Down Expand Up @@ -236,7 +236,7 @@ description = "two CBR downlink connections - one via eNodeB, one via gNodeB"
*.server.app[*].destAddress = "ue[0]" # obtain the address of the client by reading its index in the array of apps
*.server.app[*].localPort = 3088+ancestorIndex(0)
*.server.app[*].destPort = 3000+ancestorIndex(0)
*.server.app[*].PacketSize = 1000B
*.server.app[*].packetSize = 1000B
*.server.app[*].sampling_time = 0.05s
*.server.app[*].startTime = uniform(0.02s, 0.05s)
*.server.app[*].finishTime = 39.9s
Expand Down Expand Up @@ -266,7 +266,7 @@ description = "two CBR uplink connections - one via eNodeB, one via gNodeB"

*.ue[*].app[*].typename = "CbrSender"
*.ue[*].app[*].destAddress = "server"
*.ue[*].app[*].PacketSize = 1000B
*.ue[*].app[*].packetSize = 1000B
*.ue[*].app[*].sampling_time = 0.05s
*.ue[*].app[*].localPort = 3088+ancestorIndex(0)
*.ue[*].app[*].destPort = 3000+ancestorIndex(0)
Expand Down Expand Up @@ -300,7 +300,7 @@ description = "one CBR downlink, split bearer"
*.server.app[*].destAddress = "ue[" + string(ancestorIndex(0)) + "]" # obtain the address of the client by reading its index in the array of apps
*.server.app[*].localPort = 3088+ancestorIndex(0)
*.server.app[*].destPort = 3000
*.server.app[*].PacketSize = 1000B
*.server.app[*].packetSize = 1000B
*.server.app[*].sampling_time = 0.05s
*.server.app[*].startTime = uniform(0.02s, 0.05s)
*.server.app[*].finishTime = 39.9s
Expand Down
4 changes: 2 additions & 2 deletions simulations/NR/standalone/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ extends=Standalone
*.ue[*].app[*].typename = "VoIPReceiver"
*.ue[*].app[0].localPort = 3000

*.server.app[*].PacketSize = 40B
*.server.app[*].packetSize = 40B
*.server.app[*].destAddress = "ue[0]" # obtain the address of the client by reading its index in the array of udp Apps
*.server.app[*].localPort = 3088+ancestorIndex(0)
*.server.app[*].typename = "VoIPSender"
Expand All @@ -108,7 +108,7 @@ extends=Standalone
*.server.app[*].typename = "VoIPReceiver"
*.server.app[*].localPort = 3000+ancestorIndex(0)

*.ue[*].app[*].PacketSize = 40B
*.ue[*].app[*].packetSize = 40B
# obtain the address of the client by reading its index in the array of udp Apps
*.ue[*].app[*].destAddress = "server"
*.ue[*].app[*].localPort = 3088+ancestorIndex(0)
Expand Down
4 changes: 2 additions & 2 deletions simulations/NR/standalone_multicell/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ description = "CBR DL traffic from remote server to UEs"
*.ue[*].app[*].localPort = 3000

*.server.app[*].typename = "CbrSender"
*.server.app[*].PacketSize = 100B
*.server.app[*].packetSize = 100B
*.server.app[*].sampling_time = 0.02s
*.server.app[*].destAddress = "ue[" + string(ancestorIndex(0)) + "]"
*.server.app[*].destPort = 3000
Expand Down Expand Up @@ -142,7 +142,7 @@ description = "CBR UL traffic from UEs to remote server"
*.server.app[*].localPort = 3000 + ancestorIndex(0)

*.ue[*].app[*].typename = "CbrSender"
*.ue[*].app[*].PacketSize = 100B
*.ue[*].app[*].packetSize = 100B
*.ue[*].app[*].sampling_time = 0.02s
*.ue[*].app[*].destAddress = "server"
*.ue[*].app[*].destPort = 3000 + ancestorIndex(1)
Expand Down
4 changes: 2 additions & 2 deletions simulations/NR/test_multiCarrier/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ output-vector-file = ${resultdir}/${configname}/${iterationvars}-${repetition}.v
*.server.app[*].localPort = 3088+ancestorIndex(0)
*.server.app[*].typename = "CbrSender"
*.server.app[*].startTime = uniform(0.01s,0.02s)
*.server.app[*].PacketSize = 2000B
*.server.app[*].packetSize = 2000B
#------------------------------------#


Expand All @@ -110,7 +110,7 @@ output-vector-file = ${resultdir}/${configname}/${iterationvars}-${repetition}.v
*.ue[*].app[*].destPort = 1000+ancestorIndex(1)
*.ue[*].app[*].typename = "CbrSender"
*.ue[*].app[*].startTime = uniform(0s,0.02s)
*.ue[*].app[*].PacketSize = 2000B
*.ue[*].app[*].packetSize = 2000B
#------------------------------------#

#------------------------------------#
Expand Down
2 changes: 1 addition & 1 deletion simulations/NR/test_tdd/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ network = simu5g.simulations.NR.networks.SingleCell_withSecondaryGnb
*.ue[*].app[*].typename = "CbrReceiver"
*.ue[*].app[0].localPort = 10000

*.server.app[*].PacketSize = 3000B
*.server.app[*].packetSize = 3000B
*.server.app[*].sampling_time = 0.001s
*.server.app[*].destAddress = "ue["+string(ancestorIndex(0))+"]" # obtain the address of the client by reading its index in the array of udp Apps
*.server.app[*].destPort = 10000
Expand Down
2 changes: 1 addition & 1 deletion simulations/NR/tutorial/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ output-vector-file = ${resultdir}/${configname}/${repetition}.vec
*.ue[*].app[*].localPort = 1000

*.server.app[*].typename = "CbrSender"
*.server.app[*].PacketSize = 1000B # send 800 Kb/s
*.server.app[*].packetSize = 1000B # send 800 Kb/s
*.server.app[*].sampling_time = 0.01s
*.server.app[*].destAddress = "ue["+string(ancestorIndex(0))+"]" # obtain the address of the client by reading its index in the array of Apps
*.server.app[*].destPort = 1000
Expand Down
2 changes: 1 addition & 1 deletion src/apps/cbr/CbrSender.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void CbrSender::initialize(int stage)
nframesTmp_ = 0;
iDframe_ = 0;
timestamp_ = 0;
size_ = par("PacketSize");
size_ = par("packetSize");
sampling_time = par("sampling_time");
localPort_ = par("localPort");
destPort_ = par("destPort");
Expand Down
2 changes: 1 addition & 1 deletion src/apps/cbr/CbrSender.ned
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ simple CbrSender like IApp
int localPort = default(-1);
int destPort = default(3000);
string destAddress;
int PacketSize @unit(B) = default(40B);
int packetSize @unit(B) = default(40B);
double sampling_time @unit("s") = default(0.02s);
double startTime @unit("s") = default(0s);
double finishTime @unit("s") = default(0s);
Expand Down
2 changes: 1 addition & 1 deletion src/apps/mec/MecApps/MecAppBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct HttpMessageStatus
HttpBaseMessage *currentMessage = nullptr;
std::string bufferedData;
cQueue httpMessageQueue;
ProcessingTimeMessage* processMsgTimer;
ProcessingTimeMessage* processMsgTimer = nullptr;
};

class MecAppBase : public omnetpp::cSimpleModule, public inet::TcpSocket::ICallback
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ simple MecRequestBackgroundApp like IMECApp, IApp
bool allocateHostResources = default(false);

int packetSize @unit(B) = default(10B);
string interfaceTableModule = default("");

int mecAppIndex = default(0);
int mecAppId = default(0); // it will be override by getId() in initialize
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ simple MecRequestBackgroundGeneratorApp like IMECApp, IApp
bool allocateHostResources = default(false);

int packetSize @unit(B) = default(10B);
string interfaceTableModule = default("");

int mecAppIndex = default(0);
int mecAppId = default(0); // it will be override by getId() in initialize
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ simple MecRequestForegroundApp like IMECApp, IApp
bool allocateHostResources = default(false);

int packetSize @unit(B) = default(10B);
string interfaceTableModule = default("");
int mecAppIndex = default(0);
int mecAppId = default(0); // it will be override by getId() in initialize
int localUePort = default(0); // not used in MecRequestBackgroundGeneratorApp
Expand Down
1 change: 0 additions & 1 deletion src/apps/mec/MecRequestResponseApp/MECResponseApp.ned
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ simple MECResponseApp like IMECApp, IApp
@display("i=block/app;is=s");

int responsePacketSize @unit(B) = default(50B);
string interfaceTableModule = default("");
int mecAppIndex;
int mecAppId;
int localUePort;
Expand Down
6 changes: 2 additions & 4 deletions src/apps/mec/MecRequestResponseApp/UERequestApp.ned
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ simple UERequestApp like IApp

//connection infos
int localPort = default(4000);
int deviceAppPort = default(4000); // ipAddress of the DeviceApp
string deviceAppAddress; // port of the DeviceApp
int deviceAppPort = default(4000); // port of the DeviceApp
string deviceAppAddress; // ipAddress of the DeviceApp

int requestPacketSize @unit(B) = default(10B);

Expand All @@ -39,8 +39,6 @@ simple UERequestApp like IApp

string mecAppName = default("MecResponseApp");

string interfaceTableModule;

// stats

@signal[responseTime];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,18 @@ void MecRTVideoStreamingReceiver::handleUeMessage(omnetpp::cMessage *msg)
{
ueAppModule_ = L3AddressResolver().findHostWithAddress(ueAppAddress)->getSubmodule("app",1);

e2eDelaySegment_ = ueAppModule_->registerSignal("rtVideoStreamingEnd2endDelaySegment");
segmentSize_ = ueAppModule_->registerSignal("rtVideoStreamingSegmentPacketSize");
frameSize_ = ueAppModule_->registerSignal("rtVideoStreamingFrameSize");
playoutBufferLength_ = ueAppModule_->registerSignal("rtVideoStreamingPlayoutBufferLength");
playoutDelayTime_ = ueAppModule_->registerSignal("rtVideoStreamingPlayoutDelay");
playoutDelayTimeAll_ = ueAppModule_->registerSignal("rtVideoStreamingPlayoutDelayAll");
segmentLoss_ = ueAppModule_->registerSignal("rtVideoStreamingSegmentLoss");
interArrTime_ = ueAppModule_->registerSignal("rtVideoStreamingInterArrivalTimeSegment");
frameDisplayed_ = ueAppModule_->registerSignal("rtVideoStreamingFramesDisplayed");

startSession_ = ueAppModule_->registerSignal("rtVideoStreamingStartSession");
stopSession_ = ueAppModule_->registerSignal("rtVideoStreamingStopSession");
e2eDelaySegment_ = registerSignal("rtVideoStreamingEnd2endDelaySegment");
segmentSize_ = registerSignal("rtVideoStreamingSegmentPacketSize");
frameSize_ = registerSignal("rtVideoStreamingFrameSize");
playoutBufferLength_ = registerSignal("rtVideoStreamingPlayoutBufferLength");
playoutDelayTime_ = registerSignal("rtVideoStreamingPlayoutDelay");
playoutDelayTimeAll_ = registerSignal("rtVideoStreamingPlayoutDelayAll");
segmentLoss_ = registerSignal("rtVideoStreamingSegmentLoss");
interArrTime_ = registerSignal("rtVideoStreamingInterArrivalTimeSegment");
frameDisplayed_ = registerSignal("rtVideoStreamingFramesDisplayed");

startSession_ = registerSignal("rtVideoStreamingStartSession");
stopSession_ = registerSignal("rtVideoStreamingStopSession");
}

auto mecPk = pk->peekAtFront<RealTimeVideoStreamingAppPacket>();
Expand Down
Loading
Loading