diff --git a/NOTICE.md b/NOTICE.md
index 65c6105660f8d084b5c5365434c92b2195155c55..96b5d4c552ed9752d8a8ba396c9c4df4293dc34b 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -4,7 +4,7 @@ For more details of the license, refer to [LICENSE](LICENSE) file in the same di
However, the source code also contains third party software that is acknowledged here for reference.
-## Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/liblfds6.1.1/ ##
+## Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/ ##
See on [liblfds website](https://liblfds.org/) the license section.
diff --git a/ci-scripts/.gitignore b/ci-scripts/.gitignore
index d77a672c0c57e050ddc87037492ffa5cb474cea7..dc5e7c747645122e82e4e54a31492151d629680b 100644
--- a/ci-scripts/.gitignore
+++ b/ci-scripts/.gitignore
@@ -5,3 +5,5 @@ iperf_*.*
phones_list.txt
modules_list.txt
test_results*.html
+pMain*
+__pycache__
diff --git a/ci-scripts/Jenkinsfile-inria-r2lab b/ci-scripts/Jenkinsfile-inria-r2lab
index 3c4dddae8b39ba6817507dec0ccd6739d91f466a..ca6893dc4ff36d7711c37b2b02739ed848ee029f 100644
--- a/ci-scripts/Jenkinsfile-inria-r2lab
+++ b/ci-scripts/Jenkinsfile-inria-r2lab
@@ -142,13 +142,39 @@ pipeline {
stage ("Load Images") {
steps {
script {
+ // Adding a tempo after booking leases
+ sh "sleep 10"
+ sh "ssh -t inria_oaici@faraday.inria.fr 'rleases --check'"
+ sh "ssh -t inria_oaici@faraday.inria.fr 'all-off'"
+ sh "sleep 10"
+
echo '\u2705 \u001B[32mLoad Image for Python Executor\u001B[0m'
- sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labPythonExeIdx} > /dev/null 2>&1'"
- sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labPythonExeIdx}'"
+ try {
+ //sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labPythonExeIdx} > /dev/null 2>&1'"
+ sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labPythonExeIdx}'"
+ } catch (Exception e) {
+ echo "Why is it wrong?"
+ }
+ try {
+ //sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labPythonExeIdx}'"
+ sh "ssh -t inria_oaici@faraday.inria.fr 'rwait ${r2labPythonExeIdx}'"
+ } catch (Exception e) {
+ echo "Why is it wrong?"
+ }
echo '\u2705 \u001B[32mLoad Image for two (2) eNBs\u001B[0m'
- sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labENB0Idx},${r2labENB1Idx} > /dev/null 2>&1'"
- sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labENB0Idx},${r2labENB1Idx}'"
+ try {
+ //sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labENB0Idx},${r2labENB1Idx} > /dev/null 2>&1'"
+ sh "ssh -t inria_oaici@faraday.inria.fr 'rload -i oai-ci-cd-u18-lowlatency-enb-ue ${r2labENB0Idx},${r2labENB1Idx}"
+ } catch (Exception e) {
+ echo "Why is it wrong?"
+ }
+ try {
+ //sh "ssh -t inria_oaici@faraday.inria.fr 'rwait --silent ${r2labENB0Idx},${r2labENB1Idx}'"
+ sh "ssh -t inria_oaici@faraday.inria.fr 'rwait ${r2labENB0Idx},${r2labENB1Idx}'"
+ } catch (Exception e) {
+ echo "Why is it wrong?"
+ }
sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx},${r2labENB1Idx}'"
sh "sleep 5"
sh "ssh -t inria_oaici@faraday.inria.fr 'uon ${r2labENB0Idx},${r2labENB1Idx}'"
diff --git a/ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf
index fbb8c5d6f871bf0b091cfe00f0857ed520e4367c..de58950df4eed9883c9d63229d92620fbebb618c 100644
--- a/ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band17.tm1.mbms.25PRB.usrpb210.conf
@@ -288,7 +288,7 @@ MCEs = (
mnc_length = 2;
}
service_id=0;
- lcid=8; #this must be properly defined lcid:8+service:0 -> rab_id:8
+ lcid=5; #this must be properly defined lcid:8+service:0 -> rab_id:5
}
);
}
diff --git a/ci-scripts/constants.py b/ci-scripts/constants.py
new file mode 100644
index 0000000000000000000000000000000000000000..1e7e84fb32af9a694992f8b54f3f9bbb43278c66
--- /dev/null
+++ b/ci-scripts/constants.py
@@ -0,0 +1,71 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements. See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# * contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+# Required Python Version
+# Python 3.x
+#
+# Required Python Package
+# pexpect
+#---------------------------------------------------------------------
+
+#-----------------------------------------------------------
+# Version
+#-----------------------------------------------------------
+Version = '0.2'
+
+#-----------------------------------------------------------
+# Constants
+#-----------------------------------------------------------
+ALL_PROCESSES_OK = 0
+ENB_PROCESS_FAILED = -1
+ENB_PROCESS_OK = +1
+ENB_PROCESS_SEG_FAULT = -11
+ENB_PROCESS_ASSERTION = -12
+ENB_PROCESS_REALTIME_ISSUE = -13
+ENB_PROCESS_NOLOGFILE_TO_ANALYZE = -14
+ENB_PROCESS_SLAVE_RRU_NOT_SYNCED = -15
+HSS_PROCESS_FAILED = -2
+HSS_PROCESS_OK = +2
+MME_PROCESS_FAILED = -3
+MME_PROCESS_OK = +3
+SPGW_PROCESS_FAILED = -4
+SPGW_PROCESS_OK = +4
+UE_IP_ADDRESS_ISSUE = -5
+OAI_UE_PROCESS_NOLOGFILE_TO_ANALYZE = -20
+OAI_UE_PROCESS_COULD_NOT_SYNC = -21
+OAI_UE_PROCESS_ASSERTION = -22
+OAI_UE_PROCESS_FAILED = -23
+OAI_UE_PROCESS_NO_TUNNEL_INTERFACE = -24
+OAI_UE_PROCESS_SEG_FAULT = -25
+OAI_UE_PROCESS_OK = +6
+
+UE_STATUS_DETACHED = 0
+UE_STATUS_DETACHING = 1
+UE_STATUS_ATTACHING = 2
+UE_STATUS_ATTACHED = 3
+
+X2_HO_REQ_STATE__IDLE = 0
+X2_HO_REQ_STATE__TARGET_RECEIVES_REQ = 1
+X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE = 2
+X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ = 3
+X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK = 10
diff --git a/ci-scripts/cppcheck_suppressions.list b/ci-scripts/cppcheck_suppressions.list
index 4536f5731561dcca5ba7a39fef6f56e14689e91d..cad2aab88b4374811490153c509e941b2a2e4e57 100644
--- a/ci-scripts/cppcheck_suppressions.list
+++ b/ci-scripts/cppcheck_suppressions.list
@@ -76,6 +76,11 @@ nullPointer:common/utils/T/local_tracer.c:243
// first iteration of the loop
nullPointer:common/utils/T/tracer/multi.c:264
nullPointer:common/utils/T/tracer/multi.c:265
+//-----------------------------------------------------------------------------
+// this file is used for testing the RLC V2 implementation, this error is
+// not a problem, the programmer has to know what she does when writing
+// the tests
+arrayIndexOutOfBounds:openair2/LAYER2/rlc_v2/tests/test.c:401
//
//*****************************************************************************
//
diff --git a/ci-scripts/epc.py b/ci-scripts/epc.py
new file mode 100644
index 0000000000000000000000000000000000000000..4926f2d6e880a4dd82cee104afcdc0e107ad2527
--- /dev/null
+++ b/ci-scripts/epc.py
@@ -0,0 +1,397 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements. See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# * contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+# Required Python Version
+# Python 3.x
+#
+# Required Python Package
+# pexpect
+#---------------------------------------------------------------------
+
+#-----------------------------------------------------------
+# Import
+#-----------------------------------------------------------
+import sys # arg
+import re # reg
+import logging
+import os
+import time
+import signal
+
+from multiprocessing import Process, Lock, SimpleQueue
+
+#-----------------------------------------------------------
+# OAI Testing modules
+#-----------------------------------------------------------
+import sshconnection as SSH
+import helpreadme as HELP
+import constants as CONST
+import html
+
+#-----------------------------------------------------------
+# Class Declaration
+#-----------------------------------------------------------
+class EPCManagement():
+
+ def __init__(self):
+
+ self.IPAddress = ''
+ self.UserName = ''
+ self.Password = ''
+ self.SourceCodePath = ''
+ self.Type = ''
+ self.PcapFileName = ''
+ self.htmlObj = None
+
+#-----------------------------------------------------------
+# Setter and Getters on Public Members
+#-----------------------------------------------------------
+
+ def SetIPAddress(self, ipaddress):
+ self.IPAddress = ipaddress
+ def GetIPAddress(self):
+ return self.IPAddress
+ def SetUserName(self, username):
+ self.UserName = username
+ def GetUserName(self):
+ return self.UserName
+ def SetPassword(self, password):
+ self.Password = password
+ def GetPassword(self):
+ return self.Password
+ def SetSourceCodePath(self, sourcecodepath):
+ self.SourceCodePath = sourcecodepath
+ def GetSourceCodePath(self):
+ return self.SourceCodePath
+ def SetType(self, kind):
+ self.Type = kind
+ def GetType(self):
+ return self.Type
+ def SetHtmlObj(self, obj):
+ self.htmlObj = obj
+
+#-----------------------------------------------------------
+# EPC management functions
+#-----------------------------------------------------------
+
+ def InitializeHSS(self):
+ if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
+ HELP.GenericHelp(CONST.Version)
+ HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
+ sys.exit('Insufficient EPC Parameters')
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ logging.debug('Using the OAI EPC Release 14 Cassandra-based HSS')
+ mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
+ logging.debug('\u001B[1m Launching tshark on all interfaces \u001B[0m')
+ self.PcapFileName = 'epc_' + self.testCase_id + '.pcap'
+ mySSH.command('echo ' + self.Password + ' | sudo -S rm -f ' + self.PcapFileName, '\$', 5)
+ mySSH.command('echo $USER; nohup sudo tshark -f "tcp port not 22 and port not 53" -i any -w ' + self.SourceCodePath + '/scripts/' + self.PcapFileName + ' > /tmp/tshark.log 2>&1 &', self.UserName, 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S mkdir -p logs', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S rm -f hss_' + self.testCase_id + '.log logs/hss*.*', '\$', 5)
+ mySSH.command('echo "oai_hss -j /usr/local/etc/oai/hss_rel14.json" > ./my-hss.sh', '\$', 5)
+ mySSH.command('chmod 755 ./my-hss.sh', '\$', 5)
+ mySSH.command('sudo daemon --unsafe --name=hss_daemon --chdir=' + self.SourceCodePath + '/scripts -o ' + self.SourceCodePath + '/scripts/hss_' + self.testCase_id + '.log ./my-hss.sh', '\$', 5)
+ elif re.match('OAI', self.Type, re.IGNORECASE):
+ logging.debug('Using the OAI EPC HSS')
+ mySSH.command('cd ' + self.SourceCodePath, '\$', 5)
+ mySSH.command('source oaienv', '\$', 5)
+ mySSH.command('cd scripts', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S ./run_hss 2>&1 | stdbuf -o0 awk \'{ print strftime("[%Y/%m/%d %H:%M:%S] ",systime()) $0 }\' | stdbuf -o0 tee -a hss_' + self.testCase_id + '.log &', 'Core state: 2 -> 3', 35)
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ logging.debug('Using the ltebox simulated HSS')
+ mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
+ mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
+ mySSH.command('cd /opt/hss_sim0609', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S rm -f hss.log', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S echo "Starting sudo session" && sudo su -c "screen -dm -S simulated_hss ./starthss"', '\$', 5)
+ else:
+ logging.error('This option should not occur!')
+ mySSH.close()
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
+
+ def InitializeMME(self):
+ if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
+ HELP.GenericHelp(CONST.Version)
+ HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
+ sys.exit('Insufficient EPC Parameters')
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ logging.debug('Using the OAI EPC Release 14 MME')
+ mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S rm -f mme_' + self.testCase_id + '.log', '\$', 5)
+ mySSH.command('echo "./run_mme --config-file /usr/local/etc/oai/mme.conf --set-virt-if" > ./my-mme.sh', '\$', 5)
+ mySSH.command('chmod 755 ./my-mme.sh', '\$', 5)
+ mySSH.command('sudo daemon --unsafe --name=mme_daemon --chdir=' + self.SourceCodePath + '/scripts -o ' + self.SourceCodePath + '/scripts/mme_' + self.testCase_id + '.log ./my-mme.sh', '\$', 5)
+ elif re.match('OAI', self.Type, re.IGNORECASE):
+ mySSH.command('cd ' + self.SourceCodePath, '\$', 5)
+ mySSH.command('source oaienv', '\$', 5)
+ mySSH.command('cd scripts', '\$', 5)
+ mySSH.command('stdbuf -o0 hostname', '\$', 5)
+ result = re.search('hostname\\\\r\\\\n(?P<host_name>[a-zA-Z0-9\-\_]+)\\\\r\\\\n', mySSH.getBefore())
+ if result is None:
+ logging.debug('\u001B[1;37;41m Hostname Not Found! \u001B[0m')
+ sys.exit(1)
+ host_name = result.group('host_name')
+ mySSH.command('echo ' + self.Password + ' | sudo -S ./run_mme 2>&1 | stdbuf -o0 tee -a mme_' + self.testCase_id + '.log &', 'MME app initialization complete', 100)
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ mySSH.command('cd /opt/ltebox/tools', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S ./start_mme', '\$', 5)
+ else:
+ logging.error('This option should not occur!')
+ mySSH.close()
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
+
+ def InitializeSPGW(self):
+ if self.IPAddress == '' or self.UserName == '' or self.Password == '' or self.SourceCodePath == '' or self.Type == '':
+ HELP.GenericHelp(CONST.Version)
+ HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
+ sys.exit('Insufficient EPC Parameters')
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ logging.debug('Using the OAI EPC Release 14 SPGW-CUPS')
+ mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S rm -f spgwc_' + self.testCase_id + '.log spgwu_' + self.testCase_id + '.log', '\$', 5)
+ mySSH.command('echo "spgwc -c /usr/local/etc/oai/spgw_c.conf" > ./my-spgwc.sh', '\$', 5)
+ mySSH.command('chmod 755 ./my-spgwc.sh', '\$', 5)
+ mySSH.command('sudo daemon --unsafe --name=spgwc_daemon --chdir=' + self.SourceCodePath + '/scripts -o ' + self.SourceCodePath + '/scripts/spgwc_' + self.testCase_id + '.log ./my-spgwc.sh', '\$', 5)
+ time.sleep(5)
+ mySSH.command('echo "spgwu -c /usr/local/etc/oai/spgw_u.conf" > ./my-spgwu.sh', '\$', 5)
+ mySSH.command('chmod 755 ./my-spgwu.sh', '\$', 5)
+ mySSH.command('sudo daemon --unsafe --name=spgwu_daemon --chdir=' + self.SourceCodePath + '/scripts -o ' + self.SourceCodePath + '/scripts/spgwu_' + self.testCase_id + '.log ./my-spgwu.sh', '\$', 5)
+ elif re.match('OAI', self.Type, re.IGNORECASE):
+ mySSH.command('cd ' + self.SourceCodePath, '\$', 5)
+ mySSH.command('source oaienv', '\$', 5)
+ mySSH.command('cd scripts', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S ./run_spgw 2>&1 | stdbuf -o0 tee -a spgw_' + self.testCase_id + '.log &', 'Initializing SPGW-APP task interface: DONE', 30)
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ mySSH.command('cd /opt/ltebox/tools', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S ./start_xGw', '\$', 5)
+ else:
+ logging.error('This option should not occur!')
+ mySSH.close()
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow(self.Type, 'OK', CONST.ALL_PROCESSES_OK)
+
+ def CheckHSSProcess(self, status_queue):
+ try:
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ mySSH.command('stdbuf -o0 ps -aux | grep --color=never hss | grep -v grep', '\$', 5)
+ if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ result = re.search('oai_hss -j', mySSH.getBefore())
+ elif re.match('OAI', self.Type, re.IGNORECASE):
+ result = re.search('\/bin\/bash .\/run_', mySSH.getBefore())
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ result = re.search('hss_sim s6as diam_hss', mySSH.getBefore())
+ else:
+ logging.error('This should not happen!')
+ if result is None:
+ logging.debug('\u001B[1;37;41m HSS Process Not Found! \u001B[0m')
+ status_queue.put(CONST.HSS_PROCESS_FAILED)
+ else:
+ status_queue.put(CONST.HSS_PROCESS_OK)
+ mySSH.close()
+ except:
+ os.kill(os.getppid(),signal.SIGUSR1)
+
+ def CheckMMEProcess(self, status_queue):
+ try:
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ mySSH.command('stdbuf -o0 ps -aux | grep --color=never mme | grep -v grep', '\$', 5)
+ if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ result = re.search('mme -c', mySSH.getBefore())
+ elif re.match('OAI', self.Type, re.IGNORECASE):
+ result = re.search('\/bin\/bash .\/run_', mySSH.getBefore())
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ result = re.search('mme', mySSH.getBefore())
+ else:
+ logging.error('This should not happen!')
+ if result is None:
+ logging.debug('\u001B[1;37;41m MME Process Not Found! \u001B[0m')
+ status_queue.put(CONST.MME_PROCESS_FAILED)
+ else:
+ status_queue.put(CONST.MME_PROCESS_OK)
+ mySSH.close()
+ except:
+ os.kill(os.getppid(),signal.SIGUSR1)
+
+ def CheckSPGWProcess(self, status_queue):
+ try:
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ mySSH.command('stdbuf -o0 ps -aux | grep --color=never spgw | grep -v grep', '\$', 5)
+ result = re.search('spgwu -c ', mySSH.getBefore())
+ elif re.match('OAI', self.Type, re.IGNORECASE):
+ mySSH.command('stdbuf -o0 ps -aux | grep --color=never spgw | grep -v grep', '\$', 5)
+ result = re.search('\/bin\/bash .\/run_', mySSH.getBefore())
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ mySSH.command('stdbuf -o0 ps -aux | grep --color=never xGw | grep -v grep', '\$', 5)
+ result = re.search('xGw', mySSH.getBefore())
+ else:
+ logging.error('This should not happen!')
+ if result is None:
+ logging.debug('\u001B[1;37;41m SPGW Process Not Found! \u001B[0m')
+ status_queue.put(CONST.SPGW_PROCESS_FAILED)
+ else:
+ status_queue.put(CONST.SPGW_PROCESS_OK)
+ mySSH.close()
+ except:
+ os.kill(os.getppid(),signal.SIGUSR1)
+
+ def TerminateHSS(self):
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT oai_hss || true', '\$', 5)
+ time.sleep(2)
+ mySSH.command('stdbuf -o0 ps -aux | grep hss | grep -v grep', '\$', 5)
+ result = re.search('oai_hss -j', mySSH.getBefore())
+ if result is not None:
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL oai_hss || true', '\$', 5)
+ mySSH.command('rm -f ' + self.SourceCodePath + '/scripts/my-hss.sh', '\$', 5)
+ elif re.match('OAI', self.Type, re.IGNORECASE):
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT run_hss oai_hss || true', '\$', 5)
+ time.sleep(2)
+ mySSH.command('stdbuf -o0 ps -aux | grep hss | grep -v grep', '\$', 5)
+ result = re.search('\/bin\/bash .\/run_', mySSH.getBefore())
+ if result is not None:
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL run_hss oai_hss || true', '\$', 5)
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ mySSH.command('cd ' + self.SourceCodePath, '\$', 5)
+ mySSH.command('cd scripts', '\$', 5)
+ time.sleep(1)
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL hss_sim', '\$', 5)
+ else:
+ logging.error('This should not happen!')
+ mySSH.close()
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+
+ def TerminateMME(self):
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ if re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT run_mme mme || true', '\$', 5)
+ time.sleep(2)
+ mySSH.command('stdbuf -o0 ps -aux | grep mme | grep -v grep', '\$', 5)
+ result = re.search('mme -c', mySSH.getBefore())
+ if result is not None:
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL run_mme mme || true', '\$', 5)
+ mySSH.command('rm -f ' + self.SourceCodePath + '/scripts/my-mme.sh', '\$', 5)
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ mySSH.command('cd /opt/ltebox/tools', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S ./stop_mme', '\$', 5)
+ else:
+ logging.error('This should not happen!')
+ mySSH.close()
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+
+ def TerminateSPGW(self):
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT spgwc spgwu || true', '\$', 5)
+ time.sleep(2)
+ mySSH.command('stdbuf -o0 ps -aux | grep spgw | grep -v grep', '\$', 5)
+ result = re.search('spgwc -c |spgwu -c ', mySSH.getBefore())
+ if result is not None:
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL spgwc spgwu || true', '\$', 5)
+ mySSH.command('rm -f ' + self.SourceCodePath + '/scripts/my-spgw*.sh', '\$', 5)
+ mySSH.command('stdbuf -o0 ps -aux | grep tshark | grep -v grep', '\$', 5)
+ result = re.search('-w ', mySSH.getBefore())
+ if result is not None:
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT tshark || true', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S chmod 666 ' + self.SourceCodePath + '/scripts/*.pcap', '\$', 5)
+ elif re.match('OAI', self.Type, re.IGNORECASE):
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGINT run_spgw spgw || true', '\$', 5)
+ time.sleep(2)
+ mySSH.command('stdbuf -o0 ps -aux | grep spgw | grep -v grep', '\$', 5)
+ result = re.search('\/bin\/bash .\/run_', mySSH.getBefore())
+ if result is not None:
+ mySSH.command('echo ' + self.Password + ' | sudo -S killall --signal SIGKILL run_spgw spgw || true', '\$', 5)
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ mySSH.command('cd /opt/ltebox/tools', '\$', 5)
+ mySSH.command('echo ' + self.Password + ' | sudo -S ./stop_xGw', '\$', 5)
+ else:
+ logging.error('This should not happen!')
+ mySSH.close()
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+
+ def LogCollectHSS(self):
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
+ mySSH.command('rm -f hss.log.zip', '\$', 5)
+ if re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ mySSH.command('zip hss.log.zip hss*.log', '\$', 60)
+ mySSH.command('echo ' + self.Password + ' | sudo -S rm hss*.log', '\$', 5)
+ if re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ mySSH.command('zip hss.log.zip logs/hss*.* *.pcap', '\$', 60)
+ mySSH.command('echo ' + self.Password + ' | sudo -S rm -f logs/hss*.* *.pcap', '\$', 5)
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ mySSH.command('cp /opt/hss_sim0609/hss.log .', '\$', 60)
+ mySSH.command('zip hss.log.zip hss.log', '\$', 60)
+ else:
+ logging.error('This option should not occur!')
+ mySSH.close()
+
+ def LogCollectMME(self):
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
+ mySSH.command('rm -f mme.log.zip', '\$', 5)
+ if re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ mySSH.command('zip mme.log.zip mme*.log', '\$', 60)
+ mySSH.command('echo ' + self.Password + ' | sudo -S rm mme*.log', '\$', 5)
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ mySSH.command('cp /opt/ltebox/var/log/*Log.0 .', '\$', 5)
+ mySSH.command('zip mme.log.zip mmeLog.0 s1apcLog.0 s1apsLog.0 s11cLog.0 libLog.0 s1apCodecLog.0', '\$', 60)
+ else:
+ logging.error('This option should not occur!')
+ mySSH.close()
+
+ def LogCollectSPGW(self):
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.IPAddress, self.UserName, self.Password)
+ mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
+ mySSH.command('rm -f spgw.log.zip', '\$', 5)
+ if re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
+ mySSH.command('zip spgw.log.zip spgw*.log', '\$', 60)
+ mySSH.command('echo ' + self.Password + ' | sudo -S rm spgw*.log', '\$', 5)
+ elif re.match('ltebox', self.Type, re.IGNORECASE):
+ mySSH.command('cp /opt/ltebox/var/log/xGwLog.0 .', '\$', 5)
+ mySSH.command('zip spgw.log.zip xGwLog.0', '\$', 60)
+ else:
+ logging.error('This option should not occur!')
+ mySSH.close()
+
diff --git a/ci-scripts/helpreadme.py b/ci-scripts/helpreadme.py
new file mode 100644
index 0000000000000000000000000000000000000000..4b58c77510d72ed314e3e90c876d11abb55e49aa
--- /dev/null
+++ b/ci-scripts/helpreadme.py
@@ -0,0 +1,81 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements. See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# * contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+# Required Python Version
+# Python 3.x
+#
+# Required Python Package
+# pexpect
+#---------------------------------------------------------------------
+
+#-----------------------------------------------------------
+# Functions Declaration
+#-----------------------------------------------------------
+
+def GenericHelp(vers):
+ print('----------------------------------------------------------------------------------------------------------------------')
+ print('main.py Ver: ' + vers)
+ print('----------------------------------------------------------------------------------------------------------------------')
+ print('python main.py [options]')
+ print(' --help Show this help.')
+ print(' --mode=[Mode]')
+ print(' TesteNB')
+ print(' InitiateHtml, FinalizeHtml')
+ print(' TerminateeNB, TerminateUE, TerminateHSS, TerminateMME, TerminateSPGW')
+ print(' LogCollectBuild, LogCollecteNB, LogCollectHSS, LogCollectMME, LogCollectSPGW, LogCollectPing, LogCollectIperf')
+
+def GitSrvHelp(repository,branch,commit,mergeallow,targetbranch):
+ print(' --ranRepository=[OAI RAN Repository URL] -- ' + repository)
+ print(' --ranBranch=[OAI RAN Repository Branch] -- ' + branch)
+ print(' --ranCommitID=[OAI RAN Repository Commit SHA-1] -- ' + commit)
+ print(' --ranAllowMerge=[Allow Merge Request (with target branch) (true or false)] -- ' + mergeallow)
+ print(' --ranTargetBranch=[Target Branch in case of a Merge Request] -- ' + targetbranch)
+
+def eNBSrvHelp(ipaddr, username, password, sourcepath):
+ print(' --eNBIPAddress=[eNB\'s IP Address] -- ' + ipaddr)
+ print(' --eNBUserName=[eNB\'s Login User Name] -- ' + username)
+ print(' --eNBPassword=[eNB\'s Login Password] -- ' + password)
+ print(' --eNBSourceCodePath=[eNB\'s Source Code Path] -- ' + sourcepath)
+
+def OAIUESrvHelp(ipaddr, username, password, sourcepath):
+ print(' --UEIPAddress=[UE\'s IP Address] -- ' + ipaddr)
+ print(' --UEUserName=[UE\'s Login User Name] -- ' + username)
+ print(' --UEPassword=[UE\'s Login Password] -- ' + password)
+ print(' --UESourceCodePath=[UE\'s Source Code Path] -- ' + sourcepath)
+
+def EPCSrvHelp(ipaddr, username, password, sourcepath, epctype):
+ print(' --EPCIPAddress=[EPC\'s IP Address] -- ' + ipaddr)
+ print(' --EPCUserName=[EPC\'s Login User Name] -- ' + username)
+ print(' --EPCPassword=[EPC\'s Login Password] -- ' + password)
+ print(' --EPCSourceCodePath=[EPC\'s Source Code Path] -- ' + sourcepath)
+ print(' --EPCType=[EPC\'s Type: OAI or ltebox or OAI-Rel14-CUPS] -- ' + epctype)
+
+def ADBSrvHelp(ipaddr, username, password):
+ print(' --ADBIPAddress=[ADB\'s IP Address] -- ' + ipaddr)
+ print(' --ADBUserName=[ADB\'s Login User Name] -- ' + username)
+ print(' --ADBPassword=[ADB\'s Login Password] -- ' + password)
+
+def XmlHelp(filename):
+ print(' --XMLTestFile=[XML Test File to be run] -- ' + filename)
+ print(' Note: multiple xml files can be specified (--XMLFile=File1 ... --XMLTestFile=FileN) when HTML headers are created ("InitiateHtml" mode)')
+
diff --git a/ci-scripts/html.py b/ci-scripts/html.py
new file mode 100644
index 0000000000000000000000000000000000000000..3d0c8f3897d56693e6e31037c6a37d9701ecd2c0
--- /dev/null
+++ b/ci-scripts/html.py
@@ -0,0 +1,476 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements. See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# * contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+# Required Python Version
+# Python 3.x
+#
+# Required Python Package
+# pexpect
+#---------------------------------------------------------------------
+
+#-----------------------------------------------------------
+# Import
+#-----------------------------------------------------------
+import sys # arg
+import re # reg
+import logging
+import os
+import time
+import subprocess
+from multiprocessing import Process, Lock, SimpleQueue
+
+import constants as CONST
+
+#-----------------------------------------------------------
+# Class Declaration
+#-----------------------------------------------------------
+class HTMLManagement():
+
+ def __init__(self):
+
+ self.htmlFile = ''
+ self.htmlHeaderCreated = False
+ self.htmlFooterCreated = False
+
+ self.ranRepository = ''
+ self.ranBranch = ''
+ self.ranCommitID = ''
+ self.ranAllowMerge = False
+ self.ranTargetBranch = ''
+
+ self.nbTestXMLfiles = 0
+ self.htmlTabRefs = []
+ self.htmlTabNames = []
+ self.htmlTabIcons = []
+ self.testXMLfiles = []
+
+ self.htmleNBFailureMsg = ''
+ self.htmlUEFailureMsg = ''
+
+ self.startTime = int(round(time.time() * 1000))
+ self.testCase_id = ''
+ self.desc = ''
+
+ self.OsVersion = ['', '']
+ self.KernelVersion = ['', '']
+ self.UhdVersion = ['', '']
+ self.UsrpBoard = ['', '']
+ self.CpuNb = ['', '']
+ self.CpuModel = ['', '']
+ self.CpuMHz = ['', '']
+
+#-----------------------------------------------------------
+# Setters and Getters
+#-----------------------------------------------------------
+ def SethtmlUEFailureMsg(self,huefa):
+ self.htmlUEFailureMsg = huefa
+ def GethtmlUEFailureMsg(self):
+ return self.htmlUEFailureMsg
+ def SetHmleNBFailureMsg(self, msg):
+ self.htmleNBFailureMsg = msg
+
+ def Setdesc(self, dsc):
+ self.desc = dsc
+
+ def SetstartTime(self, sttime):
+ self.startTime = sttime
+
+ def SettestCase_id(self, tcid):
+ self.testCase_id = tcid
+ def GettestCase_id(self):
+ return self.testCase_id
+
+ def SetranRepository(self, repository):
+ self.ranRepository = repository
+ def SetranAllowMerge(self, merge):
+ self.ranAllowMerge = merge
+ def SetranBranch(self, branch):
+ self.ranBranch = branch
+ def SetranCommitID(self, commitid):
+ self.ranCommitID = commitid
+ def SetranTargetBranch(self, tbranch):
+ self.ranTargetBranch = tbranch
+
+ def SethtmlUEConnected(self, nbUEs):
+ self.htmlUEConnected = nbUEs
+ def SethtmlNb_Smartphones(self, nbUEs):
+ self.htmlNb_Smartphones = nbUEs
+ def SethtmlNb_CATM_Modules(self, nbUEs):
+ self.htmlNb_CATM_Modules = nbUEs
+
+ def SetnbTestXMLfiles(self, nb):
+ self.nbTestXMLfiles = nb
+ def GetnbTestXMLfiles(self):
+ return self.nbTestXMLfiles
+
+ def SettestXMLfiles(self, xmlFile):
+ self.testXMLfiles.append(xmlFile)
+ def SethtmlTabRefs(self, tabRef):
+ self.htmlTabRefs.append(tabRef)
+ def SethtmlTabNames(self, tabName):
+ self.htmlTabNames.append(tabName)
+ def SethtmlTabIcons(self, tabIcon):
+ self.htmlTabIcons.append(tabIcon)
+
+ def SetOsVersion(self, version, idx):
+ self.OsVersion[idx] = version
+ def SetKernelVersion(self, version, idx):
+ self.KernelVersion[idx] = version
+ def SetUhdVersion(self, version, idx):
+ self.UhdVersion[idx] = version
+ def SetUsrpBoard(self, version, idx):
+ self.UsrpBoard[idx] = version
+ def SetCpuNb(self, nb, idx):
+ self.CpuNb[idx] = nb
+ def SetCpuModel(self, model, idx):
+ self.CpuModel[idx] = model
+ def SetCpuMHz(self, freq, idx):
+ self.CpuMHz[idx] = freq
+
+#-----------------------------------------------------------
+# HTML structure creation functions
+#-----------------------------------------------------------
+
+
+ def CreateHtmlHeader(self, ADBIPAddress):
+ if (not self.htmlHeaderCreated):
+ logging.debug('\u001B[1m----------------------------------------\u001B[0m')
+ logging.debug('\u001B[1m Creating HTML header \u001B[0m')
+ logging.debug('\u001B[1m----------------------------------------\u001B[0m')
+ self.htmlFile = open('test_results.html', 'w')
+ self.htmlFile.write('<!DOCTYPE html>\n')
+ self.htmlFile.write('<html class="no-js" lang="en-US">\n')
+ self.htmlFile.write('<head>\n')
+ self.htmlFile.write(' <meta name="viewport" content="width=device-width, initial-scale=1">\n')
+ self.htmlFile.write(' <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">\n')
+ self.htmlFile.write(' <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>\n')
+ self.htmlFile.write(' <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>\n')
+ self.htmlFile.write(' <title>Test Results for TEMPLATE_JOB_NAME job build #TEMPLATE_BUILD_ID</title>\n')
+ self.htmlFile.write('</head>\n')
+ self.htmlFile.write('<body><div class="container">\n')
+ self.htmlFile.write(' <br>\n')
+ self.htmlFile.write(' <table style="border-collapse: collapse; border: none;">\n')
+ self.htmlFile.write(' <tr style="border-collapse: collapse; border: none;">\n')
+ self.htmlFile.write(' <td style="border-collapse: collapse; border: none;">\n')
+ self.htmlFile.write(' <a href="http://www.openairinterface.org/">\n')
+ self.htmlFile.write(' <img src="http://www.openairinterface.org/wp-content/uploads/2016/03/cropped-oai_final_logo2.png" alt="" border="none" height=50 width=150>\n')
+ self.htmlFile.write(' </img>\n')
+ self.htmlFile.write(' </a>\n')
+ self.htmlFile.write(' </td>\n')
+ self.htmlFile.write(' <td style="border-collapse: collapse; border: none; vertical-align: center;">\n')
+ self.htmlFile.write(' <b><font size = "6">Job Summary -- Job: TEMPLATE_JOB_NAME -- Build-ID: TEMPLATE_BUILD_ID</font></b>\n')
+ self.htmlFile.write(' </td>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.write(' </table>\n')
+ self.htmlFile.write(' <br>\n')
+ self.htmlFile.write(' <div class="alert alert-info"><strong> <span class="glyphicon glyphicon-dashboard"></span> TEMPLATE_STAGE_NAME</strong></div>\n')
+ self.htmlFile.write(' <table border = "1">\n')
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-time"></span> Build Start Time (UTC) </td>\n')
+ self.htmlFile.write(' <td>TEMPLATE_BUILD_TIME</td>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-cloud-upload"></span> GIT Repository </td>\n')
+ self.htmlFile.write(' <td><a href="' + self.ranRepository + '">' + self.ranRepository + '</a></td>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-wrench"></span> Job Trigger </td>\n')
+ if (self.ranAllowMerge):
+ self.htmlFile.write(' <td>Merge-Request</td>\n')
+ else:
+ self.htmlFile.write(' <td>Push to Branch</td>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.write(' <tr>\n')
+ if (self.ranAllowMerge):
+ self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Source Branch </td>\n')
+ else:
+ self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tree-deciduous"></span> Branch</td>\n')
+ self.htmlFile.write(' <td>' + self.ranBranch + '</td>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.write(' <tr>\n')
+ if (self.ranAllowMerge):
+ self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Source Commit ID </td>\n')
+ else:
+ self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
+ self.htmlFile.write(' <td>' + self.ranCommitID + '</td>\n')
+ self.htmlFile.write(' </tr>\n')
+ if self.ranAllowMerge != '':
+ commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.ranCommitID, shell=True, universal_newlines=True)
+ commit_message = commit_message.strip()
+ self.htmlFile.write(' <tr>\n')
+ if (self.ranAllowMerge):
+ self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Source Commit Message </td>\n')
+ else:
+ self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')
+ self.htmlFile.write(' <td>' + commit_message + '</td>\n')
+ self.htmlFile.write(' </tr>\n')
+ if (self.ranAllowMerge):
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-in"></span> Target Branch </td>\n')
+ if (self.ranTargetBranch == ''):
+ self.htmlFile.write(' <td>develop</td>\n')
+ else:
+ self.htmlFile.write(' <td>' + self.ranTargetBranch + '</td>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.write(' </table>\n')
+
+ if (ADBIPAddress != 'none'):
+ self.htmlFile.write(' <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(self.htmlNb_Smartphones) + ' UE(s) is(are) connected to ADB bench server</h2>\n')
+ self.htmlFile.write(' <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(self.htmlNb_CATM_Modules) + ' CAT-M UE(s) is(are) connected to bench server</h2>\n')
+ else:
+ self.htmlUEConnected = 1
+ self.htmlFile.write(' <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> 1 OAI UE(s) is(are) connected to CI bench</h2>\n')
+ self.htmlFile.write(' <br>\n')
+ self.htmlFile.write(' <ul class="nav nav-pills">\n')
+ count = 0
+ while (count < self.nbTestXMLfiles):
+ pillMsg = ' <li><a data-toggle="pill" href="#'
+ pillMsg += self.htmlTabRefs[count]
+ pillMsg += '">'
+ pillMsg += '__STATE_' + self.htmlTabNames[count] + '__'
+ pillMsg += self.htmlTabNames[count]
+ pillMsg += ' <span class="glyphicon glyphicon-'
+ pillMsg += self.htmlTabIcons[count]
+ pillMsg += '"></span></a></li>\n'
+ self.htmlFile.write(pillMsg)
+ count += 1
+ self.htmlFile.write(' </ul>\n')
+ self.htmlFile.write(' <div class="tab-content">\n')
+ self.htmlFile.close()
+
+ def CreateHtmlTabHeader(self):
+ if (not self.htmlHeaderCreated):
+ if (not os.path.isfile('test_results.html')):
+ self.CreateHtmlHeader('none')
+ self.htmlFile = open('test_results.html', 'a')
+ if (self.nbTestXMLfiles == 1):
+ self.htmlFile.write(' <div id="' + self.htmlTabRefs[0] + '" class="tab-pane fade">\n')
+ self.htmlFile.write(' <h3>Test Summary for <span class="glyphicon glyphicon-file"></span> ' + self.testXMLfiles[0] + '</h3>\n')
+ else:
+ self.htmlFile.write(' <div id="build-tab" class="tab-pane fade">\n')
+ self.htmlFile.write(' <table class="table" border = "1">\n')
+ self.htmlFile.write(' <tr bgcolor = "#33CCFF" >\n')
+ self.htmlFile.write(' <th>Relative Time (ms)</th>\n')
+ self.htmlFile.write(' <th>Test Id</th>\n')
+ self.htmlFile.write(' <th>Test Desc</th>\n')
+ self.htmlFile.write(' <th>Test Options</th>\n')
+ self.htmlFile.write(' <th>Test Status</th>\n')
+
+ i = 0
+ while (i < self.htmlUEConnected):
+ self.htmlFile.write(' <th>UE' + str(i) + ' Status</th>\n')
+ i += 1
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.close()
+ self.htmlHeaderCreated = True
+
+ def CreateHtmlTabFooter(self, passStatus):
+ if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
+ self.htmlFile = open('test_results.html', 'a')
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <th bgcolor = "#33CCFF" colspan=3>Final Tab Status</th>\n')
+ if passStatus:
+ self.htmlFile.write(' <th bgcolor = "green" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">PASS <span class="glyphicon glyphicon-ok"></span> </font></th>\n')
+ else:
+ self.htmlFile.write(' <th bgcolor = "red" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.write(' </table>\n')
+ self.htmlFile.write(' </div>\n')
+ self.htmlFile.close()
+ time.sleep(1)
+ if passStatus:
+ cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__//' test_results.html"
+ subprocess.run(cmd, shell=True)
+ else:
+ cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__/<span class=\"glyphicon glyphicon-remove\"><\/span>/' test_results.html"
+ subprocess.run(cmd, shell=True)
+ self.htmlFooterCreated = False
+
+ def CreateHtmlFooter(self, passStatus):
+ if (os.path.isfile('test_results.html')):
+ self.htmlFile = open('test_results.html', 'a')
+ self.htmlFile.write('</div>\n')
+ self.htmlFile.write(' <p></p>\n')
+ self.htmlFile.write(' <table class="table table-condensed">\n')
+
+ machines = [ 'eNB', 'UE' ]
+ for machine in machines:
+ if machine == 'eNB':
+ idx = 0
+ else:
+ idx = 1
+ if self.OsVersion[idx] == '':
+ continue
+
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <th colspan=8>' + str('eNB') + ' Server Characteristics</th>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <td>OS Version</td>\n')
+ self.htmlFile.write(' <td><span class="label label-default">' + self.OsVersion[idx] + '</span></td>\n')
+ self.htmlFile.write(' <td>Kernel Version</td>\n')
+ self.htmlFile.write(' <td><span class="label label-default">' + self.KernelVersion[idx] + '</span></td>\n')
+ self.htmlFile.write(' <td>UHD Version</td>\n')
+ self.htmlFile.write(' <td><span class="label label-default">' + self.UhdVersion[idx] + '</span></td>\n')
+ self.htmlFile.write(' <td>USRP Board</td>\n')
+ self.htmlFile.write(' <td><span class="label label-default">' + self.UsrpBoard[idx] + '</span></td>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <td>Nb CPUs</td>\n')
+ self.htmlFile.write(' <td><span class="label label-default">' + self.CpuNb[idx] + '</span></td>\n')
+ self.htmlFile.write(' <td>CPU Model Name</td>\n')
+ self.htmlFile.write(' <td><span class="label label-default">' + self.CpuModel[idx] + '</span></td>\n')
+ self.htmlFile.write(' <td>CPU Frequency</td>\n')
+ self.htmlFile.write(' <td><span class="label label-default">' + self.CpuMHz[idx] + '</span></td>\n')
+ self.htmlFile.write(' <td></td>\n')
+ self.htmlFile.write(' <td></td>\n')
+ self.htmlFile.write(' </tr>\n')
+
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <th colspan=5 bgcolor = "#33CCFF">Final Status</th>\n')
+ if passStatus:
+ self.htmlFile.write(' <th colspan=3 bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>\n')
+ else:
+ self.htmlFile.write(' <th colspan=3 bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.write(' </table>\n')
+ self.htmlFile.write(' <p></p>\n')
+ self.htmlFile.write(' <div class="well well-lg">End of Test Report -- Copyright <span class="glyphicon glyphicon-copyright-mark"></span> 2018 <a href="http://www.openairinterface.org/">OpenAirInterface</a>. All Rights Reserved.</div>\n')
+ self.htmlFile.write('</div></body>\n')
+ self.htmlFile.write('</html>\n')
+ self.htmlFile.close()
+
+ def CreateHtmlRetrySeparator(self, cntnumfails):
+ if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
+ self.htmlFile = open('test_results.html', 'a')
+ self.htmlFile.write(' <tr bgcolor = "#F0F0F0" >\n')
+ self.htmlFile.write(' <td colspan=' + str(5+self.htmlUEConnected) + '><b> ---- Try Run #' + str(cntnumfails) + ' ---- </b></td>\n')
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.close()
+
+ def CreateHtmlTestRow(self, options, status, processesStatus, machine='eNB'):
+ if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
+ return
+ self.htmlFile = open('test_results.html', 'a')
+ currentTime = int(round(time.time() * 1000)) - self.startTime
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
+ self.htmlFile.write(' <td bgcolor = "lightcyan" >' + self.testCase_id + '</td>\n')
+ self.htmlFile.write(' <td>' + self.desc + '</td>\n')
+ self.htmlFile.write(' <td>' + str(options) + '</td>\n')
+ if (str(status) == 'OK'):
+ self.htmlFile.write(' <td bgcolor = "lightgreen" >' + str(status) + '</td>\n')
+ elif (str(status) == 'KO'):
+ if (processesStatus == 0):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >' + str(status) + '</td>\n')
+ elif (processesStatus == CONST.ENB_PROCESS_FAILED):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - eNB process not found</td>\n')
+ elif (processesStatus == CONST.OAI_UE_PROCESS_FAILED):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - OAI UE process not found</td>\n')
+ elif (processesStatus == CONST.ENB_PROCESS_SEG_FAULT) or (processesStatus == CONST.OAI_UE_PROCESS_SEG_FAULT):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Segmentation Fault</td>\n')
+ elif (processesStatus == CONST.ENB_PROCESS_ASSERTION) or (processesStatus == CONST.OAI_UE_PROCESS_ASSERTION):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Assertion</td>\n')
+ elif (processesStatus == CONST.ENB_PROCESS_REALTIME_ISSUE):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - ' + machine + ' process faced Real Time issue(s)</td>\n')
+ elif (processesStatus == CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE) or (processesStatus == CONST.OAI_UE_PROCESS_NOLOGFILE_TO_ANALYZE):
+ self.htmlFile.write(' <td bgcolor = "orange" >OK?</td>\n')
+ elif (processesStatus == CONST.ENB_PROCESS_SLAVE_RRU_NOT_SYNCED):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - ' + machine + ' Slave RRU could not synch</td>\n')
+ elif (processesStatus == CONST.OAI_UE_PROCESS_COULD_NOT_SYNC):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - UE could not sync</td>\n')
+ elif (processesStatus == CONST.HSS_PROCESS_FAILED):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - HSS process not found</td>\n')
+ elif (processesStatus == CONST.MME_PROCESS_FAILED):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - MME process not found</td>\n')
+ elif (processesStatus == CONST.SPGW_PROCESS_FAILED):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - SPGW process not found</td>\n')
+ elif (processesStatus == CONST.UE_IP_ADDRESS_ISSUE):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - Could not retrieve UE IP address</td>\n')
+ else:
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >' + str(status) + '</td>\n')
+ else:
+ self.htmlFile.write(' <td bgcolor = "orange" >' + str(status) + '</td>\n')
+ if (len(str(self.htmleNBFailureMsg)) > 2):
+ cellBgColor = 'white'
+ result = re.search('ended with|faced real time issues', self.htmleNBFailureMsg)
+ if result is not None:
+ cellBgColor = 'red'
+ else:
+ result = re.search('showed|Reestablishment|Could not copy eNB logfile', self.htmleNBFailureMsg)
+ if result is not None:
+ cellBgColor = 'orange'
+ self.htmlFile.write(' <td bgcolor = "' + cellBgColor + '" colspan=' + str(self.htmlUEConnected) + '><pre style="background-color:' + cellBgColor + '">' + self.htmleNBFailureMsg + '</pre></td>\n')
+ self.htmleNBFailureMsg = ''
+ elif (len(str(self.htmlUEFailureMsg)) > 2):
+ cellBgColor = 'white'
+ result = re.search('ended with|faced real time issues', self.htmlUEFailureMsg)
+ if result is not None:
+ cellBgColor = 'red'
+ else:
+ result = re.search('showed|Could not copy UE logfile|oaitun_ue1 interface is either NOT mounted or NOT configured', self.htmlUEFailureMsg)
+ if result is not None:
+ cellBgColor = 'orange'
+ self.htmlFile.write(' <td bgcolor = "' + cellBgColor + '" colspan=' + str(self.htmlUEConnected) + '><pre style="background-color:' + cellBgColor + '">' + self.htmlUEFailureMsg + '</pre></td>\n')
+ self.htmlUEFailureMsg = ''
+ else:
+ i = 0
+ while (i < self.htmlUEConnected):
+ self.htmlFile.write(' <td>-</td>\n')
+ i += 1
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.close()
+
+ def CreateHtmlTestRowQueue(self, options, status, ue_status, ue_queue):
+ if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
+ self.htmlFile = open('test_results.html', 'a')
+ currentTime = int(round(time.time() * 1000)) - self.startTime
+ addOrangeBK = False
+ self.htmlFile.write(' <tr>\n')
+ self.htmlFile.write(' <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
+ self.htmlFile.write(' <td bgcolor = "lightcyan" >' + self.testCase_id + '</td>\n')
+ self.htmlFile.write(' <td>' + self.desc + '</td>\n')
+ self.htmlFile.write(' <td>' + str(options) + '</td>\n')
+ if (str(status) == 'OK'):
+ self.htmlFile.write(' <td bgcolor = "lightgreen" >' + str(status) + '</td>\n')
+ elif (str(status) == 'KO'):
+ self.htmlFile.write(' <td bgcolor = "lightcoral" >' + str(status) + '</td>\n')
+ else:
+ addOrangeBK = True
+ self.htmlFile.write(' <td bgcolor = "orange" >' + str(status) + '</td>\n')
+ i = 0
+ while (i < self.htmlUEConnected):
+ if (i < ue_status):
+ if (not ue_queue.empty()):
+ if (addOrangeBK):
+ self.htmlFile.write(' <td bgcolor = "orange" >' + str(ue_queue.get()).replace('white', 'orange') + '</td>\n')
+ else:
+ self.htmlFile.write(' <td>' + str(ue_queue.get()) + '</td>\n')
+ else:
+ self.htmlFile.write(' <td>-</td>\n')
+ else:
+ self.htmlFile.write(' <td>-</td>\n')
+ i += 1
+ self.htmlFile.write(' </tr>\n')
+ self.htmlFile.close()
+
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 21d51105f85a68558f3259a080dc866a60fbd69f..1e149c40504f055ae6080fef01467f5be3d44aa5 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -1,4 +1,4 @@
-#/*
+
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
@@ -28,47 +28,7 @@
# pexpect
#---------------------------------------------------------------------
-#-----------------------------------------------------------
-# Version
-#-----------------------------------------------------------
-Version = '0.1'
-
-#-----------------------------------------------------------
-# Constants
-#-----------------------------------------------------------
-ALL_PROCESSES_OK = 0
-ENB_PROCESS_FAILED = -1
-ENB_PROCESS_OK = +1
-ENB_PROCESS_SEG_FAULT = -11
-ENB_PROCESS_ASSERTION = -12
-ENB_PROCESS_REALTIME_ISSUE = -13
-ENB_PROCESS_NOLOGFILE_TO_ANALYZE = -14
-ENB_PROCESS_SLAVE_RRU_NOT_SYNCED = -15
-HSS_PROCESS_FAILED = -2
-HSS_PROCESS_OK = +2
-MME_PROCESS_FAILED = -3
-MME_PROCESS_OK = +3
-SPGW_PROCESS_FAILED = -4
-SPGW_PROCESS_OK = +4
-UE_IP_ADDRESS_ISSUE = -5
-OAI_UE_PROCESS_NOLOGFILE_TO_ANALYZE = -20
-OAI_UE_PROCESS_COULD_NOT_SYNC = -21
-OAI_UE_PROCESS_ASSERTION = -22
-OAI_UE_PROCESS_FAILED = -23
-OAI_UE_PROCESS_NO_TUNNEL_INTERFACE = -24
-OAI_UE_PROCESS_SEG_FAULT = -25
-OAI_UE_PROCESS_OK = +6
-
-UE_STATUS_DETACHED = 0
-UE_STATUS_DETACHING = 1
-UE_STATUS_ATTACHING = 2
-UE_STATUS_ATTACHED = 3
-
-X2_HO_REQ_STATE__IDLE = 0
-X2_HO_REQ_STATE__TARGET_RECEIVES_REQ = 1
-X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE = 2
-X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ = 3
-X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK = 10
+import constants as CONST
#-----------------------------------------------------------
# Import
@@ -89,55 +49,27 @@ logging.basicConfig(
format="[%(asctime)s] %(name)s:%(levelname)s: %(message)s"
)
+
#-----------------------------------------------------------
# Class Declaration
#-----------------------------------------------------------
-class SSHConnection():
+class OaiCiTest():
+
def __init__(self):
- self.prematureExit = False
self.ranRepository = ''
self.ranBranch = ''
- self.ranAllowMerge = False
self.ranCommitID = ''
+ self.ranAllowMerge = False
self.ranTargetBranch = ''
- self.eNBIPAddress = ''
- self.eNBUserName = ''
- self.eNBPassword = ''
- self.eNBSourceCodePath = ''
- self.EPCIPAddress = ''
- self.EPCUserName = ''
- self.EPCPassword = ''
- self.eNB1IPAddress = ''
- self.eNB1UserName = ''
- self.eNB1Password = ''
- self.eNB1SourceCodePath = ''
- self.eNB2IPAddress = ''
- self.eNB2UserName = ''
- self.eNB2Password = ''
- self.eNB2SourceCodePath = ''
- self.EPCSourceCodePath = ''
- self.EPCType = ''
- self.EPC_PcapFileName = ''
+
+ self.FailReportCnt = 0
self.ADBIPAddress = ''
self.ADBUserName = ''
self.ADBPassword = ''
self.ADBCentralized = True
self.testCase_id = ''
self.testXMLfiles = []
- self.nbTestXMLfiles = 0
self.desc = ''
- self.Build_eNB_args = ''
- self.backgroundBuild = False
- self.backgroundBuildTestId = ['', '', '']
- self.Build_eNB_forced_workspace_cleanup = False
- self.Initialize_eNB_args = ''
- self.air_interface = 'lte'
- self.eNB_instance = ''
- self.eNB_serverId = ''
- self.eNBLogFiles = ['', '', '']
- self.eNBOptions = ['', '', '']
- self.eNBmbmsEnables = [False, False, False]
- self.eNBstatuses = [-1, -1, -1]
self.ping_args = ''
self.ping_packetloss_threshold = ''
self.iperf_args = ''
@@ -154,30 +86,14 @@ class SSHConnection():
self.UEDevicesRebootCmd = []
self.CatMDevices = []
self.UEIPAddresses = []
- self.htmlFile = ''
- self.htmlHeaderCreated = False
- self.htmlFooterCreated = False
self.htmlUEConnected = -1
- self.htmleNBFailureMsg = ''
- self.htmlUEFailureMsg = ''
- self.picocom_closure = False
self.idle_sleep_time = 0
self.x2_ho_options = 'network'
self.x2NbENBs = 0
self.x2ENBBsIds = []
self.x2ENBConnectedUEs = []
- self.htmlTabRefs = []
- self.htmlTabNames = []
- self.htmlTabIcons = []
self.repeatCounts = []
self.finalStatus = False
- self.OsVersion = ''
- self.KernelVersion = ''
- self.UhdVersion = ''
- self.UsrpBoard = ''
- self.CpuNb = ''
- self.CpuModel = ''
- self.CpuMHz = ''
self.UEIPAddress = ''
self.UEUserName = ''
self.UEPassword = ''
@@ -187,819 +103,192 @@ class SSHConnection():
self.Build_OAI_UE_args = ''
self.Initialize_OAI_UE_args = ''
self.clean_repository = True
- self.flexranCtrlInstalled = False
- self.flexranCtrlStarted = False
self.expectedNbOfConnectedUEs = 0
- self.startTime = 0
-
- def open(self, ipaddress, username, password):
- count = 0
- connect_status = False
- while count < 4:
- self.ssh = pexpect.spawn('ssh', [username + '@' + ipaddress], timeout = 5)
- self.sshresponse = self.ssh.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', 'Last login', pexpect.EOF, pexpect.TIMEOUT])
- if self.sshresponse == 0:
- self.ssh.sendline('yes')
- self.ssh.expect('password:')
- self.ssh.sendline(password)
- self.sshresponse = self.ssh.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if self.sshresponse == 0:
- count = 10
- connect_status = True
- else:
- logging.debug('self.sshresponse = ' + str(self.sshresponse))
- elif self.sshresponse == 1:
- self.ssh.sendline(password)
- self.sshresponse = self.ssh.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if self.sshresponse == 0:
- count = 10
- connect_status = True
- else:
- logging.debug('self.sshresponse = ' + str(self.sshresponse))
- elif self.sshresponse == 2:
- # Checking if we are really on the remote client defined by its IP address
- self.command('stdbuf -o0 ifconfig | egrep --color=never "inet addr:|inet "', '\$', 5)
- result = re.search(str(ipaddress), str(self.ssh.before))
- if result is None:
- self.close()
- else:
- count = 10
- connect_status = True
- else:
- # debug output
- logging.debug(str(self.ssh.before))
- logging.debug('self.sshresponse = ' + str(self.sshresponse))
- # adding a tempo when failure
- if not connect_status:
- time.sleep(1)
- count += 1
- if connect_status:
- pass
- else:
- sys.exit('SSH Connection Failed')
-
- def command(self, commandline, expectedline, timeout):
- logging.debug(commandline)
- self.ssh.timeout = timeout
- self.ssh.sendline(commandline)
- self.sshresponse = self.ssh.expect([expectedline, pexpect.EOF, pexpect.TIMEOUT])
- if self.sshresponse == 0:
- return 0
- elif self.sshresponse == 1:
- logging.debug('\u001B[1;37;41m Unexpected EOF \u001B[0m')
- logging.debug('Expected Line : ' + expectedline)
- logging.debug(str(self.ssh.before))
- sys.exit(self.sshresponse)
- elif self.sshresponse == 2:
- logging.debug('\u001B[1;37;41m Unexpected TIMEOUT \u001B[0m')
- logging.debug('Expected Line : ' + expectedline)
- result = re.search('ping |iperf |picocom', str(commandline))
- if result is None:
- logging.debug(str(self.ssh.before))
- sys.exit(self.sshresponse)
- else:
- return -1
- else:
- logging.debug('\u001B[1;37;41m Unexpected Others \u001B[0m')
- logging.debug('Expected Line : ' + expectedline)
- sys.exit(self.sshresponse)
-
- def close(self):
- self.ssh.timeout = 5
- self.ssh.sendline('exit')
- self.sshresponse = self.ssh.expect([pexpect.EOF, pexpect.TIMEOUT])
- if self.sshresponse == 0:
- pass
- elif self.sshresponse == 1:
- if not self.picocom_closure:
- logging.debug('\u001B[1;37;41m Unexpected TIMEOUT during closing\u001B[0m')
- else:
- logging.debug('\u001B[1;37;41m Unexpected Others during closing\u001B[0m')
-
- def copyin(self, ipaddress, username, password, source, destination):
- count = 0
- copy_status = False
- logging.debug('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination)
- while count < 10:
- scp_spawn = pexpect.spawn('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination, timeout = 100)
- scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if scp_response == 0:
- scp_spawn.sendline('yes')
- scp_spawn.expect('password:')
- scp_spawn.sendline(password)
- scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if scp_response == 0:
- count = 10
- copy_status = True
- else:
- logging.debug('1 - scp_response = ' + str(scp_response))
- elif scp_response == 1:
- scp_spawn.sendline(password)
- scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if scp_response == 0 or scp_response == 3:
- count = 10
- copy_status = True
- else:
- logging.debug('2 - scp_response = ' + str(scp_response))
- elif scp_response == 2:
- count = 10
- copy_status = True
- else:
- logging.debug('3 - scp_response = ' + str(scp_response))
- # adding a tempo when failure
- if not copy_status:
- time.sleep(1)
- count += 1
- if copy_status:
- return 0
- else:
- return -1
-
- def copyout(self, ipaddress, username, password, source, destination):
- count = 0
- copy_status = False
- logging.debug('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination)
- while count < 4:
- scp_spawn = pexpect.spawn('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination, timeout = 100)
- scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if scp_response == 0:
- scp_spawn.sendline('yes')
- scp_spawn.expect('password:')
- scp_spawn.sendline(password)
- scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if scp_response == 0:
- count = 10
- copy_status = True
- else:
- logging.debug('1 - scp_response = ' + str(scp_response))
- elif scp_response == 1:
- scp_spawn.sendline(password)
- scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
- if scp_response == 0 or scp_response == 3:
- count = 10
- copy_status = True
- else:
- logging.debug('2 - scp_response = ' + str(scp_response))
- elif scp_response == 2:
- count = 10
- copy_status = True
- else:
- logging.debug('3 - scp_response = ' + str(scp_response))
- # adding a tempo when failure
- if not copy_status:
- time.sleep(1)
- count += 1
- if copy_status:
- pass
- else:
- sys.exit('SCP failed')
-
- def BuildeNB(self):
- if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
- Usage()
- sys.exit('Insufficient Parameter')
- if self.eNB_serverId == '0':
- lIpAddr = self.eNBIPAddress
- lUserName = self.eNBUserName
- lPassWord = self.eNBPassword
- lSourcePath = self.eNBSourceCodePath
- elif self.eNB_serverId == '1':
- lIpAddr = self.eNB1IPAddress
- lUserName = self.eNB1UserName
- lPassWord = self.eNB1Password
- lSourcePath = self.eNB1SourceCodePath
- elif self.eNB_serverId == '2':
- lIpAddr = self.eNB2IPAddress
- lUserName = self.eNB2UserName
- lPassWord = self.eNB2Password
- lSourcePath = self.eNB2SourceCodePath
- if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
- Usage()
- sys.exit('Insufficient Parameter')
- self.open(lIpAddr, lUserName, lPassWord)
- result = re.search('--gNB', self.Build_eNB_args)
- if result is not None:
- self.air_interface = 'nr'
- else:
- self.air_interface = 'lte'
- if self.Build_eNB_forced_workspace_cleanup:
- self.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15)
- result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
- if result is not None:
- full_ran_repo_name = self.ranRepository
- else:
- full_ran_repo_name = self.ranRepository + '.git'
- self.command('mkdir -p ' + lSourcePath, '\$', 5)
- self.command('cd ' + lSourcePath, '\$', 5)
- self.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
- # Raphael: here add a check if git clone or git fetch went smoothly
- self.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
- self.command('git config user.name "OAI Jenkins"', '\$', 5)
- # Checking the BUILD INFO file
- if not self.backgroundBuild:
- self.command('ls *.txt', '\$', 5)
- result = re.search('LAST_BUILD_INFO', str(self.ssh.before))
- if result is not None:
- mismatch = False
- self.command('grep SRC_COMMIT LAST_BUILD_INFO.txt', '\$', 2)
- result = re.search(self.ranCommitID, str(self.ssh.before))
- if result is None:
- mismatch = True
- self.command('grep MERGED_W_TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
- if (self.ranAllowMerge):
- result = re.search('YES', str(self.ssh.before))
- if result is None:
- mismatch = True
- self.command('grep TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
- if self.ranTargetBranch == '':
- result = re.search('develop', str(self.ssh.before))
- else:
- result = re.search(self.ranTargetBranch, str(self.ssh.before))
- if result is None:
- mismatch = True
- else:
- result = re.search('NO', str(self.ssh.before))
- if result is None:
- mismatch = True
- if not mismatch:
- self.close()
- self.CreateHtmlTestRow(self.Build_eNB_args, 'OK', ALL_PROCESSES_OK)
- return
-
- self.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
- # if the commit ID is provided use it to point to it
- if self.ranCommitID != '':
- self.command('git checkout -f ' + self.ranCommitID, '\$', 5)
- # if the branch is not develop, then it is a merge request and we need to do
- # the potential merge. Note that merge conflicts should already been checked earlier
- if (self.ranAllowMerge):
- if self.ranTargetBranch == '':
- if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
- self.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
- else:
- logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
- self.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
- self.command('source oaienv', '\$', 5)
- self.command('cd cmake_targets', '\$', 5)
- self.command('mkdir -p log', '\$', 5)
- self.command('chmod 777 log', '\$', 5)
- # no need to remove in log (git clean did the trick)
- if self.backgroundBuild:
- self.command('echo "./build_oai ' + self.Build_eNB_args + '" > ./my-lte-softmodem-build.sh', '\$', 5)
- self.command('chmod 775 ./my-lte-softmodem-build.sh', '\$', 5)
- self.command('echo ' + lPassWord + ' | sudo -S -E daemon --inherit --unsafe --name=build_enb_daemon --chdir=' + lSourcePath + '/cmake_targets -o ' + lSourcePath + '/cmake_targets/compile_oai_enb.log ./my-lte-softmodem-build.sh', '\$', 5)
- self.close()
- self.CreateHtmlTestRow(self.Build_eNB_args, 'OK', ALL_PROCESSES_OK)
- self.backgroundBuildTestId[int(self.eNB_instance)] = self.testCase_id
- return
- self.command('stdbuf -o0 ./build_oai ' + self.Build_eNB_args + ' 2>&1 | stdbuf -o0 tee compile_oai_enb.log', 'Bypassing the Tests|build have failed', 1500)
- self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.testCase_id)
-
- def WaitBuildeNBisFinished(self):
- if self.eNB_serverId == '0':
- lIpAddr = self.eNBIPAddress
- lUserName = self.eNBUserName
- lPassWord = self.eNBPassword
- lSourcePath = self.eNBSourceCodePath
- elif self.eNB_serverId == '1':
- lIpAddr = self.eNB1IPAddress
- lUserName = self.eNB1UserName
- lPassWord = self.eNB1Password
- lSourcePath = self.eNB1SourceCodePath
- elif self.eNB_serverId == '2':
- lIpAddr = self.eNB2IPAddress
- lUserName = self.eNB2UserName
- lPassWord = self.eNB2Password
- lSourcePath = self.eNB2SourceCodePath
- if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
- Usage()
- sys.exit('Insufficient Parameter')
- self.open(lIpAddr, lUserName, lPassWord)
- count = 40
- buildOAIprocess = True
- while (count > 0) and buildOAIprocess:
- self.command('ps aux | grep --color=never build_ | grep -v grep', '\$', 3)
- result = re.search('build_oai', str(self.ssh.before))
- if result is None:
- buildOAIprocess = False
- else:
- count -= 1
- time.sleep(30)
- self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)])
-
- def checkBuildeNB(self, lIpAddr, lUserName, lPassWord, lSourcePath, testcaseId):
- self.command('cd ' + lSourcePath + '/cmake_targets', '\$', 3)
- self.command('ls ran_build/build', '\$', 3)
- self.command('ls ran_build/build', '\$', 3)
- if self.air_interface == 'nr':
- nodeB_prefix = 'g'
- else:
- nodeB_prefix = 'e'
- buildStatus = True
- result = re.search(self.air_interface + '-softmodem', str(self.ssh.before))
- if result is None:
- buildStatus = False
- else:
- # Generating a BUILD INFO file
- self.command('echo "SRC_BRANCH: ' + self.ranBranch + '" > ../LAST_BUILD_INFO.txt', '\$', 2)
- self.command('echo "SRC_COMMIT: ' + self.ranCommitID + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
- if (self.ranAllowMerge):
- self.command('echo "MERGED_W_TGT_BRANCH: YES" >> ../LAST_BUILD_INFO.txt', '\$', 2)
- if self.ranTargetBranch == '':
- self.command('echo "TGT_BRANCH: develop" >> ../LAST_BUILD_INFO.txt', '\$', 2)
- else:
- self.command('echo "TGT_BRANCH: ' + self.ranTargetBranch + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
- else:
- self.command('echo "MERGED_W_TGT_BRANCH: NO" >> ../LAST_BUILD_INFO.txt', '\$', 2)
- self.command('mkdir -p build_log_' + testcaseId, '\$', 5)
- self.command('mv log/* ' + 'build_log_' + testcaseId, '\$', 5)
- self.command('mv compile_oai_enb.log ' + 'build_log_' + testcaseId, '\$', 5)
- if self.eNB_serverId != '0':
- self.command('cd cmake_targets', '\$', 5)
- self.command('if [ -e tmp_build' + testcaseId + '.zip ]; then rm -f tmp_build' + testcaseId + '.zip; fi', '\$', 5)
- self.command('zip -r -qq tmp_build' + testcaseId + '.zip build_log_' + testcaseId, '\$', 5)
- self.close()
- if (os.path.isfile('./tmp_build' + testcaseId + '.zip')):
- os.remove('./tmp_build' + testcaseId + '.zip')
- self.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/tmp_build' + testcaseId + '.zip', '.')
- if (os.path.isfile('./tmp_build' + testcaseId + '.zip')):
- self.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './tmp_build' + testcaseId + '.zip', self.eNBSourceCodePath + '/cmake_targets/.')
- os.remove('./tmp_build' + testcaseId + '.zip')
- self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
- self.command('cd ' + self.eNBSourceCodePath + '/cmake_targets', '\$', 5)
- self.command('unzip -qq -DD tmp_build' + testcaseId + '.zip', '\$', 5)
- self.command('rm -f tmp_build' + testcaseId + '.zip', '\$', 5)
- self.close()
- else:
- self.close()
-
- if buildStatus:
- logging.info('\u001B[1m Building OAI ' + nodeB_prefix + 'NB Pass\u001B[0m')
- self.CreateHtmlTestRow(self.Build_eNB_args, 'OK', ALL_PROCESSES_OK)
- else:
- logging.error('\u001B[1m Building OAI ' + nodeB_prefix + 'NB Failed\u001B[0m')
- self.CreateHtmlTestRow(self.Build_eNB_args, 'KO', ALL_PROCESSES_OK)
- self.CreateHtmlTabFooter(False)
- sys.exit(1)
def BuildOAIUE(self):
if self.UEIPAddress == '' or self.ranRepository == '' or self.ranBranch == '' or self.UEUserName == '' or self.UEPassword == '' or self.UESourceCodePath == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
result = re.search('--nrUE', self.Build_OAI_UE_args)
if result is not None:
- self.air_interface = 'nr'
+ RAN.Setair_interface('nr')
ue_prefix = 'NR '
else:
- self.air_interface = 'lte'
+ RAN.Setair_interface('lte')
ue_prefix = ''
result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
if result is not None:
full_ran_repo_name = self.ranRepository
else:
full_ran_repo_name = self.ranRepository + '.git'
- self.command('mkdir -p ' + self.UESourceCodePath, '\$', 5)
- self.command('cd ' + self.UESourceCodePath, '\$', 5)
- self.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+ SSH.command('mkdir -p ' + self.UESourceCodePath, '\$', 5)
+ SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
+ SSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
# here add a check if git clone or git fetch went smoothly
- self.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
- self.command('git config user.name "OAI Jenkins"', '\$', 5)
+ SSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+ SSH.command('git config user.name "OAI Jenkins"', '\$', 5)
if self.clean_repository:
- self.command('ls *.txt', '\$', 5)
- result = re.search('LAST_BUILD_INFO', str(self.ssh.before))
+ SSH.command('ls *.txt', '\$', 5)
+ result = re.search('LAST_BUILD_INFO', SSH.getBefore())
if result is not None:
mismatch = False
- self.command('grep SRC_COMMIT LAST_BUILD_INFO.txt', '\$', 2)
- result = re.search(self.ranCommitID, str(self.ssh.before))
+ SSH.command('grep SRC_COMMIT LAST_BUILD_INFO.txt', '\$', 2)
+ result = re.search(self.ranCommitID, SSH.getBefore())
if result is None:
mismatch = True
- self.command('grep MERGED_W_TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
- if (self.ranAllowMerge):
- result = re.search('YES', str(self.ssh.before))
+ SSH.command('grep MERGED_W_TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
+ if self.ranAllowMerge:
+ result = re.search('YES', SSH.getBefore())
if result is None:
mismatch = True
- self.command('grep TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
+ SSH.command('grep TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
if self.ranTargetBranch == '':
- result = re.search('develop', str(self.ssh.before))
+ result = re.search('develop', SSH.getBefore())
else:
- result = re.search(self.ranTargetBranch, str(self.ssh.before))
+ result = re.search(self.ranTargetBranch, SSH.getBefore())
if result is None:
mismatch = True
else:
- result = re.search('NO', str(self.ssh.before))
+ result = re.search('NO', SSH.getBefore())
if result is None:
mismatch = True
if not mismatch:
- self.close()
- self.CreateHtmlTestRow(self.Build_eNB_args, 'OK', ALL_PROCESSES_OK)
+ SSH.close()
+ HTML.CreateHtmlTestRow(RAN.GetBuild_eNB_args(), 'OK', CONST.ALL_PROCESSES_OK)
return
- self.command('echo ' + self.UEPassword + ' | sudo -S git clean -x -d -ff', '\$', 30)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S git clean -x -d -ff', '\$', 30)
# if the commit ID is provided use it to point to it
if self.ranCommitID != '':
- self.command('git checkout -f ' + self.ranCommitID, '\$', 5)
+ SSH.command('git checkout -f ' + self.ranCommitID, '\$', 5)
# if the branch is not develop, then it is a merge request and we need to do
# the potential merge. Note that merge conflicts should already been checked earlier
- if (self.ranAllowMerge):
+ if self.ranAllowMerge:
if self.ranTargetBranch == '':
if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
- self.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
+ SSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
else:
logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
- self.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
- self.command('source oaienv', '\$', 5)
- self.command('cd cmake_targets', '\$', 5)
- self.command('mkdir -p log', '\$', 5)
- self.command('chmod 777 log', '\$', 5)
+ SSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+ SSH.command('source oaienv', '\$', 5)
+ SSH.command('cd cmake_targets', '\$', 5)
+ SSH.command('mkdir -p log', '\$', 5)
+ SSH.command('chmod 777 log', '\$', 5)
# no need to remove in log (git clean did the trick)
- self.command('stdbuf -o0 ./build_oai ' + self.Build_OAI_UE_args + ' 2>&1 | stdbuf -o0 tee compile_oai_ue.log', 'Bypassing the Tests|build have failed', 600)
- self.command('ls ran_build/build', '\$', 3)
- self.command('ls ran_build/build', '\$', 3)
+ SSH.command('stdbuf -o0 ./build_oai ' + self.Build_OAI_UE_args + ' 2>&1 | stdbuf -o0 tee compile_oai_ue.log', 'Bypassing the Tests|build have failed', 600)
+ SSH.command('ls ran_build/build', '\$', 3)
+ SSH.command('ls ran_build/build', '\$', 3)
buildStatus = True
- result = re.search(self.air_interface + '-uesoftmodem', str(self.ssh.before))
+ result = re.search(RAN.Getair_interface() + '-uesoftmodem', SSH.getBefore())
if result is None:
buildStatus = False
- self.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
- self.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
- self.command('mv compile_oai_ue.log ' + 'build_log_' + self.testCase_id, '\$', 5)
+ SSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+ SSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+ SSH.command('mv compile_oai_ue.log ' + 'build_log_' + self.testCase_id, '\$', 5)
if buildStatus:
# Generating a BUILD INFO file
- self.command('echo "SRC_BRANCH: ' + self.ranBranch + '" > ../LAST_BUILD_INFO.txt', '\$', 2)
- self.command('echo "SRC_COMMIT: ' + self.ranCommitID + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
- if (self.ranAllowMerge):
- self.command('echo "MERGED_W_TGT_BRANCH: YES" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+ SSH.command('echo "SRC_BRANCH: ' + self.ranBranch + '" > ../LAST_BUILD_INFO.txt', '\$', 2)
+ SSH.command('echo "SRC_COMMIT: ' + self.ranCommitID + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+ if self.ranAllowMerge:
+ SSH.command('echo "MERGED_W_TGT_BRANCH: YES" >> ../LAST_BUILD_INFO.txt', '\$', 2)
if self.ranTargetBranch == '':
- self.command('echo "TGT_BRANCH: develop" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+ SSH.command('echo "TGT_BRANCH: develop" >> ../LAST_BUILD_INFO.txt', '\$', 2)
else:
- self.command('echo "TGT_BRANCH: ' + self.ranTargetBranch + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+ SSH.command('echo "TGT_BRANCH: ' + self.ranTargetBranch + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
else:
- self.command('echo "MERGED_W_TGT_BRANCH: NO" >> ../LAST_BUILD_INFO.txt', '\$', 2)
- self.close()
- self.CreateHtmlTestRow(self.Build_OAI_UE_args, 'OK', ALL_PROCESSES_OK, 'OAI UE')
+ SSH.command('echo "MERGED_W_TGT_BRANCH: NO" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+ SSH.close()
+ HTML.CreateHtmlTestRow(self.Build_OAI_UE_args, 'OK', CONST.ALL_PROCESSES_OK, 'OAI UE')
else:
- self.close()
+ SSH.close()
logging.error('\u001B[1m Building OAI UE Failed\u001B[0m')
- self.CreateHtmlTestRow(self.Build_OAI_UE_args, 'KO', ALL_PROCESSES_OK, 'OAI UE')
- self.CreateHtmlTabFooter(False)
+ HTML.CreateHtmlTestRow(self.Build_OAI_UE_args, 'KO', CONST.ALL_PROCESSES_OK, 'OAI UE')
+ HTML.CreateHtmlTabFooter(False)
sys.exit(1)
-
- def InitializeHSS(self):
- if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '' or self.EPCType == '':
- Usage()
- sys.exit('Insufficient Parameter')
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- logging.debug('Using the OAI EPC Release 14 Cassandra-based HSS')
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
- logging.debug('\u001B[1m Launching tshark on all interfaces \u001B[0m')
- EPC_PcapFileName = 'epc_' + self.testCase_id + '.pcap'
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm -f ' + EPC_PcapFileName, '\$', 5)
- self.command('echo $USER; nohup sudo tshark -f "tcp port not 22 and port not 53" -i any -w ' + self.EPCSourceCodePath + '/scripts/' + EPC_PcapFileName + ' > /tmp/tshark.log 2>&1 &', self.EPCUserName, 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S mkdir -p logs', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm -f hss_' + self.testCase_id + '.log logs/hss*.*', '\$', 5)
- self.command('echo "oai_hss -j /usr/local/etc/oai/hss_rel14.json" > ./my-hss.sh', '\$', 5)
- self.command('chmod 755 ./my-hss.sh', '\$', 5)
- self.command('sudo daemon --unsafe --name=hss_daemon --chdir=' + self.EPCSourceCodePath + '/scripts -o ' + self.EPCSourceCodePath + '/scripts/hss_' + self.testCase_id + '.log ./my-hss.sh', '\$', 5)
- elif re.match('OAI', self.EPCType, re.IGNORECASE):
- logging.debug('Using the OAI EPC HSS')
- self.command('cd ' + self.EPCSourceCodePath, '\$', 5)
- self.command('source oaienv', '\$', 5)
- self.command('cd scripts', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S ./run_hss 2>&1 | stdbuf -o0 awk \'{ print strftime("[%Y/%m/%d %H:%M:%S] ",systime()) $0 }\' | stdbuf -o0 tee -a hss_' + self.testCase_id + '.log &', 'Core state: 2 -> 3', 35)
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- logging.debug('Using the ltebox simulated HSS')
- self.command('if [ -d ' + self.EPCSourceCodePath + '/scripts ]; then echo ' + self.eNBPassword + ' | sudo -S rm -Rf ' + self.EPCSourceCodePath + '/scripts ; fi', '\$', 5)
- self.command('mkdir -p ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
- self.command('cd /opt/hss_sim0609', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm -f hss.log daemon.log', '\$', 5)
- # based on Robert's feedback, new method to run simulated HSS
- self.command('sudo su -c "cd /opt/hss_sim0609 && screen -dm -S simulated_hss ./starthss_real"', '\$', 5)
- else:
- logging.error('This option should not occur!')
- self.close()
- self.CreateHtmlTestRow(self.EPCType, 'OK', ALL_PROCESSES_OK)
-
- def InitializeMME(self):
- if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '' or self.EPCType == '':
- Usage()
- sys.exit('Insufficient Parameter')
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- logging.debug('Using the OAI EPC Release 14 MME')
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm -f mme_' + self.testCase_id + '.log', '\$', 5)
- self.command('echo "./run_mme --config-file /usr/local/etc/oai/mme.conf --set-virt-if" > ./my-mme.sh', '\$', 5)
- self.command('chmod 755 ./my-mme.sh', '\$', 5)
- self.command('sudo daemon --unsafe --name=mme_daemon --chdir=' + self.EPCSourceCodePath + '/scripts -o ' + self.EPCSourceCodePath + '/scripts/mme_' + self.testCase_id + '.log ./my-mme.sh', '\$', 5)
- elif re.match('OAI', self.EPCType, re.IGNORECASE):
- self.command('cd ' + self.EPCSourceCodePath, '\$', 5)
- self.command('source oaienv', '\$', 5)
- self.command('cd scripts', '\$', 5)
- self.command('stdbuf -o0 hostname', '\$', 5)
- result = re.search('hostname\\\\r\\\\n(?P<host_name>[a-zA-Z0-9\-\_]+)\\\\r\\\\n', str(self.ssh.before))
- if result is None:
- logging.debug('\u001B[1;37;41m Hostname Not Found! \u001B[0m')
- sys.exit(1)
- host_name = result.group('host_name')
- self.command('echo ' + self.EPCPassword + ' | sudo -S ./run_mme 2>&1 | stdbuf -o0 tee -a mme_' + self.testCase_id + '.log &', 'MME app initialization complete', 100)
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- self.command('cd /opt/ltebox/tools', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S ./start_mme', '\$', 5)
- else:
- logging.error('This option should not occur!')
- self.close()
- self.CreateHtmlTestRow(self.EPCType, 'OK', ALL_PROCESSES_OK)
-
- def InitializeSPGW(self):
- if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '' or self.EPCType == '':
- Usage()
- sys.exit('Insufficient Parameter')
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- logging.debug('Using the OAI EPC Release 14 SPGW-CUPS')
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm -f spgwc_' + self.testCase_id + '.log spgwu_' + self.testCase_id + '.log', '\$', 5)
- self.command('echo "spgwc -c /usr/local/etc/oai/spgw_c.conf" > ./my-spgwc.sh', '\$', 5)
- self.command('chmod 755 ./my-spgwc.sh', '\$', 5)
- self.command('sudo daemon --unsafe --name=spgwc_daemon --chdir=' + self.EPCSourceCodePath + '/scripts -o ' + self.EPCSourceCodePath + '/scripts/spgwc_' + self.testCase_id + '.log ./my-spgwc.sh', '\$', 5)
- time.sleep(5)
- self.command('echo "spgwu -c /usr/local/etc/oai/spgw_u.conf" > ./my-spgwu.sh', '\$', 5)
- self.command('chmod 755 ./my-spgwu.sh', '\$', 5)
- self.command('sudo daemon --unsafe --name=spgwu_daemon --chdir=' + self.EPCSourceCodePath + '/scripts -o ' + self.EPCSourceCodePath + '/scripts/spgwu_' + self.testCase_id + '.log ./my-spgwu.sh', '\$', 5)
- elif re.match('OAI', self.EPCType, re.IGNORECASE):
- self.command('cd ' + self.EPCSourceCodePath, '\$', 5)
- self.command('source oaienv', '\$', 5)
- self.command('cd scripts', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S ./run_spgw 2>&1 | stdbuf -o0 tee -a spgw_' + self.testCase_id + '.log &', 'Initializing SPGW-APP task interface: DONE', 30)
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- self.command('cd /opt/ltebox/tools', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S ./start_xGw', '\$', 5)
- else:
- logging.error('This option should not occur!')
- self.close()
- self.CreateHtmlTestRow(self.EPCType, 'OK', ALL_PROCESSES_OK)
-
+
def CheckFlexranCtrlInstallation(self):
- if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '':
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '':
return
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('ls -ls /opt/flexran_rtc/*/rt_controller', '\$', 5)
- result = re.search('/opt/flexran_rtc/build/rt_controller', str(self.ssh.before))
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('ls -ls /opt/flexran_rtc/*/rt_controller', '\$', 5)
+ result = re.search('/opt/flexran_rtc/build/rt_controller', SSH.getBefore())
if result is not None:
- self.flexranCtrlInstalled = True
+ RAN.SetflexranCtrlInstalled(True)
logging.debug('Flexran Controller is installed')
- self.close()
+ SSH.close()
def InitializeFlexranCtrl(self):
- if self.flexranCtrlInstalled == False:
+ if RAN.GetflexranCtrlInstalled() == False:
return
- if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd /opt/flexran_rtc', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm -f log/*.log', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S echo "build/rt_controller -c log_config/basic_log" > ./my-flexran-ctl.sh', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S chmod 755 ./my-flexran-ctl.sh', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S daemon --unsafe --name=flexran_rtc_daemon --chdir=/opt/flexran_rtc -o /opt/flexran_rtc/log/flexranctl_' + self.testCase_id + '.log ././my-flexran-ctl.sh', '\$', 5)
- self.command('ps -aux | grep --color=never rt_controller', '\$', 5)
- result = re.search('rt_controller -c ', str(self.ssh.before))
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('cd /opt/flexran_rtc', '\$', 5)
+ SSH.command('echo ' + EPC.GetPassword() + ' | sudo -S rm -f log/*.log', '\$', 5)
+ SSH.command('echo ' + EPC.GetPassword() + ' | sudo -S echo "build/rt_controller -c log_config/basic_log" > ./my-flexran-ctl.sh', '\$', 5)
+ SSH.command('echo ' + EPC.GetPassword() + ' | sudo -S chmod 755 ./my-flexran-ctl.sh', '\$', 5)
+ SSH.command('echo ' + EPC.GetPassword() + ' | sudo -S daemon --unsafe --name=flexran_rtc_daemon --chdir=/opt/flexran_rtc -o /opt/flexran_rtc/log/flexranctl_' + self.testCase_id + '.log ././my-flexran-ctl.sh', '\$', 5)
+ SSH.command('ps -aux | grep --color=never rt_controller', '\$', 5)
+ result = re.search('rt_controller -c ', SSH.getBefore())
if result is not None:
logging.debug('\u001B[1m Initialize FlexRan Controller Completed\u001B[0m')
- self.flexranCtrlStarted = True
- self.close()
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
-
- def InitializeeNB(self):
- if self.eNB_serverId == '0':
- lIpAddr = self.eNBIPAddress
- lUserName = self.eNBUserName
- lPassWord = self.eNBPassword
- lSourcePath = self.eNBSourceCodePath
- elif self.eNB_serverId == '1':
- lIpAddr = self.eNB1IPAddress
- lUserName = self.eNB1UserName
- lPassWord = self.eNB1Password
- lSourcePath = self.eNB1SourceCodePath
- elif self.eNB_serverId == '2':
- lIpAddr = self.eNB2IPAddress
- lUserName = self.eNB2UserName
- lPassWord = self.eNB2Password
- lSourcePath = self.eNB2SourceCodePath
- if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
- Usage()
- sys.exit('Insufficient Parameter')
- check_eNB = False
- check_OAI_UE = False
- pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
- if (pStatus < 0):
- self.CreateHtmlTestRow(self.Initialize_eNB_args, 'KO', pStatus)
- self.CreateHtmlTabFooter(False)
- sys.exit(1)
- # If tracer options is on, running tshark on EPC side and capture traffic b/ EPC and eNB
- result = re.search('T_stdout', str(self.Initialize_eNB_args))
- if result is not None:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('ip addr show | awk -f /tmp/active_net_interfaces.awk | egrep -v "lo|tun"', '\$', 5)
- result = re.search('interfaceToUse=(?P<eth_interface>[a-zA-Z0-9\-\_]+)done', str(self.ssh.before))
- if result is not None:
- eth_interface = result.group('eth_interface')
- logging.debug('\u001B[1m Launching tshark on interface ' + eth_interface + '\u001B[0m')
- self.EPC_PcapFileName = 'enb_' + self.testCase_id + '_s1log.pcap'
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm -f /tmp/' + self.EPC_PcapFileName, '\$', 5)
- self.command('echo $USER; nohup sudo tshark -f "host ' + lIpAddr +'" -i ' + eth_interface + ' -w /tmp/' + self.EPC_PcapFileName + ' > /tmp/tshark.log 2>&1 &', self.EPCUserName, 5)
- self.close()
- self.open(lIpAddr, lUserName, lPassWord)
- self.command('cd ' + lSourcePath, '\$', 5)
- # Initialize_eNB_args usually start with -O and followed by the location in repository
- full_config_file = self.Initialize_eNB_args.replace('-O ','')
- extra_options = ''
- extIdx = full_config_file.find('.conf')
- if (extIdx > 0):
- extra_options = full_config_file[extIdx + 5:]
- # if tracer options is on, compiling and running T Tracer
- result = re.search('T_stdout', str(extra_options))
- if result is not None:
- logging.debug('\u001B[1m Compiling and launching T Tracer\u001B[0m')
- self.command('cd common/utils/T/tracer', '\$', 5)
- self.command('make', '\$', 10)
- self.command('echo $USER; nohup ./record -d ../T_messages.txt -o ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '_record.raw -ON -off VCD -off HEAVY -off LEGACY_GROUP_TRACE -off LEGACY_GROUP_DEBUG > ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '_record.log 2>&1 &', lUserName, 5)
- self.command('cd ' + lSourcePath, '\$', 5)
- full_config_file = full_config_file[:extIdx + 5]
- config_path, config_file = os.path.split(full_config_file)
- else:
- sys.exit('Insufficient Parameter')
- ci_full_config_file = config_path + '/ci-' + config_file
- rruCheck = False
- result = re.search('^rru|^rcc|^du.band', str(config_file))
- if result is not None:
- rruCheck = True
- # do not reset board twice in IF4.5 case
- result = re.search('^rru|^enb|^du.band', str(config_file))
- if result is not None:
- self.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 60)
- result = re.search('type: b200', str(self.ssh.before))
- if result is not None:
- logging.debug('Found a B2xx device --> resetting it')
- self.command('echo ' + lPassWord + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 10)
- # Reloading FGPA bin firmware
- self.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 60)
- # Make a copy and adapt to EPC / eNB IP addresses
- self.command('cp ' + full_config_file + ' ' + ci_full_config_file, '\$', 5)
- self.command('sed -i -e \'s/CI_MME_IP_ADDR/' + self.EPCIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
- self.command('sed -i -e \'s/CI_ENB_IP_ADDR/' + lIpAddr + '/\' ' + ci_full_config_file, '\$', 2);
- self.command('sed -i -e \'s/CI_RCC_IP_ADDR/' + self.eNBIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
- self.command('sed -i -e \'s/CI_RRU1_IP_ADDR/' + self.eNB1IPAddress + '/\' ' + ci_full_config_file, '\$', 2);
- self.command('sed -i -e \'s/CI_RRU2_IP_ADDR/' + self.eNB2IPAddress + '/\' ' + ci_full_config_file, '\$', 2);
- if self.flexranCtrlInstalled and self.flexranCtrlStarted:
- self.command('sed -i -e \'s/FLEXRAN_ENABLED.*;/FLEXRAN_ENABLED = "yes";/\' ' + ci_full_config_file, '\$', 2);
- else:
- self.command('sed -i -e \'s/FLEXRAN_ENABLED.*;/FLEXRAN_ENABLED = "no";/\' ' + ci_full_config_file, '\$', 2);
- self.eNBmbmsEnables[int(self.eNB_instance)] = False
- self.command('grep enable_enb_m2 ' + ci_full_config_file, '\$', 2);
- result = re.search('yes', str(self.ssh.before))
- if result is not None:
- self.eNBmbmsEnables[int(self.eNB_instance)] = True
- logging.debug('\u001B[1m MBMS is enabled on this eNB\u001B[0m')
- result = re.search('noS1', str(self.Initialize_eNB_args))
- eNBinNoS1 = False
- if result is not None:
- eNBinNoS1 = True
- logging.debug('\u001B[1m eNB is in noS1 configuration \u001B[0m')
- # Launch eNB with the modified config file
- self.command('source oaienv', '\$', 5)
- self.command('cd cmake_targets', '\$', 5)
- self.command('echo "ulimit -c unlimited && ./ran_build/build/' + self.air_interface + '-softmodem -O ' + lSourcePath + '/' + ci_full_config_file + extra_options + '" > ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
- self.command('chmod 775 ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
- self.command('echo ' + lPassWord + ' | sudo -S rm -Rf enb_' + self.testCase_id + '.log', '\$', 5)
- self.command('hostnamectl','\$', 5)
- result = re.search('CentOS Linux 7', str(self.ssh.before))
- if result is not None:
- self.command('echo $USER; nohup sudo ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh > ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '.log 2>&1 &', lUserName, 10)
- else:
- self.command('echo ' + lPassWord + ' | sudo -S -E daemon --inherit --unsafe --name=enb' + str(self.eNB_instance) + '_daemon --chdir=' + lSourcePath + '/cmake_targets -o ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '.log ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
- self.eNBLogFiles[int(self.eNB_instance)] = 'enb_' + self.testCase_id + '.log'
- if extra_options != '':
- self.eNBOptions[int(self.eNB_instance)] = extra_options
- time.sleep(6)
- doLoop = True
- loopCounter = 20
- enbDidSync = False
- while (doLoop):
- loopCounter = loopCounter - 1
- if (loopCounter == 0):
- # In case of T tracer recording, we may need to kill it
- result = re.search('T_stdout', str(self.Initialize_eNB_args))
- if result is not None:
- self.command('killall --signal SIGKILL record', '\$', 5)
- self.close()
- doLoop = False
- logging.error('\u001B[1;37;41m eNB logging system did not show got sync! \u001B[0m')
- self.CreateHtmlTestRow('-O ' + config_file + extra_options, 'KO', ALL_PROCESSES_OK)
- # In case of T tracer recording, we need to kill tshark on EPC side
- result = re.search('T_stdout', str(self.Initialize_eNB_args))
- if result is not None:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- logging.debug('\u001B[1m Stopping tshark \u001B[0m')
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
- if self.EPC_PcapFileName != '':
- time.sleep(0.5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S chmod 666 /tmp/' + self.EPC_PcapFileName, '\$', 5)
- self.close()
- time.sleep(1)
- if self.EPC_PcapFileName != '':
- copyin_res = self.copyin(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, '/tmp/' + self.EPC_PcapFileName, '.')
- if (copyin_res == 0):
- self.copyout(lIpAddr, lUserName, lPassWord, self.EPC_PcapFileName, lSourcePath + '/cmake_targets/.')
- self.prematureExit = True
- return
- else:
- self.command('stdbuf -o0 cat enb_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync|Starting"', '\$', 4)
- if rruCheck:
- result = re.search('wait RUs', str(self.ssh.before))
- else:
- result = re.search('got sync|Starting F1AP at CU', str(self.ssh.before))
- if result is None:
- time.sleep(6)
- else:
- doLoop = False
- enbDidSync = True
- time.sleep(10)
-
- if enbDidSync and eNBinNoS1:
- self.command('ifconfig oaitun_enb1', '\$', 4)
- self.command('ifconfig oaitun_enb1', '\$', 4)
- result = re.search('inet addr:1|inet 1', str(self.ssh.before))
- if result is not None:
- logging.debug('\u001B[1m oaitun_enb1 interface is mounted and configured\u001B[0m')
- else:
- logging.error('\u001B[1m oaitun_enb1 interface is either NOT mounted or NOT configured\u001B[0m')
- if self.eNBmbmsEnables[int(self.eNB_instance)]:
- self.command('ifconfig oaitun_enm1', '\$', 4)
- result = re.search('inet addr', str(self.ssh.before))
- if result is not None:
- logging.debug('\u001B[1m oaitun_enm1 interface is mounted and configured\u001B[0m')
- else:
- logging.error('\u001B[1m oaitun_enm1 interface is either NOT mounted or NOT configured\u001B[0m')
- if enbDidSync:
- self.eNBstatuses[int(self.eNB_instance)] = int(self.eNB_serverId)
-
- self.close()
- self.CreateHtmlTestRow('-O ' + config_file + extra_options, 'OK', ALL_PROCESSES_OK)
- logging.debug('\u001B[1m Initialize eNB Completed\u001B[0m')
-
+ RAN.SetflexranCtrlStarted(True)
+ SSH.close()
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+
def InitializeUE_common(self, device_id, idx):
try:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
if not self.ADBCentralized:
# Reboot UE
- #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesRebootCmd[idx], '\$', 60)
+ #SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesRebootCmd[idx], '\$', 60)
# Wait
#time.sleep(60)
# Put in LTE-Mode only
- #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode 11"\'', '\$', 60)
- #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode1 11"\'', '\$', 60)
- #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode2 11"\'', '\$', 60)
- #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode3 11"\'', '\$', 60)
+ #SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode 11"\'', '\$', 60)
+ #SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode1 11"\'', '\$', 60)
+ #SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode2 11"\'', '\$', 60)
+ #SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "settings put global preferred_network_mode3 11"\'', '\$', 60)
# enable data service
- #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
+ #SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
# we need to do radio on/off cycle to make sure of above changes
# airplane mode off // radio on
- #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
+ #SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
#time.sleep(10)
# airplane mode on // radio off
- #self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
+ #SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
# normal procedure without reboot
# enable data service
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
# airplane mode on // radio off
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
- self.close()
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
+ SSH.close()
return
# enable data service
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "svc data enable"', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "svc data enable"', '\$', 60)
# The following commands are deprecated since we no longer work on Android 7+
- # self.command('stdbuf -o0 adb -s ' + device_id + ' shell settings put global airplane_mode_on 1', '\$', 10)
- # self.command('stdbuf -o0 adb -s ' + device_id + ' shell am broadcast -a android.intent.action.AIRPLANE_MODE --ez state true', '\$', 60)
+ # SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell settings put global airplane_mode_on 1', '\$', 10)
+ # SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell am broadcast -a android.intent.action.AIRPLANE_MODE --ez state true', '\$', 60)
# a dedicated script has to be installed inside the UE
# airplane mode on means call /data/local/tmp/off
if device_id == '84B7N16418004022':
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
else:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
#airplane mode off means call /data/local/tmp/on
logging.debug('\u001B[1mUE (' + device_id + ') Initialize Completed\u001B[0m')
- self.close()
+ SSH.close()
except:
os.kill(os.getppid(),signal.SIGUSR1)
def InitializeUE(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
multi_jobs = []
i = 0
@@ -1011,62 +300,62 @@ class SSHConnection():
i += 1
for job in multi_jobs:
job.join()
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
def InitializeOAIUE(self):
if self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '' or self.UESourceCodePath == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- if self.air_interface == 'lte':
+ if RAN.Getair_interface() == 'lte':
result = re.search('--no-L2-connect', str(self.Initialize_OAI_UE_args))
if result is None:
check_eNB = True
check_OAI_UE = False
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', pStatus)
- self.CreateHtmlTabFooter(False)
+ HTML.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', pStatus)
+ HTML.CreateHtmlTabFooter(False)
sys.exit(1)
UE_prefix = ''
else:
UE_prefix = 'NR '
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
# b2xx_fx3_utils reset procedure
- self.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 60)
- result = re.search('type: b200', str(self.ssh.before))
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 60)
+ result = re.search('type: b200', SSH.getBefore())
if result is not None:
logging.debug('Found a B2xx device --> resetting it')
- self.command('echo ' + self.UEPassword + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 10)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 10)
# Reloading FGPA bin firmware
- self.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 60)
- result = re.search('type: n3xx', str(self.ssh.before))
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S uhd_find_devices', '\$', 60)
+ result = re.search('type: n3xx', str(SSH.getBefore()))
if result is not None:
logging.debug('Found a N3xx device --> resetting it')
- self.command('cd ' + self.UESourceCodePath, '\$', 5)
+ SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
# Initialize_OAI_UE_args usually start with -C and followed by the location in repository
# in case of NR-UE, we may have rrc_config_path (Temporary?)
modifiedUeOptions = str(self.Initialize_OAI_UE_args)
- if self.air_interface == 'nr':
+ if RAN.Getair_interface() == 'nr':
result = re.search('--rrc_config_path ', modifiedUeOptions)
if result is not None:
modifiedUeOptions = modifiedUeOptions.replace('rrc_config_path ', 'rrc_config_path ' + self.UESourceCodePath + '/')
- self.command('source oaienv', '\$', 5)
- self.command('cd cmake_targets/ran_build/build', '\$', 5)
- if self.air_interface == 'lte':
+ SSH.command('source oaienv', '\$', 5)
+ SSH.command('cd cmake_targets/ran_build/build', '\$', 5)
+ if RAN.Getair_interface() == 'lte':
result = re.search('--no-L2-connect', str(self.Initialize_OAI_UE_args))
# We may have to regenerate the .u* files
if result is None:
- self.command('ls /tmp/*.sed', '\$', 5)
- result = re.search('adapt_usim_parameters', str(self.ssh.before))
+ SSH.command('ls /tmp/*.sed', '\$', 5)
+ result = re.search('adapt_usim_parameters', SSH.getBefore())
if result is not None:
- self.command('sed -f /tmp/adapt_usim_parameters.sed ../../../openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf > ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf', '\$', 5)
+ SSH.command('sed -f /tmp/adapt_usim_parameters.sed ../../../openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf > ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf', '\$', 5)
else:
- self.command('sed -e "s#93#92#" -e "s#8baf473f2f8fd09487cccbd7097c6862#fec86ba6eb707ed08905757b1bb44b8f#" -e "s#e734f8734007d6c5ce7a0508809e7e9c#C42449363BBAD02B66D16BC975D77CC1#" ../../../openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf > ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf', '\$', 5)
- self.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf .u*', '\$', 5)
- self.command('echo ' + self.UEPassword + ' | sudo -S ../../../targets/bin/conf2uedata -c ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf -o .', '\$', 5)
- self.command('echo "ulimit -c unlimited && ./'+ self.air_interface +'-uesoftmodem ' + modifiedUeOptions + '" > ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
- self.command('chmod 775 ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
- self.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
+ SSH.command('sed -e "s#93#92#" -e "s#8baf473f2f8fd09487cccbd7097c6862#fec86ba6eb707ed08905757b1bb44b8f#" -e "s#e734f8734007d6c5ce7a0508809e7e9c#C42449363BBAD02B66D16BC975D77CC1#" ../../../openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf > ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf', '\$', 5)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf .u*', '\$', 5)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S ../../../targets/bin/conf2uedata -c ../../../openair3/NAS/TOOLS/ci-ue_eurecom_test_sfr.conf -o .', '\$', 5)
+ SSH.command('echo "ulimit -c unlimited && ./'+ RAN.Getair_interface() +'-uesoftmodem ' + modifiedUeOptions + '" > ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+ SSH.command('chmod 775 ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
self.UELogFile = 'ue_' + self.testCase_id + '.log'
# We are now looping several times to hope we really sync w/ an eNB
@@ -1075,13 +364,13 @@ class SSHConnection():
gotSyncStatus = True
fullSyncStatus = True
while (doOutterLoop):
- self.command('cd ' + self.UESourceCodePath + '/cmake_targets/ran_build/build', '\$', 5)
- self.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
+ SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets/ran_build/build', '\$', 5)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
#use nohup instead of daemon
- #self.command('echo ' + self.UEPassword + ' | sudo -S -E daemon --inherit --unsafe --name=ue' + str(self.UE_instance) + '_daemon --chdir=' + self.UESourceCodePath + '/cmake_targets/ran_build/build -o ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
- self.command('echo $USER; nohup sudo ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh' + ' > ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ' + ' 2>&1 &', self.UEUserName, 5)
+ #SSH.command('echo ' + self.UEPassword + ' | sudo -S -E daemon --inherit --unsafe --name=ue' + str(self.UE_instance) + '_daemon --chdir=' + self.UESourceCodePath + '/cmake_targets/ran_build/build -o ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+ SSH.command('echo $USER; nohup sudo ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh' + ' > ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ' + ' 2>&1 &', self.UEUserName, 5)
time.sleep(6)
- self.command('cd ../..', '\$', 5)
+ SSH.command('cd ../..', '\$', 5)
doLoop = True
loopCounter = 10
gotSyncStatus = True
@@ -1094,11 +383,11 @@ class SSHConnection():
gotSyncStatus = False
doLoop = False
continue
- self.command('stdbuf -o0 cat ue_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync"', '\$', 4)
- if self.air_interface == 'nr':
- result = re.search('Starting sync detection', str(self.ssh.before))
+ SSH.command('stdbuf -o0 cat ue_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync"', '\$', 4)
+ if RAN.Getair_interface() == 'nr':
+ result = re.search('Starting sync detection', SSH.getBefore())
else:
- result = re.search('got sync', str(self.ssh.before))
+ result = re.search('got sync', SSH.getBefore())
if result is None:
time.sleep(10)
else:
@@ -1106,16 +395,16 @@ class SSHConnection():
logging.debug('Found "got sync" message!')
if gotSyncStatus == False:
# we certainly need to stop the lte-uesoftmodem process if it is still running!
- self.command('ps -aux | grep --text --color=never softmodem | grep -v grep', '\$', 4)
- result = re.search('-uesoftmodem', str(self.ssh.before))
+ SSH.command('ps -aux | grep --text --color=never softmodem | grep -v grep', '\$', 4)
+ result = re.search('-uesoftmodem', SSH.getBefore())
if result is not None:
- self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal=SIGINT -r *-uesoftmodem', '\$', 4)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal=SIGINT -r *-uesoftmodem', '\$', 4)
time.sleep(3)
outterLoopCounter = outterLoopCounter - 1
if (outterLoopCounter == 0):
doOutterLoop = False
continue
- if self.air_interface == 'nr':
+ if RAN.Getair_interface() == 'nr':
fullSyncStatus = True
doOutterLoop = False
else:
@@ -1131,8 +420,8 @@ class SSHConnection():
doOutterLoop = False
fullSyncStatus = True
continue
- self.command('stdbuf -o0 cat ue_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync"', '\$', 4)
- result = re.search('No cell synchronization found', str(self.ssh.before))
+ SSH.command('stdbuf -o0 cat ue_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync"', '\$', 4)
+ result = re.search('No cell synchronization found', SSH.getBefore())
if result is None:
time.sleep(6)
else:
@@ -1140,31 +429,31 @@ class SSHConnection():
fullSyncStatus = False
logging.debug('Found: "No cell synchronization" message! --> try again')
time.sleep(6)
- self.command('ps -aux | grep --text --color=never softmodem | grep -v grep', '\$', 4)
- result = re.search('lte-uesoftmodem', str(self.ssh.before))
+ SSH.command('ps -aux | grep --text --color=never softmodem | grep -v grep', '\$', 4)
+ result = re.search('lte-uesoftmodem', SSH.getBefore())
if result is not None:
- self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal=SIGINT lte-uesoftmodem', '\$', 4)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal=SIGINT lte-uesoftmodem', '\$', 4)
outterLoopCounter = outterLoopCounter - 1
if (outterLoopCounter == 0):
doOutterLoop = False
- if fullSyncStatus and gotSyncStatus and self.air_interface == 'lte':
+ if fullSyncStatus and gotSyncStatus and RAN.Getair_interface() == 'lte':
result = re.search('--no-L2-connect', str(self.Initialize_OAI_UE_args))
if result is None:
- self.command('ifconfig oaitun_ue1', '\$', 4)
- self.command('ifconfig oaitun_ue1', '\$', 4)
+ SSH.command('ifconfig oaitun_ue1', '\$', 4)
+ SSH.command('ifconfig oaitun_ue1', '\$', 4)
# ifconfig output is different between ubuntu 16 and ubuntu 18
- result = re.search('inet addr:1|inet 1', str(self.ssh.before))
+ result = re.search('inet addr:1|inet 1', SSH.getBefore())
if result is not None:
logging.debug('\u001B[1m oaitun_ue1 interface is mounted and configured\u001B[0m')
tunnelInterfaceStatus = True
else:
- logging.debug(str(self.ssh.before))
+ logging.debug(SSH.getBefore())
logging.error('\u001B[1m oaitun_ue1 interface is either NOT mounted or NOT configured\u001B[0m')
tunnelInterfaceStatus = False
- if self.eNBmbmsEnables[0]:
- self.command('ifconfig oaitun_uem1', '\$', 4)
- result = re.search('inet addr', str(self.ssh.before))
+ if RAN.GeteNBmbmsEnable(0):
+ SSH.command('ifconfig oaitun_uem1', '\$', 4)
+ result = re.search('inet addr', SSH.getBefore())
if result is not None:
logging.debug('\u001B[1m oaitun_uem1 interface is mounted and configured\u001B[0m')
tunnelInterfaceStatus = tunnelInterfaceStatus and True
@@ -1176,116 +465,116 @@ class SSHConnection():
else:
tunnelInterfaceStatus = True
- self.close()
+ SSH.close()
if fullSyncStatus and gotSyncStatus and tunnelInterfaceStatus:
- self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'OK', ALL_PROCESSES_OK, 'OAI UE')
+ HTML.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'OK', CONST.ALL_PROCESSES_OK, 'OAI UE')
logging.debug('\u001B[1m Initialize OAI UE Completed\u001B[0m')
if (self.ADBIPAddress != 'none'):
self.UEDevices = []
self.UEDevices.append('OAI-UE')
self.UEDevicesStatus = []
- self.UEDevicesStatus.append(UE_STATUS_DETACHED)
+ self.UEDevicesStatus.append(CONST.UE_STATUS_DETACHED)
else:
- if self.air_interface == 'lte':
- if self.eNBmbmsEnables[0]:
- self.htmlUEFailureMsg = 'oaitun_ue1/oaitun_uem1 interfaces are either NOT mounted or NOT configured'
+ if RAN.Getair_interface() == 'lte':
+ if RAN.GeteNBmbmsEnable(0):
+ HTML.SethtmlUEFailureMsg('oaitun_ue1/oaitun_uem1 interfaces are either NOT mounted or NOT configured')
else:
- self.htmlUEFailureMsg = 'oaitun_ue1 interface is either NOT mounted or NOT configured'
- self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', OAI_UE_PROCESS_NO_TUNNEL_INTERFACE, 'OAI UE')
+ HTML.SethtmlUEFailureMsg('oaitun_ue1 interface is either NOT mounted or NOT configured')
+ HTML.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', CONST.OAI_UE_PROCESS_NO_TUNNEL_INTERFACE, 'OAI UE')
else:
- self.htmlUEFailureMsg = 'nr-uesoftmodem did NOT synced'
- self.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', OAI_UE_PROCESS_COULD_NOT_SYNC, 'OAI UE')
+ HTML.SethtmlUEFailureMsg('nr-uesoftmodem did NOT synced')
+ HTML.CreateHtmlTestRow(self.Initialize_OAI_UE_args, 'KO', CONST.OAI_UE_PROCESS_COULD_NOT_SYNC, 'OAI UE')
logging.error('\033[91mInitialize OAI UE Failed! \033[0m')
self.AutoTerminateUEandeNB()
def checkDevTTYisUnlocked(self):
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
count = 0
while count < 5:
- self.command('echo ' + self.ADBPassword + ' | sudo -S lsof | grep ttyUSB0', '\$', 10)
- result = re.search('picocom', str(self.ssh.before))
+ SSH.command('echo ' + self.ADBPassword + ' | sudo -S lsof | grep ttyUSB0', '\$', 10)
+ result = re.search('picocom', SSH.getBefore())
if result is None:
count = 10
else:
time.sleep(5)
count = count + 1
- self.close()
+ SSH.close()
def InitializeCatM(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- self.picocom_closure = True
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.enablePicocomClosure()
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
- self.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
- self.command('sudo picocom --baud 921600 --flow n --databits 8 /dev/ttyUSB0', 'Terminal ready', 10)
+ SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
+ SSH.command('sudo picocom --baud 921600 --flow n --databits 8 /dev/ttyUSB0', 'Terminal ready', 10)
time.sleep(1)
# Calling twice AT to clear all buffers
- self.command('AT', 'OK|ERROR', 5)
- self.command('AT', 'OK', 5)
+ SSH.command('AT', 'OK|ERROR', 5)
+ SSH.command('AT', 'OK', 5)
# Doing a power cycle
- self.command('AT^RESET', 'SIMSTORE,READY', 15)
- self.command('AT', 'OK|ERROR', 5)
- self.command('AT', 'OK', 5)
- self.command('ATE1', 'OK', 5)
+ SSH.command('AT^RESET', 'SIMSTORE,READY', 15)
+ SSH.command('AT', 'OK|ERROR', 5)
+ SSH.command('AT', 'OK', 5)
+ SSH.command('ATE1', 'OK', 5)
# Disabling the Radio
- self.command('AT+CFUN=0', 'OK', 5)
+ SSH.command('AT+CFUN=0', 'OK', 5)
logging.debug('\u001B[1m Cellular Functionality disabled\u001B[0m')
# Checking if auto-attach is enabled
- self.command('AT^AUTOATT?', 'OK', 5)
- result = re.search('AUTOATT: (?P<state>[0-9\-]+)', str(self.ssh.before))
+ SSH.command('AT^AUTOATT?', 'OK', 5)
+ result = re.search('AUTOATT: (?P<state>[0-9\-]+)', SSH.getBefore())
if result is not None:
if result.group('state') is not None:
autoAttachState = int(result.group('state'))
if autoAttachState is not None:
if autoAttachState == 0:
- self.command('AT^AUTOATT=1', 'OK', 5)
+ SSH.command('AT^AUTOATT=1', 'OK', 5)
logging.debug('\u001B[1m Auto-Attach enabled\u001B[0m')
else:
logging.debug('\u001B[1;37;41m Could not check Auto-Attach! \u001B[0m')
# Force closure of picocom but device might still be locked
- self.close()
- self.picocom_closure = False
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+ SSH.close()
+ SSH.disablePicocomClosure()
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
self.checkDevTTYisUnlocked()
def TerminateCatM(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- self.picocom_closure = True
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.enablePicocomClosure()
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
- self.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
- self.command('sudo picocom --baud 921600 --flow n --databits 8 /dev/ttyUSB0', 'Terminal ready', 10)
+ SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
+ SSH.command('sudo picocom --baud 921600 --flow n --databits 8 /dev/ttyUSB0', 'Terminal ready', 10)
time.sleep(1)
# Calling twice AT to clear all buffers
- self.command('AT', 'OK|ERROR', 5)
- self.command('AT', 'OK', 5)
+ SSH.command('AT', 'OK|ERROR', 5)
+ SSH.command('AT', 'OK', 5)
# Disabling the Radio
- self.command('AT+CFUN=0', 'OK', 5)
+ SSH.command('AT+CFUN=0', 'OK', 5)
logging.debug('\u001B[1m Cellular Functionality disabled\u001B[0m')
- self.close()
- self.picocom_closure = False
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+ SSH.close()
+ SSH.disablePicocomClosure()
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
self.checkDevTTYisUnlocked()
def AttachCatM(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- self.picocom_closure = True
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.enablePicocomClosure()
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
# dummy call to start a sudo session. The picocom command does NOT handle well the `sudo -S`
- self.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
- self.command('sudo picocom --baud 921600 --flow n --databits 8 /dev/ttyUSB0', 'Terminal ready', 10)
+ SSH.command('echo ' + self.ADBPassword + ' | sudo -S ls', '\$', 10)
+ SSH.command('sudo picocom --baud 921600 --flow n --databits 8 /dev/ttyUSB0', 'Terminal ready', 10)
time.sleep(1)
# Calling twice AT to clear all buffers
- self.command('AT', 'OK|ERROR', 5)
- self.command('AT', 'OK', 5)
+ SSH.command('AT', 'OK|ERROR', 5)
+ SSH.command('AT', 'OK', 5)
# Enabling the Radio
- self.command('AT+CFUN=1', 'SIMSTORE,READY', 5)
+ SSH.command('AT+CFUN=1', 'SIMSTORE,READY', 5)
logging.debug('\u001B[1m Cellular Functionality enabled\u001B[0m')
time.sleep(4)
# We should check if we register
@@ -1293,15 +582,15 @@ class SSHConnection():
attach_cnt = 0
attach_status = False
while count < 5:
- self.command('AT+CEREG?', 'OK', 5)
- result = re.search('CEREG: 2,(?P<state>[0-9\-]+),', str(self.ssh.before))
+ SSH.command('AT+CEREG?', 'OK', 5)
+ result = re.search('CEREG: 2,(?P<state>[0-9\-]+),', SSH.getBefore())
if result is not None:
mDataConnectionState = int(result.group('state'))
if mDataConnectionState is not None:
if mDataConnectionState == 1:
count = 10
attach_status = True
- result = re.search('CEREG: 2,1,"(?P<networky>[0-9A-Z]+)","(?P<networkz>[0-9A-Z]+)"', str(self.ssh.before))
+ result = re.search('CEREG: 2,1,"(?P<networky>[0-9A-Z]+)","(?P<networkz>[0-9A-Z]+)"', SSH.getBefore())
if result is not None:
networky = result.group('networky')
networkz = result.group('networkz')
@@ -1312,21 +601,21 @@ class SSHConnection():
logging.debug('+CEREG: 2,' + str(mDataConnectionState))
attach_cnt = attach_cnt + 1
else:
- logging.debug(str(self.ssh.before))
+ logging.debug(SSH.getBefore())
attach_cnt = attach_cnt + 1
count = count + 1
time.sleep(1)
if attach_status:
- self.command('AT+CESQ', 'OK', 5)
- result = re.search('CESQ: 99,99,255,255,(?P<rsrq>[0-9]+),(?P<rsrp>[0-9]+)', str(self.ssh.before))
+ SSH.command('AT+CESQ', 'OK', 5)
+ result = re.search('CESQ: 99,99,255,255,(?P<rsrq>[0-9]+),(?P<rsrp>[0-9]+)', SSH.getBefore())
if result is not None:
nRSRQ = int(result.group('rsrq'))
nRSRP = int(result.group('rsrp'))
if (nRSRQ is not None) and (nRSRP is not None):
logging.debug(' RSRQ = ' + str(-20+(nRSRQ/2)) + ' dB')
logging.debug(' RSRP = ' + str(-140+nRSRP) + ' dBm')
- self.close()
- self.picocom_closure = False
+ SSH.close()
+ SSH.disablePicocomClosure()
html_queue = SimpleQueue()
self.checkDevTTYisUnlocked()
if attach_status:
@@ -1337,74 +626,74 @@ class SSHConnection():
else:
html_cell += '</pre>'
html_queue.put(html_cell)
- self.CreateHtmlTestRowQueue('N/A', 'OK', 1, html_queue)
+ HTML.CreateHtmlTestRowQueue('N/A', 'OK', 1, html_queue)
else:
logging.error('\u001B[1m CAT-M module Attachment Failed\u001B[0m')
html_cell = '<pre style="background-color:white">CAT-M module Attachment Failed</pre>'
html_queue.put(html_cell)
- self.CreateHtmlTestRowQueue('N/A', 'KO', 1, html_queue)
+ HTML.CreateHtmlTestRowQueue('N/A', 'KO', 1, html_queue)
self.AutoTerminateUEandeNB()
def PingCatM(self):
- if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
check_eNB = True
check_OAI_UE = False
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- self.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
+ HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
self.AutoTerminateUEandeNB()
return
try:
statusQueue = SimpleQueue()
lock = Lock()
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd ' + self.EPCSourceCodePath, '\$', 5)
- self.command('cd scripts', '\$', 5)
- if re.match('OAI', self.EPCType, re.IGNORECASE):
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('cd ' + EPC.GetSourceCodePath(), '\$', 5)
+ SSH.command('cd scripts', '\$', 5)
+ if re.match('OAI', EPC.GetType(), re.IGNORECASE):
logging.debug('Using the OAI EPC HSS: not implemented yet')
- self.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
- self.CreateHtmlTabFooter(False)
+ HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
+ HTML.CreateHtmlTabFooter(False)
sys.exit(1)
else:
- self.command('egrep --color=never "Allocated ipv4 addr" /opt/ltebox/var/log/xGwLog.0', '\$', 5)
- result = re.search('Allocated ipv4 addr: (?P<ipaddr>[0-9\.]+) from Pool', str(self.ssh.before))
+ SSH.command('egrep --color=never "Allocated ipv4 addr" /opt/ltebox/var/log/xGwLog.0', '\$', 5)
+ result = re.search('Allocated ipv4 addr: (?P<ipaddr>[0-9\.]+) from Pool', SSH.getBefore())
if result is not None:
moduleIPAddr = result.group('ipaddr')
else:
- self.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
+ HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
self.AutoTerminateUEandeNB()
return
ping_time = re.findall("-c (\d+)",str(self.ping_args))
device_id = 'catm'
- ping_status = self.command('stdbuf -o0 ping ' + self.ping_args + ' ' + str(moduleIPAddr) + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)
+ ping_status = SSH.command('stdbuf -o0 ping ' + self.ping_args + ' ' + str(moduleIPAddr) + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)
# TIMEOUT CASE
if ping_status < 0:
message = 'Ping with UE (' + str(moduleIPAddr) + ') crashed due to TIMEOUT!'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
- self.close()
+ SSH.close()
self.ping_iperf_wrong_exit(lock, moduleIPAddr, device_id, statusQueue, message)
return
- result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', str(self.ssh.before))
+ result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', SSH.getBefore())
if result is None:
message = 'Packet Loss Not Found!'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
- self.close()
+ SSH.close()
self.ping_iperf_wrong_exit(lock, moduleIPAddr, device_id, statusQueue, message)
return
packetloss = result.group('packetloss')
if float(packetloss) == 100:
message = 'Packet Loss is 100%'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
- self.close()
+ SSH.close()
self.ping_iperf_wrong_exit(lock, moduleIPAddr, device_id, statusQueue, message)
return
- result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', str(self.ssh.before))
+ result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', SSH.getBefore())
if result is None:
message = 'Ping RTT_Min RTT_Avg RTT_Max Not Found!'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
- self.close()
+ SSH.close()
self.ping_iperf_wrong_exit(lock, moduleIPAddr, device_id, statusQueue, message)
return
rtt_min = result.group('rtt_min')
@@ -1431,37 +720,37 @@ class SSHConnection():
qMsg += '\nPacket Loss is not 0%'
logging.debug('\u001B[1;30;43m Packet Loss is not 0% \u001B[0m')
lock.release()
- self.close()
+ SSH.close()
html_cell = '<pre style="background-color:white">CAT-M module\nIP Address : ' + moduleIPAddr + '\n' + qMsg + '</pre>'
statusQueue.put(html_cell)
if (packetLossOK):
- self.CreateHtmlTestRowQueue(self.ping_args, 'OK', 1, statusQueue)
+ HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', 1, statusQueue)
else:
- self.CreateHtmlTestRowQueue(self.ping_args, 'KO', 1, statusQueue)
+ HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', 1, statusQueue)
self.AutoTerminateUEandeNB()
except:
os.kill(os.getppid(),signal.SIGUSR1)
def AttachUE_common(self, device_id, statusQueue, lock, idx):
try:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
if self.ADBCentralized:
if device_id == '84B7N16418004022':
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/on"', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/on"', '\$', 60)
else:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/on', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/on', '\$', 60)
else:
# airplane mode off // radio on
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
time.sleep(2)
max_count = 45
count = max_count
while count > 0:
if self.ADBCentralized:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "dumpsys telephony.registry" | grep -m 1 mDataConnectionState', '\$', 15)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "dumpsys telephony.registry" | grep -m 1 mDataConnectionState', '\$', 15)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "dumpsys telephony.registry"\' | grep -m 1 mDataConnectionState', '\$', 60)
- result = re.search('mDataConnectionState.*=(?P<state>[0-9\-]+)', str(self.ssh.before))
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "dumpsys telephony.registry"\' | grep -m 1 mDataConnectionState', '\$', 60)
+ result = re.search('mDataConnectionState.*=(?P<state>[0-9\-]+)', SSH.getBefore())
if result is None:
logging.debug('\u001B[1;37;41m mDataConnectionState Not Found! \u001B[0m')
lock.acquire()
@@ -1484,19 +773,19 @@ class SSHConnection():
logging.debug('\u001B[1;30;43m Retry UE (' + device_id + ') Flight Mode Off \u001B[0m')
if self.ADBCentralized:
if device_id == '84B7N16418004022':
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
else:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
time.sleep(0.5)
if self.ADBCentralized:
if device_id == '84B7N16418004022':
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/on"', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/on"', '\$', 60)
else:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/on', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/on', '\$', 60)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOnCmd[idx], '\$', 60)
time.sleep(0.5)
logging.debug('\u001B[1mWait UE (' + device_id + ') a second until mDataConnectionState=2 (' + str(max_count-count) + ' times)\u001B[0m')
time.sleep(1)
@@ -1507,19 +796,19 @@ class SSHConnection():
statusQueue.put(device_id)
statusQueue.put('Attach Failed')
lock.release()
- self.close()
+ SSH.close()
except:
os.kill(os.getppid(),signal.SIGUSR1)
def AttachUE(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
check_eNB = True
check_OAI_UE = False
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- self.CreateHtmlTestRow('N/A', 'KO', pStatus)
+ HTML.CreateHtmlTestRow('N/A', 'KO', pStatus)
self.AutoTerminateUEandeNB()
return
multi_jobs = []
@@ -1528,7 +817,7 @@ class SSHConnection():
nb_ue_to_connect = 0
for device_id in self.UEDevices:
if (self.nbMaxUEtoAttach == -1) or (nb_ue_to_connect < self.nbMaxUEtoAttach):
- self.UEDevicesStatus[nb_ue_to_connect] = UE_STATUS_ATTACHING
+ self.UEDevicesStatus[nb_ue_to_connect] = CONST.UE_STATUS_ATTACHING
p = Process(target = self.AttachUE_common, args = (device_id, status_queue, lock,nb_ue_to_connect,))
p.daemon = True
p.start()
@@ -1538,7 +827,7 @@ class SSHConnection():
job.join()
if (status_queue.empty()):
- self.CreateHtmlTestRow('N/A', 'KO', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ALL_PROCESSES_OK)
self.AutoTerminateUEandeNB()
return
else:
@@ -1558,48 +847,48 @@ class SSHConnection():
if (attach_status):
cnt = 0
while cnt < len(self.UEDevices):
- if self.UEDevicesStatus[cnt] == UE_STATUS_ATTACHING:
- self.UEDevicesStatus[cnt] = UE_STATUS_ATTACHED
+ if self.UEDevicesStatus[cnt] == CONST.UE_STATUS_ATTACHING:
+ self.UEDevicesStatus[cnt] = CONST.UE_STATUS_ATTACHED
cnt += 1
- self.CreateHtmlTestRowQueue('N/A', 'OK', len(self.UEDevices), html_queue)
- result = re.search('T_stdout', str(self.Initialize_eNB_args))
+ HTML.CreateHtmlTestRowQueue('N/A', 'OK', len(self.UEDevices), html_queue)
+ result = re.search('T_stdout', str(RAN.GetInitialize_eNB_args()))
if result is not None:
logging.debug('Waiting 5 seconds to fill up record file')
time.sleep(5)
else:
- self.CreateHtmlTestRowQueue('N/A', 'KO', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue('N/A', 'KO', len(self.UEDevices), html_queue)
self.AutoTerminateUEandeNB()
def DetachUE_common(self, device_id, idx):
try:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
if self.ADBCentralized:
if device_id == '84B7N16418004022':
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
else:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
logging.debug('\u001B[1mUE (' + device_id + ') Detach Completed\u001B[0m')
- self.close()
+ SSH.close()
except:
os.kill(os.getppid(),signal.SIGUSR1)
def DetachUE(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
check_eNB = True
check_OAI_UE = False
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- self.CreateHtmlTestRow('N/A', 'KO', pStatus)
+ HTML.CreateHtmlTestRow('N/A', 'KO', pStatus)
self.AutoTerminateUEandeNB()
return
multi_jobs = []
cnt = 0
for device_id in self.UEDevices:
- self.UEDevicesStatus[cnt] = UE_STATUS_DETACHING
+ self.UEDevicesStatus[cnt] = CONST.UE_STATUS_DETACHING
p = Process(target = self.DetachUE_common, args = (device_id,cnt,))
p.daemon = True
p.start()
@@ -1607,37 +896,37 @@ class SSHConnection():
cnt += 1
for job in multi_jobs:
job.join()
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
- result = re.search('T_stdout', str(self.Initialize_eNB_args))
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+ result = re.search('T_stdout', str(RAN.GetInitialize_eNB_args()))
if result is not None:
logging.debug('Waiting 5 seconds to fill up record file')
time.sleep(5)
cnt = 0
while cnt < len(self.UEDevices):
- self.UEDevicesStatus[cnt] = UE_STATUS_DETACHED
+ self.UEDevicesStatus[cnt] = CONST.UE_STATUS_DETACHED
cnt += 1
def RebootUE_common(self, device_id):
try:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
previousmDataConnectionStates = []
# Save mDataConnectionState
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell dumpsys telephony.registry | grep mDataConnectionState', '\$', 15)
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell dumpsys telephony.registry | grep mDataConnectionState', '\$', 15)
- result = re.search('mDataConnectionState.*=(?P<state>[0-9\-]+)', str(self.ssh.before))
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell dumpsys telephony.registry | grep mDataConnectionState', '\$', 15)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell dumpsys telephony.registry | grep mDataConnectionState', '\$', 15)
+ result = re.search('mDataConnectionState.*=(?P<state>[0-9\-]+)', SSH.getBefore())
if result is None:
logging.debug('\u001B[1;37;41m mDataConnectionState Not Found! \u001B[0m')
sys.exit(1)
previousmDataConnectionStates.append(int(result.group('state')))
# Reboot UE
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell reboot', '\$', 10)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell reboot', '\$', 10)
time.sleep(60)
previousmDataConnectionState = previousmDataConnectionStates.pop(0)
count = 180
while count > 0:
count = count - 1
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell dumpsys telephony.registry | grep mDataConnectionState', '\$', 15)
- result = re.search('mDataConnectionState.*=(?P<state>[0-9\-]+)', str(self.ssh.before))
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell dumpsys telephony.registry | grep mDataConnectionState', '\$', 15)
+ result = re.search('mDataConnectionState.*=(?P<state>[0-9\-]+)', SSH.getBefore())
if result is None:
mDataConnectionState = None
else:
@@ -1652,20 +941,20 @@ class SSHConnection():
if count == 0:
logging.debug('\u001B[1;37;41m UE (' + device_id + ') Reboot Failed \u001B[0m')
sys.exit(1)
- self.close()
+ SSH.close()
except:
os.kill(os.getppid(),signal.SIGUSR1)
def RebootUE(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
check_eNB = True
check_OAI_UE = False
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- self.CreateHtmlTestRow('N/A', 'KO', pStatus)
- self.CreateHtmlTabFooter(False)
+ HTML.CreateHtmlTestRow('N/A', 'KO', pStatus)
+ HTML.CreateHtmlTabFooter(False)
sys.exit(1)
multi_jobs = []
for device_id in self.UEDevices:
@@ -1675,24 +964,24 @@ class SSHConnection():
multi_jobs.append(p)
for job in multi_jobs:
job.join()
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
def DataDisableUE_common(self, device_id, idx):
try:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
# disable data service
if self.ADBCentralized:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "svc data disable"', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "svc data disable"', '\$', 60)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data disable"\'', '\$', 60)
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data disable"\'', '\$', 60)
logging.debug('\u001B[1mUE (' + device_id + ') Disabled Data Service\u001B[0m')
- self.close()
+ SSH.close()
except:
os.kill(os.getppid(),signal.SIGUSR1)
def DataDisableUE(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
multi_jobs = []
i = 0
@@ -1704,24 +993,24 @@ class SSHConnection():
i += 1
for job in multi_jobs:
job.join()
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
def DataEnableUE_common(self, device_id, idx):
try:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
# enable data service
if self.ADBCentralized:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "svc data enable"', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "svc data enable"', '\$', 60)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "svc data enable"\'', '\$', 60)
logging.debug('\u001B[1mUE (' + device_id + ') Enabled Data Service\u001B[0m')
- self.close()
+ SSH.close()
except:
os.kill(os.getppid(),signal.SIGUSR1)
def DataEnableUE(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
multi_jobs = []
i = 0
@@ -1733,25 +1022,26 @@ class SSHConnection():
i += 1
for job in multi_jobs:
job.join()
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
def GetAllUEDevices(self, terminate_ue_flag):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
if self.ADBCentralized:
- self.command('adb devices', '\$', 15)
- self.UEDevices = re.findall("\\\\r\\\\n([A-Za-z0-9]+)\\\\tdevice",str(self.ssh.before))
- self.close()
+ SSH.command('adb devices', '\$', 15)
+ #self.UEDevices = re.findall("\\\\r\\\\n([A-Za-z0-9]+)\\\\tdevice",SSH.getBefore())
+ self.UEDevices = re.findall("\\\\r\\\\n([A-Za-z0-9]+)\\\\tdevice",SSH.getBefore())
+ SSH.close()
else:
if (os.path.isfile('./phones_list.txt')):
os.remove('./phones_list.txt')
- self.command('ls /etc/*/phones*.txt', '\$', 5)
- result = re.search('/etc/ci/phones_list.txt', str(self.ssh.before))
- self.close()
+ SSH.command('ls /etc/*/phones*.txt', '\$', 5)
+ result = re.search('/etc/ci/phones_list.txt', SSH.getBefore())
+ SSH.close()
if (result is not None) and (len(self.UEDevices) == 0):
- self.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, '/etc/ci/phones_list.txt', '.')
+ SSH.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, '/etc/ci/phones_list.txt', '.')
if (os.path.isfile('./phones_list.txt')):
phone_list_file = open('./phones_list.txt', 'r')
for line in phone_list_file.readlines():
@@ -1768,46 +1058,47 @@ class SSHConnection():
self.UEDevicesRebootCmd.append(comma_split[5])
phone_list_file.close()
- if terminate_ue_flag == False:
+ if terminate_ue_flag == True:
if len(self.UEDevices) == 0:
logging.debug('\u001B[1;37;41m UE Not Found! \u001B[0m')
sys.exit(1)
if len(self.UEDevicesStatus) == 0:
cnt = 0
while cnt < len(self.UEDevices):
- self.UEDevicesStatus.append(UE_STATUS_DETACHED)
+ self.UEDevicesStatus.append(CONST.UE_STATUS_DETACHED)
cnt += 1
def GetAllCatMDevices(self, terminate_ue_flag):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
if self.ADBCentralized:
- self.command('lsusb | egrep "Future Technology Devices International, Ltd FT2232C" | sed -e "s#:.*##" -e "s# #_#g"', '\$', 15)
- self.CatMDevices = re.findall("\\\\r\\\\n([A-Za-z0-9_]+)",str(self.ssh.before))
+ SSH.command('lsusb | egrep "Future Technology Devices International, Ltd FT2232C" | sed -e "s#:.*##" -e "s# #_#g"', '\$', 15)
+ #self.CatMDevices = re.findall("\\\\r\\\\n([A-Za-z0-9_]+)",SSH.getBefore())
+ self.CatMDevices = re.findall("\\\\r\\\\n([A-Za-z0-9_]+)",SSH.getBefore())
else:
if (os.path.isfile('./modules_list.txt')):
os.remove('./modules_list.txt')
- self.command('ls /etc/*/modules*.txt', '\$', 5)
- result = re.search('/etc/ci/modules_list.txt', str(self.ssh.before))
- self.close()
+ SSH.command('ls /etc/*/modules*.txt', '\$', 5)
+ result = re.search('/etc/ci/modules_list.txt', SSH.getBefore())
+ SSH.close()
if result is not None:
logging.debug('Found a module list file on ADB server')
- if terminate_ue_flag == False:
+ if terminate_ue_flag == True:
if len(self.CatMDevices) == 0:
logging.debug('\u001B[1;37;41m CAT-M UE Not Found! \u001B[0m')
sys.exit(1)
- self.close()
+ SSH.close()
def CheckUEStatus_common(self, lock, device_id, statusQueue, idx):
try:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
if self.ADBCentralized:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "dumpsys telephony.registry"', '\$', 15)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "dumpsys telephony.registry"', '\$', 15)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "dumpsys telephony.registry"\'', '\$', 60)
- result = re.search('mServiceState=(?P<serviceState>[0-9]+)', str(self.ssh.before))
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "dumpsys telephony.registry"\'', '\$', 60)
+ result = re.search('mServiceState=(?P<serviceState>[0-9]+)', SSH.getBefore())
serviceState = 'Service State: UNKNOWN'
if result is not None:
lServiceState = int(result.group('serviceState'))
@@ -1819,7 +1110,7 @@ class SSHConnection():
serviceState = 'Service State: IN_SERVICE'
if lServiceState == 2:
serviceState = 'Service State: EMERGENCY_ONLY'
- result = re.search('mDataConnectionState=(?P<dataConnectionState>[0-9]+)', str(self.ssh.before))
+ result = re.search('mDataConnectionState=(?P<dataConnectionState>[0-9]+)', SSH.getBefore())
dataConnectionState = 'Data State: UNKNOWN'
if result is not None:
lDataConnectionState = int(result.group('dataConnectionState'))
@@ -1831,7 +1122,7 @@ class SSHConnection():
dataConnectionState = 'Data State: CONNECTED'
if lDataConnectionState == 3:
dataConnectionState = 'Data State: SUSPENDED'
- result = re.search('mDataConnectionReason=(?P<dataConnectionReason>[0-9a-zA-Z_]+)', str(self.ssh.before))
+ result = re.search('mDataConnectionReason=(?P<dataConnectionReason>[0-9a-zA-Z_]+)', SSH.getBefore())
dataConnectionReason = 'Data Reason: UNKNOWN'
if result is not None:
dataConnectionReason = 'Data Reason: ' + result.group('dataConnectionReason')
@@ -1845,20 +1136,20 @@ class SSHConnection():
qMsg = serviceState + '\n' + dataConnectionState + '\n' + dataConnectionReason
statusQueue.put(qMsg)
lock.release()
- self.close()
+ SSH.close()
except:
os.kill(os.getppid(),signal.SIGUSR1)
def CheckStatusUE(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
check_eNB = True
check_OAI_UE = False
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- self.CreateHtmlTestRow('N/A', 'KO', pStatus)
- self.CreateHtmlTabFooter(False)
+ HTML.CreateHtmlTestRow('N/A', 'KO', pStatus)
+ HTML.CreateHtmlTabFooter(False)
sys.exit(1)
multi_jobs = []
lock = Lock()
@@ -1872,12 +1163,12 @@ class SSHConnection():
i += 1
for job in multi_jobs:
job.join()
- if self.flexranCtrlInstalled and self.flexranCtrlStarted:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd /opt/flexran_rtc', '\$', 5)
- self.command('curl http://localhost:9999/stats | jq \'.\' > log/check_status_' + self.testCase_id + '.log 2>&1', '\$', 5)
- self.command('cat log/check_status_' + self.testCase_id + '.log | jq \'.eNB_config[0].UE\' | grep -c rnti | sed -e "s#^#Nb Connected UE = #"', '\$', 5)
- result = re.search('Nb Connected UE = (?P<nb_ues>[0-9]+)', str(self.ssh.before))
+ if RAN.GetflexranCtrlInstalled() and RAN.GetflexranCtrlStarted():
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('cd /opt/flexran_rtc', '\$', 5)
+ SSH.command('curl http://localhost:9999/stats | jq \'.\' > log/check_status_' + self.testCase_id + '.log 2>&1', '\$', 5)
+ SSH.command('cat log/check_status_' + self.testCase_id + '.log | jq \'.eNB_config[0].UE\' | grep -c rnti | sed -e "s#^#Nb Connected UE = #"', '\$', 5)
+ result = re.search('Nb Connected UE = (?P<nb_ues>[0-9]+)', SSH.getBefore())
passStatus = True
if result is not None:
nb_ues = int(result.group('nb_ues'))
@@ -1888,13 +1179,13 @@ class SSHConnection():
passStatus = False
else:
htmlOptions = 'N/A'
- self.close()
+ SSH.close()
else:
passStatus = True
htmlOptions = 'N/A'
if (status_queue.empty()):
- self.CreateHtmlTestRow(htmlOptions, 'KO', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow(htmlOptions, 'KO', CONST.ALL_PROCESSES_OK)
self.AutoTerminateUEandeNB()
else:
check_status = True
@@ -1908,24 +1199,24 @@ class SSHConnection():
html_cell = '<pre style="background-color:white">UE (' + device_id + ')\n' + message + '</pre>'
html_queue.put(html_cell)
if check_status and passStatus:
- self.CreateHtmlTestRowQueue(htmlOptions, 'OK', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(htmlOptions, 'OK', len(self.UEDevices), html_queue)
else:
- self.CreateHtmlTestRowQueue(htmlOptions, 'KO', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(htmlOptions, 'KO', len(self.UEDevices), html_queue)
self.AutoTerminateUEandeNB()
def GetAllUEIPAddresses(self):
if self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
ue_ip_status = 0
self.UEIPAddresses = []
if (len(self.UEDevices) == 1) and (self.UEDevices[0] == 'OAI-UE'):
if self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '' or self.UESourceCodePath == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
- self.command('ifconfig oaitun_ue1', '\$', 4)
- result = re.search('inet addr:(?P<ueipaddress>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)|inet (?P<ueipaddress2>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', str(self.ssh.before))
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.command('ifconfig oaitun_ue1', '\$', 4)
+ result = re.search('inet addr:(?P<ueipaddress>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)|inet (?P<ueipaddress2>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', SSH.getBefore())
if result is not None:
if result.group('ueipaddress') is not None:
UE_IPAddress = result.group('ueipaddress')
@@ -1936,21 +1227,21 @@ class SSHConnection():
else:
logging.debug('\u001B[1;37;41m UE IP Address Not Found! \u001B[0m')
ue_ip_status -= 1
- self.close()
+ SSH.close()
return ue_ip_status
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
idx = 0
for device_id in self.UEDevices:
- if self.UEDevicesStatus[idx] != UE_STATUS_ATTACHED:
+ if self.UEDevicesStatus[idx] != CONST.UE_STATUS_ATTACHED:
idx += 1
continue
count = 0
while count < 4:
if self.ADBCentralized:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "ip addr show | grep rmnet"', '\$', 15)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "ip addr show | grep rmnet"', '\$', 15)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ip addr show | grep rmnet"\'', '\$', 60)
- result = re.search('inet (?P<ueipaddress>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\/[0-9]+[0-9a-zA-Z\.\s]+', str(self.ssh.before))
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ip addr show | grep rmnet"\'', '\$', 60)
+ result = re.search('inet (?P<ueipaddress>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\/[0-9]+[0-9a-zA-Z\.\s]+', SSH.getBefore())
if result is None:
logging.debug('\u001B[1;37;41m UE IP Address Not Found! \u001B[0m')
time.sleep(1)
@@ -1969,7 +1260,7 @@ class SSHConnection():
continue
self.UEIPAddresses.append(UE_IPAddress)
idx += 1
- self.close()
+ SSH.close()
return ue_ip_status
def ping_iperf_wrong_exit(self, lock, UE_IPAddress, device_id, statusQueue, message):
@@ -1985,50 +1276,50 @@ class SSHConnection():
# Launch ping on the EPC side (true for ltebox and old open-air-cn)
# But for OAI-Rel14-CUPS, we launch from python executor
launchFromEpc = True
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
+ if re.match('OAI-Rel14-CUPS', EPC.GetType(), re.IGNORECASE):
launchFromEpc = False
ping_time = re.findall("-c (\d+)",str(self.ping_args))
if launchFromEpc:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd ' + self.EPCSourceCodePath, '\$', 5)
- self.command('cd scripts', '\$', 5)
- ping_status = self.command('stdbuf -o0 ping ' + self.ping_args + ' ' + UE_IPAddress + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('cd ' + EPC.GetSourceCodePath(), '\$', 5)
+ SSH.command('cd scripts', '\$', 5)
+ ping_status = SSH.command('stdbuf -o0 ping ' + self.ping_args + ' ' + UE_IPAddress + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '_' + device_id + '.log', '\$', int(ping_time[0])*1.5)
else:
cmd = 'ping ' + self.ping_args + ' ' + UE_IPAddress + ' 2>&1 > ping_' + self.testCase_id + '_' + device_id + '.log'
message = cmd + '\n'
logging.debug(cmd)
ret = subprocess.run(cmd, shell=True)
ping_status = ret.returncode
- self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'ping_' + self.testCase_id + '_' + device_id + '.log', self.EPCSourceCodePath + '/scripts')
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cat ' + self.EPCSourceCodePath + '/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), 'ping_' + self.testCase_id + '_' + device_id + '.log', EPC.GetSourceCodePath() + '/scripts')
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('cat ' + EPC.GetSourceCodePath() + '/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
# TIMEOUT CASE
if ping_status < 0:
message = 'Ping with UE (' + str(UE_IPAddress) + ') crashed due to TIMEOUT!'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
- self.close()
+ SSH.close()
self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
return
- result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', str(self.ssh.before))
+ result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', SSH.getBefore())
if result is None:
message = 'Packet Loss Not Found!'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
- self.close()
+ SSH.close()
self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
return
packetloss = result.group('packetloss')
if float(packetloss) == 100:
message = 'Packet Loss is 100%'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
- self.close()
+ SSH.close()
self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
return
- result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', str(self.ssh.before))
+ result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', SSH.getBefore())
if result is None:
message = 'Ping RTT_Min RTT_Avg RTT_Max Not Found!'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
- self.close()
+ SSH.close()
self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
return
rtt_min = result.group('rtt_min')
@@ -2062,7 +1353,7 @@ class SSHConnection():
statusQueue.put(UE_IPAddress)
statusQueue.put(qMsg)
lock.release()
- self.close()
+ SSH.close()
except:
os.kill(os.getppid(),signal.SIGUSR1)
@@ -2070,41 +1361,41 @@ class SSHConnection():
html_queue = SimpleQueue()
html_cell = '<pre style="background-color:white">OAI UE ping result\n' + qMsg + '</pre>'
html_queue.put(html_cell)
- self.CreateHtmlTestRowQueue(self.ping_args, 'KO', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', len(self.UEDevices), html_queue)
def PingNoS1(self):
check_eNB = True
check_OAI_UE = True
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- self.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
+ HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
self.AutoTerminateUEandeNB()
return
ping_from_eNB = re.search('oaitun_enb1', str(self.ping_args))
if ping_from_eNB is not None:
- if self.eNBIPAddress == '' or self.eNBUserName == '' or self.eNBPassword == '':
- Usage()
+ if RAN.GeteNBIPAddress() == '' or RAN.GeteNBUserName() == '' or RAN.GeteNBPassword() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
else:
if self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '':
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
try:
if ping_from_eNB is not None:
- self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
- self.command('cd ' + self.eNBSourceCodePath + '/cmake_targets/', '\$', 5)
+ SSH.open(RAN.GeteNBIPAddress(), RAN.GeteNBUserName(), RAN.GeteNBPassword())
+ SSH.command('cd ' + RAN.GeteNBSourceCodePath() + '/cmake_targets/', '\$', 5)
else:
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
- self.command('cd ' + self.UESourceCodePath + '/cmake_targets/', '\$', 5)
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets/', '\$', 5)
ping_time = re.findall("-c (\d+)",str(self.ping_args))
- ping_status = self.command('stdbuf -o0 ping ' + self.ping_args + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '.log', '\$', int(ping_time[0])*1.5)
+ ping_status = SSH.command('stdbuf -o0 ping ' + self.ping_args + ' 2>&1 | stdbuf -o0 tee ping_' + self.testCase_id + '.log', '\$', int(ping_time[0])*1.5)
# TIMEOUT CASE
if ping_status < 0:
message = 'Ping with OAI UE crashed due to TIMEOUT!'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
self.PingNoS1_wrong_exit(message)
return
- result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', str(self.ssh.before))
+ result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', SSH.getBefore())
if result is None:
message = 'Packet Loss Not Found!'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
@@ -2116,7 +1407,7 @@ class SSHConnection():
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
self.PingNoS1_wrong_exit(message)
return
- result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', str(self.ssh.before))
+ result = re.search('rtt min\/avg\/max\/mdev = (?P<rtt_min>[0-9\.]+)\/(?P<rtt_avg>[0-9\.]+)\/(?P<rtt_max>[0-9\.]+)\/[0-9\.]+ ms', SSH.getBefore())
if result is None:
message = 'Ping RTT_Min RTT_Avg RTT_Max Not Found!'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
@@ -2144,33 +1435,33 @@ class SSHConnection():
elif float(packetloss) > 0:
qMsg += '\nPacket Loss is not 0%'
logging.debug('\u001B[1;30;43m Packet Loss is not 0% \u001B[0m')
- self.close()
+ SSH.close()
html_queue = SimpleQueue()
ip_addr = 'TBD'
html_cell = '<pre style="background-color:white">OAI UE ping result\n' + qMsg + '</pre>'
html_queue.put(html_cell)
if packetLossOK:
- self.CreateHtmlTestRowQueue(self.ping_args, 'OK', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', len(self.UEDevices), html_queue)
else:
- self.CreateHtmlTestRowQueue(self.ping_args, 'KO', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', len(self.UEDevices), html_queue)
# copying on the EPC server for logCollection
if ping_from_eNB is not None:
- copyin_res = self.copyin(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, self.eNBSourceCodePath + '/cmake_targets/ping_' + self.testCase_id + '.log', '.')
+ copyin_res = SSH.copyin(RAN.GeteNBIPAddress(), RAN.GeteNBUserName(), RAN.GeteNBPassword(), RAN.GeteNBSourceCodePath() + '/cmake_targets/ping_' + self.testCase_id + '.log', '.')
else:
- copyin_res = self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/ping_' + self.testCase_id + '.log', '.')
+ copyin_res = SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/ping_' + self.testCase_id + '.log', '.')
if (copyin_res == 0):
- self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'ping_' + self.testCase_id + '.log', self.EPCSourceCodePath + '/scripts')
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), 'ping_' + self.testCase_id + '.log', EPC.GetSourceCodePath() + '/scripts')
except:
os.kill(os.getppid(),signal.SIGUSR1)
def Ping(self):
- result = re.search('noS1', str(self.Initialize_eNB_args))
+ result = re.search('noS1', str(RAN.GetInitialize_eNB_args()))
if result is not None:
self.PingNoS1()
return
- if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
check_eNB = True
if (len(self.UEDevices) == 1) and (self.UEDevices[0] == 'OAI-UE'):
@@ -2179,12 +1470,12 @@ class SSHConnection():
check_OAI_UE = False
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- self.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
+ HTML.CreateHtmlTestRow(self.ping_args, 'KO', pStatus)
self.AutoTerminateUEandeNB()
return
ueIpStatus = self.GetAllUEIPAddresses()
if (ueIpStatus < 0):
- self.CreateHtmlTestRow(self.ping_args, 'KO', UE_IP_ADDRESS_ISSUE)
+ HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
self.AutoTerminateUEandeNB()
return
multi_jobs = []
@@ -2202,7 +1493,7 @@ class SSHConnection():
job.join()
if (status_queue.empty()):
- self.CreateHtmlTestRow(self.ping_args, 'KO', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.ALL_PROCESSES_OK)
self.AutoTerminateUEandeNB()
else:
ping_status = True
@@ -2217,9 +1508,9 @@ class SSHConnection():
html_cell = '<pre style="background-color:white">UE (' + device_id + ')\nIP Address : ' + ip_addr + '\n' + message + '</pre>'
html_queue.put(html_cell)
if (ping_status):
- self.CreateHtmlTestRowQueue(self.ping_args, 'OK', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.ping_args, 'OK', len(self.UEDevices), html_queue)
else:
- self.CreateHtmlTestRowQueue(self.ping_args, 'KO', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.ping_args, 'KO', len(self.UEDevices), html_queue)
self.AutoTerminateUEandeNB()
def Iperf_ComputeTime(self):
@@ -2255,8 +1546,8 @@ class SSHConnection():
return result
def Iperf_analyzeV2TCPOutput(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options):
- self.command('awk -f /tmp/tcp_iperf_stats.awk /tmp/CI-eNB/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
- result = re.search('Avg Bitrate : (?P<average>[0-9\.]+ Mbits\/sec) Max Bitrate : (?P<maximum>[0-9\.]+ Mbits\/sec) Min Bitrate : (?P<minimum>[0-9\.]+ Mbits\/sec)', str(self.ssh.before))
+ SSH.command('awk -f /tmp/tcp_iperf_stats.awk /tmp/CI-eNB/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ result = re.search('Avg Bitrate : (?P<average>[0-9\.]+ Mbits\/sec) Max Bitrate : (?P<maximum>[0-9\.]+ Mbits\/sec) Min Bitrate : (?P<minimum>[0-9\.]+ Mbits\/sec)', SSH.getBefore())
if result is not None:
avgbitrate = result.group('average')
maxbitrate = result.group('maximum')
@@ -2285,9 +1576,9 @@ class SSHConnection():
if result is None:
return self.Iperf_analyzeV2TCPOutput(lock, UE_IPAddress, device_id, statusQueue, iperf_real_options)
- result = re.search('Server Report:', str(self.ssh.before))
+ result = re.search('Server Report:', SSH.getBefore())
if result is None:
- result = re.search('read failed: Connection refused', str(self.ssh.before))
+ result = re.search('read failed: Connection refused', SSH.getBefore())
if result is not None:
logging.debug('\u001B[1;37;41m Could not connect to iperf server! \u001B[0m')
else:
@@ -2311,7 +1602,7 @@ class SSHConnection():
req_bandwidth = '%.1f Gbits/sec' % req_bw
req_bw = req_bw * 1000000000
- result = re.search('Server Report:\\\\r\\\\n(?:|\[ *\d+\].*) (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(\d+\/..\d+) +(\((?P<packetloss>[0-9\.]+)%\))', str(self.ssh.before))
+ result = re.search('Server Report:\\\\r\\\\n(?:|\[ *\d+\].*) (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(\d+\/..\d+) +(\((?P<packetloss>[0-9\.]+)%\))', SSH.getBefore())
if result is not None:
bitrate = result.group('bitrate')
packetloss = result.group('packetloss')
@@ -2462,9 +1753,9 @@ class SSHConnection():
def Iperf_analyzeV3Output(self, lock, UE_IPAddress, device_id, statusQueue):
- result = re.search('(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?:|[0-9\.]+ ms +\d+\/\d+ \((?P<packetloss>[0-9\.]+)%\)) +(?:|receiver)\\\\r\\\\n(?:|\[ *\d+\] Sent \d+ datagrams)\\\\r\\\\niperf Done\.', str(self.ssh.before))
+ result = re.search('(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?:|[0-9\.]+ ms +\d+\/\d+ \((?P<packetloss>[0-9\.]+)%\)) +(?:|receiver)\\\\r\\\\n(?:|\[ *\d+\] Sent \d+ datagrams)\\\\r\\\\niperf Done\.', SSH.getBefore())
if result is None:
- result = re.search('(?P<error>iperf: error - [a-zA-Z0-9 :]+)', str(self.ssh.before))
+ result = re.search('(?P<error>iperf: error - [a-zA-Z0-9 :]+)', SSH.getBefore())
lock.acquire()
statusQueue.put(-1)
statusQueue.put(device_id)
@@ -2513,7 +1804,7 @@ class SSHConnection():
# Launch iperf server on EPC side (true for ltebox and old open-air-cn0
# But for OAI-Rel14-CUPS, we launch from python executor and we are using its IP address as iperf client address
launchFromEpc = True
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
+ if re.match('OAI-Rel14-CUPS', EPC.GetType(), re.IGNORECASE):
launchFromEpc = False
cmd = 'hostname -I'
ret = subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, encoding='utf-8')
@@ -2521,14 +1812,14 @@ class SSHConnection():
EPC_Iperf_UE_IPAddress = ret.stdout.strip()
port = 5001 + idx
if launchFromEpc:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
- self.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('cd ' + EPC.GetSourceCodePath() + '/scripts', '\$', 5)
+ SSH.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
if udpIperf:
- self.command('echo $USER; nohup iperf -u -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.EPCUserName, 5)
+ SSH.command('echo $USER; nohup iperf -u -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', EPC.GetUserName(), 5)
else:
- self.command('echo $USER; nohup iperf -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.EPCUserName, 5)
- self.close()
+ SSH.command('echo $USER; nohup iperf -s -i 1 -p ' + str(port) + ' > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', EPC.GetUserName(), 5)
+ SSH.close()
else:
if self.ueIperfVersion == self.dummyIperfVersion:
prefix = ''
@@ -2546,11 +1837,11 @@ class SSHConnection():
# Launch iperf client on UE
if (device_id == 'OAI-UE'):
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
- self.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
else:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.command('cd ' + EPC.GetSourceCodePath() + '/scripts', '\$', 5)
iperf_time = self.Iperf_ComputeTime()
time.sleep(0.5)
@@ -2561,50 +1852,50 @@ class SSHConnection():
modified_options = modified_options.replace('-R','')
time.sleep(0.5)
- self.command('rm -f iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ SSH.command('rm -f iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
if (device_id == 'OAI-UE'):
- iperf_status = self.command('iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + ' -B ' + UE_IPAddress + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
+ iperf_status = SSH.command('iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + ' -B ' + UE_IPAddress + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
else:
if self.ADBCentralized:
- iperf_status = self.command('stdbuf -o0 adb -s ' + device_id + ' shell "/data/local/tmp/iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + '" 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
+ iperf_status = SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "/data/local/tmp/iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + '" 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
else:
- iperf_status = self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + '"\' 2>&1 > iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
- self.command('fromdos -o iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
- self.command('cat iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ iperf_status = SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf -c ' + EPC_Iperf_UE_IPAddress + ' ' + modified_options + ' -p ' + str(port) + '"\' 2>&1 > iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
+ SSH.command('fromdos -o iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ SSH.command('cat iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
# TIMEOUT Case
if iperf_status < 0:
- self.close()
+ SSH.close()
message = 'iperf on UE (' + str(UE_IPAddress) + ') crashed due to TIMEOUT !'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
- self.close()
+ SSH.close()
self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
return
clientStatus = self.Iperf_analyzeV2Output(lock, UE_IPAddress, device_id, statusQueue, modified_options)
- self.close()
+ SSH.close()
# Kill iperf server on EPC side
if launchFromEpc:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('killall --signal SIGKILL iperf', self.EPCUserName, 5)
- self.close()
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('killall --signal SIGKILL iperf', EPC.GetUserName(), 5)
+ SSH.close()
else:
cmd = 'killall --signal SIGKILL iperf'
logging.debug(cmd)
subprocess.run(cmd, shell=True)
time.sleep(1)
- self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', self.EPCSourceCodePath + '/scripts')
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', EPC.GetSourceCodePath() + '/scripts')
# in case of failure, retrieve server log
if (clientStatus == -1) or (clientStatus == -2):
if launchFromEpc:
time.sleep(1)
if (os.path.isfile('iperf_server_' + self.testCase_id + '_' + device_id + '.log')):
os.remove('iperf_server_' + self.testCase_id + '_' + device_id + '.log')
- self.copyin(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, self.EPCSourceCodePath + '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
+ SSH.copyin(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), EPC.GetSourceCodePath() + '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, modified_options)
# in case of OAI-UE
if (device_id == 'OAI-UE'):
- self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_' + self.testCase_id + '_' + device_id + '.log', '.')
- self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'iperf_' + self.testCase_id + '_' + device_id + '.log', self.EPCSourceCodePath + '/scripts')
+ SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_' + self.testCase_id + '_' + device_id + '.log', '.')
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), 'iperf_' + self.testCase_id + '_' + device_id + '.log', EPC.GetSourceCodePath() + '/scripts')
def Iperf_common(self, lock, UE_IPAddress, device_id, idx, ue_num, statusQueue):
try:
@@ -2616,48 +1907,48 @@ class SSHConnection():
self.ueIperfVersion = '2.0.5'
if (device_id != 'OAI-UE'):
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
# if by chance ADB server and EPC are on the same remote host, at least log collection will take care of it
- self.command('if [ ! -d ' + self.EPCSourceCodePath + '/scripts ]; then mkdir -p ' + self.EPCSourceCodePath + '/scripts ; fi', '\$', 5)
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
+ SSH.command('if [ ! -d ' + EPC.GetSourceCodePath() + '/scripts ]; then mkdir -p ' + EPC.GetSourceCodePath() + '/scripts ; fi', '\$', 5)
+ SSH.command('cd ' + EPC.GetSourceCodePath() + '/scripts', '\$', 5)
# Checking if iperf / iperf3 are installed
if self.ADBCentralized:
- self.command('adb -s ' + device_id + ' shell "ls /data/local/tmp"', '\$', 5)
+ SSH.command('adb -s ' + device_id + ' shell "ls /data/local/tmp"', '\$', 5)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ls /data/local/tmp"\'', '\$', 60)
- result = re.search('iperf3', str(self.ssh.before))
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ls /data/local/tmp"\'', '\$', 60)
+ result = re.search('iperf3', SSH.getBefore())
if result is None:
- result = re.search('iperf', str(self.ssh.before))
+ result = re.search('iperf', SSH.getBefore())
if result is None:
message = 'Neither iperf nor iperf3 installed on UE!'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
- self.close()
+ SSH.close()
self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
return
else:
if self.ADBCentralized:
- self.command('adb -s ' + device_id + ' shell "/data/local/tmp/iperf --version"', '\$', 5)
+ SSH.command('adb -s ' + device_id + ' shell "/data/local/tmp/iperf --version"', '\$', 5)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf --version"\'', '\$', 60)
- result = re.search('iperf version 2.0.5', str(self.ssh.before))
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf --version"\'', '\$', 60)
+ result = re.search('iperf version 2.0.5', SSH.getBefore())
if result is not None:
self.ueIperfVersion = '2.0.5'
- result = re.search('iperf version 2.0.10', str(self.ssh.before))
+ result = re.search('iperf version 2.0.10', SSH.getBefore())
if result is not None:
self.ueIperfVersion = '2.0.10'
else:
useIperf3 = True
- self.close()
+ SSH.close()
else:
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
- self.command('iperf --version', '\$', 5)
- result = re.search('iperf version 2.0.5', str(self.ssh.before))
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.command('iperf --version', '\$', 5)
+ result = re.search('iperf version 2.0.5', SSH.getBefore())
if result is not None:
self.ueIperfVersion = '2.0.5'
- result = re.search('iperf version 2.0.10', str(self.ssh.before))
+ result = re.search('iperf version 2.0.10', SSH.getBefore())
if result is not None:
self.ueIperfVersion = '2.0.10'
- self.close()
+ SSH.close()
# in case of iperf, UL has its own function
if (not useIperf3):
result = re.search('-R', str(self.iperf_args))
@@ -2667,44 +1958,44 @@ class SSHConnection():
# Launch the IPERF server on the UE side for DL
if (device_id == 'OAI-UE'):
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
- self.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
- self.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
+ SSH.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
result = re.search('-u', str(self.iperf_args))
if result is None:
- self.command('echo $USER; nohup iperf -B ' + UE_IPAddress + ' -s -i 1 > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.UEUserName, 5)
+ SSH.command('echo $USER; nohup iperf -B ' + UE_IPAddress + ' -s -i 1 > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.UEUserName, 5)
udpIperf = False
else:
- self.command('echo $USER; nohup iperf -B ' + UE_IPAddress + ' -u -s -i 1 > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.UEUserName, 5)
+ SSH.command('echo $USER; nohup iperf -B ' + UE_IPAddress + ' -u -s -i 1 > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.UEUserName, 5)
else:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.command('cd ' + EPC.GetSourceCodePath() + '/scripts', '\$', 5)
if self.ADBCentralized:
if (useIperf3):
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/iperf3 -s &', '\$', 5)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/iperf3 -s &', '\$', 5)
else:
- self.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ SSH.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
result = re.search('-u', str(self.iperf_args))
if result is None:
- self.command('echo $USER; nohup adb -s ' + device_id + ' shell "/data/local/tmp/iperf -s -i 1" > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 5)
+ SSH.command('echo $USER; nohup adb -s ' + device_id + ' shell "/data/local/tmp/iperf -s -i 1" > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 5)
udpIperf = False
else:
- self.command('echo $USER; nohup adb -s ' + device_id + ' shell "/data/local/tmp/iperf -u -s -i 1" > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 5)
+ SSH.command('echo $USER; nohup adb -s ' + device_id + ' shell "/data/local/tmp/iperf -u -s -i 1" > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 5)
else:
- self.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
- self.command('echo $USER; nohup ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf -u -s -i 1" \' 2>&1 > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 60)
+ SSH.command('rm -f iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ SSH.command('echo $USER; nohup ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "/data/local/tmp/iperf -u -s -i 1" \' 2>&1 > iperf_server_' + self.testCase_id + '_' + device_id + '.log &', self.ADBUserName, 60)
time.sleep(0.5)
- self.close()
+ SSH.close()
# Launch the IPERF client on the EPC side for DL (true for ltebox and old open-air-cn
# But for OAI-Rel14-CUPS, we launch from python executor
launchFromEpc = True
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
+ if re.match('OAI-Rel14-CUPS', EPC.GetType(), re.IGNORECASE):
launchFromEpc = False
if launchFromEpc:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('cd ' + EPC.GetSourceCodePath() + '/scripts', '\$', 5)
iperf_time = self.Iperf_ComputeTime()
time.sleep(0.5)
@@ -2715,18 +2006,18 @@ class SSHConnection():
time.sleep(0.5)
if launchFromEpc:
- self.command('rm -f iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ SSH.command('rm -f iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
else:
if (os.path.isfile('iperf_' + self.testCase_id + '_' + device_id + '.log')):
os.remove('iperf_' + self.testCase_id + '_' + device_id + '.log')
if (useIperf3):
- self.command('stdbuf -o0 iperf3 -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
+ SSH.command('stdbuf -o0 iperf3 -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
clientStatus = 0
self.Iperf_analyzeV3Output(lock, UE_IPAddress, device_id, statusQueue)
else:
if launchFromEpc:
- iperf_status = self.command('stdbuf -o0 iperf -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
+ iperf_status = SSH.command('stdbuf -o0 iperf -c ' + UE_IPAddress + ' ' + modified_options + ' 2>&1 | stdbuf -o0 tee iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', int(iperf_time)*5.0)
else:
if self.ueIperfVersion == self.dummyIperfVersion:
prefix = ''
@@ -2739,46 +2030,46 @@ class SSHConnection():
logging.debug(cmd)
ret = subprocess.run(cmd, shell=True)
iperf_status = ret.returncode
- self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'iperf_' + self.testCase_id + '_' + device_id + '.log', self.EPCSourceCodePath + '/scripts')
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cat ' + self.EPCSourceCodePath + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), 'iperf_' + self.testCase_id + '_' + device_id + '.log', EPC.GetSourceCodePath() + '/scripts')
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('cat ' + EPC.GetSourceCodePath() + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
if iperf_status < 0:
if launchFromEpc:
- self.close()
+ SSH.close()
message = 'iperf on UE (' + str(UE_IPAddress) + ') crashed due to TIMEOUT !'
logging.debug('\u001B[1;37;41m ' + message + ' \u001B[0m')
self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, message)
return
clientStatus = self.Iperf_analyzeV2Output(lock, UE_IPAddress, device_id, statusQueue, modified_options)
- self.close()
+ SSH.close()
# Kill the IPERF server that runs in background
if (device_id == 'OAI-UE'):
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
- self.command('killall iperf', '\$', 5)
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.command('killall iperf', '\$', 5)
else:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
if self.ADBCentralized:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell ps | grep --color=never iperf | grep -v grep', '\$', 5)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell ps | grep --color=never iperf | grep -v grep', '\$', 5)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ps" | grep --color=never iperf | grep -v grep\'', '\$', 60)
- result = re.search('shell +(?P<pid>\d+)', str(self.ssh.before))
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ps" | grep --color=never iperf | grep -v grep\'', '\$', 60)
+ result = re.search('shell +(?P<pid>\d+)', SSH.getBefore())
if result is not None:
pid_iperf = result.group('pid')
if self.ADBCentralized:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell kill -KILL ' + pid_iperf, '\$', 5)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell kill -KILL ' + pid_iperf, '\$', 5)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "kill -KILL ' + pid_iperf + '"\'', '\$', 60)
- self.close()
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "kill -KILL ' + pid_iperf + '"\'', '\$', 60)
+ SSH.close()
# if the client report is absent, try to analyze the server log file
if (clientStatus == -1):
time.sleep(1)
if (os.path.isfile('iperf_server_' + self.testCase_id + '_' + device_id + '.log')):
os.remove('iperf_server_' + self.testCase_id + '_' + device_id + '.log')
if (device_id == 'OAI-UE'):
- self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
+ SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
else:
- self.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, self.EPCSourceCodePath + '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
+ SSH.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, EPC.GetSourceCodePath() + '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
# fromdos has to be called on the python executor not on ADB server
cmd = 'fromdos -o iperf_server_' + self.testCase_id + '_' + device_id + '.log'
subprocess.run(cmd, shell=True)
@@ -2788,29 +2079,29 @@ class SSHConnection():
if (device_id == 'OAI-UE'):
if (os.path.isfile('iperf_server_' + self.testCase_id + '_' + device_id + '.log')):
if not launchFromEpc:
- self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', self.EPCSourceCodePath + '/scripts')
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', EPC.GetSourceCodePath() + '/scripts')
else:
- self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
- self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', self.EPCSourceCodePath + '/scripts')
+ SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), 'iperf_server_' + self.testCase_id + '_' + device_id + '.log', EPC.GetSourceCodePath() + '/scripts')
except:
os.kill(os.getppid(),signal.SIGUSR1)
def IperfNoS1(self):
- if self.eNBIPAddress == '' or self.eNBUserName == '' or self.eNBPassword == '' or self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '':
- Usage()
+ if RAN.GeteNBIPAddress() == '' or RAN.GeteNBUserName() == '' or RAN.GeteNBPassword() == '' or self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
check_eNB = True
check_OAI_UE = True
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- self.CreateHtmlTestRow(self.iperf_args, 'KO', pStatus)
+ HTML.CreateHtmlTestRow(self.iperf_args, 'KO', pStatus)
self.AutoTerminateUEandeNB()
return
server_on_enb = re.search('-R', str(self.iperf_args))
if server_on_enb is not None:
- iServerIPAddr = self.eNBIPAddress
- iServerUser = self.eNBUserName
- iServerPasswd = self.eNBPassword
+ iServerIPAddr = RAN.GeteNBIPAddress()
+ iServerUser = RAN.GeteNBUserName()
+ iServerPasswd = RAN.GeteNBPassword()
iClientIPAddr = self.UEIPAddress
iClientUser = self.UEUserName
iClientPasswd = self.UEPassword
@@ -2818,29 +2109,29 @@ class SSHConnection():
iServerIPAddr = self.UEIPAddress
iServerUser = self.UEUserName
iServerPasswd = self.UEPassword
- iClientIPAddr = self.eNBIPAddress
- iClientUser = self.eNBUserName
- iClientPasswd = self.eNBPassword
+ iClientIPAddr = RAN.GeteNBIPAddress()
+ iClientUser = RAN.GeteNBUserName()
+ iClientPasswd = RAN.GeteNBPassword()
if self.iperf_options != 'sink':
# Starting the iperf server
- self.open(iServerIPAddr, iServerUser, iServerPasswd)
+ SSH.open(iServerIPAddr, iServerUser, iServerPasswd)
# args SHALL be "-c client -u any"
# -c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1
# -B 10.0.1.1 -u -s -i 1 -fm
server_options = re.sub('-u.*$', '-u -s -i 1 -fm', str(self.iperf_args))
server_options = server_options.replace('-c','-B')
- self.command('rm -f /tmp/tmp_iperf_server_' + self.testCase_id + '.log', '\$', 5)
- self.command('echo $USER; nohup iperf ' + server_options + ' > /tmp/tmp_iperf_server_' + self.testCase_id + '.log 2>&1 &', iServerUser, 5)
+ SSH.command('rm -f /tmp/tmp_iperf_server_' + self.testCase_id + '.log', '\$', 5)
+ SSH.command('echo $USER; nohup iperf ' + server_options + ' > /tmp/tmp_iperf_server_' + self.testCase_id + '.log 2>&1 &', iServerUser, 5)
time.sleep(0.5)
- self.close()
+ SSH.close()
# Starting the iperf client
modified_options = self.Iperf_ComputeModifiedBW(0, 1)
modified_options = modified_options.replace('-R','')
iperf_time = self.Iperf_ComputeTime()
- self.open(iClientIPAddr, iClientUser, iClientPasswd)
- self.command('rm -f /tmp/tmp_iperf_' + self.testCase_id + '.log', '\$', 5)
- iperf_status = self.command('stdbuf -o0 iperf ' + modified_options + ' 2>&1 | stdbuf -o0 tee /tmp/tmp_iperf_' + self.testCase_id + '.log', '\$', int(iperf_time)*5.0)
+ SSH.open(iClientIPAddr, iClientUser, iClientPasswd)
+ SSH.command('rm -f /tmp/tmp_iperf_' + self.testCase_id + '.log', '\$', 5)
+ iperf_status = SSH.command('stdbuf -o0 iperf ' + modified_options + ' 2>&1 | stdbuf -o0 tee /tmp/tmp_iperf_' + self.testCase_id + '.log', '\$', int(iperf_time)*5.0)
status_queue = SimpleQueue()
lock = Lock()
if iperf_status < 0:
@@ -2856,28 +2147,29 @@ class SSHConnection():
status_queue.put('Sink Test : no check')
else:
clientStatus = self.Iperf_analyzeV2Output(lock, '10.0.1.2', 'OAI-UE', status_queue, modified_options)
- self.close()
+ SSH.close()
# Stopping the iperf server
if self.iperf_options != 'sink':
- self.open(iServerIPAddr, iServerUser, iServerPasswd)
- self.command('killall --signal SIGKILL iperf', '\$', 5)
+ SSH.open(iServerIPAddr, iServerUser, iServerPasswd)
+ SSH.command('killall --signal SIGKILL iperf', '\$', 5)
time.sleep(0.5)
- self.close()
+ SSH.close()
+
if (clientStatus == -1):
if (os.path.isfile('iperf_server_' + self.testCase_id + '.log')):
os.remove('iperf_server_' + self.testCase_id + '.log')
- self.copyin(iServerIPAddr, iServerUser, iServerPasswd, '/tmp/tmp_iperf_server_' + self.testCase_id + '.log', 'iperf_server_' + self.testCase_id + '_OAI-UE.log')
+ SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, '/tmp/tmp_iperf_server_' + self.testCase_id + '.log', 'iperf_server_' + self.testCase_id + '_OAI-UE.log')
self.Iperf_analyzeV2Server(lock, '10.0.1.2', 'OAI-UE', status_queue, modified_options)
# copying on the EPC server for logCollection
if (clientStatus == -1):
- copyin_res = self.copyin(iServerIPAddr, iServerUser, iServerPasswd, '/tmp/tmp_iperf_server_' + self.testCase_id + '.log', 'iperf_server_' + self.testCase_id + '_OAI-UE.log')
+ copyin_res = SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, '/tmp/tmp_iperf_server_' + self.testCase_id + '.log', 'iperf_server_' + self.testCase_id + '_OAI-UE.log')
if (copyin_res == 0):
- self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'iperf_server_' + self.testCase_id + '_OAI-UE.log', self.EPCSourceCodePath + '/scripts')
- copyin_res = self.copyin(iClientIPAddr, iClientUser, iClientPasswd, '/tmp/tmp_iperf_' + self.testCase_id + '.log', 'iperf_' + self.testCase_id + '_OAI-UE.log')
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), 'iperf_server_' + self.testCase_id + '_OAI-UE.log', EPC.GetSourceCodePath() + '/scripts')
+ copyin_res = SSH.copyin(iClientIPAddr, iClientUser, iClientPasswd, '/tmp/tmp_iperf_' + self.testCase_id + '.log', 'iperf_' + self.testCase_id + '_OAI-UE.log')
if (copyin_res == 0):
- self.copyout(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, 'iperf_' + self.testCase_id + '_OAI-UE.log', self.EPCSourceCodePath + '/scripts')
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), 'iperf_' + self.testCase_id + '_OAI-UE.log', EPC.GetSourceCodePath() + '/scripts')
iperf_noperf = False
if status_queue.empty():
iperf_status = False
@@ -2896,20 +2188,20 @@ class SSHConnection():
html_cell = '<pre style="background-color:white">UE (' + device_id + ')\nIP Address : ' + ip_addr + '\n' + message + '</pre>'
html_queue.put(html_cell)
if (iperf_noperf and iperf_status):
- self.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', len(self.UEDevices), html_queue)
elif (iperf_status):
- self.CreateHtmlTestRowQueue(self.iperf_args, 'OK', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', len(self.UEDevices), html_queue)
else:
- self.CreateHtmlTestRowQueue(self.iperf_args, 'KO', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', len(self.UEDevices), html_queue)
self.AutoTerminateUEandeNB()
def Iperf(self):
- result = re.search('noS1', str(self.Initialize_eNB_args))
+ result = re.search('noS1', str(RAN.GetInitialize_eNB_args()))
if result is not None:
self.IperfNoS1()
return
- if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '' or self.EPCSourceCodePath == '' or self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetSourceCodePath() == '' or self.ADBIPAddress == '' or self.ADBUserName == '' or self.ADBPassword == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
check_eNB = True
if (len(self.UEDevices) == 1) and (self.UEDevices[0] == 'OAI-UE'):
@@ -2918,12 +2210,13 @@ class SSHConnection():
check_OAI_UE = False
pStatus = self.CheckProcessExist(check_eNB, check_OAI_UE)
if (pStatus < 0):
- self.CreateHtmlTestRow(self.iperf_args, 'KO', pStatus)
+ HTML.CreateHtmlTestRow(self.iperf_args, 'KO', pStatus)
self.AutoTerminateUEandeNB()
return
ueIpStatus = self.GetAllUEIPAddresses()
if (ueIpStatus < 0):
- self.CreateHtmlTestRow(self.iperf_args, 'KO', UE_IP_ADDRESS_ISSUE)
+ logging.debug('going here')
+ HTML.CreateHtmlTestRow(self.iperf_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
self.AutoTerminateUEandeNB()
return
@@ -2945,7 +2238,7 @@ class SSHConnection():
status_queue = SimpleQueue()
for UE_IPAddress in self.UEIPAddresses:
device_id = self.UEDevices[i]
- p = Process(target = SSH.Iperf_common, args = (lock,UE_IPAddress,device_id,i,ue_num,status_queue,))
+ p = Process(target = self.Iperf_common, args = (lock,UE_IPAddress,device_id,i,ue_num,status_queue,))
p.daemon = True
p.start()
multi_jobs.append(p)
@@ -2954,7 +2247,7 @@ class SSHConnection():
job.join()
if (status_queue.empty()):
- self.CreateHtmlTestRow(self.iperf_args, 'KO', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow(self.iperf_args, 'KO', CONST.ALL_PROCESSES_OK)
self.AutoTerminateUEandeNB()
else:
iperf_status = True
@@ -2972,11 +2265,11 @@ class SSHConnection():
html_cell = '<pre style="background-color:white">UE (' + device_id + ')\nIP Address : ' + ip_addr + '\n' + message + '</pre>'
html_queue.put(html_cell)
if (iperf_noperf and iperf_status):
- self.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', len(self.UEDevices), html_queue)
elif (iperf_status):
- self.CreateHtmlTestRowQueue(self.iperf_args, 'OK', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', len(self.UEDevices), html_queue)
else:
- self.CreateHtmlTestRowQueue(self.iperf_args, 'KO', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', len(self.UEDevices), html_queue)
self.AutoTerminateUEandeNB()
def CheckProcessExist(self, check_eNB, check_OAI_UE):
@@ -2984,17 +2277,17 @@ class SSHConnection():
status_queue = SimpleQueue()
# in noS1 config, no need to check status from EPC
# in gNB also currently no need to check
- result = re.search('noS1|band78', str(self.Initialize_eNB_args))
+ result = re.search('noS1|band78', str(RAN.GetInitialize_eNB_args()))
if result is None:
- p = Process(target = SSH.CheckHSSProcess, args = (status_queue,))
+ p = Process(target = EPC.CheckHSSProcess, args = (status_queue,))
p.daemon = True
p.start()
multi_jobs.append(p)
- p = Process(target = SSH.CheckMMEProcess, args = (status_queue,))
+ p = Process(target = EPC.CheckMMEProcess, args = (status_queue,))
p.daemon = True
p.start()
multi_jobs.append(p)
- p = Process(target = SSH.CheckSPGWProcess, args = (status_queue,))
+ p = Process(target = EPC.CheckSPGWProcess, args = (status_queue,))
p.daemon = True
p.start()
multi_jobs.append(p)
@@ -3002,12 +2295,12 @@ class SSHConnection():
if (check_eNB == False) and (check_OAI_UE == False):
return 0
if check_eNB:
- p = Process(target = SSH.CheckeNBProcess, args = (status_queue,))
+ p = Process(target = RAN.CheckeNBProcess, args = (status_queue,))
p.daemon = True
p.start()
multi_jobs.append(p)
if check_OAI_UE:
- p = Process(target = SSH.CheckOAIUEProcess, args = (status_queue,))
+ p = Process(target = self.CheckOAIUEProcess, args = (status_queue,))
p.daemon = True
p.start()
multi_jobs.append(p)
@@ -3022,15 +2315,15 @@ class SSHConnection():
status = status_queue.get()
if (status < 0):
result = status
- if result == ENB_PROCESS_FAILED:
- fileCheck = re.search('enb_', str(self.eNBLogFiles[0]))
+ if result == CONST.ENB_PROCESS_FAILED:
+ fileCheck = re.search('enb_', str(RAN.GeteNBLogFile(0)))
if fileCheck is not None:
- self.copyin(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, self.eNBSourceCodePath + '/cmake_targets/' + self.eNBLogFiles[0], '.')
- logStatus = self.AnalyzeLogFile_eNB(self.eNBLogFiles[0])
+ SSH.copyin(RAN.GeteNBIPAddress(), RAN.GeteNBUserName(), RAN.GeteNBPassword(), RAN.GeteNBSourceCodePath() + '/cmake_targets/' + RAN.GeteNBLogFile(0), '.')
+ logStatus = RAN.AnalyzeLogFile_eNB(RAN.GeteNBLogFile[0])
if logStatus < 0:
result = logStatus
- self.eNBLogFiles[0] = ''
- if self.flexranCtrlInstalled and self.flexranCtrlStarted:
+ RAN.SeteNBLogFile('', 0)
+ if RAN.GetflexranCtrlInstalled() and RAN.GetflexranCtrlStarted():
self.TerminateFlexranCtrl()
return result
@@ -3038,7 +2331,7 @@ class SSHConnection():
multi_jobs = []
status_queue = SimpleQueue()
if initialize_OAI_UE_flag == False:
- p = Process(target = SSH.CheckOAIUEProcess, args = (status_queue,))
+ p = Process(target = self.CheckOAIUEProcess, args = (status_queue,))
p.daemon = True
p.start()
multi_jobs.append(p)
@@ -3053,10 +2346,10 @@ class SSHConnection():
status = status_queue.get()
if (status < 0):
result = status
- if result == OAI_UE_PROCESS_FAILED:
+ if result == CONST.OAI_UE_PROCESS_FAILED:
fileCheck = re.search('ue_', str(self.UELogFile))
if fileCheck is not None:
- self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/' + self.UELogFile, '.')
+ SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/' + self.UELogFile, '.')
logStatus = self.AnalyzeLogFile_UE(self.UELogFile)
if logStatus < 0:
result = logStatus
@@ -3064,379 +2357,18 @@ class SSHConnection():
def CheckOAIUEProcess(self, status_queue):
try:
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
- self.command('stdbuf -o0 ps -aux | grep --color=never ' + self.air_interface + '-uesoftmodem | grep -v grep', '\$', 5)
- result = re.search(self.air_interface + '-uesoftmodem', str(self.ssh.before))
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.command('stdbuf -o0 ps -aux | grep --color=never ' + RAN.Getair_interface() + '-uesoftmodem | grep -v grep', '\$', 5)
+ result = re.search(RAN.Getair_interface() + '-uesoftmodem', SSH.getBefore())
if result is None:
logging.debug('\u001B[1;37;41m OAI UE Process Not Found! \u001B[0m')
- status_queue.put(OAI_UE_PROCESS_FAILED)
- else:
- status_queue.put(OAI_UE_PROCESS_OK)
- self.close()
- except:
- os.kill(os.getppid(),signal.SIGUSR1)
-
- def CheckeNBProcess(self, status_queue):
- try:
- # At least the instance 0 SHALL be on!
- if self.eNBstatuses[0] == 0:
- lIpAddr = self.eNBIPAddress
- lUserName = self.eNBUserName
- lPassWord = self.eNBPassword
- elif self.eNBstatuses[0] == 1:
- lIpAddr = self.eNB1IPAddress
- lUserName = self.eNB1UserName
- lPassWord = self.eNB1Password
- elif self.eNBstatuses[0] == 2:
- lIpAddr = self.eNB2IPAddress
- lUserName = self.eNB2UserName
- lPassWord = self.eNB2Password
- else:
- lIpAddr = self.eNBIPAddress
- lUserName = self.eNBUserName
- lPassWord = self.eNBPassword
- self.open(lIpAddr, lUserName, lPassWord)
- self.command('stdbuf -o0 ps -aux | grep --color=never ' + self.air_interface + '-softmodem | grep -v grep', '\$', 5)
- result = re.search(self.air_interface + '-softmodem', str(self.ssh.before))
- if result is None:
- logging.debug('\u001B[1;37;41m eNB Process Not Found! \u001B[0m')
- status_queue.put(ENB_PROCESS_FAILED)
- else:
- status_queue.put(ENB_PROCESS_OK)
- self.close()
- except:
- os.kill(os.getppid(),signal.SIGUSR1)
-
- def CheckHSSProcess(self, status_queue):
- try:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('stdbuf -o0 ps -aux | grep --color=never hss | grep -v grep', '\$', 5)
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- result = re.search('oai_hss -j', str(self.ssh.before))
- elif re.match('OAI', self.EPCType, re.IGNORECASE):
- result = re.search('\/bin\/bash .\/run_', str(self.ssh.before))
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- result = re.search('hss_sim s6as diam_hss', str(self.ssh.before))
+ status_queue.put(CONST.OAI_UE_PROCESS_FAILED)
else:
- logging.error('This should not happen!')
- if result is None:
- logging.debug('\u001B[1;37;41m HSS Process Not Found! \u001B[0m')
- status_queue.put(HSS_PROCESS_FAILED)
- else:
- status_queue.put(HSS_PROCESS_OK)
- self.close()
+ status_queue.put(CONST.OAI_UE_PROCESS_OK)
+ SSH.close()
except:
os.kill(os.getppid(),signal.SIGUSR1)
- def CheckMMEProcess(self, status_queue):
- try:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('stdbuf -o0 ps -aux | grep --color=never mme | grep -v grep', '\$', 5)
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- result = re.search('mme -c', str(self.ssh.before))
- elif re.match('OAI', self.EPCType, re.IGNORECASE):
- result = re.search('\/bin\/bash .\/run_', str(self.ssh.before))
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- result = re.search('mme', str(self.ssh.before))
- else:
- logging.error('This should not happen!')
- if result is None:
- logging.debug('\u001B[1;37;41m MME Process Not Found! \u001B[0m')
- status_queue.put(MME_PROCESS_FAILED)
- else:
- status_queue.put(MME_PROCESS_OK)
- self.close()
- except:
- os.kill(os.getppid(),signal.SIGUSR1)
-
- def CheckSPGWProcess(self, status_queue):
- try:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- self.command('stdbuf -o0 ps -aux | grep --color=never spgw | grep -v grep', '\$', 5)
- result = re.search('spgwu -c ', str(self.ssh.before))
- elif re.match('OAI', self.EPCType, re.IGNORECASE):
- self.command('stdbuf -o0 ps -aux | grep --color=never spgw | grep -v grep', '\$', 5)
- result = re.search('\/bin\/bash .\/run_', str(self.ssh.before))
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- self.command('stdbuf -o0 ps -aux | grep --color=never xGw | grep -v grep', '\$', 5)
- result = re.search('xGw', str(self.ssh.before))
- else:
- logging.error('This should not happen!')
- if result is None:
- logging.debug('\u001B[1;37;41m SPGW Process Not Found! \u001B[0m')
- status_queue.put(SPGW_PROCESS_FAILED)
- else:
- status_queue.put(SPGW_PROCESS_OK)
- self.close()
- except:
- os.kill(os.getppid(),signal.SIGUSR1)
-
- def AnalyzeLogFile_eNB(self, eNBlogFile):
- if (not os.path.isfile('./' + eNBlogFile)):
- return -1
- enb_log_file = open('./' + eNBlogFile, 'r')
- exitSignalReceived = False
- foundAssertion = False
- msgAssertion = ''
- msgLine = 0
- foundSegFault = False
- foundRealTimeIssue = False
- rrcSetupComplete = 0
- rrcReleaseRequest = 0
- rrcReconfigRequest = 0
- rrcReconfigComplete = 0
- rrcReestablishRequest = 0
- rrcReestablishComplete = 0
- rrcReestablishReject = 0
- rlcDiscardBuffer = 0
- rachCanceledProcedure = 0
- uciStatMsgCount = 0
- pdcpFailure = 0
- ulschFailure = 0
- ulschOK = 0
- cdrxActivationMessageCount = 0
- dropNotEnoughRBs = 0
- mbmsRequestMsg = 0
- self.htmleNBFailureMsg = ''
- isRRU = False
- isSlave = False
- slaveReceivesFrameResyncCmd = False
- X2HO_state = X2_HO_REQ_STATE__IDLE
- X2HO_inNbProcedures = 0
- X2HO_outNbProcedures = 0
- for line in enb_log_file.readlines():
- if X2HO_state == X2_HO_REQ_STATE__IDLE:
- result = re.search('target eNB Receives X2 HO Req X2AP_HANDOVER_REQ', str(line))
- if result is not None:
- X2HO_state = X2_HO_REQ_STATE__TARGET_RECEIVES_REQ
- result = re.search('source eNB receives the X2 HO ACK X2AP_HANDOVER_REQ_ACK', str(line))
- if result is not None:
- X2HO_state = X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK
- if X2HO_state == X2_HO_REQ_STATE__TARGET_RECEIVES_REQ:
- result = re.search('Received LTE_RRCConnectionReconfigurationComplete from UE', str(line))
- if result is not None:
- X2HO_state = X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE
- if X2HO_state == X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE:
- result = re.search('issue rrc_eNB_send_PATH_SWITCH_REQ', str(line))
- if result is not None:
- X2HO_state = X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ
- if X2HO_state == X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ:
- result = re.search('received path switch ack S1AP_PATH_SWITCH_REQ_ACK', str(line))
- if result is not None:
- X2HO_state = X2_HO_REQ_STATE__IDLE
- X2HO_inNbProcedures += 1
- if X2HO_state == X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK:
- result = re.search('source eNB receives the X2 UE CONTEXT RELEASE X2AP_UE_CONTEXT_RELEASE', str(line))
- if result is not None:
- X2HO_state = X2_HO_REQ_STATE__IDLE
- X2HO_outNbProcedures += 1
-
- if self.eNBOptions[int(self.eNB_instance)] != '':
- res1 = re.search('max_rxgain (?P<requested_option>[0-9]+)', self.eNBOptions[int(self.eNB_instance)])
- res2 = re.search('max_rxgain (?P<applied_option>[0-9]+)', str(line))
- if res1 is not None and res2 is not None:
- requested_option = int(res1.group('requested_option'))
- applied_option = int(res2.group('applied_option'))
- if requested_option == applied_option:
- self.htmleNBFailureMsg += '<span class="glyphicon glyphicon-ok-circle"></span> Command line option(s) correctly applied <span class="glyphicon glyphicon-arrow-right"></span> ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n'
- else:
- self.htmleNBFailureMsg += '<span class="glyphicon glyphicon-ban-circle"></span> Command line option(s) NOT applied <span class="glyphicon glyphicon-arrow-right"></span> ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n'
- result = re.search('Exiting OAI softmodem', str(line))
- if result is not None:
- exitSignalReceived = True
- result = re.search('[Ss]egmentation [Ff]ault', str(line))
- if result is not None and not exitSignalReceived:
- foundSegFault = True
- result = re.search('[Cc]ore [dD]ump', str(line))
- if result is not None and not exitSignalReceived:
- foundSegFault = True
- result = re.search('./ran_build/build/lte-softmodem', str(line))
- if result is not None and not exitSignalReceived:
- foundSegFault = True
- result = re.search('[Aa]ssertion', str(line))
- if result is not None and not exitSignalReceived:
- foundAssertion = True
- result = re.search('LLL', str(line))
- if result is not None and not exitSignalReceived:
- foundRealTimeIssue = True
- if foundAssertion and (msgLine < 3):
- msgLine += 1
- msgAssertion += str(line)
- result = re.search('Setting function for RU', str(line))
- if result is not None:
- isRRU = True
- if isRRU:
- result = re.search('RU 0 is_slave=yes', str(line))
- if result is not None:
- isSlave = True
- if isSlave:
- result = re.search('Received RRU_frame_resynch command', str(line))
- if result is not None:
- slaveReceivesFrameResyncCmd = True
- result = re.search('LTE_RRCConnectionSetupComplete from UE', str(line))
- if result is not None:
- rrcSetupComplete += 1
- result = re.search('Generate LTE_RRCConnectionRelease|Generate RRCConnectionRelease', str(line))
- if result is not None:
- rrcReleaseRequest += 1
- result = re.search('Generate LTE_RRCConnectionReconfiguration', str(line))
- if result is not None:
- rrcReconfigRequest += 1
- result = re.search('LTE_RRCConnectionReconfigurationComplete from UE rnti', str(line))
- if result is not None:
- rrcReconfigComplete += 1
- result = re.search('LTE_RRCConnectionReestablishmentRequest', str(line))
- if result is not None:
- rrcReestablishRequest += 1
- result = re.search('LTE_RRCConnectionReestablishmentComplete', str(line))
- if result is not None:
- rrcReestablishComplete += 1
- result = re.search('LTE_RRCConnectionReestablishmentReject', str(line))
- if result is not None:
- rrcReestablishReject += 1
- result = re.search('CDRX configuration activated after RRC Connection', str(line))
- if result is not None:
- cdrxActivationMessageCount += 1
- result = re.search('uci->stat', str(line))
- if result is not None:
- uciStatMsgCount += 1
- result = re.search('PDCP.*Out of Resources.*reason', str(line))
- if result is not None:
- pdcpFailure += 1
- result = re.search('ULSCH in error in round', str(line))
- if result is not None:
- ulschFailure += 1
- if self.air_interface == 'nr':
- result = re.search('ULSCH received ok', str(line))
- if result is not None:
- ulschOK += 1
- result = re.search('BAD all_segments_received', str(line))
- if result is not None:
- rlcDiscardBuffer += 1
- result = re.search('Canceled RA procedure for UE rnti', str(line))
- if result is not None:
- rachCanceledProcedure += 1
- result = re.search('dropping, not enough RBs', str(line))
- if result is not None:
- dropNotEnoughRBs += 1
- if self.eNBmbmsEnables[int(self.eNB_instance)]:
- result = re.search('MBMS USER-PLANE.*Requesting.*bytes from RLC', str(line))
- if result is not None:
- mbmsRequestMsg += 1
- enb_log_file.close()
- logging.debug(' File analysis completed')
- self.htmleNBFailureMsg = ''
- if self.air_interface == 'lte':
- nodeB_prefix = 'e'
- else:
- nodeB_prefix = 'g'
- if uciStatMsgCount > 0:
- statMsg = nodeB_prefix + 'NB showed ' + str(uciStatMsgCount) + ' "uci->stat" message(s)'
- logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += statMsg + '\n'
- if pdcpFailure > 0:
- statMsg = nodeB_prefix + 'NB showed ' + str(pdcpFailure) + ' "PDCP Out of Resources" message(s)'
- logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += statMsg + '\n'
- if ulschFailure > 0:
- statMsg = nodeB_prefix + 'NB showed ' + str(ulschFailure) + ' "ULSCH in error in round" message(s)'
- logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += statMsg + '\n'
- if self.air_interface == 'nr':
- if ulschOK > 0:
- statMsg = nodeB_prefix + 'NB showed ' + str(ulschOK) + ' "ULSCH received ok" message(s)'
- logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += statMsg + '\n'
- if dropNotEnoughRBs > 0:
- statMsg = 'eNB showed ' + str(dropNotEnoughRBs) + ' "dropping, not enough RBs" message(s)'
- logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += statMsg + '\n'
- if rrcSetupComplete > 0:
- rrcMsg = nodeB_prefix + 'NB completed ' + str(rrcSetupComplete) + ' RRC Connection Setup(s)'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- rrcMsg = ' -- ' + str(rrcSetupComplete) + ' were completed'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- if rrcReleaseRequest > 0:
- rrcMsg = nodeB_prefix + 'NB requested ' + str(rrcReleaseRequest) + ' RRC Connection Release(s)'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- if rrcReconfigRequest > 0 or rrcReconfigComplete > 0:
- rrcMsg = nodeB_prefix + 'NB requested ' + str(rrcReconfigRequest) + ' RRC Connection Reconfiguration(s)'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- rrcMsg = ' -- ' + str(rrcReconfigComplete) + ' were completed'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- if rrcReestablishRequest > 0 or rrcReestablishComplete > 0 or rrcReestablishReject > 0:
- rrcMsg = nodeB_prefix + 'NB requested ' + str(rrcReestablishRequest) + ' RRC Connection Reestablishment(s)'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- rrcMsg = ' -- ' + str(rrcReestablishComplete) + ' were completed'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- rrcMsg = ' -- ' + str(rrcReestablishReject) + ' were rejected'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- if self.eNBmbmsEnables[int(self.eNB_instance)]:
- if mbmsRequestMsg > 0:
- rrcMsg = 'eNB requested ' + str(mbmsRequestMsg) + ' times the RLC for MBMS USER-PLANE'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- if X2HO_inNbProcedures > 0:
- rrcMsg = 'eNB completed ' + str(X2HO_inNbProcedures) + ' X2 Handover Connection procedure(s)'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- if X2HO_outNbProcedures > 0:
- rrcMsg = 'eNB completed ' + str(X2HO_outNbProcedures) + ' X2 Handover Release procedure(s)'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- if self.eNBOptions[int(self.eNB_instance)] != '':
- res1 = re.search('drx_Config_present prSetup', self.eNBOptions[int(self.eNB_instance)])
- if res1 is not None:
- if cdrxActivationMessageCount > 0:
- rrcMsg = 'eNB activated the CDRX Configuration for ' + str(cdrxActivationMessageCount) + ' time(s)'
- logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- else:
- rrcMsg = 'eNB did NOT ACTIVATE the CDRX Configuration'
- logging.debug('\u001B[1;37;43m ' + rrcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rrcMsg + '\n'
- if rachCanceledProcedure > 0:
- rachMsg = nodeB_prefix + 'NB cancelled ' + str(rachCanceledProcedure) + ' RA procedure(s)'
- logging.debug('\u001B[1;30;43m ' + rachMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rachMsg + '\n'
- if isRRU:
- if isSlave:
- if slaveReceivesFrameResyncCmd:
- rruMsg = 'Slave RRU received the RRU_frame_resynch command from RAU'
- logging.debug('\u001B[1;30;43m ' + rruMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rruMsg + '\n'
- else:
- rruMsg = 'Slave RRU DID NOT receive the RRU_frame_resynch command from RAU'
- logging.debug('\u001B[1;37;41m ' + rruMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rruMsg + '\n'
- self.prematureExit = True
- return ENB_PROCESS_SLAVE_RRU_NOT_SYNCED
- if foundSegFault:
- logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with a Segmentation Fault! \u001B[0m')
- return ENB_PROCESS_SEG_FAULT
- if foundAssertion:
- logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with an assertion! \u001B[0m')
- self.htmleNBFailureMsg += msgAssertion
- return ENB_PROCESS_ASSERTION
- if foundRealTimeIssue:
- logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB faced real time issues! \u001B[0m')
- self.htmleNBFailureMsg += nodeB_prefix + 'NB faced real time issues!\n'
- #return ENB_PROCESS_REALTIME_ISSUE
- if rlcDiscardBuffer > 0:
- rlcMsg = nodeB_prefix + 'NB RLC discarded ' + str(rlcDiscardBuffer) + ' buffer(s)'
- logging.debug('\u001B[1;37;41m ' + rlcMsg + ' \u001B[0m')
- self.htmleNBFailureMsg += rlcMsg + '\n'
- return ENB_PROCESS_REALTIME_ISSUE
- return 0
def AnalyzeLogFile_UE(self, UElogFile):
if (not os.path.isfile('./' + UElogFile)):
@@ -3464,7 +2396,7 @@ class SSHConnection():
nrFoundDCI = 0
nrCRCOK = 0
mbms_messages = 0
- self.htmlUEFailureMsg = ''
+ HTML.SethtmlUEFailureMsg('')
for line in ue_log_file.readlines():
result = re.search('nr_synchro_time', str(line))
if result is not None:
@@ -3525,7 +2457,7 @@ class SSHConnection():
result = re.search('No cell synchronization found, abandoning', str(line))
if result is not None:
no_cell_sync_found = True
- if self.eNBmbmsEnables[0]:
+ if RAN.GeteNBmbmsEnable(0):
result = re.search('TRIED TO PUSH MBMS DATA', str(line))
if result is not None:
mbms_messages += 1
@@ -3533,22 +2465,22 @@ class SSHConnection():
if result is not None and (not mib_found):
try:
mibMsg = "MIB Information: " + result.group(1) + ', ' + result.group(2)
- self.htmlUEFailureMsg += mibMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + mibMsg + '\n')
logging.debug('\033[94m' + mibMsg + '\033[0m')
mibMsg = " nidcell = " + result.group('nidcell')
- self.htmlUEFailureMsg += mibMsg
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + mibMsg)
logging.debug('\033[94m' + mibMsg + '\033[0m')
mibMsg = " n_rb_dl = " + result.group('n_rb_dl')
- self.htmlUEFailureMsg += mibMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + mibMsg + '\n')
logging.debug('\033[94m' + mibMsg + '\033[0m')
mibMsg = " phich_duration = " + result.group('phich_duration')
- self.htmlUEFailureMsg += mibMsg
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + mibMsg)
logging.debug('\033[94m' + mibMsg + '\033[0m')
mibMsg = " phich_resource = " + result.group('phich_resource')
- self.htmlUEFailureMsg += mibMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + mibMsg + '\n')
logging.debug('\033[94m' + mibMsg + '\033[0m')
mibMsg = " tx_ant = " + result.group('tx_ant')
- self.htmlUEFailureMsg += mibMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + mibMsg + '\n')
logging.debug('\033[94m' + mibMsg + '\033[0m')
mib_found = True
except Exception as e:
@@ -3557,7 +2489,7 @@ class SSHConnection():
if result is not None and (not frequency_found):
try:
mibMsg = "Measured Carrier Frequency = " + result.group('measured_carrier_frequency') + ' Hz'
- self.htmlUEFailureMsg += mibMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + mibMsg + '\n')
logging.debug('\033[94m' + mibMsg + '\033[0m')
frequency_found = True
except Exception as e:
@@ -3566,7 +2498,7 @@ class SSHConnection():
if result is not None and (not plmn_found):
try:
mibMsg = 'PLMN MCC = ' + result.group('mcc') + ' MNC = ' + result.group('mnc')
- self.htmlUEFailureMsg += mibMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + mibMsg + '\n')
logging.debug('\033[94m' + mibMsg + '\033[0m')
plmn_found = True
except Exception as e:
@@ -3575,7 +2507,7 @@ class SSHConnection():
if result is not None:
try:
mibMsg = "The operator is: " + result.group('operator')
- self.htmlUEFailureMsg += mibMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + mibMsg + '\n')
logging.debug('\033[94m' + mibMsg + '\033[0m')
except Exception as e:
logging.error('\033[91m' + "Operator name not found" + '\033[0m')
@@ -3583,7 +2515,7 @@ class SSHConnection():
if result is not None:
try:
mibMsg = "SIB5 InterFreqCarrierFreq element " + result.group(1) + '/' + result.group(2)
- self.htmlUEFailureMsg += mibMsg + ' -> '
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + mibMsg + ' -> ')
logging.debug('\033[94m' + mibMsg + '\033[0m')
except Exception as e:
logging.error('\033[91m' + "SIB5 InterFreqCarrierFreq element not found" + '\033[0m')
@@ -3593,7 +2525,7 @@ class SSHConnection():
freq = result.group('carrier_frequency')
new_freq = re.sub('/[0-9]+','',freq)
float_freq = float(new_freq) / 1000000
- self.htmlUEFailureMsg += 'DL Freq: ' + ('%.1f' % float_freq) + ' MHz'
+ HTMLSethtmlUEFailureMsg(HTMLGethtmlUEFailureMsg() + 'DL Freq: ' + ('%.1f' % float_freq) + ' MHz')
logging.debug('\033[94m' + " DL Carrier Frequency is: " + freq + '\033[0m')
except Exception as e:
logging.error('\033[91m' + " DL Carrier Frequency not found" + '\033[0m')
@@ -3601,7 +2533,7 @@ class SSHConnection():
if result is not None:
try:
prb = result.group('allowed_bandwidth')
- self.htmlUEFailureMsg += ' -- PRB: ' + prb + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + ' -- PRB: ' + prb + '\n')
logging.debug('\033[94m' + " AllowedMeasBandwidth: " + prb + '\033[0m')
except Exception as e:
logging.error('\033[91m' + " AllowedMeasBandwidth not found" + '\033[0m')
@@ -3609,339 +2541,167 @@ class SSHConnection():
if rrcConnectionRecfgComplete > 0:
statMsg = 'UE connected to eNB (' + str(rrcConnectionRecfgComplete) + ' RRCConnectionReconfigurationComplete message(s) generated)'
logging.debug('\033[94m' + statMsg + '\033[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if nrUEFlag:
if nrDecodeMib > 0:
statMsg = 'UE showed ' + str(nrDecodeMib) + ' MIB decode message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if nrFoundDCI > 0:
statMsg = 'UE showed ' + str(nrFoundDCI) + ' DCI found message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if nrCRCOK > 0:
statMsg = 'UE showed ' + str(nrCRCOK) + ' PDSCH decoding message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if not frequency_found:
statMsg = 'NR-UE could NOT synch!'
logging.error('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if uciStatMsgCount > 0:
statMsg = 'UE showed ' + str(uciStatMsgCount) + ' "uci->stat" message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if pdcpDataReqFailedCount > 0:
statMsg = 'UE showed ' + str(pdcpDataReqFailedCount) + ' "PDCP data request failed" message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if badDciCount > 0:
statMsg = 'UE showed ' + str(badDciCount) + ' "bad DCI 1(A)" message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if f1aRetransmissionCount > 0:
statMsg = 'UE showed ' + str(f1aRetransmissionCount) + ' "Format1A Retransmission but TBS are different" message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if fatalErrorCount > 0:
statMsg = 'UE showed ' + str(fatalErrorCount) + ' "FATAL ERROR:" message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if macBsrTimerExpiredCount > 0:
statMsg = 'UE showed ' + str(fatalErrorCount) + ' "MAC BSR Triggered ReTxBSR Timer expiry" message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
- if self.eNBmbmsEnables[0]:
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
+ if RAN.GeteNBmbmsEnable(0):
if mbms_messages > 0:
statMsg = 'UE showed ' + str(mbms_messages) + ' "TRIED TO PUSH MBMS DATA" message(s)'
logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
else:
statMsg = 'UE did NOT SHOW "TRIED TO PUSH MBMS DATA" message(s)'
logging.debug('\u001B[1;30;41m ' + statMsg + ' \u001B[0m')
- self.htmlUEFailureMsg += statMsg + '\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + statMsg + '\n')
if foundSegFault:
logging.debug('\u001B[1;37;41m UE ended with a Segmentation Fault! \u001B[0m')
if not nrUEFlag:
- return OAI_UE_PROCESS_SEG_FAULT
+ return CONST.OAI_UE_PROCESS_SEG_FAULT
else:
if not frequency_found:
- return OAI_UE_PROCESS_SEG_FAULT
+ return CONST.OAI_UE_PROCESS_SEG_FAULT
if foundAssertion:
logging.debug('\u001B[1;30;43m UE showed an assertion! \u001B[0m')
- self.htmlUEFailureMsg += 'UE showed an assertion!\n'
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + 'UE showed an assertion!\n')
if not nrUEFlag:
if not mib_found or not frequency_found:
- return OAI_UE_PROCESS_ASSERTION
+ return CONST.OAI_UE_PROCESS_ASSERTION
else:
if not frequency_found:
- return OAI_UE_PROCESS_ASSERTION
+ return CONST.OAI_UE_PROCESS_ASSERTION
if foundRealTimeIssue:
logging.debug('\u001B[1;37;41m UE faced real time issues! \u001B[0m')
- self.htmlUEFailureMsg += 'UE faced real time issues!\n'
- #return ENB_PROCESS_REALTIME_ISSUE
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + 'UE faced real time issues!\n')
+ #return CONST.ENB_PROCESS_REALTIME_ISSUE
if nrUEFlag:
if not frequency_found:
- return OAI_UE_PROCESS_COULD_NOT_SYNC
+ return CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
else:
if no_cell_sync_found and not mib_found:
logging.debug('\u001B[1;37;41m UE could not synchronize ! \u001B[0m')
- self.htmlUEFailureMsg += 'UE could not synchronize!\n'
- return OAI_UE_PROCESS_COULD_NOT_SYNC
+ HTML.SethtmlUEFailureMsg(HTML.GethtmlUEFailureMsg() + 'UE could not synchronize!\n')
+ return CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
return 0
- def TerminateeNB(self):
- if self.eNB_serverId == '0':
- lIpAddr = self.eNBIPAddress
- lUserName = self.eNBUserName
- lPassWord = self.eNBPassword
- lSourcePath = self.eNBSourceCodePath
- elif self.eNB_serverId == '1':
- lIpAddr = self.eNB1IPAddress
- lUserName = self.eNB1UserName
- lPassWord = self.eNB1Password
- lSourcePath = self.eNB1SourceCodePath
- elif self.eNB_serverId == '2':
- lIpAddr = self.eNB2IPAddress
- lUserName = self.eNB2UserName
- lPassWord = self.eNB2Password
- lSourcePath = self.eNB2SourceCodePath
- if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
- Usage()
- sys.exit('Insufficient Parameter')
- self.open(lIpAddr, lUserName, lPassWord)
- self.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
- if self.air_interface == 'lte':
- nodeB_prefix = 'e'
- else:
- nodeB_prefix = 'g'
- self.command('stdbuf -o0 ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
- result = re.search('-softmodem', str(self.ssh.before))
- if result is not None:
- self.command('echo ' + lPassWord + ' | sudo -S daemon --name=enb' + str(self.eNB_instance) + '_daemon --stop', '\$', 5)
- self.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGINT -r .*-softmodem || true', '\$', 5)
- time.sleep(10)
- self.command('stdbuf -o0 ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
- result = re.search('-softmodem', str(self.ssh.before))
- if result is not None:
- self.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGKILL -r .*-softmodem || true', '\$', 5)
- time.sleep(5)
- self.command('rm -f my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
- self.close()
- # If tracer options is on, stopping tshark on EPC side
- result = re.search('T_stdout', str(self.Initialize_eNB_args))
- if result is not None:
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- logging.debug('\u001B[1m Stopping tshark \u001B[0m')
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
- time.sleep(1)
- if self.EPC_PcapFileName != '':
- self.command('echo ' + self.EPCPassword + ' | sudo -S chmod 666 /tmp/' + self.EPC_PcapFileName, '\$', 5)
- self.copyin(self.EPCIPAddress, self.EPCUserName, self.EPCPassword, '/tmp/' + self.EPC_PcapFileName, '.')
- self.copyout(lIpAddr, lUserName, lPassWord, self.EPC_PcapFileName, lSourcePath + '/cmake_targets/.')
- self.close()
- logging.debug('\u001B[1m Replaying RAW record file\u001B[0m')
- self.open(lIpAddr, lUserName, lPassWord)
- self.command('cd ' + lSourcePath + '/common/utils/T/tracer/', '\$', 5)
- enbLogFile = self.eNBLogFiles[int(self.eNB_instance)]
- raw_record_file = enbLogFile.replace('.log', '_record.raw')
- replay_log_file = enbLogFile.replace('.log', '_replay.log')
- extracted_txt_file = enbLogFile.replace('.log', '_extracted_messages.txt')
- extracted_log_file = enbLogFile.replace('.log', '_extracted_messages.log')
- self.command('./extract_config -i ' + lSourcePath + '/cmake_targets/' + raw_record_file + ' > ' + lSourcePath + '/cmake_targets/' + extracted_txt_file, '\$', 5)
- self.command('echo $USER; nohup ./replay -i ' + lSourcePath + '/cmake_targets/' + raw_record_file + ' > ' + lSourcePath + '/cmake_targets/' + replay_log_file + ' 2>&1 &', lUserName, 5)
- self.command('./textlog -d ' + lSourcePath + '/cmake_targets/' + extracted_txt_file + ' -no-gui -ON -full > ' + lSourcePath + '/cmake_targets/' + extracted_log_file, '\$', 5)
- self.close()
- self.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + extracted_log_file, '.')
- logging.debug('\u001B[1m Analyzing eNB replay logfile \u001B[0m')
- logStatus = self.AnalyzeLogFile_eNB(extracted_log_file)
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
- self.eNBLogFiles[int(self.eNB_instance)] = ''
- else:
- analyzeFile = False
- if self.eNBLogFiles[int(self.eNB_instance)] != '':
- analyzeFile = True
- fileToAnalyze = self.eNBLogFiles[int(self.eNB_instance)]
- self.eNBLogFiles[int(self.eNB_instance)] = ''
- if analyzeFile:
- copyin_res = self.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + fileToAnalyze, '.')
- if (copyin_res == -1):
- logging.debug('\u001B[1;37;41m Could not copy ' + nodeB_prefix + 'NB logfile to analyze it! \u001B[0m')
- self.htmleNBFailureMsg = 'Could not copy ' + nodeB_prefix + 'NB logfile to analyze it!'
- self.CreateHtmlTestRow('N/A', 'KO', ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
- self.eNBmbmsEnables[int(self.eNB_instance)] = False
- return
- if self.eNB_serverId != '0':
- self.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './' + fileToAnalyze, self.eNBSourceCodePath + '/cmake_targets/')
- logging.debug('\u001B[1m Analyzing ' + nodeB_prefix + 'NB logfile \u001B[0m ' + fileToAnalyze)
- logStatus = self.AnalyzeLogFile_eNB(fileToAnalyze)
- if (logStatus < 0):
- self.CreateHtmlTestRow('N/A', 'KO', logStatus)
- self.preamtureExit = True
- self.eNBmbmsEnables[int(self.eNB_instance)] = False
- return
- else:
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
- else:
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
- self.eNBmbmsEnables[int(self.eNB_instance)] = False
- self.eNBstatuses[int(self.eNB_instance)] = -1
-
- def TerminateHSS(self):
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGINT oai_hss || true', '\$', 5)
- time.sleep(2)
- self.command('stdbuf -o0 ps -aux | grep hss | grep -v grep', '\$', 5)
- result = re.search('oai_hss -j', str(self.ssh.before))
- if result is not None:
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGKILL oai_hss || true', '\$', 5)
- self.command('rm -f ' + self.EPCSourceCodePath + '/scripts/my-hss.sh', '\$', 5)
- elif re.match('OAI', self.EPCType, re.IGNORECASE):
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGINT run_hss oai_hss || true', '\$', 5)
- time.sleep(2)
- self.command('stdbuf -o0 ps -aux | grep hss | grep -v grep', '\$', 5)
- result = re.search('\/bin\/bash .\/run_', str(self.ssh.before))
- if result is not None:
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGKILL run_hss oai_hss || true', '\$', 5)
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- self.command('cd ' + self.EPCSourceCodePath, '\$', 5)
- self.command('cd scripts', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S daemon --name=simulated_hss --stop', '\$', 5)
- time.sleep(1)
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGKILL hss_sim', '\$', 5)
- else:
- logging.error('This should not happen!')
- self.close()
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
-
- def TerminateMME(self):
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- if re.match('OAI', self.EPCType, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGINT run_mme mme || true', '\$', 5)
- time.sleep(2)
- self.command('stdbuf -o0 ps -aux | grep mme | grep -v grep', '\$', 5)
- result = re.search('mme -c', str(self.ssh.before))
- if result is not None:
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGKILL run_mme mme || true', '\$', 5)
- self.command('rm -f ' + self.EPCSourceCodePath + '/scripts/my-mme.sh', '\$', 5)
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- self.command('cd /opt/ltebox/tools', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S ./stop_mme', '\$', 5)
- else:
- logging.error('This should not happen!')
- self.close()
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
-
- def TerminateSPGW(self):
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGINT spgwc spgwu || true', '\$', 5)
- time.sleep(2)
- self.command('stdbuf -o0 ps -aux | grep spgw | grep -v grep', '\$', 5)
- result = re.search('spgwc -c |spgwu -c ', str(self.ssh.before))
- if result is not None:
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGKILL spgwc spgwu || true', '\$', 5)
- self.command('rm -f ' + self.EPCSourceCodePath + '/scripts/my-spgw*.sh', '\$', 5)
- self.command('stdbuf -o0 ps -aux | grep tshark | grep -v grep', '\$', 5)
- result = re.search('-w ', str(self.ssh.before))
- if result is not None:
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGINT tshark || true', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S chmod 666 ' + self.EPCSourceCodePath + '/scripts/*.pcap', '\$', 5)
- elif re.match('OAI', self.EPCType, re.IGNORECASE):
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGINT run_spgw spgw || true', '\$', 5)
- time.sleep(2)
- self.command('stdbuf -o0 ps -aux | grep spgw | grep -v grep', '\$', 5)
- result = re.search('\/bin\/bash .\/run_', str(self.ssh.before))
- if result is not None:
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGKILL run_spgw spgw || true', '\$', 5)
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- self.command('cd /opt/ltebox/tools', '\$', 5)
- self.command('echo ' + self.EPCPassword + ' | sudo -S ./stop_xGw', '\$', 5)
- else:
- logging.error('This should not happen!')
- self.close()
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
def TerminateFlexranCtrl(self):
- if self.flexranCtrlInstalled == False or self.flexranCtrlStarted == False:
+ if RAN.GetflexranCtrlInstalled() == False or RAN.GetflexranCtrlStarted() == False:
return
- if self.EPCIPAddress == '' or self.EPCUserName == '' or self.EPCPassword == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('echo ' + self.EPCPassword + ' | sudo -S daemon --name=flexran_rtc_daemon --stop', '\$', 5)
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('echo ' + EPC.GetPassword() + ' | sudo -S daemon --name=flexran_rtc_daemon --stop', '\$', 5)
time.sleep(1)
- self.command('echo ' + self.EPCPassword + ' | sudo -S killall --signal SIGKILL rt_controller', '\$', 5)
+ SSH.command('echo ' + EPC.GetPassword() + ' | sudo -S killall --signal SIGKILL rt_controller', '\$', 5)
time.sleep(1)
- self.close()
- self.flexranCtrlStarted = False
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+ SSH.close()
+ RAN.SetflexranCtrlStarted(False)
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
def TerminateUE_common(self, device_id, idx):
try:
- self.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
+ SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
# back in airplane mode on (ie radio off)
if self.ADBCentralized:
if device_id == '84B7N16418004022':
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "su - root -c /data/local/tmp/off"', '\$', 60)
else:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell /data/local/tmp/off', '\$', 60)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' ' + self.UEDevicesOffCmd[idx], '\$', 60)
logging.debug('\u001B[1mUE (' + device_id + ') Detach Completed\u001B[0m')
if self.ADBCentralized:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "ps | grep --color=never iperf | grep -v grep"', '\$', 5)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "ps | grep --color=never iperf | grep -v grep"', '\$', 5)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ps | grep --color=never iperf | grep -v grep"\'', '\$', 60)
- result = re.search('shell +(?P<pid>\d+)', str(self.ssh.before))
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "ps | grep --color=never iperf | grep -v grep"\'', '\$', 60)
+ result = re.search('shell +(?P<pid>\d+)', SSH.getBefore())
if result is not None:
pid_iperf = result.group('pid')
if self.ADBCentralized:
- self.command('stdbuf -o0 adb -s ' + device_id + ' shell "kill -KILL ' + pid_iperf + '"', '\$', 5)
+ SSH.command('stdbuf -o0 adb -s ' + device_id + ' shell "kill -KILL ' + pid_iperf + '"', '\$', 5)
else:
- self.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "kill -KILL ' + pid_iperf + '"\'', '\$', 60)
- self.close()
+ SSH.command('ssh ' + self.UEDevicesRemoteUser[idx] + '@' + self.UEDevicesRemoteServer[idx] + ' \'adb -s ' + device_id + ' shell "kill -KILL ' + pid_iperf + '"\'', '\$', 60)
+ SSH.close()
except:
os.kill(os.getppid(),signal.SIGUSR1)
def TerminateUE(self):
- terminate_ue_flag = True
+ terminate_ue_flag = False
self.GetAllUEDevices(terminate_ue_flag)
multi_jobs = []
i = 0
for device_id in self.UEDevices:
- p = Process(target= SSH.TerminateUE_common, args = (device_id,i,))
+ p = Process(target= self.TerminateUE_common, args = (device_id,i,))
p.daemon = True
p.start()
multi_jobs.append(p)
i += 1
for job in multi_jobs:
job.join()
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
def TerminateOAIUE(self):
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
- self.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
- self.command('ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
- result = re.search('-uesoftmodem', str(self.ssh.before))
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.command('cd ' + self.UESourceCodePath + '/cmake_targets', '\$', 5)
+ SSH.command('ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
+ result = re.search('-uesoftmodem', SSH.getBefore())
if result is not None:
- self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGINT -r .*-uesoftmodem || true', '\$', 5)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGINT -r .*-uesoftmodem || true', '\$', 5)
time.sleep(10)
- self.command('ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
- result = re.search('-uesoftmodem', str(self.ssh.before))
+ SSH.command('ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
+ result = re.search('-uesoftmodem', SSH.getBefore())
if result is not None:
- self.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGKILL -r .*-uesoftmodem || true', '\$', 5)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S killall --signal SIGKILL -r .*-uesoftmodem || true', '\$', 5)
time.sleep(5)
- self.command('rm -f my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
- self.close()
+ SSH.command('rm -f my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
+ SSH.close()
result = re.search('ue_', str(self.UELogFile))
if result is not None:
- copyin_res = self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/' + self.UELogFile, '.')
+ copyin_res = SSH.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/' + self.UELogFile, '.')
if (copyin_res == -1):
logging.debug('\u001B[1;37;41m Could not copy UE logfile to analyze it! \u001B[0m')
- self.htmlUEFailureMsg = 'Could not copy UE logfile to analyze it!'
- self.CreateHtmlTestRow('N/A', 'KO', OAI_UE_PROCESS_NOLOGFILE_TO_ANALYZE, 'UE')
+ HTML.SethtmlUEFailureMsg('Could not copy UE logfile to analyze it!')
+ HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OAI_UE_PROCESS_NOLOGFILE_TO_ANALYZE, 'UE')
self.UELogFile = ''
return
logging.debug('\u001B[1m Analyzing UE logfile \u001B[0m')
@@ -3953,56 +2713,64 @@ class SSHConnection():
ueAction = 'Connection'
if (logStatus < 0):
logging.debug('\u001B[1m' + ueAction + ' Failed \u001B[0m')
- self.htmlUEFailureMsg = '<b>' + ueAction + ' Failed</b>\n' + self.htmlUEFailureMsg
- self.CreateHtmlTestRow('N/A', 'KO', logStatus, 'UE')
- if self.air_interface == 'lte':
+ HTML.SethtmlUEFailureMsg('<b>' + ueAction + ' Failed</b>\n' + HTML.GethtmlUEFailureMsg())
+ HTML.CreateHtmlTestRow('N/A', 'KO', logStatus, 'UE')
+ if RAN.Getair_interface() == 'lte':
# In case of sniffing on commercial eNBs we have random results
# Not an error then
- if (logStatus != OAI_UE_PROCESS_COULD_NOT_SYNC) or (ueAction != 'Sniffing'):
+ if (logStatus != CONST.OAI_UE_PROCESS_COULD_NOT_SYNC) or (ueAction != 'Sniffing'):
self.Initialize_OAI_UE_args = ''
self.AutoTerminateUEandeNB()
else:
- if (logStatus == OAI_UE_PROCESS_COULD_NOT_SYNC):
+ if (logStatus == CONST.OAI_UE_PROCESS_COULD_NOT_SYNC):
self.Initialize_OAI_UE_args = ''
self.AutoTerminateUEandeNB()
else:
logging.debug('\u001B[1m' + ueAction + ' Completed \u001B[0m')
- self.htmlUEFailureMsg = '<b>' + ueAction + ' Completed</b>\n' + self.htmlUEFailureMsg
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+ HTML.SethtmlUEFailureMsg('<b>' + ueAction + ' Completed</b>\n' + HTML.GethtmlUEFailureMsg())
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
self.UELogFile = ''
else:
- self.CreateHtmlTestRow('N/A', 'OK', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
def AutoTerminateUEandeNB(self):
if (self.ADBIPAddress != 'none'):
self.testCase_id = 'AUTO-KILL-UE'
+ HTML.SettestCase_id(self.testCase_id)
self.desc = 'Automatic Termination of UE'
+ HTML.Setdesc('Automatic Termination of UE')
self.ShowTestID()
self.TerminateUE()
if (self.Initialize_OAI_UE_args != ''):
- self.testCase_id = 'AUTO-KILL-UE'
- self.desc = 'Automatic Termination of UE'
+ self.testCase_id = 'AUTO-KILL-OAI-UE'
+ HTML.SettestCase_id(self.testCase_id)
+ self.desc = 'Automatic Termination of OAI-UE'
+ HTML.Setdesc('Automatic Termination of OAI-UE')
self.ShowTestID()
self.TerminateOAIUE()
- if (self.Initialize_eNB_args != ''):
+ if (RAN.GetInitialize_eNB_args() != ''):
self.testCase_id = 'AUTO-KILL-eNB'
+ HTML.SettestCase_id(self.testCase_id)
self.desc = 'Automatic Termination of eNB'
+ HTML.Setdesc('Automatic Termination of eNB')
self.ShowTestID()
- self.eNB_instance = '0'
- self.TerminateeNB()
- if self.flexranCtrlInstalled and self.flexranCtrlStarted:
+ RAN.SeteNB_instance('0')
+ RAN.TerminateeNB()
+ if RAN.GetflexranCtrlInstalled() and RAN.GetflexranCtrlStarted():
self.testCase_id = 'AUTO-KILL-flexran-ctl'
+ HTML.SettestCase_id(self.testCase_id)
self.desc = 'Automatic Termination of FlexRan CTL'
+ HTML.Setdesc('Automatic Termination of FlexRan CTL')
self.ShowTestID()
self.TerminateFlexranCtrl()
- self.prematureExit = True
+ RAN.SetprematureExit(True)
def IdleSleep(self):
time.sleep(self.idle_sleep_time)
- self.CreateHtmlTestRow(str(self.idle_sleep_time) + ' sec', 'OK', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow(str(self.idle_sleep_time) + ' sec', 'OK', CONST.ALL_PROCESSES_OK)
def X2_Status(self, idx, fileName):
- cmd = "curl --silent http://" + self.EPCIPAddress + ":9999/stats | jq '.' > " + fileName
+ cmd = "curl --silent http://" + EPC.GetIPAddress() + ":9999/stats | jq '.' > " + fileName
message = cmd + '\n'
logging.debug(cmd)
subprocess.run(cmd, shell=True)
@@ -4051,7 +2819,7 @@ class SSHConnection():
logging.debug(msg)
fullMessage += msg + '\n'
if self.x2_ho_options == 'network':
- if self.flexranCtrlInstalled and self.flexranCtrlStarted:
+ if RAN.GetflexranCtrlInstalled() and RAN.GetflexranCtrlStarted():
self.x2ENBBsIds = []
self.x2ENBConnectedUEs = []
self.x2ENBBsIds.append([])
@@ -4066,7 +2834,7 @@ class SSHConnection():
eNB_cnt = self.x2NbENBs
cnt = 0
while cnt < eNB_cnt:
- cmd = "curl -XPOST http://" + self.EPCIPAddress + ":9999/rrc/x2_ho_net_control/enb/" + str(self.x2ENBBsIds[0][cnt]) + "/1"
+ cmd = "curl -XPOST http://" + EPC.GetIPAddress() + ":9999/rrc/x2_ho_net_control/enb/" + str(self.x2ENBBsIds[0][cnt]) + "/1"
logging.debug(cmd)
fullMessage += cmd + '\n'
subprocess.run(cmd, shell=True)
@@ -4080,7 +2848,7 @@ class SSHConnection():
while cnt < eNB_cnt:
ueIdx = 0
while ueIdx < len(self.x2ENBConnectedUEs[0][cnt]):
- cmd = "curl -XPOST http://" + self.EPCIPAddress + ":9999/rrc/ho/senb/" + str(self.x2ENBBsIds[0][cnt]) + "/ue/" + str(self.x2ENBConnectedUEs[0][cnt][ueIdx]) + "/tenb/" + str(self.x2ENBBsIds[0][eNB_cnt - cnt - 1])
+ cmd = "curl -XPOST http://" + EPC.GetIPAddress() + ":9999/rrc/ho/senb/" + str(self.x2ENBBsIds[0][cnt]) + "/ue/" + str(self.x2ENBConnectedUEs[0][cnt][ueIdx]) + "/tenb/" + str(self.x2ENBBsIds[0][eNB_cnt - cnt - 1])
logging.debug(cmd)
fullMessage += cmd + '\n'
subprocess.run(cmd, shell=True)
@@ -4101,22 +2869,22 @@ class SSHConnection():
logging.debug(msg)
fullMessage += msg + '</pre>'
html_queue.put(fullMessage)
- self.CreateHtmlTestRowQueue('N/A', 'OK', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue('N/A', 'OK', len(self.UEDevices), html_queue)
else:
msg = "X2 Handover FAILED"
logging.error(msg)
fullMessage += msg + '</pre>'
html_queue.put(fullMessage)
- self.CreateHtmlTestRowQueue('N/A', 'OK', len(self.UEDevices), html_queue)
+ HTML.CreateHtmlTestRowQueue('N/A', 'OK', len(self.UEDevices), html_queue)
else:
- self.CreateHtmlTestRow('Cannot perform requested X2 Handover', 'KO', ALL_PROCESSES_OK)
+ HTML.CreateHtmlTestRow('Cannot perform requested X2 Handover', 'KO', CONST.ALL_PROCESSES_OK)
def LogCollectBuild(self):
- if (self.eNBIPAddress != '' and self.eNBUserName != '' and self.eNBPassword != ''):
- IPAddress = self.eNBIPAddress
- UserName = self.eNBUserName
- Password = self.eNBPassword
- SourceCodePath = self.eNBSourceCodePath
+ if (RAN.GeteNBIPAddress() != '' and RAN.GeteNBUserName() != '' and RAN.GeteNBPassword() != ''):
+ IPAddress = RAN.GeteNBIPAddress()
+ UserName = RAN.GeteNBUserName()
+ Password = RAN.GeteNBPassword()
+ SourceCodePath = RAN.GeteNBSourceCodePath()
elif (self.UEIPAddress != '' and self.UEUserName != '' and self.UEPassword != ''):
IPAddress = self.UEIPAddress
UserName = self.UEUserName
@@ -4124,109 +2892,55 @@ class SSHConnection():
SourceCodePath = self.UESourceCodePath
else:
sys.exit('Insufficient Parameter')
- self.open(IPAddress, UserName, Password)
- self.command('cd ' + SourceCodePath, '\$', 5)
- self.command('cd cmake_targets', '\$', 5)
- self.command('rm -f build.log.zip', '\$', 5)
- self.command('zip build.log.zip build_log_*/*', '\$', 60)
- self.close()
-
- def LogCollecteNB(self):
- self.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
- self.command('cd ' + self.eNBSourceCodePath, '\$', 5)
- self.command('cd cmake_targets', '\$', 5)
- self.command('echo ' + self.eNBPassword + ' | sudo -S rm -f enb.log.zip', '\$', 5)
- self.command('echo ' + self.eNBPassword + ' | sudo -S zip enb.log.zip enb*.log core* enb_*record.raw enb_*.pcap enb_*txt', '\$', 60)
- self.command('echo ' + self.eNBPassword + ' | sudo -S rm enb*.log core* enb_*record.raw enb_*.pcap enb_*txt', '\$', 5)
- self.close()
-
+ SSH.open(IPAddress, UserName, Password)
+ SSH.command('cd ' + SourceCodePath, '\$', 5)
+ SSH.command('cd cmake_targets', '\$', 5)
+ SSH.command('rm -f build.log.zip', '\$', 5)
+ SSH.command('zip build.log.zip build_log_*/*', '\$', 60)
+ SSH.close()
def LogCollectPing(self):
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd ' + self.EPCSourceCodePath, '\$', 5)
- self.command('cd scripts', '\$', 5)
- self.command('rm -f ping.log.zip', '\$', 5)
- self.command('zip ping.log.zip ping*.log', '\$', 60)
- self.command('rm ping*.log', '\$', 5)
- self.close()
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('cd ' + EPC.GetSourceCodePath(), '\$', 5)
+ SSH.command('cd scripts', '\$', 5)
+ SSH.command('rm -f ping.log.zip', '\$', 5)
+ SSH.command('zip ping.log.zip ping*.log', '\$', 60)
+ SSH.command('rm ping*.log', '\$', 5)
+ SSH.close()
def LogCollectIperf(self):
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd ' + self.EPCSourceCodePath, '\$', 5)
- self.command('cd scripts', '\$', 5)
- self.command('rm -f iperf.log.zip', '\$', 5)
- self.command('zip iperf.log.zip iperf*.log', '\$', 60)
- self.command('rm iperf*.log', '\$', 5)
- self.close()
-
- def LogCollectHSS(self):
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
- self.command('rm -f hss.log.zip', '\$', 5)
- if re.match('OAI', self.EPCType, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- self.command('zip hss.log.zip hss*.log', '\$', 60)
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm hss*.log', '\$', 5)
- if re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- self.command('zip hss.log.zip logs/hss*.* *.pcap', '\$', 60)
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm -f logs/hss*.* *.pcap', '\$', 5)
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- self.command('cp /opt/hss_sim0609/hss.log .', '\$', 60)
- self.command('zip hss.log.zip hss.log', '\$', 60)
- else:
- logging.error('This option should not occur!')
- self.close()
-
- def LogCollectMME(self):
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
- self.command('rm -f mme.log.zip', '\$', 5)
- if re.match('OAI', self.EPCType, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- self.command('zip mme.log.zip mme*.log', '\$', 60)
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm mme*.log', '\$', 5)
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- self.command('cp /opt/ltebox/var/log/*Log.0 .', '\$', 5)
- self.command('zip mme.log.zip mmeLog.0 s1apcLog.0 s1apsLog.0 s11cLog.0 libLog.0 s1apCodecLog.0', '\$', 60)
- else:
- logging.error('This option should not occur!')
- self.close()
-
- def LogCollectSPGW(self):
- self.open(self.EPCIPAddress, self.EPCUserName, self.EPCPassword)
- self.command('cd ' + self.EPCSourceCodePath + '/scripts', '\$', 5)
- self.command('rm -f spgw.log.zip', '\$', 5)
- if re.match('OAI', self.EPCType, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.EPCType, re.IGNORECASE):
- self.command('zip spgw.log.zip spgw*.log', '\$', 60)
- self.command('echo ' + self.EPCPassword + ' | sudo -S rm spgw*.log', '\$', 5)
- elif re.match('ltebox', self.EPCType, re.IGNORECASE):
- self.command('cp /opt/ltebox/var/log/xGwLog.0 .', '\$', 5)
- self.command('zip spgw.log.zip xGwLog.0', '\$', 60)
- else:
- logging.error('This option should not occur!')
- self.close()
-
+ SSH.open(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword())
+ SSH.command('cd ' + EPC.GetSourceCodePath(), '\$', 5)
+ SSH.command('cd scripts', '\$', 5)
+ SSH.command('rm -f iperf.log.zip', '\$', 5)
+ SSH.command('zip iperf.log.zip iperf*.log', '\$', 60)
+ SSH.command('rm iperf*.log', '\$', 5)
+ SSH.close()
+
def LogCollectOAIUE(self):
- self.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
- self.command('cd ' + self.UESourceCodePath, '\$', 5)
- self.command('cd cmake_targets', '\$', 5)
- self.command('echo ' + self.UEPassword + ' | sudo -S rm -f ue.log.zip', '\$', 5)
- self.command('echo ' + self.UEPassword + ' | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 60)
- self.command('echo ' + self.UEPassword + ' | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
- self.close()
+ SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+ SSH.command('cd ' + self.UESourceCodePath, '\$', 5)
+ SSH.command('cd cmake_targets', '\$', 5)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S rm -f ue.log.zip', '\$', 5)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 60)
+ SSH.command('echo ' + self.UEPassword + ' | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
+ SSH.close()
def RetrieveSystemVersion(self, machine):
- if self.eNBIPAddress == 'none' or self.UEIPAddress == 'none':
- self.OsVersion = 'Ubuntu 16.04.5 LTS'
- self.KernelVersion = '4.15.0-45-generic'
- self.UhdVersion = '3.13.0.1-0'
- self.UsrpBoard = 'B210'
- self.CpuNb = '4'
- self.CpuModel = 'Intel(R) Core(TM) i5-6200U'
- self.CpuMHz = '2399.996 MHz'
+ if RAN.GeteNBIPAddress() == 'none' or self.UEIPAddress == 'none':
+ HTML.SetOsVersion('Ubuntu 16.04.5 LTS', 0)
+ HTML.SetKernelVersion('4.15.0-45-generic', 0)
+ HTML.SetUhdVersion('3.13.0.1-0', 0)
+ HTML.SetUsrpBoard('B210', 0)
+ HTML.SetCpuNb('4', 0)
+ HTML.SetCpuModel('Intel(R) Core(TM) i5-6200U', 0)
+ HTML.SetCpuMHz('2399.996 MHz', 0)
return 0
if machine == 'eNB':
- if self.eNBIPAddress != '' and self.eNBUserName != '' and self.eNBPassword != '':
- IPAddress = self.eNBIPAddress
- UserName = self.eNBUserName
- Password = self.eNBPassword
+ if RAN.GeteNBIPAddress() != '' and RAN.GeteNBUserName() != '' and RAN.GeteNBPassword() != '':
+ IPAddress = RAN.GeteNBIPAddress()
+ UserName = RAN.GeteNBUserName()
+ Password = RAN.GeteNBPassword()
+ idx = 0
else:
return -1
if machine == 'UE':
@@ -4234,386 +2948,73 @@ class SSHConnection():
IPAddress = self.UEIPAddress
UserName = self.UEUserName
Password = self.UEPassword
+ idx = 1
else:
return -1
- self.open(IPAddress, UserName, Password)
- self.command('lsb_release -a', '\$', 5)
- result = re.search('Description:\\\\t(?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', str(self.ssh.before))
+ SSH.open(IPAddress, UserName, Password)
+ SSH.command('lsb_release -a', '\$', 5)
+ result = re.search('Description:\\\\t(?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', SSH.getBefore())
if result is not None:
- self.OsVersion = result.group('os_type')
- logging.debug('OS is: ' + self.OsVersion)
+ OsVersion = result.group('os_type')
+ logging.debug('OS is: ' + OsVersion)
+ HTML.SetOsVersion(OsVersion, idx)
else:
- self.command('hostnamectl', '\$', 5)
- result = re.search('Operating System: (?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', str(self.ssh.before))
+ SSH.command('hostnamectl', '\$', 5)
+ result = re.search('Operating System: (?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', SSH.getBefore())
if result is not None:
- self.OsVersion = result.group('os_type')
- if self.OsVersion == 'CentOS Linux 7 ':
- self.command('cat /etc/redhat-release', '\$', 5)
- result = re.search('CentOS Linux release (?P<os_version>[0-9\.]+)', str(self.ssh.before))
+ OsVersion = result.group('os_type')
+ if OsVersion == 'CentOS Linux 7 ':
+ SSH.command('cat /etc/redhat-release', '\$', 5)
+ result = re.search('CentOS Linux release (?P<os_version>[0-9\.]+)', SSH.getBefore())
if result is not None:
- self.OsVersion = self.OsVersion.replace('7 ', result.group('os_version'))
- logging.debug('OS is: ' + self.OsVersion)
- self.command('uname -r', '\$', 5)
- result = re.search('uname -r\\\\r\\\\n(?P<kernel_version>[a-zA-Z0-9\-\_\.]+)', str(self.ssh.before))
+ OsVersion = OsVersion.replace('7 ', result.group('os_version'))
+ logging.debug('OS is: ' + OsVersion)
+ HTML.SetOsVersion(OsVersion, idx)
+ SSH.command('uname -r', '\$', 5)
+ result = re.search('uname -r\\\\r\\\\n(?P<kernel_version>[a-zA-Z0-9\-\_\.]+)', SSH.getBefore())
if result is not None:
- self.KernelVersion = result.group('kernel_version')
- logging.debug('Kernel Version is: ' + self.KernelVersion)
- self.command('dpkg --list | egrep --color=never libuhd003', '\$', 5)
- result = re.search('libuhd003:amd64 *(?P<uhd_version>[0-9\.]+)', str(self.ssh.before))
+ KernelVersion = result.group('kernel_version')
+ logging.debug('Kernel Version is: ' + KernelVersion)
+ HTML.SetKernelVersion(KernelVersion, idx)
+ SSH.command('dpkg --list | egrep --color=never libuhd003', '\$', 5)
+ result = re.search('libuhd003:amd64 *(?P<uhd_version>[0-9\.]+)', SSH.getBefore())
if result is not None:
- self.UhdVersion = result.group('uhd_version')
- logging.debug('UHD Version is: ' + self.UhdVersion)
+ UhdVersion = result.group('uhd_version')
+ logging.debug('UHD Version is: ' + UhdVersion)
+ HTML.SetUhdVersion(UhdVersion, idx)
else:
- self.command('uhd_config_info --version', '\$', 5)
- result = re.search('UHD (?P<uhd_version>[a-zA-Z0-9\.\-]+)', str(self.ssh.before))
+ SSH.command('uhd_config_info --version', '\$', 5)
+ result = re.search('UHD (?P<uhd_version>[a-zA-Z0-9\.\-]+)', SSH.getBefore())
if result is not None:
- self.UhdVersion = result.group('uhd_version')
- logging.debug('UHD Version is: ' + self.UhdVersion)
- self.command('echo ' + Password + ' | sudo -S uhd_find_devices', '\$', 60)
- usrp_boards = re.findall('product: ([0-9A-Za-z]+)\\\\r\\\\n', str(self.ssh.before))
+ UhdVersion = result.group('uhd_version')
+ logging.debug('UHD Version is: ' + UhdVersion)
+ HTML.SetUhdVersion(UhdVersion, idx)
+ SSH.command('echo ' + Password + ' | sudo -S uhd_find_devices', '\$', 60)
+ usrp_boards = re.findall('product: ([0-9A-Za-z]+)\\\\r\\\\n', SSH.getBefore())
count = 0
for board in usrp_boards:
if count == 0:
- self.UsrpBoard = board
+ UsrpBoard = board
else:
- self.UsrpBoard += ',' + board
+ UsrpBoard += ',' + board
count += 1
if count > 0:
- logging.debug('USRP Board(s) : ' + self.UsrpBoard)
- self.command('lscpu', '\$', 5)
- result = re.search('CPU\(s\): *(?P<nb_cpus>[0-9]+).*Model name: *(?P<model>[a-zA-Z0-9\-\_\.\ \(\)]+).*CPU MHz: *(?P<cpu_mhz>[0-9\.]+)', str(self.ssh.before))
+ logging.debug('USRP Board(s) : ' + UsrpBoard)
+ HTML.SetUsrpBoard(UsrpBoard, idx)
+ SSH.command('lscpu', '\$', 5)
+ result = re.search('CPU\(s\): *(?P<nb_cpus>[0-9]+).*Model name: *(?P<model>[a-zA-Z0-9\-\_\.\ \(\)]+).*CPU MHz: *(?P<cpu_mhz>[0-9\.]+)', SSH.getBefore())
if result is not None:
- self.CpuNb = result.group('nb_cpus')
- logging.debug('nb_cpus: ' + self.CpuNb)
- self.CpuModel = result.group('model')
- logging.debug('model: ' + self.CpuModel)
- self.CpuMHz = result.group('cpu_mhz') + ' MHz'
- logging.debug('cpu_mhz: ' + self.CpuMHz)
- self.close()
-
-#-----------------------------------------------------------
-# HTML Reporting....
-#-----------------------------------------------------------
- def CreateHtmlHeader(self):
- if (not self.htmlHeaderCreated):
- logging.debug('\u001B[1m----------------------------------------\u001B[0m')
- logging.debug('\u001B[1m Creating HTML header \u001B[0m')
- logging.debug('\u001B[1m----------------------------------------\u001B[0m')
- self.htmlFile = open('test_results.html', 'w')
- self.htmlFile.write('<!DOCTYPE html>\n')
- self.htmlFile.write('<html class="no-js" lang="en-US">\n')
- self.htmlFile.write('<head>\n')
- self.htmlFile.write(' <meta name="viewport" content="width=device-width, initial-scale=1">\n')
- self.htmlFile.write(' <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">\n')
- self.htmlFile.write(' <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>\n')
- self.htmlFile.write(' <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>\n')
- self.htmlFile.write(' <title>Test Results for TEMPLATE_JOB_NAME job build #TEMPLATE_BUILD_ID</title>\n')
- self.htmlFile.write('</head>\n')
- self.htmlFile.write('<body><div class="container">\n')
- self.htmlFile.write(' <br>\n')
- self.htmlFile.write(' <table style="border-collapse: collapse; border: none;">\n')
- self.htmlFile.write(' <tr style="border-collapse: collapse; border: none;">\n')
- self.htmlFile.write(' <td style="border-collapse: collapse; border: none;">\n')
- self.htmlFile.write(' <a href="http://www.openairinterface.org/">\n')
- self.htmlFile.write(' <img src="http://www.openairinterface.org/wp-content/uploads/2016/03/cropped-oai_final_logo2.png" alt="" border="none" height=50 width=150>\n')
- self.htmlFile.write(' </img>\n')
- self.htmlFile.write(' </a>\n')
- self.htmlFile.write(' </td>\n')
- self.htmlFile.write(' <td style="border-collapse: collapse; border: none; vertical-align: center;">\n')
- self.htmlFile.write(' <b><font size = "6">Job Summary -- Job: TEMPLATE_JOB_NAME -- Build-ID: TEMPLATE_BUILD_ID</font></b>\n')
- self.htmlFile.write(' </td>\n')
- self.htmlFile.write(' </tr>\n')
- self.htmlFile.write(' </table>\n')
- self.htmlFile.write(' <br>\n')
- self.htmlFile.write(' <div class="alert alert-info"><strong> <span class="glyphicon glyphicon-dashboard"></span> TEMPLATE_STAGE_NAME</strong></div>\n')
- self.htmlFile.write(' <table border = "1">\n')
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-time"></span> Build Start Time (UTC) </td>\n')
- self.htmlFile.write(' <td>TEMPLATE_BUILD_TIME</td>\n')
- self.htmlFile.write(' </tr>\n')
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-cloud-upload"></span> GIT Repository </td>\n')
- self.htmlFile.write(' <td><a href="' + self.ranRepository + '">' + self.ranRepository + '</a></td>\n')
- self.htmlFile.write(' </tr>\n')
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-wrench"></span> Job Trigger </td>\n')
- if (self.ranAllowMerge):
- self.htmlFile.write(' <td>Merge-Request</td>\n')
- else:
- self.htmlFile.write(' <td>Push to Branch</td>\n')
- self.htmlFile.write(' </tr>\n')
- self.htmlFile.write(' <tr>\n')
- if (self.ranAllowMerge):
- self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Source Branch </td>\n')
- else:
- self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tree-deciduous"></span> Branch</td>\n')
- self.htmlFile.write(' <td>' + self.ranBranch + '</td>\n')
- self.htmlFile.write(' </tr>\n')
- self.htmlFile.write(' <tr>\n')
- if (self.ranAllowMerge):
- self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Source Commit ID </td>\n')
- else:
- self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
- self.htmlFile.write(' <td>' + self.ranCommitID + '</td>\n')
- self.htmlFile.write(' </tr>\n')
- if self.ranAllowMerge != '':
- commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.ranCommitID, shell=True, universal_newlines=True)
- commit_message = commit_message.strip()
- self.htmlFile.write(' <tr>\n')
- if (self.ranAllowMerge):
- self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Source Commit Message </td>\n')
- else:
- self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')
- self.htmlFile.write(' <td>' + commit_message + '</td>\n')
- self.htmlFile.write(' </tr>\n')
- if (self.ranAllowMerge):
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-in"></span> Target Branch </td>\n')
- if (self.ranTargetBranch == ''):
- self.htmlFile.write(' <td>develop</td>\n')
- else:
- self.htmlFile.write(' <td>' + self.ranTargetBranch + '</td>\n')
- self.htmlFile.write(' </tr>\n')
- self.htmlFile.write(' </table>\n')
-
- if (self.ADBIPAddress != 'none'):
- terminate_ue_flag = True
- self.GetAllUEDevices(terminate_ue_flag)
- self.GetAllCatMDevices(terminate_ue_flag)
- self.htmlUEConnected = len(self.UEDevices)
- self.htmlFile.write(' <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(len(self.UEDevices)) + ' UE(s) is(are) connected to ADB bench server</h2>\n')
- self.htmlFile.write(' <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(len(self.CatMDevices)) + ' CAT-M UE(s) is(are) connected to bench server</h2>\n')
- else:
- self.UEDevices.append('OAI-UE')
- self.htmlUEConnected = len(self.UEDevices)
- self.htmlFile.write(' <h2><span class="glyphicon glyphicon-phone"></span> <span class="glyphicon glyphicon-menu-right"></span> ' + str(len(self.UEDevices)) + ' OAI UE(s) is(are) connected to CI bench</h2>\n')
- self.htmlFile.write(' <br>\n')
- self.htmlFile.write(' <ul class="nav nav-pills">\n')
- count = 0
- while (count < self.nbTestXMLfiles):
- pillMsg = ' <li><a data-toggle="pill" href="#'
- pillMsg += self.htmlTabRefs[count]
- pillMsg += '">'
- pillMsg += '__STATE_' + self.htmlTabNames[count] + '__'
- pillMsg += self.htmlTabNames[count]
- pillMsg += ' <span class="glyphicon glyphicon-'
- pillMsg += self.htmlTabIcons[count]
- pillMsg += '"></span></a></li>\n'
- self.htmlFile.write(pillMsg)
- count += 1
- self.htmlFile.write(' </ul>\n')
- self.htmlFile.write(' <div class="tab-content">\n')
- self.htmlFile.close()
-
- def CreateHtmlTabHeader(self):
- if (not self.htmlHeaderCreated):
- if (not os.path.isfile('test_results.html')):
- self.CreateHtmlHeader()
- self.htmlFile = open('test_results.html', 'a')
- if (self.nbTestXMLfiles == 1):
- self.htmlFile.write(' <div id="' + self.htmlTabRefs[0] + '" class="tab-pane fade">\n')
- self.htmlFile.write(' <h3>Test Summary for <span class="glyphicon glyphicon-file"></span> ' + self.testXMLfiles[0] + '</h3>\n')
- else:
- self.htmlFile.write(' <div id="build-tab" class="tab-pane fade">\n')
- self.htmlFile.write(' <table class="table" border = "1">\n')
- self.htmlFile.write(' <tr bgcolor = "#33CCFF" >\n')
- self.htmlFile.write(' <th>Relative Time (ms)</th>\n')
- self.htmlFile.write(' <th>Test Id</th>\n')
- self.htmlFile.write(' <th>Test Desc</th>\n')
- self.htmlFile.write(' <th>Test Options</th>\n')
- self.htmlFile.write(' <th>Test Status</th>\n')
- if (self.htmlUEConnected == -1):
- terminate_ue_flag = True
- if (self.ADBIPAddress != 'none'):
- self.GetAllUEDevices(terminate_ue_flag)
- self.GetAllCatMDevices(terminate_ue_flag)
- else:
- self.UEDevices.append('OAI-UE')
- self.htmlUEConnected = len(self.UEDevices)
-
- i = 0
- while (i < self.htmlUEConnected):
- self.htmlFile.write(' <th>UE' + str(i) + ' Status</th>\n')
- i += 1
- self.htmlFile.write(' </tr>\n')
- self.htmlHeaderCreated = True
-
- def CreateHtmlTabFooter(self, passStatus):
- if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <th bgcolor = "#33CCFF" colspan=3>Final Tab Status</th>\n')
- if passStatus:
- self.htmlFile.write(' <th bgcolor = "green" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">PASS <span class="glyphicon glyphicon-ok"></span> </font></th>\n')
- else:
- self.htmlFile.write(' <th bgcolor = "red" colspan=' + str(2 + self.htmlUEConnected) + '><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
- self.htmlFile.write(' </tr>\n')
- self.htmlFile.write(' </table>\n')
- self.htmlFile.write(' </div>\n')
- self.htmlFile.close()
- time.sleep(1)
- if passStatus:
- cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__//' test_results.html"
- subprocess.run(cmd, shell=True)
- else:
- cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__/<span class=\"glyphicon glyphicon-remove\"><\/span>/' test_results.html"
- subprocess.run(cmd, shell=True)
- self.htmlFooterCreated = False
-
- def CreateHtmlFooter(self, passStatus):
- if (os.path.isfile('test_results.html')):
- logging.debug('\u001B[1m----------------------------------------\u001B[0m')
- logging.debug('\u001B[1m Creating HTML footer \u001B[0m')
- logging.debug('\u001B[1m----------------------------------------\u001B[0m')
-
- self.htmlFile = open('test_results.html', 'a')
- self.htmlFile.write('</div>\n')
- self.htmlFile.write(' <p></p>\n')
- self.htmlFile.write(' <table class="table table-condensed">\n')
-
- machines = [ 'eNB', 'UE' ]
- for machine in machines:
- res = self.RetrieveSystemVersion(machine)
- if res == -1:
- continue
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <th colspan=8>' + str(machine) + ' Server Characteristics</th>\n')
- self.htmlFile.write(' </tr>\n')
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <td>OS Version</td>\n')
- self.htmlFile.write(' <td><span class="label label-default">' + self.OsVersion + '</span></td>\n')
- self.htmlFile.write(' <td>Kernel Version</td>\n')
- self.htmlFile.write(' <td><span class="label label-default">' + self.KernelVersion + '</span></td>\n')
- self.htmlFile.write(' <td>UHD Version</td>\n')
- self.htmlFile.write(' <td><span class="label label-default">' + self.UhdVersion + '</span></td>\n')
- self.htmlFile.write(' <td>USRP Board</td>\n')
- self.htmlFile.write(' <td><span class="label label-default">' + self.UsrpBoard + '</span></td>\n')
- self.htmlFile.write(' </tr>\n')
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <td>Nb CPUs</td>\n')
- self.htmlFile.write(' <td><span class="label label-default">' + self.CpuNb + '</span></td>\n')
- self.htmlFile.write(' <td>CPU Model Name</td>\n')
- self.htmlFile.write(' <td><span class="label label-default">' + self.CpuModel + '</span></td>\n')
- self.htmlFile.write(' <td>CPU Frequency</td>\n')
- self.htmlFile.write(' <td><span class="label label-default">' + self.CpuMHz + '</span></td>\n')
- self.htmlFile.write(' <td></td>\n')
- self.htmlFile.write(' <td></td>\n')
- self.htmlFile.write(' </tr>\n')
-
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <th colspan=5 bgcolor = "#33CCFF">Final Status</th>\n')
- if passStatus:
- self.htmlFile.write(' <th colspan=3 bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>\n')
- else:
- self.htmlFile.write(' <th colspan=3 bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>\n')
- self.htmlFile.write(' </tr>\n')
- self.htmlFile.write(' </table>\n')
- self.htmlFile.write(' <p></p>\n')
- self.htmlFile.write(' <div class="well well-lg">End of Test Report -- Copyright <span class="glyphicon glyphicon-copyright-mark"></span> 2018 <a href="http://www.openairinterface.org/">OpenAirInterface</a>. All Rights Reserved.</div>\n')
- self.htmlFile.write('</div></body>\n')
- self.htmlFile.write('</html>\n')
- self.htmlFile.close()
-
- def CreateHtmlTestRow(self, options, status, processesStatus, machine='eNB'):
- if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
- currentTime = int(round(time.time() * 1000)) - self.startTime
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
- self.htmlFile.write(' <td bgcolor = "lightcyan" >' + self.testCase_id + '</td>\n')
- self.htmlFile.write(' <td>' + self.desc + '</td>\n')
- self.htmlFile.write(' <td>' + str(options) + '</td>\n')
- if (str(status) == 'OK'):
- self.htmlFile.write(' <td bgcolor = "lightgreen" >' + str(status) + '</td>\n')
- elif (str(status) == 'KO'):
- if (processesStatus == 0):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >' + str(status) + '</td>\n')
- elif (processesStatus == ENB_PROCESS_FAILED):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - eNB process not found</td>\n')
- elif (processesStatus == OAI_UE_PROCESS_FAILED):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - OAI UE process not found</td>\n')
- elif (processesStatus == ENB_PROCESS_SEG_FAULT) or (processesStatus == OAI_UE_PROCESS_SEG_FAULT):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Segmentation Fault</td>\n')
- elif (processesStatus == ENB_PROCESS_ASSERTION) or (processesStatus == OAI_UE_PROCESS_ASSERTION):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - ' + machine + ' process ended in Assertion</td>\n')
- elif (processesStatus == ENB_PROCESS_REALTIME_ISSUE):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - ' + machine + ' process faced Real Time issue(s)</td>\n')
- elif (processesStatus == ENB_PROCESS_NOLOGFILE_TO_ANALYZE) or (processesStatus == OAI_UE_PROCESS_NOLOGFILE_TO_ANALYZE):
- self.htmlFile.write(' <td bgcolor = "orange" >OK?</td>\n')
- elif (processesStatus == ENB_PROCESS_SLAVE_RRU_NOT_SYNCED):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - ' + machine + ' Slave RRU could not synch</td>\n')
- elif (processesStatus == OAI_UE_PROCESS_COULD_NOT_SYNC):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - UE could not sync</td>\n')
- elif (processesStatus == HSS_PROCESS_FAILED):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - HSS process not found</td>\n')
- elif (processesStatus == MME_PROCESS_FAILED):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - MME process not found</td>\n')
- elif (processesStatus == SPGW_PROCESS_FAILED):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - SPGW process not found</td>\n')
- elif (processesStatus == UE_IP_ADDRESS_ISSUE):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >KO - Could not retrieve UE IP address</td>\n')
- else:
- self.htmlFile.write(' <td bgcolor = "lightcoral" >' + str(status) + '</td>\n')
- else:
- self.htmlFile.write(' <td bgcolor = "orange" >' + str(status) + '</td>\n')
- if (len(str(self.htmleNBFailureMsg)) > 2):
- cellBgColor = 'white'
- result = re.search('ended with|faced real time issues', self.htmleNBFailureMsg)
- if result is not None:
- cellBgColor = 'red'
- else:
- result = re.search('showed|Reestablishment|Could not copy eNB logfile', self.htmleNBFailureMsg)
- if result is not None:
- cellBgColor = 'orange'
- self.htmlFile.write(' <td bgcolor = "' + cellBgColor + '" colspan=' + str(self.htmlUEConnected) + '><pre style="background-color:' + cellBgColor + '">' + self.htmleNBFailureMsg + '</pre></td>\n')
- self.htmleNBFailureMsg = ''
- elif (len(str(self.htmlUEFailureMsg)) > 2):
- cellBgColor = 'white'
- result = re.search('ended with|faced real time issues', self.htmlUEFailureMsg)
- if result is not None:
- cellBgColor = 'red'
- else:
- result = re.search('showed|Could not copy UE logfile|oaitun_ue1 interface is either NOT mounted or NOT configured', self.htmlUEFailureMsg)
- if result is not None:
- cellBgColor = 'orange'
- self.htmlFile.write(' <td bgcolor = "' + cellBgColor + '" colspan=' + str(self.htmlUEConnected) + '><pre style="background-color:' + cellBgColor + '">' + self.htmlUEFailureMsg + '</pre></td>\n')
- self.htmlUEFailureMsg = ''
- else:
- i = 0
- while (i < self.htmlUEConnected):
- self.htmlFile.write(' <td>-</td>\n')
- i += 1
- self.htmlFile.write(' </tr>\n')
-
- def CreateHtmlTestRowQueue(self, options, status, ue_status, ue_queue):
- if ((not self.htmlFooterCreated) and (self.htmlHeaderCreated)):
- currentTime = int(round(time.time() * 1000)) - self.startTime
- addOrangeBK = False
- self.htmlFile.write(' <tr>\n')
- self.htmlFile.write(' <td bgcolor = "lightcyan" >' + format(currentTime / 1000, '.1f') + '</td>\n')
- self.htmlFile.write(' <td bgcolor = "lightcyan" >' + self.testCase_id + '</td>\n')
- self.htmlFile.write(' <td>' + self.desc + '</td>\n')
- self.htmlFile.write(' <td>' + str(options) + '</td>\n')
- if (str(status) == 'OK'):
- self.htmlFile.write(' <td bgcolor = "lightgreen" >' + str(status) + '</td>\n')
- elif (str(status) == 'KO'):
- self.htmlFile.write(' <td bgcolor = "lightcoral" >' + str(status) + '</td>\n')
- else:
- addOrangeBK = True
- self.htmlFile.write(' <td bgcolor = "orange" >' + str(status) + '</td>\n')
- i = 0
- while (i < self.htmlUEConnected):
- if (i < ue_status):
- if (not ue_queue.empty()):
- if (addOrangeBK):
- self.htmlFile.write(' <td bgcolor = "orange" >' + str(ue_queue.get()).replace('white', 'orange') + '</td>\n')
- else:
- self.htmlFile.write(' <td>' + str(ue_queue.get()) + '</td>\n')
- else:
- self.htmlFile.write(' <td>-</td>\n')
- else:
- self.htmlFile.write(' <td>-</td>\n')
- i += 1
- self.htmlFile.write(' </tr>\n')
+ CpuNb = result.group('nb_cpus')
+ logging.debug('nb_cpus: ' + CpuNb)
+ HTML.SetCpuNb(CpuNb, idx)
+ CpuModel = result.group('model')
+ logging.debug('model: ' + CpuModel)
+ HTML.SetCpuModel(CpuModel, idx)
+ CpuMHz = result.group('cpu_mhz') + ' MHz'
+ logging.debug('cpu_mhz: ' + CpuMHz)
+ HTML.SetCpuMHz(CpuMHz, idx)
+ SSH.close()
#-----------------------------------------------------------
# ShowTestID()
@@ -4624,50 +3025,6 @@ class SSHConnection():
logging.debug('\u001B[1m' + self.desc + '\u001B[0m')
logging.debug('\u001B[1m----------------------------------------\u001B[0m')
-#-----------------------------------------------------------
-# Usage()
-#-----------------------------------------------------------
-def Usage():
- print('----------------------------------------------------------------------------------------------------------------------')
- print('main.py Ver:' + Version)
- print('----------------------------------------------------------------------------------------------------------------------')
- print('Usage: python main.py [options]')
- print(' --help Show this help.')
- print(' --mode=[Mode]')
- print(' TesteNB')
- print(' InitiateHtml, FinalizeHtml')
- print(' TerminateeNB, TerminateUE, TerminateHSS, TerminateMME, TerminateSPGW')
- print(' LogCollectBuild, LogCollecteNB, LogCollectHSS, LogCollectMME, LogCollectSPGW, LogCollectPing, LogCollectIperf')
- print('---------------------------------------------------------------------------------------------------- Git Options --')
- print(' --ranRepository=[OAI RAN Repository URL]')
- print(' --ranBranch=[OAI RAN Repository Branch]')
- print(' --ranCommitID=[OAI RAN Repository Commit SHA-1]')
- print(' --ranAllowMerge=[Allow Merge Request (with target branch) (true or false)]')
- print(' --ranTargetBranch=[Target Branch in case of a Merge Request]')
- print('--------------------------------------------------------------------------------------------- eNB Server Options --')
- print(' --eNBIPAddress=[eNB\'s IP Address]')
- print(' --eNBUserName=[eNB\'s Login User Name]')
- print(' --eNBPassword=[eNB\'s Login Password]')
- print(' --eNBSourceCodePath=[eNB\'s Source Code Path]')
- print('------------------------------------------------------------------------------------------ OAI UE Server Options --')
- print(' --UEIPAddress=[UE\'s IP Address]')
- print(' --UEUserName=[UE\'s Login User Name]')
- print(' --UEPassword=[UE\'s Login Password]')
- print(' --UESourceCodePath=[UE\'s Source Code Path]')
- print('--------------------------------------------------------------------------------------------- EPC Server Options --')
- print(' --EPCIPAddress=[EPC\'s IP Address]')
- print(' --EPCUserName=[EPC\'s Login User Name]')
- print(' --EPCPassword=[EPC\'s Login Password]')
- print(' --EPCSourceCodePath=[EPC\'s Source Code Path]')
- print(' --EPCType=[EPC\'s Type: OAI or ltebox or OAI-Rel14-CUPS]')
- print('--------------------------------------------------------------------------------------------- ABD Server Options --')
- print(' --ADBIPAddress=[ADB\'s IP Address]')
- print(' --ADBUserName=[ADB\'s Login User Name]')
- print(' --ADBPassword=[ADB\'s Login Password]')
- print('----------------------------------------------------------------------------------------------------------------------')
- print(' --XMLTestFile=[XML Test File to be run]')
- print('----------------------------------------------------------------------------------------------------------------------')
-
def CheckClassValidity(action,id):
if action != 'Build_eNB' and action != 'WaitEndBuild_eNB' and action != 'Initialize_eNB' and action != 'Terminate_eNB' and action != 'Initialize_UE' and action != 'Terminate_UE' and action != 'Attach_UE' and action != 'Detach_UE' and action != 'Build_OAI_UE' and action != 'Initialize_OAI_UE' and action != 'Terminate_OAI_UE' and action != 'DataDisable_UE' and action != 'DataEnable_UE' and action != 'CheckStatusUE' and action != 'Ping' and action != 'Iperf' and action != 'Reboot_UE' and action != 'Initialize_FlexranCtrl' and action != 'Terminate_FlexranCtrl' and action != 'Initialize_HSS' and action != 'Terminate_HSS' and action != 'Initialize_MME' and action != 'Terminate_MME' and action != 'Initialize_SPGW' and action != 'Terminate_SPGW' and action != 'Initialize_CatM_module' and action != 'Terminate_CatM_module' and action != 'Attach_CatM_module' and action != 'Detach_CatM_module' and action != 'Ping_CatM_module' and action != 'IdleSleep' and action != 'Perform_X2_Handover':
logging.debug('ERROR: test-case ' + id + ' has wrong class ' + action)
@@ -4676,143 +3033,145 @@ def CheckClassValidity(action,id):
def GetParametersFromXML(action):
if action == 'Build_eNB':
- SSH.Build_eNB_args = test.findtext('Build_eNB_args')
+ RAN.SetBuild_eNB_args(test.findtext('Build_eNB_args'))
forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
if (forced_workspace_cleanup is None):
- SSH.Build_eNB_forced_workspace_cleanup = False
+ RAN.SetBuild_eNB_forced_workspace_cleanup(False)
else:
if re.match('true', forced_workspace_cleanup, re.IGNORECASE):
- SSH.Build_eNB_forced_workspace_cleanup = True
- else:
- SSH.Build_eNB_forced_workspace_cleanup = False
- SSH.eNB_instance = test.findtext('eNB_instance')
- if (SSH.eNB_instance is None):
- SSH.eNB_instance = '0'
- SSH.eNB_serverId = test.findtext('eNB_serverId')
- if (SSH.eNB_serverId is None):
- SSH.eNB_serverId = '0'
+ RAN.SetBuild_eNB_forced_workspace_cleanup(True)
+ else:
+ RAN.SetBuild_eNB_forced_workspace_cleanup(False)
+ RAN.SeteNB_instance(test.findtext('eNB_instance'))
+ if (RAN.GeteNB_instance() is None):
+ RAN.SeteNB_instance('0')
+ RAN.SeteNB_serverId(test.findtext('eNB_serverId'))
+ if (RAN.GeteNB_serverId() is None):
+ RAN.SeteNB_serverId('0')
xmlBgBuildField = test.findtext('backgroundBuild')
if (xmlBgBuildField is None):
- SSH.backgroundBuild = False
+ RAN.SetbackgroundBuild(False)
else:
if re.match('true', xmlBgBuildField, re.IGNORECASE):
- SSH.backgroundBuild = True
+ RAN.SetbackgroundBuild(True)
else:
- SSH.backgroundBuild = False
+ RAN.SetbackgroundBuild(False)
if action == 'WaitEndBuild_eNB':
- SSH.Build_eNB_args = test.findtext('Build_eNB_args')
- SSH.eNB_instance = test.findtext('eNB_instance')
- if (SSH.eNB_instance is None):
- SSH.eNB_instance = '0'
- SSH.eNB_serverId = test.findtext('eNB_serverId')
- if (SSH.eNB_serverId is None):
- SSH.eNB_serverId = '0'
+ RAN.SetBuild_eNB_args(test.findtext('Build_eNB_args'))
+ RAN.SeteNB_instance(test.findtext('eNB_instance'))
+ if (RAN.GeteNB_instance() is None):
+ RAN.SeteNB_instance('0')
+ RAN.SeteNB_serverId(test.findtext('eNB_serverId'))
+ if (RAN.GeteNB_serverId() is None):
+ RAN.SeteNB_serverId('0')
if action == 'Initialize_eNB':
- SSH.Initialize_eNB_args = test.findtext('Initialize_eNB_args')
- SSH.eNB_instance = test.findtext('eNB_instance')
- if (SSH.eNB_instance is None):
- SSH.eNB_instance = '0'
- SSH.eNB_serverId = test.findtext('eNB_serverId')
- if (SSH.eNB_serverId is None):
- SSH.eNB_serverId = '0'
- SSH.air_interface = test.findtext('air_interface')
- if (SSH.air_interface is None):
- SSH.air_interface = 'lte'
- else:
- SSH.air_interface = SSH.air_interface.lower()
+ RAN.SetInitialize_eNB_args(test.findtext('Initialize_eNB_args'))
+ RAN.SeteNB_instance(test.findtext('eNB_instance'))
+ if (RAN.GeteNB_instance() is None):
+ RAN.SeteNB_instance('0')
+ RAN.SeteNB_serverId(test.findtext('eNB_serverId'))
+ if (RAN.GeteNB_serverId() is None):
+ RAN.SeteNB_serverId('0')
+ CiTestObj.air_interface = test.findtext('air_interface')
+ if (CiTestObj.air_interface is None):
+ CiTestObj.air_interface = 'lte'
+ else:
+ CiTestObj.air_interface = CiTestObj.air_interface.lower()
+ RAN.Setair_interface(CiTestObj.air_interface)
if action == 'Terminate_eNB':
- SSH.eNB_instance = test.findtext('eNB_instance')
- if (SSH.eNB_instance is None):
- SSH.eNB_instance = '0'
- SSH.eNB_serverId = test.findtext('eNB_serverId')
- if (SSH.eNB_serverId is None):
- SSH.eNB_serverId = '0'
- SSH.air_interface = test.findtext('air_interface')
- if (SSH.air_interface is None):
- SSH.air_interface = 'lte'
- else:
- SSH.air_interface = SSH.air_interface.lower()
+ RAN.SeteNB_instance(test.findtext('eNB_instance'))
+ if (RAN.GeteNB_instance() is None):
+ RAN.SeteNB_instance('0')
+ RAN.SeteNB_serverId(test.findtext('eNB_serverId'))
+ if (RAN.GeteNB_serverId() is None):
+ RAN.SeteNB_serverId('0')
+ CiTestObj.air_interface = test.findtext('air_interface')
+ if (CiTestObj.air_interface is None):
+ CiTestObj.air_interface = 'lte'
+ else:
+ CiTestObj.air_interface = CiTestObj.air_interface.lower()
+ RAN.Setair_interface(CiTestObj.air_interface)
if action == 'Attach_UE':
nbMaxUEtoAttach = test.findtext('nbMaxUEtoAttach')
if (nbMaxUEtoAttach is None):
- SSH.nbMaxUEtoAttach = -1
+ CiTestObj.nbMaxUEtoAttach = -1
else:
- SSH.nbMaxUEtoAttach = int(nbMaxUEtoAttach)
+ CiTestObj.nbMaxUEtoAttach = int(nbMaxUEtoAttach)
if action == 'CheckStatusUE':
expectedNBUE = test.findtext('expectedNbOfConnectedUEs')
if (expectedNBUE is None):
- SSH.expectedNbOfConnectedUEs = -1
+ CiTestObj.expectedNbOfConnectedUEs = -1
else:
- SSH.expectedNbOfConnectedUEs = int(expectedNBUE)
+ CiTestObj.expectedNbOfConnectedUEs = int(expectedNBUE)
if action == 'Build_OAI_UE':
- SSH.Build_OAI_UE_args = test.findtext('Build_OAI_UE_args')
- SSH.clean_repository = test.findtext('clean_repository')
- if (SSH.clean_repository == 'false'):
- SSH.clean_repository = False
+ CiTestObj.Build_OAI_UE_args = test.findtext('Build_OAI_UE_args')
+ CiTestObj.clean_repository = test.findtext('clean_repository')
+ if (CiTestObj.clean_repository == 'false'):
+ CiTestObj.clean_repository = False
else:
- SSH.clean_repository = True
+ CiTestObj.clean_repository = True
if action == 'Initialize_OAI_UE':
- SSH.Initialize_OAI_UE_args = test.findtext('Initialize_OAI_UE_args')
- SSH.UE_instance = test.findtext('UE_instance')
- if (SSH.UE_instance is None):
- SSH.UE_instance = '0'
- SSH.air_interface = test.findtext('air_interface')
- if (SSH.air_interface is None):
- SSH.air_interface = 'lte'
+ CiTestObj.Initialize_OAI_UE_args = test.findtext('Initialize_OAI_UE_args')
+ CiTestObj.UE_instance = test.findtext('UE_instance')
+ if (CiTestObj.UE_instance is None):
+ CiTestObj.UE_instance = '0'
+ CiTestObj.air_interface = test.findtext('air_interface')
+ if (CiTestObj.air_interface is None):
+ CiTestObj.air_interface = 'lte'
else:
- SSH.air_interface = SSH.air_interface.lower()
+ CiTestObj.air_interface = CiTestObj.air_interface.lower()
if action == 'Terminate_OAI_UE':
- SSH.eNB_instance = test.findtext('UE_instance')
- if (SSH.UE_instance is None):
- SSH.UE_instance = '0'
+ RAN.SeteNB_instance(test.findtext('UE_instance'))
+ if (CiTestObj.UE_instance is None):
+ CiTestObj.UE_instance = '0'
if action == 'Ping' or action == 'Ping_CatM_module':
- SSH.ping_args = test.findtext('ping_args')
- SSH.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
+ CiTestObj.ping_args = test.findtext('ping_args')
+ CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
if action == 'Iperf':
- SSH.iperf_args = test.findtext('iperf_args')
- SSH.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
- SSH.iperf_profile = test.findtext('iperf_profile')
- if (SSH.iperf_profile is None):
- SSH.iperf_profile = 'balanced'
- else:
- if SSH.iperf_profile != 'balanced' and SSH.iperf_profile != 'unbalanced' and SSH.iperf_profile != 'single-ue':
- logging.debug('ERROR: test-case has wrong profile ' + SSH.iperf_profile)
- SSH.iperf_profile = 'balanced'
- SSH.iperf_options = test.findtext('iperf_options')
- if (SSH.iperf_options is None):
- SSH.iperf_options = 'check'
- else:
- if SSH.iperf_options != 'check' and SSH.iperf_options != 'sink':
- logging.debug('ERROR: test-case has wrong option ' + SSH.iperf_options)
- SSH.iperf_options = 'check'
+ CiTestObj.iperf_args = test.findtext('iperf_args')
+ CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
+ CiTestObj.iperf_profile = test.findtext('iperf_profile')
+ if (CiTestObj.iperf_profile is None):
+ CiTestObj.iperf_profile = 'balanced'
+ else:
+ if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
+ logging.debug('ERROR: test-case has wrong profile ' + CiTestObj.iperf_profile)
+ CiTestObj.iperf_profile = 'balanced'
+ CiTestObj.iperf_options = test.findtext('iperf_options')
+ if (CiTestObj.iperf_options is None):
+ CiTestObj.iperf_options = 'check'
+ else:
+ if CiTestObj.iperf_options != 'check' and CiTestObj.iperf_options != 'sink':
+ logging.debug('ERROR: test-case has wrong option ' + CiTestObj.iperf_options)
+ CiTestObj.iperf_options = 'check'
if action == 'IdleSleep':
string_field = test.findtext('idle_sleep_time_in_sec')
if (string_field is None):
- SSH.idle_sleep_time = 5
+ CiTestObj.idle_sleep_time = 5
else:
- SSH.idle_sleep_time = int(string_field)
+ CiTestObj.idle_sleep_time = int(string_field)
if action == 'Perform_X2_Handover':
string_field = test.findtext('x2_ho_options')
if (string_field is None):
- SSH.x2_ho_options = 'network'
+ CiTestObj.x2_ho_options = 'network'
else:
if string_field != 'network':
logging.error('ERROR: test-case has wrong option ' + string_field)
- SSH.x2_ho_options = 'network'
+ CiTestObj.x2_ho_options = 'network'
else:
- SSH.x2_ho_options = string_field
+ CiTestObj.x2_ho_options = string_field
#check if given test is in list
@@ -4831,7 +3190,23 @@ def receive_signal(signum, frame):
# Parameter Check
#-----------------------------------------------------------
mode = ''
-SSH = SSHConnection()
+CiTestObj = OaiCiTest()
+
+import sshconnection
+import epc
+import helpreadme as HELP
+import ran
+import html
+import constants
+
+SSH = sshconnection.SSHConnection()
+EPC = epc.EPCManagement()
+RAN = ran.RANManagement()
+HTML = html.HTMLManagement()
+
+EPC.SetHtmlObj(HTML)
+RAN.SetHtmlObj(HTML)
+RAN.SetEpcObj(EPC)
argvs = sys.argv
argc = len(argvs)
@@ -4839,8 +3214,9 @@ cwd = os.getcwd()
while len(argvs) > 1:
myArgv = argvs.pop(1) # 0th is this file's name
+
if re.match('^\-\-help$', myArgv, re.IGNORECASE):
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit(0)
elif re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
@@ -4850,7 +3226,9 @@ while len(argvs) > 1:
matchReg = re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE)
else:
matchReg = re.match('^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
- SSH.ranRepository = matchReg.group(1)
+ CiTestObj.ranRepository = matchReg.group(1)
+ RAN.SetranRepository(matchReg.group(1))
+ HTML.SetranRepository(matchReg.group(1))
elif re.match('^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
@@ -4858,259 +3236,286 @@ while len(argvs) > 1:
matchReg = re.match('^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
doMerge = matchReg.group(1)
if ((doMerge == 'true') or (doMerge == 'True')):
- SSH.ranAllowMerge = True
+ CiTestObj.ranAllowMerge = True
+ RAN.SetranAllowMerge(True)
+ HTML.SetranAllowMerge(True)
elif re.match('^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
else:
matchReg = re.match('^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
- SSH.ranBranch = matchReg.group(1)
+ CiTestObj.ranBranch = matchReg.group(1)
+ RAN.SetranBranch(matchReg.group(1))
+ HTML.SetranBranch(matchReg.group(1))
elif re.match('^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
else:
matchReg = re.match('^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
- SSH.ranCommitID = matchReg.group(1)
+ CiTestObj.ranCommitID = matchReg.group(1)
+ RAN.SetranCommitID(matchReg.group(1))
+ HTML.SetranCommitID(matchReg.group(1))
elif re.match('^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
else:
matchReg = re.match('^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
- SSH.ranTargetBranch = matchReg.group(1)
+ CiTestObj.ranTargetBranch = matchReg.group(1)
+ RAN.SetranTargetBranch(matchReg.group(1))
+ HTML.SetranTargetBranch(matchReg.group(1))
elif re.match('^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNBIPAddress = matchReg.group(1)
+ RAN.SeteNBIPAddress(matchReg.group(1))
elif re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNB1IPAddress = matchReg.group(1)
+ RAN.SeteNB1IPAddress(matchReg.group(1))
elif re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNB2IPAddress = matchReg.group(1)
+ RAN.SeteNB2IPAddress(matchReg.group(1))
elif re.match('^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNBUserName = matchReg.group(1)
+ RAN.SeteNBUserName(matchReg.group(1))
elif re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNB1UserName = matchReg.group(1)
+ RAN.SeteNB1UserName(matchReg.group(1))
elif re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNB2UserName = matchReg.group(1)
+ RAN.SeteNB2UserName(matchReg.group(1))
elif re.match('^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNBPassword = matchReg.group(1)
+ RAN.SeteNBPassword(matchReg.group(1))
elif re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNB1Password = matchReg.group(1)
+ RAN.SeteNB1Password(matchReg.group(1))
elif re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNB2Password = matchReg.group(1)
+ RAN.SeteNB2Password(matchReg.group(1))
elif re.match('^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
if re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNBSourceCodePath = matchReg.group(1)
+ RAN.SeteNBSourceCodePath(matchReg.group(1))
elif re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNB1SourceCodePath = matchReg.group(1)
+ RAN.SeteNB1SourceCodePath(matchReg.group(1))
elif re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
- SSH.eNB2SourceCodePath = matchReg.group(1)
+ RAN.SeteNB2SourceCodePath(matchReg.group(1))
elif re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE)
- SSH.EPCIPAddress = matchReg.group(1)
- elif re.match('^\-\-EPCBranch=(.+)$', myArgv, re.IGNORECASE):
- matchReg = re.match('^\-\-EPCBranch=(.+)$', myArgv, re.IGNORECASE)
- SSH.EPCBranch = matchReg.group(1)
+ EPC.SetIPAddress(matchReg.group(1))
elif re.match('^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE)
- SSH.EPCUserName = matchReg.group(1)
+ EPC.SetUserName(matchReg.group(1))
elif re.match('^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE)
- SSH.EPCPassword = matchReg.group(1)
+ EPC.SetPassword(matchReg.group(1))
elif re.match('^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
- SSH.EPCSourceCodePath = matchReg.group(1)
+ EPC.SetSourceCodePath(matchReg.group(1))
elif re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE)
if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-CUPS', matchReg.group(1), re.IGNORECASE):
- SSH.EPCType = matchReg.group(1)
+ EPC.SetType(matchReg.group(1))
else:
sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-CUPS)')
elif re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE)
- SSH.ADBIPAddress = matchReg.group(1)
+ CiTestObj.ADBIPAddress = matchReg.group(1)
elif re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE)
- SSH.ADBUserName = matchReg.group(1)
+ CiTestObj.ADBUserName = matchReg.group(1)
elif re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE)
if re.match('centralized', matchReg.group(1), re.IGNORECASE) or re.match('distributed', matchReg.group(1), re.IGNORECASE):
if re.match('distributed', matchReg.group(1), re.IGNORECASE):
- SSH.ADBCentralized = False
+ CiTestObj.ADBCentralized = False
else:
- SSH.ADBCentralized = True
+ CiTestObj.ADBCentralized = True
else:
sys.exit('Invalid ADB Type: ' + matchReg.group(1) + ' -- (should be centralized or distributed)')
elif re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE)
- SSH.ADBPassword = matchReg.group(1)
+ CiTestObj.ADBPassword = matchReg.group(1)
elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
- SSH.testXMLfiles.append(matchReg.group(1))
- SSH.nbTestXMLfiles += 1
+ CiTestObj.testXMLfiles.append(matchReg.group(1))
+ HTML.SettestXMLfiles(matchReg.group(1))
+ HTML.SetnbTestXMLfiles(HTML.GetnbTestXMLfiles()+1)
elif re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE)
- SSH.UEIPAddress = matchReg.group(1)
+ CiTestObj.UEIPAddress = matchReg.group(1)
elif re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE)
- SSH.UEUserName = matchReg.group(1)
+ CiTestObj.UEUserName = matchReg.group(1)
elif re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE)
- SSH.UEPassword = matchReg.group(1)
+ CiTestObj.UEPassword = matchReg.group(1)
elif re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE)
- SSH.UESourceCodePath = matchReg.group(1)
+ CiTestObj.UESourceCodePath = matchReg.group(1)
elif re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE):
matchReg = re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE)
finalStatus = matchReg.group(1)
if ((finalStatus == 'true') or (finalStatus == 'True')):
- SSH.finalStatus = True
+ CiTestObj.finalStatus = True
else:
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Invalid Parameter: ' + myArgv)
if re.match('^TerminateeNB$', mode, re.IGNORECASE):
- if SSH.eNBIPAddress == '' or SSH.eNBUserName == '' or SSH.eNBPassword == '':
- Usage()
+ if RAN.GeteNBIPAddress() == '' or RAN.GeteNBUserName() == '' or RAN.GeteNBPassword() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.eNB_serverId = '0'
- SSH.eNB_instance = '0'
- SSH.eNBSourceCodePath = '/tmp/'
- SSH.TerminateeNB()
+ RAN.SeteNB_serverId('0')
+ RAN.SeteNB_instance('0')
+ RAN.SeteNBSourceCodePath('/tmp/')
+ RAN.TerminateeNB()
elif re.match('^TerminateUE$', mode, re.IGNORECASE):
- if (SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == ''):
- Usage()
+ if (CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == ''):
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
signal.signal(signal.SIGUSR1, receive_signal)
- SSH.TerminateUE()
+ CiTestObj.TerminateUE()
elif re.match('^TerminateOAIUE$', mode, re.IGNORECASE):
- if SSH.UEIPAddress == '' or SSH.UEUserName == '' or SSH.UEPassword == '':
- Usage()
+ if CiTestObj.UEIPAddress == '' or CiTestObj.UEUserName == '' or CiTestObj.UEPassword == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
signal.signal(signal.SIGUSR1, receive_signal)
- SSH.TerminateOAIUE()
+ CiTestObj.TerminateOAIUE()
elif re.match('^TerminateHSS$', mode, re.IGNORECASE):
- if SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCType == '' or SSH.EPCSourceCodePath == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetType() == '' or EPC.GetSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.TerminateHSS()
+ EPC.TerminateHSS()
elif re.match('^TerminateMME$', mode, re.IGNORECASE):
- if SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCType == '' or SSH.EPCSourceCodePath == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetType() == '' or EPC.GetSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.TerminateMME()
+ EPC.TerminateMME()
elif re.match('^TerminateSPGW$', mode, re.IGNORECASE):
- if SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCType == '' or SSH.EPCSourceCodePath == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetType() == '' or EPC.GetSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.TerminateSPGW()
+ EPC.TerminateSPGW()
elif re.match('^LogCollectBuild$', mode, re.IGNORECASE):
- if (SSH.eNBIPAddress == '' or SSH.eNBUserName == '' or SSH.eNBPassword == '' or SSH.eNBSourceCodePath == '') and (SSH.UEIPAddress == '' or SSH.UEUserName == '' or SSH.UEPassword == '' or SSH.UESourceCodePath == ''):
- Usage()
+ if (RAN.GeteNBIPAddress() == '' or RAN.GeteNBUserName() == '' or RAN.GeteNBPassword() == '' or RAN.GeteNBSourceCodePath() == '') and (CiTestObj.UEIPAddress == '' or CiTestObj.UEUserName == '' or CiTestObj.UEPassword == '' or CiTestObj.UESourceCodePath == ''):
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.LogCollectBuild()
+ CiTestObj.LogCollectBuild()
elif re.match('^LogCollecteNB$', mode, re.IGNORECASE):
- if SSH.eNBIPAddress == '' or SSH.eNBUserName == '' or SSH.eNBPassword == '' or SSH.eNBSourceCodePath == '':
- Usage()
+ if RAN.GeteNBIPAddress() == '' or RAN.GeteNBUserName() == '' or RAN.GeteNBPassword() == '' or RAN.GeteNBSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.LogCollecteNB()
+ RAN.LogCollecteNB()
elif re.match('^LogCollectHSS$', mode, re.IGNORECASE):
- if SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCType == '' or SSH.EPCSourceCodePath == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetType() == '' or EPC.GetSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.LogCollectHSS()
+ EPC.LogCollectHSS()
elif re.match('^LogCollectMME$', mode, re.IGNORECASE):
- if SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCType == '' or SSH.EPCSourceCodePath == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetType() == '' or EPC.GetSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.LogCollectMME()
+ EPC.LogCollectMME()
elif re.match('^LogCollectSPGW$', mode, re.IGNORECASE):
- if SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCType == '' or SSH.EPCSourceCodePath == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetType() == '' or EPC.GetSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.LogCollectSPGW()
+ EPC.LogCollectSPGW()
elif re.match('^LogCollectPing$', mode, re.IGNORECASE):
- if SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCSourceCodePath == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.LogCollectPing()
+ CiTestObj.LogCollectPing()
elif re.match('^LogCollectIperf$', mode, re.IGNORECASE):
- if SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCSourceCodePath == '':
- Usage()
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetSourceCodePath() == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.LogCollectIperf()
+ CiTestObj.LogCollectIperf()
elif re.match('^LogCollectOAIUE$', mode, re.IGNORECASE):
- if SSH.UEIPAddress == '' or SSH.UEUserName == '' or SSH.UEPassword == '' or SSH.UESourceCodePath == '':
- Usage()
+ if CiTestObj.UEIPAddress == '' or CiTestObj.UEUserName == '' or CiTestObj.UEPassword == '' or CiTestObj.UESourceCodePath == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
- SSH.LogCollectOAIUE()
+ CiTestObj.LogCollectOAIUE()
elif re.match('^InitiateHtml$', mode, re.IGNORECASE):
- if (SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == ''):
- Usage()
+ if (CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == ''):
+ HELP.GenericHelp(CONST.Version)
sys.exit('Insufficient Parameter')
count = 0
foundCount = 0
- while (count < SSH.nbTestXMLfiles):
- xml_test_file = cwd + "/" + SSH.testXMLfiles[count]
+ while (count < HTML.GetnbTestXMLfiles()):
+ #xml_test_file = cwd + "/" + CiTestObj.testXMLfiles[count]
+ xml_test_file = sys.path[0] + "/" + CiTestObj.testXMLfiles[count]
if (os.path.isfile(xml_test_file)):
try:
xmlTree = ET.parse(xml_test_file)
except:
print("Error while parsing file: " + xml_test_file)
xmlRoot = xmlTree.getroot()
- SSH.htmlTabRefs.append(xmlRoot.findtext('htmlTabRef',default='test-tab-' + str(count)))
- SSH.htmlTabNames.append(xmlRoot.findtext('htmlTabName',default='Test-' + str(count)))
- SSH.htmlTabIcons.append(xmlRoot.findtext('htmlTabIcon',default='info-sign'))
+ HTML.SethtmlTabRefs(xmlRoot.findtext('htmlTabRef',default='test-tab-' + str(count)))
+ HTML.SethtmlTabNames(xmlRoot.findtext('htmlTabName',default='test-tab-' + str(count)))
+ HTML.SethtmlTabIcons(xmlRoot.findtext('htmlTabIcon',default='info-sign'))
foundCount += 1
count += 1
- if foundCount != SSH.nbTestXMLfiles:
- SSH.nbTestXMLfiles = foundCount
- SSH.CreateHtmlHeader()
+ if foundCount != HTML.GetnbTestXMLfiles():
+ HTML.SetnbTestXMLfiles(foundcount)
+
+ if (CiTestObj.ADBIPAddress != 'none'):
+ terminate_ue_flag = False
+ CiTestObj.GetAllUEDevices(terminate_ue_flag)
+ CiTestObj.GetAllCatMDevices(terminate_ue_flag)
+ HTML.SethtmlUEConnected(len(CiTestObj.UEDevices) + len(CiTestObj.CatMDevices))
+ HTML.SethtmlNb_Smartphones(len(CiTestObj.UEDevices))
+ HTML.SethtmlNb_CATM_Modules(len(CiTestObj.CatMDevices))
+ HTML.CreateHtmlHeader(CiTestObj.ADBIPAddress)
elif re.match('^FinalizeHtml$', mode, re.IGNORECASE):
- SSH.CreateHtmlFooter(SSH.finalStatus)
+ logging.debug('\u001B[1m----------------------------------------\u001B[0m')
+ logging.debug('\u001B[1m Creating HTML footer \u001B[0m')
+ logging.debug('\u001B[1m----------------------------------------\u001B[0m')
+
+ CiTestObj.RetrieveSystemVersion('eNB')
+ CiTestObj.RetrieveSystemVersion('UE')
+ HTML.CreateHtmlFooter(CiTestObj.finalStatus)
elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re.IGNORECASE):
if re.match('^TesteNB$', mode, re.IGNORECASE):
- if SSH.eNBIPAddress == '' or SSH.ranRepository == '' or SSH.ranBranch == '' or SSH.eNBUserName == '' or SSH.eNBPassword == '' or SSH.eNBSourceCodePath == '' or SSH.EPCIPAddress == '' or SSH.EPCUserName == '' or SSH.EPCPassword == '' or SSH.EPCType == '' or SSH.EPCSourceCodePath == '' or SSH.ADBIPAddress == '' or SSH.ADBUserName == '' or SSH.ADBPassword == '':
- Usage()
+ if RAN.GeteNBIPAddress() == '' or RAN.GetranRepository() == '' or RAN.GetranBranch() == '' or RAN.GeteNBUserName() == '' or RAN.GeteNBPassword() == '' or RAN.GeteNBSourceCodePath() == '' or EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetType() == '' or EPC.GetSourceCodePath() == '' or CiTestObj.ADBIPAddress == '' or CiTestObj.ADBUserName == '' or CiTestObj.ADBPassword == '':
+ HELP.GenericHelp(CONST.Version)
+ if EPC.GetIPAddress() == '' or EPC.GetUserName() == '' or EPC.GetPassword() == '' or EPC.GetSourceCodePath() == '' or EPC.GetType() == '':
+ HELP.EPCSrvHelp(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), EPC.GetSourceCodePath(), EPC.GetType())
+ if RAN.GetranRepository() == '':
+ HELP.GitSrvHelp(RAN.GetranRepository(), RAN.GetranBranch(), RAN.GetranCommitID(), RAN.GetranAllowMerge(), RAN.GetranTargetBranch())
+ if RAN.GeteNBIPAddress() == '' or RAN.GeteNBUserName() == '' or RAN.GeteNBPassword() == '' or RAN.GeteNBSourceCodePath() == '':
+ HELP.eNBSrvHelp(RAN.GeteNBIPAddress(), RAN.GeteNBUserName(), RAN.GeteNBPassword(), RAN.GeteNBSourceCodePath())
sys.exit('Insufficient Parameter')
- if (SSH.EPCIPAddress != '') and (SSH.EPCIPAddress != 'none'):
- SSH.copyout(SSH.EPCIPAddress, SSH.EPCUserName, SSH.EPCPassword, cwd + "/tcp_iperf_stats.awk", "/tmp")
- SSH.copyout(SSH.EPCIPAddress, SSH.EPCUserName, SSH.EPCPassword, cwd + "/active_net_interfaces.awk", "/tmp")
+ if (EPC.GetIPAddress() != '') and (EPC.GetIPAddress() != 'none'):
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), cwd + "/tcp_iperf_stats.awk", "/tmp")
+ SSH.copyout(EPC.GetIPAddress(), EPC.GetUserName(), EPC.GetPassword(), cwd + "/active_net_interfaces.awk", "/tmp")
else:
- if SSH.UEIPAddress == '' or SSH.ranRepository == '' or SSH.ranBranch == '' or SSH.UEUserName == '' or SSH.UEPassword == '' or SSH.UESourceCodePath == '':
- Usage()
+ if CiTestObj.UEIPAddress == '' or CiTestObj.ranRepository == '' or CiTestObj.ranBranch == '' or CiTestObj.UEUserName == '' or CiTestObj.UEPassword == '' or CiTestObj.UESourceCodePath == '':
+ HELP.GenericHelp(CONST.Version)
sys.exit('UE: Insufficient Parameter')
#read test_case_list.xml file
# if no parameters for XML file, use default value
- if (SSH.nbTestXMLfiles != 1):
+ if (HTML.GetnbTestXMLfiles() != 1):
xml_test_file = cwd + "/test_case_list.xml"
else:
- xml_test_file = cwd + "/" + SSH.testXMLfiles[0]
+ xml_test_file = cwd + "/" + CiTestObj.testXMLfiles[0]
xmlTree = ET.parse(xml_test_file)
xmlRoot = xmlTree.getroot()
exclusion_tests=xmlRoot.findtext('TestCaseExclusionList',default='')
requested_tests=xmlRoot.findtext('TestCaseRequestedList',default='')
- if (SSH.nbTestXMLfiles == 1):
- SSH.htmlTabRefs.append(xmlRoot.findtext('htmlTabRef',default='test-tab-0'))
- SSH.htmlTabNames.append(xmlRoot.findtext('htmlTabName',default='Test-0'))
+ if (HTML.GetnbTestXMLfiles() == 1):
+ HTML.SethtmlTabRefs(xmlRoot.findtext('htmlTabRef',default='test-tab-0'))
+ HTML.SethtmlTabNames(xmlRoot.findtext('htmlTabName',default='Test-0'))
repeatCount = xmlRoot.findtext('repeatCount',default='1')
- SSH.repeatCounts.append(int(repeatCount))
+ CiTestObj.repeatCounts.append(int(repeatCount))
all_tests=xmlRoot.findall('testCase')
exclusion_tests=exclusion_tests.split()
@@ -5136,8 +3541,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
else:
logging.debug('ERROR: requested test is invalidly formatted: ' + test)
sys.exit(1)
- if (SSH.EPCIPAddress != '') and (SSH.EPCIPAddress != 'none'):
- SSH.CheckFlexranCtrlInstallation()
+ if (EPC.GetIPAddress() != '') and (EPC.GetIPAddress() != 'none'):
+ CiTestObj.CheckFlexranCtrlInstallation()
#get the list of tests to be done
todo_tests=[]
@@ -5150,108 +3555,124 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
signal.signal(signal.SIGUSR1, receive_signal)
- SSH.CreateHtmlTabHeader()
-
- cnt = 0
- SSH.prematureExit = True
- SSH.startTime = int(round(time.time() * 1000))
- while cnt < SSH.repeatCounts[0] and SSH.prematureExit:
- SSH.prematureExit = False
+ if (CiTestObj.ADBIPAddress != 'none'):
+ terminate_ue_flag = False
+ CiTestObj.GetAllUEDevices(terminate_ue_flag)
+ CiTestObj.GetAllCatMDevices(terminate_ue_flag)
+ else:
+ CiTestObj.UEDevices.append('OAI-UE')
+ HTML.SethtmlUEConnected(len(CiTestObj.UEDevices) + len(CiTestObj.CatMDevices))
+ HTML.CreateHtmlTabHeader()
+
+ CiTestObj.FailReportCnt = 0
+ RAN.SetprematureExit(True)
+ HTML.SetstartTime(int(round(time.time() * 1000)))
+ while CiTestObj.FailReportCnt < CiTestObj.repeatCounts[0] and RAN.GetprematureExit():
+ RAN.SetprematureExit(False)
+ # At every iteratin of the retry loop, a separator will be added
+ # pass CiTestObj.FailReportCnt as parameter of HTML.CreateHtmlRetrySeparator
+ HTML.CreateHtmlRetrySeparator(CiTestObj.FailReportCnt)
for test_case_id in todo_tests:
- if SSH.prematureExit:
+ if RAN.GetprematureExit():
break
for test in all_tests:
- if SSH.prematureExit:
+ if RAN.GetprematureExit():
break
id = test.get('id')
if test_case_id != id:
continue
- SSH.testCase_id = id
- SSH.desc = test.findtext('desc')
+ CiTestObj.testCase_id = id
+ HTML.SettestCase_id(CiTestObj.testCase_id)
+ CiTestObj.desc = test.findtext('desc')
+ HTML.Setdesc(CiTestObj.desc)
action = test.findtext('class')
if (CheckClassValidity(action, id) == False):
continue
- SSH.ShowTestID()
+ CiTestObj.ShowTestID()
GetParametersFromXML(action)
if action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Ping' or action == 'Iperf' or action == 'Reboot_UE' or action == 'DataDisable_UE' or action == 'DataEnable_UE' or action == 'CheckStatusUE':
- if (SSH.ADBIPAddress != 'none'):
+ if (CiTestObj.ADBIPAddress != 'none'):
terminate_ue_flag = False
- SSH.GetAllUEDevices(terminate_ue_flag)
+ CiTestObj.GetAllUEDevices(terminate_ue_flag)
if action == 'Build_eNB':
- SSH.BuildeNB()
+ RAN.BuildeNB()
elif action == 'WaitEndBuild_eNB':
- SSH.WaitBuildeNBisFinished()
+ RAN.WaitBuildeNBisFinished()
elif action == 'Initialize_eNB':
- SSH.InitializeeNB()
+ check_eNB = False
+ check_OAI_UE = False
+ RAN.SetpStatus(CiTestObj.CheckProcessExist(check_eNB, check_OAI_UE))
+
+ RAN.InitializeeNB()
elif action == 'Terminate_eNB':
- SSH.TerminateeNB()
+ RAN.TerminateeNB()
elif action == 'Initialize_UE':
- SSH.InitializeUE()
+ CiTestObj.InitializeUE()
elif action == 'Terminate_UE':
- SSH.TerminateUE()
+ CiTestObj.TerminateUE()
elif action == 'Attach_UE':
- SSH.AttachUE()
+ CiTestObj.AttachUE()
elif action == 'Detach_UE':
- SSH.DetachUE()
+ CiTestObj.DetachUE()
elif action == 'DataDisable_UE':
- SSH.DataDisableUE()
+ CiTestObj.DataDisableUE()
elif action == 'DataEnable_UE':
- SSH.DataEnableUE()
+ CiTestObj.DataEnableUE()
elif action == 'CheckStatusUE':
- SSH.CheckStatusUE()
+ CiTestObj.CheckStatusUE()
elif action == 'Build_OAI_UE':
- SSH.BuildOAIUE()
+ CiTestObj.BuildOAIUE()
elif action == 'Initialize_OAI_UE':
- SSH.InitializeOAIUE()
+ CiTestObj.InitializeOAIUE()
elif action == 'Terminate_OAI_UE':
- SSH.TerminateOAIUE()
+ CiTestObj.TerminateOAIUE()
elif action == 'Initialize_CatM_module':
- SSH.InitializeCatM()
+ CiTestObj.InitializeCatM()
elif action == 'Terminate_CatM_module':
- SSH.TerminateCatM()
+ CiTestObj.TerminateCatM()
elif action == 'Attach_CatM_module':
- SSH.AttachCatM()
+ CiTestObj.AttachCatM()
elif action == 'Detach_CatM_module':
- SSH.TerminateCatM()
+ CiTestObj.TerminateCatM()
elif action == 'Ping_CatM_module':
- SSH.PingCatM()
+ CiTestObj.PingCatM()
elif action == 'Ping':
- SSH.Ping()
+ CiTestObj.Ping()
elif action == 'Iperf':
- SSH.Iperf()
+ CiTestObj.Iperf()
elif action == 'Reboot_UE':
- SSH.RebootUE()
+ CiTestObj.RebootUE()
elif action == 'Initialize_HSS':
- SSH.InitializeHSS()
+ EPC.InitializeHSS()
elif action == 'Terminate_HSS':
- SSH.TerminateHSS()
+ EPC.TerminateHSS()
elif action == 'Initialize_MME':
- SSH.InitializeMME()
+ EPC.InitializeMME()
elif action == 'Terminate_MME':
- SSH.TerminateMME()
+ EPC.TerminateMME()
elif action == 'Initialize_SPGW':
- SSH.InitializeSPGW()
+ EPC.InitializeSPGW()
elif action == 'Terminate_SPGW':
- SSH.TerminateSPGW()
+ EPC.TerminateSPGW()
elif action == 'Initialize_FlexranCtrl':
- SSH.InitializeFlexranCtrl()
+ CiTestObj.InitializeFlexranCtrl()
elif action == 'Terminate_FlexranCtrl':
- SSH.TerminateFlexranCtrl()
+ CiTestObj.TerminateFlexranCtrl()
elif action == 'IdleSleep':
- SSH.IdleSleep()
+ CiTestObj.IdleSleep()
elif action == 'Perform_X2_Handover':
- SSH.Perform_X2_Handover()
+ CiTestObj.Perform_X2_Handover()
else:
sys.exit('Invalid action')
- cnt += 1
- if cnt == SSH.repeatCounts[0] and SSH.prematureExit:
- logging.debug('Testsuite failed ' + str(cnt) + ' time(s)')
- SSH.CreateHtmlTabFooter(False)
+ CiTestObj.FailReportCnt += 1
+ if CiTestObj.FailReportCnt == CiTestObj.repeatCounts[0] and RAN.GetprematureExit():
+ logging.debug('Testsuite failed ' + str(CiTestObj.FailReportCnt) + ' time(s)')
+ HTML.CreateHtmlTabFooter(False)
sys.exit('Failed Scenario')
else:
- logging.info('Testsuite passed after ' + str(cnt) + ' time(s)')
- SSH.CreateHtmlTabFooter(True)
+ logging.info('Testsuite passed after ' + str(CiTestObj.FailReportCnt) + ' time(s)')
+ HTML.CreateHtmlTabFooter(True)
else:
- Usage()
+ HELP.GenericHelp(CONST.Version)
sys.exit('Invalid mode')
sys.exit(0)
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
new file mode 100644
index 0000000000000000000000000000000000000000..350098e66ee20e74a20915f3f72d084742f5acf5
--- /dev/null
+++ b/ci-scripts/ran.py
@@ -0,0 +1,1051 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements. See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# * contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+# Required Python Version
+# Python 3.x
+#
+# Required Python Package
+# pexpect
+#---------------------------------------------------------------------
+
+#-----------------------------------------------------------
+# Import
+#-----------------------------------------------------------
+import sys # arg
+import re # reg
+import logging
+import os
+import time
+from multiprocessing import Process, Lock, SimpleQueue
+
+#-----------------------------------------------------------
+# OAI Testing modules
+#-----------------------------------------------------------
+import sshconnection as SSH
+import epc
+import helpreadme as HELP
+import constants as CONST
+import html
+
+#-----------------------------------------------------------
+# Class Declaration
+#-----------------------------------------------------------
+class RANManagement():
+
+ def __init__(self):
+
+ self.prematureExit = False
+ self.ranRepository = ''
+ self.ranBranch = ''
+ self.ranAllowMerge = False
+ self.ranCommitID = ''
+ self.ranTargetBranch = ''
+ self.eNBIPAddress = ''
+ self.eNBUserName = ''
+ self.eNBPassword = ''
+ self.eNBSourceCodePath = ''
+ self.eNB1IPAddress = ''
+ self.eNB1UserName = ''
+ self.eNB1Password = ''
+ self.eNB1SourceCodePath = ''
+ self.eNB2IPAddress = ''
+ self.eNB2UserName = ''
+ self.eNB2Password = ''
+ self.eNB2SourceCodePath = ''
+ self.Build_eNB_args = ''
+ self.backgroundBuild = False
+ self.backgroundBuildTestId = ['', '', '']
+ self.Build_eNB_forced_workspace_cleanup = False
+ self.Initialize_eNB_args = ''
+ self.air_interface = 'lte'
+ self.eNB_instance = ''
+ self.eNB_serverId = ''
+ self.eNBLogFiles = ['', '', '']
+ self.eNBOptions = ['', '', '']
+ self.eNBmbmsEnables = [False, False, False]
+ self.eNBstatuses = [-1, -1, -1]
+ self.flexranCtrlInstalled = False
+ self.flexranCtrlStarted = False
+ self.testCase_id = ''
+ self.epcPcapFile = ''
+ self.htmlObj = None
+ self.epcObj = None
+
+#-----------------------------------------------------------
+# Setters and Getters on Public members
+#-----------------------------------------------------------
+
+ def SetHtmlObj(self, obj):
+ self.htmlObj = obj
+ def SetEpcObj(self, obj):
+ self.epcObj = obj
+
+ def SetflexranCtrlInstalled(self,fxrctin):
+ self.flexranCtrlInstalled = fxrctin
+ def GetflexranCtrlInstalled(self):
+ return self.flexranCtrlInstalled
+ def SetflexranCtrlStarted(self,fxrctst):
+ self.flexranCtrlStarted = fxrctst
+ def GetflexranCtrlStarted(self):
+ return self.flexranCtrlStarted
+ def SetpStatus(self, pSt):
+ self.pStatus = pSt
+ def SetranRepository(self, repository):
+ self.ranRepository = repository
+ def GetranRepository(self):
+ return self.ranRepository
+ def SetranBranch(self, branch):
+ self.ranBranch = branch
+ def GetranBranch(self):
+ return self.ranBranch
+ def SetranCommitID(self, commitid):
+ self.ranCommitID = commitid
+ def GetranCommitID(self):
+ return self.ranCommitID
+ def SeteNB_serverId(self, enbsrvid):
+ self.eNB_serverId = enbsrvid
+ def GeteNB_serverId(self):
+ return self.eNB_serverId
+ def SeteNBIPAddress(self, enbip):
+ self.eNBIPAddress = enbip
+ def GeteNBIPAddress(self):
+ return self.eNBIPAddress
+ def SeteNBUserName(self, enbusr):
+ self.eNBUserName = enbusr
+ def GeteNBUserName(self):
+ return self.eNBUserName
+ def SeteNBPassword(self, enbpw):
+ self.eNBPassword = enbpw
+ def GeteNBPassword(self):
+ return self.eNBPassword
+ def SeteNBSourceCodePath(self, enbcodepath):
+ self.eNBSourceCodePath = enbcodepath
+ def GeteNBSourceCodePath(self):
+ return self.eNBSourceCodePath
+ def SetranAllowMerge(self, merge):
+ self.ranAllowMerge = merge
+ def GetranAllowMerge(self):
+ return self.ranAllowMerge
+ def SetranTargetBranch(self, tbranch):
+ self.ranTargetBranch = tbranch
+ def GetranTargetBranch(self):
+ return self.ranTargetBranch
+ def SetBuild_eNB_args(self, enbbuildarg):
+ self.Build_eNB_args = enbbuildarg
+ def GetBuild_eNB_args(self):
+ return self.Build_eNB_args
+ def SetInitialize_eNB_args(self, initenbarg):
+ self.Initialize_eNB_args = initenbarg
+ def GetInitialize_eNB_args(self):
+ return self.Initialize_eNB_args
+ def SetbackgroundBuild(self, bkbuild):
+ self.backgroundBuild = bkbuild
+ def GetbackgroundBuild(self):
+ return self.backgroundBuild
+ def SetbackgroundBuildTestId(self, bkbuildid):
+ self.backgroundBuildTestId = bkbuildid
+ def GetbackgroundBuildTestId(self):
+ return self.backgroundBuildTestId
+ def SetBuild_eNB_forced_workspace_cleanup(self, fcdwspclean):
+ self.Build_eNB_forced_workspace_cleanup = fcdwspclean
+ def GetBuild_eNB_forced_workspace_cleanup(self):
+ return self.Build_eNB_forced_workspace_cleanup
+ def Setair_interface(self, airif):
+ self.air_interface = airif
+ def Getair_interface(self):
+ return self.air_interface
+ def SeteNB_instance(self, enbinst):
+ self.eNB_instance = enbinst
+ def GeteNB_instance(self):
+ return self.eNB_instance
+
+ def SeteNBLogFile(self, enblog, idx):
+ self.eNBLogFiles[idx] = enblog
+ def GeteNBLogFile(self, idx):
+ return self.eNBLogFiles[idx]
+
+ def GeteNBmbmsEnable(self, idx):
+ return self.eNBmbmsEnables[idx]
+
+ def SeteNB1IPAddress(self,enb1ip):
+ self.eNB1IPAddress = enb1ip
+ def GeteNB1IPAddress(self):
+ return self.eNB1IPAddress
+ def SeteNB1UserName(self, enb1usr):
+ self.eNB1UserName = enb1usr
+ def GeteNB1UserName(self):
+ return self.eNB1UserName
+ def SeteNB1Password(self, enb1pw):
+ self.eNB1Password = enb1pw
+ def GeteNB1Password(self):
+ return self.eNB1Password
+ def SeteNB1SourceCodePath(self, enb1codepath):
+ self.eNB1SourceCodePath = enb1codepath
+ def GeteNB1SourceCodePath(self):
+ return self.eNB1SourceCodePath
+
+ def SeteNB2IPAddress(self, enb2ip):
+ self.eNB2IPAddress = enb2ip
+ def GeteNB2IPAddress(self):
+ return self.eNB2IPAddress
+ def SeteNB2UserName(self, enb2usr):
+ self.eNB2UserName = enb2usr
+ def GeteNB2UserName(self):
+ return self.eNB2UserName
+ def SeteNB2Password(self, enb2pw):
+ self.eNB2Password = enb2pw
+ def GeteNB2Password(self):
+ return self.eNB2Password
+ def SeteNB2SourceCodePath(self, enb2codepath):
+ self.eNB2SourceCodePath = enb2codepath
+ def GeteNB2SourceCodePath(self):
+ return self.eNB2SourceCodePath
+
+ def SetprematureExit(self, premex):
+ self.prematureExit = premex
+ def GetprematureExit(self):
+ return self.prematureExit
+
+#-----------------------------------------------------------
+# RAN management functions
+#-----------------------------------------------------------
+
+ def BuildeNB(self):
+ if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+ HELP.GenericHelp(CONST.Version)
+ sys.exit('Insufficient Parameter')
+ if self.eNB_serverId == '0':
+ lIpAddr = self.eNBIPAddress
+ lUserName = self.eNBUserName
+ lPassWord = self.eNBPassword
+ lSourcePath = self.eNBSourceCodePath
+ elif self.eNB_serverId == '1':
+ lIpAddr = self.eNB1IPAddress
+ lUserName = self.eNB1UserName
+ lPassWord = self.eNB1Password
+ lSourcePath = self.eNB1SourceCodePath
+ elif self.eNB_serverId == '2':
+ lIpAddr = self.eNB2IPAddress
+ lUserName = self.eNB2UserName
+ lPassWord = self.eNB2Password
+ lSourcePath = self.eNB2SourceCodePath
+ if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+ HELP.GenericHelp(CONST.Version)
+ sys.exit('Insufficient Parameter')
+ mySSH = SSH.SSHConnection()
+ mySSH.open(lIpAddr, lUserName, lPassWord)
+ # Check if we build an 5G-NR gNB or an LTE eNB
+ result = re.search('--gNB', self.Build_eNB_args)
+ if result is not None:
+ self.air_interface = 'nr'
+ else:
+ self.air_interface = 'lte'
+ # Worakround for some servers, we need to erase completely the workspace
+ if self.Build_eNB_forced_workspace_cleanup:
+ mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15)
+ if self.htmlObj is not None:
+ self.testCase_id = self.htmlObj.GettestCase_id()
+ else:
+ self.testCase_id = '000000'
+ # on RedHat/CentOS .git extension is mandatory
+ result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
+ if result is not None:
+ full_ran_repo_name = self.ranRepository
+ else:
+ full_ran_repo_name = self.ranRepository + '.git'
+ mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
+ mySSH.command('cd ' + lSourcePath, '\$', 5)
+ mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+ # Raphael: here add a check if git clone or git fetch went smoothly
+ mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+ mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)
+ # Checking the BUILD INFO file
+ if not self.backgroundBuild:
+ mySSH.command('ls *.txt', '\$', 5)
+ result = re.search('LAST_BUILD_INFO', mySSH.getBefore())
+ if result is not None:
+ mismatch = False
+ mySSH.command('grep SRC_COMMIT LAST_BUILD_INFO.txt', '\$', 2)
+ result = re.search(self.ranCommitID, mySSH.getBefore())
+ if result is None:
+ mismatch = True
+ mySSH.command('grep MERGED_W_TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
+ if (self.ranAllowMerge):
+ result = re.search('YES', mySSH.getBefore())
+ if result is None:
+ mismatch = True
+ mySSH.command('grep TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
+ if self.ranTargetBranch == '':
+ result = re.search('develop', mySSH.getBefore())
+ else:
+ result = re.search(self.ranTargetBranch, mySSH.getBefore())
+ if result is None:
+ mismatch = True
+ else:
+ result = re.search('NO', mySSH.getBefore())
+ if result is None:
+ mismatch = True
+ if not mismatch:
+ mySSH.close()
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
+ return
+
+ mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+ # if the commit ID is provided use it to point to it
+ if self.ranCommitID != '':
+ mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 5)
+ # if the branch is not develop, then it is a merge request and we need to do
+ # the potential merge. Note that merge conflicts should already been checked earlier
+ if (self.ranAllowMerge):
+ if self.ranTargetBranch == '':
+ if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+ mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
+ else:
+ logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
+ mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+ mySSH.command('source oaienv', '\$', 5)
+ mySSH.command('cd cmake_targets', '\$', 5)
+ mySSH.command('mkdir -p log', '\$', 5)
+ mySSH.command('chmod 777 log', '\$', 5)
+ # no need to remove in log (git clean did the trick)
+ if self.backgroundBuild:
+ mySSH.command('echo "./build_oai ' + self.Build_eNB_args + '" > ./my-lte-softmodem-build.sh', '\$', 5)
+ mySSH.command('chmod 775 ./my-lte-softmodem-build.sh', '\$', 5)
+ mySSH.command('echo ' + lPassWord + ' | sudo -S -E daemon --inherit --unsafe --name=build_enb_daemon --chdir=' + lSourcePath + '/cmake_targets -o ' + lSourcePath + '/cmake_targets/compile_oai_enb.log ./my-lte-softmodem-build.sh', '\$', 5)
+ mySSH.close()
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
+ self.backgroundBuildTestId[int(self.eNB_instance)] = self.testCase_id
+ return
+ mySSH.command('stdbuf -o0 ./build_oai ' + self.Build_eNB_args + ' 2>&1 | stdbuf -o0 tee compile_oai_enb.log', 'Bypassing the Tests|build have failed', 1500)
+ mySSH.close()
+ self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.testCase_id)
+
+ def WaitBuildeNBisFinished(self):
+ if self.eNB_serverId == '0':
+ lIpAddr = self.eNBIPAddress
+ lUserName = self.eNBUserName
+ lPassWord = self.eNBPassword
+ lSourcePath = self.eNBSourceCodePath
+ elif self.eNB_serverId == '1':
+ lIpAddr = self.eNB1IPAddress
+ lUserName = self.eNB1UserName
+ lPassWord = self.eNB1Password
+ lSourcePath = self.eNB1SourceCodePath
+ elif self.eNB_serverId == '2':
+ lIpAddr = self.eNB2IPAddress
+ lUserName = self.eNB2UserName
+ lPassWord = self.eNB2Password
+ lSourcePath = self.eNB2SourceCodePath
+ if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+ HELP.GenericHelp(CONST.Version)
+ sys.exit('Insufficient Parameter')
+ mySSH = SSH.SSHConnection()
+ mySSH.open(lIpAddr, lUserName, lPassWord)
+ count = 40
+ buildOAIprocess = True
+ while (count > 0) and buildOAIprocess:
+ mySSH.command('ps aux | grep --color=never build_ | grep -v grep', '\$', 3)
+ result = re.search('build_oai', mySSH.getBefore())
+ if result is None:
+ buildOAIprocess = False
+ else:
+ count -= 1
+ time.sleep(30)
+ mySSH.close()
+ self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)])
+
+ def checkBuildeNB(self, lIpAddr, lUserName, lPassWord, lSourcePath, testcaseId):
+ if self.htmlObj is not None:
+ self.htmlObj.SettestCase_id(testcaseId)
+ mySSH = SSH.SSHConnection()
+ mySSH.open(lIpAddr, lUserName, lPassWord)
+ mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 3)
+ mySSH.command('ls ran_build/build', '\$', 3)
+ mySSH.command('ls ran_build/build', '\$', 3)
+ if self.air_interface == 'nr':
+ nodeB_prefix = 'g'
+ else:
+ nodeB_prefix = 'e'
+ buildStatus = True
+ result = re.search(self.air_interface + '-softmodem', mySSH.getBefore())
+ if result is None:
+ buildStatus = False
+ else:
+ # Generating a BUILD INFO file
+ mySSH.command('echo "SRC_BRANCH: ' + self.ranBranch + '" > ../LAST_BUILD_INFO.txt', '\$', 2)
+ mySSH.command('echo "SRC_COMMIT: ' + self.ranCommitID + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+ if (self.ranAllowMerge):
+ mySSH.command('echo "MERGED_W_TGT_BRANCH: YES" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+ if self.ranTargetBranch == '':
+ mySSH.command('echo "TGT_BRANCH: develop" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+ else:
+ mySSH.command('echo "TGT_BRANCH: ' + self.ranTargetBranch + '" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+ else:
+ mySSH.command('echo "MERGED_W_TGT_BRANCH: NO" >> ../LAST_BUILD_INFO.txt', '\$', 2)
+ mySSH.command('mkdir -p build_log_' + testcaseId, '\$', 5)
+ mySSH.command('mv log/* ' + 'build_log_' + testcaseId, '\$', 5)
+ mySSH.command('mv compile_oai_enb.log ' + 'build_log_' + testcaseId, '\$', 5)
+ if self.eNB_serverId != '0':
+ mySSH.command('cd cmake_targets', '\$', 5)
+ mySSH.command('if [ -e tmp_build' + testcaseId + '.zip ]; then rm -f tmp_build' + testcaseId + '.zip; fi', '\$', 5)
+ mySSH.command('zip -r -qq tmp_build' + testcaseId + '.zip build_log_' + testcaseId, '\$', 5)
+ mySSH.close()
+ if (os.path.isfile('./tmp_build' + testcaseId + '.zip')):
+ os.remove('./tmp_build' + testcaseId + '.zip')
+ mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/tmp_build' + testcaseId + '.zip', '.')
+ if (os.path.isfile('./tmp_build' + testcaseId + '.zip')):
+ mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './tmp_build' + testcaseId + '.zip', self.eNBSourceCodePath + '/cmake_targets/.')
+ os.remove('./tmp_build' + testcaseId + '.zip')
+ mySSH.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
+ mySSH.command('cd ' + self.eNBSourceCodePath + '/cmake_targets', '\$', 5)
+ mySSH.command('unzip -qq -DD tmp_build' + testcaseId + '.zip', '\$', 5)
+ mySSH.command('rm -f tmp_build' + testcaseId + '.zip', '\$', 5)
+ mySSH.close()
+ else:
+ mySSH.close()
+
+ if buildStatus:
+ logging.info('\u001B[1m Building OAI ' + nodeB_prefix + 'NB Pass\u001B[0m')
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow(self.Build_eNB_args, 'OK', CONST.ALL_PROCESSES_OK)
+ else:
+ logging.error('\u001B[1m Building OAI ' + nodeB_prefix + 'NB Failed\u001B[0m')
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow(self.Build_eNB_args, 'KO', CONST.ALL_PROCESSES_OK)
+ self.htmlObj.CreateHtmlTabFooter(False)
+ sys.exit(1)
+
+ def InitializeeNB(self):
+ if self.eNB_serverId == '0':
+ lIpAddr = self.eNBIPAddress
+ lUserName = self.eNBUserName
+ lPassWord = self.eNBPassword
+ lSourcePath = self.eNBSourceCodePath
+ elif self.eNB_serverId == '1':
+ lIpAddr = self.eNB1IPAddress
+ lUserName = self.eNB1UserName
+ lPassWord = self.eNB1Password
+ lSourcePath = self.eNB1SourceCodePath
+ elif self.eNB_serverId == '2':
+ lIpAddr = self.eNB2IPAddress
+ lUserName = self.eNB2UserName
+ lPassWord = self.eNB2Password
+ lSourcePath = self.eNB2SourceCodePath
+ if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+ HELP.GenericHelp(CONST.Version)
+ sys.exit('Insufficient Parameter')
+
+ if self.htmlObj is not None:
+ self.testCase_id = self.htmlObj.GettestCase_id()
+ else:
+ self.testCase_id = '000000'
+ mySSH = SSH.SSHConnection()
+
+ if (self.pStatus < 0):
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow(self.Initialize_eNB_args, 'KO', self.pStatus)
+ self.htmlObj.CreateHtmlTabFooter(False)
+ sys.exit(1)
+ # If tracer options is on, running tshark on EPC side and capture traffic b/ EPC and eNB
+ result = re.search('T_stdout', str(self.Initialize_eNB_args))
+ if (result is not None) and (self.epcObj is not None):
+ localEpcIpAddr = self.epcObj.GetIPAddress()
+ localEpcUserName = self.epcObj.GetUserName()
+ localEpcPassword = self.epcObj.GetPassword()
+ mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
+ mySSH.command('ip addr show | awk -f /tmp/active_net_interfaces.awk | egrep -v "lo|tun"', '\$', 5)
+ result = re.search('interfaceToUse=(?P<eth_interface>[a-zA-Z0-9\-\_]+)done', mySSH.getBefore())
+ if result is not None:
+ eth_interface = result.group('eth_interface')
+ logging.debug('\u001B[1m Launching tshark on interface ' + eth_interface + '\u001B[0m')
+ self.epcPcapFile = 'enb_' + self.testCase_id + '_s1log.pcap'
+ mySSH.command('echo ' + localEpcPassword + ' | sudo -S rm -f /tmp/' + self.epcPcapFile , '\$', 5)
+ mySSH.command('echo $USER; nohup sudo tshark -f "host ' + lIpAddr +'" -i ' + eth_interface + ' -w /tmp/' + self.epcPcapFile + ' > /tmp/tshark.log 2>&1 &', localEpcUserName, 5)
+ mySSH.close()
+ mySSH.open(lIpAddr, lUserName, lPassWord)
+ mySSH.command('cd ' + lSourcePath, '\$', 5)
+ # Initialize_eNB_args usually start with -O and followed by the location in repository
+ full_config_file = self.Initialize_eNB_args.replace('-O ','')
+ extra_options = ''
+ extIdx = full_config_file.find('.conf')
+ if (extIdx > 0):
+ extra_options = full_config_file[extIdx + 5:]
+ # if tracer options is on, compiling and running T Tracer
+ result = re.search('T_stdout', str(extra_options))
+ if result is not None:
+ logging.debug('\u001B[1m Compiling and launching T Tracer\u001B[0m')
+ mySSH.command('cd common/utils/T/tracer', '\$', 5)
+ mySSH.command('make', '\$', 10)
+ mySSH.command('echo $USER; nohup ./record -d ../T_messages.txt -o ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '_record.raw -ON -off VCD -off HEAVY -off LEGACY_GROUP_TRACE -off LEGACY_GROUP_DEBUG > ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '_record.log 2>&1 &', lUserName, 5)
+ mySSH.command('cd ' + lSourcePath, '\$', 5)
+ full_config_file = full_config_file[:extIdx + 5]
+ config_path, config_file = os.path.split(full_config_file)
+ else:
+ sys.exit('Insufficient Parameter')
+ ci_full_config_file = config_path + '/ci-' + config_file
+ rruCheck = False
+ result = re.search('^rru|^rcc|^du.band', str(config_file))
+ if result is not None:
+ rruCheck = True
+ # do not reset board twice in IF4.5 case
+ result = re.search('^rru|^enb|^du.band', str(config_file))
+ if result is not None:
+ mySSH.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 60)
+ result = re.search('type: b200', mySSH.getBefore())
+ if result is not None:
+ logging.debug('Found a B2xx device --> resetting it')
+ mySSH.command('echo ' + lPassWord + ' | sudo -S b2xx_fx3_utils --reset-device', '\$', 10)
+ # Reloading FGPA bin firmware
+ mySSH.command('echo ' + lPassWord + ' | sudo -S uhd_find_devices', '\$', 60)
+ # Make a copy and adapt to EPC / eNB IP addresses
+ mySSH.command('cp ' + full_config_file + ' ' + ci_full_config_file, '\$', 5)
+ if self.epcObj is not None:
+ localEpcIpAddr = self.epcObj.GetIPAddress()
+ mySSH.command('sed -i -e \'s/CI_MME_IP_ADDR/' + localEpcIpAddr + '/\' ' + ci_full_config_file, '\$', 2);
+ mySSH.command('sed -i -e \'s/CI_ENB_IP_ADDR/' + lIpAddr + '/\' ' + ci_full_config_file, '\$', 2);
+ mySSH.command('sed -i -e \'s/CI_RCC_IP_ADDR/' + self.eNBIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
+ mySSH.command('sed -i -e \'s/CI_RRU1_IP_ADDR/' + self.eNB1IPAddress + '/\' ' + ci_full_config_file, '\$', 2);
+ mySSH.command('sed -i -e \'s/CI_RRU2_IP_ADDR/' + self.eNB2IPAddress + '/\' ' + ci_full_config_file, '\$', 2);
+ if self.flexranCtrlInstalled and self.flexranCtrlStarted:
+ mySSH.command('sed -i -e \'s/FLEXRAN_ENABLED.*;/FLEXRAN_ENABLED = "yes";/\' ' + ci_full_config_file, '\$', 2);
+ else:
+ mySSH.command('sed -i -e \'s/FLEXRAN_ENABLED.*;/FLEXRAN_ENABLED = "no";/\' ' + ci_full_config_file, '\$', 2);
+ self.eNBmbmsEnables[int(self.eNB_instance)] = False
+ mySSH.command('grep enable_enb_m2 ' + ci_full_config_file, '\$', 2);
+ result = re.search('yes', mySSH.getBefore())
+ if result is not None:
+ self.eNBmbmsEnables[int(self.eNB_instance)] = True
+ logging.debug('\u001B[1m MBMS is enabled on this eNB\u001B[0m')
+ result = re.search('noS1', str(self.Initialize_eNB_args))
+ eNBinNoS1 = False
+ if result is not None:
+ eNBinNoS1 = True
+ logging.debug('\u001B[1m eNB is in noS1 configuration \u001B[0m')
+ # Launch eNB with the modified config file
+ mySSH.command('source oaienv', '\$', 5)
+ mySSH.command('cd cmake_targets', '\$', 5)
+ mySSH.command('echo "ulimit -c unlimited && ./ran_build/build/' + self.air_interface + '-softmodem -O ' + lSourcePath + '/' + ci_full_config_file + extra_options + '" > ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
+ mySSH.command('chmod 775 ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
+ mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf enb_' + self.testCase_id + '.log', '\$', 5)
+ mySSH.command('hostnamectl','\$', 5)
+ result = re.search('CentOS Linux 7', mySSH.getBefore())
+ if result is not None:
+ mySSH.command('echo $USER; nohup sudo ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh > ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '.log 2>&1 &', lUserName, 10)
+ else:
+ mySSH.command('echo ' + lPassWord + ' | sudo -S -E daemon --inherit --unsafe --name=enb' + str(self.eNB_instance) + '_daemon --chdir=' + lSourcePath + '/cmake_targets -o ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '.log ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
+ self.eNBLogFiles[int(self.eNB_instance)] = 'enb_' + self.testCase_id + '.log'
+ if extra_options != '':
+ self.eNBOptions[int(self.eNB_instance)] = extra_options
+ time.sleep(6)
+ doLoop = True
+ loopCounter = 20
+ enbDidSync = False
+ while (doLoop):
+ loopCounter = loopCounter - 1
+ if (loopCounter == 0):
+ # In case of T tracer recording, we may need to kill it
+ result = re.search('T_stdout', str(self.Initialize_eNB_args))
+ if result is not None:
+ mySSH.command('killall --signal SIGKILL record', '\$', 5)
+ mySSH.close()
+ doLoop = False
+ logging.error('\u001B[1;37;41m eNB logging system did not show got sync! \u001B[0m')
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow('-O ' + config_file + extra_options, 'KO', CONST.ALL_PROCESSES_OK)
+ # In case of T tracer recording, we need to kill tshark on EPC side
+ result = re.search('T_stdout', str(self.Initialize_eNB_args))
+ if (result is not None) and (self.epcObj is not None):
+ localEpcIpAddr = self.epcObj.GetIPAddress()
+ localEpcUserName = self.epcObj.GetUserName()
+ localEpcPassword = self.epcObj.GetPassword()
+ mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
+ logging.debug('\u001B[1m Stopping tshark \u001B[0m')
+ mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
+ if self.epcPcapFile != '':
+ time.sleep(0.5)
+ mySSH.command('echo ' + localEpcPassword + ' | sudo -S chmod 666 /tmp/' + self.epcPcapFile, '\$', 5)
+ mySSH.close()
+ time.sleep(1)
+ if self.epcPcapFile != '':
+ copyin_res = mySSH.copyin(localEpcIpAddr, localEpcUserName, localEpcPassword, '/tmp/' + self.epcPcapFile, '.')
+ if (copyin_res == 0):
+ mySSH.copyout(lIpAddr, lUserName, lPassWord, self.epcPcapFile, lSourcePath + '/cmake_targets/.')
+ self.prematureExit = True
+ return
+ else:
+ mySSH.command('stdbuf -o0 cat enb_' + self.testCase_id + '.log | egrep --text --color=never -i "wait|sync|Starting"', '\$', 4)
+ if rruCheck:
+ result = re.search('wait RUs', mySSH.getBefore())
+ else:
+ result = re.search('got sync|Starting F1AP at CU', mySSH.getBefore())
+ if result is None:
+ time.sleep(6)
+ else:
+ doLoop = False
+ enbDidSync = True
+ time.sleep(10)
+
+ if enbDidSync and eNBinNoS1:
+ mySSH.command('ifconfig oaitun_enb1', '\$', 4)
+ mySSH.command('ifconfig oaitun_enb1', '\$', 4)
+ result = re.search('inet addr:1|inet 1', mySSH.getBefore())
+ if result is not None:
+ logging.debug('\u001B[1m oaitun_enb1 interface is mounted and configured\u001B[0m')
+ else:
+ logging.error('\u001B[1m oaitun_enb1 interface is either NOT mounted or NOT configured\u001B[0m')
+ if self.eNBmbmsEnables[int(self.eNB_instance)]:
+ mySSH.command('ifconfig oaitun_enm1', '\$', 4)
+ result = re.search('inet addr', mySSH.getBefore())
+ if result is not None:
+ logging.debug('\u001B[1m oaitun_enm1 interface is mounted and configured\u001B[0m')
+ else:
+ logging.error('\u001B[1m oaitun_enm1 interface is either NOT mounted or NOT configured\u001B[0m')
+ if enbDidSync:
+ self.eNBstatuses[int(self.eNB_instance)] = int(self.eNB_serverId)
+
+ mySSH.close()
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow('-O ' + config_file + extra_options, 'OK', CONST.ALL_PROCESSES_OK)
+ logging.debug('\u001B[1m Initialize eNB Completed\u001B[0m')
+
+ def CheckeNBProcess(self, status_queue):
+ try:
+ # At least the instance 0 SHALL be on!
+ if self.eNBstatuses[0] == 0:
+ lIpAddr = self.eNBIPAddress
+ lUserName = self.eNBUserName
+ lPassWord = self.eNBPassword
+ elif self.eNBstatuses[0] == 1:
+ lIpAddr = self.eNB1IPAddress
+ lUserName = self.eNB1UserName
+ lPassWord = self.eNB1Password
+ elif self.eNBstatuses[0] == 2:
+ lIpAddr = self.eNB2IPAddress
+ lUserName = self.eNB2UserName
+ lPassWord = self.eNB2Password
+ else:
+ lIpAddr = self.eNBIPAddress
+ lUserName = self.eNBUserName
+ lPassWord = self.eNBPassword
+ mySSH = SSH.SSHConnection()
+ mySSH.open(lIpAddr, lUserName, lPassWord)
+ mySSH.command('stdbuf -o0 ps -aux | grep --color=never ' + self.air_interface + '-softmodem | grep -v grep', '\$', 5)
+ result = re.search(self.air_interface + '-softmodem', mySSH.getBefore())
+ if result is None:
+ logging.debug('\u001B[1;37;41m eNB Process Not Found! \u001B[0m')
+ status_queue.put(CONST.ENB_PROCESS_FAILED)
+ else:
+ status_queue.put(CONST.ENB_PROCESS_OK)
+ mySSH.close()
+ except:
+ os.kill(os.getppid(),signal.SIGUSR1)
+
+ def TerminateeNB(self):
+ if self.eNB_serverId == '0':
+ lIpAddr = self.eNBIPAddress
+ lUserName = self.eNBUserName
+ lPassWord = self.eNBPassword
+ lSourcePath = self.eNBSourceCodePath
+ elif self.eNB_serverId == '1':
+ lIpAddr = self.eNB1IPAddress
+ lUserName = self.eNB1UserName
+ lPassWord = self.eNB1Password
+ lSourcePath = self.eNB1SourceCodePath
+ elif self.eNB_serverId == '2':
+ lIpAddr = self.eNB2IPAddress
+ lUserName = self.eNB2UserName
+ lPassWord = self.eNB2Password
+ lSourcePath = self.eNB2SourceCodePath
+ if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+ HELP.GenericHelp(CONST.Version)
+ sys.exit('Insufficient Parameter')
+ mySSH = SSH.SSHConnection()
+ mySSH.open(lIpAddr, lUserName, lPassWord)
+ mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+ if self.air_interface == 'lte':
+ nodeB_prefix = 'e'
+ else:
+ nodeB_prefix = 'g'
+ mySSH.command('stdbuf -o0 ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
+ result = re.search('-softmodem', mySSH.getBefore())
+ if result is not None:
+ mySSH.command('echo ' + lPassWord + ' | sudo -S daemon --name=enb' + str(self.eNB_instance) + '_daemon --stop', '\$', 5)
+ mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGINT -r .*-softmodem || true', '\$', 5)
+ time.sleep(10)
+ mySSH.command('stdbuf -o0 ps -aux | grep --color=never softmodem | grep -v grep', '\$', 5)
+ result = re.search('-softmodem', mySSH.getBefore())
+ if result is not None:
+ mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGKILL -r .*-softmodem || true', '\$', 5)
+ time.sleep(5)
+ mySSH.command('rm -f my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
+ mySSH.close()
+ # If tracer options is on, stopping tshark on EPC side
+ result = re.search('T_stdout', str(self.Initialize_eNB_args))
+ if (result is not None) and (self.epcObj is not None):
+ localEpcIpAddr = self.epcObj.GetIPAddress()
+ localEpcUserName = self.epcObj.GetUserName()
+ localEpcPassword = self.epcObj.GetPassword()
+ mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
+ logging.debug('\u001B[1m Stopping tshark \u001B[0m')
+ mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
+ time.sleep(1)
+ if self.epcPcapFile != '':
+ mySSH.command('echo ' + localEpcPassword + ' | sudo -S chmod 666 /tmp/' + self.epcPcapFile, '\$', 5)
+ mySSH.copyin(localEpcIpAddr, localEpcUserName, localEpcPassword, '/tmp/' + self.epcPcapFile, '.')
+ mySSH.copyout(lIpAddr, lUserName, lPassWord, self.epcPcapFile, lSourcePath + '/cmake_targets/.')
+ mySSH.close()
+ logging.debug('\u001B[1m Replaying RAW record file\u001B[0m')
+ mySSH.open(lIpAddr, lUserName, lPassWord)
+ mySSH.command('cd ' + lSourcePath + '/common/utils/T/tracer/', '\$', 5)
+ enbLogFile = self.eNBLogFiles[int(self.eNB_instance)]
+ raw_record_file = enbLogFile.replace('.log', '_record.raw')
+ replay_log_file = enbLogFile.replace('.log', '_replay.log')
+ extracted_txt_file = enbLogFile.replace('.log', '_extracted_messages.txt')
+ extracted_log_file = enbLogFile.replace('.log', '_extracted_messages.log')
+ mySSH.command('./extract_config -i ' + lSourcePath + '/cmake_targets/' + raw_record_file + ' > ' + lSourcePath + '/cmake_targets/' + extracted_txt_file, '\$', 5)
+ mySSH.command('echo $USER; nohup ./replay -i ' + lSourcePath + '/cmake_targets/' + raw_record_file + ' > ' + lSourcePath + '/cmake_targets/' + replay_log_file + ' 2>&1 &', lUserName, 5)
+ mySSH.command('./textlog -d ' + lSourcePath + '/cmake_targets/' + extracted_txt_file + ' -no-gui -ON -full > ' + lSourcePath + '/cmake_targets/' + extracted_log_file, '\$', 5)
+ mySSH.close()
+ mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + extracted_log_file, '.')
+ logging.debug('\u001B[1m Analyzing eNB replay logfile \u001B[0m')
+ logStatus = self.AnalyzeLogFile_eNB(extracted_log_file)
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+ self.eNBLogFiles[int(self.eNB_instance)] = ''
+ else:
+ analyzeFile = False
+ if self.eNBLogFiles[int(self.eNB_instance)] != '':
+ analyzeFile = True
+ fileToAnalyze = self.eNBLogFiles[int(self.eNB_instance)]
+ self.eNBLogFiles[int(self.eNB_instance)] = ''
+ if analyzeFile:
+ copyin_res = mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/' + fileToAnalyze, '.')
+ if (copyin_res == -1):
+ logging.debug('\u001B[1;37;41m Could not copy ' + nodeB_prefix + 'NB logfile to analyze it! \u001B[0m')
+ if self.htmlObj is not None:
+ self.htmlObj.SetHmleNBFailureMsg('Could not copy ' + nodeB_prefix + 'NB logfile to analyze it!')
+ self.htmlObj.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
+ self.eNBmbmsEnables[int(self.eNB_instance)] = False
+ return
+ if self.eNB_serverId != '0':
+ mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './' + fileToAnalyze, self.eNBSourceCodePath + '/cmake_targets/')
+ logging.debug('\u001B[1m Analyzing ' + nodeB_prefix + 'NB logfile \u001B[0m ' + fileToAnalyze)
+ logStatus = self.AnalyzeLogFile_eNB(fileToAnalyze)
+ if (logStatus < 0):
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow('N/A', 'KO', logStatus)
+ self.preamtureExit = True
+ self.eNBmbmsEnables[int(self.eNB_instance)] = False
+ return
+ else:
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+ else:
+ if self.htmlObj is not None:
+ self.htmlObj.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+ self.eNBmbmsEnables[int(self.eNB_instance)] = False
+ self.eNBstatuses[int(self.eNB_instance)] = -1
+
+ def LogCollecteNB(self):
+ mySSH = SSH.SSHConnection()
+ mySSH.open(self.eNBIPAddress, self.eNBUserName, self.eNBPassword)
+ mySSH.command('cd ' + self.eNBSourceCodePath, '\$', 5)
+ mySSH.command('cd cmake_targets', '\$', 5)
+ mySSH.command('echo ' + self.eNBPassword + ' | sudo -S rm -f enb.log.zip', '\$', 5)
+ mySSH.command('echo ' + self.eNBPassword + ' | sudo -S zip enb.log.zip enb*.log core* enb_*record.raw enb_*.pcap enb_*txt', '\$', 60)
+ mySSH.command('echo ' + self.eNBPassword + ' | sudo -S rm enb*.log core* enb_*record.raw enb_*.pcap enb_*txt', '\$', 5)
+ mySSH.close()
+
+ def AnalyzeLogFile_eNB(self, eNBlogFile):
+ if (not os.path.isfile('./' + eNBlogFile)):
+ return -1
+ enb_log_file = open('./' + eNBlogFile, 'r')
+ exitSignalReceived = False
+ foundAssertion = False
+ msgAssertion = ''
+ msgLine = 0
+ foundSegFault = False
+ foundRealTimeIssue = False
+ rrcSetupComplete = 0
+ rrcReleaseRequest = 0
+ rrcReconfigRequest = 0
+ rrcReconfigComplete = 0
+ rrcReestablishRequest = 0
+ rrcReestablishComplete = 0
+ rrcReestablishReject = 0
+ rlcDiscardBuffer = 0
+ rachCanceledProcedure = 0
+ uciStatMsgCount = 0
+ pdcpFailure = 0
+ ulschFailure = 0
+ ulschReceiveOK = 0
+ cdrxActivationMessageCount = 0
+ dropNotEnoughRBs = 0
+ mbmsRequestMsg = 0
+ htmleNBFailureMsg = ''
+ isRRU = False
+ isSlave = False
+ slaveReceivesFrameResyncCmd = False
+ X2HO_state = CONST.X2_HO_REQ_STATE__IDLE
+ X2HO_inNbProcedures = 0
+ X2HO_outNbProcedures = 0
+ for line in enb_log_file.readlines():
+ if X2HO_state == CONST.X2_HO_REQ_STATE__IDLE:
+ result = re.search('target eNB Receives X2 HO Req X2AP_HANDOVER_REQ', str(line))
+ if result is not None:
+ X2HO_state = CONST.X2_HO_REQ_STATE__TARGET_RECEIVES_REQ
+ result = re.search('source eNB receives the X2 HO ACK X2AP_HANDOVER_REQ_ACK', str(line))
+ if result is not None:
+ X2HO_state = CONST.X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK
+ if X2HO_state == CONST.X2_HO_REQ_STATE__TARGET_RECEIVES_REQ:
+ result = re.search('Received LTE_RRCConnectionReconfigurationComplete from UE', str(line))
+ if result is not None:
+ X2HO_state = CONST.X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE
+ if X2HO_state == CONST.X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE:
+ result = re.search('issue rrc_eNB_send_PATH_SWITCH_REQ', str(line))
+ if result is not None:
+ X2HO_state = CONST.X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ
+ if X2HO_state == CONST.X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ:
+ result = re.search('received path switch ack S1AP_PATH_SWITCH_REQ_ACK', str(line))
+ if result is not None:
+ X2HO_state = CONST.X2_HO_REQ_STATE__IDLE
+ X2HO_inNbProcedures += 1
+ if X2HO_state == CONST.X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK:
+ result = re.search('source eNB receives the X2 UE CONTEXT RELEASE X2AP_UE_CONTEXT_RELEASE', str(line))
+ if result is not None:
+ X2HO_state = CONST.X2_HO_REQ_STATE__IDLE
+ X2HO_outNbProcedures += 1
+
+ if self.eNBOptions[int(self.eNB_instance)] != '':
+ res1 = re.search('max_rxgain (?P<requested_option>[0-9]+)', self.eNBOptions[int(self.eNB_instance)])
+ res2 = re.search('max_rxgain (?P<applied_option>[0-9]+)', str(line))
+ if res1 is not None and res2 is not None:
+ requested_option = int(res1.group('requested_option'))
+ applied_option = int(res2.group('applied_option'))
+ if requested_option == applied_option:
+ htmleNBFailureMsg += '<span class="glyphicon glyphicon-ok-circle"></span> Command line option(s) correctly applied <span class="glyphicon glyphicon-arrow-right"></span> ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n'
+ else:
+ htmleNBFailureMsg += '<span class="glyphicon glyphicon-ban-circle"></span> Command line option(s) NOT applied <span class="glyphicon glyphicon-arrow-right"></span> ' + self.eNBOptions[int(self.eNB_instance)] + '\n\n'
+ result = re.search('Exiting OAI softmodem', str(line))
+ if result is not None:
+ exitSignalReceived = True
+ result = re.search('[Ss]egmentation [Ff]ault', str(line))
+ if result is not None and not exitSignalReceived:
+ foundSegFault = True
+ result = re.search('[Cc]ore [dD]ump', str(line))
+ if result is not None and not exitSignalReceived:
+ foundSegFault = True
+ result = re.search('./ran_build/build/lte-softmodem', str(line))
+ if result is not None and not exitSignalReceived:
+ foundSegFault = True
+ result = re.search('[Aa]ssertion', str(line))
+ if result is not None and not exitSignalReceived:
+ foundAssertion = True
+ result = re.search('LLL', str(line))
+ if result is not None and not exitSignalReceived:
+ foundRealTimeIssue = True
+ if foundAssertion and (msgLine < 3):
+ msgLine += 1
+ msgAssertion += str(line)
+ result = re.search('Setting function for RU', str(line))
+ if result is not None:
+ isRRU = True
+ if isRRU:
+ result = re.search('RU 0 is_slave=yes', str(line))
+ if result is not None:
+ isSlave = True
+ if isSlave:
+ result = re.search('Received RRU_frame_resynch command', str(line))
+ if result is not None:
+ slaveReceivesFrameResyncCmd = True
+ result = re.search('LTE_RRCConnectionSetupComplete from UE', str(line))
+ if result is not None:
+ rrcSetupComplete += 1
+ result = re.search('Generate LTE_RRCConnectionRelease|Generate RRCConnectionRelease', str(line))
+ if result is not None:
+ rrcReleaseRequest += 1
+ result = re.search('Generate LTE_RRCConnectionReconfiguration', str(line))
+ if result is not None:
+ rrcReconfigRequest += 1
+ result = re.search('LTE_RRCConnectionReconfigurationComplete from UE rnti', str(line))
+ if result is not None:
+ rrcReconfigComplete += 1
+ result = re.search('LTE_RRCConnectionReestablishmentRequest', str(line))
+ if result is not None:
+ rrcReestablishRequest += 1
+ result = re.search('LTE_RRCConnectionReestablishmentComplete', str(line))
+ if result is not None:
+ rrcReestablishComplete += 1
+ result = re.search('LTE_RRCConnectionReestablishmentReject', str(line))
+ if result is not None:
+ rrcReestablishReject += 1
+ result = re.search('CDRX configuration activated after RRC Connection', str(line))
+ if result is not None:
+ cdrxActivationMessageCount += 1
+ result = re.search('uci->stat', str(line))
+ if result is not None:
+ uciStatMsgCount += 1
+ result = re.search('PDCP.*Out of Resources.*reason', str(line))
+ if result is not None:
+ pdcpFailure += 1
+ result = re.search('ULSCH in error in round', str(line))
+ if result is not None:
+ ulschFailure += 1
+ result = re.search('ULSCH received ok', str(line))
+ if result is not None:
+ ulschReceiveOK += 1
+ result = re.search('BAD all_segments_received', str(line))
+ if result is not None:
+ rlcDiscardBuffer += 1
+ result = re.search('Canceled RA procedure for UE rnti', str(line))
+ if result is not None:
+ rachCanceledProcedure += 1
+ result = re.search('dropping, not enough RBs', str(line))
+ if result is not None:
+ dropNotEnoughRBs += 1
+ if self.eNBmbmsEnables[int(self.eNB_instance)]:
+ result = re.search('MBMS USER-PLANE.*Requesting.*bytes from RLC', str(line))
+ if result is not None:
+ mbmsRequestMsg += 1
+ enb_log_file.close()
+ logging.debug(' File analysis completed')
+ if self.air_interface == 'lte':
+ nodeB_prefix = 'e'
+ else:
+ nodeB_prefix = 'g'
+ if self.air_interface == 'nr':
+ if ulschReceiveOK > 0:
+ statMsg = nodeB_prefix + 'NB showed ' + str(ulschReceiveOK) + ' "ULSCH received ok" message(s)'
+ logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+ htmleNBFailureMsg += statMsg + '\n'
+ if uciStatMsgCount > 0:
+ statMsg = nodeB_prefix + 'NB showed ' + str(uciStatMsgCount) + ' "uci->stat" message(s)'
+ logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+ htmleNBFailureMsg += statMsg + '\n'
+ if pdcpFailure > 0:
+ statMsg = nodeB_prefix + 'NB showed ' + str(pdcpFailure) + ' "PDCP Out of Resources" message(s)'
+ logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+ htmleNBFailureMsg += statMsg + '\n'
+ if ulschFailure > 0:
+ statMsg = nodeB_prefix + 'NB showed ' + str(ulschFailure) + ' "ULSCH in error in round" message(s)'
+ logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+ htmleNBFailureMsg += statMsg + '\n'
+ if dropNotEnoughRBs > 0:
+ statMsg = 'eNB showed ' + str(dropNotEnoughRBs) + ' "dropping, not enough RBs" message(s)'
+ logging.debug('\u001B[1;30;43m ' + statMsg + ' \u001B[0m')
+ htmleNBFailureMsg += statMsg + '\n'
+ if rrcSetupComplete > 0:
+ rrcMsg = nodeB_prefix + 'NB completed ' + str(rrcSetupComplete) + ' RRC Connection Setup(s)'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ rrcMsg = ' -- ' + str(rrcSetupComplete) + ' were completed'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ if rrcReleaseRequest > 0:
+ rrcMsg = nodeB_prefix + 'NB requested ' + str(rrcReleaseRequest) + ' RRC Connection Release(s)'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ if rrcReconfigRequest > 0 or rrcReconfigComplete > 0:
+ rrcMsg = nodeB_prefix + 'NB requested ' + str(rrcReconfigRequest) + ' RRC Connection Reconfiguration(s)'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ rrcMsg = ' -- ' + str(rrcReconfigComplete) + ' were completed'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ if rrcReestablishRequest > 0 or rrcReestablishComplete > 0 or rrcReestablishReject > 0:
+ rrcMsg = nodeB_prefix + 'NB requested ' + str(rrcReestablishRequest) + ' RRC Connection Reestablishment(s)'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ rrcMsg = ' -- ' + str(rrcReestablishComplete) + ' were completed'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ rrcMsg = ' -- ' + str(rrcReestablishReject) + ' were rejected'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ if self.eNBmbmsEnables[int(self.eNB_instance)]:
+ if mbmsRequestMsg > 0:
+ rrcMsg = 'eNB requested ' + str(mbmsRequestMsg) + ' times the RLC for MBMS USER-PLANE'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ if X2HO_inNbProcedures > 0:
+ rrcMsg = 'eNB completed ' + str(X2HO_inNbProcedures) + ' X2 Handover Connection procedure(s)'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ if X2HO_outNbProcedures > 0:
+ rrcMsg = 'eNB completed ' + str(X2HO_outNbProcedures) + ' X2 Handover Release procedure(s)'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ if self.eNBOptions[int(self.eNB_instance)] != '':
+ res1 = re.search('drx_Config_present prSetup', self.eNBOptions[int(self.eNB_instance)])
+ if res1 is not None:
+ if cdrxActivationMessageCount > 0:
+ rrcMsg = 'eNB activated the CDRX Configuration for ' + str(cdrxActivationMessageCount) + ' time(s)'
+ logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ else:
+ rrcMsg = 'eNB did NOT ACTIVATE the CDRX Configuration'
+ logging.debug('\u001B[1;37;43m ' + rrcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rrcMsg + '\n'
+ if rachCanceledProcedure > 0:
+ rachMsg = nodeB_prefix + 'NB cancelled ' + str(rachCanceledProcedure) + ' RA procedure(s)'
+ logging.debug('\u001B[1;30;43m ' + rachMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rachMsg + '\n'
+ if isRRU:
+ if isSlave:
+ if slaveReceivesFrameResyncCmd:
+ rruMsg = 'Slave RRU received the RRU_frame_resynch command from RAU'
+ logging.debug('\u001B[1;30;43m ' + rruMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rruMsg + '\n'
+ else:
+ rruMsg = 'Slave RRU DID NOT receive the RRU_frame_resynch command from RAU'
+ logging.debug('\u001B[1;37;41m ' + rruMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rruMsg + '\n'
+ self.prematureExit(True)
+ return CONST.ENB_PROCESS_SLAVE_RRU_NOT_SYNCED
+ if foundSegFault:
+ logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with a Segmentation Fault! \u001B[0m')
+ if self.htmlObj is not None:
+ self.htmlObj.SetHmleNBFailureMsg(htmleNBFailureMsg)
+ return CONST.ENB_PROCESS_SEG_FAULT
+ if foundAssertion:
+ logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB ended with an assertion! \u001B[0m')
+ htmleNBFailureMsg += msgAssertion
+ if self.htmlObj is not None:
+ self.htmlObj.SetHmleNBFailureMsg(htmleNBFailureMsg)
+ return CONST.ENB_PROCESS_ASSERTION
+ if foundRealTimeIssue:
+ logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB faced real time issues! \u001B[0m')
+ htmleNBFailureMsg += nodeB_prefix + 'NB faced real time issues!\n'
+ #return CONST.ENB_PROCESS_REALTIME_ISSUE
+ if rlcDiscardBuffer > 0:
+ rlcMsg = nodeB_prefix + 'NB RLC discarded ' + str(rlcDiscardBuffer) + ' buffer(s)'
+ logging.debug('\u001B[1;37;41m ' + rlcMsg + ' \u001B[0m')
+ htmleNBFailureMsg += rlcMsg + '\n'
+ if self.htmlObj is not None:
+ self.htmlObj.SetHmleNBFailureMsg(htmleNBFailureMsg)
+ return CONST.ENB_PROCESS_REALTIME_ISSUE
+ if self.htmlObj is not None:
+ self.htmlObj.SetHmleNBFailureMsg(htmleNBFailureMsg)
+ return 0
diff --git a/ci-scripts/sshconnection.py b/ci-scripts/sshconnection.py
new file mode 100644
index 0000000000000000000000000000000000000000..68a1d7836c78cf8a6b306736ee0d9685ae48a450
--- /dev/null
+++ b/ci-scripts/sshconnection.py
@@ -0,0 +1,217 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements. See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# * contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+# Required Python Version
+# Python 3.x
+#
+# Required Python Package
+# pexpect
+#---------------------------------------------------------------------
+
+#-----------------------------------------------------------
+# Import
+#-----------------------------------------------------------
+import pexpect # pexpect
+import logging
+import time # sleep
+import re
+import sys
+
+#-----------------------------------------------------------
+# Class Declaration
+#-----------------------------------------------------------
+class SSHConnection():
+ def __init__(self):
+ self.ssh = ''
+ self.picocom_closure = False
+
+ def disablePicocomClosure(self):
+ self.picocom_closure = False
+
+ def enablePicocomClosure(self):
+ self.picocom_closure = True
+
+ def open(self, ipaddress, username, password):
+ count = 0
+ connect_status = False
+ while count < 4:
+ self.ssh = pexpect.spawn('ssh', [username + '@' + ipaddress], timeout = 5)
+ self.sshresponse = self.ssh.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', 'Last login', pexpect.EOF, pexpect.TIMEOUT])
+ if self.sshresponse == 0:
+ self.ssh.sendline('yes')
+ self.ssh.expect('password:')
+ self.ssh.sendline(password)
+ self.sshresponse = self.ssh.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if self.sshresponse == 0:
+ count = 10
+ connect_status = True
+ else:
+ logging.debug('self.sshresponse = ' + str(self.sshresponse))
+ elif self.sshresponse == 1:
+ self.ssh.sendline(password)
+ self.sshresponse = self.ssh.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if self.sshresponse == 0:
+ count = 10
+ connect_status = True
+ else:
+ logging.debug('self.sshresponse = ' + str(self.sshresponse))
+ elif self.sshresponse == 2:
+ # Checking if we are really on the remote client defined by its IP address
+ self.command('stdbuf -o0 ifconfig | egrep --color=never "inet addr:|inet "', '\$', 5)
+ result = re.search(str(ipaddress), str(self.ssh.before))
+ if result is None:
+ self.close()
+ else:
+ count = 10
+ connect_status = True
+ else:
+ # debug output
+ logging.debug(str(self.ssh.before))
+ logging.debug('self.sshresponse = ' + str(self.sshresponse))
+ # adding a tempo when failure
+ if not connect_status:
+ time.sleep(1)
+ count += 1
+ if connect_status:
+ pass
+ else:
+ sys.exit('SSH Connection Failed')
+
+ def command(self, commandline, expectedline, timeout):
+ logging.debug(commandline)
+ self.ssh.timeout = timeout
+ self.ssh.sendline(commandline)
+ self.sshresponse = self.ssh.expect([expectedline, pexpect.EOF, pexpect.TIMEOUT])
+ if self.sshresponse == 0:
+ return 0
+ elif self.sshresponse == 1:
+ logging.debug('\u001B[1;37;41m Unexpected EOF \u001B[0m')
+ logging.debug('Expected Line : ' + expectedline)
+ logging.debug(str(self.ssh.before))
+ sys.exit(self.sshresponse)
+ elif self.sshresponse == 2:
+ logging.debug('\u001B[1;37;41m Unexpected TIMEOUT \u001B[0m')
+ logging.debug('Expected Line : ' + expectedline)
+ result = re.search('ping |iperf |picocom', str(commandline))
+ if result is None:
+ logging.debug(str(self.ssh.before))
+ sys.exit(self.sshresponse)
+ else:
+ return -1
+ else:
+ logging.debug('\u001B[1;37;41m Unexpected Others \u001B[0m')
+ logging.debug('Expected Line : ' + expectedline)
+ sys.exit(self.sshresponse)
+
+ def close(self):
+ self.ssh.timeout = 5
+ self.ssh.sendline('exit')
+ self.sshresponse = self.ssh.expect([pexpect.EOF, pexpect.TIMEOUT])
+ if self.sshresponse == 0:
+ pass
+ elif self.sshresponse == 1:
+ if not self.picocom_closure:
+ logging.debug('\u001B[1;37;41m Unexpected TIMEOUT during closing\u001B[0m')
+ else:
+ logging.debug('\u001B[1;37;41m Unexpected Others during closing\u001B[0m')
+
+ def copyin(self, ipaddress, username, password, source, destination):
+ count = 0
+ copy_status = False
+ logging.debug('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination)
+ while count < 10:
+ scp_spawn = pexpect.spawn('scp '+ username + '@' + ipaddress + ':' + source + ' ' + destination, timeout = 100)
+ scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if scp_response == 0:
+ scp_spawn.sendline('yes')
+ scp_spawn.expect('password:')
+ scp_spawn.sendline(password)
+ scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if scp_response == 0:
+ count = 10
+ copy_status = True
+ else:
+ logging.debug('1 - scp_response = ' + str(scp_response))
+ elif scp_response == 1:
+ scp_spawn.sendline(password)
+ scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if scp_response == 0 or scp_response == 3:
+ count = 10
+ copy_status = True
+ else:
+ logging.debug('2 - scp_response = ' + str(scp_response))
+ elif scp_response == 2:
+ count = 10
+ copy_status = True
+ else:
+ logging.debug('3 - scp_response = ' + str(scp_response))
+ # adding a tempo when failure
+ if not copy_status:
+ time.sleep(1)
+ count += 1
+ if copy_status:
+ return 0
+ else:
+ return -1
+
+ def copyout(self, ipaddress, username, password, source, destination):
+ count = 0
+ copy_status = False
+ logging.debug('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination)
+ while count < 4:
+ scp_spawn = pexpect.spawn('scp ' + source + ' ' + username + '@' + ipaddress + ':' + destination, timeout = 100)
+ scp_response = scp_spawn.expect(['Are you sure you want to continue connecting (yes/no)?', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if scp_response == 0:
+ scp_spawn.sendline('yes')
+ scp_spawn.expect('password:')
+ scp_spawn.sendline(password)
+ scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if scp_response == 0:
+ count = 10
+ copy_status = True
+ else:
+ logging.debug('1 - scp_response = ' + str(scp_response))
+ elif scp_response == 1:
+ scp_spawn.sendline(password)
+ scp_response = scp_spawn.expect(['\$', 'Permission denied', 'password:', pexpect.EOF, pexpect.TIMEOUT])
+ if scp_response == 0 or scp_response == 3:
+ count = 10
+ copy_status = True
+ else:
+ logging.debug('2 - scp_response = ' + str(scp_response))
+ elif scp_response == 2:
+ count = 10
+ copy_status = True
+ else:
+ logging.debug('3 - scp_response = ' + str(scp_response))
+ # adding a tempo when failure
+ if not copy_status:
+ time.sleep(1)
+ count += 1
+ if copy_status:
+ pass
+ else:
+ sys.exit('SCP failed')
+
+ def getBefore(self):
+ return str(self.ssh.before)
diff --git a/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml b/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
index 680f09c435e007fef24c78461f005756f225118a..611492b0bcdcf54e29eb18fabb89b8561dbfa489 100644
--- a/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band13_test_10mhz_tm1.xml
@@ -24,7 +24,7 @@
<htmlTabRef>test-lte-m-10-tm1</htmlTabRef>
<htmlTabName>Test-LTE-M-10MHz-TM1</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
- <repeatCount>2</repeatCount>
+ <repeatCount>1</repeatCount>
<TestCaseRequestedList>
030201
040102
diff --git a/ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml b/ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
index 2a035396c5753717c53960009ff3499e6996c47e..09aa0b04a2a8fbdfbb85cb3a521dc5451e9ac35e 100644
--- a/ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
@@ -25,7 +25,7 @@
<htmlTabRef>test-05-tm2</htmlTabRef>
<htmlTabName>Test-05MHz-TM2</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
- <repeatCount>3</repeatCount>
+ <repeatCount>2</repeatCount>
<TestCaseRequestedList>
030201
040101
diff --git a/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml b/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml
index 22f8b632660ff8e2c729da0337d2684131230c2f..8116b9dcdf316a0f36cd5bfc48122b165416c4ab 100644
--- a/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/inria/enb_usrp210_band7_x2_ho_test_05Mhz_tm1.xml
@@ -72,7 +72,11 @@
<testCase id="030105">
<class>Initialize_eNB</class>
<desc>Initialize eNB #1 (FDD/Band7/5MHz)</desc>
+<<<<<<< HEAD
+ <Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --THREAD_STRUCT.[0].parallel_config PARALLEL_RU_L1_TRX_SPLIT --eNBs.[0].enable_measurement_reports yes --eNBs.[0].enable_x2 yes --eNBs.[0].target_enb_x2_ip_address.[0].ipv4 CI_RCC_IP_ADDR --eNBs.[0].target_enb_x2_ip_address.[0].preference ipv4 --eNBs.[0].eNB_ID 0xe01 --eNBs.[0].component_carriers.[0].Nid_cell 1 --eNBs.[0].nr_cellid 98765</Initialize_eNB_args>
+=======
<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.slave.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --THREAD_STRUCT.[0].parallel_config PARALLEL_RU_L1_TRX_SPLIT --eNBs.[0].enable_measurement_reports yes --eNBs.[0].enable_x2 yes --eNBs.[0].nr_cellid 98765</Initialize_eNB_args>
+>>>>>>> origin/develop_inria_ci_deployment
<eNB_instance>1</eNB_instance>
<eNB_serverId>1</eNB_serverId>
</testCase>
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index f155d3061db9a80041b292432d8f90b18f210d45..eab3d5a068c7db0378c42efa58067e8769188874 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -727,7 +727,6 @@ Message("CPU_Affinity flag is ${CPU_AFFINITY}")
##############################################################
add_boolean_option(NO_RRM True "DO WE HAVE A RADIO RESSOURCE MANAGER: NO")
-add_boolean_option(RRC_DEFAULT_RAB_IS_AM False "set the RLC mode to AM for the default bearer")
add_boolean_option(OAI_NW_DRIVER_TYPE_ETHERNET False "????")
add_boolean_option(DEADLINE_SCHEDULER True "Use the Linux scheduler SCHED_DEADLINE: kernel >= 3.14")
@@ -828,7 +827,7 @@ add_boolean_option(TRACE_RLC_UM_TX_STATUS False "TRACE for RLC UM, TO BE CHANGE
##########################
# RRC LAYER OPTIONS
##########################
-add_boolean_option(RRC_DEFAULT_RAB_IS_AM False "Otherwise it is UM, configure params are actually set in rrc_eNB.c:rrc_eNB_generate_defaultRRCConnectionReconfiguration(...)")
+add_boolean_option(RRC_DEFAULT_RAB_IS_AM True "set the RLC mode to AM for the default bearer, otherwise it is UM.")
##########################
@@ -884,6 +883,7 @@ include_directories("${OPENAIR2_DIR}/LAYER2/PDCP_v10.1.0")
include_directories("${OPENAIR2_DIR}/RRC/LTE/MESSAGES")
include_directories("${OPENAIR2_DIR}/RRC/LTE")
include_directories("${OPENAIR_DIR}/common/utils")
+include_directories("${OPENAIR_DIR}/common/utils/collection")
include_directories("${OPENAIR_DIR}/common/utils/ocp_itti")
include_directories("${OPENAIR3_DIR}/NAS/COMMON")
include_directories("${OPENAIR3_DIR}/NAS/COMMON/API/NETWORK")
@@ -1590,6 +1590,7 @@ add_library(PHY_COMMON ${PHY_SRC_COMMON})
add_dependencies(PHY_COMMON rrc_flag)
add_dependencies(PHY_COMMON dfts)
add_library(PHY ${PHY_SRC})
+
add_dependencies(PHY rrc_flag)
add_library(PHY_UE ${PHY_SRC_UE})
add_dependencies(PHY_UE rrc_flag)
@@ -1640,7 +1641,7 @@ set(NR_RRC_DIR ${OPENAIR2_DIR}/RRC/NR)
set(NR_UE_RRC_DIR ${OPENAIR2_DIR}/RRC/NR_UE)
set(PDCP_DIR ${OPENAIR2_DIR}/LAYER2/PDCP_v10.1.0)
-set(LTE_RLC_SRC
+set(RLC_V1
${RLC_AM_DIR}/rlc_am.c
${RLC_AM_DIR}/rlc_am_init.c
${RLC_AM_DIR}/rlc_am_timer_poll_retransmit.c
@@ -1670,6 +1671,17 @@ set(LTE_RLC_SRC
${RLC_DIR}/rlc_mpls.c
)
+set(RLC_V2
+ ${OPENAIR2_DIR}/LAYER2/rlc_v2/rlc_oai_api.c
+ ${OPENAIR2_DIR}/LAYER2/rlc_v2/asn1_utils.c
+ ${OPENAIR2_DIR}/LAYER2/rlc_v2/rlc_ue_manager.c
+ ${OPENAIR2_DIR}/LAYER2/rlc_v2/rlc_entity.c
+ ${OPENAIR2_DIR}/LAYER2/rlc_v2/rlc_entity_am.c
+ ${OPENAIR2_DIR}/LAYER2/rlc_v2/rlc_entity_um.c
+ ${OPENAIR2_DIR}/LAYER2/rlc_v2/rlc_pdu.c
+ ${OPENAIR2_DIR}/LAYER2/rlc_v2/rlc_sdu.c
+ )
+
set(NR_RLC_SRC
${OPENAIR2_DIR}/LAYER2/nr_rlc/asn1_utils.c
${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_entity.c
@@ -1704,7 +1716,7 @@ set(L2_SRC
)
set(L2_LTE_SRC
- ${LTE_RLC_SRC}
+ ${RLC_V2}
)
set(L2_NR_SRC
@@ -1741,7 +1753,7 @@ set(LTE_NR_L2_SRC_UE
${PDCP_DIR}/pdcp_util.c
${PDCP_DIR}/pdcp_security.c
${PDCP_DIR}/pdcp_netlink.c
- ${LTE_RLC_SRC}
+ ${RLC_V2}
)
set(NR_L2_SRC_UE
@@ -2481,6 +2493,7 @@ add_executable(lte-softmodem
${OPENAIR_TARGETS}/RT/USER/lte-ru.c
${OPENAIR_TARGETS}/RT/USER/ru_control.c
${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
+ ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
${OPENAIR_DIR}/executables/softmodem-common.c
${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
@@ -2516,6 +2529,43 @@ target_link_libraries (lte-softmodem pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_L
target_link_libraries (lte-softmodem ${LIB_LMS_LIBRARIES})
target_link_libraries (lte-softmodem ${T_LIB})
+
+add_executable(ocp-enb
+ ${OPENAIR_DIR}/executables/main-ocp.c
+ ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
+ ${OPENAIR_DIR}/executables/softmodem-common.c
+ ${OPENAIR_DIR}/executables/main-fs6.c
+ ${OPENAIR_DIR}/executables/transport_split.c
+ ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
+ ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
+ ${OPENAIR_TARGETS}/COMMON/create_tasks.c
+ ${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c
+ ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
+ ${OPENAIR_TARGETS}/ARCH/COMMON/record_player.c
+ ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+ ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
+ ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
+ ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
+ ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
+ ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
+ ${OPENAIR_DIR}/common/utils/utils.c
+ ${OPENAIR_DIR}/common/utils/system.c
+ ${GTPU_need_ITTI}
+ ${XFORMSINTERFACE_SOURCE}
+ ${T_SOURCE}
+ ${CONFIG_SOURCES}
+ ${SHLIB_LOADER_SOURCES}
+ )
+add_dependencies(ocp-enb rrc_flag s1ap_flag x2_flag oai_iqplayer)
+
+target_link_libraries (ocp-enb
+ -Wl,--start-group
+ RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB SCHED_RU_LIB
+ PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB LFDS7
+ ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB}
+ -Wl,--end-group z dl)
+target_link_libraries (ocp-enb ${LIBXML2_LIBRARIES} pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${LIB_LMS_LIBRARIES} ${T_LIB})
+
add_executable(cu_test
${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/cu_test.c
${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/proto_agent_handler.c
@@ -2856,6 +2906,7 @@ foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim pr
add_executable(${myExe}
${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
+ ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
${OPENAIR_DIR}/common/utils/backtrace.c
${OPENAIR_DIR}/common/utils/system.c
${XFORMS_SOURCE}
diff --git a/cmake_targets/nas_sim_tools/CMakeLists.txt b/cmake_targets/nas_sim_tools/CMakeLists.txt
index c1a0bb419b74666eccc6a9c522a2394e4a688695..308c71be4c2d3112234d6066191d6d6779aa4610 100644
--- a/cmake_targets/nas_sim_tools/CMakeLists.txt
+++ b/cmake_targets/nas_sim_tools/CMakeLists.txt
@@ -14,6 +14,7 @@ set(CMAKE_C_FLAGS
set(OPENAIR_DIR $ENV{OPENAIR_DIR})
set(OPENAIR3_DIR $ENV{OPENAIR_DIR}/openair3)
+include_directories (${OPENAIR_DIR}/openair2/COMMON)
set(CONF2UEDATA_LIB_SRC
${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_emm.c
diff --git a/cmake_targets/phy_simulators/CMakeLists.txt b/cmake_targets/phy_simulators/CMakeLists.txt
index b43f7dd389717774b6462cc2c0e4564dc0807b96..5f2d34883eea95e1905f177a53e44f82635ee7d3 100644
--- a/cmake_targets/phy_simulators/CMakeLists.txt
+++ b/cmake_targets/phy_simulators/CMakeLists.txt
@@ -1,13 +1,19 @@
cmake_minimum_required(VERSION 2.8)
-set(PACKAGE_NAME "unitary_tests_simulators")
-set(PHYSIM True)
-set(RF_BOARD None)
-set(XFORMS True)
-set(ENABLE_ITTI True)
-set(DEBUG_PHY False)
-set(MU_RECIEVER False)
-set(NAS_UE False)
-set(MESSAGE_CHART_GENERATOR False)
-set(RRC_ASN1_VERSION "Rel15")
-set(T_TRACER True)
-include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
\ No newline at end of file
+set ( CMAKE_BUILD_TYPE )
+set ( CFLAGS_PROCESSOR_USER "" )
+set ( UE_EXPANSION False )
+set ( PRE_SCD_THREAD False )
+set ( UESIM_EXPANSION False )
+set ( ENABLE_VCD_FIFO False )
+set ( RF_BOARD "OAI_USRP")
+set ( TRANSP_PRO "None")
+set ( PACKAGE_NAME "")
+set ( DEADLINE_SCHEDULER "False" )
+set ( CPU_AFFINITY "False" )
+set ( T_TRACER True )
+set ( UE_AUTOTEST_TRACE False )
+set ( UE_DEBUG_TRACE False )
+set ( UE_TIMING_TRACE False )
+set ( USRP_REC_PLAY False )
+set ( SKIP_SHARED_LIB_FLAG False )
+include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
diff --git a/common/utils/T/tracer/hacks/pilot_timeplot.sh b/common/utils/T/tracer/hacks/pilot_timeplot.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0d9c4694a627e97bd4d9570de6b21627893971a4
--- /dev/null
+++ b/common/utils/T/tracer/hacks/pilot_timeplot.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# use UP and DOWN arrow keys to scroll the view displayed by timeplot
+
+while read -n 1 key
+do
+ case "$key" in
+ 'B' )
+ kill -SIGUSR1 `ps aux|grep timeplot|grep -v grep|grep -v sh|tr -s ' ' :|cut -f 2 -d :`
+ ;;
+ 'A' )
+ kill -SIGUSR2 `ps aux|grep timeplot|grep -v grep|grep -v sh|tr -s ' ' :|cut -f 2 -d :`
+ ;;
+ esac
+done
diff --git a/common/utils/T/tracer/hacks/time_meas.c b/common/utils/T/tracer/hacks/time_meas.c
index 6bd29503011fb92e306dd10a7dd6539ebd0ee0f9..408189cd80c210d7ce0dcf7cb17a48244336a32f 100644
--- a/common/utils/T/tracer/hacks/time_meas.c
+++ b/common/utils/T/tracer/hacks/time_meas.c
@@ -13,7 +13,8 @@ void usage(void)
"options:\n"
" -d <database file> this option is mandatory\n"
" -ip <host> connect to given IP address (default %s)\n"
-" -p <port> connect to given port (default %d)\n",
+" -p <port> connect to given port (default %d)\n"
+" -e <event> event to trace (default VCD_FUNCTION_ENB_DLSCH_ULSCH_SCHEDULER)\n",
DEFAULT_REMOTE_IP,
DEFAULT_REMOTE_PORT
);
@@ -47,6 +48,7 @@ int main(int n, char **v)
int ev_fun;
int start_valid = 0;
struct timespec start_time, stop_time, delta_time;
+ char *name = "VCD_FUNCTION_ENB_DLSCH_ULSCH_SCHEDULER";
for (i = 1; i < n; i++) {
if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
@@ -55,6 +57,7 @@ int main(int n, char **v)
if (!strcmp(v[i], "-ip")) { if (i > n-2) usage(); ip = v[++i]; continue; }
if (!strcmp(v[i], "-p"))
{ if (i > n-2) usage(); port = atoi(v[++i]); continue; }
+ if (!strcmp(v[i], "-e")) { if (i > n-2) usage(); name = v[++i]; continue; }
usage();
}
@@ -71,10 +74,9 @@ int main(int n, char **v)
is_on = calloc(number_of_events, sizeof(int));
if (is_on == NULL) abort();
- on_off(database, "VCD_FUNCTION_ENB_DLSCH_ULSCH_SCHEDULER", is_on, 1);
+ on_off(database, name, is_on, 1);
- ev_fun = event_id_from_name(database,
- "VCD_FUNCTION_ENB_DLSCH_ULSCH_SCHEDULER");
+ ev_fun = event_id_from_name(database, name);
socket = connect_to(ip, port);
diff --git a/common/utils/T/tracer/hacks/timeplot.c b/common/utils/T/tracer/hacks/timeplot.c
index 79905d16f99e75e5f17f6417f26afe9a9a61714e..a1ddb2a1c923ffc3df47efec0aad65e98a7a6095 100644
--- a/common/utils/T/tracer/hacks/timeplot.c
+++ b/common/utils/T/tracer/hacks/timeplot.c
@@ -28,6 +28,7 @@ int bins[50];
#define N 1000
int data[N];
+long start = 100;
void plot(void)
{
@@ -45,7 +46,8 @@ void plot(void)
if (data[i] < vmin) vmin = data[i];
if (data[i] > vmax) vmax = data[i];
vavg += data[i];
- int ms2 = data[i]/binsize_ns;
+ int ms2 = (data[i] - start * 1000)/binsize_ns;
+ if (ms2 < 0) ms2 = 0;
if (ms2 > 49) ms2 = 49;
bins[ms2]++;
if (bins[ms2] > max) max = bins[ms2];
@@ -55,7 +57,7 @@ void plot(void)
GOTO(1,1);
for (i = 0; i < 50; i++) {
- double binend = (i+1) * binsize_ns / 1000.;
+ double binend = (i+1) * binsize_ns / 1000. + start;
int k;
int width = bins[i] * 70 / max;
/* force at least width of 1 if some point is there */
@@ -68,11 +70,23 @@ void plot(void)
printf("min %d ns max %d ns avg %ld ns\n", vmin, vmax, vavg);
}
+void up(int x)
+{
+ start += 5;
+}
+
+void down(int x)
+{
+ start -= 5;
+}
+
int main(void)
{
int i;
int pos = 0;
signal(SIGINT, sig);
+ signal(SIGUSR1, up);
+ signal(SIGUSR2, down);
RESET();
HIDE_CURSOR();
while (!feof(stdin)) {
diff --git a/common/utils/ocp_itti/intertask_interface.cpp b/common/utils/ocp_itti/intertask_interface.cpp
index 89e19074bf96a24c911b523a98c56bcf31612309..3d4d356dcf68aa5fb3b629cec010262952b4ec90 100644
--- a/common/utils/ocp_itti/intertask_interface.cpp
+++ b/common/utils/ocp_itti/intertask_interface.cpp
@@ -1,12 +1,32 @@
/*
- Author: Laurent THOMAS, Open Cells
- copyleft: OpenAirInterface Software Alliance and it's licence
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
*/
+
#include <vector>
#include <map>
#include <sys/eventfd.h>
+extern "C" {
#include <intertask_interface.h>
#include <common/utils/system.h>
@@ -35,7 +55,6 @@ typedef struct task_list_s {
int timer_expired(int fd);
task_list_t tasks[TASK_MAX];
-extern "C" {
void *pool_buffer_init (void) {
return 0;
}
@@ -86,6 +105,9 @@ extern "C" {
temp->ittiMsgHeader.messageId = message_id;
temp->ittiMsgHeader.originTaskId = origin_task_id;
temp->ittiMsgHeader.ittiMsgSize = size;
+ temp->ittiMsgHeader.destinationTaskId=TASK_UNKNOWN;
+ temp->ittiMsgHeader.instance=0;
+ temp->ittiMsgHeader.lte_time={0};
return temp;
//return itti_alloc_new_message_sized(origin_task_id, message_id, messages_info[message_id].size);
}
diff --git a/common/utils/ocp_itti/intertask_interface.h b/common/utils/ocp_itti/intertask_interface.h
index 52c733752de92d885a230330dce385d3e56f558e..0cd25ee23195a688be61ef3642f85e3f3761d5b6 100644
--- a/common/utils/ocp_itti/intertask_interface.h
+++ b/common/utils/ocp_itti/intertask_interface.h
@@ -1,7 +1,26 @@
/*
- Author: Laurent THOMAS, Open Cells
- Copyleft: OpenAirInterface software alliance and it's license
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
*/
+
#ifndef INTERTASK_INTERFACE_H_
#define INTERTASK_INTERFACE_H_
#include <stdint.h>
@@ -275,7 +294,7 @@ typedef struct {
//TASK_DEF(TASK_RRC_ENB, TASK_PRIORITY_MED, 200, NULL, NULL)
//TASK_DEF(TASK_GTPV1_U, TASK_PRIORITY_MED, 1000,NULL, NULL)
//TASK_DEF(TASK_UDP, TASK_PRIORITY_MED, 1000, NULL, NULL)
-
+void * rrc_enb_process_msg(void*);
#define FOREACH_TASK(TASK_DEF) \
TASK_DEF(TASK_UNKNOWN, TASK_PRIORITY_MED, 50, NULL, NULL) \
TASK_DEF(TASK_TIMER, TASK_PRIORITY_MED, 10, NULL, NULL) \
diff --git a/common/utils/system.c b/common/utils/system.c
index 3a8fe7be3d82260448071d915af94bbc28eb2147..1bd5c7d39bc500d979bd8d258c8fa7dd16a52b95 100644
--- a/common/utils/system.c
+++ b/common/utils/system.c
@@ -243,6 +243,8 @@ void configure_linux(void) {
// Set CPU frequency to it's maximum
if ( 0 != system("for d in /sys/devices/system/cpu/cpu[0-9]*; do cat $d/cpufreq/cpuinfo_max_freq > $d/cpufreq/scaling_min_freq; done"))
- LOG_W(HW,"Can't set cpu frequency\n");
-
+ LOG_E(HW,"Can't set cpu frequency\n");
+
+ mlockall(MCL_CURRENT | MCL_FUTURE);
+
}
diff --git a/common/utils/threadPool/measurement_display.c b/common/utils/threadPool/measurement_display.c
index 8f6e2c239a231c41a0f4c2f151dd3fcee468bf9b..0f5a3e0f69c81b2860b7275ec30a932693aaba5c 100644
--- a/common/utils/threadPool/measurement_display.c
+++ b/common/utils/threadPool/measurement_display.c
@@ -1,7 +1,26 @@
/*
- Author: Laurent THOMAS, Open Cells
- copyleft: OpenAirInterface Software Alliance and it's licence
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
*/
+
#include <common/utils/simple_executable.h>
#include "thread-pool.h"
diff --git a/common/utils/threadPool/thread-pool.c b/common/utils/threadPool/thread-pool.c
index dd3d16d717bdf37565e85a1e7c1cfc3d5a744e41..cbb2dbe3d91742afc2375ff3fd48f90b20c48404 100644
--- a/common/utils/threadPool/thread-pool.c
+++ b/common/utils/threadPool/thread-pool.c
@@ -1,8 +1,27 @@
/*
- Author: Laurent THOMAS, Open Cells
- copyleft: OpenAirInterface Software Alliance and it's licence
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
*/
+
#define _GNU_SOURCE
#include <sched.h>
#include <sys/types.h>
diff --git a/common/utils/threadPool/thread-pool.h b/common/utils/threadPool/thread-pool.h
index 9a2681a828ea312c57a4f79a6d6de37c0da7e52d..0ed8715811e1e7345d0600e7b332a176ff20a9d5 100644
--- a/common/utils/threadPool/thread-pool.h
+++ b/common/utils/threadPool/thread-pool.h
@@ -1,8 +1,27 @@
/*
- Author: Laurent THOMAS, Open Cells
- copyleft: OpenAirInterface Software Alliance and it's licence
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
*/
+
#ifndef THREAD_POOL_H
#define THREAD_POOL_H
#include <stdbool.h>
@@ -217,11 +236,11 @@ static inline void pushTpool(tpool_t *t, notifiedFIFO_elt_t *msg) {
static inline notifiedFIFO_elt_t *pullTpool(notifiedFIFO_t *responseFifo, tpool_t *t) {
notifiedFIFO_elt_t *msg= pullNotifiedFIFO(responseFifo);
-
+ AssertFatal(t->traceFd, "Thread pool used while not initialized");
if (t->measurePerf)
msg->returnTime=rdtsc();
- if (t->traceFd >= 0)
+ if (t->traceFd > 0)
if(write(t->traceFd, msg, sizeof(*msg)));
return msg;
@@ -229,7 +248,7 @@ static inline notifiedFIFO_elt_t *pullTpool(notifiedFIFO_t *responseFifo, tpool_
static inline notifiedFIFO_elt_t *tryPullTpool(notifiedFIFO_t *responseFifo, tpool_t *t) {
notifiedFIFO_elt_t *msg= pollNotifiedFIFO(responseFifo);
-
+ AssertFatal(t->traceFd, "Thread pool used while not initialized");
if (msg == NULL)
return NULL;
diff --git a/doc/L2NFAPI.md b/doc/L2NFAPI.md
index 4dcaaef3bcf8771a4ae8108b11dd31dcadedd79c..137e4847e4bddbde1eace9ec9806793ad4bab8e8 100644
--- a/doc/L2NFAPI.md
+++ b/doc/L2NFAPI.md
@@ -14,19 +14,24 @@
This simulator allows to test L2 and above Layers using the nFAPI interface.
-**This simulator is available starting the `v1.0.0` release on the `master` branch.**
-
-Currently the only validated deployment by CI and developers is *with S1 interface and eNB / UEs are on the same machine*.
-
-Others deployments will be supported later after bug fixes and validation in the CI process.
-
-1. [With S1 -- eNB and UE on same machine](L2NFAPI_S1.md)
+The UE executable is able to "simulate" multiple UEs in order to stimulate the scheduler in the eNB.
+**This simulator is available starting the `v1.0.0` release on the `master` branch.**
+Currently the Continuous Integration process is validating this simulator the following way:
+* the LTE modem executable is run on one host (in our CI deployment it is a **Xenial Virtual Machine**)
+* the UE(s) modem executable is run on another host (in our CI deployment it is also a **Xenial Virtual Machine**)
+* We are testing:
+ * in S1 mode (ie we are connected to a 3rd-party EPC)
+ * in noS1 mode (no need for an EPC)
+Normally it should be fine to run both executables on the same host using the `loopback` interface to communicate. **But we are not guaranting it**
+1. [With S1 -- eNB and UE on 2 hosts](L2NFAPI_S1.md)
+2. [No S1 -- eNB and UE on 2 hosts](L2NFAPI_NOS1.md)
+----
[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
diff --git a/doc/L2NFAPI_NOS1.md b/doc/L2NFAPI_NOS1.md
new file mode 100644
index 0000000000000000000000000000000000000000..bb4c32ec084bf2258657bfa0bb96d01253825807
--- /dev/null
+++ b/doc/L2NFAPI_NOS1.md
@@ -0,0 +1,349 @@
+<table style="border-collapse: collapse; border: none;">
+ <tr style="border-collapse: collapse; border: none;">
+ <td style="border-collapse: collapse; border: none;">
+ <a href="http://www.openairinterface.org/">
+ <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
+ </img>
+ </a>
+ </td>
+ <td style="border-collapse: collapse; border: none; vertical-align: center;">
+ <b><font size = "5">L2 nFAPI Simulator (no S1 Mode / 2-host deployment)</font></b>
+ </td>
+ </tr>
+</table>
+
+## Table of Contents ##
+
+1. [Environment](#1-environment)
+2. [Retrieve the OAI eNB-UE source code](#2-retrieve-the-oai-enb-ue-source-code)
+3. [Setup of the USIM information in UE folder](#3-setup-of-the-usim-information-in-ue-folder)
+4. [Setup of the Configuration files](#4-setup-of-the-configuration-files)
+ 1. [The eNB Configuration file](#41-the-enb-configuration-file)
+ 2. [The UE Configuration file](#42-the-ue-configuration-file)
+5. [Build OAI UE and eNodeB](#5-build-oai-ue-and-enodeb)
+6. [Start the eNB](#6-start-the-enb)
+7. [Start the UE](#7-start-the-ue)
+8. [Test with ping](#8-test-with-ping)
+9. [Limitations](#9-limitations)
+
+# 1. Environment #
+
+You may not have access to an EPC or you don't want to hassle to deploy one.
+
+2 servers are used in this deployment. You can use Virtual Machines instead of each server; like it is done in the CI process.
+
+* Machine B contains the OAI eNB executable (`lte-softmodem`)
+* Machine C contains the OAI UE(s) executable (`lte-uesoftmodem`)
+
+Example of L2 nFAPI Simulator testing environment:
+
+<img src="./images/L2-sim-noS1-2-host-deployment.png" alt="" border=3>
+
+Note that the IP addresses are indicative and need to be adapted to your environment.
+
+# 2. Retrieve the OAI eNB-UE source code #
+
+At the time of writing, the tag used in the `develop` branch to do this documentation was `2020.w16`.
+
+The tutorial should be valid for the `master` branch tags such as `v1.2.0` or `v1.2.1`. But you may face issues that could be fixed in newer `develop` tags.
+
+Please try to use the same commit ID on both eNB/UE hosts.
+
+```bash
+$ ssh sudousername@machineB
+git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git enb_folder
+cd enb_folder
+git checkout develop
+```
+
+```bash
+$ ssh sudousername@machineC
+git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git ue_folder
+cd ue_folder
+git checkout develop
+```
+
+# 3. Setup of the USIM information in UE folder #
+
+```bash
+$ ssh sudousername@machineC
+cd ue_folder
+# Edit openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf with your preferred editor
+```
+
+Edit the USIM information within this file in order to match the HSS database. They **HAVE TO** match:
+
+* PLMN+MSIN and IMSI of users table of HSS database **SHALL** be the same.
+* OPC of this file and OPC of users table of HSS database **SHALL** be the same.
+* USIM_API_K of this file and the key of users table of HSS database **SHALL** be the same.
+
+When testing multiple UEs, it is necessary to add other UEs information like described below for 2 Users. Only UE0 (first UE) information is written in the original file.
+
+```
+UE0:
+{
+ USER: {
+ IMEI="356113022094149";
+ MANUFACTURER="EURECOM";
+ MODEL="LTE Android PC";
+ PIN="0000";
+ };
+
+ SIM: {
+ MSIN="0000000001"; // <-- Modify here
+ USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
+ OPC="e734f8734007d6c5ce7a0508809e7e9c";
+ MSISDN="33611123456";
+ };
+...
+};
+// Copy the UE0 and edit
+UE1: // <- Edit here
+{
+ USER: {
+ IMEI="356113022094149";
+ MANUFACTURER="EURECOM";
+ MODEL="LTE Android PC";
+ PIN="0000";
+ };
+
+ SIM: {
+ MSIN="0000000002"; // <-- Modify here
+ USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
+ OPC="e734f8734007d6c5ce7a0508809e7e9c";
+ MSISDN="33611123456";
+ };
+...
+};
+```
+
+You can repeat the operation for as many users you want to test with.
+
+# 4. Setup of the Configuration files #
+
+**CAUTION: both proposed configuration files resides in the ci-scripts realm. You can copy them but you CANNOT push any modification on these 2 files as part of an MR without informing the CI team.**
+
+## 4.1. The eNB Configuration file ##
+
+```bash
+$ ssh sudousername@machineB
+cd enb_folder
+# Edit ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf with your preferred editor
+```
+
+First verify the nFAPI interface setup on the physical ethernet interface of machineB and put the proper IP addresses for both hosts.
+
+```
+MACRLCs = (
+ {
+ num_cc = 1;
+ local_s_if_name = "ens3"; // <-- HERE
+ remote_s_address = "192.168.122.169"; // <-- HERE
+ local_s_address = "192.168.122.31"; // <-- HERE
+ local_s_portc = 50001;
+ remote_s_portc = 50000;
+ local_s_portd = 50011;
+ remote_s_portd = 50010;
+ tr_s_preference = "nfapi";
+ tr_n_preference = "local_RRC";
+ }
+);
+```
+
+If you are testing more than 16 UEs, a proper setting on the RUs is necessary. **Note that this part is NOT present in the original configuration file**.
+
+```
+RUs = (
+ {
+ local_rf = "yes"
+ nb_tx = 1
+ nb_rx = 1
+ att_tx = 20
+ att_rx = 0;
+ bands = [38];
+ max_pdschReferenceSignalPower = -23;
+ max_rxgain = 116;
+ eNB_instances = [0];
+ }
+);
+```
+
+Last, the S1 interface shall be properly set.
+
+```
+ ////////// MME parameters:
+ mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; // replace with 192.168.122.195
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+ NETWORK_INTERFACES :
+ {
+ ENB_INTERFACE_NAME_FOR_S1_MME = "ens3"; // replace with the proper interface name
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31
+ ENB_INTERFACE_NAME_FOR_S1U = "ens3"; // replace with the proper interface name
+ ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31
+ ENB_PORT_FOR_S1U = 2152; # Spec 2152
+ ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31
+ ENB_PORT_FOR_X2C = 36422; # Spec 36422
+
+ };
+```
+
+## 4.2. The UE Configuration file ##
+
+```bash
+$ ssh sudousername@machineB
+cd ue_folder
+# Edit ci-scripts/conf_files/ue.nfapi.conf with your preferred editor
+```
+
+Verify the nFAPI interface setup on the loopback interface.
+
+```
+L1s = (
+ {
+ num_cc = 1;
+ tr_n_preference = "nfapi";
+ local_n_if_name = "ens3"; // <- HERE
+ remote_n_address = "192.168.122.31"; // <- HERE
+ local_n_address = "192.168.122.169"; // <- HERE
+ local_n_portc = 50000;
+ remote_n_portc = 50001;
+ local_n_portd = 50010;
+ remote_n_portd = 50011;
+ }
+);
+```
+
+# 5. Build OAI UE and eNodeB #
+
+See [Build documentation](./BUILD.md).
+
+# 6. Start the eNB #
+
+In the first terminal (the one you used to build the eNB):
+
+```bash
+$ ssh sudousername@machineB
+cd enb_folder/cmake_targets
+sudo -E ./ran_build/build/lte-softmodem -O ../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf --noS1 > enb.log 2>&1
+sleep 10
+ifconfig
+ens3 Link encap:Ethernet HWaddr XX:XX:XX:XX:XX:XX
+ inet addr:192.168.122.31 Bcast:192.168.122.255 Mask:255.255.255.0
+....
+oaitun_enb1 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:10.0.1.1 P-t-P:192.172.0.2 Mask:255.255.255.0
+....
+```
+
+If you don't use redirection, you can test but many logs are printed on the console and this may affect performance of the L2-nFAPI simulator.
+
+We do recommend the redirection in steady mode once your setup is correct.
+
+# 7. Start the UE #
+
+In the second terminal (the one you used to build the UE):
+
+```bash
+$ ssh sudousername@machineC
+cd ue_folder/cmake_targets
+# Test 64 UEs, 1 thread in FDD mode
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 --nokrnmod 1 > ue.log 2>&1
+# Test 64 UEs, 1 thread in TDD mode
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 --nokrnmod 1 -T 1 > ue.log 2>&1
+# The "-T 1" option means TDD config
+```
+
+- The number of UEs can set by using `--num-ues` option and the maximum UE number is 255 (with the `--mu*` options, otherwise 16).
+- The number of threads can set with the `--nums-ue-thread`. This number **SHALL NOT** be greater than the number of UEs.
+ * At the time of writing, it seems to be enough to run on a single thread.
+- The `--nokrnmod 1` option makes use of the preferred and supported tunnel interface.
+- How many UE that can be tested depends on hardware (server , PC, etc) performance in your environment.
+
+For example, running with 4 UEs:
+
+```bash
+$ ssh sudousername@machineC
+cd ue_folder/cmake_targets
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 --nokrnmod 1 > ue.log 2>&1
+sleep 10
+ifconfig
+ens3 Link encap:Ethernet HWaddr XX:XX:XX:XX:XX:XX
+ inet addr:192.168.122.169 Bcast:192.168.122.255 Mask:255.255.255.0
+....
+oaitun_ue1 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:10.0.1.2 P-t-P:192.172.0.2 Mask:255.255.255.0
+....
+oaitun_ue2 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:10.0.1.3 P-t-P:192.172.0.3 Mask:255.255.255.0
+....
+oaitun_ue3 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:10.0.1.4 P-t-P:192.172.0.4 Mask:255.255.255.0
+....
+oaitun_ue4 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:10.0.1.5 P-t-P:192.172.0.5 Mask:255.255.255.0
+....
+oaitun_uem1 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:10.0.2.2 P-t-P:10.0.2.2 Mask:255.255.255.0
+....
+....
+```
+
+Having the 4 oaitun_ue tunnel interfaces up and with an allocated address means the connection with EPC went alright.
+
+# 8. Test with ping #
+
+In a third terminal, after around 10 seconds, the UE(s) shall be connected to the eNB: Check with ifconfig
+
+```bash
+$ ssh sudousername@machineB
+# Ping UE1 IP address based on the EPC pool used: in this example:
+ping -I oaitun_enb1 -c 20 10.0.1.2
+# Ping UE4 IP address based on the EPC pool used: in this example:
+ping -I oaitun_enb1 -c 20 10.0.1.5
+```
+
+Ping from the UE side:
+
+```bash
+$ ssh sudousername@machineC
+ping -I oaitun_ue1 -c 20 10.0.1.1
+ping -I oaitun_ue3 -c 20 10.0.1.1
+```
+
+iperf operations can also be performed.
+
+DL traffic:
+
+```bash
+$ ssh sudousername@machineC
+iperf -B 10.0.1.2 -u -s -i 1 -fm -p 5002
+$ ssh sudousername@machineB
+iperf -c 10.0.1.2 -u -t 30 -b 3M -i 1 -fm -B 10.0.1.1 -p 5002
+```
+
+UL traffic:
+
+```bash
+$ ssh sudousername@machineB
+iperf -B 10.0.1.1 -u -s -i 1 -fm -p 5002
+$ ssh sudousername@machineC
+iperf -c 10.0.1.1 -u -t 30 -b 2M -i 1 -fm -B 10.0.1.2 -p 5002
+```
+
+# 9. Limitations #
+
+
+----
+
+[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai softmodem features](FEATURE_SET.md)
+
+[oai softmodem build procedure](BUILD.md)
+
+[L2 nfapi simulator](L2NFAPI.md)
diff --git a/doc/L2NFAPI_S1.md b/doc/L2NFAPI_S1.md
index b9156e93796f514b7a48615d3ddf18f7579d3372..9fd6d518180d705d1d5a16a3d4361b3cd7b06684 100644
--- a/doc/L2NFAPI_S1.md
+++ b/doc/L2NFAPI_S1.md
@@ -7,7 +7,7 @@
</a>
</td>
<td style="border-collapse: collapse; border: none; vertical-align: center;">
- <b><font size = "5">L2 nFAPI Simulator (with S1 / same machine deployment)</font></b>
+ <b><font size = "5">L2 nFAPI Simulator (with S1 / 2-host deployment)</font></b>
</td>
</tr>
</table>
@@ -21,25 +21,24 @@
5. [Setup of the Configuration files](#5-setup-of-the-configuration-files)
1. [The eNB Configuration file](#51-the-enb-configuration-file)
2. [The UE Configuration file](#52-the-ue-configuration-file)
-6. [Bring Up a second loopback interface](#6-bring-up-a-second-loopback-interface)
-7. [Build the eNB](#7-build-the-enb)
-8. [Build the UE](#8-build-the-ue)
-9. [Initialize the NAS UE Layer](#9-initialize-the-nas-ue-layer)
-10. [Start the eNB](#10-start-the-enb)
-11. [Start the UE](#11-start-the-ue)
-12. [Test with ping](#12-test-with-ping)
-13. [Limitations](#13-limitations)
+6. [Build OAI UE and eNodeB](#6-build-oai-ue-and-enodeb)
+7. [Start EPC](#7-start-epc)
+8. [Start the eNB](#8-start-the-enb)
+9. [Start the UE](#9-start-the-ue)
+10. [Test with ping](#10-test-with-ping)
+11. [Limitations](#11-limitations)
# 1. Environment #
-2 servers are used in this deployment. You can use Virtual Machines instead of each server; like it is done in the CI process.
+3 servers are used in this deployment. You can use Virtual Machines instead of each server; like it is done in the CI process.
* Machine A contains the EPC.
-* Machine B contains the OAI eNB and the OAI UE(s)
+* Machine B contains the OAI eNB executable (`lte-softmodem`)
+* Machine C contains the OAI UE(s) executable (`lte-uesoftmodem`)
Example of L2 nFAPI Simulator testing environment:
-<img src="../l2-nfapi-simulator/L2-sim-single-server-deployment.png" alt="" border=3>
+<img src="./images/L2-sim-S1-3-host-deployment.png" alt="" border=3>
Note that the IP addresses are indicative and need to be adapted to your environment.
@@ -47,26 +46,35 @@ Note that the IP addresses are indicative and need to be adapted to your environ
Create the environment for the EPC and register all **USIM** information into the **HSS** database.
-If you are using OAI-EPC ([see on GitHub](https://github.com/OPENAIRINTERFACE/openair-cn)), build **HSS/MME/SPGW** and create config files.
+If you are using OAI-EPC ([see on GitHub](https://github.com/OPENAIRINTERFACE/openair-epc-fed)), build **HSS/MME/SPGW** and create config files.
# 3. Retrieve the OAI eNB-UE source code #
-The eNB and the UE executables will compiled into 2 separate folders on the same machine `B`.
+At the time of writing, the tag used in the `develop` branch to do this documentation was `2020.w16`.
+
+The tutorial should be valid for the `master` branch tags such as `v1.2.0` or `v1.2.1`. But you may face issues that could be fixed in newer `develop` tags.
+
+Please try to use the same commit ID on both eNB/UE hosts.
```bash
$ ssh sudousername@machineB
-$ git clone https://gitlab.eurecom.fr/oai/openairinterface5g/ enb_folder
-$ cd enb_folder
-$ git checkout -f v1.0.0
-$ cd ..
-$ cp -Rf enb_folder ue_folder
+git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git enb_folder
+cd enb_folder
+git checkout develop
+```
+
+```bash
+$ ssh sudousername@machineC
+git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git ue_folder
+cd ue_folder
+git checkout develop
```
# 4. Setup of the USIM information in UE folder #
```bash
-$ ssh sudousername@machineB
-$ cd ue_folder
+$ ssh sudousername@machineC
+cd ue_folder
# Edit openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf with your preferred editor
```
@@ -126,19 +134,19 @@ You can repeat the operation for as many users you want to test with.
```bash
$ ssh sudousername@machineB
-$ cd enb_folder
+cd enb_folder
# Edit ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf with your preferred editor
```
-First verify the nFAPI interface setup on the 2nd loopback interface.
+First verify the nFAPI interface setup on the physical ethernet interface of machineB and put the proper IP addresses for both hosts.
```
MACRLCs = (
{
num_cc = 1;
- local_s_if_name = "lo:"; // <-- HERE
- remote_s_address = "127.0.0.1"; // <-- HERE
- local_s_address = "127.0.0.2"; // <-- HERE
+ local_s_if_name = "ens3"; // <-- HERE
+ remote_s_address = "192.168.122.169"; // <-- HERE
+ local_s_address = "192.168.122.31"; // <-- HERE
local_s_portc = 50001;
remote_s_portc = 50000;
local_s_portd = 50011;
@@ -171,7 +179,7 @@ Last, the S1 interface shall be properly set.
```
////////// MME parameters:
- mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; // replace with 192.168.10.20
+ mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; // replace with 192.168.122.195
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
@@ -181,11 +189,11 @@ Last, the S1 interface shall be properly set.
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "ens3"; // replace with the proper interface name
- ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; // replace with 192.168.10.10
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31
ENB_INTERFACE_NAME_FOR_S1U = "ens3"; // replace with the proper interface name
- ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; // replace with 192.168.10.10
+ ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31
ENB_PORT_FOR_S1U = 2152; # Spec 2152
- ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; // replace with 192.168.10.10
+ ENB_IPV4_ADDRESS_FOR_X2C = "CI_ENB_IP_ADDR"; // replace with 192.168.122.31
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
@@ -195,7 +203,7 @@ Last, the S1 interface shall be properly set.
```bash
$ ssh sudousername@machineB
-$ cd ue_folder
+cd ue_folder
# Edit ci-scripts/conf_files/ue.nfapi.conf with your preferred editor
```
@@ -206,9 +214,9 @@ L1s = (
{
num_cc = 1;
tr_n_preference = "nfapi";
- local_n_if_name = "lo"; // <- HERE
- remote_n_address = "127.0.0.2"; // <- HERE
- local_n_address = "127.0.0.1"; // <- HERE
+ local_n_if_name = "ens3"; // <- HERE
+ remote_n_address = "192.168.122.31"; // <- HERE
+ local_n_address = "192.168.122.169"; // <- HERE
local_n_portc = 50000;
remote_n_portc = 50001;
local_n_portd = 50010;
@@ -217,20 +225,11 @@ L1s = (
);
```
-# 6. Bring Up a second loopback interface #
-
-A second loopback interface is used to connect the eNB and the UEs.
-
-```bash
-$ ssh sudousername@machineB
-$ sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up
-```
-
-# 7. [Build OAI UE and eNodeB](BUILD.md) #
+# 6. Build OAI UE and eNodeB #
+See [Build documentation](./BUILD.md).
-
-# 8. Initialize the NAS UE Layer #
+# 7. Start EPC #
Start the EPC on machine `A`.
@@ -239,61 +238,89 @@ $ ssh sudousername@machineA
# Start the EPC
```
-# 9. Start the eNB #
+# 8. Start the eNB #
In the first terminal (the one you used to build the eNB):
```bash
$ ssh sudousername@machineB
-$ cd enb_folder/cmake_targets
-$ sudo -E ./ran_build/build/lte-softmodem -O ../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf > enb.log 2>&1
+cd enb_folder/cmake_targets
+sudo -E ./ran_build/build/lte-softmodem -O ../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf > enb.log 2>&1
```
If you don't use redirection, you can test but many logs are printed on the console and this may affect performance of the L2-nFAPI simulator.
We do recommend the redirection in steady mode once your setup is correct.
-# 10. Start the UE #
+# 9. Start the UE #
In the second terminal (the one you used to build the UE):
```bash
-$ ssh sudousername@machineB
-$ cd ue_folder/cmake_targets
-# Test 64 UEs, 64 threads in FDD mode
-$ sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums-ue-thread 64 > ue.log 2>&1
-# Test 64 UEs, 64 threads in TDD mode
-$ sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums-ue-thread 64 -T 1 > ue.log 2>&1
+$ ssh sudousername@machineC
+cd ue_folder/cmake_targets
+# Test 64 UEs, 1 thread in FDD mode
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 --nokrnmod 1 > ue.log 2>&1
+# Test 64 UEs, 1 thread in TDD mode
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 --nokrnmod 1 -T 1 > ue.log 2>&1
# The "-T 1" option means TDD config
```
- The number of UEs can set by using `--num-ues` option and the maximum UE number is 255 (with the `--mu*` options, otherwise 16).
-- The umber of threads can set with the `--nums-ue-thread`. This number **SHALL NOT** be greater than the number of UEs.
+- The number of threads can set with the `--nums-ue-thread`. This number **SHALL NOT** be greater than the number of UEs.
+ * At the time of writing, it seems to be enough to run on a single thread.
+- The `--nokrnmod 1` option makes use of the preferred and supported tunnel interface.
- How many UE that can be tested depends on hardware (server , PC, etc) performance in your environment.
-# 11. Test with ping #
-
-In a third terminal, after around 10 seconds, the UE(s) shall be connected to the eNB:
+For example, running with 4 UEs:
```bash
-$ ssh sudousername@machineA
-# Ping UE0 IP address based on the EPC pool used: in this example:
-$ ping -c 20 192.168.200.2
-# Ping UE1 IP address based on the EPC pool used: in this example:
-$ ping -c 20 192.168.200.4
+$ ssh sudousername@machineC
+cd ue_folder/cmake_targets
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 --nokrnmod 1 > ue.log 2>&1
+sleep 10
+ifconfig
+ens3 Link encap:Ethernet HWaddr XX:XX:XX:XX:XX:XX
+ inet addr:192.168.122.169 Bcast:192.168.122.255 Mask:255.255.255.0
+....
+oaitun_ue1 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:192.172.0.2 P-t-P:192.172.0.2 Mask:255.255.255.0
+....
+oaitun_ue2 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:192.172.0.3 P-t-P:192.172.0.3 Mask:255.255.255.0
+....
+oaitun_ue3 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:192.172.0.4 P-t-P:192.172.0.4 Mask:255.255.255.0
+....
+oaitun_ue4 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:192.172.0.5 P-t-P:192.172.0.5 Mask:255.255.255.0
+....
+oaitun_uem1 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+ inet addr:10.0.2.2 P-t-P:10.0.2.2 Mask:255.255.255.0
+....
+....
```
-# 12. Limitations #
-
-Testing on the CI process is currently limited at time of writing. Improvements will be made soon.
-
+Having the 4 oaitun_ue tunnel interfaces up and with an allocated address means the connection with EPC went alright.
+# 10. Test with ping #
+In a third terminal, after around 10 seconds, the UE(s) shall be connected to the eNB: Check with ifconfig
+```bash
+$ ssh sudousername@machineA
+# Ping UE1 IP address based on the EPC pool used: in this example:
+$ ping -c 20 192.172.0.2
+# Ping UE4 IP address based on the EPC pool used: in this example:
+$ ping -c 20 192.172.0.5
+```
+iperf operations can also be performed.
+# 11. Limitations #
+----
[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
diff --git a/doc/SystemX-tutorial-design.md b/doc/SystemX-tutorial-design.md
new file mode 100644
index 0000000000000000000000000000000000000000..3e4496f7de6c22811d99984777fde9008bc8e282
--- /dev/null
+++ b/doc/SystemX-tutorial-design.md
@@ -0,0 +1,336 @@
+# OpenAirInterface for SystemX
+
+# Terminology
+
+****This document use the 5G terminology****
+
+**Central Unit (CU):** It is a logical node that includes the gNB
+functions like Transfer of user data, Mobility control, Radio access
+network sharing, Positioning, Session Management etc., except those
+functions allocated exclusively to the DU. CU controls the operation of
+DUs over front-haul (Fs) interface. A central unit (CU) may also be
+known as BBU/REC/RCC/C-RAN/V-RAN/VNF
+
+**Distributed Unit (DU):** This logical node includes a subset of the
+gNB functions, depending on the functional split option. Its operation
+is controlled by the CU. Distributed Unit (DU) also known with other
+names like RRH/RRU/RE/RU/PNF.
+
+In OpenAir code, the terminology is often RU and BBU.
+
+# OpenAirUsage
+
+## EPC and general environment
+
+### OAI EPC
+
+Use the stable OAI EPC, that can run in one machine (VM or standalone)
+
+Draft description:
+<https://open-cells.com/index.php/2017/08/22/all-in-one-openairinterface-august-22nd/>
+
+## Standalone 4G
+
+EPC+eNB on one machine, the UE can be commercial or OAI UE.
+
+### USRP B210
+
+Main current issue: traffic is good only on coaxial link between UE and
+eNB (probably power management issue).
+
+### Simulated RF
+
+Running eNB+UE both OAI can be done over a virtual RF link.
+
+The UE current status is that threads synchronization is implicit in
+some cases. As the RF simulator is very quick, a “sleep()†is required
+in the UE main loop
+
+(line 1744, targets/RT/USER/lte-ue.c).
+
+Running also the UE in the same machine is possible with simulated RF.
+
+Running in same machine is simpler, offers about infinite speed for
+virtual RF samples transmission.
+
+A specific configuration is required because the EPC Sgi interface has
+the same IP tunnel end point as the UE.
+
+So, we have to create a network namespace for the UE and to route data
+in/out of the namespace.
+
+```bash
+ip netns delete aNameSpace 2> /dev/null
+
+ip link delete v-eth1 2> /dev/null
+
+ip netns add aNameSpace
+
+ip link add v-eth1 type veth peer name v-peer1
+
+ip link set v-peer1 netns aNameSpace
+
+ip addr add 10.200.1.1/24 dev v-eth1
+
+ip link set v-eth1 up
+
+iptables -t nat -A POSTROUTING -s 10.200.1.0/255.255.255.0 -o enp0s31f6 \
+-j MASQUERADE
+
+iptables -A FORWARD -i enp0s31f6 -o v-eth1 -j ACCEPT
+
+iptables -A FORWARD -o enp0s31f6 -i v-eth1 -j ACCEPT
+
+ip netns exec aNameSpace ip link set dev lo up
+
+ip netns exec aNameSpace ip addr add 10.200.1.2/24 dev v-peer1
+
+ip netns exec aNameSpace ip link set v-peer1 up
+
+ip netns exec aNameSpace bash
+```
+
+After the last command, the Linux shell is in the new namespace, ready
+to run the UE.
+
+To make user plan traffic, the traffic generator has to run in the same
+namespace
+
+```bash
+ip netns exec aNameSpace bash
+```
+
+The traffic genenrator has to specify the interface:
+
+```bash
+route add default oaitun_ue1
+```
+
+or specify the outgoing route in the traffic generator (like option “-Iâ€
+in ping command).
+
+## Split 6 DL 4G
+
+The contract describes to reuse the uplink existing if4p5 and to develop
+is this work the downlink “functional split 6â€.
+
+The customer required after signature to develop also the uplink
+functional split 6. This is accepted, as long as the whole work is
+research with no delivery completeness warranty.
+
+### Simulation
+
+To be able to verify the new features and to help in all future
+developments, Open Cells added and improved the Rf board simulator
+during this contract.
+
+We added the channel modeling simulation, that offer to simulate various
+3GPP defined channels.
+
+### Main loop
+
+The main log is in RF simulator is in
+
+ `targets/RT/USER/lte-ru.c and targets/RT/USER/lte-enb.c`
+
+As this piece of SW is very complex and doesn’t meet our goals
+(functional split 6), a cleaned version replaces these 2 files in
+executables/ocp-main.c (openair1/SCHED/prach\_procedures.c is also
+replaced by this new file as it only launching the RACH actual work in a
+way not compatible with our FS6).
+
+The main loop cadences the I/Q samples reception, signal processing and
+I/Q samples sending.
+
+The main loop uses extensively function pointers to call the right
+processing function depending on the split case.
+
+A lot of OAI reduntant global variables contains the same semantic data: time,frame, subframe.
+The reworked main loop take care of a uniq variable that comes directly from harware: RF board sampling number.
+
+To use OAI, we need to set all OAI variables that derivates from this timestamp value. The function setAllfromTS() implements this.
+
+### Splitted main level
+
+When FS6 is actived, a main loop for DU (du_fs6()) a main loop for CU case replaces the uniq eNB main loop.
+
+Each of these main loops calls initialization of OAI LTE data and the FS6 transport layer initialization.
+
+Then, it runs a infinite loop on: set time, call UL and DL. The time comes from the RF board, so the DU sends the time to the CU.
+
+This is enough for RF board dialog, but the FS6 is higher in SW layers,
+we need to cut higher functions inside downlink and uplink procedures.
+
+As much as possible, the FS6 code is in the directory OPENAIR_DIR/executables. When a given OAI piece of code is small or need complex changes, it is reworked in the file fs6-main.c. The functions naming keeps the OAI function name, adding suffix _fromsplit() or _tosplit().
+
+When this organization would lead to large code copy, it is better to insert modifications in OAI code. This is done in two files:
+
+- openair1/SCHED/phy_procedures_lte_eNb.c: to send signaling channels computation results
+ - the function sendFs6Ulharq() centralizes all signaling channels forwarding to CU
+- openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c: to deal with FS6 user plane split
+ - sendFs6Ul() is used once to forward user plane to CU
+
+
+### DownLink
+
+The main procedure is phy\_procedures\_eNB\_TX()
+
+This is building the common channels (beacon, multi-UE signaling).
+
+The FS6 split breaks this function into pieces:
+
+* The multi-UE signals, built by common\_signal\_procedures(),
+ subframe2harq\_pid(), generate\_dci\_top(), subframe2harq\_pid()
+ * These functions run in the DU, nevertheless all context has to be sent
+ (it is also needed partially for UL spitting)
+ * Run in the DU also to meet the requirement of pushing
+ in DU the data encoded with large redundancy (>3 redundancy)
+
+* the per UE data: pdsch\_procedures() needs further splitting:
+
+ * dlsch\_encoding\_all() that makes the encoding: turbo code
+ and lte\_rate\_matching\_turbo() that will be in the DU (some
+ unlikely cases can reach redundancy up to x3, when MCS is very
+ low (negative SINR cases)).
+
+ * dlsch\_encoding() output needs to be transmitted between the
+ DU and the CU for functional split 6.
+ * dlsch\_scrambling() that will go in the DU
+ * dlsch\_modulation() that will go in the DU
+
+ The du user plane data is made of expanded bit in OAI at FS6 split level. 1 pair of functions compact back these bits into 8bits/byte before sending data and expand it again in the DU data reception (functions: fs6Dl(un)pack()).
+
+### Uplink
+
+The uplink require configuration that is part of the DL transmission.
+
+It interprets the signalling to extract the RACH and the per UE data
+channels.
+
+Ocp-main.c:rxtx() calls directly the entry procedure
+phy\_procedures\_eNB\_uespec\_RX() calls:
+
+* rx\_ulsch() that demodulate and extract soft bits per UE.
+
+ * This function runs in the DU
+ * the output data will be processes in the DU, so it needs to be
+ transmitted to the DU
+* ulsch\_decoding() that do lte\_rate\_matching\_turbo\_rx()
+ sub\_block\_deinterleaving\_turbo()
+ then turbo decode that is in the CU
+* fill\_ulsch\_cqi\_indication() fill\_crc\_indication() , fill\_rx\_indication()
+ * DU performs the signal processing of each channel data, prepare and sent to the CU the computed result
+
+* Random access channel detection runs in the DU
+ * the DU reports to the CU only the detected temprary identifier for RACH response
+
+
+### signaling data in each direction (UL and DL)
+
+
+* each LTE channel needs to be propagated between CU and DU
+ * the simplest are the almost static data such as PSS/SSS, that need only static eNB parameters and primary information (frame numbering)
+ * all the other channels require data transmission CU to DU and DU to CU
+ * the general design push all the low level processing for these channels in the DU
+ * the CU interface transports only signal processing results (UL) or configuration to create the RF signal (DL case)
+* HARQ is detected in the DU, then only the ACK or NACK is reported to CU
+
+* the CU have to control the power and MCS (modulation and coding scheme)
+ * the DU performs the signal processing and report only the decoded data like the CQI
+ * as the DU performas the modulation, scrambling and puncturing, each data packet is associated with the LTE parameters required for these features
+ * in DL, the CU associates the control parameters and the user plane data
+ * in UL, the CU sends upfront the scheduled UL data to the DU. So, the DU have the required knowledge to decode the next subframes in time.
+
+### UDP transport layer
+
+A general UDP transport layer is in executables/transport\_split.c
+
+Linux offers a UDP socket builtin timeout, that we use.
+
+In and out buffers are memory zones that contains compacted
+(concatenated) UDP chunks.
+
+For output, sendSubFrame() sends each UDP chunk
+
+For input, receiveSubFrame() collects all UDP chunks for a group (a
+subframe in OAI LTE case). It returns in the following cases:
+
+- all chunks are received
+- a timeout expired
+- a chunk from the next subframe already arrived
+
+### Functional split 6 usage
+
+The ocp cleaned main hale to be used: run ocp-softmodem instead of
+lte-softmodem.
+
+The functionality and parameters is the same, enhanced with FS6 mode.
+
+The end line option “--split73†enables the fs6 (also called split 7.3) mode and decided to be cu or du.
+
+Example:
+
+```bash
+./ocp-softmodem -O $OPENAIR_DIR/enb.fs6.example.conf --rfsim --log_config.phy_log_level debug --split73 cu:127.0.0.1
+```
+
+Run the CU init of the split 6 eNB, that will call du on 127.0.0.1 address
+
+```bash
+./ocp-softmodem -O $OPENAIR_DIR/enb.fs6.example.conf --rfsim --log_config.phy_log_level debug --split73 du:127.0.0.1
+```
+
+will run the du, calling the cu on 127.0.0.1
+
+If the CU and the DU are not on the same machine, the remote address of each side need to be specified as per this example
+
+```bash
+./ocp-softmodem -O $OPENAIR_DIR/enb.fs6.example.conf --rfsim --log_config.phy_log_level debug --split73 du:192.168.1.55
+```
+
+runs the functional split 6 DU
+
+```bash
+./lte-uesoftmodem -C 2685000000 -r 50 --rfsim --rfsimulator.serveraddr 192.168.1.1 -d
+```
+
+Runs the UE (to have the UE signal scope, compile it with make uescope)
+
+CU+DU+UE can run with option `--noS1` to avoid to use a EPC and/or with `--rfsim` to simulate RF board
+
+
+## 5G and F1
+
+Today 5G achievement is limited to physical layer.
+
+The available modulation is 40MHz, that require one X310 or N300 for the
+gNB and a X310 or N300 for the nrUE.
+
+### Usage with X310
+
+Linux configuration:
+<https://files.ettus.com/manual/page_usrp_x3x0_config.html>
+
+We included most of this configuration included in OAI source code.
+
+Remain to set the NIC (network interface card) MTU to 9000 (jumbo
+frames).
+
+### Running 5G
+
+Usage with RFsimulator:
+
+**gNB**
+
+```bash
+sudo RFSIMULATOR=server ./nr-softmodem -O \
+../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf \
+--parallel-config PARALLEL\_SINGLE\_THREAD
+```
+
+**nrUE**
+
+```bash
+sudo RFSIMULATOR=127.0.0.1 ./nr-uesoftmodem --numerology 1 -r 106 -C \
+3510000000 -d
+```
diff --git a/doc/images/L2-sim-S1-3-host-deployment.png b/doc/images/L2-sim-S1-3-host-deployment.png
new file mode 100644
index 0000000000000000000000000000000000000000..4049ebd7a8ace60df576a988f32442526af7f13e
Binary files /dev/null and b/doc/images/L2-sim-S1-3-host-deployment.png differ
diff --git a/doc/images/L2-sim-noS1-2-host-deployment.png b/doc/images/L2-sim-noS1-2-host-deployment.png
new file mode 100644
index 0000000000000000000000000000000000000000..02d29b7b3cdfb05dc912548e001fb11aa1d96fc8
Binary files /dev/null and b/doc/images/L2-sim-noS1-2-host-deployment.png differ
diff --git a/executables/main-fs6.c b/executables/main-fs6.c
new file mode 100644
index 0000000000000000000000000000000000000000..45a627188771b87e8691a0b4d92d3e3322c8bbc6
--- /dev/null
+++ b/executables/main-fs6.c
@@ -0,0 +1,1602 @@
+/*
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
+*/
+
+#include <stdint.h>
+#include <common/utils/LOG/log.h>
+#include <common/utils/system.h>
+#include <common/config/config_userapi.h>
+#include <targets/RT/USER/lte-softmodem.h>
+#include <openair1/PHY/defs_eNB.h>
+#include <openair1/PHY/phy_extern.h>
+#include <nfapi/oai_integration/vendor_ext.h>
+#include <openair1/SCHED/fapi_l1.h>
+#include <openair1/PHY/INIT/phy_init.h>
+#include <openair2/LAYER2/MAC/mac_extern.h>
+#include <openair1/PHY/LTE_REFSIG/lte_refsig.h>
+#include <nfapi/oai_integration/nfapi_pnf.h>
+#include <executables/split_headers.h>
+#include <nfapi/oai_integration/vendor_ext.h>
+#include <openair1/PHY/INIT/lte_init.c>
+#include <openair1/PHY/LTE_ESTIMATION/lte_estimation.h>
+#include <executables/split_headers.h>
+#include <openair1/PHY/CODING/coding_extern.h>
+#include <threadPool/thread-pool.h>
+#include <emmintrin.h>
+
+#define FS6_BUF_SIZE 1000*1000
+static UDPsock_t sockFS6;
+
+int sum(uint8_t *b, int s) {
+ int sum=0;
+
+ for (int i=0; i < s; i++)
+ sum+=b[i];
+
+ return sum;
+}
+
+static inline int cmpintRev(const void *a, const void *b) {
+ uint64_t *aa=(uint64_t *)a;
+ uint64_t *bb=(uint64_t *)b;
+ return (int)(*bb-*aa);
+}
+
+static inline void printMeas2(char *txt, Meas *M, int period, bool MaxMin) {
+ if (M->iterations%period == 0 ) {
+ char txt2[512];
+ sprintf(txt2,"%s avg=%" PRIu64 " iterations=%" PRIu64 " %s=%"
+ PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 ":%" PRIu64 "\n",
+ txt,
+ M->sum/M->iterations,
+ M->iterations,
+ MaxMin?"max":"min",
+ M->maxArray[1],M->maxArray[2], M->maxArray[3],M->maxArray[4], M->maxArray[5],
+ M->maxArray[6],M->maxArray[7], M->maxArray[8],M->maxArray[9],M->maxArray[10]);
+#if T_TRACER
+ LOG_W(PHY,"%s",txt2);
+#else
+ printf("%s",txt2);
+#endif
+ }
+}
+
+static inline void updateTimesReset(uint64_t start, Meas *M, int period, bool MaxMin, char *txt) {
+ if (start!=0) {
+ uint64_t end=rdtsc();
+ long long diff=(end-start)/(cpuf*1000);
+ M->maxArray[0]=diff;
+ M->sum+=diff;
+ M->iterations++;
+
+ if ( MaxMin)
+ qsort(M->maxArray, 11, sizeof(uint64_t), cmpint);
+ else
+ qsort(M->maxArray, 11, sizeof(uint64_t), cmpintRev);
+
+ printMeas2(txt,M,period, MaxMin);
+
+ if (M->iterations%period == 0 ) {
+ bzero(M,sizeof(*M));
+
+ if (!MaxMin)
+ for (int i=0; i<11; i++)
+ M->maxArray[i]=INT_MAX;
+ }
+ }
+}
+
+static inline void measTransportTime(uint64_t DuSend, uint64_t CuMicroSec, Meas *M, int period, bool MaxMin, char *txt) {
+ if (DuSend!=0) {
+ uint64_t end=rdtsc();
+ long long diff=(end-DuSend)/(cpuf*1000)-CuMicroSec;
+ M->maxArray[0]=diff;
+ M->sum+=diff;
+ M->iterations++;
+
+ if ( MaxMin)
+ qsort(M->maxArray, 11, sizeof(uint64_t), cmpint);
+ else
+ qsort(M->maxArray, 11, sizeof(uint64_t), cmpintRev);
+
+ printMeas2(txt,M,period, MaxMin);
+
+ if (M->iterations%period == 0 ) {
+ bzero(M,sizeof(*M));
+
+ if (!MaxMin)
+ for (int i=0; i<11; i++)
+ M->maxArray[i]=INT_MAX;
+ }
+ }
+}
+
+#define ceil16_bytes(a) ((((a+15)/16)*16)/8)
+
+static void fs6Dlunpack(void *out, void *in, int szUnpacked) {
+ static uint64_t *lut=NULL;
+
+ if (!lut) {
+ lut=(uint64_t *) malloc(sizeof(*lut)*256);
+
+ for (int i=0; i <256; i++)
+ for (int j=0; j<8; j++)
+ ((uint8_t *)(lut+i))[7-j]=(i>>j)&1;
+ }
+
+ int64_t *out_64 = (int64_t *)out;
+ int sz=ceil16_bytes(szUnpacked);
+
+ for (int i=0; i<sz; i++)
+ out_64[i]=lut[((uint8_t *)in)[i]];
+
+ return;
+}
+
+
+static void fs6Dlpack(void *out, void *in, int szUnpacked) {
+ __m128i zeros=_mm_set1_epi8(0);
+ __m128i shuffle=_mm_set_epi8(8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7);
+ const int loop=ceil16_bytes(szUnpacked)/sizeof(uint16_t);
+ __m128i *iter=(__m128i *)in;
+
+ for (int i=0; i < loop; i++) {
+ __m128i tmp=_mm_shuffle_epi8(_mm_cmpgt_epi8(*iter++,zeros),shuffle);
+ ((uint16_t *)out)[i]=(uint16_t)_mm_movemask_epi8(tmp);
+ }
+}
+
+void prach_eNB_tosplit(uint8_t *bufferZone, int bufSize, PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc) {
+ fs6_ul_t *header=(fs6_ul_t *) commonUDPdata(bufferZone);
+
+ if (is_prach_subframe(&eNB->frame_parms, proc->frame_prach,proc->subframe_prach)<=0)
+ return;
+
+ RU_t *ru;
+ int aa=0;
+ int ru_aa;
+
+ for (int i=0; i<eNB->num_RU; i++) {
+ ru=eNB->RU_list[i];
+
+ for (ru_aa=0,aa=0; ru_aa<ru->nb_rx; ru_aa++,aa++) {
+ eNB->prach_vars.rxsigF[0][aa] = eNB->RU_list[i]->prach_rxsigF[ru_aa];
+ int ce_level;
+
+ for (ce_level=0; ce_level<4; ce_level++)
+ eNB->prach_vars_br.rxsigF[ce_level][aa] = eNB->RU_list[i]->prach_rxsigF_br[ce_level][ru_aa];
+ }
+ }
+
+ ocp_rx_prach(eNB,
+ proc,
+ eNB->RU_list[0],
+ header->max_preamble,
+ header->max_preamble_energy,
+ header->max_preamble_delay,
+ header->avg_preamble_energy,
+ proc->frame_prach,
+ 0,
+ false
+ );
+ // run PRACH detection for CE-level 0 only for now when br_flag is set
+ /* fixme: seems not operational and may overwrite regular LTE prach detection
+ * OAI code can call is sequence
+ rx_prach(eNB,
+ eNB->RU_list[0],
+ header->max_preamble,
+ header->max_preamble_energy,
+ header->max_preamble_delay,
+ header->avg_preamble_energy,
+ frame,
+ 0,
+ true
+ );
+ */
+ LOG_D(PHY,"RACH detection index 0: max preamble: %u, energy: %u, delay: %u, avg energy: %u\n",
+ header->max_preamble[0],
+ header->max_preamble_energy[0],
+ header->max_preamble_delay[0],
+ header->avg_preamble_energy[0]
+ );
+ return;
+}
+
+void prach_eNB_fromsplit(uint8_t *bufferZone, int bufSize, PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc) {
+ fs6_ul_t *header=(fs6_ul_t *) commonUDPdata(bufferZone);
+ uint16_t *max_preamble=header->max_preamble;
+ uint16_t *max_preamble_energy=header->max_preamble_energy;
+ uint16_t *max_preamble_delay=header->max_preamble_delay;
+ uint16_t *avg_preamble_energy=header->avg_preamble_energy;
+ int subframe=proc->subframe_prach;
+ int frame=proc->frame_prach;
+ // Fixme: not clear why we call twice with "br" and without
+ int br_flag=0;
+
+ if (br_flag==1) {
+ int prach_mask;
+ prach_mask = is_prach_subframe (&eNB->frame_parms, proc->frame_prach_br, proc->subframe_prach_br);
+ eNB->UL_INFO.rach_ind_br.rach_indication_body.preamble_list = eNB->preamble_list_br;
+ int ind = 0;
+ int ce_level = 0;
+ /* Save for later, it doesn't work
+ for (int ind=0,ce_level=0;ce_level<4;ce_level++) {
+
+ if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[ce_level]==1)&&
+ (prach_mask&(1<<(1+ce_level)) > 0) && // prach is active and CE level has finished its repetitions
+ (eNB->prach_vars_br.repetition_number[ce_level]==
+ eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level])) {
+
+ */
+
+ if (eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[0] == 1) {
+ if ((eNB->prach_energy_counter == 100) && (max_preamble_energy[0] > eNB->measurements.prach_I0 + eNB->prach_DTX_threshold_emtc[0])) {
+ eNB->UL_INFO.rach_ind_br.rach_indication_body.number_of_preambles++;
+ eNB->preamble_list_br[ind].preamble_rel8.timing_advance = max_preamble_delay[ind]; //
+ eNB->preamble_list_br[ind].preamble_rel8.preamble = max_preamble[ind];
+ // note: fid is implicitly 0 here, this is the rule for eMTC RA-RNTI from 36.321, Section 5.1.4
+ eNB->preamble_list_br[ind].preamble_rel8.rnti = 1 + subframe + (60*(eNB->prach_vars_br.first_frame[ce_level] % 40));
+ eNB->preamble_list_br[ind].instance_length = 0; //don't know exactly what this is
+ eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type = 1 + ce_level; // CE Level
+ LOG_I (PHY, "Filling NFAPI indication for RACH %d CELevel %d (mask %x) : TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
+ ind,
+ ce_level,
+ prach_mask,
+ eNB->preamble_list_br[ind].preamble_rel8.timing_advance,
+ eNB->preamble_list_br[ind].preamble_rel8.preamble, eNB->preamble_list_br[ind].preamble_rel8.rnti, eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type);
+ }
+ }
+
+ /*
+ ind++;
+ }
+ } */// ce_level
+ } else if ((eNB->prach_energy_counter == 100) &&
+ (max_preamble_energy[0] > eNB->measurements.prach_I0+eNB->prach_DTX_threshold)) {
+ LOG_I(PHY,"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure with preamble %d, energy %d.%d dB, delay %d\n",
+ eNB->Mod_id,
+ eNB->CC_id,
+ frame,
+ subframe,
+ max_preamble[0],
+ max_preamble_energy[0]/10,
+ max_preamble_energy[0]%10,
+ max_preamble_delay[0]);
+ pthread_mutex_lock(&eNB->UL_INFO_mutex);
+ eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 1;
+ eNB->UL_INFO.rach_ind.rach_indication_body.preamble_list = &eNB->preamble_list[0];
+ eNB->UL_INFO.rach_ind.rach_indication_body.tl.tag = NFAPI_RACH_INDICATION_BODY_TAG;
+ eNB->UL_INFO.rach_ind.header.message_id = NFAPI_RACH_INDICATION;
+ eNB->UL_INFO.rach_ind.sfn_sf = frame<<4 | subframe;
+ eNB->preamble_list[0].preamble_rel8.tl.tag = NFAPI_PREAMBLE_REL8_TAG;
+ eNB->preamble_list[0].preamble_rel8.timing_advance = max_preamble_delay[0];
+ eNB->preamble_list[0].preamble_rel8.preamble = max_preamble[0];
+ eNB->preamble_list[0].preamble_rel8.rnti = 1+subframe; // note: fid is implicitly 0 here
+ eNB->preamble_list[0].preamble_rel13.rach_resource_type = 0;
+ eNB->preamble_list[0].instance_length = 0; //don't know exactly what this is
+
+ if (NFAPI_MODE==NFAPI_MODE_PNF) { // If NFAPI PNF then we need to send the message to the VNF
+ LOG_D(PHY,"Filling NFAPI indication for RACH : SFN_SF:%d TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
+ NFAPI_SFNSF2DEC(eNB->UL_INFO.rach_ind.sfn_sf),
+ eNB->preamble_list[0].preamble_rel8.timing_advance,
+ eNB->preamble_list[0].preamble_rel8.preamble,
+ eNB->preamble_list[0].preamble_rel8.rnti,
+ eNB->preamble_list[0].preamble_rel13.rach_resource_type);
+ oai_nfapi_rach_ind(&eNB->UL_INFO.rach_ind);
+ eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 0;
+ }
+
+ pthread_mutex_unlock(&eNB->UL_INFO_mutex);
+ } // max_preamble_energy > prach_I0 + 100
+ else {
+ eNB->measurements.prach_I0 = ((eNB->measurements.prach_I0*900)>>10) + ((avg_preamble_energy[0]*124)>>10);
+
+ if (eNB->prach_energy_counter < 100)
+ eNB->prach_energy_counter++;
+ }
+}
+
+void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask,
+ uint16_t rnti,
+ int32_t stat) {
+ static int current_fsf=-1;
+ int fsf=frame*16+subframe;
+ uint8_t *bufferZone=eNB->FS6bufferZone;
+ commonUDP_t *FirstUDPheader=(commonUDP_t *) bufferZone;
+ // move to the end
+ uint8_t *firstFreeByte=bufferZone;
+ int curBlock=0;
+
+ if ( current_fsf != fsf ) {
+ for (int i=0; i < FirstUDPheader->nbBlocks; i++) {
+ AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
+ firstFreeByte+=alignedSize(firstFreeByte);
+ curBlock++;
+ }
+
+ commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
+ FirstUDPheader->nbBlocks++;
+ newUDPheader->blockID=curBlock;
+ newUDPheader->contentBytes=sizeof(fs6_ul_t)+sizeof(fs6_ul_uespec_uci_t);
+ hULUEuci(newUDPheader)->type=fs6ULcch;
+ hULUEuci(newUDPheader)->nb_active_ue=0;
+ } else
+ for (int i=0; i < FirstUDPheader->nbBlocks-1; i++) {
+ AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
+ firstFreeByte+=alignedSize(firstFreeByte);
+ curBlock++;
+ }
+
+ LOG_D(PHY,"FS6 du, block: %d: adding ul harq/sr: %d, rnti: %d, ueid: %d\n",
+ curBlock, type, rnti, UEid);
+ commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
+ fs6_ul_uespec_uci_element_t *tmp=(fs6_ul_uespec_uci_element_t *)(hULUEuci(newUDPheader)+1);
+ tmp+=hULUEuci(newUDPheader)->nb_active_ue;
+ tmp->type=type;
+ tmp->UEid=UEid;
+ tmp->frame=frame;
+ tmp->subframe=subframe;
+
+ if (uci != NULL)
+ memcpy(&tmp->uci, uci, sizeof(*uci));
+ else
+ tmp->uci.ue_id=0xFFFF;
+
+ if (harq_ack != NULL)
+ memcpy(tmp->harq_ack, harq_ack, 4);
+
+ tmp->tdd_mapping_mode=tdd_mapping_mode;
+ tmp->tdd_multiplexing_mask=tdd_multiplexing_mask;
+ tmp->n0_subband_power_dB=eNB->measurements.n0_subband_power_dB[0][0];
+ tmp->rnti=rnti;
+ tmp->stat=stat;
+ hULUEuci(newUDPheader)->nb_active_ue++;
+ newUDPheader->contentBytes+=sizeof(fs6_ul_uespec_uci_element_t);
+}
+
+
+void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset) {
+ uint8_t *bufferZone=eNB->FS6bufferZone;
+ commonUDP_t *FirstUDPheader=(commonUDP_t *) bufferZone;
+ // move to the end
+ uint8_t *firstFreeByte=bufferZone;
+ int curBlock=0;
+
+ for (int i=0; i < FirstUDPheader->nbBlocks; i++) {
+ AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
+ firstFreeByte+=alignedSize(firstFreeByte);
+ curBlock++;
+ }
+
+ commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
+ FirstUDPheader->nbBlocks++;
+ newUDPheader->blockID=curBlock;
+ newUDPheader->contentBytes=sizeof(fs6_ul_t)+sizeof(fs6_ul_uespec_t) + dataLen;
+ hULUE(newUDPheader)->type=fs6ULsch;
+ hULUE(newUDPheader)->UE_id=UE_id;
+ hULUE(newUDPheader)->harq_id=harq_pid;
+ memcpy(hULUE(newUDPheader)->ulsch_power,
+ eNB->pusch_vars[UE_id]->ulsch_power,
+ sizeof(int)*2);
+ hULUE(newUDPheader)->cqi_crc_status=eNB->ulsch[UE_id]->harq_processes[harq_pid]->cqi_crc_status;
+ hULUE(newUDPheader)->O_ACK=eNB->ulsch[UE_id]->harq_processes[harq_pid]->O_ACK;
+ memcpy(hULUE(newUDPheader)->o_ACK, eNB->ulsch[UE_id]->harq_processes[harq_pid]->o_ACK,
+ sizeof(eNB->ulsch[UE_id]->harq_processes[harq_pid]->o_ACK));
+ hULUE(newUDPheader)->ta=lte_est_timing_advance_pusch(eNB, UE_id);
+ hULUE(newUDPheader)->segment=segmentID;
+ memcpy(hULUE(newUDPheader)->o, eNB->ulsch[UE_id]->harq_processes[harq_pid]->o,
+ sizeof(eNB->ulsch[UE_id]->harq_processes[harq_pid]->o));
+ memcpy(hULUE(newUDPheader)+1, data, dataLen);
+ hULUE(newUDPheader)->segLen=dataLen;
+ hULUE(newUDPheader)->r_offset=r_offset;
+ hULUE(newUDPheader)->G=eNB->ulsch[UE_id]->harq_processes[harq_pid]->G;
+}
+
+void pusch_procedures_tosplit(uint8_t *bufferZone, int bufSize, PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
+ uint32_t harq_pid;
+ LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
+ const int subframe = proc->subframe_rx;
+ const int frame = proc->frame_rx;
+
+ for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
+ LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[i];
+
+ if (ulsch->ue_type > NOCE)
+ harq_pid = 0;
+ else
+ harq_pid= subframe2harq_pid(&eNB->frame_parms,frame,subframe);
+
+ LTE_UL_eNB_HARQ_t *ulsch_harq = ulsch->harq_processes[harq_pid];
+
+ if (ulsch->rnti>0)
+ LOG_D(PHY,"eNB->ulsch[%d]->harq_processes[harq_pid:%d] SFN/SF:%04d%d: PUSCH procedures, UE %d/%x ulsch_harq[status:%d SFN/SF:%04d%d active: %d handled:%d]\n",
+ i, harq_pid, frame,subframe,i,ulsch->rnti,
+ ulsch_harq->status, ulsch_harq->frame, ulsch_harq->subframe, ulsch_harq->status, ulsch_harq->handled);
+
+ if ((ulsch) &&
+ (ulsch->rnti>0) &&
+ (ulsch_harq->status == ACTIVE) &&
+ ((ulsch_harq->frame == frame) || (ulsch_harq->repetition_number >1) ) &&
+ ((ulsch_harq->subframe == subframe) || (ulsch_harq->repetition_number >1) ) &&
+ (ulsch_harq->handled == 0)) {
+ // UE has ULSCH scheduling
+ for (int rb=0;
+ rb<=ulsch_harq->nb_rb;
+ rb++) {
+ int rb2 = rb+ulsch_harq->first_rb;
+ eNB->rb_mask_ul[rb2>>5] |= (1<<(rb2&31));
+ }
+
+ LOG_D(PHY,"[eNB %d] frame %d, subframe %d: Scheduling ULSCH Reception for UE %d \n",
+ eNB->Mod_id, frame, subframe, i);
+ uint8_t nPRS= fp->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[subframe<<1];
+ ulsch->cyclicShift = (ulsch_harq->n_DMRS2 +
+ fp->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift +
+ nPRS)%12;
+ AssertFatal(ulsch_harq->TBS>0,"illegal TBS %d\n",ulsch_harq->TBS);
+ LOG_D(PHY,
+ "[eNB %d][PUSCH %d] Frame %d Subframe %d Demodulating PUSCH: dci_alloc %d, rar_alloc %d, round %d, first_rb %d, nb_rb %d, Qm %d, TBS %d, rv %d, cyclic_shift %d (n_DMRS2 %d, cyclicShift_common %d, ), O_ACK %d, beta_cqi %d \n",
+ eNB->Mod_id,harq_pid,frame,subframe,
+ ulsch_harq->dci_alloc,
+ ulsch_harq->rar_alloc,
+ ulsch_harq->round,
+ ulsch_harq->first_rb,
+ ulsch_harq->nb_rb,
+ ulsch_harq->Qm,
+ ulsch_harq->TBS,
+ ulsch_harq->rvidx,
+ ulsch->cyclicShift,
+ ulsch_harq->n_DMRS2,
+ fp->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift,
+ ulsch_harq->O_ACK,
+ ulsch->beta_offset_cqi_times8);
+ start_meas(&eNB->ulsch_demodulation_stats);
+ eNB->FS6bufferZone=bufferZone;
+ rx_ulsch(eNB, proc, i);
+ stop_meas(&eNB->ulsch_demodulation_stats);
+ // TBD: add datablock for transmission
+ start_meas(&eNB->ulsch_decoding_stats);
+ ulsch_decoding(eNB,proc,
+ i,
+ 0, // control_only_flag
+ ulsch_harq->V_UL_DAI,
+ ulsch_harq->nb_rb>20 ? 1 : 0);
+ stop_meas(&eNB->ulsch_decoding_stats);
+ }
+ }
+}
+
+void phy_procedures_eNB_uespec_RX_tosplit(uint8_t *bufferZone, int bufSize, PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
+ //RX processing for ue-specific resources
+ LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
+ const int subframe = proc->subframe_rx;
+ const int frame = proc->frame_rx;
+ /* TODO: use correct rxdata */
+
+ if ((fp->frame_type == TDD) && (subframe_select(fp,subframe)!=SF_UL)) return;
+
+ LOG_D (PHY, "[eNB %d] Frame %d: Doing phy_procedures_eNB_uespec_RX(%d)\n", eNB->Mod_id, frame, subframe);
+ eNB->rb_mask_ul[0] = 0;
+ eNB->rb_mask_ul[1] = 0;
+ eNB->rb_mask_ul[2] = 0;
+ eNB->rb_mask_ul[3] = 0;
+ // Fix me here, these should be locked
+ eNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus = 0;
+ eNB->UL_INFO.crc_ind.crc_indication_body.number_of_crcs = 0;
+ // Call SRS first since all others depend on presence of SRS or lack thereof
+ srs_procedures (eNB, proc);
+ eNB->first_run_I0_measurements = 0;
+ uci_procedures (eNB, proc);
+
+ if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) { // If PNF or monolithic
+ pusch_procedures_tosplit(bufferZone, bufSize, eNB,proc);
+ }
+
+ lte_eNB_I0_measurements (eNB, subframe, 0, eNB->first_run_I0_measurements);
+ int min_I0=1000,max_I0=0;
+
+ if ((frame==0) && (subframe==4)) {
+ for (int i=0; i<eNB->frame_parms.N_RB_UL; i++) {
+ if (i==(eNB->frame_parms.N_RB_UL>>1) - 1) i+=2;
+
+ if (eNB->measurements.n0_subband_power_tot_dB[i]<min_I0)
+ min_I0 = eNB->measurements.n0_subband_power_tot_dB[i];
+
+ if (eNB->measurements.n0_subband_power_tot_dB[i]>max_I0)
+ max_I0 = eNB->measurements.n0_subband_power_tot_dB[i];
+ }
+
+ LOG_I (PHY, "max_I0 %d, min_I0 %d\n", max_I0, min_I0);
+ }
+
+ return;
+}
+
+
+void fill_rx_indication_from_split(uint8_t *bufferZone, PHY_VARS_eNB *eNB,int UE_id,int frame,int subframe, ul_propagation_t *ul_propa) {
+ nfapi_rx_indication_pdu_t *pdu;
+ int timing_advance_update;
+ uint32_t harq_pid;
+
+ if (eNB->ulsch[UE_id]->ue_type > 0)
+ harq_pid = 0;
+ else
+ harq_pid = subframe2harq_pid (&eNB->frame_parms,
+ frame, subframe);
+
+ pthread_mutex_lock(&eNB->UL_INFO_mutex);
+ eNB->UL_INFO.rx_ind.sfn_sf = frame<<4| subframe;
+ eNB->UL_INFO.rx_ind.rx_indication_body.tl.tag = NFAPI_RX_INDICATION_BODY_TAG;
+ pdu = &eNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list[eNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus];
+ // pdu->rx_ue_information.handle = eNB->ulsch[UE_id]->handle;
+ pdu->rx_ue_information.tl.tag = NFAPI_RX_UE_INFORMATION_TAG;
+ pdu->rx_ue_information.rnti = eNB->ulsch[UE_id]->rnti;
+ pdu->rx_indication_rel8.tl.tag = NFAPI_RX_INDICATION_REL8_TAG;
+ pdu->rx_indication_rel8.length = eNB->ulsch[UE_id]->harq_processes[harq_pid]->TBS>>3;
+ pdu->rx_indication_rel8.offset = 1; // DJP - I dont understand - but broken unless 1 ???? 0; // filled in at the end of the UL_INFO formation
+ pdu->data = eNB->ulsch[UE_id]->harq_processes[harq_pid]->decodedBytes;
+ // estimate timing advance for MAC
+ timing_advance_update = ul_propa[UE_id].ta;
+
+ // if (timing_advance_update > 10) { dump_ulsch(eNB,frame,subframe,UE_id); exit(-1);}
+ // if (timing_advance_update < -10) { dump_ulsch(eNB,frame,subframe,UE_id); exit(-1);}
+ switch (eNB->frame_parms.N_RB_DL) {
+ case 6: /* nothing to do */
+ break;
+
+ case 15:
+ timing_advance_update /= 2;
+ break;
+
+ case 25:
+ timing_advance_update /= 4;
+ break;
+
+ case 50:
+ timing_advance_update /= 8;
+ break;
+
+ case 75:
+ timing_advance_update /= 12;
+ break;
+
+ case 100:
+ timing_advance_update /= 16;
+ break;
+
+ default:
+ abort ();
+ }
+
+ // put timing advance command in 0..63 range
+ timing_advance_update += 31;
+
+ if (timing_advance_update < 0)
+ timing_advance_update = 0;
+
+ if (timing_advance_update > 63)
+ timing_advance_update = 63;
+
+ pdu->rx_indication_rel8.timing_advance = timing_advance_update;
+ // estimate UL_CQI for MAC (from antenna port 0 only)
+ int SNRtimes10 = dB_fixed_times10(eNB->pusch_vars[UE_id]->ulsch_power[0]) - 10 * eNB->measurements.n0_subband_power_dB[0][0];
+
+ if (SNRtimes10 < -640)
+ pdu->rx_indication_rel8.ul_cqi = 0;
+ else if (SNRtimes10 > 635)
+ pdu->rx_indication_rel8.ul_cqi = 255;
+ else
+ pdu->rx_indication_rel8.ul_cqi = (640 + SNRtimes10) / 5;
+
+ LOG_D(PHY,"[PUSCH %d] Frame %d Subframe %d Filling RX_indication with SNR %d (%d), timing_advance %d (update %d)\n",
+ harq_pid,frame,subframe,SNRtimes10,pdu->rx_indication_rel8.ul_cqi,pdu->rx_indication_rel8.timing_advance,
+ timing_advance_update);
+ eNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus++;
+ eNB->UL_INFO.rx_ind.sfn_sf = frame<<4 | subframe;
+ pthread_mutex_unlock(&eNB->UL_INFO_mutex);
+}
+
+void pusch_procedures_fromsplit(uint8_t *bufferZone, int bufSize, PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc, ul_propagation_t *ul_propa) {
+ //LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
+ const int subframe = proc->subframe_rx;
+ const int frame = proc->frame_rx;
+ uint32_t harq_pid;
+ uint32_t harq_pid0 = subframe2harq_pid(&eNB->frame_parms,frame,subframe);
+
+ for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
+ LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[i];
+
+ if (ulsch->ue_type > NOCE) harq_pid = 0;
+ else harq_pid=harq_pid0;
+
+ LTE_UL_eNB_HARQ_t *ulsch_harq = ulsch->harq_processes[harq_pid];
+
+ if (ulsch->rnti>0)
+ LOG_D(PHY,"eNB->ulsch[%d]->harq_processes[harq_pid:%d] SFN/SF:%04d%d: PUSCH procedures, UE %d/%x ulsch_harq[status:%d SFN/SF:%04d%d handled:%d]\n",
+ i, harq_pid, frame,subframe,i,ulsch->rnti,
+ ulsch_harq->status, ulsch_harq->frame, ulsch_harq->subframe, ulsch_harq->handled);
+
+ if ((ulsch) &&
+ (ulsch->rnti>0) &&
+ (ulsch_harq->status == ACTIVE) &&
+ (ulsch_harq->frame == frame) &&
+ (ulsch_harq->subframe == subframe) &&
+ (ulsch_harq->handled == 0)) {
+ // UE has ULSCH scheduling
+ for (int rb=0;
+ rb<=ulsch_harq->nb_rb;
+ rb++) {
+ int rb2 = rb+ulsch_harq->first_rb;
+ eNB->rb_mask_ul[rb2>>5] |= (1<<(rb2&31));
+ }
+
+ start_meas(&eNB->ulsch_decoding_stats);
+ // This is a new packet, so compute quantities regarding segmentation
+ ulsch_harq->B = ulsch_harq->TBS+24;
+ lte_segmentation(NULL,
+ NULL,
+ ulsch_harq->B,
+ &ulsch_harq->C,
+ &ulsch_harq->Cplus,
+ &ulsch_harq->Cminus,
+ &ulsch_harq->Kplus,
+ &ulsch_harq->Kminus,
+ &ulsch_harq->F);
+ ulsch_decoding_data(eNB, proc, i, harq_pid,
+ ulsch_harq->nb_rb>20 ? 1 : 0);
+ stop_meas(&eNB->ulsch_decoding_stats);
+ } // if ((ulsch) &&
+ // (ulsch->rnti>0) &&
+ // (ulsch_harq->status == ACTIVE))
+ else if ((ulsch) &&
+ (ulsch->rnti>0) &&
+ (ulsch_harq->status == ACTIVE) &&
+ (ulsch_harq->frame == frame) &&
+ (ulsch_harq->subframe == subframe) &&
+ (ulsch_harq->handled == 1)) {
+ // this harq process is stale, kill it, this 1024 frames later (10s), consider reducing that
+ ulsch_harq->status = SCH_IDLE;
+ ulsch_harq->handled = 0;
+ ulsch->harq_mask &= ~(1 << harq_pid);
+ LOG_W (PHY, "Removing stale ULSCH config for UE %x harq_pid %d (harq_mask is now 0x%2.2x)\n", ulsch->rnti, harq_pid, ulsch->harq_mask);
+ }
+ } // for (i=0; i<NUMBER_OF_UE_MAX; i++)
+
+ while (proc->nbDecode > 0) {
+ notifiedFIFO_elt_t *req=pullTpool(proc->respDecode, proc->threadPool);
+ postDecode(proc, req);
+ delNotifiedFIFO_elt(req);
+ }
+}
+
+void recvFs6Ul(uint8_t *bufferZone, int nbBlocks, PHY_VARS_eNB *eNB, ul_propagation_t *ul_propa) {
+ void *bufPtr=bufferZone;
+
+ for (int i=0; i < nbBlocks; i++) { //nbBlocks is the actual received blocks
+ if ( ((commonUDP_t *)bufPtr)->contentBytes > sizeof(fs6_ul_t) ) {
+ int type=hULUE(bufPtr)->type;
+
+ if ( type == fs6ULsch) {
+ LTE_eNB_ULSCH_t *ulsch =eNB->ulsch[hULUE(bufPtr)->UE_id];
+ LTE_UL_eNB_HARQ_t *ulsch_harq=ulsch->harq_processes[hULUE(bufPtr)->harq_id];
+ memcpy(ulsch_harq->eUL+hULUE(bufPtr)->r_offset,
+ hULUE(bufPtr)+1,
+ hULUE(bufPtr)->segLen);
+ memcpy(eNB->pusch_vars[hULUE(bufPtr)->UE_id]->ulsch_power,
+ hULUE(bufPtr)->ulsch_power,
+ sizeof(int)*2);
+ ulsch_harq->G=hULUE(bufPtr)->G;
+ ulsch_harq->cqi_crc_status=hULUE(bufPtr)->cqi_crc_status;
+ //ulsch_harq->O_ACK= hULUE(bufPtr)->O_ACK;
+ memcpy(ulsch_harq->o_ACK, hULUE(bufPtr)->o_ACK,
+ sizeof(ulsch_harq->o_ACK));
+ memcpy(ulsch_harq->o,hULUE(bufPtr)->o, sizeof(ulsch_harq->o));
+ ul_propa[hULUE(bufPtr)->UE_id].ta=hULUE(bufPtr)->ta;
+ LOG_D(PHY,"Received ulsch data for: rnti:%x, cqi_crc_status %d O_ACK: %d, segment: %d, seglen: %d \n",
+ ulsch->rnti, ulsch_harq->cqi_crc_status, ulsch_harq->O_ACK,hULUE(bufPtr)->segment, hULUE(bufPtr)->segLen);
+ } else if ( type == fs6ULcch ) {
+ int nb_uci=hULUEuci(bufPtr)->nb_active_ue;
+ fs6_ul_uespec_uci_element_t *tmp=(fs6_ul_uespec_uci_element_t *)(hULUEuci(bufPtr)+1);
+
+ for (int j=0; j < nb_uci ; j++) {
+ LOG_D(PHY,"FS6 cu, block: %d/%d: received ul harq/sr: %d, rnti: %d, ueid: %d\n",
+ i, j, type, tmp->rnti, tmp->UEid);
+ eNB->measurements.n0_subband_power_dB[0][0]=tmp->n0_subband_power_dB;
+
+ if (tmp->uci.ue_id != 0xFFFF)
+ memcpy(&eNB->uci_vars[tmp->UEid],&tmp->uci, sizeof(tmp->uci));
+
+ if ( tmp->type == fs6ULindicationHarq )
+ fill_uci_harq_indication (tmp->UEid, eNB, &eNB->uci_vars[tmp->UEid],
+ tmp->frame, tmp->subframe, tmp->harq_ack,
+ tmp->tdd_mapping_mode, tmp->tdd_multiplexing_mask);
+ else if ( tmp->type == fs6ULindicationSr )
+ fill_sr_indication(tmp->UEid, eNB,tmp->rnti,tmp->frame,tmp->subframe,tmp->stat);
+ else
+ LOG_E(PHY, "Split FS6: impossible UL harq type\n");
+
+ tmp++;
+ }
+ } else
+ LOG_E(PHY, "FS6 ul packet type impossible\n" );
+ }
+
+ bufPtr+=alignedSize(bufPtr);
+ }
+}
+
+void phy_procedures_eNB_uespec_RX_fromsplit(uint8_t *bufferZone, int nbBlocks,PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc) {
+ // The configuration arrived in Dl, so we can extract the UL data
+ ul_propagation_t ul_propa[NUMBER_OF_UE_MAX];
+ recvFs6Ul(bufferZone, nbBlocks, eNB, ul_propa);
+
+ // dirty memory allocation in OAI...
+ for (int i = 0; i < NUMBER_OF_UCI_VARS_MAX; i++)
+ if ( eNB->uci_vars[i].frame == proc->frame_rx &&
+ eNB->uci_vars[i].subframe == proc->subframe_rx )
+ eNB->uci_vars[i].active=0;
+
+ pusch_procedures_fromsplit(bufferZone, nbBlocks, eNB, proc, ul_propa);
+}
+
+void rcvFs6DL(uint8_t *bufferZone, int nbBlocks, PHY_VARS_eNB *eNB, int frame, int subframe) {
+ void *bufPtr=bufferZone;
+
+ for (int i=0; i < nbBlocks; i++) { //nbBlocks is the actual received blocks
+ if ( ((commonUDP_t *)bufPtr)->contentBytes > sizeof(fs6_dl_t) ) {
+ int type=hDLUE(bufPtr)->type;
+
+ if ( type == fs6DlConfig) {
+ int curUE=hDLUE(bufPtr)->UE_id;
+ LTE_eNB_DLSCH_t *dlsch0 = eNB->dlsch[curUE][0];
+ LTE_DL_eNB_HARQ_t *dlsch_harq=dlsch0->harq_processes[hDLUE(bufPtr)->harq_pid];
+#ifdef PHY_TX_THREAD
+ dlsch0->active[subframe] = 1;
+#else
+ dlsch0->active = 1;
+#endif
+ dlsch0->harq_ids[frame%2][subframe]=hDLUE(bufPtr)->harq_pid;
+ dlsch0->rnti=hDLUE(bufPtr)->rnti;
+ dlsch0->sqrt_rho_a=hDLUE(bufPtr)->sqrt_rho_a;
+ dlsch0->sqrt_rho_b=hDLUE(bufPtr)->sqrt_rho_b;
+ dlsch_harq->nb_rb=hDLUE(bufPtr)->nb_rb;
+ memcpy(dlsch_harq->rb_alloc, hDLUE(bufPtr)->rb_alloc, sizeof(hDLUE(bufPtr)->rb_alloc));
+ dlsch_harq->Qm=hDLUE(bufPtr)->Qm;
+ dlsch_harq->Nl=hDLUE(bufPtr)->Nl;
+ dlsch_harq->pdsch_start=hDLUE(bufPtr)->pdsch_start;
+#ifdef PHY_TX_THREAD
+ dlsch_harq->CEmode = hDLUE(bufPtr)->CEmode;
+ dlsch_harq->i0=hDLUE(bufPtr)->i0;
+ dlsch_harq->sib1_br_flag=hDLUE(bufPtr)->sib1_br_flag;
+#else
+ dlsch0->i0=hDLUE(bufPtr)->i0;
+ dlsch0->sib1_br_flag=hDLUE(bufPtr)->sib1_br_flag;
+#endif
+ fs6Dlunpack(dlsch_harq->eDL,
+ hDLUE(bufPtr)+1, hDLUE(bufPtr)->dataLen);
+ LOG_D(PHY,"received %d bits, in harq id: %di fsf: %d.%d, sum %d\n",
+ hDLUE(bufPtr)->dataLen, hDLUE(bufPtr)->harq_pid, frame, subframe, sum(dlsch_harq->eDL, hDLUE(bufPtr)->dataLen));
+ } else if (type == fs6UlConfig) {
+ int nbUE=(((commonUDP_t *)bufPtr)->contentBytes - sizeof(fs6_dl_t)) / sizeof( fs6_dl_ulsched_t ) ;
+#define cpyVal(a) memcpy(&ulsch_harq->a,&hTxULUE(bufPtr)->a, sizeof(ulsch_harq->a))
+
+ for ( int i=0; i < nbUE; i++ ) {
+ int curUE=hTxULUE(bufPtr)->UE_id;
+ LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[curUE];
+ LTE_UL_eNB_HARQ_t *ulsch_harq=ulsch->harq_processes[hTxULUE(bufPtr)->harq_pid];
+ ulsch->ue_type=hTxULUE(bufPtr)->ue_type;
+ ulsch->harq_mask=hTxULUE(bufPtr)->harq_mask;
+ ulsch->Mlimit=hTxULUE(bufPtr)->Mlimit;
+ ulsch->max_turbo_iterations=hTxULUE(bufPtr)->max_turbo_iterations;
+ ulsch->bundling=hTxULUE(bufPtr)->bundling;
+ ulsch->beta_offset_cqi_times8=hTxULUE(bufPtr)->beta_offset_cqi_times8;
+ ulsch->beta_offset_ri_times8=hTxULUE(bufPtr)->beta_offset_ri_times8;
+ ulsch->beta_offset_harqack_times8=hTxULUE(bufPtr)->beta_offset_harqack_times8;
+ ulsch->Msg3_active=hTxULUE(bufPtr)->Msg3_active;
+ ulsch->cyclicShift=hTxULUE(bufPtr)->cyclicShift;
+ ulsch->cooperation_flag=hTxULUE(bufPtr)->cooperation_flag;
+ ulsch->num_active_cba_groups=hTxULUE(bufPtr)->num_active_cba_groups;
+ memcpy(ulsch->cba_rnti,hTxULUE(bufPtr)->cba_rnti,sizeof(ulsch->cba_rnti));//NUM_MAX_CBA_GROUP];
+ ulsch->rnti=hTxULUE(bufPtr)->rnti;
+ ulsch_harq->nb_rb=hTxULUE(bufPtr)->nb_rb;
+ ulsch_harq->handled=0;
+ ulsch_harq->status = ACTIVE;
+ ulsch_harq->frame = frame;
+ ulsch_harq->subframe = subframe;
+ ulsch_harq->first_rb=hTxULUE(bufPtr)->first_rb;
+ ulsch_harq->O_RI=hTxULUE(bufPtr)->O_RI;
+ ulsch_harq->Or1=hTxULUE(bufPtr)->Or1;
+ ulsch_harq->Msc_initial=hTxULUE(bufPtr)->Msc_initial;
+ ulsch_harq->Nsymb_initial=hTxULUE(bufPtr)->Nsymb_initial;
+ ulsch_harq->V_UL_DAI=hTxULUE(bufPtr)->V_UL_DAI;
+ ulsch_harq->Qm=hTxULUE(bufPtr)->Qm;
+ ulsch_harq->srs_active=hTxULUE(bufPtr)->srs_active;
+ ulsch_harq->TBS=hTxULUE(bufPtr)->TBS;
+ ulsch_harq->Nsymb_pusch=hTxULUE(bufPtr)->Nsymb_pusch;
+ cpyVal(dci_alloc);
+ cpyVal(rar_alloc);
+ cpyVal(status);
+ cpyVal(Msg3_flag);
+ cpyVal(phich_active);
+ cpyVal(phich_ACK);
+ cpyVal(previous_first_rb);
+ cpyVal(B);
+ cpyVal(G);
+ //cpyVal(o);
+ cpyVal(uci_format);
+ cpyVal(Or2);
+ cpyVal(o_RI);
+ cpyVal(o_ACK);
+ cpyVal(O_ACK);
+ //cpyVal(q);
+ cpyVal(o_RCC);
+ cpyVal(q_ACK);
+ cpyVal(q_RI);
+ cpyVal(RTC);
+ cpyVal(ndi);
+ cpyVal(round);
+ cpyVal(rvidx);
+ cpyVal(Nl);
+ cpyVal(n_DMRS);
+ cpyVal(previous_n_DMRS);
+ cpyVal(n_DMRS2);
+ cpyVal(delta_TF);
+ cpyVal(repetition_number );
+ cpyVal(total_number_of_repetitions);
+ LOG_D(PHY,"Received request to perform ulsch for: rnti:%d, fsf: %d/%d, O_ACK: %d\n",
+ ulsch->rnti, frame, subframe, ulsch_harq->O_ACK);
+ }
+ } else if ( type == fs6ULConfigCCH ) {
+ fs6_dl_uespec_ulcch_element_t *tmp=(fs6_dl_uespec_ulcch_element_t *)(hTxULcch(bufPtr)+1);
+
+ for (int i=0; i< hTxULcch(bufPtr)->nb_active_ue; i++ )
+ memcpy(&eNB->uci_vars[tmp->UE_id], &tmp->cch_vars, sizeof(tmp->cch_vars));
+ } else
+ LOG_E(PHY, "Impossible block in fs6 DL\n");
+ }
+
+ bufPtr+=alignedSize(bufPtr);
+ }
+}
+
+void phy_procedures_eNB_TX_fromsplit(uint8_t *bufferZone, int nbBlocks, PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc, int do_meas ) {
+ LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
+ int subframe=proc->subframe_tx;
+ int frame=proc->frame_tx;
+ //LTE_UL_eNB_HARQ_t *ulsch_harq;
+ eNB->pdcch_vars[subframe&1].num_pdcch_symbols=hDL(bufferZone)->num_pdcch_symbols;
+ eNB->pdcch_vars[subframe&1].num_dci=hDL(bufferZone)->num_dci;
+ uint8_t num_mdci = eNB->mpdcch_vars[subframe&1].num_dci = hDL(bufferZone)->num_mdci;
+ eNB->pbch_configured=true;
+ memcpy(eNB->pbch_pdu,hDL(bufferZone)->pbch_pdu, 4);
+
+ // Remove all scheduled DL, we will populate from the CU sending
+ for (int UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
+ LTE_eNB_DLSCH_t *dlsch0 = eNB->dlsch[UE_id][0];
+
+ if ( dlsch0 && dlsch0->rnti>0 ) {
+#ifdef PHY_TX_THREAD
+ dlsch0->active[subframe] = 0;
+#else
+ dlsch0->active = 0;
+#endif
+ }
+ }
+
+ rcvFs6DL(bufferZone, nbBlocks, eNB, frame, subframe);
+
+ if (do_meas==1) {
+ start_meas(&eNB->phy_proc_tx);
+ start_meas(&eNB->dlsch_common_and_dci);
+ }
+
+ // clear the transmit data array for the current subframe
+ for (int aa = 0; aa < fp->nb_antenna_ports_eNB; aa++) {
+ memset (&eNB->common_vars.txdataF[aa][subframe * fp->ofdm_symbol_size * (fp->symbols_per_tti)],
+ 0, fp->ofdm_symbol_size * (fp->symbols_per_tti) * sizeof (int32_t));
+ }
+
+ if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
+ if (is_pmch_subframe(frame,subframe,fp)) {
+ pmch_procedures(eNB,proc);
+ } else {
+ // this is not a pmch subframe, so generate PSS/SSS/PBCH
+ common_signal_procedures(eNB,frame, subframe);
+ }
+ }
+
+ // clear previous allocation information for all UEs
+ for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
+ //if (eNB->dlsch[i][0])
+ //eNB->dlsch[i][0]->subframe_tx[subframe] = 0;
+ }
+
+ if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
+ for (int i=0; i< hDL(bufferZone)->num_dci; i++)
+ eNB->pdcch_vars[subframe&1].dci_alloc[i]=hDL(bufferZone)->dci_alloc[i];
+
+ LOG_D (PHY, "Frame %d, subframe %d: Calling generate_dci_top (pdcch) (num_dci %" PRIu8 ")\n", frame, subframe, hDL(bufferZone)->num_dci);
+ generate_dci_top(hDL(bufferZone)->num_pdcch_symbols,
+ hDL(bufferZone)->num_dci,
+ &eNB->pdcch_vars[subframe&1].dci_alloc[0],
+ 0,
+ hDL(bufferZone)->amp,
+ fp,
+ eNB->common_vars.txdataF,
+ subframe);
+
+ if (num_mdci > 0) {
+ LOG_D (PHY, "[eNB %" PRIu8 "] Frame %d, subframe %d: Calling generate_mdci_top (mpdcch) (num_dci %" PRIu8 ")\n", eNB->Mod_id, frame, subframe, num_mdci);
+ generate_mdci_top (eNB, frame, subframe, AMP, eNB->common_vars.txdataF);
+ }
+ }
+
+ for (int UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
+ LTE_eNB_DLSCH_t *dlsch0 = eNB->dlsch[UE_id][0];
+ LTE_eNB_DLSCH_t *dlsch1 = eNB->dlsch[UE_id][1];
+
+ if ((dlsch0)&&(dlsch0->rnti>0)&&
+#ifdef PHY_TX_THREAD
+ (dlsch0->active[subframe] == 1)
+#else
+ (dlsch0->active == 1)
+#endif
+ ) {
+ uint64_t sum=0;
+
+ for ( int i= subframe * fp->ofdm_symbol_size * (fp->symbols_per_tti);
+ i< (subframe+1) * fp->ofdm_symbol_size * (fp->symbols_per_tti);
+ i++)
+ sum+=((int32_t *)(eNB->common_vars.txdataF[0]))[i];
+
+ LOG_D(PHY,"frame: %d, subframe: %d, sum of dlsch mod v1: %lx\n", frame, subframe, sum);
+ int harq_pid=dlsch0->harq_ids[frame%2][subframe];
+ pdsch_procedures(eNB,
+ proc,
+ harq_pid,
+ dlsch0,
+ dlsch1);
+ }
+ }
+
+ eNB->phich_vars[subframe&1]=hDL(bufferZone)->phich_vars;
+ generate_phich_top(eNB,
+ proc,
+ AMP);
+}
+
+#define cpyToDu(a) hTxULUE(newUDPheader)->a=ulsch->a
+#define cpyToDuHarq(a) hTxULUE(newUDPheader)->a=ulsch_harq->a
+#define memcpyToDuHarq(a) memcpy(&hTxULUE(newUDPheader)->a,&ulsch_harq->a, sizeof(ulsch_harq->a));
+
+void appendFs6TxULUE(uint8_t *bufferZone, LTE_DL_FRAME_PARMS *fp, int curUE, LTE_eNB_ULSCH_t *ulsch, int frame, int subframe) {
+ commonUDP_t *FirstUDPheader=(commonUDP_t *) bufferZone;
+ // move to the end
+ uint8_t *firstFreeByte=bufferZone;
+ int curBlock=0;
+
+ for (int i=0; i < FirstUDPheader->nbBlocks; i++) {
+ AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
+ firstFreeByte+=alignedSize(firstFreeByte);
+ curBlock++;
+ }
+
+ commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
+ FirstUDPheader->nbBlocks++;
+ newUDPheader->blockID=curBlock;
+ newUDPheader->contentBytes=sizeof(fs6_dl_t)+sizeof(fs6_dl_ulsched_t);
+ // We skip the fs6 DL header, that is populated by caller
+ // This header will be duplicated during sending
+ hTxULUE(newUDPheader)->type=fs6UlConfig;
+ hTxULUE(newUDPheader)->UE_id=curUE;
+ int harq_pid;
+
+ if (ulsch->ue_type > NOCE)
+ // LTE-M case
+ harq_pid = 0;
+ else
+ harq_pid = subframe2harq_pid(fp, frame, subframe);
+
+ LTE_UL_eNB_HARQ_t *ulsch_harq=ulsch->harq_processes[harq_pid];
+ hTxULUE(newUDPheader)->harq_pid=harq_pid;
+ cpyToDu(ue_type);
+ cpyToDu(harq_mask);
+ cpyToDu(Mlimit);
+ cpyToDu(max_turbo_iterations);
+ cpyToDu(bundling);
+ cpyToDu(beta_offset_cqi_times8);
+ cpyToDu(beta_offset_ri_times8);
+ cpyToDu(beta_offset_harqack_times8);
+ cpyToDu(Msg3_active);
+ cpyToDu(cyclicShift);
+ cpyToDu(cooperation_flag);
+ cpyToDu(num_active_cba_groups);
+ memcpy(hTxULUE(newUDPheader)->cba_rnti,ulsch->cba_rnti,sizeof(ulsch->cba_rnti));//NUM_MAX_CBA_GROUP];
+ cpyToDu(rnti);
+ cpyToDuHarq(nb_rb);
+ cpyToDuHarq(Msc_initial);
+ cpyToDuHarq(Nsymb_initial);
+ cpyToDuHarq(O_RI);
+ cpyToDuHarq(Or1);
+ cpyToDuHarq(first_rb);
+ cpyToDuHarq(V_UL_DAI);
+ cpyToDuHarq(Qm);
+ cpyToDuHarq(srs_active);
+ cpyToDuHarq(TBS);
+ cpyToDuHarq(Nsymb_pusch);
+ memcpyToDuHarq(dci_alloc);
+ memcpyToDuHarq(rar_alloc);
+ memcpyToDuHarq(status);
+ memcpyToDuHarq(Msg3_flag);
+ memcpyToDuHarq(phich_active);
+ memcpyToDuHarq(phich_ACK);
+ memcpyToDuHarq(previous_first_rb);
+ memcpyToDuHarq(B);
+ memcpyToDuHarq(G);
+ //memcpyToDuHarq(o);
+ memcpyToDuHarq(uci_format);
+ memcpyToDuHarq(Or2);
+ memcpyToDuHarq(o_RI);
+ memcpyToDuHarq(o_ACK);
+ memcpyToDuHarq(O_ACK);
+ //memcpyToDuHarq(q);
+ memcpyToDuHarq(o_RCC);
+ memcpyToDuHarq(q_ACK);
+ memcpyToDuHarq(q_RI);
+ memcpyToDuHarq(RTC);
+ memcpyToDuHarq(ndi);
+ memcpyToDuHarq(round);
+ memcpyToDuHarq(rvidx);
+ memcpyToDuHarq(Nl);
+ memcpyToDuHarq(n_DMRS);
+ memcpyToDuHarq(previous_n_DMRS);
+ memcpyToDuHarq(n_DMRS2);
+ memcpyToDuHarq(delta_TF);
+ memcpyToDuHarq(repetition_number );
+ memcpyToDuHarq(total_number_of_repetitions);
+ LOG_D(PHY,"Added request to perform ulsch for: rnti:%x, fsf: %d/%d\n", ulsch->rnti, frame, subframe);
+}
+
+void appendFs6DLUE(uint8_t *bufferZone, LTE_DL_FRAME_PARMS *fp, int UE_id, int8_t harq_pid, LTE_eNB_DLSCH_t *dlsch0, LTE_DL_eNB_HARQ_t *harqData, int frame, int subframe) {
+ commonUDP_t *FirstUDPheader=(commonUDP_t *) bufferZone;
+ // move to the end
+ uint8_t *firstFreeByte=bufferZone;
+ int curBlock=0;
+
+ for (int i=0; i < FirstUDPheader->nbBlocks; i++) {
+ AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
+ firstFreeByte+=alignedSize(firstFreeByte);
+ curBlock++;
+ }
+
+ int UEdataLen= get_G(fp,
+ harqData->nb_rb,
+ harqData->rb_alloc,
+ harqData->Qm,
+ harqData->Nl,
+ harqData->pdsch_start,
+ frame,subframe,
+ 0);
+ AssertFatal(firstFreeByte+ceil16_bytes(UEdataLen)+sizeof(fs6_dl_t) <= bufferZone+FS6_BUF_SIZE, "");
+ commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
+ FirstUDPheader->nbBlocks++;
+ newUDPheader->blockID=curBlock;
+ newUDPheader->contentBytes=sizeof(fs6_dl_t)+sizeof(fs6_dl_uespec_t) + ceil16_bytes(UEdataLen);
+ // We skip the fs6 DL header, that is populated by caller
+ // This header will be duplicated during sending
+ hDLUE(newUDPheader)->type=fs6DlConfig;
+ hDLUE(newUDPheader)->UE_id=UE_id;
+ hDLUE(newUDPheader)->harq_pid=harq_pid;
+ hDLUE(newUDPheader)->rnti=dlsch0->rnti;
+ hDLUE(newUDPheader)->sqrt_rho_a=dlsch0->sqrt_rho_a;
+ hDLUE(newUDPheader)->sqrt_rho_b=dlsch0->sqrt_rho_b;
+ hDLUE(newUDPheader)->nb_rb=harqData->nb_rb;
+ memcpy(hDLUE(newUDPheader)->rb_alloc, harqData->rb_alloc, sizeof(harqData->rb_alloc));
+ hDLUE(newUDPheader)->Qm=harqData->Qm;
+ hDLUE(newUDPheader)->Nl=harqData->Nl;
+ hDLUE(newUDPheader)->pdsch_start=harqData->pdsch_start;
+#ifdef PHY_TX_THREAD
+ hDLUE(newUDPheader)->CEmode=harqData->CEmode;
+ hDLUE(newUDPheader)->i0=harqData->i0;
+ hDLUE(newUDPheader)->sib1_br_flag=harqData->sib1_br_flag;
+#else
+ hDLUE(newUDPheader)->i0=dlsch0->i0;
+ hDLUE(newUDPheader)->sib1_br_flag=dlsch0->sib1_br_flag;
+#endif
+ hDLUE(newUDPheader)->dataLen=UEdataLen;
+ fs6Dlpack(hDLUE(newUDPheader)+1, harqData->eDL, UEdataLen);
+ LOG_D(PHY,"sending %d bits, in harq id: %di fsf: %d.%d, sum %d\n",
+ UEdataLen, harq_pid, frame, subframe, sum(harqData->eDL, UEdataLen));
+ //for (int i=0; i < UEdataLen; i++)
+ //LOG_D(PHY,"buffer ei[%d]:%hhx\n", i, ( (uint8_t *)(hDLUE(newUDPheader)+1) )[i]);
+}
+
+void appendFs6DLUEcch(uint8_t *bufferZone, PHY_VARS_eNB *eNB, int frame, int subframe) {
+ commonUDP_t *FirstUDPheader=(commonUDP_t *) bufferZone;
+ // move to the end
+ uint8_t *firstFreeByte=bufferZone;
+ int curBlock=0;
+
+ for (int i=0; i < FirstUDPheader->nbBlocks; i++) {
+ AssertFatal( ((commonUDP_t *) firstFreeByte)->blockID==curBlock,"");
+ firstFreeByte+=alignedSize(firstFreeByte);
+ curBlock++;
+ }
+
+ commonUDP_t *newUDPheader=(commonUDP_t *) firstFreeByte;
+ bool first_UE=true;
+
+ for (int i = 0; i < NUMBER_OF_UCI_VARS_MAX; i++) {
+ LTE_eNB_UCI *uci = &(eNB->uci_vars[i]);
+
+ if ((uci->active == 1) && (uci->frame == frame) && (uci->subframe == subframe)) {
+ LOG_D(PHY,"Frame %d, subframe %d: adding uci procedures (type %d) for %d \n",
+ frame,
+ subframe,
+ uci->type,
+ i);
+
+ if ( first_UE ) {
+ FirstUDPheader->nbBlocks++;
+ newUDPheader->blockID=curBlock;
+ newUDPheader->contentBytes=sizeof(fs6_dl_t)+sizeof(fs6_dl_uespec_ulcch_t);
+ hTxULcch(newUDPheader)->type=fs6ULConfigCCH;
+ hTxULcch(newUDPheader)->nb_active_ue=0;
+ first_UE=false;
+ }
+
+ fs6_dl_uespec_ulcch_element_t *tmp=(fs6_dl_uespec_ulcch_element_t *)(hTxULcch(newUDPheader)+1);
+ tmp+=hTxULcch(newUDPheader)->nb_active_ue;
+ tmp->UE_id=i;
+ memcpy(&tmp->cch_vars,uci, sizeof(tmp->cch_vars));
+ hTxULcch(newUDPheader)->nb_active_ue++;
+ newUDPheader->contentBytes+=sizeof(fs6_dl_uespec_ulcch_element_t);
+ }
+ }
+}
+
+void phy_procedures_eNB_TX_tosplit(uint8_t *bufferZone, PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc, int do_meas, uint8_t *buf, int bufSize) {
+ int frame=proc->frame_tx;
+ int subframe=proc->subframe_tx;
+ LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
+
+ if ((fp->frame_type == TDD) && (subframe_select (fp, subframe) == SF_UL)) {
+ LOG_W(HW,"no sending in eNB_TX\n");
+ return;
+ }
+
+ // clear previous allocation information for all UEs
+ for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
+ //if (eNB->dlsch[i][0])
+ //eNB->dlsch[i][0]->subframe_tx[subframe] = 0;
+ }
+
+ // Send to DU the UL scheduled for future UL subframe
+ for (int i=0; i<NUMBER_OF_UE_MAX; i++) {
+ int harq_pid;
+ LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[i];
+
+ if (ulsch->ue_type > NOCE)
+ harq_pid = 0;
+ else
+ harq_pid= subframe2harq_pid(&eNB->frame_parms,frame,subframe);
+
+ LTE_UL_eNB_HARQ_t *ulsch_harq = ulsch->harq_processes[harq_pid];
+
+ if (ulsch->rnti>0) {
+ LOG_D(PHY,"check in UL scheduled harq %d: rnti %d, tx frame %d/%d, ulsch: %d, %d/%d (handled: %d)\n",
+ harq_pid, ulsch->rnti, frame, subframe, ulsch_harq->status, ulsch_harq->frame, ulsch_harq->subframe, ulsch_harq->handled);
+ }
+
+ for (int k=0; k<8; k++) {
+ ulsch_harq = ulsch->harq_processes[k];
+
+ if (ulsch &&
+ (ulsch->rnti>0) &&
+ (ulsch_harq->status == ACTIVE) &&
+ (ulsch_harq->frame == frame) &&
+ (ulsch_harq->subframe == subframe) &&
+ (ulsch_harq->handled == 0)
+ )
+ appendFs6TxULUE(bufferZone,
+ fp,
+ i,
+ ulsch,
+ frame,
+ subframe
+ );
+ }
+ }
+
+ appendFs6DLUEcch(bufferZone,
+ eNB,
+ frame,
+ subframe
+ );
+ uint8_t num_pdcch_symbols = eNB->pdcch_vars[subframe&1].num_pdcch_symbols;
+ uint8_t num_dci = eNB->pdcch_vars[subframe&1].num_dci;
+ uint8_t num_mdci = eNB->mpdcch_vars[subframe&1].num_dci;
+ memcpy(hDL(bufferZone)->pbch_pdu,eNB->pbch_pdu,4);
+
+ if ( num_dci <= 8 )
+ LOG_D(PHY,"num_pdcch_symbols %"PRIu8",number dci %"PRIu8"\n",num_pdcch_symbols, num_dci);
+ else {
+ LOG_E(PHY, "Num dci too large for current FS6 implementation, reducing to 8 dci (was %d)\n", num_dci);
+ num_dci=8;
+ }
+
+ if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
+ hDL(bufferZone)->num_pdcch_symbols=num_pdcch_symbols;
+ hDL(bufferZone)->num_dci=num_dci;
+ hDL(bufferZone)->num_mdci=num_mdci;
+ hDL(bufferZone)->amp=AMP;
+
+ for (int i=0; i< hDL(bufferZone)->num_dci; i++)
+ hDL(bufferZone)->dci_alloc[i]=eNB->pdcch_vars[subframe&1].dci_alloc[i];
+
+ LOG_D(PHY, "pbch configured: %d\n", eNB->pbch_configured);
+ }
+
+ if (do_meas==1) stop_meas(&eNB->dlsch_common_and_dci);
+
+ if (do_meas==1) start_meas(&eNB->dlsch_ue_specific);
+
+ for (int UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
+ LTE_eNB_DLSCH_t *dlsch0 = eNB->dlsch[UE_id][0];
+
+ if ((dlsch0)&&(dlsch0->rnti>0)&&
+#ifdef PHY_TX_THREAD
+ (dlsch0->active[subframe] == 1)
+#else
+ (dlsch0->active == 1)
+#endif
+ ) {
+ // get harq_pid
+ int harq_pid = dlsch0->harq_ids[frame%2][subframe];
+ AssertFatal(harq_pid>=0,"harq_pid is negative\n");
+
+ if (harq_pid>=8) {
+ if (dlsch0->ue_type == NOCE)
+ LOG_E(PHY,"harq_pid:%d corrupt must be 0-7 UE_id:%d frame:%d subframe:%d rnti:%x [ %1d.%1d.%1d.%1d.%1d.%1d.%1d.%1d\n", harq_pid,UE_id,frame,subframe,dlsch0->rnti,
+ dlsch0->harq_ids[frame%2][0],
+ dlsch0->harq_ids[frame%2][1],
+ dlsch0->harq_ids[frame%2][2],
+ dlsch0->harq_ids[frame%2][3],
+ dlsch0->harq_ids[frame%2][4],
+ dlsch0->harq_ids[frame%2][5],
+ dlsch0->harq_ids[frame%2][6],
+ dlsch0->harq_ids[frame%2][7]);
+ } else {
+ if (dlsch_procedures(eNB,
+ proc,
+ harq_pid,
+ dlsch0,
+ &eNB->UE_stats[(uint32_t)UE_id])) {
+ // data in: dlsch0 harq_processes[harq_pid]->e
+ /* length
+ get_G(fp,
+ dlsch_harq->nb_rb,
+ dlsch_harq->rb_alloc,
+ dlsch_harq->Qm,
+ dlsch_harq->Nl,
+ dlsch_harq->pdsch_start,
+ frame,subframe,
+ 0)
+ need harq_pid
+ */
+ LTE_DL_eNB_HARQ_t *dlsch_harq=dlsch0->harq_processes[harq_pid];
+ appendFs6DLUE(bufferZone,
+ fp,
+ UE_id,
+ harq_pid,
+ dlsch0,
+ dlsch_harq,
+ frame,
+ subframe
+ );
+ }
+ }
+ } else if ((dlsch0)&&(dlsch0->rnti>0)&&
+#ifdef PHY_TX_THREAD
+ (dlsch0->active[subframe] == 0)
+#else
+ (dlsch0->active == 0)
+#endif
+ ) {
+ // clear subframe TX flag since UE is not scheduled for PDSCH in this subframe (so that we don't look for PUCCH later)
+ //dlsch0->subframe_tx[subframe]=0;
+ }
+ }
+
+ hDL(bufferZone)->phich_vars=eNB->phich_vars[subframe&1];
+
+ if (do_meas==1) stop_meas(&eNB->dlsch_ue_specific);
+
+ if (do_meas==1) stop_meas(&eNB->phy_proc_tx);
+
+ // MBMS is not working in OAI
+ if (hDL(bufferZone)->num_mdci) abort();
+
+ return;
+}
+
+void *DL_du_fs6(void *arg) {
+ RU_t *ru=(RU_t *)arg;
+ static uint64_t lastTS;
+ L1_rxtx_proc_t L1proc= {0};
+ // We pick the global thread pool from the legacy code global vars
+ L1proc.threadPool=RC.eNB[0][0]->proc.L1_proc.threadPool;
+ L1proc.respEncode=RC.eNB[0][0]->proc.L1_proc.respEncode;
+ L1proc.respDecode=RC.eNB[0][0]->proc.L1_proc.respDecode;
+ initStaticTime(begingWait);
+ initStaticTime(begingProcessing);
+ initRefTimes(fullLoop);
+ initRefTimes(DuHigh);
+ initRefTimes(DuLow);
+ initRefTimes(transportTime);
+
+ while (1) {
+ for (int i=0; i<ru->num_eNB; i++) {
+ initBufferZone(bufferZone);
+ pickStaticTime(begingWait);
+ int nb_blocks=receiveSubFrame(&sockFS6, bufferZone, sizeof(bufferZone), CTsentCUv0 );
+ updateTimesReset(begingWait, &fullLoop, 1000, false, "DU wait CU");
+
+ if (nb_blocks > 0) {
+ if ( lastTS+ru->eNB_list[i]->frame_parms.samples_per_tti < hUDP(bufferZone)->timestamp) {
+ LOG_E(HW,"Missed a subframe: expecting: %lu, received %lu\n",
+ lastTS+ru->eNB_list[i]->frame_parms.samples_per_tti,
+ hUDP(bufferZone)->timestamp);
+ } else if ( lastTS+ru->eNB_list[i]->frame_parms.samples_per_tti > hUDP(bufferZone)->timestamp) {
+ LOG_E(HW,"Received a subframe in past time from CU (dropping it): expecting: %lu, received %lu\n",
+ lastTS+ru->eNB_list[i]->frame_parms.samples_per_tti,
+ hUDP(bufferZone)->timestamp);
+ }
+
+ pickStaticTime(begingProcessing);
+ lastTS=hUDP(bufferZone)->timestamp;
+ setAllfromTS(hUDP(bufferZone)->timestamp - sf_ahead*ru->eNB_list[i]->frame_parms.samples_per_tti, &L1proc);
+ measTransportTime(hDL(bufferZone)->DuClock, hDL(bufferZone)->CuSpentMicroSec,
+ &transportTime, 1000, false, "Transport time, to CU + from CU for one subframe");
+ phy_procedures_eNB_TX_fromsplit( bufferZone, nb_blocks, ru->eNB_list[i], &L1proc, 1);
+ updateTimesReset(begingProcessing, &DuHigh, 1000, false, "DU high layer1 processing for DL");
+ } else
+ LOG_E(PHY,"DL not received for subframe\n");
+ }
+
+ pickStaticTime(begingProcessing);
+ feptx_prec(ru, L1proc.frame_tx,L1proc.subframe_tx );
+ feptx_ofdm(ru, L1proc.frame_tx,L1proc.subframe_tx );
+ ocp_tx_rf(ru, &L1proc);
+ updateTimesReset(begingProcessing, &DuLow, 1000, false, "DU low layer1 processing for DL");
+
+ if ( IS_SOFTMODEM_RFSIM )
+ return NULL;
+ }
+
+ return NULL;
+}
+
+void UL_du_fs6(RU_t *ru, L1_rxtx_proc_t *proc) {
+ initStaticTime(begingWait);
+ initRefTimes(fullLoop);
+ pickStaticTime(begingWait);
+ rx_rf(ru, proc);
+ updateTimesReset(begingWait, &fullLoop, 1000, false, "DU wait USRP");
+ // front end processing: convert from time domain to frequency domain
+ // fills rxdataF buffer
+ fep_full(ru, proc->subframe_rx);
+ // Fixme: datamodel issue
+ PHY_VARS_eNB *eNB = RC.eNB[0][0];
+
+ if (NFAPI_MODE==NFAPI_MODE_PNF) {
+ // I am a PNF and I need to let nFAPI know that we have a (sub)frame tick
+ //add_subframe(&frame, &subframe, 4);
+ //oai_subframe_ind(proc->frame_tx, proc->subframe_tx);
+ oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
+ }
+
+ initBufferZone(bufferZone);
+ hUDP(bufferZone)->timestamp=proc->timestamp_rx;
+ prach_eNB_tosplit(bufferZone, FS6_BUF_SIZE, eNB, proc );
+
+ if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
+ phy_procedures_eNB_uespec_RX_tosplit(bufferZone, FS6_BUF_SIZE, eNB, proc );
+ }
+
+ if (hUDP(bufferZone)->nbBlocks==0) {
+ hUDP(bufferZone)->nbBlocks=1; // We have to send the signaling, even is there is no user plan data (no UE)
+ hUDP(bufferZone)->blockID=0;
+ hUDP(bufferZone)->contentBytes=sizeof(fs6_ul_t);
+ }
+
+ for (int i=0; i<ru->num_eNB; i++) {
+ sendSubFrame(&sockFS6, bufferZone, sizeof(fs6_ul_t), CTsentDUv0);
+ }
+}
+
+void DL_cu_fs6(RU_t *ru, L1_rxtx_proc_t *proc, uint64_t DuClock, uint64_t startCycle) {
+ initRefTimes(CUprocessing);
+ // Fixme: datamodel issue
+ PHY_VARS_eNB *eNB = RC.eNB[0][0];
+ pthread_mutex_lock(&eNB->UL_INFO_mutex);
+ eNB->UL_INFO.frame = proc->frame_rx;
+ eNB->UL_INFO.subframe = proc->subframe_rx;
+ eNB->UL_INFO.module_id = eNB->Mod_id;
+ eNB->UL_INFO.CC_id = eNB->CC_id;
+ eNB->if_inst->UL_indication(&eNB->UL_INFO, proc);
+ pthread_mutex_unlock(&eNB->UL_INFO_mutex);
+ initBufferZone(bufferZone);
+ phy_procedures_eNB_TX_tosplit(bufferZone, eNB, proc, 1, bufferZone, FS6_BUF_SIZE);
+ hUDP(bufferZone)->timestamp=proc->timestamp_tx;
+
+ if (hUDP(bufferZone)->nbBlocks==0) {
+ hUDP(bufferZone)->nbBlocks=1; // We have to send the signaling, even is there is no user plan data (no UE)
+ hUDP(bufferZone)->blockID=0;
+ hUDP(bufferZone)->contentBytes=sizeof(fs6_dl_t);
+ }
+
+ hDL(bufferZone)->DuClock=DuClock;
+ hDL(bufferZone)->CuSpentMicroSec=(rdtsc()-startCycle)/(cpuf*1000);
+ updateTimesReset(startCycle, &CUprocessing, 1000, true,"CU entire processing from recv to send");
+ sendSubFrame(&sockFS6, bufferZone, sizeof(fs6_dl_t), CTsentCUv0 );
+ return;
+}
+
+void UL_cu_fs6(RU_t *ru, L1_rxtx_proc_t *proc, uint64_t *TS, uint64_t *DuClock, uint64_t *startProcessing) {
+ initBufferZone(bufferZone);
+ initStaticTime(begingWait);
+ initRefTimes(fullLoop);
+ pickStaticTime(begingWait);
+ int nb_blocks=receiveSubFrame(&sockFS6, bufferZone, sizeof(bufferZone), CTsentDUv0 );
+ * DuClock=hUDP(bufferZone)->senderClock;
+ * startProcessing=rdtsc();
+ updateTimesReset(begingWait, &fullLoop, 1000, false, "CU wait DU");
+
+ if (nb_blocks ==0) {
+ LOG_W(PHY, "CU lost a subframe\n");
+ return;
+ }
+
+ if (nb_blocks != hUDP(bufferZone)->nbBlocks )
+ LOG_W(PHY, "received %d blocks for %d expected\n", nb_blocks, hUDP(bufferZone)->nbBlocks);
+
+ if ( *TS != hUDP(bufferZone)->timestamp ) {
+ LOG_W(HW, "CU received time: %lu instead of %lu expected\n", hUDP(bufferZone)->timestamp, *TS);
+ *TS=hUDP(bufferZone)->timestamp;
+ }
+
+ setAllfromTS(hUDP(bufferZone)->timestamp, proc);
+ PHY_VARS_eNB *eNB = RC.eNB[0][0];
+
+ if (is_prach_subframe(&eNB->frame_parms, proc->frame_prach,proc->subframe_prach)>0)
+ prach_eNB_fromsplit(bufferZone, sizeof(bufferZone), eNB, proc);
+
+ release_UE_in_freeList(eNB->Mod_id);
+
+ if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
+ phy_procedures_eNB_uespec_RX_fromsplit(bufferZone, nb_blocks, eNB, proc);
+ }
+}
+
+void *cu_fs6(void *arg) {
+ setbuf(stdout, NULL);
+ setbuf(stderr, NULL);
+ RU_t *ru = (RU_t *)arg;
+ //RU_proc_t *proc = &ru->proc;
+ fill_rf_config(ru,ru->rf_config_file);
+ init_frame_parms(ru->frame_parms,1);
+ phy_init_RU(ru);
+ wait_sync("ru_thread");
+ char remoteIP[1024];
+ strncpy(remoteIP,get_softmodem_params()->split73+3, 1023); //three first char should be cu: or du:
+ char port_def[256]=DU_PORT;
+ for (int i=0; i <1000; i++)
+ if (remoteIP[i]==':') {
+ strncpy(port_def,remoteIP+i+1,255);
+ remoteIP[i]=0;
+ break;
+ }
+
+ AssertFatal(createUDPsock(NULL, CU_PORT, remoteIP, port_def, &sockFS6), "");
+ L1_rxtx_proc_t L1proc= {0};
+ // We pick the global thread pool from the legacy code global vars
+ L1proc.threadPool=RC.eNB[0][0]->proc.L1_proc.threadPool;
+ L1proc.respEncode=RC.eNB[0][0]->proc.L1_proc.respEncode;
+ L1proc.respDecode=RC.eNB[0][0]->proc.L1_proc.respDecode;
+ uint64_t timeStamp=0;
+ initStaticTime(begingWait);
+ initStaticTime(begingWait2);
+ initRefTimes(waitDUAndProcessingUL);
+ initRefTimes(makeSendDL);
+ initRefTimes(fullLoop);
+ uint64_t DuClock=0, startProcessing=0;
+
+ while(1) {
+ timeStamp+=ru->frame_parms->samples_per_tti;
+ updateTimesReset(begingWait, &fullLoop, 1000, true, "CU for full SubFrame (must be less 1ms)");
+ pickStaticTime(begingWait);
+ UL_cu_fs6(ru, &L1proc, &timeStamp, &DuClock, &startProcessing);
+ updateTimesReset(begingWait, &waitDUAndProcessingUL, 1000, true,"CU Time in wait Rx + Ul processing");
+ pickStaticTime(begingWait2);
+ DL_cu_fs6(ru, &L1proc, DuClock, startProcessing);
+ updateTimesReset(begingWait2, &makeSendDL, 1000, true,"CU Time in DL build+send");
+ }
+
+ return NULL;
+}
+
+void *du_fs6(void *arg) {
+ setbuf(stdout, NULL);
+ setbuf(stderr, NULL);
+ RU_t *ru = (RU_t *)arg;
+ //RU_proc_t *proc = &ru->proc;
+ fill_rf_config(ru,ru->rf_config_file);
+ init_frame_parms(ru->frame_parms,1);
+ phy_init_RU(ru);
+ init_rf(ru);
+ wait_sync("ru_thread");
+ char remoteIP[1024];
+ strncpy(remoteIP,get_softmodem_params()->split73+3,1023); //three first char should be cu: or du:
+ char port_def[256]=CU_PORT;
+ for (int i=0; i <1000; i++)
+ if (remoteIP[i]==':') {
+ strncpy(port_def,remoteIP+i+1,255);
+ remoteIP[i]=0;
+ break;
+ }
+ AssertFatal(createUDPsock(NULL, DU_PORT, remoteIP, port_def, &sockFS6), "");
+
+ if (ru->rfdevice.trx_start_func(&ru->rfdevice) != 0)
+ LOG_E(HW,"Could not start the RF device\n");
+ else
+ LOG_I(PHY,"RU %d rf device ready\n",ru->idx);
+
+ initStaticTime(begingWait);
+ initRefTimes(waitRxAndProcessingUL);
+ initRefTimes(fullLoop);
+ pthread_t t;
+
+ if ( !IS_SOFTMODEM_RFSIM )
+ threadCreate(&t, DL_du_fs6, (void *)ru, "MainDuTx", -1, OAI_PRIORITY_RT_MAX);
+
+ L1_rxtx_proc_t L1proc= {0};
+ // We pick the global thread pool from the legacy code global vars
+ L1proc.threadPool=RC.eNB[0][0]->proc.L1_proc.threadPool;
+ L1proc.respEncode=RC.eNB[0][0]->proc.L1_proc.respEncode;
+ L1proc.respDecode=RC.eNB[0][0]->proc.L1_proc.respDecode;
+
+ while(!oai_exit) {
+ updateTimesReset(begingWait, &fullLoop, 1000, true,"DU for full SubFrame (must be less 1ms)");
+ pickStaticTime(begingWait);
+ UL_du_fs6(ru, &L1proc);
+
+ if ( IS_SOFTMODEM_RFSIM )
+ DL_du_fs6((void *)ru);
+
+ updateTimesReset(begingWait, &waitRxAndProcessingUL, 1000, true,"DU Time in wait Rx + Ul processing");
+ }
+
+ ru->rfdevice.trx_end_func(&ru->rfdevice);
+ LOG_I(PHY,"RU %d rf device stopped\n",ru->idx);
+ return NULL;
+}
diff --git a/executables/main-ocp.c b/executables/main-ocp.c
new file mode 100644
index 0000000000000000000000000000000000000000..d2ee9418dcaa2efb4059324a1e177d25f27967fe
--- /dev/null
+++ b/executables/main-ocp.c
@@ -0,0 +1,1401 @@
+/*
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
+*/
+
+
+/*
+ * This file replaces
+ * targets/RT/USER/lte-softmodem.c
+ * targets/RT/USER/rt_wrapper.c
+ * targets/RT/USER/lte-ru.c
+ * targets/RT/USER/lte-enb.c
+ * targets/RT/USER/ru_control.c
+ * openair1/SCHED/prach_procedures.c
+ * The merger of OpenAir central code to this branch
+ * should check if these 3 files are modified and analyze if code code has to be copied in here
+ */
+#define _GNU_SOURCE
+#include <pthread.h>
+
+#include <common/utils/LOG/log.h>
+#include <common/utils/system.h>
+#include <common/utils/assertions.h>
+static int DEFBANDS[] = {7};
+static int DEFENBS[] = {0};
+#include <common/config/config_userapi.h>
+#include <targets/RT/USER/lte-softmodem.h>
+#include <openair1/PHY/defs_eNB.h>
+#include <openair1/PHY/phy_extern.h>
+#include <nfapi/oai_integration/vendor_ext.h>
+#include <openair1/SCHED/fapi_l1.h>
+#include <openair1/PHY/INIT/phy_init.h>
+#include <openair2/LAYER2/MAC/mac_extern.h>
+#include <openair1/PHY/LTE_REFSIG/lte_refsig.h>
+#include <nfapi/oai_integration/nfapi_pnf.h>
+#include <executables/split_headers.h>
+#include <common/utils/threadPool/thread-pool.h>
+#include <openair2/ENB_APP/NB_IoT_interface.h>
+#include <common/utils/load_module_shlib.h>
+#include <targets/COMMON/create_tasks.h>
+#include <openair1/PHY/TOOLS/phy_scope_interface.h>
+#include <openair2/UTIL/OPT/opt.h>
+#include <openair1/SIMULATION/TOOLS/sim.h>
+#include <openair1/PHY/phy_vars.h>
+#include <openair1/SCHED/sched_common_vars.h>
+#include <openair2/LAYER2/MAC/mac_vars.h>
+#include <openair2/RRC/LTE/rrc_vars.h>
+
+pthread_cond_t nfapi_sync_cond;
+pthread_mutex_t nfapi_sync_mutex;
+int nfapi_sync_var=-1; //!< protected by mutex \ref nfapi_sync_mutex
+pthread_cond_t sync_cond;
+pthread_mutex_t sync_mutex;
+int sync_var=-1; //!< protected by mutex \ref sync_mutex.
+int config_sync_var=-1;
+volatile int oai_exit = 0;
+double cpuf;
+uint16_t sf_ahead=4;
+int otg_enabled;
+uint64_t downlink_frequency[MAX_NUM_CCs][4];
+int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
+int split73;
+char * split73_config;
+int split73;
+
+static void *ru_thread( void *param );
+void kill_RU_proc(RU_t *ru) {
+}
+void kill_eNB_proc(int inst) {
+}
+void free_transport(PHY_VARS_eNB *eNB) {
+}
+void reset_opp_meas(void) {
+}
+extern void phy_free_RU(RU_t *);
+
+void exit_function(const char *file, const char *function, const int line, const char *s) {
+ if (s != NULL) {
+ printf("%s:%d %s() Exiting OAI softmodem: %s\n",file,line, function, s);
+ }
+
+ close_log_mem();
+ oai_exit = 1;
+
+ if (RC.ru == NULL)
+ exit(-1); // likely init not completed, prevent crash or hang, exit now...
+
+ for (int ru_id=0; ru_id<RC.nb_RU; ru_id++) {
+ if (RC.ru[ru_id] && RC.ru[ru_id]->rfdevice.trx_end_func) {
+ RC.ru[ru_id]->rfdevice.trx_end_func(&RC.ru[ru_id]->rfdevice);
+ RC.ru[ru_id]->rfdevice.trx_end_func = NULL;
+ }
+
+ if (RC.ru[ru_id] && RC.ru[ru_id]->ifdevice.trx_end_func) {
+ RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
+ RC.ru[ru_id]->ifdevice.trx_end_func = NULL;
+ }
+ }
+
+ sleep(1); //allow lte-softmodem threads to exit first
+ exit(1);
+}
+
+// Fixme: there are many mistakes in the datamodel and in redondant variables
+// TDD is also mode complex
+void setAllfromTS(uint64_t TS, L1_rxtx_proc_t *proc) {
+ for (int i=0; i < RC.nb_inst; i++) {
+ for (int j=0; j<RC.nb_CC[i]; j++) {
+ LTE_DL_FRAME_PARMS *fp=&RC.eNB[i][j]->frame_parms;
+ uint64_t TStx=TS+(sf_ahead)*fp->samples_per_tti;
+ uint64_t TSrach=TS;//-fp->samples_per_tti;
+ proc->timestamp_rx= TS;
+ proc->timestamp_tx= TStx;
+ proc->subframe_rx= (TS / fp->samples_per_tti)%10;
+ proc->subframe_prach=(TSrach / fp->samples_per_tti)%10;
+ proc->subframe_prach_br=(TSrach / fp->samples_per_tti)%10;
+ proc->frame_rx= (TS / (fp->samples_per_tti*10))&1023;
+ proc->frame_prach= (TSrach / (fp->samples_per_tti*10))&1023;
+ proc->frame_prach_br=(TSrach / (fp->samples_per_tti*10))&1023;
+ proc->frame_tx= (TStx / (fp->samples_per_tti*10))&1023;
+ proc->subframe_tx= (TStx / fp->samples_per_tti)%10;
+ }
+ }
+
+ return;
+}
+
+void init_RU_proc(RU_t *ru) {
+ pthread_t t;
+
+ switch(split73) {
+ case SPLIT73_CU:
+ threadCreate(&t, cu_fs6, (void *)ru, "MainCu", -1, OAI_PRIORITY_RT_MAX);
+ break;
+ case SPLIT73_DU:
+ threadCreate(&t, du_fs6, (void *)ru, "MainDuRx", -1, OAI_PRIORITY_RT_MAX);
+ break;
+ default:
+ threadCreate(&t, ru_thread, (void *)ru, "MainRu", -1, OAI_PRIORITY_RT_MAX);
+ }
+}
+
+// Create per UE structures
+void init_transport(PHY_VARS_eNB *eNB) {
+ LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
+ LOG_I(PHY, "Initialise transport\n");
+
+ for (int i=0; i<NUMBER_OF_UE_MAX; i++) {
+ LOG_D(PHY,"Allocating Transport Channel Buffers for DLSCH, UE %d\n",i);
+
+ for (int j=0; j<2; j++) {
+ AssertFatal( (eNB->dlsch[i][j] = new_eNB_dlsch(1,8,NSOFT,fp->N_RB_DL,0,fp)) != NULL,
+ "Can't get eNB dlsch structures for UE %d \n", i);
+ eNB->dlsch[i][j]->rnti=0;
+ LOG_D(PHY,"dlsch[%d][%d] => %p rnti:%d\n",i,j,eNB->dlsch[i][j], eNB->dlsch[i][j]->rnti);
+ }
+
+ LOG_D(PHY,"Allocating Transport Channel Buffer for ULSCH, UE %d\n",i);
+ AssertFatal((eNB->ulsch[1+i] = new_eNB_ulsch(MAX_TURBO_ITERATIONS,fp->N_RB_UL, 0)) != NULL,
+ "Can't get eNB ulsch structures\n");
+ // this is the transmission mode for the signalling channels
+ // this will be overwritten with the real transmission mode by the RRC once the UE is connected
+ eNB->transmission_mode[i] = fp->nb_antenna_ports_eNB==1 ? 1 : 2;
+ }
+
+ // ULSCH for RA
+ AssertFatal( (eNB->ulsch[0] = new_eNB_ulsch(MAX_TURBO_ITERATIONS, fp->N_RB_UL, 0)) !=NULL,
+ "Can't get eNB ulsch structures\n");
+ eNB->dlsch_SI = new_eNB_dlsch(1,8,NSOFT,fp->N_RB_DL, 0, fp);
+ LOG_D(PHY,"eNB %d.%d : SI %p\n",eNB->Mod_id,eNB->CC_id,eNB->dlsch_SI);
+ eNB->dlsch_ra = new_eNB_dlsch(1,8,NSOFT,fp->N_RB_DL, 0, fp);
+ LOG_D(PHY,"eNB %d.%d : RA %p\n",eNB->Mod_id,eNB->CC_id,eNB->dlsch_ra);
+ eNB->dlsch_MCH = new_eNB_dlsch(1,8,NSOFT,fp->N_RB_DL, 0, fp);
+ LOG_D(PHY,"eNB %d.%d : MCH %p\n",eNB->Mod_id,eNB->CC_id,eNB->dlsch_MCH);
+ eNB->rx_total_gain_dB=130;
+
+ for(int i=0; i<NUMBER_OF_UE_MAX; i++)
+ eNB->mu_mimo_mode[i].dl_pow_off = 2;
+
+ eNB->check_for_total_transmissions = 0;
+ eNB->check_for_MUMIMO_transmissions = 0;
+ eNB->FULL_MUMIMO_transmissions = 0;
+ eNB->check_for_SUMIMO_transmissions = 0;
+ fp->pucch_config_common.deltaPUCCH_Shift = 1;
+}
+
+void init_eNB_afterRU(void) {
+ for (int inst=0; inst<RC.nb_inst; inst++) {
+ for (int CC_id=0; CC_id<RC.nb_CC[inst]; CC_id++) {
+ PHY_VARS_eNB *eNB = RC.eNB[inst][CC_id];
+ phy_init_lte_eNB(eNB,0,0);
+ eNB->frame_parms.nb_antennas_rx = 0;
+ eNB->frame_parms.nb_antennas_tx = 0;
+ eNB->prach_vars.rxsigF[0] = (int16_t **)malloc16(64*sizeof(int16_t *));
+
+ for (int ce_level=0; ce_level<4; ce_level++) {
+ eNB->prach_vars_br.rxsigF[ce_level] = (int16_t **)malloc16(64*sizeof(int16_t *));
+ }
+
+ for (int ru_id=0,aa=0; ru_id<eNB->num_RU; ru_id++) {
+ eNB->frame_parms.nb_antennas_rx += eNB->RU_list[ru_id]->nb_rx;
+ eNB->frame_parms.nb_antennas_tx += eNB->RU_list[ru_id]->nb_tx;
+ AssertFatal(eNB->RU_list[ru_id]->common.rxdataF!=NULL,
+ "RU %d : common.rxdataF is NULL\n",
+ eNB->RU_list[ru_id]->idx);
+ AssertFatal(eNB->RU_list[ru_id]->prach_rxsigF!=NULL,
+ "RU %d : prach_rxsigF is NULL\n",
+ eNB->RU_list[ru_id]->idx);
+
+ for (int i=0; i<eNB->RU_list[ru_id]->nb_rx; aa++,i++) {
+ LOG_I(PHY,"Attaching RU %d antenna %d to eNB antenna %d\n",eNB->RU_list[ru_id]->idx,i,aa);
+ eNB->prach_vars.rxsigF[0][aa] = eNB->RU_list[ru_id]->prach_rxsigF[i];
+
+ for (int ce_level=0; ce_level<4; ce_level++)
+ eNB->prach_vars_br.rxsigF[ce_level][aa] = eNB->RU_list[ru_id]->prach_rxsigF_br[ce_level][i];
+
+ eNB->common_vars.rxdataF[aa] = eNB->RU_list[ru_id]->common.rxdataF[i];
+ }
+ }
+
+ AssertFatal( eNB->frame_parms.nb_antennas_rx > 0 && eNB->frame_parms.nb_antennas_rx < 4, "");
+ AssertFatal( eNB->frame_parms.nb_antennas_tx > 0 && eNB->frame_parms.nb_antennas_rx < 4, "");
+ LOG_I(PHY,"inst %d, CC_id %d : nb_antennas_rx %d\n",inst,CC_id,eNB->frame_parms.nb_antennas_rx);
+ init_transport(eNB);
+ //init_precoding_weights(RC.eNB[inst][CC_id]);
+ }
+ }
+}
+
+void init_eNB(int single_thread_flag,int wait_for_sync) {
+ AssertFatal(RC.eNB != NULL,"RC.eNB must have been allocated\n");
+
+ for (int inst=0; inst<RC.nb_L1_inst; inst++) {
+ AssertFatal(RC.eNB[inst] != NULL,"RC.eNB[%d] must have been allocated\n", inst);
+
+ for (int CC_id=0; CC_id<RC.nb_L1_CC[inst]; CC_id++) {
+ AssertFatal(RC.eNB[inst][CC_id] != NULL,"RC.eNB[%d][%d] must have been allocated\n", inst, CC_id);
+ PHY_VARS_eNB *eNB = RC.eNB[inst][CC_id];
+ eNB->abstraction_flag = 0;
+ eNB->single_thread_flag = single_thread_flag;
+ AssertFatal((eNB->if_inst = IF_Module_init(inst))!=NULL,"Cannot register interface");
+ eNB->if_inst->schedule_response = schedule_response;
+ eNB->if_inst->PHY_config_req = phy_config_request;
+ memset((void *)&eNB->UL_INFO,0,sizeof(eNB->UL_INFO));
+ memset((void *)&eNB->Sched_INFO,0,sizeof(eNB->Sched_INFO));
+ pthread_mutex_init( &eNB->UL_INFO_mutex, NULL);
+ LOG_I(PHY,"Setting indication lists\n");
+ eNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list = eNB->rx_pdu_list;
+ eNB->UL_INFO.crc_ind.crc_indication_body.crc_pdu_list = eNB->crc_pdu_list;
+ eNB->UL_INFO.sr_ind.sr_indication_body.sr_pdu_list = eNB->sr_pdu_list;
+ eNB->UL_INFO.harq_ind.harq_indication_body.harq_pdu_list = eNB->harq_pdu_list;
+ eNB->UL_INFO.cqi_ind.cqi_indication_body.cqi_pdu_list = eNB->cqi_pdu_list;
+ eNB->UL_INFO.cqi_ind.cqi_indication_body.cqi_raw_pdu_list = eNB->cqi_raw_pdu_list;
+ eNB->prach_energy_counter = 0;
+ }
+ }
+
+ SET_LOG_DEBUG(PRACH);
+}
+
+void stop_eNB(int nb_inst) {
+ for (int inst=0; inst<nb_inst; inst++) {
+ LOG_I(PHY,"Killing eNB %d processing threads\n",inst);
+ kill_eNB_proc(inst);
+ }
+}
+
+// this is for RU with local RF unit
+void fill_rf_config(RU_t *ru, char *rf_config_file) {
+ int i;
+ LTE_DL_FRAME_PARMS *fp = ru->frame_parms;
+ openair0_config_t *cfg = &ru->openair0_cfg;
+ //printf("////////////////numerology in config = %d\n",numerology);
+ int numerology = get_softmodem_params()->numerology;
+
+ if(fp->N_RB_DL == 100) {
+ if(numerology == 0) {
+ if (fp->threequarter_fs) {
+ cfg->sample_rate=23.04e6;
+ cfg->samples_per_frame = 230400;
+ cfg->tx_bw = 10e6;
+ cfg->rx_bw = 10e6;
+ } else {
+ cfg->sample_rate=30.72e6;
+ cfg->samples_per_frame = 307200;
+ cfg->tx_bw = 10e6;
+ cfg->rx_bw = 10e6;
+ }
+ } else if(numerology == 1) {
+ cfg->sample_rate=61.44e6;
+ cfg->samples_per_frame = 307200;
+ cfg->tx_bw = 20e6;
+ cfg->rx_bw = 20e6;
+ } else if(numerology == 2) {
+ cfg->sample_rate=122.88e6;
+ cfg->samples_per_frame = 307200;
+ cfg->tx_bw = 40e6;
+ cfg->rx_bw = 40e6;
+ } else {
+ LOG_E(PHY,"Wrong input for numerology %d\n setting to 20MHz normal CP configuration",numerology);
+ cfg->sample_rate=30.72e6;
+ cfg->samples_per_frame = 307200;
+ cfg->tx_bw = 10e6;
+ cfg->rx_bw = 10e6;
+ }
+ } else if(fp->N_RB_DL == 50) {
+ cfg->sample_rate=15.36e6;
+ cfg->samples_per_frame = 153600;
+ cfg->tx_bw = 5e6;
+ cfg->rx_bw = 5e6;
+ } else if (fp->N_RB_DL == 25) {
+ cfg->sample_rate=7.68e6;
+ cfg->samples_per_frame = 76800;
+ cfg->tx_bw = 2.5e6;
+ cfg->rx_bw = 2.5e6;
+ } else if (fp->N_RB_DL == 6) {
+ cfg->sample_rate=1.92e6;
+ cfg->samples_per_frame = 19200;
+ cfg->tx_bw = 1.5e6;
+ cfg->rx_bw = 1.5e6;
+ } else AssertFatal(1==0,"Unknown N_RB_DL %d\n",fp->N_RB_DL);
+
+ if (fp->frame_type==TDD)
+ cfg->duplex_mode = duplex_mode_TDD;
+ else //FDD
+ cfg->duplex_mode = duplex_mode_FDD;
+
+ cfg->Mod_id = 0;
+ cfg->num_rb_dl=fp->N_RB_DL;
+ cfg->tx_num_channels=ru->nb_tx;
+ cfg->rx_num_channels=ru->nb_rx;
+ cfg->clock_source=get_softmodem_params()->clock_source;
+
+ for (i=0; i<ru->nb_tx; i++) {
+ cfg->tx_freq[i] = (double)fp->dl_CarrierFreq;
+ cfg->rx_freq[i] = (double)fp->ul_CarrierFreq;
+ cfg->tx_gain[i] = (double)ru->att_tx;
+ cfg->rx_gain[i] = ru->max_rxgain-(double)ru->att_rx;
+ cfg->configFilename = rf_config_file;
+ LOG_I(PHY,"channel %d, Setting tx_gain offset %f, rx_gain offset %f, tx_freq %f, rx_freq %f\n",
+ i, cfg->tx_gain[i],
+ cfg->rx_gain[i],
+ cfg->tx_freq[i],
+ cfg->rx_freq[i]);
+ }
+}
+
+/* this function maps the RU tx and rx buffers to the available rf chains.
+ Each rf chain is is addressed by the card number and the chain on the card. The
+ rf_map specifies for each antenna port, on which rf chain the mapping should start. Multiple
+ antennas are mapped to successive RF chains on the same card. */
+int setup_RU_buffers(RU_t *ru) {
+ //uint16_t N_TA_offset = 0;
+ LTE_DL_FRAME_PARMS *frame_parms;
+ AssertFatal(ru, "ru is NULL");
+ frame_parms = ru->frame_parms;
+ LOG_I(PHY,"setup_RU_buffers: frame_parms = %p\n",frame_parms);
+
+ if (frame_parms->frame_type == TDD) {
+ if (frame_parms->N_RB_DL == 100) {
+ ru->N_TA_offset = 624;
+ } else if (frame_parms->N_RB_DL == 50) {
+ ru->N_TA_offset = 624/2;
+ ru->sf_extension /= 2;
+ ru->end_of_burst_delay /= 2;
+ } else if (frame_parms->N_RB_DL == 25) {
+ ru->N_TA_offset = 624/4;
+ ru->sf_extension /= 4;
+ ru->end_of_burst_delay /= 4;
+ } else {
+ LOG_E(PHY,"not handled, todo\n");
+ exit(1);
+ }
+ } else {
+ ru->N_TA_offset = 0;
+ ru->sf_extension = 0;
+ ru->end_of_burst_delay = 0;
+ }
+
+ return(0);
+}
+
+void init_precoding_weights(PHY_VARS_eNB *eNB) {
+ int layer,ru_id,aa,re,ue,tb;
+ LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
+ RU_t *ru;
+ LTE_eNB_DLSCH_t *dlsch;
+
+ // init precoding weigths
+ for (ue=0; ue<NUMBER_OF_UE_MAX; ue++) {
+ for (tb=0; tb<2; tb++) {
+ dlsch = eNB->dlsch[ue][tb];
+
+ for (layer=0; layer<4; layer++) {
+ int nb_tx=0;
+
+ for (ru_id=0; ru_id<RC.nb_RU; ru_id++) {
+ ru = RC.ru[ru_id];
+ nb_tx+=ru->nb_tx;
+ }
+
+ dlsch->ue_spec_bf_weights[layer] = (int32_t **)malloc16(nb_tx*sizeof(int32_t *));
+
+ for (aa=0; aa<nb_tx; aa++) {
+ dlsch->ue_spec_bf_weights[layer][aa] = (int32_t *)malloc16(fp->ofdm_symbol_size*sizeof(int32_t));
+
+ for (re=0; re<fp->ofdm_symbol_size; re++) {
+ dlsch->ue_spec_bf_weights[layer][aa][re] = 0x00007fff;
+ }
+ }
+ }
+ }
+ }
+}
+
+void ocp_rx_prach(PHY_VARS_eNB *eNB,
+ L1_rxtx_proc_t *proc,
+ RU_t *ru,
+ uint16_t *max_preamble,
+ uint16_t *max_preamble_energy,
+ uint16_t *max_preamble_delay,
+ uint16_t *avg_preamble_energy,
+ uint16_t Nf,
+ uint8_t tdd_mapindex,
+ uint8_t br_flag) {
+ int i;
+ int prach_mask=0;
+
+ if (br_flag == 0) {
+ rx_prach0(eNB,ru,proc->frame_prach, proc->subframe_prach,
+ max_preamble,max_preamble_energy,max_preamble_delay,avg_preamble_energy,Nf,tdd_mapindex,0,0);
+ } else { // This is procedure for eMTC, basically handling the repetitions
+ prach_mask = is_prach_subframe(&eNB->frame_parms,proc->frame_prach_br,proc->subframe_prach_br);
+
+ for (i=0; i<4; i++) {
+ if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[i]==1) &&
+ ((prach_mask&(1<<(i+1))) > 0)) { // check that prach CE level is active now
+
+ // if first reception in group of repetitions store frame for later (in RA-RNTI for Msg2)
+ if (eNB->prach_vars_br.repetition_number[i]==0) eNB->prach_vars_br.first_frame[i]=proc->frame_prach_br;
+
+ // increment repetition number
+ eNB->prach_vars_br.repetition_number[i]++;
+ // do basic PRACH reception
+ rx_prach0(eNB,ru,proc->frame_prach, proc->subframe_prach_br,
+ max_preamble,max_preamble_energy,max_preamble_delay,avg_preamble_energy,Nf,tdd_mapindex,1,i);
+
+ // if last repetition, clear counter
+ if (eNB->prach_vars_br.repetition_number[i] == eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[i]) {
+ eNB->prach_vars_br.repetition_number[i]=0;
+ }
+ }
+ } /* for i ... */
+ } /* else br_flag == 0 */
+}
+
+void prach_procedures_ocp(PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc, int br_flag) {
+ uint16_t max_preamble[4],max_preamble_energy[4],max_preamble_delay[4],avg_preamble_energy[4];
+ RU_t *ru;
+ int aa=0;
+ int ru_aa;
+
+ for (int i=0; i<eNB->num_RU; i++) {
+ ru=eNB->RU_list[i];
+
+ for (ru_aa=0,aa=0; ru_aa<ru->nb_rx; ru_aa++,aa++) {
+ eNB->prach_vars.rxsigF[0][aa] = eNB->RU_list[i]->prach_rxsigF[ru_aa];
+ int ce_level;
+
+ if (br_flag==1)
+ for (ce_level=0; ce_level<4; ce_level++)
+ eNB->prach_vars_br.rxsigF[ce_level][aa] = eNB->RU_list[i]->prach_rxsigF_br[ce_level][ru_aa];
+ }
+ }
+
+ // run PRACH detection for CE-level 0 only for now when br_flag is set
+ ocp_rx_prach(eNB,
+ proc,
+ eNB->RU_list[0],
+ &max_preamble[0],
+ &max_preamble_energy[0],
+ &max_preamble_delay[0],
+ &avg_preamble_energy[0],
+ proc->frame_prach,
+ 0
+ ,br_flag
+ );
+ LOG_D(PHY,"RACH detection index 0: max preamble: %u, energy: %u, delay: %u, avg energy: %u\n",
+ max_preamble[0],
+ max_preamble_energy[0],
+ max_preamble_delay[0],
+ avg_preamble_energy[0]
+ );
+
+ if (br_flag==1) {
+ int prach_mask;
+ prach_mask = is_prach_subframe (&eNB->frame_parms, proc->frame_prach_br, proc->subframe_prach_br);
+ eNB->UL_INFO.rach_ind_br.rach_indication_body.preamble_list = eNB->preamble_list_br;
+ int ind = 0;
+ int ce_level = 0;
+ /* Save for later, it doesn't work
+ for (int ind=0,ce_level=0;ce_level<4;ce_level++) {
+
+ if ((eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[ce_level]==1)&&
+ (prach_mask&(1<<(1+ce_level)) > 0) && // prach is active and CE level has finished its repetitions
+ (eNB->prach_vars_br.repetition_number[ce_level]==
+ eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[ce_level])) {
+
+ */
+
+ if (eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_CElevel_enable[0] == 1) {
+ if ((eNB->prach_energy_counter == 100) && (max_preamble_energy[0] > eNB->measurements.prach_I0 + eNB->prach_DTX_threshold_emtc[0])) {
+ eNB->UL_INFO.rach_ind_br.rach_indication_body.number_of_preambles++;
+ eNB->preamble_list_br[ind].preamble_rel8.timing_advance = max_preamble_delay[ind]; //
+ eNB->preamble_list_br[ind].preamble_rel8.preamble = max_preamble[ind];
+ // note: fid is implicitly 0 here, this is the rule for eMTC RA-RNTI from 36.321, Section 5.1.4
+ eNB->preamble_list_br[ind].preamble_rel8.rnti = 1 + proc->subframe_prach + (60*(eNB->prach_vars_br.first_frame[ce_level] % 40));
+ eNB->preamble_list_br[ind].instance_length = 0; //don't know exactly what this is
+ eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type = 1 + ce_level; // CE Level
+ LOG_I (PHY, "Filling NFAPI indication for RACH %d CELevel %d (mask %x) : TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
+ ind,
+ ce_level,
+ prach_mask,
+ eNB->preamble_list_br[ind].preamble_rel8.timing_advance,
+ eNB->preamble_list_br[ind].preamble_rel8.preamble, eNB->preamble_list_br[ind].preamble_rel8.rnti, eNB->preamble_list_br[ind].preamble_rel13.rach_resource_type);
+ }
+ }
+
+ /*
+ ind++;
+ }
+ } */// ce_level
+ } else if ((eNB->prach_energy_counter == 100) &&
+ (max_preamble_energy[0] > eNB->measurements.prach_I0+eNB->prach_DTX_threshold)) {
+ LOG_I(PHY,"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure with preamble %d, energy %d.%d dB, delay %d\n",
+ eNB->Mod_id,
+ eNB->CC_id,
+ proc->frame_prach,
+ proc->subframe_prach,
+ max_preamble[0],
+ max_preamble_energy[0]/10,
+ max_preamble_energy[0]%10,
+ max_preamble_delay[0]);
+ pthread_mutex_lock(&eNB->UL_INFO_mutex);
+ eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 1;
+ eNB->UL_INFO.rach_ind.rach_indication_body.preamble_list = &eNB->preamble_list[0];
+ eNB->UL_INFO.rach_ind.rach_indication_body.tl.tag = NFAPI_RACH_INDICATION_BODY_TAG;
+ eNB->UL_INFO.rach_ind.header.message_id = NFAPI_RACH_INDICATION;
+ eNB->UL_INFO.rach_ind.sfn_sf = proc->frame_prach<<4 | proc->subframe_prach;
+ eNB->preamble_list[0].preamble_rel8.tl.tag = NFAPI_PREAMBLE_REL8_TAG;
+ eNB->preamble_list[0].preamble_rel8.timing_advance = max_preamble_delay[0];
+ eNB->preamble_list[0].preamble_rel8.preamble = max_preamble[0];
+ eNB->preamble_list[0].preamble_rel8.rnti = 1+proc->subframe_prach; // note: fid is implicitly 0 here
+ eNB->preamble_list[0].preamble_rel13.rach_resource_type = 0;
+ eNB->preamble_list[0].instance_length = 0; //don't know exactly what this is
+
+ if (NFAPI_MODE==NFAPI_MODE_PNF) { // If NFAPI PNF then we need to send the message to the VNF
+ LOG_D(PHY,"Filling NFAPI indication for RACH : SFN_SF:%d TA %d, Preamble %d, rnti %x, rach_resource_type %d\n",
+ NFAPI_SFNSF2DEC(eNB->UL_INFO.rach_ind.sfn_sf),
+ eNB->preamble_list[0].preamble_rel8.timing_advance,
+ eNB->preamble_list[0].preamble_rel8.preamble,
+ eNB->preamble_list[0].preamble_rel8.rnti,
+ eNB->preamble_list[0].preamble_rel13.rach_resource_type);
+ oai_nfapi_rach_ind(&eNB->UL_INFO.rach_ind);
+ eNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 0;
+ }
+
+ pthread_mutex_unlock(&eNB->UL_INFO_mutex);
+ } // max_preamble_energy > prach_I0 + 100
+ else {
+ eNB->measurements.prach_I0 = ((eNB->measurements.prach_I0*900)>>10) + ((avg_preamble_energy[0]*124)>>10);
+
+ if (eNB->prach_energy_counter < 100)
+ eNB->prach_energy_counter++;
+ }
+} // else br_flag
+
+void prach_eNB(PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc, int frame,int subframe) {
+ // check if we have to detect PRACH first
+ if (is_prach_subframe(&eNB->frame_parms, frame,subframe)>0) {
+ prach_procedures_ocp(eNB, proc, 0);
+ prach_procedures_ocp(eNB, proc, 1);
+ }
+}
+
+static inline int rxtx(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, char *thread_name) {
+ AssertFatal( eNB !=NULL, "");
+
+ if (NFAPI_MODE==NFAPI_MODE_PNF) {
+ // I am a PNF and I need to let nFAPI know that we have a (sub)frame tick
+ //add_subframe(&frame, &subframe, 4);
+ //oai_subframe_ind(proc->frame_tx, proc->subframe_tx);
+ oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
+ }
+
+ AssertFatal( !(NFAPI_MODE==NFAPI_MODE_PNF &&
+ eNB->pdcch_vars[proc->subframe_tx&1].num_pdcch_symbols == 0), "");
+ prach_eNB(eNB,proc,proc->frame_rx,proc->subframe_rx);
+ release_UE_in_freeList(eNB->Mod_id);
+
+ // UE-specific RX processing for subframe n
+ if (NFAPI_MODE==NFAPI_MONOLITHIC || NFAPI_MODE==NFAPI_MODE_PNF) {
+ phy_procedures_eNB_uespec_RX(eNB, proc);
+ }
+
+ pthread_mutex_lock(&eNB->UL_INFO_mutex);
+ eNB->UL_INFO.frame = proc->frame_rx;
+ eNB->UL_INFO.subframe = proc->subframe_rx;
+ eNB->UL_INFO.module_id = eNB->Mod_id;
+ eNB->UL_INFO.CC_id = eNB->CC_id;
+ eNB->if_inst->UL_indication(&eNB->UL_INFO, proc);
+ pthread_mutex_unlock(&eNB->UL_INFO_mutex);
+ phy_procedures_eNB_TX(eNB, proc, 1);
+ return(0);
+}
+
+void rx_rf(RU_t *ru, L1_rxtx_proc_t *proc) {
+ LTE_DL_FRAME_PARMS *fp = ru->frame_parms;
+ void *rxp[ru->nb_rx];
+ unsigned int rxs;
+ int i;
+ openair0_timestamp ts=0, timestamp_rx;
+ static openair0_timestamp old_ts=0;
+
+ for (i=0; i<ru->nb_rx; i++)
+ //receive in the next slot
+ rxp[i] = (void *)&ru->common.rxdata[i][((proc->subframe_rx+1)%10)*fp->samples_per_tti];
+
+ rxs = ru->rfdevice.trx_read_func(&ru->rfdevice,
+ &ts,
+ rxp,
+ fp->samples_per_tti,
+ ru->nb_rx);
+ timestamp_rx = ts-ru->ts_offset;
+
+ // AssertFatal(rxs == fp->samples_per_tti,
+ // "rx_rf: Asked for %d samples, got %d from SDR\n",fp->samples_per_tti,rxs);
+ if(rxs != fp->samples_per_tti) {
+ LOG_E(PHY,"rx_rf: Asked for %d samples, got %d from SDR\n",fp->samples_per_tti,rxs);
+#if defined(USRP_REC_PLAY)
+ exit_fun("Exiting IQ record/playback");
+#else
+ //exit_fun( "problem receiving samples" );
+ LOG_E(PHY, "problem receiving samples");
+#endif
+ }
+
+ if (old_ts != 0 && timestamp_rx - old_ts != fp->samples_per_tti) {
+ LOG_E(HW,"impossible shift in rx stream, rx: %ld, previous rx distance: %ld, should be %d\n", timestamp_rx, proc->timestamp_rx - old_ts, fp->samples_per_tti);
+ //ru->ts_offset += (proc->timestamp_rx - old_ts - fp->samples_per_tti);
+ //proc->timestamp_rx = ts-ru->ts_offset;
+ }
+
+ old_ts=timestamp_rx;
+ setAllfromTS(timestamp_rx, proc);
+}
+
+void ocp_tx_rf(RU_t *ru, L1_rxtx_proc_t *proc) {
+ LTE_DL_FRAME_PARMS *fp = ru->frame_parms;
+ void *txp[ru->nb_tx];
+ int i;
+ lte_subframe_t SF_type = subframe_select(fp,proc->subframe_tx%10);
+ lte_subframe_t prevSF_type = subframe_select(fp,(proc->subframe_tx+9)%10);
+ int sf_extension = 0;
+
+ if ((SF_type == SF_DL) ||
+ (SF_type == SF_S)) {
+ int siglen=fp->samples_per_tti,flags=1;
+
+ if (SF_type == SF_S) {
+ /* end_of_burst_delay is used to stop TX only "after a while".
+ * If we stop right after effective signal, with USRP B210 and
+ * B200mini, we observe a high EVM on the S subframe (on the
+ * PSS).
+ * A value of 400 (for 30.72MHz) solves this issue. This is
+ * the default.
+ */
+ siglen = (fp->ofdm_symbol_size + fp->nb_prefix_samples0)
+ + (fp->dl_symbols_in_S_subframe - 1) * (fp->ofdm_symbol_size + fp->nb_prefix_samples)
+ + ru->end_of_burst_delay;
+ flags=3; // end of burst
+ }
+
+ if (fp->frame_type == TDD &&
+ SF_type == SF_DL &&
+ prevSF_type == SF_UL) {
+ flags = 2; // start of burst
+ sf_extension = ru->sf_extension;
+ }
+
+#if defined(__x86_64) || defined(__i386__)
+#ifdef __AVX2__
+ sf_extension = (sf_extension)&0xfffffff8;
+#else
+ sf_extension = (sf_extension)&0xfffffffc;
+#endif
+#elif defined(__arm__)
+ sf_extension = (sf_extension)&0xfffffffc;
+#endif
+
+ for (i=0; i<ru->nb_tx; i++)
+ txp[i] = (void *)&ru->common.txdata[i][(proc->subframe_tx*fp->samples_per_tti)-sf_extension];
+
+ /* add fail safe for late command end */
+ // prepare tx buffer pointers
+ ru->rfdevice.trx_write_func(&ru->rfdevice,
+ proc->timestamp_tx+ru->ts_offset-ru->openair0_cfg.tx_sample_advance-sf_extension,
+ txp,
+ siglen+sf_extension,
+ ru->nb_tx,
+ flags);
+ LOG_D(PHY,"[TXPATH] RU %d tx_rf, writing to TS %llu, frame %d, subframe %d\n",ru->idx,
+ (long long unsigned int)proc->timestamp_tx,proc->frame_tx,proc->subframe_tx);
+ }
+
+ return;
+}
+
+static void *ru_thread( void *param ) {
+ setbuf(stdout, NULL);
+ setbuf(stderr, NULL);
+ RU_t *ru = (RU_t *)param;
+ L1_rxtx_proc_t L1proc= {0};
+ // We pick the global thread pool from the legacy code global vars
+ L1proc.threadPool=RC.eNB[0][0]->proc.L1_proc.threadPool;
+ L1proc.respEncode=RC.eNB[0][0]->proc.L1_proc.respEncode;
+ L1proc.respDecode=RC.eNB[0][0]->proc.L1_proc.respDecode;
+
+ if (ru->if_south == LOCAL_RF) { // configure RF parameters only
+ fill_rf_config(ru,ru->rf_config_file);
+ init_frame_parms(ru->frame_parms,1);
+ phy_init_RU(ru);
+ init_rf(ru);
+ }
+
+ AssertFatal(setup_RU_buffers(ru)==0, "Exiting, cannot initialize RU Buffers\n");
+ LOG_I(PHY, "Signaling main thread that RU %d is ready\n",ru->idx);
+ wait_sync("ru_thread");
+
+ // Start RF device if any
+ if (ru->rfdevice.trx_start_func(&ru->rfdevice) != 0)
+ LOG_E(HW,"Could not start the RF device\n");
+ else LOG_I(PHY,"RU %d rf device ready\n",ru->idx);
+
+ // This is a forever while loop, it loops over subframes which are scheduled by incoming samples from HW devices
+ while (!oai_exit) {
+ // synchronization on input FH interface, acquire signals/data and block
+ rx_rf(ru, &L1proc);
+ // do RX front-end processing (frequency-shift, dft) if needed
+ fep_full(ru, L1proc.subframe_rx);
+
+ // At this point, all information for subframe has been received on FH interface
+ // If this proc is to provide synchronization, do so
+ // Fixme: not used
+ // wakeup_slaves(proc);
+ for (int i=0; i<ru->num_eNB; i++) {
+ char string[20];
+ sprintf(string,"Incoming RU %d",ru->idx);
+
+ if (rxtx(ru->eNB_list[i],&L1proc,string) < 0)
+ LOG_E(PHY,"eNB %d CC_id %d failed during execution\n",
+ ru->eNB_list[i]->Mod_id,ru->eNB_list[i]->CC_id);
+ }
+
+ // do TX front-end processing if needed (precoding and/or IDFTs)
+ feptx_prec(ru, L1proc.frame_tx, L1proc.subframe_tx);
+ // do OFDM if needed
+ feptx_ofdm(ru, L1proc.frame_tx, L1proc.subframe_tx);
+ // do outgoing fronthaul (south) if needed
+ ocp_tx_rf(ru, &L1proc);
+ }
+
+ LOG_W(PHY,"Exiting ru_thread \n");
+ ru->rfdevice.trx_end_func(&ru->rfdevice);
+ LOG_I(PHY,"RU %d rf device stopped\n",ru->idx);
+ return NULL;
+}
+
+int init_rf(RU_t *ru) {
+ char name[256];
+ pthread_getname_np(pthread_self(),name, 255);
+ pthread_setname_np(pthread_self(),"UHD for OAI");
+ int ret=openair0_device_load(&ru->rfdevice,&ru->openair0_cfg);
+ pthread_setname_np(pthread_self(),name);
+ return ret;
+}
+
+void init_RU(char *rf_config_file, int send_dmrssync) {
+ RU_t *ru;
+ PHY_VARS_eNB *eNB0= (PHY_VARS_eNB *)NULL;
+ int i;
+ int CC_id;
+ // read in configuration file)
+ LOG_I(PHY,"configuring RU from file\n");
+ LOG_I(PHY,"number of L1 instances %d, number of RU %d, number of CPU cores %d\n",
+ RC.nb_L1_inst,RC.nb_RU,get_nprocs());
+
+ if (RC.nb_CC != 0)
+ for (i=0; i<RC.nb_L1_inst; i++)
+ for (CC_id=0; CC_id<RC.nb_CC[i]; CC_id++)
+ RC.eNB[i][CC_id]->num_RU=0;
+
+ LOG_D(PHY,"Process RUs RC.nb_RU:%d\n",RC.nb_RU);
+
+ for (int ru_id=0; ru_id<RC.nb_RU; ru_id++) {
+ LOG_D(PHY,"Process RC.ru[%d]\n",ru_id);
+ ru = RC.ru[ru_id];
+ ru->rf_config_file = rf_config_file;
+ ru->idx = ru_id;
+ ru->ts_offset = 0;
+
+ if (ru->is_slave == 1) {
+ ru->in_synch = 0;
+ ru->generate_dmrs_sync = 0;
+ } else {
+ ru->in_synch = 1;
+ ru->generate_dmrs_sync=send_dmrssync;
+ }
+
+ ru->cmd = EMPTY;
+ ru->south_out_cnt= 0;
+
+ // ru->generate_dmrs_sync = (ru->is_slave == 0) ? 1 : 0;
+ if (ru->generate_dmrs_sync == 1) {
+ generate_ul_ref_sigs();
+ ru->dmrssync = (int16_t *)malloc16_clear(ru->frame_parms->ofdm_symbol_size*2*sizeof(int16_t));
+ }
+
+ ru->wakeup_L1_sleeptime = 2000;
+ ru->wakeup_L1_sleep_cnt_max = 3;
+
+ if (ru->num_eNB > 0) {
+ LOG_D(PHY, "%s() RC.ru[%d].num_eNB:%d ru->eNB_list[0]:%p RC.eNB[0][0]:%p rf_config_file:%s\n",
+ __FUNCTION__, ru_id, ru->num_eNB, ru->eNB_list[0], RC.eNB[0][0], ru->rf_config_file);
+ AssertFatal(ru->eNB_list[0], "ru->eNB_list is not initialized\n");
+ } else {
+ LOG_E(PHY,"Wrong data model, assigning eNB 0, carrier 0 to RU 0\n");
+ ru->eNB_list[0] = RC.eNB[0][0];
+ ru->num_eNB=1;
+ }
+
+ eNB0 = ru->eNB_list[0];
+ // datamodel error in regular OAI: a RU uses one single eNB carrier parameters!
+ ru->frame_parms = &eNB0->frame_parms;
+
+ for (i=0; i<ru->num_eNB; i++) {
+ eNB0 = ru->eNB_list[i];
+ int ruIndex=eNB0->num_RU++;
+ eNB0->RU_list[ruIndex] = ru;
+ }
+ } // for ru_id
+}
+
+void stop_RU(int nb_ru) {
+ for (int inst = 0; inst < nb_ru; inst++) {
+ LOG_I(PHY, "Stopping RU %d processing threads\n", inst);
+ kill_RU_proc(RC.ru[inst]);
+ }
+}
+
+/* --------------------------------------------------------*/
+/* from here function to use configuration module */
+static int DEFBFW[] = {0x00007fff};
+void RCconfig_RU(void) {
+ paramdef_t RUParams[] = RUPARAMS_DESC;
+ paramlist_def_t RUParamList = {CONFIG_STRING_RU_LIST,NULL,0};
+ config_getlist( &RUParamList,RUParams,sizeof(RUParams)/sizeof(paramdef_t), NULL);
+
+ if ( RUParamList.numelt == 0 ) {
+ LOG_W(PHY, "Calling RCconfig_RU while no ru\n");
+ RC.nb_RU = 0;
+ return;
+ } // setting != NULL
+
+ if ( RC.ru != NULL ) {
+ LOG_W(PHY, "Calling RCconfig_RU twice (nb ru=%d), ignoring the second call data structure is %p\n",
+ RUParamList.numelt,RC.ru);
+ return;
+ }
+
+ RC.ru = (RU_t **)malloc(RC.nb_RU*sizeof(RU_t *));
+
+ for (int j = 0; j < RC.nb_RU; j++) {
+ RC.ru[j] = (RU_t *)calloc(sizeof(RU_t), 1);
+ RC.ru[j]->idx = j;
+ LOG_I(PHY,"Creating RC.ru[%d]:%p\n", j, RC.ru[j]);
+ RC.ru[j]->if_timing = synch_to_ext_device;
+ paramdef_t *vals=RUParamList.paramarray[j];
+
+ if (RC.nb_L1_inst >0)
+ RC.ru[j]->num_eNB = vals[RU_ENB_LIST_IDX].numelt;
+ else
+ RC.ru[j]->num_eNB = 0;
+
+ for (int i=0; i<RC.ru[j]->num_eNB; i++)
+ RC.ru[j]->eNB_list[i] = RC.eNB[vals[RU_ENB_LIST_IDX].iptr[i]][0];
+
+ if (config_isparamset(vals, RU_SDR_ADDRS)) {
+ RC.ru[j]->openair0_cfg.sdr_addrs = strdup(*(vals[RU_SDR_ADDRS].strptr));
+ }
+
+ if (config_isparamset(vals, RU_SDR_CLK_SRC)) {
+ char *paramVal=*(vals[RU_SDR_CLK_SRC].strptr);
+ LOG_D(PHY, "RU clock source set as %s\n", paramVal);
+
+ if (strcmp(paramVal, "internal") == 0) {
+ RC.ru[j]->openair0_cfg.clock_source = internal;
+ } else if (strcmp(paramVal, "external") == 0) {
+ RC.ru[j]->openair0_cfg.clock_source = external;
+ } else if (strcmp(paramVal, "gpsdo") == 0) {
+ RC.ru[j]->openair0_cfg.clock_source = gpsdo;
+ } else {
+ LOG_E(PHY, "Erroneous RU clock source in the provided configuration file: '%s'\n", paramVal);
+ }
+ }
+
+ if (strcmp(*(vals[RU_LOCAL_RF_IDX].strptr), "yes") == 0) {
+ if ( !(config_isparamset(vals,RU_LOCAL_IF_NAME_IDX)) ) {
+ RC.ru[j]->if_south = LOCAL_RF;
+ RC.ru[j]->function = eNodeB_3GPP;
+ LOG_I(PHY, "Setting function for RU %d to eNodeB_3GPP\n",j);
+ } else {
+ RC.ru[j]->eth_params.local_if_name = strdup(*(vals[RU_LOCAL_IF_NAME_IDX].strptr));
+ RC.ru[j]->eth_params.my_addr = strdup(*(vals[RU_LOCAL_ADDRESS_IDX].strptr));
+ RC.ru[j]->eth_params.remote_addr = strdup(*(vals[RU_REMOTE_ADDRESS_IDX].strptr));
+ RC.ru[j]->eth_params.my_portc = *(vals[RU_LOCAL_PORTC_IDX].uptr);
+ RC.ru[j]->eth_params.remote_portc = *(vals[RU_REMOTE_PORTC_IDX].uptr);
+ RC.ru[j]->eth_params.my_portd = *(vals[RU_LOCAL_PORTD_IDX].uptr);
+ RC.ru[j]->eth_params.remote_portd = *(vals[RU_REMOTE_PORTD_IDX].uptr);
+ }
+
+ RC.ru[j]->max_pdschReferenceSignalPower = *(vals[RU_MAX_RS_EPRE_IDX].uptr);;
+ RC.ru[j]->max_rxgain = *(vals[RU_MAX_RXGAIN_IDX].uptr);
+ RC.ru[j]->num_bands = vals[RU_BAND_LIST_IDX].numelt;
+ /* sf_extension is in unit of samples for 30.72MHz here, has to be scaled later */
+ RC.ru[j]->sf_extension = *(vals[RU_SF_EXTENSION_IDX].uptr);
+ RC.ru[j]->end_of_burst_delay = *(vals[RU_END_OF_BURST_DELAY_IDX].uptr);
+
+ for (int i=0; i<RC.ru[j]->num_bands; i++) RC.ru[j]->band[i] = vals[RU_BAND_LIST_IDX].iptr[i];
+ } else {
+ LOG_I(PHY,"RU %d: Transport %s\n",j,*(vals[RU_TRANSPORT_PREFERENCE_IDX].strptr));
+ RC.ru[j]->eth_params.local_if_name = strdup(*(vals[RU_LOCAL_IF_NAME_IDX].strptr));
+ RC.ru[j]->eth_params.my_addr = strdup(*(vals[RU_LOCAL_ADDRESS_IDX].strptr));
+ RC.ru[j]->eth_params.remote_addr = strdup(*(vals[RU_REMOTE_ADDRESS_IDX].strptr));
+ RC.ru[j]->eth_params.my_portc = *(vals[RU_LOCAL_PORTC_IDX].uptr);
+ RC.ru[j]->eth_params.remote_portc = *(vals[RU_REMOTE_PORTC_IDX].uptr);
+ RC.ru[j]->eth_params.my_portd = *(vals[RU_LOCAL_PORTD_IDX].uptr);
+ RC.ru[j]->eth_params.remote_portd = *(vals[RU_REMOTE_PORTD_IDX].uptr);
+ } /* strcmp(local_rf, "yes") != 0 */
+
+ RC.ru[j]->nb_tx = *(vals[RU_NB_TX_IDX].uptr);
+ RC.ru[j]->nb_rx = *(vals[RU_NB_RX_IDX].uptr);
+ RC.ru[j]->att_tx = *(vals[RU_ATT_TX_IDX].uptr);
+ RC.ru[j]->att_rx = *(vals[RU_ATT_RX_IDX].uptr);
+ }// j=0..num_rus
+
+ return;
+}
+
+
+static void get_options(void) {
+ CONFIG_SETRTFLAG(CONFIG_NOEXITONHELP);
+ get_common_options(SOFTMODEM_ENB_BIT);
+ CONFIG_CLEARRTFLAG(CONFIG_NOEXITONHELP);
+
+ if ( !(CONFIG_ISFLAGSET(CONFIG_ABORT)) ) {
+ memset((void *)&RC,0,sizeof(RC));
+ /* Read RC configuration file */
+ RCConfig();
+ NB_eNB_INST = RC.nb_inst;
+ printf("Configuration: nb_rrc_inst %d, nb_L1_inst %d, nb_ru %d\n",NB_eNB_INST,RC.nb_L1_inst,RC.nb_RU);
+
+ if (!IS_SOFTMODEM_NONBIOT) {
+ load_NB_IoT();
+ printf(" nb_nbiot_rrc_inst %d, nb_nbiot_L1_inst %d, nb_nbiot_macrlc_inst %d\n",
+ RC.nb_nb_iot_rrc_inst, RC.nb_nb_iot_L1_inst, RC.nb_nb_iot_macrlc_inst);
+ } else {
+ printf("All Nb-IoT instances disabled\n");
+ RC.nb_nb_iot_rrc_inst=RC.nb_nb_iot_L1_inst=RC.nb_nb_iot_macrlc_inst=0;
+ }
+ }
+}
+
+void set_default_frame_parms(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) {
+ int CC_id;
+
+ for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
+ frame_parms[CC_id] = (LTE_DL_FRAME_PARMS *) malloc(sizeof(LTE_DL_FRAME_PARMS));
+ /* Set some default values that may be overwritten while reading options */
+ frame_parms[CC_id]->frame_type = FDD;
+ frame_parms[CC_id]->tdd_config = 3;
+ frame_parms[CC_id]->tdd_config_S = 0;
+ frame_parms[CC_id]->N_RB_DL = 100;
+ frame_parms[CC_id]->N_RB_UL = 100;
+ frame_parms[CC_id]->Ncp = NORMAL;
+ frame_parms[CC_id]->Ncp_UL = NORMAL;
+ frame_parms[CC_id]->Nid_cell = 0;
+ frame_parms[CC_id]->num_MBSFN_config = 0;
+ frame_parms[CC_id]->nb_antenna_ports_eNB = 1;
+ frame_parms[CC_id]->nb_antennas_tx = 1;
+ frame_parms[CC_id]->nb_antennas_rx = 1;
+ frame_parms[CC_id]->nushift = 0;
+ frame_parms[CC_id]->phich_config_common.phich_resource = oneSixth;
+ frame_parms[CC_id]->phich_config_common.phich_duration = normal;
+ // UL RS Config
+ frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift = 0;//n_DMRS1 set to 0
+ frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.groupHoppingEnabled = 0;
+ frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled = 0;
+ frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH = 0;
+ frame_parms[CC_id]->prach_config_common.rootSequenceIndex=22;
+ frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig=1;
+ frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.prach_ConfigIndex=0;
+ frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.highSpeedFlag=0;
+ frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.prach_FreqOffset=0;
+ // downlink_frequency[CC_id][0] = 2680000000; // Use float to avoid issue with frequency over 2^31.
+ // downlink_frequency[CC_id][1] = downlink_frequency[CC_id][0];
+ // downlink_frequency[CC_id][2] = downlink_frequency[CC_id][0];
+ // downlink_frequency[CC_id][3] = downlink_frequency[CC_id][0];
+ //printf("Downlink for CC_id %d frequency set to %u\n", CC_id, downlink_frequency[CC_id][0]);
+ frame_parms[CC_id]->dl_CarrierFreq=downlink_frequency[CC_id][0];
+ }
+}
+
+void init_pdcp(void) {
+ if (!NODE_IS_DU(RC.rrc[0]->node_type)) {
+ pdcp_layer_init();
+ uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
+ (PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
+
+ if (IS_SOFTMODEM_NOS1)
+ pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT ;
+
+ pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_W_MBMS_BIT;
+
+ if ( split73!=SPLIT73_DU)
+ pdcp_module_init(pdcp_initmask);
+
+ if (NODE_IS_CU(RC.rrc[0]->node_type)) {
+ pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t)proto_agent_send_rlc_data_req);
+ } else {
+ pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
+ pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
+ }
+ } else {
+ pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) proto_agent_send_pdcp_data_ind);
+ }
+}
+
+static void wait_nfapi_init(char *thread_name) {
+ printf( "waiting for NFAPI PNF connection and population of global structure (%s)\n",thread_name);
+ pthread_mutex_lock( &nfapi_sync_mutex );
+
+ while (nfapi_sync_var<0)
+ pthread_cond_wait( &nfapi_sync_cond, &nfapi_sync_mutex );
+
+ pthread_mutex_unlock(&nfapi_sync_mutex);
+ printf( "NFAPI: got sync (%s)\n", thread_name);
+}
+
+void terminate_task(module_id_t mod_id, task_id_t from, task_id_t to) {
+ LOG_I(ENB_APP, "sending TERMINATE_MESSAGE from task %s (%d) to task %s (%d)\n",
+ itti_get_task_name(from), from, itti_get_task_name(to), to);
+ MessageDef *msg;
+ msg = itti_alloc_new_message (from, TERMINATE_MESSAGE);
+ itti_send_msg_to_task (to, ENB_MODULE_ID_TO_INSTANCE(mod_id), msg);
+}
+
+int stop_L1L2(module_id_t enb_id) {
+ LOG_W(ENB_APP, "stopping lte-softmodem\n");
+
+ if (!RC.ru) {
+ LOG_UI(ENB_APP, "no RU configured\n");
+ return -1;
+ }
+
+ /* these tasks need to pick up new configuration */
+ terminate_task(enb_id, TASK_ENB_APP, TASK_RRC_ENB);
+ oai_exit = 1;
+ LOG_I(ENB_APP, "calling kill_RU_proc() for instance %d\n", enb_id);
+ kill_RU_proc(RC.ru[enb_id]);
+ LOG_I(ENB_APP, "calling kill_eNB_proc() for instance %d\n", enb_id);
+ kill_eNB_proc(enb_id);
+ oai_exit = 0;
+
+ for (int cc_id = 0; cc_id < RC.nb_CC[enb_id]; cc_id++) {
+ free_transport(RC.eNB[enb_id][cc_id]);
+ phy_free_lte_eNB(RC.eNB[enb_id][cc_id]);
+ }
+
+ phy_free_RU(RC.ru[enb_id]);
+ free_lte_top();
+ return 0;
+}
+
+/*
+ * Restart the lte-softmodem after it has been soft-stopped with stop_L1L2()
+ */
+int restart_L1L2(module_id_t enb_id) {
+ RU_t *ru = RC.ru[enb_id];
+ MessageDef *msg_p = NULL;
+ LOG_W(ENB_APP, "restarting lte-softmodem\n");
+ /* block threads */
+ pthread_mutex_lock(&sync_mutex);
+ sync_var = -1;
+ pthread_mutex_unlock(&sync_mutex);
+ RC.ru_mask |= (1 << ru->idx);
+ /* copy the changed frame parameters to the RU */
+ /* TODO this should be done for all RUs associated to this eNB */
+ memcpy(&ru->frame_parms, &RC.eNB[enb_id][0]->frame_parms, sizeof(LTE_DL_FRAME_PARMS));
+ /* reset the list of connected UEs in the MAC, since in this process with
+ * loose all UEs (have to reconnect) */
+ init_UE_info(&RC.mac[enb_id]->UE_info);
+ LOG_I(ENB_APP, "attempting to create ITTI tasks\n");
+ // No more rrc thread, as many race conditions are hidden behind
+ rrc_enb_init();
+ itti_mark_task_ready(TASK_RRC_ENB);
+ /* pass a reconfiguration request which will configure everything down to
+ * RC.eNB[i][j]->frame_parms, too */
+ msg_p = itti_alloc_new_message(TASK_ENB_APP, RRC_CONFIGURATION_REQ);
+ RRC_CONFIGURATION_REQ(msg_p) = RC.rrc[enb_id]->configuration;
+ itti_send_msg_to_task(TASK_RRC_ENB, ENB_MODULE_ID_TO_INSTANCE(enb_id), msg_p);
+ /* TODO XForms might need to be restarted, but it is currently (09/02/18)
+ * broken, so we cannot test it */
+ init_RU_proc(ru);
+ ru->rf_map.card = 0;
+ ru->rf_map.chain = 0; /* CC_id + chain_offset;*/
+ init_eNB_afterRU();
+ printf("Sending sync to all threads\n");
+ pthread_mutex_lock(&sync_mutex);
+ sync_var=0;
+ pthread_cond_broadcast(&sync_cond);
+ pthread_mutex_unlock(&sync_mutex);
+ return 0;
+}
+
+int main ( int argc, char **argv ) {
+ int i;
+ int CC_id = 0;
+ int node_type = ngran_eNB;
+ AssertFatal(load_configmodule(argc,argv,0), "[SOFTMODEM] Error, configuration module init failed\n");
+ logInit();
+ printf("Reading in command-line options\n");
+ get_options ();
+ AssertFatal(!CONFIG_ISFLAGSET(CONFIG_ABORT),"Getting configuration failed\n");
+ EPC_MODE_ENABLED = !IS_SOFTMODEM_NOS1;
+#if T_TRACER
+ T_Config_Init();
+#endif
+ configure_linux();
+ cpuf=get_cpu_freq_GHz();
+ set_taus_seed (0);
+
+ if (opp_enabled ==1)
+ reset_opp_meas();
+
+ itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+ init_opt();
+#ifndef PACKAGE_VERSION
+# define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
+#endif
+ LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
+
+ /* Read configuration */
+ if (RC.nb_inst > 0) {
+ // Allocate memory from RC variable
+ read_config_and_init();
+ } else {
+ printf("RC.nb_inst = 0, Initializing L1\n");
+ RCconfig_L1();
+ }
+
+ /* We need to read RU configuration before FlexRAN starts so it knows what
+ * splits to report. Actual RU start comes later. */
+ if (RC.nb_RU > 0 && NFAPI_MODE != NFAPI_MODE_VNF) {
+ RCconfig_RU();
+ LOG_I(PHY,
+ "number of L1 instances %d, number of RU %d, number of CPU cores %d\n",
+ RC.nb_L1_inst, RC.nb_RU, get_nprocs());
+ }
+
+ if ( strlen(get_softmodem_params()->split73) > 0 ) {
+ char tmp[1024]={0};
+ strncpy(tmp,get_softmodem_params()->split73, 1023);
+ tmp[2]=0;
+ if ( strncasecmp(tmp,"cu", 2)==0 )
+ split73=SPLIT73_CU;
+ else if ( strncasecmp(tmp,"du", 2)==0 )
+ split73=SPLIT73_DU;
+ else
+ AssertFatal(false,"split73 syntax: <cu|du>:<remote ip addr>[:<ip port>] (string found: %s) \n",get_softmodem_params()->split73);
+ }
+
+ if (RC.nb_inst > 0) {
+ /* Start the agent. If it is turned off in the configuration, it won't start */
+ for (i = 0; i < RC.nb_inst; i++) {
+ flexran_agent_start(i);
+ }
+
+ /* initializes PDCP and sets correct RLC Request/PDCP Indication callbacks
+ * for monolithic/F1 modes */
+ init_pdcp();
+ AssertFatal(create_tasks(1)==0,"cannot create ITTI tasks\n");
+
+ for (int enb_id = 0; enb_id < RC.nb_inst; enb_id++) {
+ MessageDef *msg_p = itti_alloc_new_message (TASK_ENB_APP, RRC_CONFIGURATION_REQ);
+ RRC_CONFIGURATION_REQ(msg_p) = RC.rrc[enb_id]->configuration;
+ itti_send_msg_to_task (TASK_RRC_ENB, ENB_MODULE_ID_TO_INSTANCE(enb_id), msg_p);
+ }
+
+ node_type = RC.rrc[0]->node_type;
+ }
+
+ if (RC.nb_inst > 0 && NODE_IS_CU(node_type)) {
+ protocol_ctxt_t ctxt;
+ ctxt.module_id = 0 ;
+ ctxt.instance = 0;
+ ctxt.rnti = 0;
+ ctxt.enb_flag = 1;
+ ctxt.frame = 0;
+ ctxt.subframe = 0;
+ pdcp_run(&ctxt);
+ }
+
+ /* start threads if only L1 or not a CU */
+ if (RC.nb_inst == 0 || !NODE_IS_CU(node_type) || NFAPI_MODE == NFAPI_MODE_PNF || NFAPI_MODE == NFAPI_MODE_VNF) {
+ // init UE_PF_PO and mutex lock
+ pthread_mutex_init(&ue_pf_po_mutex, NULL);
+ memset (&UE_PF_PO[0][0], 0, sizeof(UE_PF_PO_t)*MAX_MOBILES_PER_ENB*MAX_NUM_CCs);
+ pthread_cond_init(&sync_cond,NULL);
+ pthread_mutex_init(&sync_mutex, NULL);
+
+ if (NFAPI_MODE!=NFAPI_MONOLITHIC) {
+ LOG_I(ENB_APP,"NFAPI*** - mutex and cond created - will block shortly for completion of PNF connection\n");
+ pthread_cond_init(&sync_cond,NULL);
+ pthread_mutex_init(&sync_mutex, NULL);
+ }
+
+ if (NFAPI_MODE==NFAPI_MODE_VNF) {// VNF
+#if defined(PRE_SCD_THREAD)
+ init_ru_vnf(); // ru pointer is necessary for pre_scd.
+#endif
+ wait_nfapi_init("main?");
+ }
+
+ LOG_I(ENB_APP,"START MAIN THREADS\n");
+ // start the main threads
+ number_of_cards = 1;
+ printf("RC.nb_L1_inst:%d\n", RC.nb_L1_inst);
+
+ if (RC.nb_L1_inst > 0) {
+ printf("Initializing eNB threads single_thread_flag:%d wait_for_sync:%d\n",
+ get_softmodem_params()->single_thread_flag,
+ get_softmodem_params()->wait_for_sync);
+ init_eNB(get_softmodem_params()->single_thread_flag,
+ get_softmodem_params()->wait_for_sync);
+ }
+
+ for (int x=0; x < RC.nb_L1_inst; x++)
+ for (int CC_id=0; CC_id<RC.nb_L1_CC[x]; CC_id++) {
+ L1_rxtx_proc_t *L1proc= &RC.eNB[x][CC_id]->proc.L1_proc;
+ L1proc->threadPool=(tpool_t *)malloc(sizeof(tpool_t));
+ L1proc->respEncode=(notifiedFIFO_t *) malloc(sizeof(notifiedFIFO_t));
+ L1proc->respDecode=(notifiedFIFO_t *) malloc(sizeof(notifiedFIFO_t));
+
+ if ( strlen(get_softmodem_params()->threadPoolConfig) > 0 )
+ initTpool(get_softmodem_params()->threadPoolConfig, L1proc->threadPool, true);
+ else
+ initTpool("n", L1proc->threadPool, true);
+
+ initNotifiedFIFO(L1proc->respEncode);
+ initNotifiedFIFO(L1proc->respDecode);
+ }
+ }
+
+ printf("About to Init RU threads RC.nb_RU:%d\n", RC.nb_RU);
+
+ // RU thread and some L1 procedure aren't necessary in VNF or L2 FAPI simulator.
+ // but RU thread deals with pre_scd and this is necessary in VNF and simulator.
+ // some initialization is necessary and init_ru_vnf do this.
+ if (RC.nb_RU >0 && NFAPI_MODE!=NFAPI_MODE_VNF) {
+ printf("Initializing RU threads\n");
+ init_RU(get_softmodem_params()->rf_config_file,
+ get_softmodem_params()->send_dmrs_sync);
+
+ for (int ru_id=0; ru_id<RC.nb_RU; ru_id++) {
+ RC.ru[ru_id]->rf_map.card=0;
+ RC.ru[ru_id]->rf_map.chain=CC_id+(get_softmodem_params()->chain_offset);
+ LOG_I(PHY,"Starting ru_thread %d\n",ru_id);
+ init_RU_proc(RC.ru[ru_id]);
+ }
+
+ config_sync_var=0;
+
+ if (NFAPI_MODE==NFAPI_MODE_PNF) { // PNF
+ wait_nfapi_init("main?");
+ }
+
+ LOG_I(ENB_APP,"RC.nb_RU:%d\n", RC.nb_RU);
+ // once all RUs are ready intiailize the rest of the eNBs ((dependence on final RU parameters after configuration)
+ printf("ALL RUs ready - init eNBs\n");
+
+ if (NFAPI_MODE!=NFAPI_MODE_PNF && NFAPI_MODE!=NFAPI_MODE_VNF) {
+ LOG_I(ENB_APP,"Not NFAPI mode - call init_eNB_afterRU()\n");
+ init_eNB_afterRU();
+ } else {
+ LOG_I(ENB_APP,"NFAPI mode - DO NOT call init_eNB_afterRU()\n");
+ }
+
+ LOG_UI(ENB_APP,"ALL RUs ready - ALL eNBs ready\n");
+ // connect the TX/RX buffers
+ sleep(1); /* wait for thread activation */
+ LOG_I(ENB_APP,"Sending sync to all threads\n");
+ pthread_mutex_lock(&sync_mutex);
+ sync_var=0;
+ pthread_cond_broadcast(&sync_cond);
+ pthread_mutex_unlock(&sync_mutex);
+ config_check_unknown_cmdlineopt(CONFIG_CHECKALLSECTIONS);
+ }
+
+ create_tasks_mbms(1);
+ // wait for end of program
+ LOG_UI(ENB_APP,"TYPE <CTRL-C> TO TERMINATE\n");
+ // CI -- Flushing the std outputs for the previous marker to show on the eNB / DU / CU log file
+ fflush(stdout);
+ fflush(stderr);
+
+ // end of CI modifications
+ //getchar();
+ if(IS_SOFTMODEM_DOFORMS)
+ load_softscope("enb");
+
+ itti_wait_tasks_end();
+ oai_exit=1;
+ LOG_I(ENB_APP,"oai_exit=%d\n",oai_exit);
+ // stop threads
+
+ if (RC.nb_inst == 0 || !NODE_IS_CU(node_type)) {
+ if(IS_SOFTMODEM_DOFORMS)
+ end_forms();
+
+ LOG_I(ENB_APP,"stopping MODEM threads\n");
+ stop_eNB(NB_eNB_INST);
+ stop_RU(RC.nb_RU);
+
+ /* release memory used by the RU/eNB threads (incomplete), after all
+ * threads have been stopped (they partially use the same memory) */
+ for (int inst = 0; inst < NB_eNB_INST; inst++) {
+ for (int cc_id = 0; cc_id < RC.nb_CC[inst]; cc_id++) {
+ free_transport(RC.eNB[inst][cc_id]);
+ phy_free_lte_eNB(RC.eNB[inst][cc_id]);
+ }
+ }
+
+ for (int inst = 0; inst < RC.nb_RU; inst++) {
+ phy_free_RU(RC.ru[inst]);
+ }
+
+ free_lte_top();
+ end_configmodule();
+ pthread_cond_destroy(&sync_cond);
+ pthread_mutex_destroy(&sync_mutex);
+ pthread_cond_destroy(&nfapi_sync_cond);
+ pthread_mutex_destroy(&nfapi_sync_mutex);
+ pthread_mutex_destroy(&ue_pf_po_mutex);
+
+ for(int ru_id=0; ru_id<RC.nb_RU; ru_id++) {
+ if (RC.ru[ru_id]->rfdevice.trx_end_func) {
+ RC.ru[ru_id]->rfdevice.trx_end_func(&RC.ru[ru_id]->rfdevice);
+ RC.ru[ru_id]->rfdevice.trx_end_func = NULL;
+ }
+
+ if (RC.ru[ru_id]->ifdevice.trx_end_func) {
+ RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
+ RC.ru[ru_id]->ifdevice.trx_end_func = NULL;
+ }
+ }
+ }
+
+ terminate_opt();
+ logClean();
+ printf("Bye.\n");
+ return 0;
+}
diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index afac4e0c54f81b6c9413f3d02902555c430af5ff..9003f6835778ce51024d387ac2cfef93f86d7362 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -185,8 +185,8 @@ static inline int rxtx(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int frame_t
wakeup_prach_gNB(gNB,NULL,proc->frame_rx,proc->slot_rx);
}
*/
-
// Call the scheduler
+
pthread_mutex_lock(&gNB->UL_INFO_mutex);
gNB->UL_INFO.frame = frame_rx;
gNB->UL_INFO.slot = slot_rx;
@@ -324,7 +324,7 @@ static void *gNB_L1_thread( void *param ) {
gNB_L1_rxtx_proc_t *L1_proc = &gNB_proc->L1_proc;
//PHY_VARS_gNB *gNB = RC.gNB[0][proc->CC_id];
char thread_name[100];
-
+ // set default return value
// set default return value
gNB_thread_rxtx_status = 0;
@@ -421,7 +421,7 @@ int wakeup_txfh(PHY_VARS_gNB *gNB,gNB_L1_rxtx_proc_t *proc,int frame_tx,int slot
int waitret = 0, ret = 0, time_ns = 1000*1000;
struct timespec now, abstime;
-
+ // note this should depend on the numerology used by the TX L1 thread, set here for 500us slot time
// note this should depend on the numerology used by the TX L1 thread, set here for 500us slot time
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL,1);
time_ns = time_ns/gNB->frame_parms.slots_per_subframe;
@@ -443,27 +443,27 @@ int wakeup_txfh(PHY_VARS_gNB *gNB,gNB_L1_rxtx_proc_t *proc,int frame_tx,int slot
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL,0);
if (waitret == ETIMEDOUT) {
- LOG_W(PHY,"Dropping TX slot (%d.%d) because FH is blocked more than 1 slot times (500us)\n",frame_tx,slot_tx);
+ LOG_W(PHY,"Dropping TX slot (%d.%d) because FH is blocked more than 1 slot times (500us)\n",frame_tx,slot_tx);
- AssertFatal((ret=pthread_mutex_lock(&gNB->proc.mutex_RU_tx))==0,"mutex_lock returns %d\n",ret);
- gNB->proc.RU_mask_tx = 0;
- AssertFatal((ret=pthread_mutex_unlock(&gNB->proc.mutex_RU_tx))==0,"mutex_unlock returns %d\n",ret);
- AssertFatal((ret=pthread_mutex_lock(&proc->mutex_RUs_tx))==0,"mutex_lock returns %d\n",ret);
- proc->instance_cnt_RUs = 0;
- VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_UE,proc->instance_cnt_RUs);
- AssertFatal((ret=pthread_mutex_unlock(&proc->mutex_RUs_tx))==0,"mutex_unlock returns %d\n",ret);
+ AssertFatal((ret=pthread_mutex_lock(&gNB->proc.mutex_RU_tx))==0,"mutex_lock returns %d\n",ret);
+ gNB->proc.RU_mask_tx = 0;
+ AssertFatal((ret=pthread_mutex_unlock(&gNB->proc.mutex_RU_tx))==0,"mutex_unlock returns %d\n",ret);
+ AssertFatal((ret=pthread_mutex_lock(&proc->mutex_RUs_tx))==0,"mutex_lock returns %d\n",ret);
+ proc->instance_cnt_RUs = 0;
+ VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_UE,proc->instance_cnt_RUs);
+ AssertFatal((ret=pthread_mutex_unlock(&proc->mutex_RUs_tx))==0,"mutex_unlock returns %d\n",ret);
- VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_UE,1);
- VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_UE,0);
+ VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_UE,1);
+ VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_UE,0);
+
+ return(-1);
+ }
- return(-1);
- }
-
for(int i=0; i<gNB->num_RU; i++)
{
ru = gNB->RU_list[i];
ru_proc = &ru->proc;
-
+
if (ru_proc->instance_cnt_gNBs == 0) {
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST_UE, 1);
@@ -484,10 +484,10 @@ int wakeup_txfh(PHY_VARS_gNB *gNB,gNB_L1_rxtx_proc_t *proc,int frame_tx,int slot
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX1_UE, ru_proc->instance_cnt_gNBs);
- LOG_D(PHY,"Signaling tx_thread_fh for %d.%d\n",frame_tx,slot_tx);
+ LOG_D(PHY,"Signaling tx_thread_fh for %d.%d\n",frame_tx,slot_tx);
// the thread can now be woken up
AssertFatal(pthread_cond_signal(&ru_proc->cond_gNBs) == 0,
- "[gNB] ERROR pthread_cond_signal for gNB TXnp4 thread\n");
+ "[gNB] ERROR pthread_cond_signal for gNB TXnp4 thread\n");
AssertFatal((ret=pthread_mutex_unlock(&ru_proc->mutex_gNBs))==0,"mutex_unlock returned %d\n",ret);
}
@@ -505,7 +505,7 @@ int wakeup_tx(PHY_VARS_gNB *gNB,int frame_rx,int slot_rx,int frame_tx,int slot_t
AssertFatal((ret = pthread_mutex_lock(&L1_proc_tx->mutex))==0,"mutex_lock returns %d\n",ret);
- while(L1_proc_tx->instance_cnt == 0){
+ while(L1_proc_tx->instance_cnt == 0) {
pthread_cond_wait(&L1_proc_tx->cond,&L1_proc_tx->mutex);
}
@@ -521,7 +521,7 @@ int wakeup_tx(PHY_VARS_gNB *gNB,int frame_rx,int slot_rx,int frame_tx,int slot_t
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX1_UE,1);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX1_UE,0);
-
+ // the thread can now be woken up
// the thread can now be woken up
AssertFatal(pthread_cond_signal(&L1_proc_tx->cond) == 0, "ERROR pthread_cond_signal for gNB L1 thread\n");
@@ -541,11 +541,11 @@ int wakeup_rxtx(PHY_VARS_gNB *gNB,RU_t *ru) {
int time_ns = 50000;
AssertFatal((ret=pthread_mutex_lock(&proc->mutex_RU))==0,"mutex_lock returns %d\n",ret);
- for (i=0;i<gNB->num_RU;i++) {
+ for (i=0; i<gNB->num_RU; i++) {
if (ru == gNB->RU_list[i]) {
if ((proc->RU_mask&(1<<i)) > 0)
- LOG_E(PHY,"gNB %d frame %d, subframe %d : previous information from RU %d (num_RU %d,mask %x) has not been served yet!\n",
- gNB->Mod_id,proc->frame_rx,proc->slot_rx,ru->idx,gNB->num_RU,proc->RU_mask);
+ LOG_E(PHY,"gNB %d frame %d, subframe %d : previous information from RU %d (num_RU %d,mask %x) has not been served yet!\n",
+ gNB->Mod_id,proc->frame_rx,proc->slot_rx,ru->idx,gNB->num_RU,proc->RU_mask);
proc->RU_mask |= (1<<i);
}
}
@@ -572,16 +572,16 @@ int wakeup_rxtx(PHY_VARS_gNB *gNB,RU_t *ru) {
AssertFatal((ret=pthread_mutex_timedlock(&L1_proc->mutex, &abstime)) == 0,"mutex_lock returns %d\n", ret);
if (L1_proc->instance_cnt == 0) { // L1_thread is busy so abort the subframe
- AssertFatal((ret=pthread_mutex_unlock( &L1_proc->mutex))==0,"muex_unlock return %d\n",ret);
- LOG_W(PHY,"L1_thread isn't ready in %d.%d, aborting RX processing\n",ru_proc->frame_rx,ru_proc->tti_rx);
- return(-1);
+ AssertFatal((ret=pthread_mutex_unlock( &L1_proc->mutex))==0,"muex_unlock return %d\n",ret);
+ LOG_W(PHY,"L1_thread isn't ready in %d.%d, aborting RX processing\n",ru_proc->frame_rx,ru_proc->tti_rx);
+ return(-1);
}
-
+
++L1_proc->instance_cnt;
-
- // We have just received and processed the common part of a subframe, say n.
- // TS_rx is the last received timestamp (start of 1st slot), TS_tx is the desired
+ // We have just received and processed the common part of a subframe, say n.
+ // TS_rx is the last received timestamp (start of 1st slot), TS_tx is the desired
// transmitted timestamp of the next TX slot (first).
+
// The last (TS_rx mod samples_per_frame) was n*samples_per_tti,
// we want to generate subframe (n+sf_ahead), so TS_tx = TX_rx+sf_ahead*samples_per_tti,
// and proc->slot_tx = proc->slot_rx+sf_ahead
@@ -601,7 +601,7 @@ int wakeup_rxtx(PHY_VARS_gNB *gNB,RU_t *ru) {
exit_fun( "ERROR pthread_cond_signal" );
return(-1);
}
-
+
return(0);
}
/*
@@ -705,9 +705,9 @@ static void* gNB_thread_prach( void* param ) {
extern void init_td_thread(PHY_VARS_gNB *);
extern void init_te_thread(PHY_VARS_gNB *);
-static void* process_stats_thread(void* param) {
+static void *process_stats_thread(void *param) {
- PHY_VARS_gNB *gNB = (PHY_VARS_gNB*)param;
+ PHY_VARS_gNB *gNB = (PHY_VARS_gNB *)param;
reset_meas(&gNB->dlsch_encoding_stats);
reset_meas(&gNB->dlsch_scrambling_stats);
diff --git a/executables/nr-ru.c b/executables/nr-ru.c
index 337502d6cb2aa84c73b8c935fcb78dd78982499d..f947395f4a077708c5bf61c029401235f8409762 100644
--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
@@ -1,41 +1,24 @@
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2014 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-*******************************************************************************/
-
-/*! \file lte-enb.c
- * \brief Top-level threads for eNodeB
- * \author R. Knopp, F. Kaltenberger, Navid Nikaein
- * \date 2012
- * \version 0.1
- * \company Eurecom
- * \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr, navid.nikaein@eurecom.fr
- * \note
- * \warning
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
*/
+
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
@@ -91,7 +74,7 @@ unsigned short config_frames[4] = {2,9,11,13};
static int DEFBANDS[] = {7};
static int DEFENBS[] = {0};
static int DEFBFW[] = {0x00007fff};
-
+
//static int DEFNRBANDS[] = {7};
//static int DEFGNBS[] = {0};
@@ -711,7 +694,7 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
}
-void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
+void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
RU_proc_t *proc = &ru->proc;
NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
nfapi_nr_config_request_scf_t *cfg = &ru->gNB_list[0]->gNB_config;
@@ -882,7 +865,7 @@ void *ru_thread_prach( void *param ) {
0,0
);
}
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_RU_PRACH_RX, 0 );*/
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_RU_PRACH_RX, 0 );*/
if (release_thread(&proc->mutex_prach,&proc->instance_cnt_prach,"ru_prach_thread") < 0) break;
}
@@ -1109,16 +1092,16 @@ void fill_rf_config(RU_t *ru, char *rf_config_file) {
}
} else if(N_RB == 106) {
if (fp->threequarter_fs) {
- cfg->sample_rate=46.08e6;
- cfg->samples_per_frame = 460800;
- cfg->tx_bw = 40e6;
- cfg->rx_bw = 40e6;
+ cfg->sample_rate=46.08e6;
+ cfg->samples_per_frame = 460800;
+ cfg->tx_bw = 40e6;
+ cfg->rx_bw = 40e6;
}
else {
- cfg->sample_rate=61.44e6;
- cfg->samples_per_frame = 614400;
- cfg->tx_bw = 40e6;
- cfg->rx_bw = 40e6;
+ cfg->sample_rate=61.44e6;
+ cfg->samples_per_frame = 614400;
+ cfg->tx_bw = 40e6;
+ cfg->rx_bw = 40e6;
}
} else {
AssertFatal(0==1,"N_RB %d not yet supported for numerology %d\n",N_RB,mu);
@@ -1240,7 +1223,7 @@ void *ru_stats_thread(void *param) {
if (ru->feprx) print_meas(&ru->ofdm_demod_stats,"feprx",NULL,NULL);
- if (ru->feptx_ofdm){
+ if (ru->feptx_ofdm) {
print_meas(&ru->precoding_stats,"feptx_prec",NULL,NULL);
print_meas(&ru->txdataF_copy_stats,"txdataF_copy",NULL,NULL);
print_meas(&ru->ofdm_mod_stats,"feptx_ofdm",NULL,NULL);
@@ -1249,7 +1232,7 @@ void *ru_stats_thread(void *param) {
if (ru->fh_north_asynch_in) print_meas(&ru->rx_fhaul,"rx_fhaul",NULL,NULL);
- print_meas(&ru->tx_fhaul,"tx_fhaul",NULL,NULL);
+ print_meas(&ru->tx_fhaul,"tx_fhaul",NULL,NULL);
if (ru->fh_north_out) {
print_meas(&ru->compression,"compression",NULL,NULL);
print_meas(&ru->transport,"transport",NULL,NULL);
@@ -1380,7 +1363,7 @@ void *ru_thread_tx( void *param ) {
L1_proc->instance_cnt_RUs = 0;
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_UE,L1_proc->instance_cnt_RUs);
AssertFatal(pthread_cond_signal(&L1_proc->cond_RUs) == 0,
- "ERROR pthread_cond_signal for gNB_L1_thread\n");
+ "ERROR pthread_cond_signal for gNB_L1_thread\n");
} //else AssertFatal(1==0,"gNB TX thread is not ready\n");
ret = pthread_mutex_unlock(&L1_proc->mutex_RUs_tx);
AssertFatal(ret == 0,"mutex_unlock returns %d\n",ret);
@@ -2293,7 +2276,7 @@ void RCconfig_RU(void)
}
}
else {
- RC.ru[j]->openair0_cfg.clock_source = unset;
+ RC.ru[j]->openair0_cfg.clock_source = unset;
}
if (config_isparamset(RUParamList.paramarray[j], RU_SDR_TME_SRC)) {
diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index 1146d281b02cf8c76470223ebe1f669ec0be670f..6dd3807f3cc1f5a92ff0aee0b30b9e3d80fe4806 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -106,7 +106,7 @@ static int wait_for_sync = 0;
unsigned int mmapped_dma=0;
int single_thread_flag=1;
-static int8_t threequarter_fs=0;
+int8_t threequarter_fs=0;
uint64_t downlink_frequency[MAX_NUM_CCs][4];
int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
@@ -169,6 +169,10 @@ uint32_t target_ul_mcs = 20;
uint32_t timing_advance = 0;
uint64_t num_missed_slots=0; // counter for the number of missed slots
+int split73=0;
+void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset) {
+ AssertFatal(false, "Must not be called in this context\n");
+}
extern void reset_opp_meas(void);
extern void print_opp_meas(void);
@@ -719,13 +723,9 @@ int restart_L1L2(module_id_t gnb_id) {
memcpy(&ru->nr_frame_parms, &RC.gNB[gnb_id]->frame_parms, sizeof(NR_DL_FRAME_PARMS));
set_function_spec_param(RC.ru[gnb_id]);
LOG_I(GNB_APP, "attempting to create ITTI tasks\n");
-
- if (itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL) < 0) {
- LOG_E(RRC, "Create task for RRC eNB failed\n");
- return -1;
- } else {
- LOG_I(RRC, "Re-created task for RRC gNB successfully\n");
- }
+ // No more rrc thread, as many race conditions are hidden behind
+ rrc_enb_init();
+ itti_mark_task_ready(TASK_RRC_ENB);
if (itti_create_task (TASK_L2L1, l2l1_task, NULL) < 0) {
LOG_E(PDCP, "Create task for L2L1 failed\n");
@@ -768,23 +768,23 @@ static void wait_nfapi_init(char *thread_name) {
void init_pdcp(void) {
//if (!NODE_IS_DU(RC.rrc[0]->node_type)) {
- pdcp_layer_init();
- uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
- (PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
+ pdcp_layer_init();
+ uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
+ (PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
- if (IS_SOFTMODEM_NOS1){
- printf("IS_SOFTMODEM_NOS1 option enabled \n");
- pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT ;
- }
+ if (IS_SOFTMODEM_NOS1) {
+ printf("IS_SOFTMODEM_NOS1 option enabled \n");
+ pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT ;
+ }
- pdcp_module_init(pdcp_initmask);
+ pdcp_module_init(pdcp_initmask);
- /*if (NODE_IS_CU(RC.rrc[0]->node_type)) {
- pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t)proto_agent_send_rlc_data_req);
- } else {*/
- pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
- pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
- //}
+ /*if (NODE_IS_CU(RC.rrc[0]->node_type)) {
+ pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t)proto_agent_send_rlc_data_req);
+ } else {*/
+ pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
+ pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
+ //}
/*} else {
pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) proto_agent_send_pdcp_data_ind);
}*/
@@ -838,7 +838,7 @@ int main( int argc, char **argv )
MSC_INIT(MSC_E_UTRAN, THREAD_MAX+TASK_MAX);
-init_opt();
+ init_opt();
#ifdef PDCP_USE_NETLINK
@@ -855,7 +855,7 @@ if(!IS_SOFTMODEM_NOS1)
LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
if(IS_SOFTMODEM_NOS1)
- init_pdcp();
+ init_pdcp();
if (RC.nb_nr_inst > 0) {
// don't create if node doesn't connect to RRC/S1/GTP
@@ -985,27 +985,27 @@ if(!IS_SOFTMODEM_NOS1)
printf("oai_exit=%d\n",oai_exit);
// stop threads
-/*#ifdef XFORMS
+ /*#ifdef XFORMS
- printf("waiting for XFORMS thread\n");
+ printf("waiting for XFORMS thread\n");
- if (do_forms==1) {
- pthread_join(forms_thread,&status);
- fl_hide_form(form_stats->stats_form);
- fl_free_form(form_stats->stats_form);
+ if (do_forms==1) {
+ pthread_join(forms_thread,&status);
+ fl_hide_form(form_stats->stats_form);
+ fl_free_form(form_stats->stats_form);
- fl_hide_form(form_stats_l2->stats_form);
- fl_free_form(form_stats_l2->stats_form);
+ fl_hide_form(form_stats_l2->stats_form);
+ fl_free_form(form_stats_l2->stats_form);
- for(UE_id=0; UE_id<scope_enb_num_ue; UE_id++) {
- for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
- fl_hide_form(form_enb[CC_id][UE_id]->phy_scope_gNB);
- fl_free_form(form_enb[CC_id][UE_id]->phy_scope_gNB);
- }
- }
- }
+ for(UE_id=0; UE_id<scope_enb_num_ue; UE_id++) {
+ for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
+ fl_hide_form(form_enb[CC_id][UE_id]->phy_scope_gNB);
+ fl_free_form(form_enb[CC_id][UE_id]->phy_scope_gNB);
+ }
+ }
+ }
-#endif*/
+ #endif*/
printf("stopping MODEM threads\n");
// cleanup
stop_gNB(NB_gNB_INST);
diff --git a/executables/nr-ue.c b/executables/nr-ue.c
index 131710ee0208f5c3dab6c59dc055269c28d37d53..a0251b26dffae81cb2dd09ac059d087c7e0f81eb 100644
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -146,7 +146,7 @@ void init_nr_ue_vars(PHY_VARS_NR_UE *ue,
ue->Mod_id = UE_id;
ue->mac_enabled = 1;
-
+ // initialize all signal buffers
// initialize all signal buffers
init_nr_ue_signal(ue,1,abstraction_flag);
// intialize transport
@@ -471,7 +471,7 @@ void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
}
}
-
+ // no UL for now
// no UL for now
/*
if (UE->mac_enabled==1) {
@@ -508,7 +508,7 @@ void UE_processing(void *arg) {
PHY_VARS_NR_UE *UE = rxtxD->UE;
uint8_t gNB_id = 0;
-
+ // params for UL time alignment procedure
// params for UL time alignment procedure
NR_UL_TIME_ALIGNMENT_t *ul_time_alignment = &UE->ul_time_alignment[gNB_id];
uint8_t numerology = UE->frame_parms.numerology_index;
@@ -521,9 +521,9 @@ void UE_processing(void *arg) {
// then timing advance is processed and set to be applied in the next UL transmission */
if (UE->mac_enabled == 1) {
- if (frame_tx == ul_time_alignment->ta_frame && slot_tx == ul_time_alignment->ta_slot){
+ if (frame_tx == ul_time_alignment->ta_frame && slot_tx == ul_time_alignment->ta_slot) {
LOG_D(PHY,"Applying timing advance -- frame %d -- slot %d\n", frame_tx, slot_tx);
-
+ //if (nfapi_mode!=3){
//if (nfapi_mode!=3){
nr_process_timing_advance(UE->Mod_id, UE->CC_id, ul_time_alignment->ta_command, numerology, bwp_ul_NB_RB);
ul_time_alignment->ta_frame = -1;
@@ -590,8 +590,8 @@ void readFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp, bool toTrash)
void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
- LOG_I(PHY,"Resynchronizing RX by %d samples (mode = %d)\n",UE->rx_offset,UE->mode);
- void *dummy_tx[UE->frame_parms.nb_antennas_tx];
+ LOG_I(PHY,"Resynchronizing RX by %d samples (mode = %d)\n",UE->rx_offset,UE->mode);
+ void *dummy_tx[UE->frame_parms.nb_antennas_tx];
*timestamp += UE->frame_parms.get_samples_per_slot(1,&UE->frame_parms);
for ( int size=UE->rx_offset ; size > 0 ; size -= UE->frame_parms.samples_per_subframe ) {
@@ -753,7 +753,7 @@ void *UE_thread(void *arg) {
#ifdef OAI_ADRV9371_ZC706
/*uint32_t total_gain_dB_prev = 0;
if (total_gain_dB_prev != UE->rx_total_gain_dB) {
- total_gain_dB_prev = UE->rx_total_gain_dB;
+ total_gain_dB_prev = UE->rx_total_gain_dB;
openair0_cfg[0].rx_gain[0] = UE->rx_total_gain_dB;
UE->rfdevice.trx_set_gains_func(&UE->rfdevice,&openair0_cfg[0]);
}*/
diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c
index 09b2c943be05404e3237f850f2e636745c190015..9b2b704833fb878ed5f9796892bb8f9811584f5a 100644
--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
@@ -213,7 +213,7 @@ int emulate_rf = 0;
tpool_t *Tpool;
#ifdef UE_DLSCH_PARALLELISATION
-tpool_t *Tpool_dl;
+ tpool_t *Tpool_dl;
#endif
@@ -309,8 +309,8 @@ static void *scope_thread(void *arg) {
while (!oai_exit) {
phy_scope_nrUE(form_nrue[0],
- PHY_vars_UE_g[0][0],
- 0,0,1);
+ PHY_vars_UE_g[0][0],
+ 0,0,1);
usleep(100*1000);
}
@@ -381,9 +381,9 @@ static void get_options(void) {
int tddflag=0, nonbiotflag, vcdflag=0;
char *loopfile=NULL;
int dumpframe=0;
-
//uint32_t noS1;
//uint32_t nokrnmod;
+ //uint32_t nokrnmod;
paramdef_t cmdline_params[] =CMDLINE_PARAMS_DESC_UE ;
config_process_cmdline( cmdline_params,sizeof(cmdline_params)/sizeof(paramdef_t),NULL);
@@ -527,12 +527,12 @@ void init_openair0(void) {
else {
openair0_cfg[card].sample_rate=122.88e6;
openair0_cfg[card].samples_per_frame = 1228800;
- }
+ }
} else {
LOG_E(PHY,"Unsupported numerology!\n");
exit(-1);
}
- }else if(frame_parms[0]->N_RB_DL == 273) {
+ } else if(frame_parms[0]->N_RB_DL == 273) {
if (numerology==1) {
if (frame_parms[0]->threequarter_fs) {
AssertFatal(0 == 1,"three quarter sampling not supported for N_RB 273\n");
@@ -540,12 +540,12 @@ void init_openair0(void) {
else {
openair0_cfg[card].sample_rate=122.88e6;
openair0_cfg[card].samples_per_frame = 1228800;
- }
+ }
} else {
LOG_E(PHY,"Unsupported numerology!\n");
exit(-1);
}
- }else if(frame_parms[0]->N_RB_DL == 106) {
+ } else if(frame_parms[0]->N_RB_DL == 106) {
if (numerology==0) {
if (frame_parms[0]->threequarter_fs) {
openair0_cfg[card].sample_rate=23.04e6;
@@ -554,15 +554,15 @@ void init_openair0(void) {
openair0_cfg[card].sample_rate=30.72e6;
openair0_cfg[card].samples_per_frame = 307200;
}
- } else if (numerology==1) {
+ } else if (numerology==1) {
if (frame_parms[0]->threequarter_fs) {
- openair0_cfg[card].sample_rate=46.08e6;
- openair0_cfg[card].samples_per_frame = 460800;
+ openair0_cfg[card].sample_rate=46.08e6;
+ openair0_cfg[card].samples_per_frame = 460800;
}
else {
- openair0_cfg[card].sample_rate=61.44e6;
- openair0_cfg[card].samples_per_frame = 614400;
- }
+ openair0_cfg[card].sample_rate=61.44e6;
+ openair0_cfg[card].samples_per_frame = 614400;
+ }
} else if (numerology==2) {
openair0_cfg[card].sample_rate=122.88e6;
openair0_cfg[card].samples_per_frame = 1228800;
@@ -638,7 +638,7 @@ void init_pdcp(void) {
pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
/*if (rlc_module_init() != 0) {
- LOG_I(RLC, "Problem at RLC initiation \n");
+ LOG_I(RLC, "Problem at RLC initiation \n");
}
pdcp_layer_init();
nr_ip_over_LTE_DRB_preconfiguration();*/
@@ -648,6 +648,11 @@ void init_pdcp(void) {
LOG_I(PDCP, "Before getting out from init_pdcp() \n");
}
+// Stupid function addition because UE itti messages queues definition is common with eNB
+void *rrc_enb_process_msg(void *notUsed) {
+ return NULL;
+}
+
int main( int argc, char **argv ) {
//uint8_t beta_ACK=0,beta_RI=0,beta_CQI=2;
@@ -675,12 +680,12 @@ int main( int argc, char **argv ) {
set_taus_seed (0);
tpool_t pool;
Tpool = &pool;
- char params[]="-1,-1";
+ char params[]="-1,-1";
initTpool(params, Tpool, false);
#ifdef UE_DLSCH_PARALLELISATION
tpool_t pool_dl;
Tpool_dl = &pool_dl;
- char params_dl[]="-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1";
+ char params_dl[]="-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1";
initTpool(params_dl, Tpool_dl, false);
#endif
cpuf=get_cpu_freq_GHz();
diff --git a/executables/softmodem-common.c b/executables/softmodem-common.c
index f714fa2bd4b0612f503259938c4430336d7b0a9b..04a58413b5a1b9f29a6d6c4626b3d648d9f4128e 100644
--- a/executables/softmodem-common.c
+++ b/executables/softmodem-common.c
@@ -81,8 +81,8 @@ char *get_softmodem_function(uint64_t *sofmodemfunc_mask_ptr) {
}
void get_common_options(uint32_t execmask) {
- uint32_t online_log_messages;
- uint32_t glog_level ;
+ uint32_t online_log_messages=0;
+ uint32_t glog_level=0 ;
uint32_t start_telnetsrv = 0;
uint32_t noS1 = 0, nokrnmod = 0, nonbiot = 0;
uint32_t rfsim = 0, basicsim = 0, do_forms = 0;
@@ -145,27 +145,27 @@ void get_common_options(uint32_t execmask) {
if(worker_config != NULL) set_worker_conf(worker_config);
}
void softmodem_printresources(int sig, telnet_printfunc_t pf) {
- struct rusage usage;
- struct timespec stop;
-
- clock_gettime(CLOCK_BOOTTIME, &stop);
-
- uint64_t elapse = (stop.tv_sec - start.tv_sec) ; // in seconds
-
-
- int st = getrusage(RUSAGE_SELF,&usage);
- if (!st) {
- pf("\nRun time: %lluh %llus\n",(unsigned long long)elapse/3600,(unsigned long long)(elapse - (elapse/3600)));
- pf("\tTime executing user inst.: %lds %ldus\n",(long)usage.ru_utime.tv_sec,(long)usage.ru_utime.tv_usec);
- pf("\tTime executing system inst.: %lds %ldus\n",(long)usage.ru_stime.tv_sec,(long)usage.ru_stime.tv_usec);
- pf("\tMax. Phy. memory usage: %ldkB\n",(long)usage.ru_maxrss);
- pf("\tPage fault number (no io): %ld\n",(long)usage.ru_minflt);
- pf("\tPage fault number (requiring io): %ld\n",(long)usage.ru_majflt);
- pf("\tNumber of file system read: %ld\n",(long)usage.ru_inblock);
- pf("\tNumber of filesystem write: %ld\n",(long)usage.ru_oublock);
- pf("\tNumber of context switch (process origin, io...): %ld\n",(long)usage.ru_nvcsw);
- pf("\tNumber of context switch (os origin, priority...): %ld\n",(long)usage.ru_nivcsw);
- }
+ struct rusage usage;
+ struct timespec stop;
+
+ clock_gettime(CLOCK_BOOTTIME, &stop);
+
+ uint64_t elapse = (stop.tv_sec - start.tv_sec) ; // in seconds
+
+
+ int st = getrusage(RUSAGE_SELF,&usage);
+ if (!st) {
+ pf("\nRun time: %lluh %llus\n",(unsigned long long)elapse/3600,(unsigned long long)(elapse - (elapse/3600)));
+ pf("\tTime executing user inst.: %lds %ldus\n",(long)usage.ru_utime.tv_sec,(long)usage.ru_utime.tv_usec);
+ pf("\tTime executing system inst.: %lds %ldus\n",(long)usage.ru_stime.tv_sec,(long)usage.ru_stime.tv_usec);
+ pf("\tMax. Phy. memory usage: %ldkB\n",(long)usage.ru_maxrss);
+ pf("\tPage fault number (no io): %ld\n",(long)usage.ru_minflt);
+ pf("\tPage fault number (requiring io): %ld\n",(long)usage.ru_majflt);
+ pf("\tNumber of file system read: %ld\n",(long)usage.ru_inblock);
+ pf("\tNumber of filesystem write: %ld\n",(long)usage.ru_oublock);
+ pf("\tNumber of context switch (process origin, io...): %ld\n",(long)usage.ru_nvcsw);
+ pf("\tNumber of context switch (os origin, priority...): %ld\n",(long)usage.ru_nivcsw);
+ }
}
void signal_handler(int sig) {
@@ -180,9 +180,9 @@ void signal_handler(int sig) {
backtrace_symbols_fd(array, size, 2);
exit(-1);
} else {
- if(sig==SIGINT ||sig==SOFTMODEM_RTSIGNAL)
- softmodem_printresources(sig,(telnet_printfunc_t)printf);
- if (sig != SOFTMODEM_RTSIGNAL) {
+ if(sig==SIGINT ||sig==SOFTMODEM_RTSIGNAL)
+ softmodem_printresources(sig,(telnet_printfunc_t)printf);
+ if (sig != SOFTMODEM_RTSIGNAL) {
printf("Linux signal %s...\n",strsignal(sig));
exit_function(__FILE__, __FUNCTION__, __LINE__,"softmodem starting exit procedure\n");
}
@@ -192,7 +192,7 @@ void signal_handler(int sig) {
void set_softmodem_sighandler(void) {
- struct sigaction act,oldact;
+ struct sigaction act,oldact;
clock_gettime(CLOCK_BOOTTIME, &start);
memset(&act,0,sizeof(act));
act.sa_handler=signal_handler;
@@ -201,6 +201,6 @@ void set_softmodem_sighandler(void) {
signal(SIGSEGV, signal_handler);
signal(SIGINT, signal_handler);
signal(SIGTERM, signal_handler);
- signal(SIGABRT, signal_handler);
+ signal(SIGABRT, signal_handler);
}
diff --git a/executables/softmodem-common.h b/executables/softmodem-common.h
index 2fac7d825e170adb9b2bfda261f1eed532a0c91b..0ac7b6449e553ed8fce94dc99ff6d35bed579815 100644
--- a/executables/softmodem-common.h
+++ b/executables/softmodem-common.h
@@ -38,6 +38,11 @@ extern "C"
#endif
/* help strings definition for command line options, used in CMDLINE_XXX_DESC macros and printed when -h option is used */
#define CONFIG_HLP_RFCFGF "Configuration file for front-end (e.g. LMS7002M)\n"
+#define CONFIG_HLP_SPLIT73 "Split 7.3 (below rate matching) option: <cu|du>:<remote ip address>:<remote port>"
+#define CONFIG_HLP_TPOOL "Thread pool configuration: \n\
+ default no pool (runs in calling thread),\n\
+ list of cores, comma separated (negative value is no core affinity)\n\
+ example: -1,3 launches two working threads one floating, the second set on core 3"
#define CONFIG_HLP_ULMAXE "set the eNodeB max ULSCH erros\n"
#define CONFIG_HLP_CALUER "set UE RX calibration\n"
#define CONFIG_HLP_CALUERM ""
@@ -89,6 +94,8 @@ extern "C"
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/*-----------------------------------------------------------------------------------------------------------------------------------------------------*/
#define RF_CONFIG_FILE softmodem_params.rf_config_file
+#define SPLIT73 softmodem_params.split73
+#define TP_CONFIG softmodem_params.threadPoolConfig
#define PHY_TEST softmodem_params.phy_test
#define WAIT_FOR_SYNC softmodem_params.wait_for_sync
#define SINGLE_THREAD_FLAG softmodem_params.single_thread_flag
@@ -104,6 +111,8 @@ extern "C"
#define CMDLINE_PARAMS_DESC { \
{"rf-config-file", CONFIG_HLP_RFCFGF, 0, strptr:(char **)&RF_CONFIG_FILE, defstrval:NULL, TYPE_STRING, sizeof(RF_CONFIG_FILE)},\
+ {"split73", CONFIG_HLP_SPLIT73, 0, strptr:(char **)&SPLIT73, defstrval:NULL, TYPE_STRING, sizeof(SPLIT73)},\
+ {"thread-pool", CONFIG_HLP_TPOOL, 0, strptr:(char **)&TP_CONFIG, defstrval:"n", TYPE_STRING, sizeof(TP_CONFIG)}, \
{"phy-test", CONFIG_HLP_PHYTST, PARAMFLAG_BOOL, iptr:&PHY_TEST, defintval:0, TYPE_INT, 0}, \
{"usim-test", CONFIG_HLP_USIM, PARAMFLAG_BOOL, u8ptr:&USIM_TEST, defintval:0, TYPE_UINT8, 0}, \
{"clock-source", CONFIG_HLP_CLK, 0, uptr:&CLOCK_SOURCE, defintval:0, TYPE_UINT, 0}, \
@@ -193,6 +202,8 @@ typedef struct {
uint64_t optmask;
//THREAD_STRUCT thread_struct;
char rf_config_file[1024];
+ char split73[1024];
+ char threadPoolConfig[1024];
int phy_test;
uint8_t usim_test;
int emulate_rf;
diff --git a/executables/split_headers.h b/executables/split_headers.h
new file mode 100644
index 0000000000000000000000000000000000000000..4e328f74c418c7f902014b99630dd4fbe2130e7a
--- /dev/null
+++ b/executables/split_headers.h
@@ -0,0 +1,329 @@
+/*
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
+*/
+
+
+#ifndef __SPLIT_HEADERS_H
+#define __SPLIT_HEADERS_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <openair1/PHY/defs_eNB.h>
+
+#define CU_PORT "7878"
+#define DU_PORT "8787"
+#define SPLIT73_CU 1
+#define SPLIT73_DU 2
+extern int split73;
+
+#define MTU 65536
+#define UDP_TIMEOUT 900000L // in micro second (struct timeval, NOT struct timespec)
+// linux may timeout for a much longer time (up to 10ms)
+#define blockAlign 32 //bytes to align memory for SIMD copy (256 bits vectors)
+
+// FS6 transport configuration and handler
+typedef struct {
+ char *sourceIP;
+ char *sourcePort;
+ char *destIP;
+ char *destPort;
+ struct addrinfo *destAddr;
+ int sockHandler;
+} UDPsock_t;
+
+#define CTsentCUv0 0xA500
+#define CTsentDUv0 0x5A00
+
+// Main FS6 transport layer header
+// All packets starts with this header
+typedef struct commonUDP_s {
+ uint64_t timestamp; // id of the group (subframe for LTE)
+ uint16_t nbBlocks; // total number of blocks for this timestamp
+ uint16_t blockID; // id: 0..nbBocks-1
+ uint16_t contentType; // defines the content format
+ uint16_t contentBytes; // will be sent in a UDP packet, so must be < 2^16 bytes
+ uint64_t senderClock;
+} commonUDP_t;
+
+// FS6 UL common header (DU to CU)
+// gives the RACH detection data and is always sent to inform the CU that a subframe arrived
+typedef struct {
+ uint16_t max_preamble[4];
+ uint16_t max_preamble_energy[4];
+ uint16_t max_preamble_delay[4];
+ uint16_t avg_preamble_energy[4];
+} fs6_ul_t;
+
+// FS6 DL common header (CU to DU)
+// gives the DCI configuration from each subframe
+typedef struct {
+ uint8_t pbch_pdu[4];
+ int num_pdcch_symbols;
+ int num_dci;
+ DCI_ALLOC_t dci_alloc[8];
+ int num_mdci;
+ int amp;
+ LTE_eNB_PHICH phich_vars;
+ uint64_t DuClock;
+ uint64_t CuSpentMicroSec;
+} fs6_dl_t;
+
+// a value to type all sub packets,
+// to detect errors, and to be able to extend to other versions
+// the first byte of each sub structure should match one of these values
+enum pckType {
+ fs6UlConfig=25,
+ fs6DlConfig=26,
+ fs6ULConfigCCH=27,
+ fs6ULsch=28,
+ fs6ULcch=29,
+ fs6ULindicationHarq=40,
+ fs6ULindicationSr=41,
+};
+
+// CU to DU definition of a future UL subframe decode
+// defines a UE future data plane
+typedef struct {
+ enum pckType type:8;
+ uint16_t UE_id;
+ int8_t harq_pid;
+ UE_type_t ue_type;
+
+ uint8_t dci_alloc;
+ uint8_t rar_alloc;
+ SCH_status_t status;
+ uint8_t Msg3_flag;
+ uint8_t subframe;
+ uint32_t frame;
+ uint8_t handled;
+ uint8_t phich_active;
+ uint8_t phich_ACK;
+ uint16_t previous_first_rb;
+ uint32_t B;
+ uint32_t G;
+ UCI_format_t uci_format;
+ uint8_t Or2;
+ uint8_t o_RI[2];
+ uint8_t o_ACK[4];
+ uint8_t O_ACK;
+ uint8_t o_RCC;
+ int16_t q_ACK[MAX_ACK_PAYLOAD];
+ int16_t q_RI[MAX_RI_PAYLOAD];
+ uint32_t RTC[MAX_NUM_ULSCH_SEGMENTS];
+ uint8_t ndi;
+ uint8_t round;
+ uint8_t rvidx;
+ uint8_t Nl;
+ uint8_t n_DMRS;
+ uint8_t previous_n_DMRS;
+ uint8_t n_DMRS2;
+ int32_t delta_TF;
+ uint32_t repetition_number ;
+ uint32_t total_number_of_repetitions;
+
+ uint16_t harq_mask;
+ uint16_t nb_rb;
+ uint8_t Qm;
+ uint16_t first_rb;
+ uint8_t O_RI;
+ uint8_t Or1;
+ uint16_t Msc_initial;
+ uint8_t Nsymb_initial;
+ uint8_t V_UL_DAI;
+ uint8_t srs_active;
+ uint32_t TBS;
+ uint8_t Nsymb_pusch;
+ uint8_t Mlimit;
+ uint8_t max_turbo_iterations;
+ uint8_t bundling;
+ uint16_t beta_offset_cqi_times8;
+ uint16_t beta_offset_ri_times8;
+ uint16_t beta_offset_harqack_times8;
+ uint8_t Msg3_active;
+ uint16_t rnti;
+ uint8_t cyclicShift;
+ uint8_t cooperation_flag;
+ uint8_t num_active_cba_groups;
+ uint16_t cba_rnti[4];//NUM_MAX_CBA_GROUP];
+} fs6_dl_ulsched_t;
+
+// CU to DU defintion of a DL packet for a given UE
+// The data itself is padded at the end of this structure
+typedef struct {
+ enum pckType type:8;
+ int UE_id;
+ int8_t harq_pid;
+ uint16_t rnti;
+ int16_t sqrt_rho_a;
+ int16_t sqrt_rho_b;
+ CEmode_t CEmode:8;
+ uint16_t nb_rb;
+ uint8_t Qm;
+ int8_t Nl;
+ uint8_t pdsch_start;
+ uint8_t sib1_br_flag;
+ uint16_t i0;
+ uint32_t rb_alloc[4];
+ int dataLen;
+} fs6_dl_uespec_t;
+
+// CU to DU definition of CCH channel
+typedef struct {
+ int16_t UE_id;
+ LTE_eNB_UCI cch_vars;
+} fs6_dl_uespec_ulcch_element_t;
+
+// header to group all UE CCH channels definitions in one UDP packet
+typedef struct {
+ enum pckType type:8;
+ int16_t nb_active_ue;
+} fs6_dl_uespec_ulcch_t;
+
+// code internal, not transmitted as this
+typedef struct {
+ int ta;
+} ul_propagation_t;
+
+// One UE UL data, data plane, UE data appended after the header
+typedef struct {
+ enum pckType type:8;
+ short UE_id;
+ uint8_t harq_id;
+ uint8_t segment;
+ int segLen;
+ int r_offset;
+ int G;
+ int ulsch_power[2];
+ uint8_t o_ACK[4];
+ uint8_t O_ACK;
+ int ta;
+ uint8_t o[MAX_CQI_BYTES];
+ uint8_t cqi_crc_status;
+} fs6_ul_uespec_t;
+
+// UL UCI (control plane), per UE
+typedef struct {
+ enum pckType type:8;
+ int UEid;
+ int frame;
+ int subframe;
+ LTE_eNB_UCI uci;
+ uint8_t harq_ack[4];
+ uint8_t tdd_mapping_mode;
+ uint16_t tdd_multiplexing_mask;
+ unsigned short n0_subband_power_dB;
+ uint16_t rnti;
+ int32_t stat;
+} fs6_ul_uespec_uci_element_t;
+
+// all segments UCI grouped in one UDP packet
+typedef struct {
+ enum pckType type:8;
+ int16_t nb_active_ue;
+} fs6_ul_uespec_uci_t;
+
+
+bool createUDPsock (char *sourceIP, char *sourcePort, char *destIP, char *destPort, UDPsock_t *result);
+int receiveSubFrame(UDPsock_t *sock, void *bufferZone, int bufferSize, uint16_t contentType);
+int sendSubFrame(UDPsock_t *sock, void *bufferZone, ssize_t secondHeaderSize, uint16_t contentType);
+
+#define initBufferZone(xBuf) \
+ uint8_t xBuf[FS6_BUF_SIZE]; \
+ ((commonUDP_t *)xBuf)->nbBlocks=0;
+
+#define hUDP(xBuf) ((commonUDP_t *)xBuf)
+#define hDL(xBuf) ((fs6_dl_t*)(((commonUDP_t *)xBuf)+1))
+#define hUL(xBuf) ((fs6_ul_t*)(((commonUDP_t *)xBuf)+1))
+#define hDLUE(xBuf) ((fs6_dl_uespec_t*) (((fs6_dl_t*)(((commonUDP_t *)xBuf)+1))+1))
+#define hTxULUE(xBuf) ((fs6_dl_ulsched_t*) (((fs6_dl_t*)(((commonUDP_t *)xBuf)+1))+1))
+#define hTxULcch(xBuf) ((fs6_dl_uespec_ulcch_t*) (((fs6_dl_t*)(((commonUDP_t *)xBuf)+1))+1))
+#define hULUE(xBuf) ((fs6_ul_uespec_t*) (((fs6_ul_t*)(((commonUDP_t *)xBuf)+1))+1))
+#define hULUEuci(xBuf) ((fs6_ul_uespec_uci_t*) (((fs6_ul_t*)(((commonUDP_t *)xBuf)+1))+1))
+
+static inline size_t alignedSize(uint8_t *ptr) {
+ commonUDP_t *header=(commonUDP_t *) ptr;
+ return ((header->contentBytes+sizeof(commonUDP_t)+blockAlign-1)/blockAlign)*blockAlign;
+}
+
+static inline void *commonUDPdata(uint8_t *ptr) {
+ return (void *) (((commonUDP_t *)ptr)+1);
+}
+
+void setAllfromTS(uint64_t TS, L1_rxtx_proc_t *proc);
+void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB,LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask,
+ uint16_t rnti, int32_t stat);
+void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset);
+void *cu_fs6(void *arg);
+void *du_fs6(void *arg);
+void fill_rf_config(RU_t *ru, char *rf_config_file);
+int init_rf(RU_t *ru);
+void rx_rf(RU_t *ru, L1_rxtx_proc_t *proc);
+void tx_rf(RU_t *ru, L1_rxtx_proc_t *proc);
+void common_signal_procedures (PHY_VARS_eNB *eNB,int frame, int subframe);
+void pmch_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc);
+bool dlsch_procedures(PHY_VARS_eNB *eNB,
+ L1_rxtx_proc_t *proc,
+ int harq_pid,
+ LTE_eNB_DLSCH_t *dlsch,
+ LTE_eNB_UE_stats *ue_stats) ;
+void postDecode(L1_rxtx_proc_t *proc, notifiedFIFO_elt_t *req);
+void pdsch_procedures(PHY_VARS_eNB *eNB,
+ L1_rxtx_proc_t *proc,
+ int harq_pid,
+ LTE_eNB_DLSCH_t *dlsch,
+ LTE_eNB_DLSCH_t *dlsch1);
+void srs_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc);
+void uci_procedures(PHY_VARS_eNB *eNB,
+ L1_rxtx_proc_t *proc);
+void ocp_rx_prach(PHY_VARS_eNB *eNB,
+ L1_rxtx_proc_t *proc,
+ RU_t *ru,
+ uint16_t *max_preamble,
+ uint16_t *max_preamble_energy,
+ uint16_t *max_preamble_delay,
+ uint16_t *avg_preamble_energy,
+ uint16_t Nf,
+ uint8_t tdd_mapindex,
+ uint8_t br_flag);
+void rx_prach0(PHY_VARS_eNB *eNB,
+ RU_t *ru,
+ int frame_prach,
+ int subframe,
+ uint16_t *max_preamble,
+ uint16_t *max_preamble_energy,
+ uint16_t *max_preamble_delay,
+ uint16_t *avg_preamble_energy,
+ uint16_t Nf,
+ uint8_t tdd_mapindex,
+ uint8_t br_flag,
+ uint8_t ce_level
+ );
+void ocp_tx_rf(RU_t *ru, L1_rxtx_proc_t *proc);
+
+// mistakes in main OAI
+void phy_init_RU(RU_t *);
+void fep_full(RU_t *ru, int subframe);
+void feptx_prec(RU_t *ru,int frame,int subframe);
+void feptx_ofdm(RU_t *ru, int frame, int subframe);
+void oai_subframe_ind(uint16_t sfn, uint16_t sf);
+extern uint16_t sf_ahead;
+#endif
diff --git a/executables/transport_split.c b/executables/transport_split.c
new file mode 100644
index 0000000000000000000000000000000000000000..f380eb90e36977727e7b493b200999fa3edf6316
--- /dev/null
+++ b/executables/transport_split.c
@@ -0,0 +1,195 @@
+/*
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
+*/
+
+
+
+#include <executables/split_headers.h>
+#include <sys/types.h> /* See NOTES */
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/udp.h>
+#include <netdb.h>
+#include <targets/RT/USER/lte-softmodem.h>
+
+bool createUDPsock (char *sourceIP, char *sourcePort, char *destIP, char *destPort, UDPsock_t *result) {
+ struct addrinfo hints= {0}, *servinfo, *p;
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_flags = AI_PASSIVE;
+ int status;
+
+ if ((status = getaddrinfo(sourceIP, sourcePort, &hints, &servinfo)) != 0) {
+ LOG_E(GTPU,"getaddrinfo error: %s\n", gai_strerror(status));
+ return false;
+ }
+
+ // loop through all the results and bind to the first we can
+ for(p = servinfo; p != NULL; p = p->ai_next) {
+ if ((result->sockHandler = socket(p->ai_family, p->ai_socktype,
+ p->ai_protocol)) == -1) {
+ LOG_W(GTPU,"socket: %s\n", strerror(errno));
+ continue;
+ }
+
+ if (bind(result->sockHandler, p->ai_addr, p->ai_addrlen) == -1) {
+ close(result->sockHandler);
+ LOG_W(GTPU,"bind: %s\n", strerror(errno));
+ continue;
+ }
+
+ break; // if we get here, we must have connected successfully
+ }
+
+ if (p == NULL) {
+ // looped off the end of the list with no successful bind
+ LOG_E(GTPU,"failed to bind socket: %s %s \n",sourceIP,sourcePort);
+ return false;
+ }
+
+ freeaddrinfo(servinfo); // all done with this structure
+
+ if ((status = getaddrinfo(destIP, destPort, &hints, &servinfo)) != 0) {
+ LOG_E(GTPU,"getaddrinfo error: %s\n", gai_strerror(status));
+ return false;
+ }
+
+ if (servinfo) {
+ result->destAddr=servinfo;
+ } else {
+ LOG_E(PHY,"No valid UDP addr: %s:%s\n",destIP, destPort);
+ return false;
+ }
+
+ int enable=1;
+ AssertFatal(setsockopt(result->sockHandler, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable))==0,"");
+ struct timeval tv= {0,UDP_TIMEOUT};
+
+ if (IS_SOFTMODEM_RFSIM)
+ tv.tv_sec=2; //debug: wait 2 seconds for human understanding
+
+ AssertFatal(setsockopt(result->sockHandler, SOL_SOCKET, SO_RCVTIMEO,&tv,sizeof(tv)) ==0,"");
+ // Make a send/recv buffer larger than a a couple of subframe
+ // so the kernel will store for us in and out paquets
+ int buff=1000*1000*10;
+ AssertFatal ( setsockopt(result->sockHandler, SOL_SOCKET, SO_SNDBUF, &buff, sizeof(buff)) == 0, "");
+ AssertFatal ( setsockopt(result->sockHandler, SOL_SOCKET, SO_RCVBUF, &buff, sizeof(buff)) == 0, "");
+ return true;
+}
+
+// sock: udp socket
+// bufferZone: a reception area of bufferSize
+int receiveSubFrame(UDPsock_t *sock, void *bufferZone, int bufferSize, uint16_t contentType) {
+ int rcved=0;
+ commonUDP_t *bufOrigin=(commonUDP_t *)bufferZone;
+ static uint8_t crossData[65536];
+ static int crossDataSize=0;
+
+ if (crossDataSize) {
+ LOG_D(HW,"copy a block received in previous subframe\n");
+ memcpy(bufferZone, crossData, crossDataSize);
+ rcved=1;
+ bufferZone+=crossDataSize;
+ crossDataSize=0;
+ }
+
+ do {
+ //read all subframe data from the control unit
+ int ret=recv(sock->sockHandler, bufferZone, bufferSize, 0);
+
+ if ( ret==-1) {
+ if ( errno == EWOULDBLOCK || errno== EINTR ) {
+ LOG_I(HW,"Received: Timeout, subframe incomplete\n");
+ return rcved;
+ } else {
+ LOG_E(HW,"Critical issue in socket: %s\n", strerror(errno));
+ return -1;
+ }
+ } else {
+ if (hUDP(bufferZone)->contentType != contentType)
+ abort();
+
+ if (rcved && bufOrigin->timestamp != hUDP(bufferZone)->timestamp ) {
+ if ( hUDP(bufferZone)->timestamp > bufOrigin->timestamp ) {
+ LOG_W(HW,"Received data for TS: %lu before end of TS : %lu completion\n",
+ hUDP(bufferZone)->timestamp,
+ bufOrigin->timestamp);
+ memcpy(crossData, bufferZone, ret );
+ crossDataSize=ret;
+ return rcved;
+ } else {
+ LOG_W(HW,"Dropping late packet\n");
+ continue;
+ }
+ }
+
+ rcved++;
+ bufferZone+=ret;
+ }
+
+ LOG_D(HW,"Received: blocks: %d/%d, size %d, TS: %lu\n",
+ rcved, bufOrigin->nbBlocks, ret, bufOrigin->timestamp);
+ } while ( rcved == 0 || rcved < bufOrigin->nbBlocks );
+
+ return rcved;
+}
+
+int sendSubFrame(UDPsock_t *sock, void *bufferZone, ssize_t secondHeaderSize, uint16_t contentType) {
+ commonUDP_t *UDPheader=(commonUDP_t *)bufferZone ;
+ UDPheader->contentType=contentType;
+ UDPheader->senderClock=rdtsc();
+ int nbBlocks=UDPheader->nbBlocks;
+ int blockId=0;
+
+ if (nbBlocks <= 0 ) {
+ LOG_E(PHY,"FS6: can't send blocks: %d\n", nbBlocks);
+ return 0;
+ }
+
+ do {
+ if (blockId > 0 ) {
+ commonUDP_t *currentHeader=(commonUDP_t *)bufferZone;
+ currentHeader->timestamp=UDPheader->timestamp;
+ currentHeader->nbBlocks=UDPheader->nbBlocks;
+ currentHeader->blockID=blockId;
+ currentHeader->contentType=UDPheader->contentType;
+ memcpy(commonUDPdata((void *)currentHeader), commonUDPdata(bufferZone), secondHeaderSize);
+ }
+
+ blockId++;
+ int sz=alignedSize(bufferZone);
+ // Let's use the first address returned by getaddrinfo()
+ int ret=sendto(sock->sockHandler, bufferZone, sz, 0,
+ sock->destAddr->ai_addr, sock->destAddr->ai_addrlen);
+
+ if ( ret != sz )
+ LOG_W(HW,"Wrote socket doesn't return size %d (val: %d, errno:%d, %s)\n",
+ sz, ret, errno, strerror(errno));
+
+ LOG_D(HW,"Sent: TS: %lu, blocks %d/%d, block size : %d \n",
+ UDPheader->timestamp, UDPheader->nbBlocks-nbBlocks, UDPheader->nbBlocks, sz);
+ bufferZone+=sz;
+ nbBlocks--;
+ } while (nbBlocks);
+
+ return 0;
+}
diff --git a/nfapi/oai_integration/nfapi.c b/nfapi/oai_integration/nfapi.c
index 4fc35fd951309bae126a53bf4818cfc7ccdf1352..86d1ae3127d33c13c71977c43c950830feb1ecdd 100644
--- a/nfapi/oai_integration/nfapi.c
+++ b/nfapi/oai_integration/nfapi.c
@@ -29,7 +29,7 @@ typedef struct {
nfapi_mode_t nfapi_mode;
} nfapi_params_t;
-static nfapi_params_t nfapi_params;
+static nfapi_params_t nfapi_params = {0};
void set_thread_priority(int priority) {
//printf("%s(priority:%d)\n", __FUNCTION__, priority);
diff --git a/nfapi/oai_integration/nfapi_pnf.c b/nfapi/oai_integration/nfapi_pnf.c
index 481c4105616d2cfa9746e36e055fa47ab58a9f20..59857659c13fe506714210bca0212a4079c5caf0 100644
--- a/nfapi/oai_integration/nfapi_pnf.c
+++ b/nfapi/oai_integration/nfapi_pnf.c
@@ -691,13 +691,14 @@ void pnf_phy_deallocate_p7_vendor_ext(nfapi_p7_message_header_t *header) {
free(header);
}
-int pnf_phy_hi_dci0_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_hi_dci0_request_t *req) {
+int pnf_phy_hi_dci0_req(L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_hi_dci0_request_t *req) {
if (req->hi_dci0_request_body.number_of_dci == 0 && req->hi_dci0_request_body.number_of_hi == 0)
LOG_D(PHY,"[PNF] HI_DCI0_REQUEST SFN/SF:%05d dci:%d hi:%d\n", NFAPI_SFNSF2DEC(req->sfn_sf), req->hi_dci0_request_body.number_of_dci, req->hi_dci0_request_body.number_of_hi);
//phy_info* phy = (phy_info*)(pnf_p7->user_data);
struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
- L1_rxtx_proc_t *proc = &eNB->proc.L1_proc;
+ if (proc ==NULL)
+ proc = &eNB->proc.L1_proc;
for (int i=0; i<req->hi_dci0_request_body.number_of_dci + req->hi_dci0_request_body.number_of_hi; i++) {
//LOG_D(PHY,"[PNF] HI_DCI0_REQ sfn_sf:%d PDU[%d]\n", NFAPI_SFNSF2DEC(req->sfn_sf), i);
@@ -718,7 +719,7 @@ int pnf_phy_hi_dci0_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_hi_dci0_request_t *
return 0;
}
-int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request_t *req) {
+int pnf_phy_dl_config_req(L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request_t *req) {
if (RC.ru == 0) {
return -1;
}
@@ -739,7 +740,8 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request
int sfn = NFAPI_SFNSF2SFN(req->sfn_sf);
int sf = NFAPI_SFNSF2SF(req->sfn_sf);
struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
- L1_rxtx_proc_t *proc = &eNB->proc.L1_proc;
+ if (proc==NULL)
+ proc = &eNB->proc.L1_proc;
nfapi_dl_config_request_pdu_t *dl_config_pdu_list = req->dl_config_request_body.dl_config_pdu_list;
LTE_eNB_PDCCH *pdcch_vars = &eNB->pdcch_vars[sf&1];
pdcch_vars->num_pdcch_symbols = req->dl_config_request_body.number_pdcch_ofdm_symbols;
@@ -796,7 +798,7 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request
uint8_t *dlsch_sdu = tx_pdus[UE_id][harq_pid];
memcpy(dlsch_sdu, tx_pdu->segments[0].segment_data, tx_pdu->segments[0].segment_length);
//NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() DLSCH:pdu_index:%d handle_nfapi_dlsch_pdu(eNB, proc_rxtx, dlsch_pdu, transport_blocks:%d sdu:%p) eNB->pdcch_vars[proc->subframe_tx & 1].num_pdcch_symbols:%d\n", __FUNCTION__, rel8_pdu->pdu_index, rel8_pdu->transport_blocks, dlsch_sdu, eNB->pdcch_vars[proc->subframe_tx & 1].num_pdcch_symbols);
- handle_nfapi_dlsch_pdu( eNB, sfn,sf, &eNB->proc.L1_proc, &dl_config_pdu_list[i], rel8_pdu->transport_blocks-1, dlsch_sdu);
+ handle_nfapi_dlsch_pdu( eNB, sfn,sf, proc, &dl_config_pdu_list[i], rel8_pdu->transport_blocks-1, dlsch_sdu);
} else {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s() DLSCH NULL TX PDU SFN/SF:%d PDU_INDEX:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(req->sfn_sf), rel8_pdu->pdu_index);
}
@@ -836,7 +838,7 @@ int pnf_phy_tx_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_tx_request_t *req) {
return 0;
}
-int pnf_phy_ul_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_ul_config_request_t *req) {
+int pnf_phy_ul_config_req(L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_ul_config_request_t *req) {
if (0)LOG_D(PHY,"[PNF] UL_CONFIG_REQ %s() sfn_sf:%d pdu:%d rach_prach_frequency_resources:%d srs_present:%u\n",
__FUNCTION__,
NFAPI_SFNSF2DEC(req->sfn_sf),
@@ -865,7 +867,8 @@ int pnf_phy_ul_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_ul_config_request
uint16_t curr_sfn = NFAPI_SFNSF2SFN(req->sfn_sf);
uint16_t curr_sf = NFAPI_SFNSF2SF(req->sfn_sf);
struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
- L1_rxtx_proc_t *proc = &eNB->proc.L1_proc;
+ if (proc==NULL)
+ proc = &eNB->proc.L1_proc;
nfapi_ul_config_request_pdu_t *ul_config_pdu_list = req->ul_config_request_body.ul_config_pdu_list;
for (int i=0; i<req->ul_config_request_body.number_of_pdus; i++) {
diff --git a/nfapi/oai_integration/nfapi_pnf.h b/nfapi/oai_integration/nfapi_pnf.h
index e213d785f14ef1c94a41cb61a058d25e7982b6e4..2c8201737c8642a9b25bf9238c70465b1d4fdb7e 100644
--- a/nfapi/oai_integration/nfapi_pnf.h
+++ b/nfapi/oai_integration/nfapi_pnf.h
@@ -23,5 +23,5 @@
#define NFAPI_PNF_H__
int oai_nfapi_rach_ind(nfapi_rach_indication_t *rach_ind);
void configure_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port);
-
+void oai_subframe_ind(uint16_t sfn, uint16_t sf);
#endif
diff --git a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
index 5fe1c53a54622d3db9e85bc391b2ff141a8ba805..650bda4f780138874f71ee40ee3b5098fb0d81e1 100644
--- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
@@ -10,6 +10,7 @@
#define _NFAPI_NR_INTERFACE_H_
#include "nfapi_interface.h"
+#include <nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h>
#define NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS 5
#define NFAPI_NR_MAX_NB_TCI_STATES_PDCCH 64
diff --git a/nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h b/nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h
index 8d17416a418a98a822494726b1f1261aa1f66e54..d169177d6b182eeae05d4290c1fa88e3248cd1c7 100644
--- a/nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h
+++ b/nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h
@@ -24,6 +24,7 @@ extern "C" {
#include "nfapi_interface.h"
#include "debug.h"
+#include <openair2/PHY_INTERFACE/IF_Module.h>
#include <sys/types.h>
@@ -619,21 +620,21 @@ typedef struct nfapi_pnf_p7_config
* \param req A pointer to the dl config request message structure
* \return not currently used
*/
- int (*dl_config_req)(nfapi_pnf_p7_config_t* config, nfapi_dl_config_request_t* req);
+ int (*dl_config_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_dl_config_request_t* req);
/*! A callback for the UL_CONFIG.request
* \param config A poiner to the PNF P7 config
* \param req A pointer to the ul config request message structure
* \return not currently used
*/
- int (*ul_config_req)(nfapi_pnf_p7_config_t* config, nfapi_ul_config_request_t* req);
+ int (*ul_config_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_ul_config_request_t* req);
/*! A callback for the HI_DCI0.request
* \param config A poiner to the PNF P7 config
* \param req A pointer to the hi dci0 request message structure
* \return not currently used
*/
- int (*hi_dci0_req)(nfapi_pnf_p7_config_t* config, nfapi_hi_dci0_request_t* req);
+ int (*hi_dci0_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_hi_dci0_request_t* req);
/*! A callback for the TX_REQ.request
* \param config A poiner to the PNF P7 config
diff --git a/nfapi/open-nFAPI/pnf/src/pnf_interface.c b/nfapi/open-nFAPI/pnf/src/pnf_interface.c
index 7310fc0c66c57209bcedac7cc326ab4b19d4229a..dda0d0fdc60ce5f632b12962ac502877c72e9aff 100644
--- a/nfapi/open-nFAPI/pnf/src/pnf_interface.c
+++ b/nfapi/open-nFAPI/pnf/src/pnf_interface.c
@@ -39,7 +39,7 @@ nfapi_pnf_config_t* nfapi_pnf_config_create()
_this->_public.codec_config.allocate = &malloc;
_this->_public.codec_config.deallocate = &free;
- return &(_this->_public);
+ return (nfapi_pnf_config_t* )_this;
}
void nfapi_pnf_config_destory(nfapi_pnf_config_t* config)
diff --git a/nfapi/open-nFAPI/pnf/src/pnf_p7.c b/nfapi/open-nFAPI/pnf/src/pnf_p7.c
index 944673037500c6f8478b3352f0998f28e840cc07..5ba912e059f73b5c15b3d8e5a4e490ddc2000cd6 100644
--- a/nfapi/open-nFAPI/pnf/src/pnf_p7.c
+++ b/nfapi/open-nFAPI/pnf/src/pnf_p7.c
@@ -576,20 +576,20 @@ void send_dummy_subframe(pnf_p7_t* pnf_p7, uint16_t sfn_sf)
{
pnf_p7->_public.dummy_subframe.dl_config_req->sfn_sf = sfn_sf;
//NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy dl_config_req - enter\n");
- (pnf_p7->_public.dl_config_req)(&(pnf_p7->_public), pnf_p7->_public.dummy_subframe.dl_config_req);
+ (pnf_p7->_public.dl_config_req)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_subframe.dl_config_req);
//NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy dl_config_req - exit\n");
}
if(pnf_p7->_public.ul_config_req && pnf_p7->_public.dummy_subframe.ul_config_req)
{
pnf_p7->_public.dummy_subframe.ul_config_req->sfn_sf = sfn_sf;
NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy ul_config_req - enter\n");
- (pnf_p7->_public.ul_config_req)(&pnf_p7->_public, pnf_p7->_public.dummy_subframe.ul_config_req);
+ (pnf_p7->_public.ul_config_req)(NULL, &pnf_p7->_public, pnf_p7->_public.dummy_subframe.ul_config_req);
}
if(pnf_p7->_public.hi_dci0_req && pnf_p7->_public.dummy_subframe.hi_dci0_req)
{
pnf_p7->_public.dummy_subframe.hi_dci0_req->sfn_sf = sfn_sf;
NFAPI_TRACE(NFAPI_TRACE_INFO, "Dummy hi_dci0 - enter\n");
- (pnf_p7->_public.hi_dci0_req)(&pnf_p7->_public, pnf_p7->_public.dummy_subframe.hi_dci0_req);
+ (pnf_p7->_public.hi_dci0_req)(NULL, &pnf_p7->_public, pnf_p7->_public.dummy_subframe.hi_dci0_req);
}
if(pnf_p7->_public.lbt_dl_config_req && pnf_p7->_public.dummy_subframe.lbt_dl_config_req)
{
@@ -699,7 +699,7 @@ int pnf_p7_subframe_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn_sf)
if(tx_subframe_buffer->dl_config_req != 0)
{
if(pnf_p7->_public.dl_config_req)
- (pnf_p7->_public.dl_config_req)(&(pnf_p7->_public), tx_subframe_buffer->dl_config_req);
+ (pnf_p7->_public.dl_config_req)(NULL, &(pnf_p7->_public), tx_subframe_buffer->dl_config_req);
//deallocate_nfapi_dl_config_request(subframe_buffer->dl_config_req, pnf_p7);
}
@@ -709,14 +709,14 @@ int pnf_p7_subframe_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn_sf)
if(pnf_p7->_public.dl_config_req && pnf_p7->_public.dummy_subframe.dl_config_req)
{
pnf_p7->_public.dummy_subframe.dl_config_req->sfn_sf = sfn_sf_tx;
- (pnf_p7->_public.dl_config_req)(&(pnf_p7->_public), pnf_p7->_public.dummy_subframe.dl_config_req);
+ (pnf_p7->_public.dl_config_req)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_subframe.dl_config_req);
}
}
if(tx_subframe_buffer->hi_dci0_req != 0)
{
if(pnf_p7->_public.hi_dci0_req)
- (pnf_p7->_public.hi_dci0_req)(&(pnf_p7->_public), tx_subframe_buffer->hi_dci0_req);
+ (pnf_p7->_public.hi_dci0_req)(NULL, &(pnf_p7->_public), tx_subframe_buffer->hi_dci0_req);
//deallocate_nfapi_hi_dci0_request(subframe_buffer->hi_dci0_req, pnf_p7);
}
@@ -726,7 +726,7 @@ int pnf_p7_subframe_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn_sf)
if(pnf_p7->_public.hi_dci0_req && pnf_p7->_public.dummy_subframe.hi_dci0_req)
{
pnf_p7->_public.dummy_subframe.hi_dci0_req->sfn_sf = sfn_sf_tx;
- (pnf_p7->_public.hi_dci0_req)(&(pnf_p7->_public), pnf_p7->_public.dummy_subframe.hi_dci0_req);
+ (pnf_p7->_public.hi_dci0_req)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_subframe.hi_dci0_req);
}
}
@@ -777,7 +777,7 @@ int pnf_p7_subframe_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn_sf)
if(subframe_buffer->ul_config_req != 0)
{
if(pnf_p7->_public.ul_config_req)
- (pnf_p7->_public.ul_config_req)(&(pnf_p7->_public), subframe_buffer->ul_config_req);
+ (pnf_p7->_public.ul_config_req)(NULL, &(pnf_p7->_public), subframe_buffer->ul_config_req);
//deallocate_nfapi_ul_config_request(subframe_buffer->ul_config_req, pnf_p7);
}
@@ -787,7 +787,7 @@ int pnf_p7_subframe_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn_sf)
if(pnf_p7->_public.ul_config_req && pnf_p7->_public.dummy_subframe.ul_config_req)
{
pnf_p7->_public.dummy_subframe.ul_config_req->sfn_sf = sfn_sf;
- (pnf_p7->_public.ul_config_req)(&(pnf_p7->_public), pnf_p7->_public.dummy_subframe.ul_config_req);
+ (pnf_p7->_public.ul_config_req)(NULL, &(pnf_p7->_public), pnf_p7->_public.dummy_subframe.ul_config_req);
}
}
diff --git a/nfapi/open-nFAPI/vnf/src/vnf_interface.c b/nfapi/open-nFAPI/vnf/src/vnf_interface.c
index 0aba0a29f5e0c9a6d74ef1e361f7c135a875e31b..59d7f3eb4fb1dd17ae8331b9ec5b020849053000 100644
--- a/nfapi/open-nFAPI/vnf/src/vnf_interface.c
+++ b/nfapi/open-nFAPI/vnf/src/vnf_interface.c
@@ -55,7 +55,7 @@ nfapi_vnf_config_t* nfapi_vnf_config_create()
_this->_public.codec_config.deallocate = &free;
- return &(_this->_public);
+ return (nfapi_vnf_config_t* )_this;
}
void nfapi_vnf_config_destory(nfapi_vnf_config_t* config)
diff --git a/nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c b/nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
index 35bd5e4c1b8352ce7fe1329b25127e6f02b3eb74..a0efeeb5f4dbff9f123c5715bd02266efcccfecb 100644
--- a/nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
+++ b/nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
@@ -47,7 +47,7 @@ nfapi_vnf_p7_config_t* nfapi_vnf_p7_config_create()
_this->_public.codec_config.deallocate = &free;
- return &(_this->_public);
+ return (nfapi_vnf_p7_config_t*)_this;
}
void nfapi_vnf_p7_config_destory(nfapi_vnf_p7_config_t* config)
diff --git a/openair1/PHY/CODING/TESTBENCH/ldpctest.c b/openair1/PHY/CODING/TESTBENCH/ldpctest.c
index 552af99c41e78e3de1ddf114c3a90fcc13d33e57..ce6f9996dede49d94e4f1c645455e18a3158588a 100644
--- a/openair1/PHY/CODING/TESTBENCH/ldpctest.c
+++ b/openair1/PHY/CODING/TESTBENCH/ldpctest.c
@@ -529,7 +529,7 @@ int main(int argc, char *argv[])
time_stats_t time_optim[10], time_decoder[10];
n_iter_stats_t dec_iter[3];
- short BG=0,Zc,Kb;
+ short BG=0,Zc,Kb=0;
while ((c = getopt (argc, argv, "q:r:s:S:l:n:d:i:t:u:h")) != -1)
switch (c)
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c b/openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
index 43c0350efb138dd9302d2c0f70ed77ee0c2d9e2b..2331e253d5f2a703b355dccbe557b15fe3d9a506 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
@@ -43,7 +43,7 @@ int lte_dl_bf_channel_estimation(PHY_VARS_UE *phy_vars_ue,
uint8_t pilot0,pilot1,pilot2,pilot3;
short ch[2], *pil, *rxF, *dl_bf_ch, *dl_bf_ch_prev;
- short *fl, *fm, *fr, *fl_dc, *fm_dc, *fr_dc, *f1, *f2l, *f2r;
+ short *fl=NULL, *fm=NULL, *fr=NULL, *fl_dc=NULL, *fm_dc=NULL, *fr_dc=NULL, *f1, *f2l=NULL, *f2r=NULL;
unsigned int *rballoc;
int **rxdataF;
@@ -58,10 +58,10 @@ int lte_dl_bf_channel_estimation(PHY_VARS_UE *phy_vars_ue,
dlsch0_harq = dlsch_ue[0]->harq_processes[harq_pid];
if (((frame_parms->Ncp == NORMAL) && (symbol>=7)) ||
- ((frame_parms->Ncp == EXTENDED) && (symbol>=6)))
- rballoc = dlsch0_harq->rb_alloc_odd;
+ ((frame_parms->Ncp == EXTENDED) && (symbol>=6)))
+ rballoc = dlsch0_harq->rb_alloc_odd;
else
- rballoc = dlsch0_harq->rb_alloc_even;
+ rballoc = dlsch0_harq->rb_alloc_even;
rxdataF = phy_vars_ue->common_vars.common_vars_rx_data_per_thread[phy_vars_ue->current_thread_id[Ns>>1]].rxdataF;
@@ -69,56 +69,56 @@ int lte_dl_bf_channel_estimation(PHY_VARS_UE *phy_vars_ue,
beamforming_mode = phy_vars_ue->transmission_mode[eNB_id]>6 ? phy_vars_ue->transmission_mode[eNB_id] : 0;
if (phy_vars_ue->high_speed_flag == 0) // use second channel estimate position for temporary storage
- ch_offset = frame_parms->ofdm_symbol_size;
+ ch_offset = frame_parms->ofdm_symbol_size;
else
- ch_offset = frame_parms->ofdm_symbol_size*symbol;
+ ch_offset = frame_parms->ofdm_symbol_size*symbol;
+
-
uespec_nushift = frame_parms->Nid_cell%3;
subframe = Ns>>1;
-
- //generate ue specific pilots
- lprime = symbol/3-1;
- lte_dl_ue_spec_rx(phy_vars_ue,uespec_pilot,Ns,5,lprime,0,dlsch0_harq->nb_rb);
- //LOG_M("uespec_pilot_rx.m","uespec_pilot",uespec_pilot,300,1,1);
-
- if (frame_parms->Ncp==0){
- if (symbol==3 || symbol==6 || symbol==9 || symbol==12)
- uespec_pilots = 1;
- } else{
- if (symbol==4 || symbol==7 || symbol==10)
- uespec_pilots = 1;
- }
-
- if ((frame_parms->Ncp==0 && (symbol==6 ||symbol ==12)) || (frame_parms->Ncp==1 && symbol==7))
- uespec_poffset = 2;
-
- if (phy_vars_ue->frame_parms.Ncp == 0) { // normal prefix
- pilot0 = 3;
- pilot1 = 6;
- pilot2 = 9;
- pilot3 = 12;
- } else { // extended prefix
- pilot0 = 4;
- pilot1 = 7;
- pilot2 = 10;
- }
- //define the filter
- pil_offset = (uespec_nushift+uespec_poffset)%3;
- // printf("symbol=%d,pil_offset=%d\n",symbol,pil_offset);
- switch (pil_offset) {
- case 0:
- fl = filt16_l0;
- fm = filt16_m0;
- fr = filt16_r0;
- fl_dc = filt16_l0;
- fm_dc = filt16_m0;
- fr_dc = filt16_r0;
- f1 = filt16_1;
- f2l = filt16_2l0;
- f2r = filt16_2r0;
+ //generate ue specific pilots
+ lprime = symbol/3-1;
+ lte_dl_ue_spec_rx(phy_vars_ue,uespec_pilot,Ns,5,lprime,0,dlsch0_harq->nb_rb);
+ //LOG_M("uespec_pilot_rx.m","uespec_pilot",uespec_pilot,300,1,1);
+
+ if (frame_parms->Ncp==0){
+ if (symbol==3 || symbol==6 || symbol==9 || symbol==12)
+ uespec_pilots = 1;
+ } else{
+ if (symbol==4 || symbol==7 || symbol==10)
+ uespec_pilots = 1;
+ }
+
+ if ((frame_parms->Ncp==0 && (symbol==6 ||symbol ==12)) || (frame_parms->Ncp==1 && symbol==7))
+ uespec_poffset = 2;
+
+ if (phy_vars_ue->frame_parms.Ncp == 0) { // normal prefix
+ pilot0 = 3;
+ pilot1 = 6;
+ pilot2 = 9;
+ pilot3 = 12;
+ } else { // extended prefix
+ pilot0 = 4;
+ pilot1 = 7;
+ pilot2 = 10;
+ }
+
+ //define the filter
+ pil_offset = (uespec_nushift+uespec_poffset)%3;
+ // printf("symbol=%d,pil_offset=%d\n",symbol,pil_offset);
+ switch (pil_offset) {
+ case 0:
+ fl = filt16_l0;
+ fm = filt16_m0;
+ fr = filt16_r0;
+ fl_dc = filt16_l0;
+ fm_dc = filt16_m0;
+ fr_dc = filt16_r0;
+ f1 = filt16_1;
+ f2l = filt16_2l0;
+ f2r = filt16_2r0;
break;
case 1:
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c b/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
index 2e4f3e60361eeb564e376435a34fcd8b9443982c..880c056578e6a4a0dc2fe7f7b108e798cacbb204 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
@@ -1029,7 +1029,7 @@ void lte_ue_measurements(PHY_VARS_UE *ue,
int N_RB_DL = frame_parms->N_RB_DL;
- int rank_tm3_tm4;
+ int rank_tm3_tm4=-1;
ue->measurements.nb_antennas_rx = frame_parms->nb_antennas_rx;
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c b/openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
index f5543eda52ec8f39eabc75ab50e7c18c90583365..7caaf07406b0355d970165fd8a1eb793f9710197 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
@@ -50,8 +50,11 @@ int32_t lte_ul_channel_estimation(PHY_VARS_eNB *eNB,
int32_t **ul_ch_estimates_time = (eNB!=NULL) ? pusch_vars->drs_ch_estimates_time : calibration->drs_ch_estimates_time;
AssertFatal(ul_ch_estimates_time != NULL, "ul_ch_estimates_time is null\n");
int32_t **rxdataF_ext = (eNB!=NULL) ? pusch_vars->rxdataF_ext : calibration->rxdataF_ext;
- int subframe = (eNB!=NULL) ? proc->subframe_rx : ru->proc.tti_rx;
- uint8_t harq_pid;
+
+ int subframe = proc->subframe_rx;
+
+ uint8_t harq_pid;
+
int16_t delta_phase = 0;
int16_t *ru1 = ru_90;
int16_t *ru2 = ru_90;
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
index 6595158f1a856cf5b7205f3069bc7bdee46000dd..15eb5206a196530371d121b960144945d17afe68 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
@@ -20,15 +20,15 @@
*/
/*! \file PHY/LTE_TRANSPORT/dlsch_coding.c
-* \brief Top-level routines for implementing Turbo-coded (DLSCH) transport channels from 36-212, V8.6 2009-03
-* \author R. Knopp
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: knopp@eurecom.fr
-* \note
-* \warning
-*/
+ * \brief Top-level routines for implementing Turbo-coded (DLSCH) transport channels from 36-212, V8.6 2009-03
+ * \author R. Knopp
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr
+ * \note
+ * \warning
+ */
#include "PHY/defs_eNB.h"
#include "PHY/phy_extern.h"
@@ -42,22 +42,23 @@
#include "common/utils/LOG/log.h"
#include "targets/RT/USER/lte-softmodem.h"
#include <syscall.h>
-#include "executables/thread-common.h"
+#include "targets/RT/USER/rt_wrapper.h"
+#include <common/utils/threadPool/thread-pool.h>
//#define DEBUG_DLSCH_CODING
//#define DEBUG_DLSCH_FREE 1
/*
-#define is_not_pilot(pilots,first_pilot,re) (pilots==0) || \
+ #define is_not_pilot(pilots,first_pilot,re) (pilots==0) || \
((pilots==1)&&(first_pilot==1)&&(((re>2)&&(re<6))||((re>8)&&(re<12)))) || \
((pilots==1)&&(first_pilot==0)&&(((re<3))||((re>5)&&(re<9)))) \
*/
#define is_not_pilot(pilots,first_pilot,re) (1)
/*extern void thread_top_init(char *thread_name,
- int affinity,
- uint64_t runtime,
- uint64_t deadline,
- uint64_t period);*/
+ int affinity,
+ uint64_t runtime,
+ uint64_t deadline,
+ uint64_t period);*/
extern volatile int oai_exit;
@@ -83,11 +84,6 @@ void free_eNB_dlsch(LTE_eNB_DLSCH_t *dlsch) {
free16(dlsch->harq_processes[i]->c[r],((r==0)?8:0) + 3+768);
dlsch->harq_processes[i]->c[r] = NULL;
}
-
- if (dlsch->harq_processes[i]->d[r]) {
- free16(dlsch->harq_processes[i]->d[r],(96+12+3+(3*6144)));
- dlsch->harq_processes[i]->d[r] = NULL;
- }
}
free16(dlsch->harq_processes[i],sizeof(LTE_DL_eNB_HARQ_t));
@@ -108,26 +104,26 @@ LTE_eNB_DLSCH_t *new_eNB_dlsch(unsigned char Kmimo,
LTE_DL_FRAME_PARMS *frame_parms)
{
LTE_eNB_DLSCH_t *dlsch;
- unsigned char exit_flag = 0,i,j,r,aa,layer;
+ unsigned char exit_flag = 0,i,r,aa,layer;
int re;
unsigned char bw_scaling =1;
switch (N_RB_DL) {
- case 6:
- bw_scaling =16;
- break;
+ case 6:
+ bw_scaling =16;
+ break;
- case 25:
- bw_scaling =4;
- break;
+ case 25:
+ bw_scaling =4;
+ break;
- case 50:
- bw_scaling =2;
- break;
+ case 50:
+ bw_scaling =2;
+ break;
- default:
- bw_scaling =1;
- break;
+ default:
+ bw_scaling =1;
+ break;
}
dlsch = (LTE_eNB_DLSCH_t *)malloc16(sizeof(LTE_eNB_DLSCH_t));
@@ -153,11 +149,11 @@ LTE_eNB_DLSCH_t *new_eNB_dlsch(unsigned char Kmimo,
// NOTE: THIS HAS TO BE REVISED FOR RU, commenting to remove memory leak !!!!!
/*
- dlsch->calib_dl_ch_estimates = (int32_t**)malloc16(frame_parms->nb_antennas_tx*sizeof(int32_t*));
- for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
- dlsch->calib_dl_ch_estimates[aa] = (int32_t *)malloc16(OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(int32_t));
+ dlsch->calib_dl_ch_estimates = (int32_t**)malloc16(frame_parms->nb_antennas_tx*sizeof(int32_t*));
+ for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
+ dlsch->calib_dl_ch_estimates[aa] = (int32_t *)malloc16(OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(int32_t));
- }*/
+ }*/
for (i=0; i<20; i++)
dlsch->harq_ids[i/10][i%10] = Mdlharq;
@@ -183,7 +179,6 @@ LTE_eNB_DLSCH_t *new_eNB_dlsch(unsigned char Kmimo,
for (r=0; r<MAX_NUM_DLSCH_SEGMENTS/bw_scaling; r++) {
// account for filler in first segment and CRCs for multiple segment case
dlsch->harq_processes[i]->c[r] = (uint8_t *)malloc16(((r==0)?8:0) + 3+ 768);
- dlsch->harq_processes[i]->d[r] = (uint8_t *)malloc16((96+12+3+(3*6144)));
if (dlsch->harq_processes[i]->c[r]) {
bzero(dlsch->harq_processes[i]->c[r],((r==0)?8:0) + 3+ 768);
@@ -191,13 +186,6 @@ LTE_eNB_DLSCH_t *new_eNB_dlsch(unsigned char Kmimo,
printf("Can't get c\n");
exit_flag=2;
}
-
- if (dlsch->harq_processes[i]->d[r]) {
- bzero(dlsch->harq_processes[i]->d[r],(96+12+3+(3*6144)));
- } else {
- printf("Can't get d\n");
- exit_flag=2;
- }
}
}
} else {
@@ -209,13 +197,6 @@ LTE_eNB_DLSCH_t *new_eNB_dlsch(unsigned char Kmimo,
if (exit_flag==0) {
for (i=0; i<Mdlharq; i++) {
dlsch->harq_processes[i]->round=0;
-
- for (j=0; j<96; j++)
- for (r=0; r<MAX_NUM_DLSCH_SEGMENTS/bw_scaling; r++) {
- // printf("dlsch->harq_processes[%d]->d[%d] %p\n",i,r,dlsch->harq_processes[i]->d[r]);
- if (dlsch->harq_processes[i]->d[r])
- dlsch->harq_processes[i]->d[r][j] = LTE_NULL;
- }
}
return(dlsch);
@@ -231,7 +212,7 @@ LTE_eNB_DLSCH_t *new_eNB_dlsch(unsigned char Kmimo,
void clean_eNb_dlsch(LTE_eNB_DLSCH_t *dlsch) {
unsigned char Mdlharq;
- unsigned char i,j,r;
+ unsigned char i;
if (dlsch) {
Mdlharq = dlsch->Mdlharq;
@@ -255,307 +236,17 @@ void clean_eNb_dlsch(LTE_eNB_DLSCH_t *dlsch) {
dlsch->harq_processes[i]->status = 0;
dlsch->harq_processes[i]->round = 0;
- for (j=0; j<96; j++)
- for (r=0; r<MAX_NUM_DLSCH_SEGMENTS; r++)
- if (dlsch->harq_processes[i]->d[r])
- dlsch->harq_processes[i]->d[r][j] = LTE_NULL;
}
}
}
}
-
-int dlsch_encoding_2threads0(te_params *tep) {
- LTE_eNB_DLSCH_t *dlsch = tep->dlsch;
- unsigned int G = tep->G;
- unsigned char harq_pid = tep->harq_pid;
- unsigned int total_worker = tep->total_worker;
- unsigned int current_worker = tep->current_worker;
- unsigned short nb_rb = dlsch->harq_processes[harq_pid]->nb_rb;
- unsigned int Kr=0,Kr_bytes,r,r_offset=0;
- // unsigned short m=dlsch->harq_processes[harq_pid]->mcs;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING_W, VCD_FUNCTION_IN);
-
- if (dlsch->harq_processes[harq_pid]->round == 0) { // this is a new packet
- for (r=(dlsch->harq_processes[harq_pid]->C/(total_worker+1))*current_worker; r<(dlsch->harq_processes[harq_pid]->C/(total_worker+1))*(current_worker+1); r++) {
- if (r<dlsch->harq_processes[harq_pid]->Cminus)
- Kr = dlsch->harq_processes[harq_pid]->Kminus;
- else
- Kr = dlsch->harq_processes[harq_pid]->Kplus;
-
- Kr_bytes = Kr>>3;
- encoder(dlsch->harq_processes[harq_pid]->c[r],
- Kr>>3,
- &dlsch->harq_processes[harq_pid]->d[r][96],
- (r==0) ? dlsch->harq_processes[harq_pid]->F : 0
- );
- dlsch->harq_processes[harq_pid]->RTC[r] =
- sub_block_interleaving_turbo(4+(Kr_bytes*8),
- &dlsch->harq_processes[harq_pid]->d[r][96],
- dlsch->harq_processes[harq_pid]->w[r]);
- }
- }
-
- // Fill in the "e"-sequence from 36-212, V8.6 2009-03, p. 16-17 (for each "e") and concatenate the
- // outputs for each code segment, see Section 5.1.5 p.20
-
- for (r=0,r_offset=0; r<(dlsch->harq_processes[harq_pid]->C/(total_worker+1))*(current_worker+1); r++) {
- if(r<(dlsch->harq_processes[harq_pid]->C/(total_worker+1))*(current_worker)) {
- int Nl=dlsch->harq_processes[harq_pid]->Nl;
- int Qm=dlsch->harq_processes[harq_pid]->Qm;
- int C = dlsch->harq_processes[harq_pid]->C;
- int Gp = G/Nl/Qm;
- int GpmodC = Gp%C;
-
- if (r < (C-(GpmodC)))
- r_offset += Nl*Qm * (Gp/C);
- else
- r_offset += Nl*Qm * ((GpmodC==0?0:1) + (Gp/C));
- } else {
- r_offset += lte_rate_matching_turbo(dlsch->harq_processes[harq_pid]->RTC[r],
- G, //G
- dlsch->harq_processes[harq_pid]->w[r],
- dlsch->harq_processes[harq_pid]->e+r_offset,
- dlsch->harq_processes[harq_pid]->C, // C
- dlsch->Nsoft, // Nsoft,
- dlsch->Mdlharq,
- dlsch->Kmimo,
- dlsch->harq_processes[harq_pid]->rvidx,
- dlsch->harq_processes[harq_pid]->Qm,
- dlsch->harq_processes[harq_pid]->Nl,
- r,
- nb_rb);
- // m); // r
- }
- }
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING_W, VCD_FUNCTION_OUT);
- return(0);
-}
-
-
void *te_thread(void *param) {
- te_params *tep = (te_params *)param;
-
- //wait_sync("te_thread");
-
- while (!oai_exit) {
- if (wait_on_condition(&tep->mutex_te,&tep->cond_te,&tep->instance_cnt_te,"te thread")<0) break;
-
- if(oai_exit) break;
-
- dlsch_encoding_2threads0(tep);
-
- if (release_thread(&tep->mutex_te,&tep->instance_cnt_te,"te thread")<0) break;
-
- if (pthread_cond_signal(&tep->cond_te) != 0) {
- printf("[eNB] ERROR pthread_cond_signal for te thread exit\n");
- exit_fun( "ERROR pthread_cond_signal" );
- return(NULL);
- }
-
- /*if(opp_enabled == 1 && te_wakeup_stats0->p_time>50*3000){
- print_meas_now(te_wakeup_stats0,"coding_wakeup",stderr);
- printf("te_thread0 delay for waking up in frame_rx: %d subframe_rx: %d \n",proc->frame_rx,proc->subframe_rx);
- }*/
- }
-
return(NULL);
}
-
-int dlsch_encoding_2threads(PHY_VARS_eNB *eNB,
- unsigned char *a,
- uint8_t num_pdcch_symbols,
- LTE_eNB_DLSCH_t *dlsch,
- int frame,
- uint8_t subframe,
- time_stats_t *rm_stats,
- time_stats_t *te_stats,
- time_stats_t *te_wait_stats,
- time_stats_t *te_main_stats,
- time_stats_t *te_wakeup_stats0,
- time_stats_t *te_wakeup_stats1,
- time_stats_t *i_stats,
- int worker_num) {
- //start_meas(&eNB->dlsch_turbo_encoding_preperation_stats);
- LTE_DL_FRAME_PARMS *frame_parms = &eNB->frame_parms;
- L1_proc_t *proc = &eNB->proc;
- unsigned int G;
- unsigned int crc=1;
- unsigned char harq_pid = dlsch->harq_ids[frame%2][subframe];
- if((harq_pid < 0) || (harq_pid >= dlsch->Mdlharq)) {
- LOG_E(PHY,"dlsch_encoding_2threads illegal harq_pid %d %s:%d\n", harq_pid, __FILE__, __LINE__);
- return(-1);
- }
-
- unsigned short nb_rb = dlsch->harq_processes[harq_pid]->nb_rb;
- unsigned int A;
- unsigned char mod_order;
- unsigned int Kr=0,Kr_bytes,r,r_offset=0;
- // unsigned short m=dlsch->harq_processes[harq_pid]->mcs;
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_IN);
- A = dlsch->harq_processes[harq_pid]->TBS; //6228
- mod_order = dlsch->harq_processes[harq_pid]->Qm;
- G = get_G(frame_parms,nb_rb,dlsch->harq_processes[harq_pid]->rb_alloc,mod_order,dlsch->harq_processes[harq_pid]->Nl,num_pdcch_symbols,frame,subframe,
- dlsch->harq_processes[harq_pid]->mimo_mode==TM7?7:0);
-
- if (dlsch->harq_processes[harq_pid]->round == 0) { // this is a new packet
- start_meas(&eNB->dlsch_turbo_encoding_preperation_stats);
- // Add 24-bit crc (polynomial A) to payload
- crc = crc24a(a,
- A)>>8;
- stop_meas(&eNB->dlsch_turbo_encoding_preperation_stats);
- a[A>>3] = ((uint8_t *)&crc)[2];
- a[1+(A>>3)] = ((uint8_t *)&crc)[1];
- a[2+(A>>3)] = ((uint8_t *)&crc)[0];
- dlsch->harq_processes[harq_pid]->B = A+24;
- memcpy(dlsch->harq_processes[harq_pid]->b,a,(A/8)+4);
- //stop_meas(&eNB->dlsch_turbo_encoding_preperation_stats);
- start_meas(&eNB->dlsch_turbo_encoding_segmentation_stats);
-
- if (lte_segmentation(dlsch->harq_processes[harq_pid]->b,
- dlsch->harq_processes[harq_pid]->c,
- dlsch->harq_processes[harq_pid]->B,
- &dlsch->harq_processes[harq_pid]->C,
- &dlsch->harq_processes[harq_pid]->Cplus,
- &dlsch->harq_processes[harq_pid]->Cminus,
- &dlsch->harq_processes[harq_pid]->Kplus,
- &dlsch->harq_processes[harq_pid]->Kminus,
- &dlsch->harq_processes[harq_pid]->F)<0)
- return(-1);
-
- stop_meas(&eNB->dlsch_turbo_encoding_segmentation_stats);
- start_meas(&eNB->dlsch_turbo_encoding_signal_stats);
-
- for(int i=0; i<worker_num; i++) {
- proc->tep[i].eNB = eNB;
- proc->tep[i].dlsch = dlsch;
- proc->tep[i].G = G;
- proc->tep[i].harq_pid = harq_pid;
- proc->tep[i].total_worker = worker_num;
- proc->tep[i].current_worker = i;
- pthread_mutex_lock( &proc->tep[i].mutex_te );
-
- if (proc->tep[i].instance_cnt_te==0) {
- printf("[eNB] TE thread busy\n");
- exit_fun("TE thread busy");
- pthread_mutex_unlock( &proc->tep[i].mutex_te );
- return(-1);
- }
-
- ++proc->tep[i].instance_cnt_te;
-
- // wakeup worker to do segments
- if (pthread_cond_signal(&proc->tep[i].cond_te) != 0) {
- printf("[eNB] ERROR pthread_cond_signal for te thread %d exit\n",i);
- exit_fun( "ERROR pthread_cond_signal" );
- return (-1);
- }
-
- pthread_mutex_unlock( &proc->tep[i].mutex_te );
- }
-
- stop_meas(&eNB->dlsch_turbo_encoding_signal_stats);
- start_meas(te_main_stats);
-
- for (r=(dlsch->harq_processes[harq_pid]->C/(worker_num+1))*worker_num; r<dlsch->harq_processes[harq_pid]->C; r++) {
- if (r<dlsch->harq_processes[harq_pid]->Cminus)
- Kr = dlsch->harq_processes[harq_pid]->Kminus;
- else
- Kr = dlsch->harq_processes[harq_pid]->Kplus;
-
- Kr_bytes = Kr>>3;
- start_meas(te_stats);
- encoder(dlsch->harq_processes[harq_pid]->c[r],
- Kr>>3,
- &dlsch->harq_processes[harq_pid]->d[r][96],
- (r==0) ? dlsch->harq_processes[harq_pid]->F : 0
- );
- stop_meas(te_stats);
- start_meas(i_stats);
- dlsch->harq_processes[harq_pid]->RTC[r] =
- sub_block_interleaving_turbo(4+(Kr_bytes*8),
- &dlsch->harq_processes[harq_pid]->d[r][96],
- dlsch->harq_processes[harq_pid]->w[r]);
- stop_meas(i_stats);
- }
- } else {
- for(int i=0; i<worker_num; i++) {
- proc->tep[i].eNB = eNB;
- proc->tep[i].dlsch = dlsch;
- proc->tep[i].G = G;
- proc->tep[i].total_worker = worker_num;
- proc->tep[i].current_worker = i;
-
- if (pthread_cond_signal(&proc->tep[i].cond_te) != 0) {
- printf("[eNB] ERROR pthread_cond_signal for te thread exit\n");
- exit_fun( "ERROR pthread_cond_signal" );
- return (-1);
- }
- }
- }
-
- // Fill in the "e"-sequence from 36-212, V8.6 2009-03, p. 16-17 (for each "e") and concatenate the
- // outputs for each code segment, see Section 5.1.5 p.20
- for (r=0,r_offset=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
- // get information for E for the segments that are handled by the worker thread
- if (r<(dlsch->harq_processes[harq_pid]->C/(worker_num+1))*worker_num) {
- int Nl=dlsch->harq_processes[harq_pid]->Nl;
- int Qm=dlsch->harq_processes[harq_pid]->Qm;
- int C = dlsch->harq_processes[harq_pid]->C;
- int Gp = G/Nl/Qm;
- int GpmodC = Gp%C;
-
- if (r < (C-(GpmodC)))
- r_offset += Nl*Qm * (Gp/C);
- else
- r_offset += Nl*Qm * ((GpmodC==0?0:1) + (Gp/C));
- } else {
- start_meas(rm_stats);
- r_offset += lte_rate_matching_turbo(dlsch->harq_processes[harq_pid]->RTC[r],
- G, //G
- dlsch->harq_processes[harq_pid]->w[r],
- dlsch->harq_processes[harq_pid]->e+r_offset,
- dlsch->harq_processes[harq_pid]->C, // C
- dlsch->Nsoft, // Nsoft,
- dlsch->Mdlharq,
- dlsch->Kmimo,
- dlsch->harq_processes[harq_pid]->rvidx,
- dlsch->harq_processes[harq_pid]->Qm,
- dlsch->harq_processes[harq_pid]->Nl,
- r,
- nb_rb);
- // m); // r
- stop_meas(rm_stats);
- }
- }
-
- stop_meas(te_main_stats);
- start_meas(te_wait_stats);
-
- if(worker_num == 1) {
- wait_on_busy_condition(&proc->tep[0].mutex_te,&proc->tep[0].cond_te,&proc->tep[0].instance_cnt_te,"te thread 0");
- } else if(worker_num == 2) {
- wait_on_busy_condition(&proc->tep[0].mutex_te,&proc->tep[0].cond_te,&proc->tep[0].instance_cnt_te,"te thread 0");
- wait_on_busy_condition(&proc->tep[1].mutex_te,&proc->tep[1].cond_te,&proc->tep[1].instance_cnt_te,"te thread 1");
- } else {
- wait_on_busy_condition(&proc->tep[0].mutex_te,&proc->tep[0].cond_te,&proc->tep[0].instance_cnt_te,"te thread 0");
- wait_on_busy_condition(&proc->tep[1].mutex_te,&proc->tep[1].cond_te,&proc->tep[1].instance_cnt_te,"te thread 1");
- wait_on_busy_condition(&proc->tep[2].mutex_te,&proc->tep[2].cond_te,&proc->tep[2].instance_cnt_te,"te thread 2");
- }
-
- stop_meas(te_wait_stats);
- /*if(opp_enabled == 1 && te_wait_stats->p_time>100*3000){
- print_meas_now(te_wait_stats,"coding_wait",stderr);
- printf("coding delay in wait on codition in frame_rx: %d \n",proc->frame_rx);
- }*/
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_OUT);
- return(0);
-}
-
-
int dlsch_encoding_all(PHY_VARS_eNB *eNB,
+ L1_rxtx_proc_t *proc,
unsigned char *a,
uint8_t num_pdcch_symbols,
LTE_eNB_DLSCH_t *dlsch,
@@ -568,108 +259,72 @@ int dlsch_encoding_all(PHY_VARS_eNB *eNB,
time_stats_t *te_wakeup_stats0,
time_stats_t *te_wakeup_stats1,
time_stats_t *i_stats) {
- int encoding_return = 0;
- unsigned int L,C,B;
uint8_t harq_pid = dlsch->harq_ids[frame%2][subframe];
if(harq_pid >= dlsch->Mdlharq) {
LOG_E(PHY,"dlsch_encoding_all illegal harq_pid %d\n", harq_pid);
return(-1);
}
- B = dlsch->harq_processes[harq_pid]->B;
+
+ LOG_D(PHY,"B %d, harq_pid %d\n",
+ dlsch->harq_processes[harq_pid]->B,
+ dlsch->harq_ids[frame%2][subframe]);
+
+ return dlsch_encoding(eNB,
+ proc,
+ a,
+ num_pdcch_symbols,
+ dlsch,
+ frame,
+ subframe,
+ rm_stats,
+ te_stats,
+ i_stats);
- LOG_D(PHY,"B %d, harq_pid %d\n",B,dlsch->harq_ids[frame%2][subframe]);
-
- if(B<=6144) {
- L=0;
- C=1;
- } else {
- L=24;
- C = B/(6144-L);
-
- if((6144-L)*C < B) {
- C = C+1;
- }
- }
+}
- if(get_thread_worker_conf() == WORKER_ENABLE) {
- if(C >= 8) { //one main three worker
- encoding_return =
- dlsch_encoding_2threads(eNB,
- a,
- num_pdcch_symbols,
- dlsch,
- frame,
- subframe,
- rm_stats,
- te_stats,
- te_wait_stats,
- te_main_stats,
- te_wakeup_stats0,
- te_wakeup_stats1,
- i_stats,
- 3);
- } else if(C >= 6) { //one main two worker
- encoding_return =
- dlsch_encoding_2threads(eNB,
- a,
- num_pdcch_symbols,
- dlsch,
- frame,
- subframe,
- rm_stats,
- te_stats,
- te_wait_stats,
- te_main_stats,
- te_wakeup_stats0,
- te_wakeup_stats1,
- i_stats,
- 2);
- } else if(C >= 4) { //one main one worker
- encoding_return =
- dlsch_encoding_2threads(eNB,
- a,
- num_pdcch_symbols,
- dlsch,
- frame,
- subframe,
- rm_stats,
- te_stats,
- te_wait_stats,
- te_main_stats,
- te_wakeup_stats0,
- te_wakeup_stats1,
- i_stats,
- 1);
- } else {
- encoding_return =
- dlsch_encoding(eNB,
- a,
- num_pdcch_symbols,
- dlsch,
- frame,
- subframe,
- rm_stats,
- te_stats,
- i_stats);
- }
- } else {
- encoding_return =
- dlsch_encoding(eNB,
- a,
- num_pdcch_symbols,
- dlsch,
- frame,
- subframe,
- rm_stats,
- te_stats,
- i_stats);
+static void TPencode(void * arg) {
+ turboEncode_t * rdata=(turboEncode_t *) arg;
+ unsigned char harq_pid = rdata->harq_pid;
+ LTE_DL_eNB_HARQ_t *hadlsch=rdata->dlsch->harq_processes[harq_pid];
+
+ if ( rdata-> round == 0) {
+ uint8_t tmp[96+12+3+3*6144];
+ memset(tmp,LTE_NULL, TURBO_SIMD_SOFTBITS);
+ start_meas(rdata->te_stats);
+ encoder(rdata->input,
+ rdata->Kr_bytes,
+ tmp+96,//&dlsch->harq_processes[harq_pid]->d[r][96],
+ rdata->filler);
+ stop_meas(rdata->te_stats);
+ start_meas(rdata->i_stats);
+ hadlsch->RTC[rdata->r] =
+ sub_block_interleaving_turbo(4+(rdata->Kr_bytes*8),
+ tmp+96,
+ hadlsch->w[rdata->r]);
+ stop_meas(rdata->i_stats);
}
-
- return encoding_return;
+
+ // Fill in the "e"-sequence from 36-212, V8.6 2009-03, p. 16-17 (for each "e") and concatenate the
+ // outputs for each code segment, see Section 5.1.5 p.20
+ start_meas(rdata->rm_stats);
+ lte_rate_matching_turbo(hadlsch->RTC[rdata->r],
+ rdata->G, //G
+ hadlsch->w[rdata->r],
+ hadlsch->eDL+rdata->r_offset,
+ hadlsch->C, // C
+ rdata->dlsch->Nsoft, // Nsoft,
+ rdata->dlsch->Mdlharq,
+ rdata->dlsch->Kmimo,
+ hadlsch->rvidx,
+ hadlsch->Qm,
+ hadlsch->Nl,
+ rdata->r,
+ hadlsch->nb_rb);
+ stop_meas(rdata->rm_stats);
}
-
int dlsch_encoding(PHY_VARS_eNB *eNB,
+ L1_rxtx_proc_t *proc,
unsigned char *a,
uint8_t num_pdcch_symbols,
LTE_eNB_DLSCH_t *dlsch,
@@ -678,8 +333,6 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
time_stats_t *rm_stats,
time_stats_t *te_stats,
time_stats_t *i_stats) {
- unsigned int G;
- unsigned int crc=1;
LTE_DL_FRAME_PARMS *frame_parms = &eNB->frame_parms;
unsigned char harq_pid = dlsch->harq_ids[frame%2][subframe];
if((harq_pid < 0) || (harq_pid >= dlsch->Mdlharq)) {
@@ -687,135 +340,88 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
return(-1);
}
- unsigned short nb_rb = dlsch->harq_processes[harq_pid]->nb_rb;
- unsigned int A;
- unsigned char mod_order;
- unsigned int Kr=0,Kr_bytes,r,r_offset=0;
- // unsigned short m=dlsch->harq_processes[harq_pid]->mcs;
+ LTE_DL_eNB_HARQ_t *hadlsch=dlsch->harq_processes[harq_pid];
uint8_t beamforming_mode=0;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_IN);
- A = dlsch->harq_processes[harq_pid]->TBS; //6228
- // printf("Encoder: A: %d\n",A);
- mod_order = dlsch->harq_processes[harq_pid]->Qm;
- if(dlsch->harq_processes[harq_pid]->mimo_mode == TM7)
+ if(hadlsch->mimo_mode == TM7)
beamforming_mode = 7;
- else if(dlsch->harq_processes[harq_pid]->mimo_mode == TM8)
+ else if(hadlsch->mimo_mode == TM8)
beamforming_mode = 8;
- else if(dlsch->harq_processes[harq_pid]->mimo_mode == TM9_10)
+ else if(hadlsch->mimo_mode == TM9_10)
beamforming_mode = 9;
- G = get_G(frame_parms,nb_rb,dlsch->harq_processes[harq_pid]->rb_alloc,mod_order,dlsch->harq_processes[harq_pid]->Nl,num_pdcch_symbols,frame,subframe,beamforming_mode);
+ unsigned int G = get_G(frame_parms,hadlsch->nb_rb,
+ hadlsch->rb_alloc,
+ hadlsch->Qm, // mod order
+ hadlsch->Nl,
+ num_pdcch_symbols,
+ frame,subframe,beamforming_mode);
- // if (dlsch->harq_processes[harq_pid]->Ndi == 1) { // this is a new packet
- if (dlsch->harq_processes[harq_pid]->round == 0) { // this is a new packet
-#ifdef DEBUG_DLSCH_CODING
- printf("encoding thinks this is a new packet for harq_pid %d (%p), A %u \n",harq_pid,dlsch,A);
-#endif
- /*
- int i;
- printf("dlsch (tx): \n");
- for (i=0;i<(A>>3);i++)
- printf("%02x.",a[i]);
- printf("\n");
- */
+ proc->nbEncode=0;
+
+ // if (hadlsch->Ndi == 1) { // this is a new packet
+ if (hadlsch->round == 0) { // this is a new packet
// Add 24-bit crc (polynomial A) to payload
- crc = crc24a(a,
+ unsigned int A=hadlsch->TBS; //6228;
+ unsigned int crc = crc24a(a,
A)>>8;
a[A>>3] = ((uint8_t *)&crc)[2];
a[1+(A>>3)] = ((uint8_t *)&crc)[1];
a[2+(A>>3)] = ((uint8_t *)&crc)[0];
// printf("CRC %x (A %d)\n",crc,A);
- dlsch->harq_processes[harq_pid]->B = A+24;
- // dlsch->harq_processes[harq_pid]->b = a;
- memcpy(dlsch->harq_processes[harq_pid]->b,a,(A/8)+4);
-
- if (lte_segmentation(dlsch->harq_processes[harq_pid]->b,
- dlsch->harq_processes[harq_pid]->c,
- dlsch->harq_processes[harq_pid]->B,
- &dlsch->harq_processes[harq_pid]->C,
- &dlsch->harq_processes[harq_pid]->Cplus,
- &dlsch->harq_processes[harq_pid]->Cminus,
- &dlsch->harq_processes[harq_pid]->Kplus,
- &dlsch->harq_processes[harq_pid]->Kminus,
- &dlsch->harq_processes[harq_pid]->F)<0)
+ hadlsch->B = A+24;
+ // hadlsch->b = a;
+ memcpy(hadlsch->b,a,(A/8)+4);
+
+ if (lte_segmentation(hadlsch->b,
+ hadlsch->c,
+ hadlsch->B,
+ &hadlsch->C,
+ &hadlsch->Cplus,
+ &hadlsch->Cminus,
+ &hadlsch->Kplus,
+ &hadlsch->Kminus,
+ &hadlsch->F)<0)
return(-1);
-
- for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
- if (r<dlsch->harq_processes[harq_pid]->Cminus)
- Kr = dlsch->harq_processes[harq_pid]->Kminus;
- else
- Kr = dlsch->harq_processes[harq_pid]->Kplus;
-
- Kr_bytes = Kr>>3;
-#ifdef DEBUG_DLSCH_CODING
- printf("Generating Code Segment %u (%u bits)\n",r,Kr);
- // generate codewords
- printf("bits_per_codeword (Kr)= %u, A %u\n",Kr,A);
- printf("N_RB = %d\n",nb_rb);
- printf("Ncp %d\n",frame_parms->Ncp);
- printf("mod_order %d\n",mod_order);
-#endif
- start_meas(te_stats);
- encoder(dlsch->harq_processes[harq_pid]->c[r],
- Kr>>3,
- &dlsch->harq_processes[harq_pid]->d[r][96],
- (r==0) ? dlsch->harq_processes[harq_pid]->F : 0
- );
- stop_meas(te_stats);
-#ifdef DEBUG_DLSCH_CODING
-
- if (r==0)
- LOG_M("enc_output0.m","enc0",&dlsch->harq_processes[harq_pid]->d[r][96],(3*8*Kr_bytes)+12,1,4);
-
-#endif
- start_meas(i_stats);
- dlsch->harq_processes[harq_pid]->RTC[r] =
- sub_block_interleaving_turbo(4+(Kr_bytes*8),
- &dlsch->harq_processes[harq_pid]->d[r][96],
- dlsch->harq_processes[harq_pid]->w[r]);
- stop_meas(i_stats);
- }
}
-
- // Fill in the "e"-sequence from 36-212, V8.6 2009-03, p. 16-17 (for each "e") and concatenate the
- // outputs for each code segment, see Section 5.1.5 p.20
-
- for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
-#ifdef DEBUG_DLSCH_CODING
- printf("Rate Matching, Code segment %u (coded bits (G) %u,unpunctured/repeated bits per code segment %u,mod_order %d, nb_rb %d)...\n",
- r,
- G,
- Kr*3,
- mod_order,nb_rb);
-#endif
- start_meas(rm_stats);
-#ifdef DEBUG_DLSCH_CODING
- printf("rvidx in encoding = %d\n", dlsch->harq_processes[harq_pid]->rvidx);
-#endif
- r_offset += lte_rate_matching_turbo(dlsch->harq_processes[harq_pid]->RTC[r],
- G, //G
- dlsch->harq_processes[harq_pid]->w[r],
- dlsch->harq_processes[harq_pid]->e+r_offset,
- dlsch->harq_processes[harq_pid]->C, // C
- dlsch->Nsoft, // Nsoft,
- dlsch->Mdlharq,
- dlsch->Kmimo,
- dlsch->harq_processes[harq_pid]->rvidx,
- dlsch->harq_processes[harq_pid]->Qm,
- dlsch->harq_processes[harq_pid]->Nl,
- r,
- nb_rb);
- // m); // r
- stop_meas(rm_stats);
-#ifdef DEBUG_DLSCH_CODING
-
- if (r==dlsch->harq_processes[harq_pid]->C-1)
- LOG_M("enc_output.m","enc",dlsch->harq_processes[harq_pid]->e,r_offset,1,4);
-
-#endif
+
+ for (int r=0, r_offset=0; r<hadlsch->C; r++) {
+
+ union turboReqUnion id= {.s={dlsch->rnti,frame,subframe,r,0}};
+ notifiedFIFO_elt_t *req=newNotifiedFIFO_elt(sizeof(turboEncode_t), id.p, proc->respEncode, TPencode);
+ turboEncode_t * rdata=(turboEncode_t *) NotifiedFifoData(req);
+ rdata->input=hadlsch->c[r];
+ rdata->Kr_bytes= ( r<hadlsch->Cminus ? hadlsch->Kminus : hadlsch->Kplus) >>3;
+ rdata->filler=(r==0) ? hadlsch->F : 0;
+ rdata->r=r;
+ rdata->harq_pid=harq_pid;
+ rdata->dlsch=dlsch;
+ rdata->rm_stats=rm_stats;
+ rdata->te_stats=te_stats;
+ rdata->i_stats=i_stats;
+ rdata->round=hadlsch->round;
+ rdata->r_offset=r_offset;
+ rdata->G=G;
+
+ if ( proc->threadPool->activated ) {
+ pushTpool(proc->threadPool,req);
+ proc->nbEncode++;
+ } else {
+ TPencode(rdata);
+ delNotifiedFIFO_elt(req);
+ }
+
+ int Qm=hadlsch->Qm;
+ int C=hadlsch->C;
+ int Nl=hadlsch->Nl;
+ int Gp = G/Nl/Qm;
+ int GpmodC = Gp%C;
+ if (r < (C-(GpmodC)))
+ r_offset += Nl*Qm * (Gp/C);
+ else
+ r_offset += Nl*Qm * ((GpmodC==0?0:1) + (Gp/C));
}
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_OUT);
return(0);
}
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
index 04a49d062a3be069a78bb6e505c3cf3eb830f200..475c8bd521d8ea8b777d3bf04a40e799497858cd 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
@@ -158,7 +158,7 @@ int allocate_REs_in_RB_no_pilots_QPSK_siso(PHY_VARS_eNB* phy_vars_eNB,
{
LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->frame_parms;
- uint8_t *x0 = dlsch0_harq->e;
+ uint8_t *x0 = dlsch0_harq->eDL;
uint32_t qpsk_table_offset_re = 0;
uint32_t qpsk_table_offset_im = 0;
@@ -248,7 +248,7 @@ int allocate_REs_in_RB_pilots_QPSK_siso(PHY_VARS_eNB* phy_vars_eNB,
LTE_DL_FRAME_PARMS *frame_parms=&phy_vars_eNB->frame_parms;
- uint8_t *x0 = dlsch0_harq->e;
+ uint8_t *x0 = dlsch0_harq->eDL;
uint32_t qpsk_table_offset_re = 0;
uint32_t qpsk_table_offset_im = 0;
@@ -343,7 +343,7 @@ int allocate_REs_in_RB_no_pilots_16QAM_siso(PHY_VARS_eNB* phy_vars_eNB,
{
LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->frame_parms;
- uint8_t *x0 = dlsch0_harq->e;
+ uint8_t *x0 = dlsch0_harq->eDL;
uint32_t qam16_table_offset_re = 0;
uint32_t qam16_table_offset_im = 0;
@@ -439,7 +439,7 @@ int allocate_REs_in_RB_pilots_16QAM_siso(PHY_VARS_eNB* phy_vars_eNB,
LTE_DL_FRAME_PARMS *frame_parms=&phy_vars_eNB->frame_parms;
- uint8_t *x0 = dlsch0_harq->e;
+ uint8_t *x0 = dlsch0_harq->eDL;
uint32_t qam16_table_offset_re = 0;
uint32_t qam16_table_offset_im = 0;
@@ -542,7 +542,7 @@ int allocate_REs_in_RB_no_pilots_64QAM_siso(PHY_VARS_eNB* phy_vars_eNB,
LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->frame_parms;
- uint8_t *x0 = dlsch0_harq->e;
+ uint8_t *x0 = dlsch0_harq->eDL;
uint32_t qam64_table_offset_re = 0;
uint32_t qam64_table_offset_im = 0;
@@ -699,7 +699,7 @@ int allocate_REs_in_RB_pilots_64QAM_siso(PHY_VARS_eNB* phy_vars_eNB,
LTE_DL_FRAME_PARMS *frame_parms=&phy_vars_eNB->frame_parms;
- uint8_t *x0 = dlsch0_harq->e;
+ uint8_t *x0 = dlsch0_harq->eDL;
uint32_t qam64_table_offset_re = 0;
uint32_t qam64_table_offset_im = 0;
@@ -866,12 +866,12 @@ int allocate_REs_in_RB(PHY_VARS_eNB* phy_vars_eNB,
if ((dlsch0_harq != NULL) && (dlsch1_harq != NULL)) { //this is for TM3, TM4
- x0 = dlsch0_harq->e;
+ x0 = dlsch0_harq->eDL;
mimo_mode = dlsch0_harq->mimo_mode;
first_layer0 = dlsch0_harq->first_layer;
Nlayers0 = dlsch0_harq->Nlayers;
mod_order0 = dlsch0_harq->Qm;
- x1 = dlsch1_harq->e;
+ x1 = dlsch1_harq->eDL;
// Fill these in later for TM8-10
// Nlayers1 = dlsch1_harq->Nlayers;
// first_layer1 = dlsch1_harq->first_layer;
@@ -879,7 +879,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB* phy_vars_eNB,
} else if ((dlsch0_harq != NULL) && (dlsch1_harq == NULL)){ //This is for SIS0 TM1, TM6, etc
- x0 = dlsch0_harq->e;
+ x0 = dlsch0_harq->eDL;
mimo_mode = dlsch0_harq->mimo_mode;
first_layer0 = dlsch0_harq->first_layer;
Nlayers0 = dlsch0_harq->Nlayers;
@@ -887,7 +887,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB* phy_vars_eNB,
} else if ((dlsch0_harq == NULL) && (dlsch1_harq != NULL)){ // This is for TM4 retransmission
- x0 = dlsch1_harq->e;
+ x0 = dlsch1_harq->eDL;
mimo_mode = dlsch1_harq->mimo_mode;
first_layer0 = dlsch1_harq->first_layer;
Nlayers0 = dlsch1_harq->Nlayers;
@@ -2692,7 +2692,7 @@ int dlsch_modulation_SIC(int32_t **sic_buffer,
LTE_DL_eNB_HARQ_t *dlsch0_harq = dlsch0->harq_processes[harq_pid];
uint32_t i,jj,re_allocated=0;
uint8_t mod_order0 = dlsch0_harq->Qm;
- uint8_t *x0 = dlsch0_harq->e;
+ uint8_t *x0 = dlsch0_harq->eDL;
uint8_t qam64_table_offset_re = 0;
uint8_t qam64_table_offset_im = 0;
uint8_t qam16_table_offset_re = 0;
@@ -2883,7 +2883,7 @@ int mch_modulation(int32_t **txdataF,
&jj,
re_offset,
symbol_offset,
- dlsch->harq_processes[0]->e,
+ dlsch->harq_processes[0]->eDL,
l,
mod_order,
amp,
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c b/openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
index 2e8ddde8488a2e59e37455ea50f5dfb54308b9cc..d48164e07d605a16aa27e3c81415c85879585f67 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
@@ -52,7 +52,7 @@ void dlsch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
int n;
// uint8_t reset;
uint32_t x1, x2, s=0;
- uint8_t *dlsch_e=dlsch->harq_processes[harq_pid]->e;
+ uint8_t *dlsch_e=dlsch->harq_processes[harq_pid]->eDL;
uint8_t *e=dlsch_e;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_SCRAMBLING, VCD_FUNCTION_IN);
// Rule for accumulation of subframes for BL/CE UEs
diff --git a/openair1/PHY/LTE_TRANSPORT/if5_tools.h b/openair1/PHY/LTE_TRANSPORT/if5_tools.h
index 0f24f7becee0334c1e2d900a5b79133bb9130ba8..6c75b20bd9692f72eceb25388aff375bb5ed5aa3 100644
--- a/openair1/PHY/LTE_TRANSPORT/if5_tools.h
+++ b/openair1/PHY/LTE_TRANSPORT/if5_tools.h
@@ -61,7 +61,8 @@ typedef struct IF5_mobipass_header IF5_mobipass_header_t;
void send_IF5(RU_t *, openair0_timestamp, int, uint8_t*, uint16_t);
-void recv_IF5(RU_t *, openair0_timestamp*, int, uint16_t);
+void recv_IF5(RU_t *ru, openair0_timestamp *proc_timestamp, int subframe, uint16_t packet_type);
+
void malloc_IF5_buffer(RU_t *ru);
diff --git a/openair1/PHY/LTE_TRANSPORT/phich.c b/openair1/PHY/LTE_TRANSPORT/phich.c
index ab2fe2d743b8b2310ff1af8d5592a5df0979afc7..6d8b58818b16155fcabdc7ebc2fef4999ec9a01b 100644
--- a/openair1/PHY/LTE_TRANSPORT/phich.c
+++ b/openair1/PHY/LTE_TRANSPORT/phich.c
@@ -714,7 +714,7 @@ void generate_phich_top(PHY_VARS_eNB *eNB,
int32_t **txdataF = eNB->common_vars.txdataF;
uint8_t Ngroup_PHICH,ngroup_PHICH,nseq_PHICH;
uint8_t NSF_PHICH = 4;
- uint8_t pusch_subframe;
+ uint8_t pusch_subframe=-1;
uint8_t i;
int subframe = proc->subframe_tx;
phich_config_t *phich;
diff --git a/openair1/PHY/LTE_TRANSPORT/pmch.c b/openair1/PHY/LTE_TRANSPORT/pmch.c
index f48ee629a1eed9f1161105fcd27cb288541aca2c..90e2836b1e729dc09d18bdf87a09952a73714ed3 100644
--- a/openair1/PHY/LTE_TRANSPORT/pmch.c
+++ b/openair1/PHY/LTE_TRANSPORT/pmch.c
@@ -105,6 +105,7 @@ void generate_mch(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,uint8_t *a)
AssertFatal(eNB->dlsch_MCH->harq_processes[0]->pdu != NULL, "attempt to encode a NULL harq PDU\n");
AssertFatal(dlsch_encoding(eNB,
+ proc,
// a,
eNB->dlsch_MCH->harq_processes[0]->pdu,
1,
diff --git a/openair1/PHY/LTE_TRANSPORT/prach.c b/openair1/PHY/LTE_TRANSPORT/prach.c
index 983e30c80a1b6c50ccf4a9f7b4ac418304db86ae..24faf584d3ae2e2048e3ee4a412c3c33637d8a0d 100644
--- a/openair1/PHY/LTE_TRANSPORT/prach.c
+++ b/openair1/PHY/LTE_TRANSPORT/prach.c
@@ -38,9 +38,13 @@
#include "SCHED/sched_eNB.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "prach_extern.h"
+#include <openair1/PHY/LTE_TRANSPORT/transport_proto.h>
+#include <executables/split_headers.h>
void rx_prach0(PHY_VARS_eNB *eNB,
RU_t *ru,
+ int frame_prach,
+ int subframe,
uint16_t *max_preamble,
uint16_t *max_preamble_energy,
uint16_t *max_preamble_delay,
@@ -51,17 +55,14 @@ void rx_prach0(PHY_VARS_eNB *eNB,
uint8_t ce_level
) {
int i;
- LTE_DL_FRAME_PARMS *fp=NULL;
lte_frame_type_t frame_type;
uint16_t rootSequenceIndex;
uint8_t prach_ConfigIndex;
uint8_t Ncs_config;
uint8_t restricted_set;
uint8_t n_ra_prb;
- int subframe;
int16_t *prachF=NULL;
int16_t **rxsigF=NULL;
- int nb_rx=0;
int16_t *prach2;
uint8_t preamble_index;
uint16_t NCS,NCS2;
@@ -89,6 +90,8 @@ void rx_prach0(PHY_VARS_eNB *eNB,
int32_t **prach_ifftp=(int32_t **)NULL;
int prach_ifft_cnt=0;
+ LTE_DL_FRAME_PARMS *fp;
+ int nb_rx;
if(eNB) {
fp = &(eNB->frame_parms);
nb_rx = fp->nb_antennas_rx;
@@ -96,7 +99,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
fp = (ru->frame_parms);
nb_rx = ru->nb_rx;
}
-
+
AssertFatal(fp!=NULL,"rx_prach called without valid RU or eNB descriptor\n");
frame_type = fp->frame_type;
@@ -133,14 +136,13 @@ void rx_prach0(PHY_VARS_eNB *eNB,
if (eNB) {
if (br_flag == 1) {
prach_ifftp = eNB->prach_vars_br.prach_ifft[ce_level];
- subframe = eNB->proc.subframe_prach_br;
prachF = eNB->prach_vars_br.prachF;
rxsigF = eNB->prach_vars_br.rxsigF[ce_level];
if (LOG_DEBUGFLAG(PRACH)) {
- if (((eNB->proc.frame_prach)&1023) < 20) LOG_I(PHY,
+ if (((frame_prach)&1023) < 20) LOG_I(PHY,
"PRACH (eNB) : running rx_prach (br_flag %d, ce_level %d) for frame %d subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d, rootSequenceIndex %d, repetition number %d,numRepetitionsPrePreambleAttempt %d\n",
- br_flag,ce_level,eNB->proc.frame_prach,subframe,
+ br_flag,ce_level,frame_prach,subframe,
fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],
prach_ConfigIndex,rootSequenceIndex,
eNB->prach_vars_br.repetition_number[ce_level],
@@ -148,30 +150,27 @@ void rx_prach0(PHY_VARS_eNB *eNB,
}
} else {
prach_ifftp = eNB->prach_vars.prach_ifft[0];
- subframe = eNB->proc.subframe_prach;
prachF = eNB->prach_vars.prachF;
rxsigF = eNB->prach_vars.rxsigF[0];
if (LOG_DEBUGFLAG(PRACH)) {
- if (((eNB->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (eNB) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d , rootSequenceIndex %d\n", subframe,
+ if (((frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (eNB) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d , rootSequenceIndex %d\n", subframe,
fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,prach_ConfigIndex,rootSequenceIndex);
}
}
} else {
if (br_flag == 1) {
- subframe = ru->proc.subframe_prach_br;
rxsigF = ru->prach_rxsigF_br[ce_level];
if (LOG_DEBUGFLAG(PRACH)) {
- if (((ru->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (RU) : running rx_prach (br_flag %d, ce_level %d) for frame %d subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
- br_flag,ce_level,ru->proc.frame_prach,subframe,fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],prach_ConfigIndex);
+ if (((frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (RU) : running rx_prach (br_flag %d, ce_level %d) for frame %d subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
+ br_flag,ce_level,frame_prach,subframe,fp->prach_emtc_config_common.prach_ConfigInfo.prach_FreqOffset[ce_level],prach_ConfigIndex);
}
} else {
- subframe = ru->proc.subframe_prach;
rxsigF = ru->prach_rxsigF;
if (LOG_DEBUGFLAG(PRACH)) {
- if (((ru->proc.frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (RU) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
+ if (((frame_prach)&1023) < 20) LOG_I(PHY,"PRACH (RU) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d\n",
subframe,fp->prach_config_common.prach_ConfigInfo.prach_FreqOffset,prach_ConfigIndex);
}
}
@@ -202,7 +201,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
if (prach[0]!= NULL) LOG_M("prach_rx","prach_rx",prach[0],fp->samples_per_tti,1,1);
LOG_I(PHY,"RU %d, br_flag %d ce_level %d frame %d subframe %d per_tti:%d prach:%p (energy %d) TA:%d %s rxdata:%p index:%d\n",
- ru->idx,br_flag,ce_level,ru->proc.frame_prach,subframe,fp->samples_per_tti,
+ ru->idx,br_flag,ce_level,frame_prach,subframe,fp->samples_per_tti,
prach[aa],dbEn0,ru->N_TA_offset,buffer,ru->common.rxdata[aa],
(subframe*fp->samples_per_tti)-ru->N_TA_offset);
}
@@ -407,16 +406,16 @@ void rx_prach0(PHY_VARS_eNB *eNB,
if ((eNB==NULL) && ru->function == NGFI_RRU_IF4p5) {
/// **** send_IF4 of rxsigF to RAU **** ///
if (br_flag == 1)
- send_IF4p5(ru, ru->proc.frame_prach, ru->proc.subframe_prach, IF4p5_PRACH+1+ce_level);
+ send_IF4p5(ru, frame_prach, subframe, IF4p5_PRACH+1+ce_level);
else
- send_IF4p5(ru, ru->proc.frame_prach, ru->proc.subframe_prach, IF4p5_PRACH);
+ send_IF4p5(ru, frame_prach, subframe, IF4p5_PRACH);
return;
} else if (eNB!=NULL) {
if ( LOG_DEBUGFLAG(PRACH)) {
int en = dB_fixed(signal_energy((int32_t *)&rxsigF[0][0],840));
- if ((en > 60)&&(br_flag==1)) LOG_I(PHY,"PRACH (br_flag %d,ce_level %d, n_ra_prb %d, k %d): Frame %d, Subframe %d => %d dB\n",br_flag,ce_level,n_ra_prb,k,eNB->proc.frame_rx,eNB->proc.subframe_rx,en);
+ if ((en > 60)&&(br_flag==1)) LOG_I(PHY,"PRACH (br_flag %d,ce_level %d, n_ra_prb %d, k %d): Frame %d, Subframe %d => %d dB\n",br_flag,ce_level,n_ra_prb,k,frame_prach,subframe,en);
}
}
@@ -457,7 +456,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
if (LOG_DEBUGFLAG(PRACH)) {
int en = dB_fixed(signal_energy((int32_t *)&rxsigF[0][0],840));
- if (en>60) LOG_I(PHY,"frame %d, subframe %d : Trying preamble %d (br_flag %d)\n",ru->proc.frame_prach,subframe,preamble_index,br_flag);
+ if (en>60) LOG_I(PHY,"frame %d, subframe %d : Trying preamble %d (br_flag %d)\n",frame_prach,subframe,preamble_index,br_flag);
}
if (restricted_set == 0) {
@@ -543,7 +542,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
int en = dB_fixed(signal_energy((int32_t *)&rxsigF[0][0],840));
if (en>60) LOG_I(PHY,"frame %d, subframe %d : preamble index %d: offset %d, preamble shift %d (br_flag %d, en %d)\n",
- ru->proc.frame_prach,subframe,preamble_index,preamble_offset,preamble_shift,br_flag,en);
+ frame_prach,subframe,preamble_index,preamble_offset,preamble_shift,br_flag,en);
}
log2_ifft_size = 10;
@@ -618,7 +617,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
if (LOG_DEBUGFLAG(PRACH)) {
int en = dB_fixed(signal_energy((int32_t *)&rxsigF[0][0],840));
- if (en>60) LOG_I(PHY,"frame %d, subframe %d: Checking for peak in time-domain (br_flag %d, en %d)\n",ru->proc.frame_prach,subframe,br_flag,en);
+ if (en>60) LOG_I(PHY,"frame %d, subframe %d: Checking for peak in time-domain (br_flag %d, en %d)\n",frame_prach,subframe,br_flag,en);
}
preamble_shift2 = ((preamble_shift==0) ? 0 : ((preamble_shift<<log2_ifft_size)/N_ZC));
@@ -638,7 +637,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
if ((en>60) && (br_flag==1))
LOG_D(PHY,"frame %d, subframe %d : max_preamble_energy %d, max_preamble_delay %d, max_preamble %d (br_flag %d,ce_level %d, levdB %d, lev %d)\n",
- ru->proc.frame_prach,subframe,
+ frame_prach,subframe,
*max_preamble_energy,*max_preamble_delay,
*max_preamble,br_flag,ce_level,levdB,lev);
}
@@ -694,8 +693,16 @@ void rx_prach(PHY_VARS_eNB *eNB,
int i;
int prach_mask=0;
+ int subframe;
+ if (eNB)
+ subframe= br_flag?eNB->proc.subframe_prach_br:eNB->proc.subframe_prach;
+ else
+ subframe= br_flag?ru->proc.subframe_prach_br:ru->proc.subframe_prach;
+
+ int frame_prach=eNB?eNB->proc.frame_prach: ru->proc.frame_prach;
+
if (br_flag == 0) {
- rx_prach0(eNB,ru,max_preamble,max_preamble_energy,max_preamble_delay,avg_preamble_energy,Nf,tdd_mapindex,0,0);
+ rx_prach0(eNB,ru,frame_prach,subframe,max_preamble,max_preamble_energy,max_preamble_delay,avg_preamble_energy,Nf,tdd_mapindex,0,0);
} else { // This is procedure for eMTC, basically handling the repetitions
prach_mask = is_prach_subframe(&eNB->frame_parms,eNB->proc.frame_prach_br,eNB->proc.subframe_prach_br);
@@ -709,7 +716,7 @@ void rx_prach(PHY_VARS_eNB *eNB,
// increment repetition number
eNB->prach_vars_br.repetition_number[i]++;
// do basic PRACH reception
- rx_prach0(eNB,ru,max_preamble,max_preamble_energy,max_preamble_delay,avg_preamble_energy,Nf,tdd_mapindex,1,i);
+ rx_prach0(eNB,ru,frame_prach,subframe,max_preamble,max_preamble_energy,max_preamble_delay,avg_preamble_energy,Nf,tdd_mapindex,1,i);
// if last repetition, clear counter
if (eNB->prach_vars_br.repetition_number[i] == eNB->frame_parms.prach_emtc_config_common.prach_ConfigInfo.prach_numRepetitionPerPreambleAttempt[i]) {
diff --git a/openair1/PHY/LTE_TRANSPORT/pucch.c b/openair1/PHY/LTE_TRANSPORT/pucch.c
index e142d2f29febdac4a98c539f46e9115d461c503f..8637e80137576108f7302ff6df27aad6a1c5d1eb 100644
--- a/openair1/PHY/LTE_TRANSPORT/pucch.c
+++ b/openair1/PHY/LTE_TRANSPORT/pucch.c
@@ -180,7 +180,7 @@ uint16_t pucchfmt3_ChannelEstimation( int16_t SubCarrierDeMapData[NB_ANTENNAS_RX
uint16_t n3_pucch_array[NUMBER_OF_UE_MAX],
uint8_t ncs_cell[20][7] ) {
uint32_t aa, symNo, k, slotNo, sym, i, j;
- int16_t np, np_n, ip_ind;
+ int16_t np, np_n, ip_ind=-1;
//int16_t npucch_sf;
int16_t calctmp[2];
int16_t BsCshData[NB_ANTENNAS_RX][D_NSYM1SF][D_NSC1RB][2];
diff --git a/openair1/PHY/LTE_TRANSPORT/transport_eNB.h b/openair1/PHY/LTE_TRANSPORT/transport_eNB.h
index 7b9004ba80cd6f33e49be2b155b5842c1018fd64..5e446db5fdd1a11431d2e3075bcda66fdc5bd68a 100644
--- a/openair1/PHY/LTE_TRANSPORT/transport_eNB.h
+++ b/openair1/PHY/LTE_TRANSPORT/transport_eNB.h
@@ -100,7 +100,7 @@ typedef struct {
/// start symbold of pdsch
uint8_t pdsch_start;
/// Concatenated "e"-sequences (for definition see 36-212 V8.6 2009-03, p.17-18)
- uint8_t e[MAX_NUM_CHANNEL_BITS] __attribute__((aligned(32)));
+ uint8_t eDL[MAX_NUM_CHANNEL_BITS] __attribute__((aligned(32)));
/// Turbo-code outputs (36-212 V8.6 2009-03, p.12
uint8_t *d[MAX_NUM_DLSCH_SEGMENTS];//[(96+3+(3*6144))];
/// Sub-block interleaver outputs (36-212 V8.6 2009-03, p.16-17)
@@ -261,12 +261,13 @@ typedef struct {
/// coded RI bits
int16_t q_RI[MAX_RI_PAYLOAD];
/// Concatenated "e"-sequences (for definition see 36-212 V8.6 2009-03, p.17-18)
- int16_t e[MAX_NUM_CHANNEL_BITS] __attribute__((aligned(32)));
+ int16_t eUL[MAX_NUM_CHANNEL_BITS] __attribute__((aligned(32)));
/// Temporary h sequence to flag PUSCH_x/PUSCH_y symbols which are not scrambled
uint8_t h[MAX_NUM_CHANNEL_BITS];
/// Pointer to the payload
- uint8_t *b;
+ uint8_t *decodedBytes;
/// Pointers to transport block segments
+ //TBD
uint8_t *c[MAX_NUM_ULSCH_SEGMENTS];
/// RTC values for each segment (for definition see 36-212 V8.6 2009-03, p.15)
uint32_t RTC[MAX_NUM_ULSCH_SEGMENTS];
@@ -282,8 +283,12 @@ typedef struct {
uint8_t rvidx;
/// soft bits for each received segment ("w"-sequence)(for definition see 36-212 V8.6 2009-03, p.15)
int16_t w[MAX_NUM_ULSCH_SEGMENTS][3*(6144+64)];
+ int16_t pusch_rep_buffer[MAX_NUM_ULSCH_SEGMENTS][3*(6144+64)];
/// soft bits for each received segment ("d"-sequence)(for definition see 36-212 V8.6 2009-03, p.15)
+ //TBD
int16_t *d[MAX_NUM_ULSCH_SEGMENTS];
+ uint32_t processedSegments;
+ uint32_t processedBadSegment;
/// Number of code segments (for definition see 36-212 V8.6 2009-03, p.9)
uint32_t C;
/// Number of "small" code segments (for definition see 36-212 V8.6 2009-03, p.10)
diff --git a/openair1/PHY/LTE_TRANSPORT/transport_proto.h b/openair1/PHY/LTE_TRANSPORT/transport_proto.h
index f034039e7e23479059f9f7be3036a4b0f2877412..3988923bb98cdd77b93996ebb7fac009aee0ac12 100644
--- a/openair1/PHY/LTE_TRANSPORT/transport_proto.h
+++ b/openair1/PHY/LTE_TRANSPORT/transport_proto.h
@@ -73,18 +73,19 @@ void free_eNB_ulsch(LTE_eNB_ULSCH_t *ulsch);
LTE_eNB_ULSCH_t *new_eNB_ulsch(uint8_t max_turbo_iterations,uint8_t N_RB_UL, uint8_t abstraction_flag);
int dlsch_encoding_all(PHY_VARS_eNB *eNB,
- unsigned char *a,
- uint8_t num_pdcch_symbols,
- LTE_eNB_DLSCH_t *dlsch,
- int frame,
- uint8_t subframe,
- time_stats_t *rm_stats,
- time_stats_t *te_stats,
- time_stats_t *te_wait_stats,
- time_stats_t *te_main_stats,
- time_stats_t *te_wakeup_stats0,
- time_stats_t *te_wakeup_stats1,
- time_stats_t *i_stats);
+ L1_rxtx_proc_t *proc,
+ unsigned char *a,
+ uint8_t num_pdcch_symbols,
+ LTE_eNB_DLSCH_t *dlsch,
+ int frame,
+ uint8_t subframe,
+ time_stats_t *rm_stats,
+ time_stats_t *te_stats,
+ time_stats_t *te_wait_stats,
+ time_stats_t *te_main_stats,
+ time_stats_t *te_wakeup_stats0,
+ time_stats_t *te_wakeup_stats1,
+ time_stats_t *i_stats);
/** \fn dlsch_encoding(PHY_VARS_eNB *eNB,
uint8_t *input_buffer,
@@ -112,6 +113,7 @@ int dlsch_encoding_all(PHY_VARS_eNB *eNB,
@returns status
*/
int32_t dlsch_encoding(PHY_VARS_eNB *eNB,
+ L1_rxtx_proc_t *proc,
uint8_t *a,
uint8_t num_pdcch_symbols,
LTE_eNB_DLSCH_t *dlsch,
@@ -467,9 +469,12 @@ void rx_ulsch(PHY_VARS_eNB *eNB,
int ulsch_decoding_data_all(PHY_VARS_eNB *eNB,
- int UE_id,
- int harq_pid,
- int llr8_flag);
+
+ L1_rxtx_proc_t *proc,
+ int UE_id,
+ int harq_pid,
+ int llr8_flag);
+
/*!
\brief Decoding of PUSCH/ACK/RI/ACK from 36-212.
@@ -511,6 +516,7 @@ int ulsch_decoding_data_2thread(PHY_VARS_eNB *eNB,
@returns 0 on success
*/
int ulsch_decoding_data(PHY_VARS_eNB *eNB,
+ L1_rxtx_proc_t *proc,
int UE_id,
int harq_pid,
int llr8_flag);
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
index 39556902fcdd97d94bcaf34caa2f22d9468ae551..90492b999991905e8829d35447dda2716bb61913 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
@@ -41,22 +41,22 @@
#include "RRC/LTE/rrc_extern.h"
#include "PHY_INTERFACE/phy_interface.h"
#include "transport_proto.h"
-#include "common/utils/LOG/vcd_signal_dumper.h"
-
+#include <executables/split_headers.h>
extern WORKER_CONF_t get_thread_worker_conf(void);
extern volatile int oai_exit;
+
void free_eNB_ulsch(LTE_eNB_ULSCH_t *ulsch) {
int i,r;
if (ulsch) {
for (i=0; i<8; i++) {
if (ulsch->harq_processes[i]) {
- if (ulsch->harq_processes[i]->b) {
- free16(ulsch->harq_processes[i]->b,MAX_ULSCH_PAYLOAD_BYTES);
- ulsch->harq_processes[i]->b = NULL;
+ if (ulsch->harq_processes[i]->decodedBytes) {
+ free16(ulsch->harq_processes[i]->decodedBytes,MAX_ULSCH_PAYLOAD_BYTES);
+ ulsch->harq_processes[i]->decodedBytes = NULL;
}
for (r=0; r<MAX_NUM_ULSCH_SEGMENTS; r++) {
@@ -115,10 +115,10 @@ LTE_eNB_ULSCH_t *new_eNB_ulsch(uint8_t max_turbo_iterations,uint8_t N_RB_UL, uin
if (ulsch->harq_processes[i]) {
memset(ulsch->harq_processes[i],0,sizeof(LTE_UL_eNB_HARQ_t));
- ulsch->harq_processes[i]->b = (uint8_t *)malloc16(MAX_ULSCH_PAYLOAD_BYTES/bw_scaling);
+ ulsch->harq_processes[i]->decodedBytes = (uint8_t *)malloc16(MAX_ULSCH_PAYLOAD_BYTES/bw_scaling);
- if (ulsch->harq_processes[i]->b)
- memset(ulsch->harq_processes[i]->b,0,MAX_ULSCH_PAYLOAD_BYTES/bw_scaling);
+ if (ulsch->harq_processes[i]->decodedBytes)
+ memset(ulsch->harq_processes[i]->decodedBytes,0,MAX_ULSCH_PAYLOAD_BYTES/bw_scaling);
else
exit_flag=3;
@@ -210,490 +210,163 @@ uint8_t extract_cqi_crc(uint8_t *cqi,uint8_t CQI_LENGTH) {
return(crc);
}
-
-
-
-int ulsch_decoding_data_2thread0(td_params *tdp) {
- PHY_VARS_eNB *eNB = tdp->eNB;
- int UE_id = tdp->UE_id;
- int harq_pid = tdp->harq_pid;
- int llr8_flag = tdp->llr8_flag;
- unsigned int r,r_offset=0,Kr,Kr_bytes;
- uint8_t crc_type;
- int offset = 0;
- int ret = 1;
- int16_t dummy_w[MAX_NUM_ULSCH_SEGMENTS][3*(6144+64)];
- LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[UE_id];
- LTE_UL_eNB_HARQ_t *ulsch_harq = ulsch->harq_processes[harq_pid];
- int Q_m = ulsch_harq->Qm;
- int G = ulsch_harq->G;
- uint32_t E=0;
- uint32_t Gp,GpmodC,Nl=1;
- uint32_t C = ulsch_harq->C;
- decoder_if_t *tc;
-
- if (llr8_flag == 0)
- tc = decoder16;
- else
- tc = decoder8;
-
- // go through first half of segments to get r_offset
- for (r=0; r<(ulsch_harq->C/2); r++) {
- // Get Turbo interleaver parameters
- if (r<ulsch_harq->Cminus)
- Kr = ulsch_harq->Kminus;
- else
- Kr = ulsch_harq->Kplus;
-
- Kr_bytes = Kr>>3;
- // This is stolen from rate-matching algorithm to get the value of E
- Gp = G/Nl/Q_m;
- GpmodC = Gp%C;
-
- if (r < (C-(GpmodC)))
- E = Nl*Q_m * (Gp/C);
- else
- E = Nl*Q_m * ((GpmodC==0?0:1) + (Gp/C));
-
- r_offset += E;
-
- if (r==0) {
- offset = Kr_bytes - (ulsch_harq->F>>3) - ((ulsch_harq->C>1)?3:0);
- } else {
- offset += (Kr_bytes- ((ulsch_harq->C>1)?3:0));
- }
- }
-
- // go through second half of segments
- for (; r<(ulsch_harq->C); r++) {
- // printf("before subblock deinterleaving c[%d] = %p\n",r,ulsch_harq->c[r]);
- // Get Turbo interleaver parameters
- if (r<ulsch_harq->Cminus)
- Kr = ulsch_harq->Kminus;
- else
- Kr = ulsch_harq->Kplus;
-
- Kr_bytes = Kr>>3;
- memset(&dummy_w[r][0],0,3*(6144+64)*sizeof(short));
- ulsch_harq->RTC[r] = generate_dummy_w(4+(Kr_bytes*8),
- (uint8_t *)&dummy_w[r][0],
+void processULSegment(void * arg) {
+ turboDecode_t* rdata=(turboDecode_t*) arg;
+ PHY_VARS_eNB *eNB=rdata->eNB;
+ LTE_UL_eNB_HARQ_t *ulsch_harq=rdata->ulsch_harq;
+ int r=rdata->segment_r;
+ int G=ulsch_harq->G;
+ int Kr_bytes=rdata->Kr>>3;
+ int16_t dummy_w[3*(6144+64)];
+
+ memset(&dummy_w[0],0,3*(6144+64)*sizeof(short));
+ ulsch_harq->RTC[r] = generate_dummy_w(4+(Kr_bytes*8),
+ (uint8_t *)&dummy_w[0],
(r==0) ? ulsch_harq->F : 0);
-#ifdef DEBUG_ULSCH_DECODING
- printf("Rate Matching Segment %u (coded bits (G) %d,unpunctured/repeated bits %u, Q_m %d, nb_rb %d, Nl %d)...\n",
- r, G,
- Kr*3,
- Q_m,
- nb_rb,
- ulsch_harq->Nl);
-#endif
-
- if (lte_rate_matching_turbo_rx(ulsch_harq->RTC[r],
+ start_meas(&eNB->ulsch_deinterleaving_stats);
+ unsigned int E;
+ if (lte_rate_matching_turbo_rx(ulsch_harq->RTC[r],
G,
ulsch_harq->w[r],
- (uint8_t *) &dummy_w[r][0],
- ulsch_harq->e+r_offset,
+ (uint8_t *) &dummy_w[0],
+ ulsch_harq->eUL+rdata->r_offset,
ulsch_harq->C,
NSOFT,
0, //Uplink
1,
ulsch_harq->rvidx,
- (ulsch_harq->round==0)?1:0, // clear
+ (ulsch_harq->rvidx==0)?1:0, // clear
ulsch_harq->Qm,
1,
r,
&E)==-1) {
LOG_E(PHY,"ulsch_decoding.c: Problem in rate matching\n");
- return(-1);
- }
+ return;
+ }
+ stop_meas(&eNB->ulsch_rate_unmatching_stats);
+ int max_Ncb = 3*ulsch_harq->RTC[r]*32 ;
- r_offset += E;
- sub_block_deinterleaving_turbo(4+Kr,
- &ulsch_harq->d[r][96],
- ulsch_harq->w[r]);
+ if(ulsch_harq->repetition_number == 1) {
+ memset(ulsch_harq->pusch_rep_buffer[r],0,(sizeof(int32_t)*3*(6144+64))) ; // reset the buffer every new repetitions
+ }
+ if(ulsch_harq->total_number_of_repetitions > 1) {
+ if (ulsch_harq->rvidx==1) {
+ LOG_E(PHY,"Adding HARQ data for segment: %d\n", r);
+ // Store the result of HARQ combining in the last emtc repetitions of sequence 0,2,3,1
+ for (int nn=0; nn<max_Ncb; nn++)
+ ulsch_harq->pusch_rep_buffer[r][nn] += ulsch_harq->w[r][nn] ;
+ }
- if (ulsch_harq->C == 1)
- crc_type = CRC24_A;
- else
- crc_type = CRC24_B;
-
- ret = tc(&ulsch_harq->d[r][96],
- NULL,
- ulsch_harq->c[r],
- NULL,
- Kr,
- ulsch->max_turbo_iterations,//MAX_TURBO_ITERATIONS,
- crc_type,
- (r==0) ? ulsch_harq->F : 0,
- &eNB->ulsch_tc_init_stats,
- &eNB->ulsch_tc_alpha_stats,
- &eNB->ulsch_tc_beta_stats,
- &eNB->ulsch_tc_gamma_stats,
- &eNB->ulsch_tc_ext_stats,
- &eNB->ulsch_tc_intl1_stats,
- &eNB->ulsch_tc_intl2_stats);
-
- // Reassembly of Transport block here
-
- if (ret != (1+ulsch->max_turbo_iterations)) {
- if (r<ulsch_harq->Cminus)
- Kr = ulsch_harq->Kminus;
- else
- Kr = ulsch_harq->Kplus;
-
- Kr_bytes = Kr>>3;
- memcpy(ulsch_harq->b+offset,
- ulsch_harq->c[r],
- Kr_bytes - ((ulsch_harq->C>1)?3:0));
- offset += (Kr_bytes- ((ulsch_harq->C>1)?3:0));
- } else {
- break;
+ if (ulsch_harq->repetition_number == ulsch_harq->total_number_of_repetitions) {
+ LOG_E(PHY,"Will use HARQ data sum up for segment: %d\n", r);
+ for (int nn=0; nn<max_Ncb; nn++)
+ ulsch_harq->w[r][nn] = ulsch_harq->pusch_rep_buffer[r][nn] ;
}
}
-
- return(ret);
+ int16_t soft_bits[3*8*6144+12+96] __attribute__((aligned(32)));
+ sub_block_deinterleaving_turbo(4+rdata->Kr,
+ soft_bits+96,
+ ulsch_harq->w[r]);
+ stop_meas(&eNB->ulsch_deinterleaving_stats);
+ rdata->decodeIterations = rdata->function( soft_bits+96,
+ NULL,
+ rdata->decoded_bytes,
+ NULL,
+ rdata->Kr,
+ rdata->maxIterations,
+ rdata->nbSegments == 1 ? CRC24_A: CRC24_B,
+ rdata->Fbits,
+ &eNB->ulsch_tc_init_stats,
+ &eNB->ulsch_tc_alpha_stats,
+ &eNB->ulsch_tc_beta_stats,
+ &eNB->ulsch_tc_gamma_stats,
+ &eNB->ulsch_tc_ext_stats,
+ &eNB->ulsch_tc_intl1_stats,
+ &eNB->ulsch_tc_intl2_stats);
+ stop_meas(&eNB->ulsch_turbo_decoding_stats);
+
}
-
void *td_thread(void *param) {
- PHY_VARS_eNB *eNB = ((td_params *)param)->eNB;
- L1_proc_t *proc = &eNB->proc;
- pthread_setname_np( pthread_self(),"td processing");
- LOG_I(PHY,"thread td created id=%ld\n", syscall(__NR_gettid));
- //wait_sync("td_thread");
-
- while (!oai_exit) {
- if (wait_on_condition(&proc->mutex_td,&proc->cond_td,&proc->instance_cnt_td,"td thread")<0) break;
-
- if(oai_exit) break;
-
- ((td_params *)param)->ret = ulsch_decoding_data_2thread0((td_params *)param);
-
- if (release_thread(&proc->mutex_td,&proc->instance_cnt_td,"td thread")<0) break;
-
- if (pthread_cond_signal(&proc->cond_td) != 0) {
- printf("[eNB] ERROR pthread_cond_signal for td thread exit\n");
- exit_fun( "ERROR pthread_cond_signal" );
- return(NULL);
- }
- }
return(NULL);
}
-int ulsch_decoding_data_2thread(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag) {
- L1_proc_t *proc = &eNB->proc;
- unsigned int r,r_offset=0,Kr,Kr_bytes;
- uint8_t crc_type;
+int ulsch_decoding_data(PHY_VARS_eNB *eNB, L1_rxtx_proc_t *proc,
+ int UE_id,int harq_pid,int llr8_flag) {
+ unsigned int r_offset=0;
int offset = 0;
- int ret = 1;
- int16_t dummy_w[MAX_NUM_ULSCH_SEGMENTS][3*(6144+64)];
LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[UE_id];
LTE_UL_eNB_HARQ_t *ulsch_harq = ulsch->harq_processes[harq_pid];
int G = ulsch_harq->G;
unsigned int E;
- int Cby2;
- decoder_if_t *tc;
- struct timespec wait;
- wait.tv_sec=0;
- wait.tv_nsec=5000000L;
-
- if (llr8_flag == 0)
- tc = decoder16;
- else
- tc = decoder8;
-
- if (ulsch_harq->C>1) { // wakeup worker if more than 1 segment
- if (pthread_mutex_timedlock(&proc->mutex_td,&wait) != 0) {
- printf("[eNB] ERROR pthread_mutex_lock for TD thread (IC %d)\n", proc->instance_cnt_td);
- exit_fun( "error locking mutex_fep" );
- return -1;
- }
-
- if (proc->instance_cnt_td==0) {
- printf("[eNB] TD thread busy\n");
- exit_fun("TD thread busy");
- pthread_mutex_unlock( &proc->mutex_td );
- return -1;
- }
-
- ++proc->instance_cnt_td;
- proc->tdp.eNB = eNB;
- proc->tdp.UE_id = UE_id;
- proc->tdp.harq_pid = harq_pid;
- proc->tdp.llr8_flag = llr8_flag;
-
- // wakeup worker to do second half segments
- if (pthread_cond_signal(&proc->cond_td) != 0) {
- printf("[eNB] ERROR pthread_cond_signal for td thread exit\n");
- exit_fun( "ERROR pthread_cond_signal" );
- return (1+ulsch->max_turbo_iterations);
- }
-
- pthread_mutex_unlock( &proc->mutex_td );
- Cby2 = ulsch_harq->C/2;
- } else {
- Cby2 = 1;
- }
-
- // go through first half of segments in main thread
- for (r=0; r<Cby2; r++) {
+ int ret=0;
+
+ decoder_if_t * td=llr8_flag == 0 ?
+ *decoder16 : *decoder8;
+ ulsch_harq->processedSegments=0;
+
+ for (int r=0; r<ulsch_harq->C; r++) {
// printf("before subblock deinterleaving c[%d] = %p\n",r,ulsch_harq->c[r]);
// Get Turbo interleaver parameters
- if (r<ulsch_harq->Cminus)
- Kr = ulsch_harq->Kminus;
- else
- Kr = ulsch_harq->Kplus;
-
- Kr_bytes = Kr>>3;
- memset(&dummy_w[r][0],0,3*(6144+64)*sizeof(short));
- ulsch_harq->RTC[r] = generate_dummy_w(4+(Kr_bytes*8),
- (uint8_t *)&dummy_w[r][0],
- (r==0) ? ulsch_harq->F : 0);
+ unsigned int Kr= r<ulsch_harq->Cminus ?
+ ulsch_harq->Kminus :ulsch_harq->Kplus;
+ unsigned int Kr_bytes = Kr>>3;
+
#ifdef DEBUG_ULSCH_DECODING
- printf("Rate Matching Segment %u (coded bits (G) %d,unpunctured/repeated bits %u, Q_m %d, nb_rb %d, Nl %d)...\n",
- r, G,
- Kr*3,
- Q_m,
- nb_rb,
- ulsch_harq->Nl);
-#endif
- start_meas(&eNB->ulsch_rate_unmatching_stats);
-
- if (lte_rate_matching_turbo_rx(ulsch_harq->RTC[r],
- G,
- ulsch_harq->w[r],
- (uint8_t *) &dummy_w[r][0],
- ulsch_harq->e+r_offset,
- ulsch_harq->C,
- NSOFT,
- 0, //Uplink
- 1,
- ulsch_harq->rvidx,
- (ulsch_harq->round==0)?1:0, // clear
- ulsch_harq->Qm,
- 1,
- r,
- &E)==-1) {
- LOG_E(PHY,"ulsch_decoding.c: Problem in rate matching\n");
- return(-1);
- }
-
- stop_meas(&eNB->ulsch_rate_unmatching_stats);
- r_offset += E;
- start_meas(&eNB->ulsch_deinterleaving_stats);
- sub_block_deinterleaving_turbo(4+Kr,
- &ulsch_harq->d[r][96],
- ulsch_harq->w[r]);
- stop_meas(&eNB->ulsch_deinterleaving_stats);
-
- if (ulsch_harq->C == 1)
- crc_type = CRC24_A;
- else
- crc_type = CRC24_B;
-
- start_meas(&eNB->ulsch_turbo_decoding_stats);
- ret = tc(&ulsch_harq->d[r][96],
- NULL,
- ulsch_harq->c[r],
- NULL,
- Kr,
- ulsch->max_turbo_iterations,//MAX_TURBO_ITERATIONS,
- crc_type,
- (r==0) ? ulsch_harq->F : 0,
- &eNB->ulsch_tc_init_stats,
- &eNB->ulsch_tc_alpha_stats,
- &eNB->ulsch_tc_beta_stats,
- &eNB->ulsch_tc_gamma_stats,
- &eNB->ulsch_tc_ext_stats,
- &eNB->ulsch_tc_intl1_stats,
- &eNB->ulsch_tc_intl2_stats);
-
- // Reassembly of Transport block here
-
- if (ret != (1+ulsch->max_turbo_iterations)) {
- if (r<ulsch_harq->Cminus)
- Kr = ulsch_harq->Kminus;
- else
- Kr = ulsch_harq->Kplus;
-
- Kr_bytes = Kr>>3;
-
- if (r==0) {
- memcpy(ulsch_harq->b,
- &ulsch_harq->c[0][(ulsch_harq->F>>3)],
- Kr_bytes - (ulsch_harq->F>>3) - ((ulsch_harq->C>1)?3:0));
- offset = Kr_bytes - (ulsch_harq->F>>3) - ((ulsch_harq->C>1)?3:0);
- } else {
- memcpy(ulsch_harq->b+offset,
- ulsch_harq->c[r],
- Kr_bytes - ((ulsch_harq->C>1)?3:0));
- offset += (Kr_bytes- ((ulsch_harq->C>1)?3:0));
- }
- } else {
- break;
- }
-
- stop_meas(&eNB->ulsch_turbo_decoding_stats);
- //printf("/////////////////////////////////////////**************************loop for %d time in ulsch_decoding main\n",r);
- }
-
- // wait for worker to finish
- wait_on_busy_condition(&proc->mutex_td,&proc->cond_td,&proc->instance_cnt_td,"td thread");
- return( (ret>proc->tdp.ret) ? ret : proc->tdp.ret );
-}
-
-int ulsch_decoding_data(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag) {
- unsigned int r,r_offset=0,Kr,Kr_bytes;
- uint8_t crc_type;
- int offset = 0;
- int ret = 1;
- int16_t dummy_w[MAX_NUM_ULSCH_SEGMENTS][3*(6144+64)];
- LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[UE_id];
- LTE_UL_eNB_HARQ_t *ulsch_harq = ulsch->harq_processes[harq_pid];
- int G = ulsch_harq->G;
- unsigned int E;
- decoder_if_t *tc;
- static int32_t pusch_rep_buffer[3*(6144+64)];
- int max_Ncb;
-
- if (llr8_flag == 0)
- tc = *decoder16;
- else
- tc = *decoder8;
-
- if(ulsch_harq->repetition_number == 1) {
- memset(pusch_rep_buffer,0,(sizeof(int32_t)*3*(6144+64))) ; // reset the buffer every new repetitions
- }
-
- for (r=0; r<ulsch_harq->C; r++) {
- // printf("before subblock deinterleaving c[%d] = %p\n",r,ulsch_harq->c[r]);
- // Get Turbo interleaver parameters
- if (r<ulsch_harq->Cminus)
- Kr = ulsch_harq->Kminus;
- else
- Kr = ulsch_harq->Kplus;
-
- Kr_bytes = Kr>>3;
- memset(&dummy_w[r][0],0,3*(6144+64)*sizeof(short));
- ulsch_harq->RTC[r] = generate_dummy_w(4+(Kr_bytes*8),
- (uint8_t *)&dummy_w[r][0],
- (r==0) ? ulsch_harq->F : 0);
-#ifdef DEBUG_ULSCH_DECODING
- printf("Rate Matching Segment %u (coded bits (G) %d,unpunctured/repeated bits %u, Q_m %d, Nl %d)...\n",
+ printf("Rate Matching Segment %d (coded bits (G) %d,unpunctured/repeated bits %u, Q_m %d, Nl %d, r_offset %u)...\n",
r, G,
Kr*3,
ulsch_harq->Qm,
- ulsch_harq->Nl);
+ ulsch_harq->Nl, r_offset);
#endif
- start_meas(&eNB->ulsch_rate_unmatching_stats);
-
- if (lte_rate_matching_turbo_rx(ulsch_harq->RTC[r],
- G,
- ulsch_harq->w[r],
- (uint8_t *) &dummy_w[r][0],
- ulsch_harq->e+r_offset,
- ulsch_harq->C,
- NSOFT,
- 0, //Uplink
- 1,
- ulsch_harq->rvidx,
- (ulsch_harq->rvidx==0)?1:0, // clear
- ulsch_harq->Qm,
- 1,
- r,
- &E)==-1) {
- LOG_E(PHY,"ulsch_decoding.c: Problem in rate matching\n");
- return(-1);
- }
-
- stop_meas(&eNB->ulsch_rate_unmatching_stats);
- max_Ncb = 3*ulsch_harq->RTC[r]*32 ;
-
- if(ulsch_harq->total_number_of_repetitions > 1) {
- if (ulsch_harq->rvidx==1) {
- // Store the result of HARQ combining in the last emtc repetitions of sequence 0,2,3,1
- for (int nn=0; nn<max_Ncb; nn++) {
- pusch_rep_buffer[nn] += ulsch_harq->w[r][nn] ;
- }
- }
-
- if (ulsch_harq->repetition_number == ulsch_harq->total_number_of_repetitions) {
- for (int nn=0; nn<max_Ncb; nn++) {
- ulsch_harq->w[r][nn] = pusch_rep_buffer[nn] ;
- }
- }
- }
-
- r_offset += E;
- start_meas(&eNB->ulsch_deinterleaving_stats);
- sub_block_deinterleaving_turbo(4+Kr,
- &ulsch_harq->d[r][96],
- ulsch_harq->w[r]);
- stop_meas(&eNB->ulsch_deinterleaving_stats);
-
- if (ulsch_harq->C == 1)
- crc_type = CRC24_A;
+ int Gp=G/ulsch_harq->Qm;
+ int GpmodC = Gp%ulsch_harq->C;
+
+ if (r < (ulsch_harq->C-(GpmodC)))
+ E = ulsch_harq->Qm * (Gp/ulsch_harq->C);
else
- crc_type = CRC24_B;
-
- start_meas(&eNB->ulsch_turbo_decoding_stats);
- ret = tc(&ulsch_harq->d[r][96],
- NULL,
- ulsch_harq->c[r],
- NULL,
- Kr,
- ulsch->max_turbo_iterations,//MAX_TURBO_ITERATIONS,
- crc_type,
- (r==0) ? ulsch_harq->F : 0,
- &eNB->ulsch_tc_init_stats,
- &eNB->ulsch_tc_alpha_stats,
- &eNB->ulsch_tc_beta_stats,
- &eNB->ulsch_tc_gamma_stats,
- &eNB->ulsch_tc_ext_stats,
- &eNB->ulsch_tc_intl1_stats,
- &eNB->ulsch_tc_intl2_stats);
- stop_meas(&eNB->ulsch_turbo_decoding_stats);
-
- // Reassembly of Transport block here
-
- if (ret != (1+ulsch->max_turbo_iterations)) {
- if (r<ulsch_harq->Cminus)
- Kr = ulsch_harq->Kminus;
- else
- Kr = ulsch_harq->Kplus;
-
- Kr_bytes = Kr>>3;
-
- if (r==0) {
- memcpy(ulsch_harq->b,
- &ulsch_harq->c[0][(ulsch_harq->F>>3)],
- Kr_bytes - (ulsch_harq->F>>3) - ((ulsch_harq->C>1)?3:0));
- offset = Kr_bytes - (ulsch_harq->F>>3) - ((ulsch_harq->C>1)?3:0);
- } else {
- memcpy(ulsch_harq->b+offset,
- ulsch_harq->c[r],
- Kr_bytes - ((ulsch_harq->C>1)?3:0));
- offset += (Kr_bytes- ((ulsch_harq->C>1)?3:0));
- }
- } else {
- break;
+ E = ulsch_harq->Qm * ((GpmodC==0?0:1) + (Gp/ulsch_harq->C));
+
+ if ( split73 == SPLIT73_DU ) {
+ sendFs6Ul(eNB, UE_id, harq_pid, r, ulsch_harq->eUL+r_offset, E*sizeof(int16_t), r_offset);
+ r_offset += E;
+ continue;
}
- }
+ union turboReqUnion id= {.s={ulsch->rnti,proc->frame_rx,proc->subframe_rx,0,0}};
+ notifiedFIFO_elt_t *req=newNotifiedFIFO_elt(sizeof(turboDecode_t), id.p, proc->respDecode, processULSegment);
+ turboDecode_t * rdata=(turboDecode_t *) NotifiedFifoData(req);
+
+ rdata->eNB=eNB;
+ rdata->frame=proc->frame_rx;
+ rdata->subframe=proc->subframe_rx;
+ rdata->UEid=UE_id;
+ rdata->harq_pid=harq_pid;
+ rdata->Kr=Kr;
+ rdata->maxIterations=eNB->ulsch[UE_id]->max_turbo_iterations;
+ rdata->ulsch_harq=ulsch_harq;
+ rdata->eNB=eNB;
+ rdata->nbSegments=ulsch_harq->C;
+ rdata->segment_r=r;
+ rdata->Fbits=(r==0) ? ulsch_harq->F : 0;
+ rdata->r_offset=r_offset;
+ rdata->offset=offset;
+ rdata->function=td;
+ int Fbytes=(r==0) ? rdata->Fbits>>3 : 0;
+ int sz=Kr_bytes - Fbytes - ((ulsch_harq->C>1)?3:0);
+ pushTpool(proc->threadPool,req);
+ proc->nbDecode++;
+ LOG_D(PHY,"Added a block to decode, in pipe: %d\n",proc->nbDecode);
+ r_offset+=E;
+ offset+=sz;
+ }
return(ret);
}
-int ulsch_decoding_data_all(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag) {
- int ret = 0;
- /*if(get_thread_worker_conf() == WORKER_ENABLE)
- {
- ret = ulsch_decoding_data_2thread(eNB,UE_id,harq_pid,llr8_flag);
- }
- else*/
- {
- ret = ulsch_decoding_data(eNB,UE_id,harq_pid,llr8_flag);
- }
- return ret;
+int ulsch_decoding_data_all(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,
+ int UE_id,int harq_pid,int llr8_flag) {
+ return ulsch_decoding_data(eNB,proc,UE_id,harq_pid,llr8_flag);
}
static inline unsigned int lte_gold_unscram(unsigned int *x1, unsigned int *x2, unsigned char reset) __attribute__((always_inline));
@@ -767,7 +440,6 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,
else
harq_pid = subframe2harq_pid(frame_parms,proc->frame_rx,subframe);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_ULSCH_DECODING0+harq_pid,1);
// x1 is set in lte_gold_generic
x2 = ((uint32_t)ulsch->rnti<<14) + ((uint32_t)subframe<<9) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.3.1
ulsch_harq = ulsch->harq_processes[harq_pid];
@@ -779,8 +451,9 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,
A = ulsch_harq->TBS;
Q_m = ulsch_harq->Qm;
G = nb_rb * (12 * Q_m) * ulsch_harq->Nsymb_pusch;
+ LOG_D(PHY, "PUSCH nb_rb %d Q_m %d ulsch_harq->Nsymb_pusch %d\n",nb_rb, Q_m, ulsch_harq->Nsymb_pusch);
//#ifdef DEBUG_ULSCH_DECODING
- LOG_D(PHY,"[PUSCH %d] Frame %d, Subframe %d: ulsch_decoding (Nid_cell %d, rnti %x, x2 %x): A %d, round %d, RV %d, O_r1 %d, O_RI %d, O_ACK %d, G %d, Q_m %d Nsymb_pusch %d nb_rb %d\n",
+ LOG_D(PHY,"[PUSCH harq %d] Frame %d, Subframe %d: ulsch_decoding (Nid_cell %d, rnti %x, x2 %x): TBS %d, round %d, RV %d, O_r1 %d, O_RI %d, O_ACK %d, G %d, Q_m %d Nsymb_pusch %d nb_rb %d\n",
harq_pid,
proc->frame_rx,subframe,
frame_parms->Nid_cell,ulsch->rnti,x2,
@@ -833,6 +506,12 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,
subframe);
// Compute Q_ri
Qprime = ulsch_harq->O_RI*ulsch_harq->Msc_initial*ulsch_harq->Nsymb_initial * ulsch->beta_offset_ri_times8;
+ LOG_D(PHY, "Qprime %d, O_RI %d, Msc %d, Nym %d beta %d\n",
+ Qprime,
+ ulsch_harq->O_RI,
+ ulsch_harq->Msc_initial,
+ ulsch_harq->Nsymb_initial,
+ ulsch->beta_offset_ri_times8);
if (Qprime > 0 ) {
if ((Qprime % (8*sumKr)) > 0)
@@ -893,7 +572,7 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,
G = G - Q_RI - Q_CQI;
ulsch_harq->G = G;
AssertFatal((int)G > 0,
- "FATAL: ulsch_decoding.c G < 0 (%d) : Q_RI %d, Q_CQI %d\n",G,Q_RI,Q_CQI);
+ "FATAL: ulsch_decoding.c G < 0 (%u) : Q_RI %u, Q_CQI %u\n",G,Q_RI,Q_CQI);
H = G + Q_CQI;
Hprime = H/Q_m;
// Demultiplexing/Deinterleaving of PUSCH/ACK/RI/CQI
@@ -1209,8 +888,8 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,
j2+=2;
}
- ulsch_harq->e[iprime++] = y[j2++];
- ulsch_harq->e[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
}
break;
@@ -1222,10 +901,10 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,
j2+=4;
}
- ulsch_harq->e[iprime++] = y[j2++];
- ulsch_harq->e[iprime++] = y[j2++];
- ulsch_harq->e[iprime++] = y[j2++];
- ulsch_harq->e[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
}
break;
@@ -1237,12 +916,12 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,
j2+=6;
}
- ulsch_harq->e[iprime++] = y[j2++];
- ulsch_harq->e[iprime++] = y[j2++];
- ulsch_harq->e[iprime++] = y[j2++];
- ulsch_harq->e[iprime++] = y[j2++];
- ulsch_harq->e[iprime++] = y[j2++];
- ulsch_harq->e[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
+ ulsch_harq->eUL[iprime++] = y[j2++];
}
break;
@@ -1280,7 +959,7 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,
*/
int16_t *yp,*ep;
- for (iprime=0,yp=&y[j2],ep=&ulsch_harq->e[0];
+ for (iprime=0,yp=&y[j2],ep=&ulsch_harq->eUL[0];
iprime<G;
iprime+=8,j2+=8,ep+=8,yp+=8) {
ep[0] = yp[0];
@@ -1404,7 +1083,6 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,
LOG_D(PHY,"frame %d subframe %d O_ACK:%d o_ACK[]=%d:%d:%d:%d\n",frame,subframe,ulsch_harq->O_ACK,ulsch_harq->o_ACK[0],ulsch_harq->o_ACK[1],ulsch_harq->o_ACK[2],ulsch_harq->o_ACK[3]);
// Do ULSCH Decoding for data portion
- ret = ulsch_decoding_data_all(eNB,UE_id,harq_pid,llr8_flag);
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_ULSCH_DECODING0+harq_pid,0);
+ ret = ulsch_decoding_data_all(eNB,proc, UE_id,harq_pid,llr8_flag);
return(ret);
}
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c b/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
index 0e7bdd2ae46af2fe9075fa58e443f0d7676f433b..f357e385f0d8e01af770485425788f81b074ae81 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
@@ -780,7 +780,6 @@ void ulsch_channel_compensation(int32_t **rxdataF_ext,
#endif
for (rb=0; rb<nb_rb; rb++) {
- LOG_D(PHY,"comp: symbol %d rb %d\n",symbol,rb);
// just compute channel magnitude without scaling, this is done after equalization for SC-FDMA
#if defined(__x86_64__) || defined(__i386__)
mmtmpU0 = _mm_madd_epi16(ul_ch128[0],ul_ch128[0]);
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/dlsch_decoding.c b/openair1/PHY/LTE_UE_TRANSPORT/dlsch_decoding.c
index 4ca9a7c7625f19470fb3023269e37081ade943d2..7442a0ae7e0ff225c9486ff8442308d811127ea2 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/dlsch_decoding.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/dlsch_decoding.c
@@ -793,7 +793,7 @@ int dlsch_encoding_SIC(PHY_VARS_UE *ue,
r_offset += lte_rate_matching_turbo(dlsch->harq_processes[harq_pid]->RTC[r],
G, //G
dlsch->harq_processes[harq_pid]->w[r],
- dlsch->harq_processes[harq_pid]->e+r_offset,
+ dlsch->harq_processes[harq_pid]->eDL+r_offset,
dlsch->harq_processes[harq_pid]->C, // C
dlsch->Nsoft, // Nsoft,
dlsch->Mdlharq,
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c b/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c
index 5c75dd250cff86a92eb3e50a38f8ef5d0442e098..e4083863f0da352bfd5c74998414cbd768526601 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c
@@ -65,7 +65,7 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
uint16_t *prach_root_sequence_map;
uint16_t preamble_offset,preamble_shift;
uint16_t preamble_index0,n_shift_ra,n_shift_ra_bar;
- uint16_t d_start,numshift;
+ uint16_t d_start=-1,numshift;
uint8_t prach_fmt = get_prach_fmt(prach_ConfigIndex,frame_type);
//uint8_t Nsp=2;
//uint8_t f_ra,t1_ra;
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/ulsch_coding.c b/openair1/PHY/LTE_UE_TRANSPORT/ulsch_coding.c
index cc1f762e7046b9836d0c898d6c459afd9f34cb89..de1c3891da078517be8425ebf1556a916df5b6ec 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/ulsch_coding.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/ulsch_coding.c
@@ -446,6 +446,13 @@ uint32_t ulsch_encoding(uint8_t *a,
Qprime = (ulsch->O + L) * ulsch->harq_processes[harq_pid]->Msc_initial*ulsch->harq_processes[harq_pid]->Nsymb_initial * ulsch->beta_offset_cqi_times8;
else
Qprime = 0;
+ LOG_D(PHY,"Qprime %d, O_RI %d + %d, Msc %d, Nym %d beta %d\n",
+ Qprime,
+ ulsch->O, L,
+ ulsch->harq_processes[harq_pid]->Msc_initial,
+ ulsch->harq_processes[harq_pid]->Nsymb_initial,
+ ulsch->beta_offset_cqi_times8);
+
if (Qprime > 0) {
if ((Qprime % (8*sumKr)) > 0)
@@ -455,7 +462,7 @@ uint32_t ulsch_encoding(uint8_t *a,
}
G = ulsch->harq_processes[harq_pid]->nb_rb * (12 * Q_m) * (ulsch->Nsymb_pusch);
-
+ LOG_D(PHY,"G: rb %d * ( 12 * Qm %d ) * nsymb %d, Qprime %d, O_RI %d\n", ulsch->harq_processes[harq_pid]->nb_rb, Q_m, ulsch->Nsymb_pusch, Qprime, ulsch->O_RI);
if (Qprime > (G - ulsch->O_RI))
Qprime = G - ulsch->O_RI;
@@ -465,6 +472,7 @@ uint32_t ulsch_encoding(uint8_t *a,
G = G - Q_RI - Q_CQI;
+ LOG_D(PHY,"new G: %d, Q_RI %d Q_CQI %d\n", G , Q_RI , Q_CQI);
ulsch->harq_processes[harq_pid]->G = G;
/*
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c b/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
index ccec73d40e9c7f9a93cb7f0122d3d05d62040667..c7b14571b7d14f5d846eca804ee3418134e4454a 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
@@ -137,7 +137,7 @@ void nr_fill_cce_list(PHY_VARS_gNB *gNB, uint8_t m) {
int N_reg = n_rb * pdcch_pdu_rel15->DurationSymbols;
- int C;
+ int C=-1;
for (int d=0;d<pdcch_pdu_rel15->numDlDci;d++) {
int L = pdcch_pdu_rel15->AggregationLevel[d];
@@ -210,7 +210,7 @@ void nr_fill_dci(PHY_VARS_gNB *gNB,
for (int i=0;i<pdcch_pdu_rel15->numDlDci;i++) {
- uint64_t *dci_pdu = (uint64_t*)pdcch_pdu_rel15->Payload[i];
+ //uint64_t *dci_pdu = (uint64_t*)pdcch_pdu_rel15->Payload[i];
int dlsch_id = find_nr_dlsch(pdcch_pdu_rel15->RNTI[i],gNB,SEARCH_EXIST_OR_FREE);
@@ -248,7 +248,7 @@ void nr_fill_ul_dci(PHY_VARS_gNB *gNB,
for (int i=0;i<pdcch_pdu_rel15->numDlDci;i++) {
- uint64_t *dci_pdu = (uint64_t*)pdcch_pdu_rel15->Payload[i];
+ //uint64_t *dci_pdu = (uint64_t*)pdcch_pdu_rel15->Payload[i];
// if there's no DL DCI then generate CCE list
if (gNB->pdcch_pdu) nr_fill_cce_list(gNB,0);
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c b/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
index 3f16bc246562ca66202e7366f5cddbd7957dc22b..adef4a759277c8371e089239310394e79ad8640d 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
@@ -88,7 +88,7 @@ int32_t generate_nr_prach( PHY_VARS_NR_UE *ue, uint8_t eNB_id, uint8_t subframe,
uint16_t *prach_root_sequence_map;
uint16_t preamble_offset,preamble_shift;
uint16_t preamble_index0,n_shift_ra,n_shift_ra_bar;
- uint16_t d_start,numshift;
+ uint16_t d_start=-1,numshift;
uint16_t prach_fmt = get_nr_prach_fmt(prach_ConfigIndex,fp->frame_type,fp->freq_range);
//uint8_t Nsp=2;
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
index f1d4a304f979554d0125b83a9870fd738d2a3b15..a15851bf4910a0476f657cbb75de0b2b516179cf 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
@@ -116,7 +116,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
uint16_t beta_ptrs; // PTRS parameter related to power control
NR_UE_ULSCH_t *ulsch_ue;
- NR_UL_UE_HARQ_t *harq_process_ul_ue;
+ NR_UL_UE_HARQ_t *harq_process_ul_ue=NULL;
NR_DL_FRAME_PARMS *frame_parms = &UE->frame_parms;
NR_UE_PUSCH *pusch_ue = UE->pusch_vars[thread_id][gNB_id];
uint8_t ulsch_input_buffer[MAX_ULSCH_PAYLOAD_BYTES];
diff --git a/openair1/PHY/TOOLS/lte_phy_scope.c b/openair1/PHY/TOOLS/lte_phy_scope.c
index dbcd9540be3478d1a917914e60a6763156950579..8621898d9d4c09db5a16ff1f3186c2960d241617 100644
--- a/openair1/PHY/TOOLS/lte_phy_scope.c
+++ b/openair1/PHY/TOOLS/lte_phy_scope.c
@@ -325,12 +325,18 @@ void phy_scope_eNB(FD_lte_phy_scope_enb *form,
// PUSCH I/Q of MF Output
if (pusch_comp!=NULL) {
ind=0;
+ int range=80*1000*1000;
for (k=0; k<frame_parms->symbols_per_tti; k++) {
for (i=0; i<12*frame_parms->N_RB_UL; i++) {
- I[ind] = pusch_comp[(2*frame_parms->N_RB_UL*12*k)+2*i];
- Q[ind] = pusch_comp[(2*frame_parms->N_RB_UL*12*k)+2*i+1];
- ind++;
+ if ( pusch_comp[(2*frame_parms->N_RB_UL*12*k)+2*i] > -range &&
+ pusch_comp[(2*frame_parms->N_RB_UL*12*k)+2*i] < range &&
+ pusch_comp[(2*frame_parms->N_RB_UL*12*k)+2*i+1] > -range &&
+ pusch_comp[(2*frame_parms->N_RB_UL*12*k)+2*i+1] < range ) {
+ I[ind] = pusch_comp[(2*frame_parms->N_RB_UL*12*k)+2*i];
+ Q[ind] = pusch_comp[(2*frame_parms->N_RB_UL*12*k)+2*i+1];
+ ind++;
+ }
}
}
diff --git a/openair1/PHY/TOOLS/time_meas.h b/openair1/PHY/TOOLS/time_meas.h
index b9777686eac01601edfc2bed4835adec187cb10e..2deab40f27fef6bb44ee41327ffd6e38bd0901f0 100644
--- a/openair1/PHY/TOOLS/time_meas.h
+++ b/openair1/PHY/TOOLS/time_meas.h
@@ -33,7 +33,7 @@
#include <linux/types.h>
// global var to enable openair performance profiler
extern int opp_enabled;
-double cpu_freq_GHz;
+double cpu_freq_GHz __attribute__ ((aligned(32)));;
#if defined(__x86_64__) || defined(__i386__)
typedef struct {
diff --git a/openair1/PHY/defs_RU.h b/openair1/PHY/defs_RU.h
index 10496ced20dd7c0f4600a048bbf403a069362604..2fd4d0ea663d0c9fc6045ab40598ea1e6b56383a 100644
--- a/openair1/PHY/defs_RU.h
+++ b/openair1/PHY/defs_RU.h
@@ -38,6 +38,7 @@
#include "openairinterface5g_limits.h"
#include "PHY/TOOLS/time_meas.h"
#include "defs_common.h"
+#include <openair2/PHY_INTERFACE/IF_Module.h>
#define MAX_BANDS_PER_RRU 4
diff --git a/openair1/PHY/defs_eNB.h b/openair1/PHY/defs_eNB.h
index 7b06f6c8c70665beefc627d4b76678129ce7bd1e..557b8bfc30e0108105f79f7d3328ee6bf2b05bc7 100644
--- a/openair1/PHY/defs_eNB.h
+++ b/openair1/PHY/defs_eNB.h
@@ -201,41 +201,11 @@ typedef struct {
int repetition_number[4];
} LTE_eNB_PRACH;
-/// Context data structure for RX/TX portion of subframe processing
-typedef struct {
- /// Component Carrier index
- uint8_t CC_id;
- /// timestamp transmitted to HW
- openair0_timestamp timestamp_tx;
- /// subframe to act upon for transmission
- int subframe_tx;
- /// subframe to act upon for reception
- int subframe_rx;
- /// frame to act upon for transmission
- int frame_tx;
- /// frame to act upon for reception
- int frame_rx;
- /// \brief Instance count for RXn-TXnp4 processing thread.
- /// \internal This variable is protected by \ref mutex_rxtx.
- int instance_cnt;
- /// pthread structure for RXn-TXnp4 processing thread
- pthread_t pthread;
- /// pthread attributes for RXn-TXnp4 processing thread
- pthread_attr_t attr;
- /// condition variable for tx processing thread
- pthread_cond_t cond;
- /// mutex for RXn-TXnp4 processing thread
- pthread_mutex_t mutex;
- /// scheduling parameters for RXn-TXnp4 thread
- struct sched_param sched_param_rxtx;
-
- /// \internal This variable is protected by \ref mutex_RUs.
- int instance_cnt_RUs;
- /// condition variable for tx processing thread
- pthread_cond_t cond_RUs;
- /// mutex for RXn-TXnp4 processing thread
- pthread_mutex_t mutex_RUs;
-} L1_rxtx_proc_t;
+#include "PHY/TOOLS/time_meas.h"
+#include "PHY/CODING/coding_defs.h"
+#include "PHY/TOOLS/tools_defs.h"
+#include "PHY/LTE_TRANSPORT/transport_eNB.h"
+
typedef struct {
struct PHY_VARS_eNB_s *eNB;
@@ -694,6 +664,57 @@ typedef struct PHY_VARS_eNB_s {
int32_t pusch_stats_mcs[NUMBER_OF_UE_MAX][10240];
int32_t pusch_stats_bsr[NUMBER_OF_UE_MAX][10240];
int32_t pusch_stats_BO[NUMBER_OF_UE_MAX][10240];
+ uint8_t *FS6bufferZone;
} PHY_VARS_eNB;
+
+struct turboReqId {
+ uint16_t rnti;
+ uint16_t frame;
+ uint8_t subframe;
+ uint8_t codeblock;
+ uint16_t spare;
+} __attribute__((packed));
+
+union turboReqUnion {
+ struct turboReqId s;
+ uint64_t p;
+};
+
+typedef struct TurboDecode_s {
+ PHY_VARS_eNB *eNB;
+ decoder_if_t *function;
+ uint8_t decoded_bytes[3+1768] __attribute__((aligned(32)));
+ int UEid;
+ int harq_pid;
+ int frame;
+ int subframe;
+ int Fbits;
+ int Kr;
+ LTE_UL_eNB_HARQ_t *ulsch_harq;
+ int nbSegments;
+ int segment_r;
+ int r_offset;
+ int offset;
+ int maxIterations;
+ int decodeIterations;
+} turboDecode_t;
+
+#define TURBO_SIMD_SOFTBITS 96+12+3+3*6144
+typedef struct turboEncode_s {
+ uint8_t * input;
+ int Kr_bytes;
+ int filler;
+ unsigned int G;
+ int r;
+ int harq_pid;
+ int round;
+ int r_offset;
+ LTE_eNB_DLSCH_t *dlsch;
+ time_stats_t *rm_stats;
+ time_stats_t *te_stats;
+ time_stats_t *i_stats;
+} turboEncode_t;
+
+
#endif /* __PHY_DEFS_ENB__H__ */
diff --git a/openair1/SCHED/fapi_l1.c b/openair1/SCHED/fapi_l1.c
index 16fcc75a794259e6d9df5238a6c0266846041244..96a073fbb8ca86baf98bfa5f12f1c529d76e2c51 100644
--- a/openair1/SCHED/fapi_l1.c
+++ b/openair1/SCHED/fapi_l1.c
@@ -732,7 +732,7 @@ void handle_nfapi_ul_pdu(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,
} else if (ul_config_pdu->pdu_type == NFAPI_UL_CONFIG_UCI_CQI_SR_PDU_TYPE) {
AssertFatal(1==0,"NFAPI_UL_CONFIG_UCI_CQI_SR_PDU_TYPE not handled yet\n");
} else if (ul_config_pdu->pdu_type == NFAPI_UL_CONFIG_UCI_SR_PDU_TYPE) {
- AssertFatal((UE_id = find_uci(ul_config_pdu->uci_sr_pdu.ue_information.ue_information_rel8.rnti,
+ AssertFatal((UE_id = find_uci(ul_config_pdu->uci_sr_pdu.ue_information.ue_information_rel8.rnti,
proc->frame_tx,proc->subframe_tx,eNB,SEARCH_EXIST_OR_FREE))>=0,
"No available UE UCI for rnti %x\n",ul_config_pdu->uci_sr_pdu.ue_information.ue_information_rel8.rnti);
handle_uci_sr_pdu(eNB,UE_id,ul_config_pdu,frame,subframe,srs_present);
@@ -745,9 +745,8 @@ void handle_nfapi_ul_pdu(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,
}
}
-void schedule_response(Sched_Rsp_t *Sched_INFO) {
+void schedule_response(Sched_Rsp_t *Sched_INFO, L1_rxtx_proc_t *proc) {
PHY_VARS_eNB *eNB;
- L1_rxtx_proc_t *proc;
// copy data from L2 interface into L1 structures
module_id_t Mod_id = Sched_INFO->module_id;
uint8_t CC_id = Sched_INFO->CC_id;
@@ -767,7 +766,6 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
AssertFatal(RC.eNB[Mod_id][CC_id]!=NULL,"RC.eNB[%d][%d] is null\n",Mod_id,CC_id);
eNB = RC.eNB[Mod_id][CC_id];
fp = &eNB->frame_parms;
- proc = &eNB->proc.L1_proc;
/* TODO: check that following line is correct - in the meantime it is disabled */
//if ((fp->frame_type == TDD) && (subframe_select(fp,subframe)==SF_UL)) return;
ul_subframe = pdcch_alloc2ul_subframe(fp,subframe);
@@ -1020,11 +1018,11 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
/*Dummy functions*/
-int memcpy_dl_config_req (nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request_t *req) {
+int memcpy_dl_config_req (L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request_t *req) {
return 0;
}
-int memcpy_ul_config_req (nfapi_pnf_p7_config_t *pnf_p7, nfapi_ul_config_request_t *req) {
+int memcpy_ul_config_req (L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_ul_config_request_t *req) {
return 0;
}
diff --git a/openair1/SCHED/fapi_l1.h b/openair1/SCHED/fapi_l1.h
index 05ec813917be7b0122dcba129c43f3fddab841c0..4da1fa63ec54b5493e520b018b4dbc78ecc157c0 100644
--- a/openair1/SCHED/fapi_l1.h
+++ b/openair1/SCHED/fapi_l1.h
@@ -37,10 +37,10 @@
#include "SCHED/sched_common.h"
#include "nfapi_interface.h"
-void fill_uci_harq_indication(PHY_VARS_eNB *eNB,LTE_eNB_UCI *uci,int frame,int subframe,uint8_t *harq_ack,uint8_t tdd_mapping_mode,uint16_t tdd_multiplexing_mask);
+void fill_uci_harq_indication(int UEid, PHY_VARS_eNB *eNB,LTE_eNB_UCI *uci,int frame,int subframe,uint8_t *harq_ack,uint8_t tdd_mapping_mode,uint16_t tdd_multiplexing_mask);
void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,uint16_t rnti, int frame,int subframe,int bundling);
void fill_ulsch_cqi_indication(PHY_VARS_eNB *eNB,uint16_t frame,uint8_t subframe,LTE_UL_eNB_HARQ_t *ulsch_harq,uint16_t rnti);
-void fill_sr_indication(PHY_VARS_eNB *eNB,uint16_t rnti,int frame,int subframe,uint32_t stat);
+void fill_sr_indication(int UEid, PHY_VARS_eNB *eNB,uint16_t rnti,int frame,int subframe,uint32_t stat);
void fill_rx_indication(PHY_VARS_eNB *eNB,int UE_id,int frame,int subframe);
void fill_crc_indication(PHY_VARS_eNB *eNB,int UE_id,int frame,int subframe,uint8_t crc_flag);
void handle_nfapi_dci_dl_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_proc_t *proc,nfapi_dl_config_request_pdu_t *dl_config_pdu);
@@ -81,4 +81,4 @@ void handle_uci_harq_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_pdu
void handle_srs_pdu(PHY_VARS_eNB *eNB,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe);
-void schedule_response(Sched_Rsp_t *Sched_INFO);
+void schedule_response(Sched_Rsp_t *Sched_INFO, L1_rxtx_proc_t *proc);
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index 45448068ae9ffa68b67383b21b1a8fea838d8904..ba03e79e624178cb781e930d6126fab06a317e99 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -47,6 +47,7 @@
#include <time.h>
#include "intertask_interface.h"
+#include <executables/split_headers.h>
#define MBMS_NFAPI_SCHEDULER
@@ -303,6 +304,7 @@ bool dlsch_procedures(PHY_VARS_eNB *eNB,
start_meas(&eNB->dlsch_encoding_stats);
dlsch_encoding_all(eNB,
+ proc,
dlsch_harq->pdu,
dlsch_harq->pdsch_start,
dlsch,
@@ -317,6 +319,14 @@ bool dlsch_procedures(PHY_VARS_eNB *eNB,
&eNB->dlsch_interleaving_stats);
stop_meas(&eNB->dlsch_encoding_stats);
+ if ( proc->threadPool->activated ) {
+ // Wait all other threads finish to process
+ while (proc->nbEncode) {
+ delNotifiedFIFO_elt(pullTpool(proc->respEncode, proc->threadPool));
+ proc->nbEncode--;
+ }
+ }
+
if(eNB->dlsch_encoding_stats.p_time>500*3000 && opp_enabled == 1) {
print_meas_now(&eNB->dlsch_encoding_stats,"total coding",stderr);
}
@@ -431,6 +441,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
if (ul_subframe < 10) { // This means that there is a potential UL subframe that will be scheduled here
for (i=0; i<NUMBER_OF_UE_MAX; i++) {
if (eNB->ulsch[i] && eNB->ulsch[i]->ue_type >0) harq_pid = 0;
+
else
harq_pid = subframe2harq_pid(fp,ul_frame,ul_subframe);
@@ -591,7 +602,12 @@ void srs_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
}
}
-void fill_sr_indication(PHY_VARS_eNB *eNB,uint16_t rnti,int frame,int subframe,uint32_t stat) {
+void fill_sr_indication(int UEid, PHY_VARS_eNB *eNB,uint16_t rnti,int frame,int subframe,uint32_t stat) {
+ if ( split73 == SPLIT73_DU ) {
+ sendFs6Ulharq(fs6ULindicationSr, UEid, eNB, NULL, frame, subframe, NULL,0,0, rnti, stat);
+ return;
+ }
+
pthread_mutex_lock(&eNB->UL_INFO_mutex);
nfapi_sr_indication_t *sr_ind = &eNB->UL_INFO.sr_ind;
nfapi_sr_indication_body_t *sr_ind_body = &sr_ind->sr_indication_body;
@@ -604,6 +620,7 @@ void fill_sr_indication(PHY_VARS_eNB *eNB,uint16_t rnti,int frame,int subframe,u
pdu->rx_ue_information.tl.tag = NFAPI_RX_UE_INFORMATION_TAG;
pdu->rx_ue_information.rnti = rnti;
int SNRtimes10 = dB_fixed_times10(stat) - 10 * eNB->measurements.n0_subband_power_dB[0][0];
+ LOG_D(PHY,"stat %d subbandpower %d, SNRtimes10 %d\n", stat, eNB->measurements.n0_subband_power_dB[0][0], SNRtimes10);
pdu->ul_cqi_information.tl.tag = NFAPI_UL_CQI_INFORMATION_TAG;
if (SNRtimes10 < -640) pdu->ul_cqi_information.ul_cqi=0;
@@ -714,7 +731,7 @@ uci_procedures(PHY_VARS_eNB *eNB,
if (uci->type == SR) {
if (SR_payload == 1) {
- fill_sr_indication(eNB,uci->rnti,frame,subframe,metric_SR);
+ fill_sr_indication(i, eNB,uci->rnti,frame,subframe,metric_SR);
break;
} else {
break;
@@ -748,7 +765,7 @@ uci_procedures(PHY_VARS_eNB *eNB,
/* cancel SR detection if reception on n1_pucch0 is better than on SR PUCCH resource index, otherwise send it up to MAC */
if (uci->type==HARQ_SR && metric[0] > metric_SR) SR_payload = 0;
- else if (SR_payload == 1) fill_sr_indication(eNB,uci->rnti,frame,subframe,metric_SR);
+ else if (SR_payload == 1) fill_sr_indication(i, eNB,uci->rnti,frame,subframe,metric_SR);
if (uci->type==HARQ_SR && metric[0] <= metric_SR) {
/* when transmitting ACK/NACK on SR PUCCH resource index, SR payload is always 1 */
@@ -773,7 +790,7 @@ uci_procedures(PHY_VARS_eNB *eNB,
frame,subframe,
pucch_b0b1[0][0],metric[0]);
uci->stat = metric[0];
- fill_uci_harq_indication(eNB,uci,frame,subframe,pucch_b0b1[0],0,0xffff);
+ fill_uci_harq_indication(i, eNB,uci,frame,subframe,pucch_b0b1[0],0,0xffff);
} else { // frame_type == TDD
LOG_D(PHY,"Frame %d Subframe %d Demodulating PUCCH (UCI %d) for ACK/NAK (uci->pucch_fmt %d,uci->type %d.uci->frame %d, uci->subframe %d): n1_pucch0 %d SR_payload %d\n",
frame,subframe,i,
@@ -795,7 +812,7 @@ uci_procedures(PHY_VARS_eNB *eNB,
);
if (uci->type==HARQ_SR && metric[0] > metric_SR) SR_payload = 0;
- else if (SR_payload == 1) fill_sr_indication(eNB,uci->rnti,frame,subframe,metric_SR);
+ else if (SR_payload == 1) fill_sr_indication(i, eNB,uci->rnti,frame,subframe,metric_SR);
if (uci->type==HARQ_SR && metric[0] <= metric_SR) {
SR_payload = 1;
@@ -877,7 +894,7 @@ uci_procedures(PHY_VARS_eNB *eNB,
}
uci->stat = metric[0];
- fill_uci_harq_indication(eNB,uci,frame,subframe,harq_ack,2,0xffff); // special_bundling mode
+ fill_uci_harq_indication(i, eNB,uci,frame,subframe,harq_ack,2,0xffff); // special_bundling mode
} else if ((uci->tdd_bundling == 0) && (uci->num_pucch_resources==2)) { // multiplexing + no SR, implement Table 10.1.3-5 (Rel14) for multiplexing with M=2
if (pucch_b0b1[0][0] == 4 ||
pucch_b0b1[1][0] == 4) { // there isn't a likely transmission
@@ -913,7 +930,7 @@ uci_procedures(PHY_VARS_eNB *eNB,
}
uci->stat = max(metric[0],metric[1]);
- fill_uci_harq_indication(eNB,uci,frame,subframe,harq_ack,1,tdd_multiplexing_mask); // multiplexing mode
+ fill_uci_harq_indication(i, eNB,uci,frame,subframe,harq_ack,1,tdd_multiplexing_mask); // multiplexing mode
} //else if ((uci->tdd_bundling == 0) && (res==2))
else if ((uci->tdd_bundling == 0) && (uci->num_pucch_resources==3)) { // multiplexing + no SR, implement Table 10.1.3-6 (Rel14) for multiplexing with M=3
if (harq_ack[0] == 4 ||
@@ -984,7 +1001,7 @@ uci_procedures(PHY_VARS_eNB *eNB,
}
uci->stat = max_metric;
- fill_uci_harq_indication(eNB,uci,frame,subframe,harq_ack,1,tdd_multiplexing_mask); // multiplexing mode
+ fill_uci_harq_indication(i, eNB,uci,frame,subframe,harq_ack,1,tdd_multiplexing_mask); // multiplexing mode
}
} //else if ((uci->tdd_bundling == 0) && (res==3))
else if ((uci->tdd_bundling == 0) && (uci->num_pucch_resources==4)) { // multiplexing + no SR, implement Table 10.1.3-7 (Rel14) for multiplexing with M=4
@@ -1106,14 +1123,14 @@ uci_procedures(PHY_VARS_eNB *eNB,
}
uci->stat = max_metric;
- fill_uci_harq_indication(eNB,uci,frame,subframe,harq_ack,1,tdd_multiplexing_mask); // multiplexing mode
+ fill_uci_harq_indication(i, eNB,uci,frame,subframe,harq_ack,1,tdd_multiplexing_mask); // multiplexing mode
} // else if ((uci->tdd_bundling == 0) && (res==4))
else { // bundling
harq_ack[0] = pucch_b0b1[0][0];
harq_ack[1] = pucch_b0b1[0][1];
uci->stat = metric[0];
LOG_D(PHY,"bundling: (%d,%d), metric %d\n",harq_ack[0],harq_ack[1],uci->stat);
- fill_uci_harq_indication(eNB,uci,frame,subframe,harq_ack,0,0xffff); // special_bundling mode
+ fill_uci_harq_indication(i, eNB,uci,frame,subframe,harq_ack,0,0xffff); // special_bundling mode
}
#ifdef DEBUG_PHY_PROC
@@ -1144,8 +1161,93 @@ uci_procedures(PHY_VARS_eNB *eNB,
} // end loop for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
}
+void postDecode(L1_rxtx_proc_t *proc, notifiedFIFO_elt_t *req) {
+ turboDecode_t * rdata=(turboDecode_t *) NotifiedFifoData(req);
+
+ LTE_eNB_ULSCH_t *ulsch = rdata->eNB->ulsch[rdata->UEid];
+ LTE_UL_eNB_HARQ_t *ulsch_harq = rdata->ulsch_harq;
+ PHY_VARS_eNB *eNB=rdata->eNB;
+
+ bool decodeSucess=rdata->decodeIterations <= rdata->maxIterations;
+ ulsch_harq->processedSegments++;
+ LOG_D(PHY, "processing result of segment: %d, ue %d, processed %d/%d\n",
+ rdata->segment_r, rdata->UEid, ulsch_harq->processedSegments, rdata->nbSegments);
+ proc->nbDecode--;
+ LOG_D(PHY,"remain to decoded in subframe: %d\n", proc->nbDecode);
+ if (decodeSucess) {
+ int Fbytes=(rdata->segment_r==0) ? rdata->Fbits>>3 : 0;
+ int sz=(rdata->Kr>>3) - Fbytes - ((ulsch_harq->C>1)?3:0);
+ memcpy(ulsch_harq->decodedBytes+rdata->offset,
+ rdata->decoded_bytes+Fbytes,
+ sz);
+ } else {
+ if ( rdata->nbSegments != ulsch_harq->processedSegments ) {
+ int nb=abortTpool(proc->threadPool, req->key);
+ nb+=abortNotifiedFIFO(proc->respDecode, req->key);
+ proc->nbDecode-=nb;
+ LOG_I(PHY,"uplink segment error %d/%d, aborted %d segments\n",rdata->segment_r,rdata->nbSegments, nb);
+ AssertFatal(ulsch_harq->processedSegments+nb == rdata->nbSegments,"processed: %d, aborted: %d, total %d\n",
+ ulsch_harq->processedSegments, nb, rdata->nbSegments);
+ ulsch_harq->processedSegments=rdata->nbSegments;
+ }
+ }
+
+ // if this UE segments are all done
+ if ( rdata->nbSegments == ulsch_harq->processedSegments) {
+ //compute the expected ULSCH RX power (for the stats)
+ int i=rdata->UEid;
+ ulsch_harq->delta_TF = get_hundred_times_delta_IF_eNB(eNB,i,rdata->harq_pid, 0); // 0 means bw_factor is not considered
+ if (RC.mac != NULL) { /* ulsim does not use RC.mac context. */
+ if (ulsch_harq->cqi_crc_status == 1) {
+ fill_ulsch_cqi_indication(eNB,rdata->frame,rdata->subframe,ulsch_harq,ulsch->rnti);
+ RC.mac[eNB->Mod_id]->UE_info.UE_sched_ctrl[i].cqi_req_flag &= (~(1 << rdata->subframe));
+ } else {
+ if(RC.mac[eNB->Mod_id]->UE_info.UE_sched_ctrl[i].cqi_req_flag & (1 << rdata->subframe) ) {
+ RC.mac[eNB->Mod_id]->UE_info.UE_sched_ctrl[i].cqi_req_flag &= (~(1 << rdata->subframe));
+ RC.mac[eNB->Mod_id]->UE_info.UE_sched_ctrl[i].cqi_req_timer=30;
+ LOG_D(PHY,"Frame %d,Subframe %d, We're supposed to get a cqi here. Set cqi_req_timer to 30.\n",rdata->frame,rdata->subframe);
+ }
+ }
+ }
+
+ if (!decodeSucess) {
+ fill_crc_indication(eNB,i,rdata->frame,rdata->subframe,1); // indicate NAK to MAC
+ fill_rx_indication(eNB,i,rdata->frame,rdata->subframe); // indicate SDU to MAC
+ LOG_D(PHY,"[eNB %d][PUSCH %d] frame %d subframe %d UE %d Error receiving ULSCH, round %d/%d (ACK %d,%d)\n",
+ eNB->Mod_id,rdata->harq_pid,
+ rdata->frame,rdata->subframe, i,
+ ulsch_harq->round,
+ ulsch->Mlimit,
+ ulsch_harq->o_ACK[0],
+ ulsch_harq->o_ACK[1]);
+
+ if (ulsch_harq->round >= 3) {
+ ulsch_harq->status = SCH_IDLE;
+ ulsch_harq->handled = 0;
+ ulsch->harq_mask &= ~(1 << rdata->harq_pid);
+ ulsch_harq->round = 0;
+ }
+ /* Mark the HARQ process to release it later if max transmission reached
+ * (see below).
+ * MAC does not send the max transmission count, we have to deal with it
+ * locally in PHY.
+ */
+ ulsch_harq->handled = 1;
+ } // ulsch in error
+ else if(ulsch_harq->repetition_number == ulsch_harq->total_number_of_repetitions){
+ fill_crc_indication(eNB,i,rdata->frame,rdata->subframe,0); // indicate ACK to MAC
+ fill_rx_indication(eNB,i,rdata->frame,rdata->subframe); // indicate SDU to MAC
+ ulsch_harq->status = SCH_IDLE;
+ ulsch->harq_mask &= ~(1 << rdata->harq_pid);
+ } // ulsch not in error
+
+ if (ulsch_harq->O_ACK>0)
+ fill_ulsch_harq_indication(eNB,ulsch_harq,ulsch->rnti,rdata->frame,rdata->subframe,ulsch->bundling);
+ }
+}
+
void pusch_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
- uint32_t ret=0,i;
+ uint32_t i;
uint32_t harq_pid;
uint8_t nPRS;
LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
@@ -1154,7 +1256,6 @@ void pusch_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
const int subframe = proc->subframe_rx;
const int frame = proc->frame_rx;
uint32_t harq_pid0 = subframe2harq_pid(&eNB->frame_parms,frame,subframe);
- int rvidx_tab[4] = {0,2,3,1};
for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
ulsch = eNB->ulsch[i];
@@ -1208,127 +1309,13 @@ void pusch_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
rx_ulsch(eNB,proc, i);
stop_meas(&eNB->ulsch_demodulation_stats);
start_meas(&eNB->ulsch_decoding_stats);
- ret = ulsch_decoding(eNB,proc,
+ ulsch_decoding(eNB,proc,
i,
0, // control_only_flag
ulsch_harq->V_UL_DAI,
ulsch_harq->nb_rb>20 ? 1 : 0);
stop_meas(&eNB->ulsch_decoding_stats);
- LOG_D(PHY,
- "[eNB %d][PUSCH %d] frame %d subframe %d RNTI %x RX power (%d,%d) N0 (%d,%d) dB ACK (%d,%d), decoding iter %d ulsch_harq->cqi_crc_status:%d ackBits:%d ulsch_decoding_stats[t:%lld max:%lld]\n",
- eNB->Mod_id,harq_pid,
- frame,subframe,
- ulsch->rnti,
- dB_fixed(eNB->pusch_vars[i]->ulsch_power[0]),
- dB_fixed(eNB->pusch_vars[i]->ulsch_power[1]),
- 30,//eNB->measurements.n0_power_dB[0],
- 30,//eNB->measurements.n0_power_dB[1],
- ulsch_harq->o_ACK[0],
- ulsch_harq->o_ACK[1],
- ret,
- ulsch_harq->cqi_crc_status,
- ulsch_harq->O_ACK,
- eNB->ulsch_decoding_stats.p_time, eNB->ulsch_decoding_stats.max);
- if (ulsch_harq->repetition_number < ulsch_harq->total_number_of_repetitions){
- ulsch_harq->rvidx = rvidx_tab[(ulsch_harq->repetition_number%4)] ; // Set the correct rvidx for the next emtc repetitions
- ulsch_harq->repetition_number +=1 ; // Increment repetition_number for the next ULSCH allocation
- }
- //compute the expected ULSCH RX power (for the stats)
- ulsch_harq->delta_TF = get_hundred_times_delta_IF_eNB(eNB,i,harq_pid, 0); // 0 means bw_factor is not considered
-
- if (RC.mac != NULL) { /* ulsim does not use RC.mac context. */
- if (ulsch_harq->cqi_crc_status == 1) {
-#ifdef DEBUG_PHY_PROC
- //if (((frame%10) == 0) || (frame < 50))
- print_CQI(ulsch_harq->o,ulsch_harq->uci_format,0,fp->N_RB_DL);
-#endif
- fill_ulsch_cqi_indication(eNB,frame,subframe,ulsch_harq,ulsch->rnti);
- RC.mac[eNB->Mod_id]->UE_info.UE_sched_ctrl[i].cqi_req_flag &= (~(1 << subframe));
- } else {
- if(RC.mac[eNB->Mod_id]->UE_info.UE_sched_ctrl[i].cqi_req_flag & (1 << subframe) ) {
- RC.mac[eNB->Mod_id]->UE_info.UE_sched_ctrl[i].cqi_req_flag &= (~(1 << subframe));
- RC.mac[eNB->Mod_id]->UE_info.UE_sched_ctrl[i].cqi_req_timer=30;
- LOG_D(PHY,"Frame %d,Subframe %d, We're supposed to get a cqi here. Set cqi_req_timer to 30.\n",frame,subframe);
- }
- }
- }
-
- if (ret == (1+MAX_TURBO_ITERATIONS)) {
- T(T_ENB_PHY_ULSCH_UE_NACK, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(ulsch->rnti),
- T_INT(harq_pid));
- fill_crc_indication(eNB,i,frame,subframe,1); // indicate NAK to MAC
- fill_rx_indication(eNB,i,frame,subframe); // indicate SDU to MAC
- LOG_D(PHY,"[eNB %d][PUSCH %d] frame %d subframe %d UE %d Error receiving ULSCH, round %d/%d (ACK %d,%d)\n",
- eNB->Mod_id,harq_pid,
- frame,subframe, i,
- ulsch_harq->round,
- ulsch->Mlimit,
- ulsch_harq->o_ACK[0],
- ulsch_harq->o_ACK[1]);
-
- if (ulsch_harq->round >= 3) {
- ulsch_harq->status = SCH_IDLE;
- ulsch_harq->handled = 0;
- ulsch->harq_mask &= ~(1 << harq_pid);
- ulsch_harq->round = 0;
- }
-
- MSC_LOG_RX_DISCARDED_MESSAGE(
- MSC_PHY_ENB,MSC_PHY_UE,
- NULL,0,
- "%05u:%02u ULSCH received rnti %x harq id %u round %d",
- frame,subframe,
- ulsch->rnti,harq_pid,
- ulsch_harq->round-1
- );
- /* Mark the HARQ process to release it later if max transmission reached
- * (see below).
- * MAC does not send the max transmission count, we have to deal with it
- * locally in PHY.
- */
- ulsch_harq->handled = 1;
- } // ulsch in error
- else if(ulsch_harq->repetition_number == ulsch_harq->total_number_of_repetitions){
- fill_crc_indication(eNB,i,frame,subframe,0); // indicate ACK to MAC
- fill_rx_indication(eNB,i,frame,subframe); // indicate SDU to MAC
- ulsch_harq->status = SCH_IDLE;
- ulsch->harq_mask &= ~(1 << harq_pid);
- T (T_ENB_PHY_ULSCH_UE_ACK, T_INT (eNB->Mod_id), T_INT (frame), T_INT (subframe), T_INT (ulsch->rnti), T_INT (harq_pid));
- MSC_LOG_RX_MESSAGE(
- MSC_PHY_ENB,MSC_PHY_UE,
- NULL,0,
- "%05u:%02u ULSCH received rnti %x harq id %u",
- frame,subframe,
- ulsch->rnti,harq_pid
- );
-#ifdef DEBUG_PHY_PROC
-#ifdef DEBUG_ULSCH
- LOG_D(PHY,"[eNB] Frame %d, Subframe %d : ULSCH SDU (RX harq_pid %d) %d bytes:",frame,subframe,
- harq_pid,ulsch_harq->TBS>>3);
-
- for (j=0; j<ulsch_harq->TBS>>3; j++)
- LOG_T(PHY,"%x.",ulsch->harq_processes[harq_pid]->b[j]);
-
- LOG_T(PHY,"\n");
-#endif
-#endif
- } // ulsch not in error
-
- if (ulsch_harq->O_ACK>0) fill_ulsch_harq_indication(eNB,ulsch_harq,ulsch->rnti,frame,subframe,ulsch->bundling);
-
- LOG_D(PHY,"[eNB %d] Frame %d subframe %d: received ULSCH harq_pid %d for UE %d, ret = %d, CQI CRC Status %d, ACK %d,%d, ulsch_errors %d/%d\n",
- eNB->Mod_id,frame,subframe,
- harq_pid,
- i,
- ret,
- ulsch_harq->cqi_crc_status,
- ulsch_harq->o_ACK[0],
- ulsch_harq->o_ACK[1],
- eNB->UE_stats[i].ulsch_errors[harq_pid],
- eNB->UE_stats[i].ulsch_decoding_attempts[harq_pid][0]);
- } // if ((ulsch) &&
- // (ulsch->rnti>0) &&
- // (ulsch_harq->status == ACTIVE))
+ }
else if ((ulsch) &&
(ulsch->rnti>0) &&
(ulsch_harq->status == ACTIVE) &&
@@ -1342,6 +1329,12 @@ void pusch_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
LOG_W (PHY, "Removing stale ULSCH config for UE %x harq_pid %d (harq_mask is now 0x%2.2x)\n", ulsch->rnti, harq_pid, ulsch->harq_mask);
}
} // for (i=0; i<NUMBER_OF_UE_MAX; i++)
+
+ while (proc->nbDecode > 0) {
+ notifiedFIFO_elt_t *req=pullTpool(proc->respDecode, proc->threadPool);
+ postDecode(proc, req);
+ delNotifiedFIFO_elt(req);
+ }
}
extern int oai_exit;
@@ -1349,24 +1342,29 @@ extern int oai_exit;
extern void *td_thread (void *);
void init_td_thread(PHY_VARS_eNB *eNB) {
+ /*
L1_proc_t *proc = &eNB->proc;
proc->tdp.eNB = eNB;
proc->instance_cnt_td = -1;
threadCreate(&proc->pthread_td, td_thread, (void *)&proc->tdp, "TD", -1, OAI_PRIORITY_RT);
+ */
}
void kill_td_thread(PHY_VARS_eNB *eNB) {
+ /*
L1_proc_t *proc = &eNB->proc;
proc->instance_cnt_td = 0;
pthread_cond_signal(&proc->cond_td);
pthread_join(proc->pthread_td, NULL);
pthread_mutex_destroy( &proc->mutex_td );
pthread_cond_destroy( &proc->cond_td );
+ */
}
extern void *te_thread (void *);
void init_te_thread(PHY_VARS_eNB *eNB) {
+ /*
L1_proc_t *proc = &eNB->proc;
for(int i=0; i<3 ; i++) {
@@ -1377,9 +1375,11 @@ void init_te_thread(PHY_VARS_eNB *eNB) {
sprintf(txt,"TE_%d", i);
threadCreate(&proc->tep[i].pthread_te, te_thread, (void *)&proc->tep[i], txt, -1, OAI_PRIORITY_RT);
}
+ */
}
void kill_te_thread(PHY_VARS_eNB *eNB) {
+ /*
L1_proc_t *proc = &eNB->proc;
for(int i=0; i<3 ; i++) {
@@ -1389,6 +1389,7 @@ void kill_te_thread(PHY_VARS_eNB *eNB) {
pthread_mutex_destroy( &proc->tep[i].mutex_te);
pthread_cond_destroy( &proc->tep[i].cond_te);
}
+ */
}
void fill_rx_indication(PHY_VARS_eNB *eNB,
@@ -1416,7 +1417,7 @@ void fill_rx_indication(PHY_VARS_eNB *eNB,
pdu->rx_indication_rel8.tl.tag = NFAPI_RX_INDICATION_REL8_TAG;
pdu->rx_indication_rel8.length = eNB->ulsch[UE_id]->harq_processes[harq_pid]->TBS>>3;
pdu->rx_indication_rel8.offset = 1; // DJP - I dont understand - but broken unless 1 ???? 0; // filled in at the end of the UL_INFO formation
- pdu->data = eNB->ulsch[UE_id]->harq_processes[harq_pid]->b;
+ pdu->data = eNB->ulsch[UE_id]->harq_processes[harq_pid]->decodedBytes;
// estimate timing advance for MAC
sync_pos = lte_est_timing_advance_pusch(eNB,UE_id);
timing_advance_update = sync_pos; // - eNB->frame_parms.nb_prefix_samples/4; //to check
@@ -1749,7 +1750,12 @@ void fill_ulsch_harq_indication (PHY_VARS_eNB *eNB, LTE_UL_eNB_HARQ_t *ulsch_har
pthread_mutex_unlock(&eNB->UL_INFO_mutex);
}
-void fill_uci_harq_indication (PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask) {
+void fill_uci_harq_indication (int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask) {
+ if ( split73 == SPLIT73_DU ) {
+ sendFs6Ulharq(fs6ULindicationHarq, UEid, eNB, uci, frame, subframe, harq_ack, tdd_mapping_mode, tdd_multiplexing_mask, 0, 0);
+ return;
+ }
+
int UE_id=find_dlsch(uci->rnti,eNB,SEARCH_EXIST);
//AssertFatal(UE_id>=0,"UE_id doesn't exist rnti:%x\n", uci->rnti);
diff --git a/openair1/SCHED/ru_procedures.c b/openair1/SCHED/ru_procedures.c
index 6d392b04378bb41b7bab838f3854c92d4077a0c0..8846b77af9f9b756bbc308012bf8494792012ac6 100644
--- a/openair1/SCHED/ru_procedures.c
+++ b/openair1/SCHED/ru_procedures.c
@@ -321,7 +321,7 @@ void feptx_ofdm(RU_t *ru,
fp->nb_prefix_samples,
CYCLIC_PREFIX);
} else {
- if(is_pmch_subframe(ru->proc.frame_tx,subframe,fp)/*subframe==1*/){
+ if(is_pmch_subframe(frame,subframe,fp)/*subframe==1*/){
normal_prefix_mod(&ru->common.txdataF_BF[aa][0],
dummy_tx_b,
2,
@@ -426,7 +426,7 @@ void feptx_ofdm(RU_t *ru,
stop_meas(&ru->ofdm_mod_stats);
LOG_D(PHY,"feptx_ofdm (TXPATH): frame %d, subframe %d: txp (time %p) %d dB, txp (freq) %d dB\n",
- ru->proc.frame_tx,subframe,txdata,dB_fixed(signal_energy((int32_t*)txdata,fp->samples_per_tti)),
+ frame,subframe,txdata,dB_fixed(signal_energy((int32_t*)txdata,fp->samples_per_tti)),
dB_fixed(signal_energy_nodc(ru->common.txdataF_BF[aa],2*slot_sizeF)));
}
}
diff --git a/openair1/SCHED/sched_common.h b/openair1/SCHED/sched_common.h
index e9af869b05518d68b71d05f4efef29ec90a9adeb..f3e43d516ece342271860bad060b5669da6bb01b 100644
--- a/openair1/SCHED/sched_common.h
+++ b/openair1/SCHED/sched_common.h
@@ -311,7 +311,7 @@ void get_cqipmiri_params(PHY_VARS_UE *ue,uint8_t eNB_id);
int8_t get_PHR(uint8_t Mod_id, uint8_t CC_id, uint8_t eNB_index);
-void schedule_response(Sched_Rsp_t *Sched_INFO);
+void schedule_response(Sched_Rsp_t *Sched_INFO, L1_rxtx_proc_t *proc);
LTE_eNB_UE_stats* get_UE_stats(uint8_t Mod_id, uint8_t CC_id,uint16_t rnti);
diff --git a/openair1/SCHED/sched_eNB.h b/openair1/SCHED/sched_eNB.h
index e74b9a312fda7bc7ed76430b83a73b4b92d9fa15..f04bec2e5c45f691d75fb0e39aeaae07c34d409f 100644
--- a/openair1/SCHED/sched_eNB.h
+++ b/openair1/SCHED/sched_eNB.h
@@ -128,8 +128,8 @@ void phy_procedures_eNB_S_RX(PHY_VARS_eNB *phy_vars_eNB,L1_rxtx_proc_t *proc);
@param br_flag indicator for eMTC PRACH
*/
-void prach_procedures(PHY_VARS_eNB *eNB,
- int br_flag);
+void prach_procedures(PHY_VARS_eNB *eNB,
+ int br_flag);
/*! \brief Function to compute timing of Msg3 transmission on UL-SCH (first UE transmission in RA procedure). This implements the timing in paragraph a) from Section 6.1.1 in 36.213 (p. 17 in version 8.6). Used by eNB upon transmission of random-access response (RA_RNTI) to program corresponding ULSCH reception procedure. Used by UE upon reception of random-access response (RA_RNTI) to program corresponding ULSCH transmission procedure. This does not support the UL_delay field in RAR (always assumed to be 0).
@@ -193,7 +193,7 @@ int8_t find_ue_ulsch(uint16_t rnti, PHY_VARS_eNB *phy_vars_eNB);
-void schedule_response(Sched_Rsp_t *Sched_INFO);
+void schedule_response(Sched_Rsp_t *Sched_INFO, L1_rxtx_proc_t *proc);
LTE_eNB_UE_stats *get_UE_stats(uint8_t Mod_id, uint8_t CC_id,uint16_t rnti);
@@ -218,8 +218,6 @@ int is_srs_occasion_common(LTE_DL_FRAME_PARMS *frame_parms,int frame_tx,int subf
void compute_srs_pos(lte_frame_type_t frameType,uint16_t isrs,uint16_t *psrsPeriodicity,uint16_t *psrsOffset);
void release_rnti_of_phy(module_id_t mod_id);
-
-void ru_fep_full_2thread(RU_t *ru, int subframe);
/*@}*/
diff --git a/openair1/SCHED_NR/phy_frame_config_nr.c b/openair1/SCHED_NR/phy_frame_config_nr.c
index fa22e43661f5fd9a0fd0f419ca12a0cea039af51..a36cebd6aeed3b8c7c26007384bf805396a8ca16 100644
--- a/openair1/SCHED_NR/phy_frame_config_nr.c
+++ b/openair1/SCHED_NR/phy_frame_config_nr.c
@@ -202,7 +202,7 @@ int set_tdd_config_nr( nfapi_nr_config_request_scf_t *cfg,
void add_tdd_dedicated_configuration_nr(NR_DL_FRAME_PARMS *frame_parms, int slotIndex, int nrofDownlinkSymbols, int nrofUplinkSymbols) {
TDD_UL_DL_SlotConfig_t *p_TDD_UL_DL_ConfigDedicated = frame_parms->p_TDD_UL_DL_ConfigDedicated;
- TDD_UL_DL_SlotConfig_t *p_previous_TDD_UL_DL_ConfigDedicated;
+ TDD_UL_DL_SlotConfig_t *p_previous_TDD_UL_DL_ConfigDedicated=NULL;
int next = 0;
while (p_TDD_UL_DL_ConfigDedicated != NULL) {
diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
index 509f4b60213bb27365d70386e3eee91545275463..1f46408e48cdf83fa97aedc748e71a433a8151a4 100644
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -2460,7 +2460,7 @@ ue->prach_resources[eNB_id]->ra_PreambleIndex = preamble_tx;
ue->tx_total_RE[nr_tti_tx] = 96;
#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)
- ue->prach_vars[eNB_id]->amp = get_tx_amp(ue->tx_power_dBm[nr_tti_tx],
+ ue->prach_vars[eNB_id]->amp = nr_get_tx_amp(ue->tx_power_dBm[nr_tti_tx],
ue->tx_power_max_dBm,
ue->frame_parms.N_RB_UL,
6);
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c
index 6706b0f91238d22f979825a85af8593ca55d1cab..f65e1f9633f14bdc898ca4937d6a6f8af2af1cd5 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
@@ -59,6 +59,7 @@
#include "unitary_defs.h"
#include "dummy_functions.c"
#include "executables/thread-common.h"
+#include "executables/split_headers.h"
void feptx_ofdm(RU_t *ru, int frame, int subframe);
void feptx_prec(RU_t *ru, int frame, int subframe);
@@ -78,6 +79,13 @@ int n_tx_dropped = 0; /*!< \brief initial max process time for tx */
int n_rx_dropped = 0; /*!< \brief initial max process time for rx */
int emulate_rf = 0;
+int split73=0;
+void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset) {
+ AssertFatal(false, "Must not be called in this context\n");
+}
+void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask, uint16_t rnti, int32_t stat) {
+ AssertFatal(false, "Must not be called in this context\n");
+}
void handler(int sig) {
void *array[10];
@@ -515,7 +523,7 @@ int main(int argc, char **argv) {
char fname[32],vname[32];
FILE *bler_fd;
char bler_fname[256];
- FILE *time_meas_fd;
+ FILE *time_meas_fd=NULL;
char time_meas_fname[256];
// FILE *tikz_fd;
// char tikz_fname[256];
@@ -1266,6 +1274,13 @@ int main(int argc, char **argv) {
}
L1_rxtx_proc_t *proc_eNB = &eNB->proc.L1_proc;
+ proc_eNB->threadPool=(tpool_t*)malloc(sizeof(tpool_t));
+ proc_eNB->respEncode=(notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+ proc_eNB->respDecode=(notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+ initTpool("n", proc_eNB->threadPool, true);
+ initNotifiedFIFO(proc_eNB->respEncode);
+ initNotifiedFIFO(proc_eNB->respDecode);
+
proc_eNB->frame_tx=0;
if (input_fd==NULL) {
@@ -1446,7 +1461,7 @@ int main(int argc, char **argv) {
sched_resp.subframe=subframe;
sched_resp.frame=proc_eNB->frame_tx;
eNB->abstraction_flag=0;
- schedule_response(&sched_resp);
+ schedule_response(&sched_resp, proc_eNB);
phy_procedures_eNB_TX(eNB,proc_eNB,1);
if (uncoded_ber_bit == NULL) {
@@ -1480,7 +1495,7 @@ int main(int argc, char **argv) {
TX_req.tx_request_body.number_of_pdus=0;
proc_eNB->subframe_tx = subframe+1;
sched_resp.subframe=subframe+1;
- schedule_response(&sched_resp);
+ schedule_response(&sched_resp, proc_eNB);
phy_procedures_eNB_TX(eNB,proc_eNB,0);
ru->proc.tti_tx=(subframe+1)%10;
feptx_prec(ru,proc_eNB->frame_tx,subframe+1);
@@ -1583,11 +1598,11 @@ int main(int argc, char **argv) {
subframe<<1);
for (i=0; i<coded_bits_per_codeword; i++)
- if ((eNB->dlsch[0][0]->harq_processes[0]->e[i]==1 && UE->pdsch_vars[UE->current_thread_id[subframe]][0]->llr[0][i] > 0)||
- (eNB->dlsch[0][0]->harq_processes[0]->e[i]==0 && UE->pdsch_vars[UE->current_thread_id[subframe]][0]->llr[0][i] < 0)) {
+ if ((eNB->dlsch[0][0]->harq_processes[0]->eDL[i]==1 && UE->pdsch_vars[UE->current_thread_id[subframe]][0]->llr[0][i] > 0)||
+ (eNB->dlsch[0][0]->harq_processes[0]->eDL[i]==0 && UE->pdsch_vars[UE->current_thread_id[subframe]][0]->llr[0][i] < 0)) {
uncoded_ber_bit[bit_errors++] = 1;
printf("error in pos %d : %d => %d\n",i,
- eNB->dlsch[0][0]->harq_processes[0]->e[i],
+ eNB->dlsch[0][0]->harq_processes[0]->eDL[i],
UE->pdsch_vars[UE->current_thread_id[subframe]][0]->llr[0][i]);
} else {
/*
@@ -1634,7 +1649,7 @@ int main(int argc, char **argv) {
//pdsch_vars
printf("coded_bits_per_codeword %u\n",coded_bits_per_codeword);
dump_dlsch2(UE,eNB_id,subframe,&coded_bits_per_codeword,round, UE->dlsch[UE->current_thread_id[subframe]][0][0]->current_harq_pid);
- LOG_M("dlsch_e.m","e",eNB->dlsch[0][0]->harq_processes[0]->e,coded_bits_per_codeword,1,4);
+ LOG_M("dlsch_e.m","e",eNB->dlsch[0][0]->harq_processes[0]->eDL,coded_bits_per_codeword,1,4);
//pdcch_vars
LOG_M("pdcchF0_ext.m","pdcchF_ext", UE->pdcch_vars[0][eNB_id]->rxdataF_ext[0],2*3*UE->frame_parms.ofdm_symbol_size,1,1);
LOG_M("pdcch00_ch0_ext.m","pdcch00_ch0_ext",UE->pdcch_vars[0][eNB_id]->dl_ch_estimates_ext[0],300*3,1,1);
diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c
index db97240ed55686138b7a67a4903fe1ec3e04f9f9..c950d6f4da2079fe3a23af075fe8e6f5ceb1e547 100644
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
@@ -54,6 +54,7 @@
#include "common/config/config_load_configmodule.h"
#include "executables/thread-common.h"
#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/split_headers.h"
double cpuf;
#define inMicroS(a) (((double)(a))/(cpu_freq_GHz*1000.0))
@@ -81,6 +82,14 @@ int n_tx_dropped = 0; /*!< \brief initial max process time for tx */
int n_rx_dropped = 0; /*!< \brief initial max process time for rx */
+int split73=0;
+void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset) {
+ AssertFatal(false, "Must not be called in this context\n");
+}
+void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask, uint16_t rnti, int32_t stat) {
+ AssertFatal(false, "Must not be called in this context\n");
+}
+
extern void fep_full(RU_t *ru, int subframe);
extern void ru_fep_full_2thread(RU_t *ru, int subframe);
//extern void eNB_fep_full(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc);
@@ -793,6 +802,13 @@ int main(int argc, char **argv) {
proc_rxtx_ue->frame_rx = (subframe<4)?(proc_rxtx->frame_tx-1):(proc_rxtx->frame_tx);
proc_rxtx_ue->subframe_tx = proc_rxtx->subframe_rx;
proc_rxtx_ue->subframe_rx = (proc_rxtx->subframe_tx+6)%10;
+ proc_rxtx->threadPool=(tpool_t*)malloc(sizeof(tpool_t));
+ proc_rxtx->respEncode=(notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+ proc_rxtx->respDecode=(notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+ initTpool("n",proc_rxtx->threadPool, true);
+ initNotifiedFIFO(proc_rxtx->respEncode);
+ initNotifiedFIFO(proc_rxtx->respDecode);
+
printf("Init UL hopping UE\n");
init_ul_hopping(&UE->frame_parms);
printf("Init UL hopping eNB\n");
@@ -995,7 +1011,7 @@ int main(int argc, char **argv) {
srs_flag);
sched_resp.subframe=(subframe+6)%10;
sched_resp.frame=(1024+eNB->proc.frame_rx+((subframe<4)?-1:0))&1023;
- schedule_response(&sched_resp);
+ schedule_response(&sched_resp, proc_rxtx);
/////////////////////
if (abstx) {
@@ -1270,7 +1286,7 @@ int main(int argc, char **argv) {
LOG_UDUMPMSG(SIM,dataArray(table_rx),table_rx->size,LOG_DUMP_DOUBLE,"The receiver raw data: \n");
}
- printf("\n**********rb: %d ***mcs : %d *********SNR = %f dB (%f): TX %u dB (gain %f dB), N0W %f dB, I0 %d dB, delta_IF %d [ (%d,%d) dB / (%d,%d) dB ]**************************\n",
+ printf("\n**********rb: %d ***mcs : %d *********SNR = %f dB (%f): TX %u dB (gain %f dB), N0W %f dB, I0 %u dB, delta_IF %d [ (%d,%d) dB / (%u,%u) dB ]**************************\n",
nb_rb,mcs,SNR,SNR2,
tx_lev_dB,
20*log10(tx_gain),
@@ -1352,7 +1368,7 @@ int main(int argc, char **argv) {
printStatIndent2(&eNB->ulsch_deinterleaving_stats,"sub-block interleaving" );
printStatIndent2(&eNB->ulsch_demultiplexing_stats,"sub-block demultiplexing" );
printStatIndent2(&eNB->ulsch_rate_unmatching_stats,"sub-block rate-matching" );
- printf("|__ turbo_decoder(%d bits), avg iterations: %.1f %.2f us (%d cycles, %d trials)\n",
+ printf(" |__ turbo_decoder(%d bits), avg iterations: %.1f %.2f us (%d cycles, %d trials)\n",
eNB->ulsch[0]->harq_processes[harq_pid]->Cminus ?
eNB->ulsch[0]->harq_processes[harq_pid]->Kminus :
eNB->ulsch[0]->harq_processes[harq_pid]->Kplus,
diff --git a/openair2/COMMON/rrc_messages_def.h b/openair2/COMMON/rrc_messages_def.h
index 1d0c2dfdb85d4186180b9b5954409815c7f9d33a..cde2497880849bccbbbafb3c5e787a946eddde17 100644
--- a/openair2/COMMON/rrc_messages_def.h
+++ b/openair2/COMMON/rrc_messages_def.h
@@ -76,3 +76,6 @@ MESSAGE_DEF(NAS_DOWNLINK_DATA_IND, MESSAGE_PRIORITY_MED, NasDlDataInd
// eNB: realtime -> RRC messages
MESSAGE_DEF(RRC_SUBFRAME_PROCESS, MESSAGE_PRIORITY_MED, RrcSubframeProcess, rrc_subframe_process)
+
+// eNB: RLC -> RRC messages
+MESSAGE_DEF(RLC_SDU_INDICATION, MESSAGE_PRIORITY_MED, RlcSduIndication, rlc_sdu_indication)
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index 68e1753448b2c9a5bc7d5b0a9f70b4857853a0d7..7582de65ba4c9761f80c572254baaa21fede672c 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -87,6 +87,8 @@
#define RRC_SUBFRAME_PROCESS(mSGpTR) (mSGpTR)->ittiMsg.rrc_subframe_process
+#define RLC_SDU_INDICATION(mSGpTR) (mSGpTR)->ittiMsg.rlc_sdu_indication
+
//-------------------------------------------------------------------------------------------//
typedef struct RrcStateInd_s {
Rrc_State_t state;
@@ -429,4 +431,12 @@ typedef struct rrc_subframe_process_s {
int CC_id;
} RrcSubframeProcess;
+// eNB: RLC -> RRC messages
+typedef struct rlc_sdu_indication_s {
+ int rnti;
+ int is_successful;
+ int srb_id;
+ int message_id;
+} RlcSduIndication;
+
#endif /* RRC_MESSAGES_TYPES_H_ */
diff --git a/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
index 30c10940c99fb8496e12b197c8a641baa7a211c2..a85cbac5439465b3ca9d88e2a21241a67bb72ab9 100644
--- a/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
+++ b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
@@ -290,7 +290,7 @@ Protocol__FlexUlCqiReport * copy_ul_cqi_report(Protocol__FlexUlCqiReport * origi
full_ul_report->has_sfn_sn = original->has_sfn_sn;
full_ul_report->n_cqi_meas = original->n_cqi_meas;
- Protocol__FlexUlCqi **ul_report;
+ Protocol__FlexUlCqi **ul_report=NULL;
ul_report = malloc(sizeof(Protocol__FlexUlCqi *) * full_ul_report->n_cqi_meas);
if(ul_report == NULL)
goto error;
@@ -348,7 +348,7 @@ Protocol__FlexDlCqiReport * copy_dl_cqi_report(Protocol__FlexDlCqiReport * origi
dl_report->has_sfn_sn = original->has_sfn_sn;
dl_report->n_csi_report = original->n_csi_report;
- Protocol__FlexDlCsi **csi_reports;
+ Protocol__FlexDlCsi **csi_reports=NULL;
csi_reports = malloc(sizeof(Protocol__FlexDlCsi *) * dl_report->n_csi_report);
if (csi_reports == NULL)
goto error;
@@ -383,7 +383,7 @@ Protocol__FlexPagingBufferReport * copy_paging_buffer_report(Protocol__FlexPagin
protocol__flex_paging_buffer_report__init(copy);
copy->n_paging_info = original->n_paging_info;
- Protocol__FlexPagingInfo **p_info;
+ Protocol__FlexPagingInfo **p_info=NULL;
p_info = malloc(sizeof(Protocol__FlexPagingInfo *) * copy->n_paging_info);
if (p_info == NULL)
goto error;
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
index a42922c300387b7cca6c8a0528726501b9b838c3..00fd40109db819a754e3bbf9ad79810df59b0641 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
@@ -2240,7 +2240,7 @@ void ulsch_scheduler_pre_ue_select_fairRR(
uint8_t first_ue_total[MAX_NUM_CCs][20];
uint8_t first_ue_id[MAX_NUM_CCs][20];
uint8_t ul_inactivity_num[MAX_NUM_CCs];
- uint8_t ul_inactivity_id[MAX_NUM_CCs][20];
+ uint8_t ul_inactivity_id[MAX_NUM_CCs][20]={0};
// LTE_DL_FRAME_PARMS *frame_parms;
uint8_t ulsch_ue_max_num[MAX_NUM_CCs];
uint16_t saved_ulsch_dci[MAX_NUM_CCs];
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_mch.c b/openair2/LAYER2/MAC/eNB_scheduler_mch.c
index 12cdb29f4cec48b9d374ef406c46215db1225901..eb5d78fd3f4b25d22c177d636a14cec72988b306 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_mch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_mch.c
@@ -714,7 +714,7 @@ schedule_MBMS_NFAPI(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
mbms_rab_id = cc->mbms_SessionList[0]->list.array[0]->logicalChannelIdentity_r9;
rlc_status =
- mac_rlc_status_ind(module_idP, 0/*0xfffd*/, frameP, subframeP,
+ mac_rlc_status_ind(module_idP, 0xfffd, frameP, subframeP,
module_idP, ENB_FLAG_YES, MBMS_FLAG_YES,
cc->mbms_SessionList[0]->list.array[0]->logicalChannelIdentity_r9,
//MTCH,
@@ -771,7 +771,7 @@ schedule_MBMS_NFAPI(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
TBS - header_len_mcch - header_len_msi -
sdu_length_total - header_len_mtch, header_len_mtch, rlc_status.bytes_in_buffer);
- sdu_lengths[num_sdus] = mac_rlc_data_req(module_idP, 0, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_YES,cc->mbms_SessionList[0]->list.array[0]->logicalChannelIdentity_r9,
+ sdu_lengths[num_sdus] = mac_rlc_data_req(module_idP, 0xfffd, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_YES,cc->mbms_SessionList[0]->list.array[0]->logicalChannelIdentity_r9,
TBS - header_len_mcch - header_len_msi - sdu_length_total - header_len_mtch,
(char *)
&mch_buffer[sdu_length_total]
@@ -1553,7 +1553,7 @@ schedule_MBMS(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
mbms_rab_id = cc->mbms_SessionList[0]->list.array[0]->logicalChannelIdentity_r9;
rlc_status =
- mac_rlc_status_ind(module_idP, 0/*0xfffd*/, frameP, subframeP,
+ mac_rlc_status_ind(module_idP, 0xfffd, frameP, subframeP,
module_idP, ENB_FLAG_YES, MBMS_FLAG_YES,
cc->mbms_SessionList[0]->list.array[0]->logicalChannelIdentity_r9,
//MTCH,
@@ -1576,7 +1576,7 @@ schedule_MBMS(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
TBS - header_len_mcch - header_len_msi -
sdu_length_total - header_len_mtch, header_len_mtch, rlc_status.bytes_in_buffer);
- sdu_lengths[num_sdus] = mac_rlc_data_req(module_idP, 0, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_YES,cc->mbms_SessionList[0]->list.array[0]->logicalChannelIdentity_r9,
+ sdu_lengths[num_sdus] = mac_rlc_data_req(module_idP, 0xfffd, module_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_YES,cc->mbms_SessionList[0]->list.array[0]->logicalChannelIdentity_r9,
TBS - header_len_mcch - header_len_msi - sdu_length_total - header_len_mtch,
(char *)
&mch_buffer[sdu_length_total]
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index 656dd885dfde293845ee2b24ef75ad0e3102e22e..3062e5c9647826af5fe547d5fa7a06c7f6707004 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -180,7 +180,7 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_template_ptr->scheduled_ul_bytes = 0;
}
} else { // sduP == NULL => error
- LOG_W(MAC, "[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d, UE_id %d, RNTI %x\n",
+ LOG_W(MAC, "[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d, UE_id %d, RNTI %x (len %d)\n",
enb_mod_idP,
harq_pid,
CC_idP,
@@ -189,7 +189,8 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_scheduling_control->round_UL[CC_idP][harq_pid],
ul_cqi,
UE_id,
- current_rnti);
+ current_rnti,
+ sdu_lenP);
if (ul_cqi > 200) { // too high energy pattern
UE_scheduling_control->pusch_snr[CC_idP] = ul_cqi;
diff --git a/openair2/LAYER2/MAC/ue_procedures.c b/openair2/LAYER2/MAC/ue_procedures.c
index c151c061bdc4defc0f5d082e3559403272eacfcb..24630c0fe2cc8e095198e9ae9bdfd0c2d385ab56 100644
--- a/openair2/LAYER2/MAC/ue_procedures.c
+++ b/openair2/LAYER2/MAC/ue_procedures.c
@@ -1972,6 +1972,10 @@ ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
subframe, ENB_FLAG_NO,
lcid);
lcid_buffer_occupancy_new = lcid_buffer_occupancy_old;
+#if 0
+ /* TODO: those assert crash the L2 simulator with the new RLC.
+ * Are they necessary?
+ */
AssertFatal(lcid_buffer_occupancy_new ==
UE_mac_inst[module_idP].
scheduling_info.LCID_buffer_remain[lcid],
@@ -1990,6 +1994,7 @@ ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
scheduling_info.BSR_bytes[UE_mac_inst[module_idP].
scheduling_info.LCGID
[lcid]]);
+#endif
//Multiplex all available DCCH RLC PDUs considering to multiplex the last PDU each time for maximize the data
//Adjust at the end of the loop
@@ -2085,18 +2090,10 @@ ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
}
//Update Buffer remain and BSR bytes after transmission
- AssertFatal(lcid_buffer_occupancy_new <=
- lcid_buffer_occupancy_old,
- "MAC UE Tx error : Buffer Occupancy After Tx=%d greater than before=%d BO! for LCID=%d RLC PDU nb=%d Frame %d Subrame %d\n",
- lcid_buffer_occupancy_new,
- lcid_buffer_occupancy_old, lcid,
- lcid_rlc_pdu_count, frameP, subframe);
- UE_mac_inst[module_idP].scheduling_info.
- LCID_buffer_remain[lcid] = lcid_buffer_occupancy_new;
- UE_mac_inst[module_idP].
- scheduling_info.BSR_bytes[UE_mac_inst[module_idP].
- scheduling_info.LCGID[lcid]] +=
- (lcid_buffer_occupancy_new - lcid_buffer_occupancy_old);
+ UE_mac_inst[module_idP].scheduling_info.LCID_buffer_remain[lcid] = lcid_buffer_occupancy_new;
+ UE_mac_inst[module_idP].scheduling_info.BSR_bytes[UE_mac_inst[module_idP].scheduling_info.LCGID[lcid]] += (lcid_buffer_occupancy_new - lcid_buffer_occupancy_old);
+ if (UE_mac_inst[module_idP].scheduling_info.BSR_bytes[UE_mac_inst[module_idP].scheduling_info.LCGID[lcid]] < 0)
+ UE_mac_inst[module_idP].scheduling_info.BSR_bytes[UE_mac_inst[module_idP].scheduling_info.LCGID[lcid]] = 0;
//Update the number of LCGID with data as BSR shall reflect status after BSR transmission
if ((num_lcg_id_with_data > 1)
diff --git a/openair2/LAYER2/NR_MAC_UE/mac_proto.h b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
index 36d285e320e416c7f14d3f0694e01322d6ddc6c7..3c625ec2ff11a7932d8c78427d88d2049070a72b 100755
--- a/openair2/LAYER2/NR_MAC_UE/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
@@ -166,6 +166,11 @@ void nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
nr_dci_pdu_rel15_t *nr_pdci_info_extracted);
+uint8_t
+nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
+ sub_frame_t subframe, uint8_t eNB_index,
+ uint8_t *ulsch_buffer, uint16_t buflen, uint8_t *access_mode) ;
+
int set_tdd_config_nr_ue(fapi_nr_config_request_t *cfg, int mu,
int nrofDownlinkSlots, int nrofDownlinkSymbols,
int nrofUplinkSlots, int nrofUplinkSymbols);
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 93768558823ed86df27e162fca962daebcf729e7..b7fddf9b733fba3d9bc74d66af550b825a027cdc 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -507,7 +507,7 @@ void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t* pdcch_pdu,
AssertFatal(bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList!=NULL,"searchPsacesToAddModList is null\n");
AssertFatal(bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList->list.count>0,
"searchPsacesToAddModList is empty\n");
- NR_SearchSpace_t *ss;
+ NR_SearchSpace_t *ss=NULL;
int found=0;
int target_ss = NR_SearchSpace__searchSpaceType_PR_common;
if (ss_type == 1) {
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent.c b/openair2/LAYER2/PROTO_AGENT/proto_agent.c
index bead6ad28d3fbc920f29fa8dbc4ec5370d5a83db..6bf9cdce229a249417febf87340c68e6dce6f453 100644
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent.c
+++ b/openair2/LAYER2/PROTO_AGENT/proto_agent.c
@@ -1,31 +1,23 @@
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2014 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
-
- *******************************************************************************/
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
/*! \file enb_agent.h
* \brief top level enb agent receive thread and itti task
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent.h b/openair2/LAYER2/PROTO_AGENT/proto_agent.h
index 927b714b2c41f1ec4875d8d0a52335c3cb430b0c..6898c9e447421ab954a86a21dd3c6dd387da45bb 100644
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent.h
+++ b/openair2/LAYER2/PROTO_AGENT/proto_agent.h
@@ -1,32 +1,23 @@
-
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2014 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
-
- *******************************************************************************/
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
/*! \file proto_agent.h
* \brief top level protocol agent
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_async.c b/openair2/LAYER2/PROTO_AGENT/proto_agent_async.c
index eef697c5bbe05c4e5e34875493a52fa0005a48d8..df3684ee275ab035f285132dccb3cc4d13e4a56d 100644
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_async.c
+++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_async.c
@@ -1,32 +1,23 @@
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2014 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
-
- *******************************************************************************/
-
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
#include "proto_agent_async.h"
#include "proto_agent_defs.h"
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_async.h b/openair2/LAYER2/PROTO_AGENT/proto_agent_async.h
index 27030924cdff888a221d42646db970c7b085b5b2..6bc952e804de80a7aa42b1b6393776b80fbdd522 100644
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_async.h
+++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_async.h
@@ -1,31 +1,23 @@
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2014 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
-
- *******************************************************************************/
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
/*! \file enb_agent_async.h
* \brief channel implementation for async interface
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c b/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c
index a11c029bd3637e022a8699562f65f3863f56b5b3..6e343343cded082c291072e565a0ef00f1998c7f 100644
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c
+++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c
@@ -1,31 +1,23 @@
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2014 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
-
- *******************************************************************************/
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
/*! \file proto_agent_common.c
* \brief common primitives for all agents
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_common.h b/openair2/LAYER2/PROTO_AGENT/proto_agent_common.h
index 70e6b2a84ec4b09f1ea2221bf10482bd26bc6f0a..c805b8154339cb654521969847708f0654424086 100644
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_common.h
+++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_common.h
@@ -1,31 +1,23 @@
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2014 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
-
- *******************************************************************************/
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
/*! \file enb_agent_common.h
* \brief common message primitves and utilities
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h b/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h
index 08c91e70850cf87d189bf01bdd0d67057d3a3b76..cd730a6de864f604c979f58021e806f505220c0d 100644
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h
+++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h
@@ -1,31 +1,23 @@
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2016 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
-
- *******************************************************************************/
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
/*! \file enb_agent_defs.h
* \brief enb agent common definitions
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_handler.c b/openair2/LAYER2/PROTO_AGENT/proto_agent_handler.c
index cb65da28039c5012ade0ed08d7f8bcfee1223104..82f7849717fae519b81acc0071a6ca7dcf85e62b 100644
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_handler.c
+++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_handler.c
@@ -1,31 +1,23 @@
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2014 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
-
- *******************************************************************************/
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
/*! \file enb_agent_handler.c
* \brief enb agent tx and rx message handler
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c b/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
index f64a58f8e1584580bcc25180f7edd8fca0e282ce..9a63427ed5887111ba21b9863da5e738763ad239 100644
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
+++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c
@@ -1,31 +1,23 @@
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2016 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
-
- *******************************************************************************/
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
/*! \file enb_agent_net_comm.c
* \brief enb agent network interface abstraction
diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.h b/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.h
index c956bf48b1daf93e435c7e15a800d196151f214e..55fca5a928eb4d52fefa4cd6e056e0e80c191ec9 100644
--- a/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.h
+++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.h
@@ -1,31 +1,23 @@
-/*******************************************************************************
- OpenAirInterface
- Copyright(c) 1999 - 2016 Eurecom
-
- OpenAirInterface is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-
- OpenAirInterface is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenAirInterface.The full GNU General Public License is
- included in this distribution in the file called "COPYING". If not,
- see <http://www.gnu.org/licenses/>.
-
- Contact Information
- OpenAirInterface Admin: openair_admin@eurecom.fr
- OpenAirInterface Tech : openair_tech@eurecom.fr
- OpenAirInterface Dev : openair4g-devel@lists.eurecom.fr
-
- Address : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
-
- *******************************************************************************/
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
/*! \file enb_agent_net_comm.h
* \brief enb agent network interface abstraction
diff --git a/openair2/LAYER2/RLC/rlc.h b/openair2/LAYER2/RLC/rlc.h
index ca952119221548c2f1d56efde7ac91996ada7fa1..27ca18ed7ee9d2b712254eb43ffbb64850ac78c2 100644
--- a/openair2/LAYER2/RLC/rlc.h
+++ b/openair2/LAYER2/RLC/rlc.h
@@ -137,7 +137,7 @@ void (*rlc_rrc_data_ind)(
const protocol_ctxt_t *const ctxtP,
const rb_id_t rb_idP,
const sdu_size_t sdu_sizeP,
- const uint8_t *const sduP);
+ const uint8_t *const sduP) __attribute__ ((aligned(32)));
void (*rlc_rrc_data_conf)(
const protocol_ctxt_t *const ctxtP,
@@ -250,7 +250,7 @@ logical_chan_id_t rlc_mbms_rbid2lcid_eNB[MAX_eNB][NB_RB_MBMS_MAX];
(((hash_key_t)(sESSION_ID)) << 37) | \
(((hash_key_t)(0x0000000000000001)) << 63))
-hash_table_t *rlc_coll_p;
+hash_table_t *rlc_coll_p __attribute__ ((aligned(32)));
/*! \fn tbs_size_t mac_rlc_serialize_tb (char* bufferP, list_t transport_blocksP)
* \brief Serialize a list of transport blocks coming from RLC in order to be processed by MAC.
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
index 608c0bc2e28ae699e21e547920bb0d79cf300a21..ff0d446e3f0e4004b45048cdb3eab6a6a9a2b2c6 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
@@ -107,7 +107,6 @@ tbs_size_t mac_rlc_data_req(
int ret;
nr_rlc_ue_t *ue;
nr_rlc_entity_t *rb;
- int is_enb;
int maxsize;
nr_rlc_manager_lock(nr_rlc_ue_manager);
@@ -121,8 +120,6 @@ tbs_size_t mac_rlc_data_req(
if (rb != NULL) {
rb->set_time(rb, nr_rlc_current_time);
- /* UE does not seem to use saved_status_ind_tb_size */
- is_enb = nr_rlc_manager_get_enb_flag(nr_rlc_ue_manager);
maxsize = tb_sizeP;
ret = rb->generate_pdu(rb, buffer_pP, maxsize);
} else {
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h b/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h
index 97da28cdce2136f01bef2d0c8625269e7ba5edf0..464cf3d083d774bc1286520a8e00f382196383f5 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h
@@ -28,10 +28,6 @@ typedef void nr_rlc_ue_manager_t;
typedef struct nr_rlc_ue_t {
int rnti;
- /* due to openair calling status_ind/data_req, we need to keep this.
- * To be considered 'hackish'.
- */
- int saved_status_ind_tb_size[2+5];
nr_rlc_entity_t *srb[2];
nr_rlc_entity_t *drb[5];
} nr_rlc_ue_t;
diff --git a/openair2/LAYER2/rlc_v2/TODO b/openair2/LAYER2/rlc_v2/TODO
new file mode 100644
index 0000000000000000000000000000000000000000..0778d4320b888ac2cf9b695f0e3129863656fa2a
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/TODO
@@ -0,0 +1,18 @@
+RLC AM
+======
+
+- 36.322 5.4 Re-establishment procedure
+ when possible, reassemble RLC SDUs from any byte segments of AMD PDUs
+ with SN < VR(MR) in the receiving side, remove RLC headers when doing
+ so and deliver all reassembled RLC SDUs to upper layer in ascending order
+ of the RLC SN, if not delivered before;
+
+- 36.322 5.2.3 Status reporting
+ delay triggering the STATUS report until x < VR(MS) or x >= VR(MR)
+
+- 36.322 5.1.3.2.3 Actions when a RLC data PDU is placed in the reception
+ buffer
+ [...] and in-sequence byte segments of the AMD PDU with SN = VR(R) [...]
+
+- use SOstart/SOend in NACK reporting, do not NACK full PDU if
+ parts of it have been received
diff --git a/openair2/LAYER2/rlc_v2/asn1_utils.c b/openair2/LAYER2/rlc_v2/asn1_utils.c
new file mode 100644
index 0000000000000000000000000000000000000000..46f7d90da57d2cb7d15cee8c60614a49a832e955
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/asn1_utils.c
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "rlc.h"
+
+int decode_t_reordering(int v)
+{
+ static int tab[32] = {
+ 0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85,
+ 90, 95, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 1600
+ };
+
+ if (v < 0 || v > 31) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ return tab[v];
+}
+
+int decode_t_status_prohibit(int v)
+{
+ static int tab[62] = {
+ 0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90,
+ 95, 100, 105, 110, 115, 120, 125, 130, 135, 140, 145, 150, 155, 160, 165,
+ 170, 175, 180, 185, 190, 195, 200, 205, 210, 215, 220, 225, 230, 235, 240,
+ 245, 250, 300, 350, 400, 450, 500, 800, 1000, 1200, 1600, 2000, 2400
+ };
+
+ if (v < 0 || v > 61) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ return tab[v];
+}
+
+int decode_t_poll_retransmit(int v)
+{
+ static int tab[59] = {
+ 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95,
+ 100, 105, 110, 115, 120, 125, 130, 135, 140, 145, 150, 155, 160, 165, 170,
+ 175, 180, 185, 190, 195, 200, 205, 210, 215, 220, 225, 230, 235, 240, 245,
+ 250, 300, 350, 400, 450, 500, 800, 1000, 2000, 4000
+ };
+
+ if (v < 0 || v > 58) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ return tab[v];
+}
+
+int decode_poll_pdu(int v)
+{
+ static int tab[8] = {
+ 4, 8, 16, 32, 64, 128, 256, -1 /* -1 means infinity */
+ };
+
+ if (v < 0 || v > 7) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ return tab[v];
+}
+
+int decode_poll_byte(int v)
+{
+ static int tab[15] = {
+ 25, 50, 75, 100, 125, 250, 375, 500, 750, 1000, 1250, 1500, 2000, 3000,
+ -1 /* -1 means infinity */
+ };
+
+ if (v < 0 || v > 14) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ if (tab[v] == -1) return -1;
+ return tab[v] * 1024;
+}
+
+int decode_max_retx_threshold(int v)
+{
+ static int tab[8] = {
+ 1, 2, 3, 4, 6, 8, 16, 32
+ };
+
+ if (v < 0 || v > 7) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ return tab[v];
+}
+
+int decode_sn_field_length(int v)
+{
+ static int tab[2] = {
+ 5, 10
+ };
+
+ if (v < 0 || v > 1) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ return tab[v];
+}
diff --git a/openair2/UTIL/MEM/mem_mngt_proto_extern.h b/openair2/LAYER2/rlc_v2/asn1_utils.h
similarity index 77%
rename from openair2/UTIL/MEM/mem_mngt_proto_extern.h
rename to openair2/LAYER2/rlc_v2/asn1_utils.h
index 4690bba42e5b91f4721d727b38d41da928e0c55a..61394c9c6991ccdc32722bfb039bfdac82a741ae 100644
--- a/openair2/UTIL/MEM/mem_mngt_proto_extern.h
+++ b/openair2/LAYER2/rlc_v2/asn1_utils.h
@@ -19,3 +19,15 @@
* contact@openairinterface.org
*/
+#ifndef _ASN1_UTILS_H_
+#define _ASN1_UTILS_H_
+
+int decode_t_reordering(int v);
+int decode_t_status_prohibit(int v);
+int decode_t_poll_retransmit(int v);
+int decode_poll_pdu(int v);
+int decode_poll_byte(int v);
+int decode_max_retx_threshold(int v);
+int decode_sn_field_length(int v);
+
+#endif /* _ASN1_UTILS_H_ */
diff --git a/openair2/LAYER2/rlc_v2/rlc_entity.c b/openair2/LAYER2/rlc_v2/rlc_entity.c
new file mode 100644
index 0000000000000000000000000000000000000000..d774e2b7e17788f71a0edc178295f1a682488469
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_entity.c
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "rlc_entity.h"
+
+#include <stdlib.h>
+
+#include "rlc_entity_am.h"
+#include "rlc_entity_um.h"
+
+#include "LOG/log.h"
+
+rlc_entity_t *new_rlc_entity_am(
+ int rx_maxsize,
+ int tx_maxsize,
+ void (*deliver_sdu)(void *deliver_sdu_data, struct rlc_entity_t *entity,
+ char *buf, int size),
+ void *deliver_sdu_data,
+ void (*sdu_successful_delivery)(void *sdu_successful_delivery_data,
+ struct rlc_entity_t *entity,
+ int sdu_id),
+ void *sdu_successful_delivery_data,
+ void (*max_retx_reached)(void *max_retx_reached_data,
+ struct rlc_entity_t *entity),
+ void *max_retx_reached_data,
+ int t_reordering,
+ int t_status_prohibit,
+ int t_poll_retransmit,
+ int poll_pdu,
+ int poll_byte,
+ int max_retx_threshold)
+{
+ rlc_entity_am_t *ret;
+
+ ret = calloc(1, sizeof(rlc_entity_am_t));
+ if (ret == NULL) {
+ LOG_E(RLC, "%s:%d:%s: out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ ret->common.recv_pdu = rlc_entity_am_recv_pdu;
+ ret->common.buffer_status = rlc_entity_am_buffer_status;
+ ret->common.generate_pdu = rlc_entity_am_generate_pdu;
+
+ ret->common.recv_sdu = rlc_entity_am_recv_sdu;
+
+ ret->common.set_time = rlc_entity_am_set_time;
+
+ ret->common.discard_sdu = rlc_entity_am_discard_sdu;
+
+ ret->common.reestablishment = rlc_entity_am_reestablishment;
+
+ ret->common.delete = rlc_entity_am_delete;
+
+ ret->common.deliver_sdu = deliver_sdu;
+ ret->common.deliver_sdu_data = deliver_sdu_data;
+
+ ret->common.sdu_successful_delivery = sdu_successful_delivery;
+ ret->common.sdu_successful_delivery_data = sdu_successful_delivery_data;
+
+ ret->common.max_retx_reached = max_retx_reached;
+ ret->common.max_retx_reached_data = max_retx_reached_data;
+
+ ret->rx_maxsize = rx_maxsize;
+ ret->tx_maxsize = tx_maxsize;
+ ret->t_reordering = t_reordering;
+ ret->t_status_prohibit = t_status_prohibit;
+ ret->t_poll_retransmit = t_poll_retransmit;
+ ret->poll_pdu = poll_pdu;
+ ret->poll_byte = poll_byte;
+ ret->max_retx_threshold = max_retx_threshold;
+
+ return (rlc_entity_t *)ret;
+}
+
+rlc_entity_t *new_rlc_entity_um(
+ int rx_maxsize,
+ int tx_maxsize,
+ void (*deliver_sdu)(void *deliver_sdu_data, struct rlc_entity_t *entity,
+ char *buf, int size),
+ void *deliver_sdu_data,
+ int t_reordering,
+ int sn_field_length)
+{
+ rlc_entity_um_t *ret;
+
+ ret = calloc(1, sizeof(rlc_entity_um_t));
+ if (ret == NULL) {
+ LOG_E(RLC, "%s:%d:%s: out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ ret->common.recv_pdu = rlc_entity_um_recv_pdu;
+ ret->common.buffer_status = rlc_entity_um_buffer_status;
+ ret->common.generate_pdu = rlc_entity_um_generate_pdu;
+
+ ret->common.recv_sdu = rlc_entity_um_recv_sdu;
+
+ ret->common.set_time = rlc_entity_um_set_time;
+
+ ret->common.discard_sdu = rlc_entity_um_discard_sdu;
+
+ ret->common.reestablishment = rlc_entity_um_reestablishment;
+
+ ret->common.delete = rlc_entity_um_delete;
+
+ ret->common.deliver_sdu = deliver_sdu;
+ ret->common.deliver_sdu_data = deliver_sdu_data;
+
+ ret->sn_field_length = sn_field_length;
+ ret->rx_maxsize = rx_maxsize;
+ ret->tx_maxsize = tx_maxsize;
+ ret->t_reordering = t_reordering;
+
+ if (sn_field_length == 5)
+ ret->sn_modulus = 32;
+ else if (sn_field_length == 10)
+ ret->sn_modulus = 1024;
+ else {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ ret->window_size = ret->sn_modulus / 2;
+
+ return (rlc_entity_t *)ret;
+}
diff --git a/openair2/LAYER2/rlc_v2/rlc_entity.h b/openair2/LAYER2/rlc_v2/rlc_entity.h
new file mode 100644
index 0000000000000000000000000000000000000000..c9b35204f03e92d305dc0bba1b40e4d36bd8964e
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_entity.h
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#ifndef _RLC_ENTITY_H_
+#define _RLC_ENTITY_H_
+
+#include <stdint.h>
+
+#define SDU_MAX 16000 /* maximum PDCP SDU size is 8188, let's take more */
+
+typedef struct {
+ int status_size;
+ int tx_size;
+ int retx_size;
+} rlc_entity_buffer_status_t;
+
+typedef struct rlc_entity_t {
+ /* functions provided by the RLC module */
+ void (*recv_pdu)(struct rlc_entity_t *entity, char *buffer, int size);
+ rlc_entity_buffer_status_t (*buffer_status)(
+ struct rlc_entity_t *entity, int maxsize);
+ int (*generate_pdu)(struct rlc_entity_t *entity, char *buffer, int size);
+
+ void (*recv_sdu)(struct rlc_entity_t *entity, char *buffer, int size,
+ int sdu_id);
+
+ void (*set_time)(struct rlc_entity_t *entity, uint64_t now);
+
+ void (*discard_sdu)(struct rlc_entity_t *entity, int sdu_id);
+
+ void (*reestablishment)(struct rlc_entity_t *entity);
+
+ void (*delete)(struct rlc_entity_t *entity);
+
+ /* callbacks provided to the RLC module */
+ void (*deliver_sdu)(void *deliver_sdu_data, struct rlc_entity_t *entity,
+ char *buf, int size);
+ void *deliver_sdu_data;
+
+ void (*sdu_successful_delivery)(void *sdu_successful_delivery_data,
+ struct rlc_entity_t *entity,
+ int sdu_id);
+ void *sdu_successful_delivery_data;
+
+ void (*max_retx_reached)(void *max_retx_reached_data,
+ struct rlc_entity_t *entity);
+ void *max_retx_reached_data;
+} rlc_entity_t;
+
+rlc_entity_t *new_rlc_entity_am(
+ int rx_maxsize,
+ int tx_maxsize,
+ void (*deliver_sdu)(void *deliver_sdu_data, struct rlc_entity_t *entity,
+ char *buf, int size),
+ void *deliver_sdu_data,
+ void (*sdu_successful_delivery)(void *sdu_successful_delivery_data,
+ struct rlc_entity_t *entity,
+ int sdu_id),
+ void *sdu_successful_delivery_data,
+ void (*max_retx_reached)(void *max_retx_reached_data,
+ struct rlc_entity_t *entity),
+ void *max_retx_reached_data,
+ int t_reordering,
+ int t_status_prohibit,
+ int t_poll_retransmit,
+ int poll_pdu,
+ int poll_byte,
+ int max_retx_threshold);
+
+rlc_entity_t *new_rlc_entity_um(
+ int rx_maxsize,
+ int tx_maxsize,
+ void (*deliver_sdu)(void *deliver_sdu_data, struct rlc_entity_t *entity,
+ char *buf, int size),
+ void *deliver_sdu_data,
+ int t_reordering,
+ int sn_field_length);
+
+#endif /* _RLC_ENTITY_H_ */
diff --git a/openair2/LAYER2/rlc_v2/rlc_entity_am.c b/openair2/LAYER2/rlc_v2/rlc_entity_am.c
new file mode 100644
index 0000000000000000000000000000000000000000..b4f3d2f47c86508d628edd0c5468a4ac96269004
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_entity_am.c
@@ -0,0 +1,1700 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "rlc_entity_am.h"
+#include "rlc_pdu.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "LOG/log.h"
+
+/*************************************************************************/
+/* PDU RX functions */
+/*************************************************************************/
+
+static int modulus_rx(rlc_entity_am_t *entity, int a)
+{
+ /* as per 36.322 7.1, modulus base is vr(r) and modulus is 1024 for rx */
+ int r = a - entity->vr_r;
+ if (r < 0) r += 1024;
+ return r;
+}
+
+/* used in both RX and TX processing */
+static int modulus_tx(rlc_entity_am_t *entity, int a)
+{
+ /* as per 36.322 7.1, modulus base is vt(a) and modulus is 1024 for tx */
+ int r = a - entity->vt_a;
+ if (r < 0) r += 1024;
+ return r;
+}
+
+static int sn_in_recv_window(void *_entity, int sn)
+{
+ rlc_entity_am_t *entity = _entity;
+ int mod_sn = modulus_rx(entity, sn);
+ /* we simplify vr(r)<=sn<vr(mr). base is vr(r) and vr(mr) = vr(r) + 512 */
+ return mod_sn < 512;
+}
+
+static int sn_compare_rx(void *_entity, int a, int b)
+{
+ rlc_entity_am_t *entity = _entity;
+ return modulus_rx(entity, a) - modulus_rx(entity, b);
+}
+
+/* used in both RX and TX processing */
+static int sn_compare_tx(void *_entity, int a, int b)
+{
+ rlc_entity_am_t *entity = _entity;
+ return modulus_tx(entity, a) - modulus_tx(entity, b);
+}
+
+static int segment_already_received(rlc_entity_am_t *entity,
+ int sn, int so, int data_size)
+{
+ /* TODO: optimize */
+ rlc_rx_pdu_segment_t *l = entity->rx_list;
+
+ while (l != NULL) {
+ if (l->sn == sn && l->so <= so &&
+ l->so + l->size - l->data_offset >= so + data_size)
+ return 1;
+ l = l->next;
+ }
+
+ return 0;
+}
+
+static int rlc_am_segment_full(rlc_entity_am_t *entity, int sn)
+{
+ rlc_rx_pdu_segment_t *l = entity->rx_list;
+ int last_byte;
+ int new_last_byte;
+
+ last_byte = -1;
+ while (l != NULL) {
+ if (l->sn == sn)
+ break;
+ l = l->next;
+ }
+ while (l != NULL && l->sn == sn) {
+ if (l->so > last_byte + 1)
+ return 0;
+ if (l->is_last)
+ return 1;
+ new_last_byte = l->so + l->size - l->data_offset - 1;
+ if (new_last_byte > last_byte)
+ last_byte = new_last_byte;
+ l = l->next;
+ }
+ return 0;
+}
+
+/* return 1 if the new segment has some data to consume, 0 if not */
+static int rlc_am_reassemble_next_segment(rlc_am_reassemble_t *r)
+{
+ int rf;
+ int sn;
+
+ r->sdu_offset = r->start->data_offset;
+
+ rlc_pdu_decoder_init(&r->dec, r->start->data, r->start->size);
+
+ rlc_pdu_decoder_get_bits(&r->dec, 1); /* dc */
+ rf = rlc_pdu_decoder_get_bits(&r->dec, 1);
+ rlc_pdu_decoder_get_bits(&r->dec, 1); /* p */
+ r->fi = rlc_pdu_decoder_get_bits(&r->dec, 2);
+ r->e = rlc_pdu_decoder_get_bits(&r->dec, 1);
+ sn = rlc_pdu_decoder_get_bits(&r->dec, 10);
+ if (rf) {
+ rlc_pdu_decoder_get_bits(&r->dec, 1); /* lsf */
+ r->so = rlc_pdu_decoder_get_bits(&r->dec, 15);
+ } else {
+ r->so = 0;
+ }
+
+ if (r->e) {
+ r->e = rlc_pdu_decoder_get_bits(&r->dec, 1);
+ r->sdu_len = rlc_pdu_decoder_get_bits(&r->dec, 11);
+ } else
+ r->sdu_len = r->start->size - r->sdu_offset;
+
+ /* new sn: read starts from PDU byte 0 */
+ if (sn != r->sn) {
+ r->pdu_byte = 0;
+ r->sn = sn;
+ }
+
+ r->data_pos = r->start->data_offset + r->pdu_byte - r->so;
+
+ /* TODO: remove this check, it is useless, data has been validated before */
+ if (r->pdu_byte < r->so) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ /* if pdu_byte is not in [so .. so+len-1] then all bytes from this segment
+ * have already been consumed
+ */
+ if (r->pdu_byte >= r->so + r->start->size - r->start->data_offset)
+ return 0;
+
+ /* go to correct SDU */
+ while (r->pdu_byte >= r->so + (r->sdu_offset - r->start->data_offset) + r->sdu_len) {
+ r->sdu_offset += r->sdu_len;
+ if (r->e) {
+ r->e = rlc_pdu_decoder_get_bits(&r->dec, 1);
+ r->sdu_len = rlc_pdu_decoder_get_bits(&r->dec, 11);
+ } else {
+ r->sdu_len = r->start->size - r->sdu_offset;
+ }
+ }
+
+ return 1;
+}
+
+static void rlc_am_reassemble(rlc_entity_am_t *entity)
+{
+ rlc_am_reassemble_t *r = &entity->reassemble;
+
+ while (r->start != NULL) {
+ if (r->sdu_pos >= SDU_MAX) {
+ /* TODO: proper error handling (discard PDUs with current sn from
+ * reassembly queue? something else?)
+ */
+ LOG_E(RLC, "%s:%d:%s: bad RLC PDU\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ r->sdu[r->sdu_pos] = r->start->data[r->data_pos];
+ r->sdu_pos++;
+ r->data_pos++;
+ r->pdu_byte++;
+ if (r->data_pos == r->sdu_offset + r->sdu_len) {
+ /* all bytes of SDU are consumed, check if SDU is fully there.
+ * It is if the data pointer is not at the end of the PDU segment
+ * or if 'fi' & 1 == 0
+ */
+ if (r->data_pos != r->start->size ||
+ (r->fi & 1) == 0) {
+ /* SDU is full - deliver to higher layer */
+ entity->common.deliver_sdu(entity->common.deliver_sdu_data,
+ (rlc_entity_t *)entity,
+ r->sdu, r->sdu_pos);
+ r->sdu_pos = 0;
+ }
+ if (r->data_pos != r->start->size) {
+ /* not at the end, process next SDU */
+ r->sdu_offset += r->sdu_len;
+ if (r->e) {
+ r->e = rlc_pdu_decoder_get_bits(&r->dec, 1);
+ r->sdu_len = rlc_pdu_decoder_get_bits(&r->dec, 11);
+ } else
+ r->sdu_len = r->start->size - r->sdu_offset;
+ } else {
+ /* all bytes are consumend, go to next segment not already fully
+ * processed, if any
+ */
+ do {
+ rlc_rx_pdu_segment_t *e = r->start;
+ entity->rx_size -= e->size;
+ r->start = r->start->next;
+ rlc_rx_free_pdu_segment(e);
+ } while (r->start != NULL && !rlc_am_reassemble_next_segment(r));
+ }
+ }
+ }
+}
+
+static void rlc_am_reception_actions(rlc_entity_am_t *entity,
+ rlc_rx_pdu_segment_t *pdu_segment)
+{
+ int x = pdu_segment->sn;
+ int vr_ms;
+ int vr_r;
+
+ if (modulus_rx(entity, x) >= modulus_rx(entity, entity->vr_h))
+ entity->vr_h = (x + 1) % 1024;
+
+ vr_ms = entity->vr_ms;
+ while (rlc_am_segment_full(entity, vr_ms))
+ vr_ms = (vr_ms + 1) % 1024;
+ entity->vr_ms = vr_ms;
+
+ if (x == entity->vr_r) {
+ vr_r = entity->vr_r;
+ while (rlc_am_segment_full(entity, vr_r)) {
+ /* move segments with sn=vr(r) from rx list to end of reassembly list */
+ while (entity->rx_list != NULL && entity->rx_list->sn == vr_r) {
+ rlc_rx_pdu_segment_t *e = entity->rx_list;
+ entity->rx_list = e->next;
+ e->next = NULL;
+ if (entity->reassemble.start == NULL) {
+ entity->reassemble.start = e;
+ /* the list was empty, we need to init decoder */
+ entity->reassemble.sn = -1;
+ if (!rlc_am_reassemble_next_segment(&entity->reassemble)) {
+ /* TODO: proper error recovery (or remove the test, it should not happen) */
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ } else {
+ entity->reassemble.end->next = e;
+ }
+ entity->reassemble.end = e;
+ }
+
+ /* update vr_r */
+ vr_r = (vr_r + 1) % 1024;
+ }
+ entity->vr_r = vr_r;
+ }
+
+ rlc_am_reassemble(entity);
+
+ if (entity->t_reordering_start) {
+ int vr_x = entity->vr_x;
+ if (vr_x < entity->vr_r) vr_x += 1024;
+ if (vr_x == entity->vr_r || vr_x > entity->vr_r + 512)
+ entity->t_reordering_start = 0;
+ }
+
+ if (entity->t_reordering_start == 0) {
+ if (sn_compare_rx(entity, entity->vr_h, entity->vr_r) > 0) {
+ entity->t_reordering_start = entity->t_current;
+ entity->vr_x = entity->vr_h;
+ }
+ }
+}
+
+static void process_received_ack(rlc_entity_am_t *entity, int sn)
+{
+ rlc_tx_pdu_segment_t head;
+ rlc_tx_pdu_segment_t *cur;
+ rlc_tx_pdu_segment_t *prev;
+
+ /* put all PDUs from wait and retransmit lists with SN < 'sn' to ack_list */
+
+ /* process wait list */
+ head.next = entity->wait_list;
+ prev = &head;
+ cur = entity->wait_list;
+ while (cur != NULL) {
+ if (sn_compare_tx(entity, cur->sn, sn) < 0) {
+ /* remove from wait list */
+ prev->next = cur->next;
+ /* put the PDU in the ack list */
+ entity->ack_list = rlc_tx_pdu_list_add(sn_compare_tx, entity,
+ entity->ack_list, cur);
+ cur = prev->next;
+ } else {
+ prev = cur;
+ cur = cur->next;
+ }
+ }
+ entity->wait_list = head.next;
+
+ /* process retransmit list */
+ head.next = entity->retransmit_list;
+ prev = &head;
+ cur = entity->retransmit_list;
+ while (cur != NULL) {
+ if (sn_compare_tx(entity, cur->sn, sn) < 0) {
+ /* dec. retx_count in case we put this segment back in retransmit list
+ * in 'process_received_nack'
+ */
+ cur->retx_count--;
+ /* remove from retransmit list */
+ prev->next = cur->next;
+ /* put the PDU in the ack list */
+ entity->ack_list = rlc_tx_pdu_list_add(sn_compare_tx, entity,
+ entity->ack_list, cur);
+ cur = prev->next;
+ } else {
+ prev = cur;
+ cur = cur->next;
+ }
+ }
+ entity->retransmit_list = head.next;
+
+}
+
+static void consider_retransmission(rlc_entity_am_t *entity,
+ rlc_tx_pdu_segment_t *cur)
+{
+ cur->retx_count++;
+
+ /* let's report max RETX reached for all retx_count >= max_retx_threshold
+ * (specs say to report if retx_count == max_retx_threshold).
+ * Upper layers should react (radio link failure), so no big deal actually.
+ */
+ if (cur->retx_count >= entity->max_retx_threshold) {
+ entity->common.max_retx_reached(entity->common.max_retx_reached_data,
+ (rlc_entity_t *)entity);
+ }
+
+ /* let's put in retransmit list even if we are over max_retx_threshold.
+ * upper layers should deal with this condition, internally it's better
+ * for the RLC code to keep going with this segment (we only remove
+ * a segment that was ACKed)
+ */
+ entity->retransmit_list = rlc_tx_pdu_list_add(sn_compare_tx, entity,
+ entity->retransmit_list, cur);
+}
+
+static int so_overlap(int s1, int e1, int s2, int e2)
+{
+ if (s1 < s2) {
+ if (e1 == -1 || e1 >= s2)
+ return 1;
+ return 0;
+ }
+ if (e2 == -1 || s1 <= e2)
+ return 1;
+ return 0;
+}
+
+static void process_received_nack(rlc_entity_am_t *entity, int sn,
+ int so_start, int so_end)
+{
+ /* put all PDU segments with SN == 'sn' and with an overlapping so start/end
+ * to the retransmit list
+ * source lists are ack list and wait list.
+ * Not sure if we should consider wait list, isn't the other end supposed
+ * to only NACK SNs lower than the ACK SN sent in the status PDU, in which
+ * case all potential PDU segments should all be in ack list when calling
+ * the current function? in doubt let's accept anything and thus process
+ * also wait list.
+ */
+ rlc_tx_pdu_segment_t head;
+ rlc_tx_pdu_segment_t *cur;
+ rlc_tx_pdu_segment_t *prev;
+
+ /* check that VT(A) <= sn < VT(S) */
+ if (!(sn_compare_tx(entity, entity->vt_a, sn) <= 0 &&
+ sn_compare_tx(entity, sn, entity->vt_s) < 0))
+ return;
+
+ /* process wait list */
+ head.next = entity->wait_list;
+ prev = &head;
+ cur = entity->wait_list;
+ while (cur != NULL) {
+ if (cur->sn == sn &&
+ so_overlap(so_start, so_end, cur->so, cur->so + cur->data_size - 1)) {
+ /* remove from wait list */
+ prev->next = cur->next;
+ /* consider the PDU segment for retransmission */
+ consider_retransmission(entity, cur);
+ cur = prev->next;
+ } else {
+ prev = cur;
+ cur = cur->next;
+ }
+ }
+ entity->wait_list = head.next;
+
+ /* process ack list */
+ head.next = entity->ack_list;
+ prev = &head;
+ cur = entity->ack_list;
+ while (cur != NULL) {
+ if (cur->sn == sn &&
+ so_overlap(so_start, so_end, cur->so, cur->so + cur->data_size - 1)) {
+ /* remove from ack list */
+ prev->next = cur->next;
+ /* consider the PDU segment for retransmission */
+ consider_retransmission(entity, cur);
+ cur = prev->next;
+ } else {
+ prev = cur;
+ cur = cur->next;
+ }
+ }
+ entity->ack_list = head.next;
+}
+
+int tx_pdu_in_ack_list_full(rlc_tx_pdu_segment_t *pdu)
+{
+ int sn = pdu->sn;
+ int last_byte = -1;
+ int new_last_byte;
+ int is_last_seen = 0;
+
+ while (pdu != NULL && pdu->sn == sn) {
+ if (pdu->so > last_byte + 1) return 0;
+ if (pdu->is_last)
+ is_last_seen = 1;
+ new_last_byte = pdu->so + pdu->data_size - 1;
+ if (new_last_byte > last_byte)
+ last_byte = new_last_byte;
+ pdu = pdu->next;
+ }
+
+ return is_last_seen == 1;
+}
+
+int tx_pdu_in_ack_list_size(rlc_tx_pdu_segment_t *pdu)
+{
+ int sn = pdu->sn;
+ int ret = 0;
+
+ while (pdu != NULL && pdu->sn == sn) {
+ ret += pdu->data_size;
+ pdu = pdu->next;
+ }
+
+ return ret;
+}
+
+void ack_sdu_bytes(rlc_sdu_t *start, int start_byte, int sdu_size)
+{
+ rlc_sdu_t *cur = start;
+ int remaining_size = sdu_size;
+
+ while (remaining_size) {
+ int cursize = cur->size - start_byte;
+ if (cursize > remaining_size)
+ cursize = remaining_size;
+ cur->acked_bytes += cursize;
+ remaining_size -= cursize;
+ /* start_byte is only meaningful for the 1st SDU, then it is 0 */
+ start_byte = 0;
+ cur = cur->next;
+ }
+}
+
+rlc_tx_pdu_segment_t *tx_list_remove_sn(rlc_tx_pdu_segment_t *list, int sn)
+{
+ rlc_tx_pdu_segment_t head;
+ rlc_tx_pdu_segment_t *cur;
+ rlc_tx_pdu_segment_t *prev;
+
+ head.next = list;
+ cur = list;
+ prev = &head;
+
+ while (cur != NULL) {
+ if (cur->sn == sn) {
+ prev->next = cur->next;
+ rlc_tx_free_pdu(cur);
+ cur = prev->next;
+ } else {
+ prev = cur;
+ cur = cur->next;
+ }
+ }
+
+ return head.next;
+}
+
+void cleanup_sdu_list(rlc_entity_am_t *entity)
+{
+ rlc_sdu_t head;
+ rlc_sdu_t *cur;
+ rlc_sdu_t *prev;
+
+ /* remove fully acked SDUs, indicate successful delivery to upper layer */
+ head.next = entity->tx_list;
+ cur = entity->tx_list;
+ prev = &head;
+
+ while (cur != NULL) {
+ if (cur->acked_bytes == cur->size) {
+ prev->next = cur->next;
+ entity->tx_size -= cur->size;
+ entity->common.sdu_successful_delivery(
+ entity->common.sdu_successful_delivery_data,
+ (rlc_entity_t *)entity, cur->upper_layer_id);
+ rlc_free_sdu(cur);
+ entity->tx_end = prev;
+ cur = prev->next;
+ } else {
+ entity->tx_end = cur;
+ prev = cur;
+ cur = cur->next;
+ }
+ }
+
+ entity->tx_list = head.next;
+
+ /* if tx_end == head then it means that the list is now empty */
+ if (entity->tx_end == &head)
+ entity->tx_end = NULL;
+}
+
+static void finalize_ack_nack_processing(rlc_entity_am_t *entity)
+{
+ int sn;
+ rlc_tx_pdu_segment_t *cur = entity->ack_list;
+ int pdu_size;
+
+ if (cur == NULL)
+ return;
+
+ /* Remove full PDUs and ack the SDU bytes they cover. Start from SN == VT(A)
+ * and process increasing SNs until end of list or missing ACK or PDU not
+ * fully ACKed.
+ */
+ while (cur != NULL && cur->sn == entity->vt_a &&
+ tx_pdu_in_ack_list_full(cur)) {
+ sn = cur->sn;
+ entity->vt_a = (entity->vt_a + 1) % 1024;
+ pdu_size = tx_pdu_in_ack_list_size(cur);
+ ack_sdu_bytes(cur->start_sdu, cur->sdu_start_byte, pdu_size);
+ while (cur != NULL && cur->sn == sn)
+ cur = cur->next;
+ entity->ack_list = tx_list_remove_sn(entity->ack_list, sn);
+ }
+
+ cleanup_sdu_list(entity);
+}
+
+void rlc_entity_am_recv_pdu(rlc_entity_t *_entity, char *buffer, int size)
+{
+#define R(d) do { if (rlc_pdu_decoder_in_error(&d)) goto err; } while (0)
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ rlc_pdu_decoder_t decoder;
+ rlc_pdu_decoder_t data_decoder;
+ rlc_pdu_decoder_t control_decoder;
+
+ int dc;
+ int rf;
+ int p = 0;
+ int fi;
+ int e;
+ int sn;
+ int lsf;
+ int so;
+
+ int cpt;
+ int e1;
+ int e2;
+ int ack_sn;
+ int nack_sn;
+ int so_start;
+ int so_end;
+ int control_e1;
+ int control_e2;
+
+ int data_e;
+ int data_li;
+
+ int packet_count;
+ int data_size;
+ int data_start;
+ int indicated_data_size;
+
+ rlc_rx_pdu_segment_t *pdu_segment;
+
+ rlc_pdu_decoder_init(&decoder, buffer, size);
+ dc = rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+ if (dc == 0) goto control;
+
+ /* data PDU */
+ rf = rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+ p = rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+ fi = rlc_pdu_decoder_get_bits(&decoder, 2); R(decoder);
+ e = rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+ sn = rlc_pdu_decoder_get_bits(&decoder, 10); R(decoder);
+
+ /* dicard PDU if rx buffer is full */
+ if (entity->rx_size + size > entity->rx_maxsize) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, RX buffer full\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ goto discard;
+ }
+
+ if (!sn_in_recv_window(entity, sn)) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, sn out of window (sn %d vr_r %d)\n",
+ __FILE__, __LINE__, __FUNCTION__,
+ sn, entity->vr_r);
+ goto discard;
+ }
+
+ if (rf) {
+ lsf = rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+ so = rlc_pdu_decoder_get_bits(&decoder, 15); R(decoder);
+ } else {
+ lsf = 1;
+ so = 0;
+ }
+
+ packet_count = 1;
+
+ /* go to start of data */
+ indicated_data_size = 0;
+ data_decoder = decoder;
+ data_e = e;
+ while (data_e) {
+ data_e = rlc_pdu_decoder_get_bits(&data_decoder, 1); R(data_decoder);
+ data_li = rlc_pdu_decoder_get_bits(&data_decoder, 11); R(data_decoder);
+ if (data_li == 0) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, li == 0\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ goto discard;
+ }
+ indicated_data_size += data_li;
+ packet_count++;
+ }
+ rlc_pdu_decoder_align(&data_decoder);
+
+ data_start = data_decoder.byte;
+ data_size = size - data_start;
+
+ if (data_size <= 0) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, wrong data size (sum of LI %d data size %d)\n",
+ __FILE__, __LINE__, __FUNCTION__,
+ indicated_data_size, data_size);
+ goto discard;
+ }
+ if (indicated_data_size >= data_size) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, bad LIs (sum of LI %d data size %d)\n",
+ __FILE__, __LINE__, __FUNCTION__,
+ indicated_data_size, data_size);
+ goto discard;
+ }
+
+ /* discard segment if all the bytes of the segment are already there */
+ if (segment_already_received(entity, sn, so, data_size)) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, already received\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ goto discard;
+ }
+
+ char *fi_str[] = {
+ "first byte: YES last byte: YES",
+ "first byte: YES last byte: NO",
+ "first byte: NO last byte: YES",
+ "first byte: NO last byte: NO",
+ };
+
+ LOG_D(RLC, "found %d packets, data size %d data start %d [fi %d %s] (sn %d) (p %d)\n",
+ packet_count, data_size, data_decoder.byte, fi, fi_str[fi], sn, p);
+
+ /* put in pdu reception list */
+ entity->rx_size += size;
+ pdu_segment = rlc_rx_new_pdu_segment(sn, so, size, lsf, buffer, data_start);
+ entity->rx_list = rlc_rx_pdu_segment_list_add(sn_compare_rx, entity,
+ entity->rx_list, pdu_segment);
+
+ /* do reception actions (36.322 5.1.3.2.3) */
+ rlc_am_reception_actions(entity, pdu_segment);
+
+ if (p) {
+ /* 36.322 5.2.3 says status triggering should be delayed
+ * until x < VR(MS) or x >= VR(MR). This is not clear (what
+ * is x then? we keep the same?). So let's trigger no matter what.
+ */
+ int vr_mr = (entity->vr_r + 512) % 1024;
+ entity->status_triggered = 1;
+ if (!(sn_compare_rx(entity, sn, entity->vr_ms) < 0 ||
+ sn_compare_rx(entity, sn, vr_mr) >= 0)) {
+ LOG_D(RLC, "%s:%d:%s: warning: STATUS trigger should be delayed, according to specs\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ }
+ }
+
+ return;
+
+control:
+ cpt = rlc_pdu_decoder_get_bits(&decoder, 3); R(decoder);
+ if (cpt != 0) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, CPT not 0 (%d)\n",
+ __FILE__, __LINE__, __FUNCTION__, cpt);
+ goto discard;
+ }
+ ack_sn = rlc_pdu_decoder_get_bits(&decoder, 10); R(decoder);
+ e1 = rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+
+ /* let's try to parse the control PDU once to check consistency */
+ control_decoder = decoder;
+ control_e1 = e1;
+ while (control_e1) {
+ rlc_pdu_decoder_get_bits(&control_decoder, 10); R(control_decoder); /* NACK_SN */
+ control_e1 = rlc_pdu_decoder_get_bits(&control_decoder, 1); R(control_decoder);
+ control_e2 = rlc_pdu_decoder_get_bits(&control_decoder, 1); R(control_decoder);
+ if (control_e2) {
+ rlc_pdu_decoder_get_bits(&control_decoder, 15); R(control_decoder); /* SOstart */
+ rlc_pdu_decoder_get_bits(&control_decoder, 15); R(control_decoder); /* SOend */
+ }
+ }
+
+ /* 36.322 5.2.2.2 says to stop t_poll_retransmit if a ACK or NACK is
+ * received for the SN 'poll_sn'
+ */
+ if (sn_compare_tx(entity, entity->poll_sn, ack_sn) < 0)
+ entity->t_poll_retransmit_start = 0;
+
+ /* at this point, accept the PDU even if the actual values
+ * may be incorrect (eg. if so_start > so_end)
+ */
+ process_received_ack(entity, ack_sn);
+
+ while (e1) {
+ nack_sn = rlc_pdu_decoder_get_bits(&decoder, 10); R(decoder);
+ e1 = rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+ e2 = rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+ if (e2) {
+ so_start = rlc_pdu_decoder_get_bits(&decoder, 15); R(decoder);
+ so_end = rlc_pdu_decoder_get_bits(&decoder, 15); R(decoder);
+ if (so_end < so_start) {
+ LOG_W(RLC, "%s:%d:%s: warning, bad so start/end, NACK the whole PDU (sn %d)\n",
+ __FILE__, __LINE__, __FUNCTION__, nack_sn);
+ so_start = 0;
+ so_end = -1;
+ }
+ /* special value 0x7fff indicates 'all bytes to the end' */
+ if (so_end == 0x7fff)
+ so_end = -1;
+ } else {
+ so_start = 0;
+ so_end = -1;
+ }
+ process_received_nack(entity, nack_sn, so_start, so_end);
+
+ /* 36.322 5.2.2.2 says to stop t_poll_retransmit if a ACK or NACK is
+ * received for the SN 'poll_sn'
+ */
+ if (entity->poll_sn == nack_sn)
+ entity->t_poll_retransmit_start = 0;
+ }
+
+ finalize_ack_nack_processing(entity);
+
+ return;
+
+err:
+ LOG_W(RLC, "%s:%d:%s: error decoding PDU, discarding\n", __FILE__, __LINE__, __FUNCTION__);
+ goto discard;
+
+discard:
+ if (p)
+ entity->status_triggered = 1;
+
+#undef R
+}
+
+/*************************************************************************/
+/* TX functions */
+/*************************************************************************/
+
+static int pdu_size(rlc_entity_am_t *entity, rlc_tx_pdu_segment_t *pdu)
+{
+ int header_size;
+ int sdu_count;
+ int data_size;
+ int li_bits;
+ rlc_sdu_t *sdu;
+
+ header_size = 2;
+ if (pdu->is_segment)
+ header_size += 2;
+
+ data_size = pdu->data_size;
+
+ sdu = pdu->start_sdu;
+
+ sdu_count = 1;
+ data_size -= sdu->size - pdu->sdu_start_byte;
+ sdu = sdu->next;
+
+ while (data_size > 0) {
+ sdu_count++;
+ data_size -= sdu->size;
+ sdu = sdu->next;
+ }
+
+ li_bits = 12 * (sdu_count - 1);
+ header_size += (li_bits + 7) / 8;
+
+ return header_size + pdu->data_size;
+}
+
+static int header_size(int sdu_count)
+{
+ int bits = 16 + 12 * (sdu_count - 1);
+ /* padding if we have to */
+ return (bits + 7) / 8;
+}
+
+typedef struct {
+ int sdu_count;
+ int data_size;
+ int header_size;
+} tx_pdu_size_t;
+
+static tx_pdu_size_t compute_new_pdu_size(rlc_entity_am_t *entity, int maxsize)
+{
+ tx_pdu_size_t ret;
+ int sdu_count;
+ int sdu_size;
+ int pdu_data_size;
+ rlc_sdu_t *sdu;
+
+ int vt_ms = (entity->vt_a + 512) % 1024;
+
+ ret.sdu_count = 0;
+ ret.data_size = 0;
+ ret.header_size = 0;
+
+ /* sn out of window? nothing to do */
+ if (!(sn_compare_tx(entity, entity->vt_s, entity->vt_a) >= 0 &&
+ sn_compare_tx(entity, entity->vt_s, vt_ms) < 0))
+ return ret;
+
+ /* TX PDU - let's make the biggest PDU we can with the SDUs we have */
+ sdu_count = 0;
+ pdu_data_size = 0;
+ sdu = entity->tx_list;
+ while (sdu != NULL) {
+ /* include SDU only if it has not been fully included in PDUs already */
+ if (sdu->next_byte != sdu->size) {
+ int new_header_size = header_size(sdu_count + 1);
+ /* if we cannot put new header + at least 1 byte of data then over */
+ if (new_header_size + pdu_data_size + 1 > maxsize)
+ break;
+ sdu_count++;
+ /* only include the bytes of this SDU not included in PDUs already */
+ sdu_size = sdu->size - sdu->next_byte;
+ /* don't feed more than 'maxsize' bytes */
+ if (new_header_size + pdu_data_size + sdu_size > maxsize)
+ sdu_size = maxsize - new_header_size - pdu_data_size;
+ pdu_data_size += sdu_size;
+ /* if we put more than 2^11-1 bytes then the LI field cannot be used,
+ * so this is the last SDU we can put
+ */
+ if (sdu_size > 2047)
+ break;
+ }
+ sdu = sdu->next;
+ }
+
+ if (sdu_count) {
+ ret.sdu_count = sdu_count;
+ ret.data_size = pdu_data_size;
+ ret.header_size = header_size(sdu_count);
+ }
+
+ return ret;
+}
+
+static int status_size(rlc_entity_am_t *entity, int maxsize)
+{
+ /* let's count bits */
+ int bits = 15; /* minimum size is 15 (header+ack_sn+e1) */
+ int sn;
+
+ maxsize *= 8;
+
+ if (bits > maxsize) {
+ LOG_W(RLC, "%s:%d:%s: warning: cannot generate status PDU, not enough room\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ return 0;
+ }
+
+ /* each NACK adds 12 bits */
+ sn = entity->vr_r;
+ while (bits + 12 <= maxsize && sn_compare_rx(entity, sn, entity->vr_ms) < 0) {
+ if (!(rlc_am_segment_full(entity, sn)))
+ bits += 12;
+ sn = (sn + 1) % 1024;
+ }
+
+ return (bits + 7) / 8;
+}
+
+static int generate_status(rlc_entity_am_t *entity, char *buffer, int size)
+{
+ /* let's count bits */
+ int bits = 15; /* minimum size is 15 (header+ack_sn+e1) */
+ int sn;
+ rlc_pdu_encoder_t encoder;
+ int has_nack = 0;
+ int ack;
+
+ rlc_pdu_encoder_init(&encoder, buffer, size);
+
+ size *= 8;
+
+ if (bits > size) {
+ LOG_W(RLC, "%s:%d:%s: warning: cannot generate status PDU, not enough room\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ return 0;
+ }
+
+ /* header */
+ rlc_pdu_encoder_put_bits(&encoder, 0, 1); /* D/C */
+ rlc_pdu_encoder_put_bits(&encoder, 0, 3); /* CPT */
+
+ /* reserve room for ACK (it will be set after putting the NACKs) */
+ rlc_pdu_encoder_put_bits(&encoder, 0, 10);
+
+ /* at this point, ACK is VR(R) */
+ ack = entity->vr_r;
+
+ /* each NACK adds 12 bits */
+ sn = entity->vr_r;
+ while (bits + 12 <= size && sn_compare_rx(entity, sn, entity->vr_ms) < 0) {
+ if (!(rlc_am_segment_full(entity, sn))) {
+ /* put previous e1 (is 1) */
+ rlc_pdu_encoder_put_bits(&encoder, 1, 1);
+ /* if previous was NACK, put previous e2 (0, we don't do 'so' thing) */
+ if (has_nack)
+ rlc_pdu_encoder_put_bits(&encoder, 0, 1);
+ /* put NACKed sn */
+ rlc_pdu_encoder_put_bits(&encoder, sn, 10);
+ has_nack = 1;
+ bits += 12;
+ } else {
+ /* this sn is full and we put all NACKs before it, use it for ACK */
+ ack = (sn + 1) % 1024;
+ }
+ sn = (sn + 1) % 1024;
+ }
+
+ /* go to highest full sn+1 for ACK, VR(MS) is the limit */
+ while (sn_compare_rx(entity, sn, entity->vr_ms) < 0 &&
+ rlc_am_segment_full(entity, sn)) {
+ ack = (sn + 1) % 1024;
+ sn = (sn + 1) % 1024;
+ }
+
+ /* at this point, if last put was NACK then put 2 bits else put 1 bit */
+ if (has_nack)
+ rlc_pdu_encoder_put_bits(&encoder, 0, 2);
+ else
+ rlc_pdu_encoder_put_bits(&encoder, 0, 1);
+
+ rlc_pdu_encoder_align(&encoder);
+
+ /* let's put the ACK */
+ buffer[0] |= ack >> 6;
+ buffer[1] |= (ack & 0x3f) << 2;
+
+ /* reset the trigger */
+ entity->status_triggered = 0;
+
+ /* start t_status_prohibit */
+ entity->t_status_prohibit_start = entity->t_current;
+
+ return encoder.byte;
+}
+
+int transmission_buffer_empty(rlc_entity_am_t *entity)
+{
+ rlc_sdu_t *sdu;
+
+ /* is transmission buffer empty? */
+ sdu = entity->tx_list;
+ while (sdu != NULL) {
+ if (sdu->next_byte != sdu->size)
+ return 0;
+ sdu = sdu->next;
+ }
+ return 1;
+}
+
+int check_poll_after_pdu_assembly(rlc_entity_am_t *entity)
+{
+ int retransmission_buffer_empty;
+ int window_stalling;
+ int vt_ms;
+
+ /* is retransmission buffer empty? */
+ if (entity->retransmit_list == NULL)
+ retransmission_buffer_empty = 1;
+ else
+ retransmission_buffer_empty = 0;
+
+ /* is window stalling? */
+ vt_ms = (entity->vt_a + 512) % 1024;
+ if (!(sn_compare_tx(entity, entity->vt_s, entity->vt_a) >= 0 &&
+ sn_compare_tx(entity, entity->vt_s, vt_ms) < 0))
+ window_stalling = 1;
+ else
+ window_stalling = 0;
+
+ return (transmission_buffer_empty(entity) && retransmission_buffer_empty) ||
+ window_stalling;
+}
+
+void include_poll(rlc_entity_am_t *entity, char *buffer)
+{
+ /* set the P bit to 1 */
+ buffer[0] |= 0x20;
+
+ entity->pdu_without_poll = 0;
+ entity->byte_without_poll = 0;
+
+ /* set POLL_SN to VT(S) - 1 */
+ entity->poll_sn = (entity->vt_s + 1023) % 1024;
+
+ /* start t_poll_retransmit */
+ entity->t_poll_retransmit_start = entity->t_current;
+}
+
+static int serialize_pdu(rlc_entity_am_t *entity, char *buffer, int bufsize,
+ rlc_tx_pdu_segment_t *pdu, int p)
+{
+ int first_sdu_full;
+ int last_sdu_full;
+ int sdu_next_byte;
+ rlc_sdu_t *sdu;
+ int i;
+ int cursize;
+ rlc_pdu_encoder_t encoder;
+ int fi;
+ int e;
+ int li;
+ char *out;
+ int outpos;
+ int sdu_count;
+ int header_size;
+ int sdu_start_byte;
+
+ first_sdu_full = pdu->sdu_start_byte == 0;
+
+ /* is last SDU full? (and also compute sdu_count) */
+ last_sdu_full = 1;
+ sdu = pdu->start_sdu;
+ sdu_next_byte = pdu->sdu_start_byte;
+ cursize = 0;
+ sdu_count = 0;
+ while (cursize != pdu->data_size) {
+ int sdu_size = sdu->size - sdu_next_byte;
+ sdu_count++;
+ if (cursize + sdu_size > pdu->data_size) {
+ last_sdu_full = 0;
+ break;
+ }
+ cursize += sdu_size;
+ sdu = sdu->next;
+ sdu_next_byte = 0;
+ }
+
+ /* generate header */
+ rlc_pdu_encoder_init(&encoder, buffer, bufsize);
+
+ rlc_pdu_encoder_put_bits(&encoder, 1, 1); /* D/C: 1 = data */
+ rlc_pdu_encoder_put_bits(&encoder, pdu->is_segment, 1); /* RF */
+ rlc_pdu_encoder_put_bits(&encoder, 0, 1); /* P: reserve, set later */
+
+ fi = 0;
+ if (!first_sdu_full)
+ fi |= 0x02;
+ if (!last_sdu_full)
+ fi |= 0x01;
+ rlc_pdu_encoder_put_bits(&encoder, fi, 2); /* FI */
+
+ /* to understand the logic for Es and LIs:
+ * If we have:
+ * 1 SDU: E=0
+ *
+ * 2 SDUs: E=1
+ * then: E=0 LI(sdu[0])
+ *
+ * 3 SDUs: E=1
+ * then: E=1 LI(sdu[0])
+ * then: E=0 LI(sdu[1])
+ *
+ * 4 SDUs: E=1
+ * then: E=1 LI(sdu[0])
+ * then: E=1 LI(sdu[1])
+ * then: E=0 LI(sdu[2])
+ */
+ if (sdu_count >= 2)
+ e = 1;
+ else
+ e = 0;
+ rlc_pdu_encoder_put_bits(&encoder, e, 1); /* E */
+
+ rlc_pdu_encoder_put_bits(&encoder, pdu->sn, 10); /* SN */
+
+ if (pdu->is_segment) {
+ rlc_pdu_encoder_put_bits(&encoder, pdu->is_last, 1); /* LSF */
+ rlc_pdu_encoder_put_bits(&encoder, pdu->so, 15); /* SO */
+ }
+
+ /* put LIs */
+ sdu = pdu->start_sdu;
+ /* first SDU */
+ li = sdu->size - pdu->sdu_start_byte;
+ /* put E+LI only if at least 2 SDUs */
+ if (sdu_count >= 2) {
+ /* E is 1 if at least 3 SDUs */
+ if (sdu_count >= 3)
+ e = 1;
+ else
+ e = 0;
+ rlc_pdu_encoder_put_bits(&encoder, e, 1); /* E */
+ rlc_pdu_encoder_put_bits(&encoder, li, 11); /* LI */
+ }
+ /* next SDUs, but not the last (no LI for the last) */
+ sdu = sdu->next;
+ for (i = 2; i < sdu_count; i++, sdu = sdu->next) {
+ if (i != sdu_count - 1)
+ e = 1;
+ else
+ e = 0;
+ li = sdu->size;
+ rlc_pdu_encoder_put_bits(&encoder, e, 1); /* E */
+ rlc_pdu_encoder_put_bits(&encoder, li, 11); /* LI */
+ }
+
+ rlc_pdu_encoder_align(&encoder);
+
+ header_size = encoder.byte;
+
+ /* generate data */
+ out = buffer + header_size;
+ sdu = pdu->start_sdu;
+ sdu_start_byte = pdu->sdu_start_byte;
+ outpos = 0;
+ for (i = 0; i < sdu_count; i++, sdu = sdu->next) {
+ li = sdu->size - sdu_start_byte;
+ if (outpos + li >= pdu->data_size)
+ li = pdu->data_size - outpos;
+ memcpy(out+outpos, sdu->data + sdu_start_byte, li);
+ outpos += li;
+ sdu_start_byte = 0;
+ }
+
+ if (p)
+ include_poll(entity, buffer);
+
+ return header_size + pdu->data_size;
+}
+
+static int generate_tx_pdu(rlc_entity_am_t *entity, char *buffer, int bufsize)
+{
+ int vt_ms;
+ tx_pdu_size_t pdu_size;
+ rlc_sdu_t *sdu;
+ int i;
+ int cursize;
+ int p;
+ rlc_tx_pdu_segment_t *pdu;
+
+ /* sn out of window? do nothing */
+ vt_ms = (entity->vt_a + 512) % 1024;
+ if (!(sn_compare_tx(entity, entity->vt_s, entity->vt_a) >= 0 &&
+ sn_compare_tx(entity, entity->vt_s, vt_ms) < 0))
+ return 0;
+
+ pdu_size = compute_new_pdu_size(entity, bufsize);
+ if (pdu_size.sdu_count == 0)
+ return 0;
+
+ pdu = rlc_tx_new_pdu();
+
+ pdu->sn = entity->vt_s;
+ entity->vt_s = (entity->vt_s + 1) % 1024;
+
+ /* go to first SDU (skip those already fully processed) */
+ sdu = entity->tx_list;
+ while (sdu->next_byte == sdu->size)
+ sdu = sdu->next;
+
+ pdu->start_sdu = sdu;
+
+ pdu->sdu_start_byte = sdu->next_byte;
+
+ pdu->so = 0;
+ pdu->is_segment = 0;
+ pdu->is_last = 1;
+ /* to conform to specs' logic, put -1 (specs say "for 1st retransmission
+ * put 0 otherwise increase", let's put -1 and always increase when the
+ * segment goes to retransmit list)
+ */
+ pdu->retx_count = -1;
+
+ /* reserve SDU bytes */
+ cursize = 0;
+ for (i = 0; i < pdu_size.sdu_count; i++, sdu = sdu->next) {
+ int sdu_size = sdu->size - sdu->next_byte;
+ if (cursize + sdu_size > pdu_size.data_size)
+ sdu_size = pdu_size.data_size - cursize;
+ sdu->next_byte += sdu_size;
+ cursize += sdu_size;
+ }
+
+ pdu->data_size = cursize;
+
+ /* put PDU at the end of the wait list */
+ entity->wait_list = rlc_tx_pdu_list_append(entity->wait_list, pdu);
+
+ /* polling actions for a new PDU */
+ entity->pdu_without_poll++;
+ entity->byte_without_poll += pdu_size.data_size;
+ if ((entity->poll_pdu != -1 &&
+ entity->pdu_without_poll >= entity->poll_pdu) ||
+ (entity->poll_byte != -1 &&
+ entity->byte_without_poll >= entity->poll_byte))
+ p = 1;
+ else
+ p = check_poll_after_pdu_assembly(entity);
+
+ if (entity->force_poll) {
+ p = 1;
+ entity->force_poll = 0;
+ }
+
+ return serialize_pdu(entity, buffer, bufsize, pdu, p);
+}
+
+static void resegment(rlc_tx_pdu_segment_t *pdu, int size)
+{
+ rlc_tx_pdu_segment_t *new_pdu;
+ rlc_sdu_t *sdu;
+ int sdu_count;
+ int pdu_header_size;
+ int pdu_data_size;
+ int sdu_pos;
+ int sdu_bytes_to_take;
+
+ /* PDU segment too big, cut in two parts so that first part fits into
+ * size bytes (including header)
+ */
+ sdu = pdu->start_sdu;
+ pdu_data_size = 0;
+ sdu_pos = pdu->sdu_start_byte;
+ sdu_count = 0;
+ while (1) {
+ /* can we put a new header and at least one byte of data? */
+ /* header has 2 more bytes for SO */
+ pdu_header_size = 2 + header_size(sdu_count + 1);
+ if (pdu_header_size + pdu_data_size + 1 > size) {
+ /* no we can't, stop here */
+ break;
+ }
+ /* yes we can, go ahead */
+ sdu_count++;
+ sdu_bytes_to_take = sdu->size - sdu_pos;
+ if (pdu_header_size + pdu_data_size + sdu_bytes_to_take > size) {
+ sdu_bytes_to_take = size - (pdu_header_size + pdu_data_size);
+ }
+ sdu_pos += sdu_bytes_to_take;
+ if (sdu_pos == sdu->size) {
+ sdu = sdu->next;
+ sdu_pos = 0;
+ }
+ pdu_data_size += sdu_bytes_to_take;
+ }
+
+ new_pdu = rlc_tx_new_pdu();
+ pdu->is_segment = 1;
+ *new_pdu = *pdu;
+
+ new_pdu->so = pdu->so + pdu_data_size;
+ new_pdu->data_size = pdu->data_size - pdu_data_size;
+ new_pdu->start_sdu = sdu;
+ new_pdu->sdu_start_byte = sdu_pos;
+
+ pdu->is_last = 0;
+ pdu->data_size = pdu_data_size;
+ pdu->next = new_pdu;
+}
+
+static int generate_retx_pdu(rlc_entity_am_t *entity, char *buffer, int size)
+{
+ rlc_tx_pdu_segment_t *pdu;
+ int orig_size;
+ int p;
+
+ pdu = entity->retransmit_list;
+ orig_size = pdu_size(entity, pdu);
+
+ if (orig_size > size) {
+ /* we can't resegment if size is less than 5
+ * (4 bytes for header, 1 byte for data)
+ */
+ if (size < 5)
+ return 0;
+ resegment(pdu, size);
+ }
+
+ /* remove from retransmit list and put in wait list */
+ entity->retransmit_list = pdu->next;
+ entity->wait_list = rlc_tx_pdu_list_add(sn_compare_tx, entity,
+ entity->wait_list, pdu);
+
+ p = check_poll_after_pdu_assembly(entity);
+
+ if (entity->force_poll) {
+ p = 1;
+ entity->force_poll = 0;
+ }
+
+ return serialize_pdu(entity, buffer, orig_size, pdu, p);
+}
+
+static int status_to_report(rlc_entity_am_t *entity)
+{
+ return entity->status_triggered &&
+ (entity->t_status_prohibit_start == 0 ||
+ entity->t_current - entity->t_status_prohibit_start >
+ entity->t_status_prohibit);
+}
+
+static int retx_pdu_size(rlc_entity_am_t *entity, int maxsize)
+{
+ int size;
+
+ if (entity->retransmit_list == NULL)
+ return 0;
+
+ size = pdu_size(entity, entity->retransmit_list);
+ if (size <= maxsize)
+ return size;
+
+ /* we can segment head of retransmist list if maxsize is large enough
+ * to hold a PDU segment with at least 1 data byte (so 5 bytes: 4 bytes
+ * header + 1 byte data)
+ */
+ if (maxsize < 5)
+ return 0;
+
+ /* a later segmentation of the head of retransmit list will generate a pdu
+ * of maximum size 'maxsize' (can be less)
+ */
+ return maxsize;
+}
+
+rlc_entity_buffer_status_t rlc_entity_am_buffer_status(
+ rlc_entity_t *_entity, int maxsize)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ rlc_entity_buffer_status_t ret;
+ tx_pdu_size_t tx_size;
+
+ /* status PDU, if we have to */
+ if (status_to_report(entity))
+ ret.status_size = status_size(entity, maxsize);
+ else
+ ret.status_size = 0;
+
+ /* TX PDU */
+ /* todo: if an SDU has size >2047 in the tx list then processing
+ * stops and computed size will not be accurate. Change the computation
+ * to be more accurate (if needed).
+ */
+ tx_size = compute_new_pdu_size(entity, maxsize);
+ ret.tx_size = tx_size.data_size + tx_size.header_size;
+
+ /* reTX PDU */
+ /* todo: report size of all available data, not just first PDU */
+ ret.retx_size = retx_pdu_size(entity, maxsize);
+
+ return ret;
+}
+
+int rlc_entity_am_generate_pdu(rlc_entity_t *_entity, char *buffer, int size)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ int ret;
+
+ if (status_to_report(entity)) {
+ ret = generate_status(entity, buffer, size);
+ if (ret != 0)
+ return ret;
+ }
+
+ if (entity->retransmit_list != NULL) {
+ ret = generate_retx_pdu(entity, buffer, size);
+ if (ret != 0)
+ return ret;
+ }
+
+ return generate_tx_pdu(entity, buffer, size);
+}
+
+/*************************************************************************/
+/* SDU RX functions */
+/*************************************************************************/
+
+void rlc_entity_am_recv_sdu(rlc_entity_t *_entity, char *buffer, int size,
+ int sdu_id)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ rlc_sdu_t *sdu;
+
+ if (size > SDU_MAX) {
+ LOG_E(RLC, "%s:%d:%s: fatal: SDU size too big (%d bytes)\n",
+ __FILE__, __LINE__, __FUNCTION__, size);
+ exit(1);
+ }
+
+ if (entity->tx_size + size > entity->tx_maxsize) {
+ LOG_D(RLC, "%s:%d:%s: warning: SDU rejected, SDU buffer full\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
+
+ entity->tx_size += size;
+
+ sdu = rlc_new_sdu(buffer, size, sdu_id);
+ rlc_sdu_list_add(&entity->tx_list, &entity->tx_end, sdu);
+}
+
+/*************************************************************************/
+/* time/timers */
+/*************************************************************************/
+
+static void check_t_poll_retransmit(rlc_entity_am_t *entity)
+{
+ rlc_tx_pdu_segment_t head;
+ rlc_tx_pdu_segment_t *cur;
+ rlc_tx_pdu_segment_t *prev;
+ int sn;
+
+ /* 36.322 5.2.2.3 */
+ /* did t_poll_retransmit expire? */
+ if (entity->t_poll_retransmit_start == 0 ||
+ entity->t_current <= entity->t_poll_retransmit_start +
+ entity->t_poll_retransmit)
+ return;
+
+ /* stop timer */
+ entity->t_poll_retransmit_start = 0;
+
+ /* 36.322 5.2.2.3 says:
+ *
+ * - include a poll in a RLC data PDU as described in section 5.2.2.1
+ *
+ * That does not seem to be conditional. So we forcefully will send
+ * a poll as soon as we generate a PDU.
+ * Hopefully this interpretation is correct. In the worst case we generate
+ * more polling than necessary, but it's not a big deal. When
+ * 't_poll_retransmit' expires it means we didn't receive a status report,
+ * meaning a bad radio link, so things are quite bad at this point and
+ * asking again for a poll won't hurt much more.
+ */
+ entity->force_poll = 1;
+
+ LOG_D(RLC, "%s:%d:%s: warning: t_poll_retransmit expired\n",
+ __FILE__, __LINE__, __FUNCTION__);
+
+ /* do we meet conditions of 36.322 5.2.2.3? */
+ if (!check_poll_after_pdu_assembly(entity))
+ return;
+
+ /* search wait list for PDU with SN = VT(S)-1 */
+ sn = (entity->vt_s + 1023) % 1024;
+
+ head.next = entity->wait_list;
+ cur = entity->wait_list;
+ prev = &head;
+
+ while (cur != NULL) {
+ if (cur->sn == sn)
+ break;
+ prev = cur;
+ cur = cur->next;
+ }
+
+ /* PDU with SN = VT(S)-1 not found?, take the head of wait list */
+ if (cur == NULL) {
+ cur = entity->wait_list;
+ prev = &head;
+ sn = cur->sn;
+ }
+
+ /* 36.322 says "PDU", not "PDU segment", so let's retransmit all
+ * PDU segments with this SN
+ */
+ while (cur != NULL && cur->sn == sn) {
+ prev->next = cur->next;
+ entity->wait_list = head.next;
+ /* put in retransmit list */
+ consider_retransmission(entity, cur);
+ cur = prev->next;
+ }
+}
+
+static void check_t_reordering(rlc_entity_am_t *entity)
+{
+ int sn;
+
+ /* is t_reordering running and if yes has it expired? */
+ if (entity->t_reordering_start == 0 ||
+ entity->t_current <= entity->t_reordering_start + entity->t_reordering)
+ return;
+
+ /* stop timer */
+ entity->t_reordering_start = 0;
+
+ LOG_D(RLC, "%s:%d:%s: t_reordering expired\n", __FILE__, __LINE__, __FUNCTION__);
+
+ /* update VR(MS) to first SN >= VR(X) for which not all PDU segments
+ * have been received
+ */
+ sn = entity->vr_x;
+ while (rlc_am_segment_full(entity, sn))
+ sn = (sn + 1) % 1024;
+ entity->vr_ms = sn;
+
+ if (sn_compare_rx(entity, entity->vr_h, entity->vr_ms) > 0) {
+ entity->t_reordering_start = entity->t_current;
+ entity->vr_x = entity->vr_h;
+ }
+
+ /* trigger STATUS report */
+ entity->status_triggered = 1;
+}
+
+void rlc_entity_am_set_time(rlc_entity_t *_entity, uint64_t now)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+
+ entity->t_current = now;
+
+ check_t_poll_retransmit(entity);
+
+ check_t_reordering(entity);
+
+ /* t_status_prohibit is handled by generate_status */
+}
+
+/*************************************************************************/
+/* discard/re-establishment/delete */
+/*************************************************************************/
+
+void rlc_entity_am_discard_sdu(rlc_entity_t *_entity, int sdu_id)
+{
+ /* implements 36.322 5.3 */
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ rlc_sdu_t head;
+ rlc_sdu_t *cur;
+ rlc_sdu_t *prev;
+
+ head.next = entity->tx_list;
+ cur = entity->tx_list;
+ prev = &head;
+
+ while (cur != NULL && cur->upper_layer_id != sdu_id) {
+ prev = cur;
+ cur = cur->next;
+ }
+
+ /* if sdu_id not found or some bytes have already been 'PDU-ized'
+ * then do nothing
+ */
+ if (cur == NULL || cur->next_byte != 0)
+ return;
+
+ /* remove SDU from tx_list */
+ prev->next = cur->next;
+ entity->tx_list = head.next;
+ if (entity->tx_end == cur) {
+ if (prev != &head)
+ entity->tx_end = prev;
+ else
+ entity->tx_end = NULL;
+ }
+
+ rlc_free_sdu(cur);
+}
+
+static void free_pdu_segment_list(rlc_tx_pdu_segment_t *l)
+{
+ rlc_tx_pdu_segment_t *cur;
+
+ while (l != NULL) {
+ cur = l;
+ l = l->next;
+ rlc_tx_free_pdu(cur);
+ }
+}
+
+static void clear_entity(rlc_entity_am_t *entity)
+{
+ rlc_rx_pdu_segment_t *cur_rx;
+ rlc_sdu_t *cur_tx;
+
+ entity->vr_r = 0;
+ entity->vr_x = 0;
+ entity->vr_ms = 0;
+ entity->vr_h = 0;
+
+ entity->status_triggered = 0;
+
+ entity->vt_a = 0;
+ entity->vt_s = 0;
+ entity->poll_sn = 0;
+ entity->pdu_without_poll = 0;
+ entity->byte_without_poll = 0;
+ entity->force_poll = 0;
+
+ entity->t_current = 0;
+
+ entity->t_reordering_start = 0;
+ entity->t_status_prohibit_start = 0;
+ entity->t_poll_retransmit_start = 0;
+
+ cur_rx = entity->rx_list;
+ while (cur_rx != NULL) {
+ rlc_rx_pdu_segment_t *p = cur_rx;
+ cur_rx = cur_rx->next;
+ rlc_rx_free_pdu_segment(p);
+ }
+ entity->rx_list = NULL;
+ entity->rx_size = 0;
+
+ memset(&entity->reassemble, 0, sizeof(rlc_am_reassemble_t));
+
+ cur_tx = entity->tx_list;
+ while (cur_tx != NULL) {
+ rlc_sdu_t *p = cur_tx;
+ cur_tx = cur_tx->next;
+ rlc_free_sdu(p);
+ }
+ entity->tx_list = NULL;
+ entity->tx_end = NULL;
+ entity->tx_size = 0;
+
+ free_pdu_segment_list(entity->wait_list);
+ free_pdu_segment_list(entity->retransmit_list);
+ free_pdu_segment_list(entity->ack_list);
+ entity->wait_list = NULL;
+ entity->retransmit_list = NULL;
+ entity->ack_list = NULL;
+}
+
+void rlc_entity_am_reestablishment(rlc_entity_t *_entity)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+
+ /* 36.322 5.4 says to deliver SDUs if possible.
+ * Let's not do that, it makes the code simpler.
+ * TODO: change this behavior if wanted/needed.
+ */
+
+ clear_entity(entity);
+}
+
+void rlc_entity_am_delete(rlc_entity_t *_entity)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ clear_entity(entity);
+ free(entity);
+}
diff --git a/openair2/LAYER2/rlc_v2/rlc_entity_am.h b/openair2/LAYER2/rlc_v2/rlc_entity_am.h
new file mode 100644
index 0000000000000000000000000000000000000000..0437f17ad8e63e97c9a9cca6e92a5c85a73fb604
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_entity_am.h
@@ -0,0 +1,285 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#ifndef _RLC_ENTITY_AM_H_
+#define _RLC_ENTITY_AM_H_
+
+#include <stdint.h>
+
+#include "rlc_entity.h"
+#include "rlc_pdu.h"
+#include "rlc_sdu.h"
+
+/*
+ * Here comes some documentation to understand the reassembly
+ * logic in the code and the fields in the structure rlc_am_reassemble_t.
+ *
+ * Inside RLC, we deal with SDUs, PDUs and PDU segments.
+ * SDUs are packets coming from upper layer.
+ * A PDU is made of a header and a payload.
+ * In the payload there are SDUs.
+ * First SDU and last SDU in a PDU may be incomplete.
+ * PDU segments exist in case of retransmissions when the MAC
+ * layer asks for less data than previously, in which case
+ * only part of the previous PDU is sent.
+ *
+ * This is PDU data (just bytes):
+ * ---------------------------------------------------------
+ * | PDU data |
+ * ---------------------------------------------------------
+ * It contains SDUs, like:
+ * ---------------------------------------------------------
+ * | SDU 1 | SDU 2 | [...] | SDU n |
+ * ---------------------------------------------------------
+ * SDU 1 may be only the end of an SDU from which previous bytes were
+ * transmitted in previous PDUs.
+ * SDU n may be only the start of an SDU, that is more bytes from
+ * this SDU may be sent in successive PDUs.
+ *
+ * At front of the PDU data, we have a header:
+ * --------------- ---------------------------------------------------------
+ * | PDU header | | SDU 1 | SDU 2 | [...] | SDU n |
+ * --------------- ---------------------------------------------------------
+ * PDU header describes PDU data (most notably lengths).
+ *
+ * A PDU segment is a part of a PDU. For example, from this PDU data:
+ * ---------------------------------------------------------
+ * | SDU 1 | SDU 2 | [...] | SDU n |
+ * ---------------------------------------------------------
+ * We can extract the following PDU segment (data part only):
+ * ----------------------
+ * | PDU segment data |
+ * ----------------------
+ * This PDU segment would contain the end of SDU 2 above and some SDUs up to,
+ * let's say SDU x (x is 5 below).
+ *
+ * In front of a transmitted PDU segment, we have a header,
+ * containing the important variable 'so' (segment offset) that gives
+ * the index of the first byte of the segment in the original PDU.
+ * -------------- ----------------------
+ * | seg. header| | PDU segment data |
+ * -------------- ----------------------
+ *
+ * Let's now explain the data structure rlc_am_reassemble_t.
+ *
+ * In the structure rlc_am_reassemble_t, the fields fi, e, sn and so
+ * are coming from the PDU segment header and the semantics is the
+ * one of the RLC specs.
+ *
+ * The currently processed PDU segment is stored in 'start'.
+ * We have 'start->s->data_offset' and 'start->s->size'.
+ * start->s->data_offset is the index of the start of the data in the
+ * PDU segment. That is if the header is of length 3 bytes
+ * then start->s->data_offset is 3.
+ * start->s->size is the total length of the PDU segment,
+ * including header.
+ * The size of actual data bytes in the PDU segment is thus
+ * start->s->size - start->s->data_offset.
+ *
+ * The field sdu_len is the length of the current SDU being
+ * processed.
+ *
+ * The field sdu_offset is the starting point of the
+ * current SDU being processed (starting from beginning
+ * of PDU segment, including header).
+ *
+ * The field data_pos is the current read pointer. 0 points to
+ * the beginning of the PDU segment (including header).
+ *
+ * The field pdu_byte points to the current byte in the original
+ * PDU (not the PDU segment). It starts at 0 when we start
+ * processing a new PDU (when a new 'sn' is seen) and always
+ * increases after each byte processed. This is tha variable
+ * that is used to know if the next PDU segment will be used
+ * or not and if yes, starting from which data byte (see
+ * function rlc_am_reassemble_next_segment).
+ *
+ * 'so' is important and points to the byte in the original PDU
+ * that is the first byte of the PDU segment.
+ *
+ * For example, let's take this PDU segment data from above:
+ * ----------------------
+ * | PDU segment data |
+ * ----------------------
+ * Let's say it is decomposed as:
+ * ----------------------
+ * |222|33|4444|55555555|
+ * ----------------------
+ * It contains SDUs 2, 3, 4, and 5.
+ * SDU 2 is 3 bytes, SDU 3 is 2 bytes, SDU 4 is 4 bytes, SDU 5 is 8 bytes.
+ *
+ * Let's suppose that the original PDU starts with:
+ * ----------------
+ * |1111111|222222|
+ * ----------------
+ *
+ * (In this example, in the PDU segment, SDU 2 is not full,
+ * we only have its end.)
+ *
+ * Then 'so' is 13 (SDU 1 is 7 bytes, head of SDU 2 is 6 bytes).
+ *
+ * Let's continue with our PDU segment data.
+ * Let's say we are current processing SDU 4.
+ * Let's say the read pointer (variable 'data_pos') is there:
+ * ----------------------
+ * |222|33|4444|55555555|
+ * ----------------------
+ * ^
+ * read pointer (data_pos)
+ *
+ * Then:
+ * - sdu_len is 4
+ * - sdu_offset is 5 + [PDU segment header length]
+ * (it points to the beginning of SDU 4, starting
+ * from the head of the PDU segment, that is
+ * 3 bytes for SDU 2, 2 bytes for SDU 3, and the
+ * PDU segment header length)
+ * - start->s->data_offset is [PDU segment header length]
+ * - pdu_byte is 20
+ * (13 bytes from beginning of original PDU,
+ * 3 bytes for SDU 2, 2 bytes for SDU 3, then 2 bytes for SDU 4)
+ * - data_pos = read pointer = 7 + [PDU segment header length]
+ *
+ * To finish this description, in the code, a PDU is simply
+ * seen as a PDU segment with 'so' = 0 (and is_last == 1 (lsf in the specs),
+ * but this variable is not used by the reassembly logic).
+ *
+ * And for [PDU segment header length] we use start->s->data_offset.
+ *
+ * To recap, here is an illustration of the various variables
+ * and what starting point they use. In the figures, the start
+ * of the variable name is aligned to the byte it refers to.
+ * + is used to show the starting point.
+ *
+ * Let's put the PDU segment back into the original PDU.
+ * And let's show the values for when the read pointer
+ * is on the second byte of SDU 4 (as above).
+ *
+ * +++++++++++++++ so
+ * +++++++++++++++++++++++ pdu_byte
+ * ---------------------------------------------------------
+ * | SDU 1| SDU 2..222|33|4444|55555555| [...] | SDU n |
+ * ---------------------------------------------------------
+ *
+ * And now the PDU segment with header.
+ *
+ *
+ * ++++ sdu_len
+ * ++++++++++++++++++++++ sdu_offset
+ * +++++++++++++++++++++++ data_pos
+ * +++++++++++++++ start->s->data_offset
+ * +++++++++++++++++++++++++++++++++++++ start->s->size
+ * -------------- ----------------------
+ * | seg. header| |222|33|4444|55555555|
+ * -------------- ----------------------
+ *
+ * We see three case for the starting point:
+ * - start of original PDU (without any header)
+ * - start of header of current PDU segment
+ * - start of current SDU (for sdu_len)
+ */
+
+typedef struct {
+ rlc_rx_pdu_segment_t *start; /* start of list */
+ rlc_rx_pdu_segment_t *end; /* end of list (last element) */
+ int pos; /* byte to get from current buffer */
+ char sdu[SDU_MAX]; /* sdu is reassembled here */
+ int sdu_pos; /* next byte to put in sdu */
+
+ /* decoder of current PDU */
+ rlc_pdu_decoder_t dec;
+ int fi;
+ int e;
+ int sn;
+ int so;
+ int sdu_len;
+ int sdu_offset;
+ int data_pos;
+ int pdu_byte;
+} rlc_am_reassemble_t;
+
+typedef struct {
+ rlc_entity_t common;
+
+ /* configuration */
+ int t_reordering;
+ int t_status_prohibit;
+ int t_poll_retransmit;
+ int poll_pdu; /* -1 means infinity */
+ int poll_byte; /* -1 means infinity */
+ int max_retx_threshold;
+
+ /* runtime rx */
+ int vr_r;
+ int vr_x;
+ int vr_ms;
+ int vr_h;
+
+ int status_triggered;
+
+ /* runtime tx */
+ int vt_a;
+ int vt_s;
+ int poll_sn;
+ int pdu_without_poll;
+ int byte_without_poll;
+ int force_poll;
+
+ /* set to the latest know time by the user of the module. Unit: ms */
+ uint64_t t_current;
+
+ /* timers (stores the TTI of activation, 0 means not active) */
+ uint64_t t_reordering_start;
+ uint64_t t_status_prohibit_start;
+ uint64_t t_poll_retransmit_start;
+
+ /* rx management */
+ rlc_rx_pdu_segment_t *rx_list;
+ int rx_size;
+ int rx_maxsize;
+
+ /* reassembly management */
+ rlc_am_reassemble_t reassemble;
+
+ /* tx management */
+ rlc_sdu_t *tx_list;
+ rlc_sdu_t *tx_end;
+ int tx_size;
+ int tx_maxsize;
+
+ rlc_tx_pdu_segment_t *wait_list;
+ rlc_tx_pdu_segment_t *retransmit_list;
+
+ rlc_tx_pdu_segment_t *ack_list;
+} rlc_entity_am_t;
+
+void rlc_entity_am_recv_sdu(rlc_entity_t *entity, char *buffer, int size,
+ int sdu_id);
+void rlc_entity_am_recv_pdu(rlc_entity_t *entity, char *buffer, int size);
+rlc_entity_buffer_status_t rlc_entity_am_buffer_status(
+ rlc_entity_t *entity, int maxsize);
+int rlc_entity_am_generate_pdu(rlc_entity_t *entity, char *buffer, int size);
+void rlc_entity_am_set_time(rlc_entity_t *entity, uint64_t now);
+void rlc_entity_am_discard_sdu(rlc_entity_t *entity, int sdu_id);
+void rlc_entity_am_reestablishment(rlc_entity_t *entity);
+void rlc_entity_am_delete(rlc_entity_t *entity);
+
+#endif /* _RLC_ENTITY_AM_H_ */
diff --git a/openair2/LAYER2/rlc_v2/rlc_entity_um.c b/openair2/LAYER2/rlc_v2/rlc_entity_um.c
new file mode 100644
index 0000000000000000000000000000000000000000..f0fe33789b4fecc1f5673edf30355422568c4460
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_entity_um.c
@@ -0,0 +1,707 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "rlc_entity_um.h"
+#include "rlc_pdu.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "LOG/log.h"
+
+/*************************************************************************/
+/* PDU RX functions */
+/*************************************************************************/
+
+static int modulus_rx(rlc_entity_um_t *entity, int a)
+{
+ /* as per 36.322 7.1, modulus base is vr(uh)-window_size and modulus is
+ * 2^sn_field_length (which is 'sn_modulus' in rlc_entity_um_t)
+ */
+ int r = a - (entity->vr_uh - entity->window_size);
+ if (r < 0) r += entity->sn_modulus;
+ return r % entity->sn_modulus;
+}
+
+static int sn_compare_rx(void *_entity, int a, int b)
+{
+ rlc_entity_um_t *entity = _entity;
+ return modulus_rx(entity, a) - modulus_rx(entity, b);
+}
+
+static int sn_in_recv_window(void *_entity, int sn)
+{
+ rlc_entity_um_t *entity = _entity;
+ int mod_sn = modulus_rx(entity, sn);
+ /* we simplify (VR(UH) - UM_Window_Size) <= SN < VR(UH), base is
+ * (VR(UH) - UM_Window_Size) and VR(UH) = base + window_size
+ */
+ return mod_sn < entity->window_size;
+}
+
+/* return 1 if a PDU with SN == 'sn' is in the rx list, 0 otherwise */
+static int rlc_um_pdu_received(rlc_entity_um_t *entity, int sn)
+{
+ rlc_rx_pdu_segment_t *cur = entity->rx_list;
+ while (cur != NULL) {
+ if (cur->sn == sn)
+ return 1;
+ cur = cur->next;
+ }
+ return 0;
+}
+
+static int less_than_vr_ur(rlc_entity_um_t *entity, int sn)
+{
+ return sn_compare_rx(entity, sn, entity->vr_ur) < 0;
+}
+
+static int outside_of_reordering_window(rlc_entity_um_t *entity, int sn)
+{
+ return !sn_in_recv_window(entity, sn);
+}
+
+static int less_than_vr_uh(rlc_entity_um_t *entity, int sn)
+{
+ return sn_compare_rx(entity, sn, entity->vr_uh) < 0;
+}
+
+static void rlc_um_reassemble_pdu(rlc_entity_um_t *entity,
+ rlc_rx_pdu_segment_t *pdu)
+{
+ rlc_um_reassemble_t *r = &entity->reassemble;
+
+ int fi;
+ int e;
+ int sn;
+ int data_pos;
+ int sdu_len;
+ int sdu_offset;
+
+ sdu_offset = pdu->data_offset;
+
+ rlc_pdu_decoder_init(&r->dec, pdu->data, pdu->size);
+
+ if (entity->sn_field_length == 10)
+ rlc_pdu_decoder_get_bits(&r->dec, 3);
+
+ fi = rlc_pdu_decoder_get_bits(&r->dec, 2);
+ e = rlc_pdu_decoder_get_bits(&r->dec, 1);
+ sn = rlc_pdu_decoder_get_bits(&r->dec, entity->sn_field_length);
+
+ if (e) {
+ e = rlc_pdu_decoder_get_bits(&r->dec, 1);
+ sdu_len = rlc_pdu_decoder_get_bits(&r->dec, 11);
+ } else
+ sdu_len = pdu->size - sdu_offset;
+
+ /* discard current SDU being reassembled if bad SN or bad FI */
+ if (sn != (r->sn + 1) % entity->sn_modulus ||
+ !(fi & 0x02)) {
+ if (r->sdu_pos)
+ LOG_D(RLC, "%s:%d:%s: warning: discard partially reassembled SDU\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ r->sdu_pos = 0;
+ }
+
+ /* if the head of the SDU is missing, still process the PDU
+ * but remember to discard the reassembled SDU later on (the
+ * head has not been received).
+ * The head is missing if sdu_pos == 0 and fi says the PDU does not
+ * start an SDU.
+ */
+ if (r->sdu_pos == 0 && (fi & 0x02))
+ r->sdu_head_missing = 1;
+
+ r->sn = sn;
+ data_pos = pdu->data_offset;
+
+ while (1) {
+ if (r->sdu_pos >= SDU_MAX) {
+ /* TODO: proper error handling (discard PDUs with current sn from
+ * reassembly queue? something else?)
+ */
+ LOG_E(RLC, "%s:%d:%s: bad RLC PDU\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ r->sdu[r->sdu_pos] = pdu->data[data_pos];
+ r->sdu_pos++;
+ data_pos++;
+ if (data_pos == sdu_offset + sdu_len) {
+ /* all bytes of SDU are consumed, check if SDU is fully there.
+ * It is if the data pointer is not at the end of the PDU segment
+ * or if 'fi' & 1 == 0
+ */
+ if (data_pos != pdu->size || (fi & 1) == 0) {
+ /* time to discard the SDU if we didn't receive the head */
+ if (r->sdu_head_missing) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard SDU, head not received\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ r->sdu_head_missing = 0;
+ } else {
+ /* SDU is full - deliver to higher layer */
+ entity->common.deliver_sdu(entity->common.deliver_sdu_data,
+ (rlc_entity_t *)entity,
+ r->sdu, r->sdu_pos);
+ }
+ r->sdu_pos = 0;
+ }
+ /* done with PDU? */
+ if (data_pos == pdu->size)
+ break;
+ /* not at the end of PDU, process next SDU */
+ sdu_offset += sdu_len;
+ if (e) {
+ e = rlc_pdu_decoder_get_bits(&r->dec, 1);
+ sdu_len = rlc_pdu_decoder_get_bits(&r->dec, 11);
+ } else
+ sdu_len = pdu->size - sdu_offset;
+ }
+ }
+}
+
+static void rlc_um_reassemble(rlc_entity_um_t *entity,
+ int (*check_sn)(rlc_entity_um_t *entity, int sn))
+{
+ rlc_rx_pdu_segment_t *cur;
+
+ /* process all PDUs from head of rx list until all is processed or
+ * the SN is not valid anymore with respect to 'check_sn'
+ */
+ while (entity->rx_list != NULL && check_sn(entity, entity->rx_list->sn)) {
+ cur = entity->rx_list;
+ rlc_um_reassemble_pdu(entity, cur);
+ entity->rx_size -= cur->size;
+ entity->rx_list = cur->next;
+ rlc_rx_free_pdu_segment(cur);
+ }
+}
+
+static void rlc_um_reception_actions(rlc_entity_um_t *entity,
+ rlc_rx_pdu_segment_t *pdu_segment)
+{
+ if (!sn_in_recv_window(entity, pdu_segment->sn)) {
+ entity->vr_uh = (pdu_segment->sn + 1) % entity->sn_modulus;
+ rlc_um_reassemble(entity, outside_of_reordering_window);
+ if (!sn_in_recv_window(entity, entity->vr_ur))
+ entity->vr_ur = (entity->vr_uh - entity->window_size
+ + entity->sn_modulus) % entity->sn_modulus;
+ }
+
+ if (rlc_um_pdu_received(entity, entity->vr_ur)) {
+ do {
+ entity->vr_ur = (entity->vr_ur + 1) % entity->sn_modulus;
+ } while (rlc_um_pdu_received(entity, entity->vr_ur));
+ rlc_um_reassemble(entity, less_than_vr_ur);
+ }
+
+ if (entity->t_reordering_start) {
+ if (sn_compare_rx(entity, entity->vr_ux, entity->vr_ur) <= 0 ||
+ (!sn_in_recv_window(entity, entity->vr_ux) &&
+ entity->vr_ux != entity->vr_uh))
+ entity->t_reordering_start = 0;
+ }
+
+ if (entity->t_reordering_start == 0) {
+ if (sn_compare_rx(entity, entity->vr_uh, entity->vr_ur) > 0) {
+ entity->t_reordering_start = entity->t_current;
+ entity->vr_ux = entity->vr_uh;
+ }
+ }
+}
+
+void rlc_entity_um_recv_pdu(rlc_entity_t *_entity, char *buffer, int size)
+{
+#define R(d) do { if (rlc_pdu_decoder_in_error(&d)) goto err; } while (0)
+ rlc_entity_um_t *entity = (rlc_entity_um_t *)_entity;
+ rlc_pdu_decoder_t decoder;
+ rlc_pdu_decoder_t data_decoder;
+
+ int e;
+ int sn;
+
+ int data_e;
+ int data_li;
+
+ int packet_count;
+ int data_size;
+ int data_start;
+ int indicated_data_size;
+
+ rlc_rx_pdu_segment_t *pdu_segment;
+
+ rlc_pdu_decoder_init(&decoder, buffer, size);
+
+ if (entity->sn_field_length == 10) {
+ rlc_pdu_decoder_get_bits(&decoder, 3); R(decoder); /* R1 */
+ }
+
+ rlc_pdu_decoder_get_bits(&decoder, 2); R(decoder); /* FI */
+ e = rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+ sn = rlc_pdu_decoder_get_bits(&decoder, entity->sn_field_length); R(decoder);
+
+ /* dicard PDU if rx buffer is full */
+ if (entity->rx_size + size > entity->rx_maxsize) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, RX buffer full\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
+
+ /* discard according to 36.322 5.1.2.2.2 */
+ if ((sn_compare_rx(entity, entity->vr_ur, sn) < 0 &&
+ sn_compare_rx(entity, sn, entity->vr_uh) < 0 &&
+ rlc_um_pdu_received(entity, sn)) ||
+ (sn_compare_rx(entity, entity->vr_uh - entity->window_size, sn) <= 0 &&
+ sn_compare_rx(entity, sn, entity->vr_ur) < 0)) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU (sn %d vr(ur) %d vr(uh) %d)\n",
+ __FILE__, __LINE__, __FUNCTION__,
+ sn, entity->vr_ur, entity->vr_uh);
+ return;
+ }
+
+ packet_count = 1;
+
+ /* go to start of data */
+ indicated_data_size = 0;
+ data_decoder = decoder;
+ data_e = e;
+ while (data_e) {
+ data_e = rlc_pdu_decoder_get_bits(&data_decoder, 1); R(data_decoder);
+ data_li = rlc_pdu_decoder_get_bits(&data_decoder, 11); R(data_decoder);
+ if (data_li == 0) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, li == 0\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
+ indicated_data_size += data_li;
+ packet_count++;
+ }
+ rlc_pdu_decoder_align(&data_decoder);
+
+ data_start = data_decoder.byte;
+ data_size = size - data_start;
+
+ if (data_size <= 0) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, wrong data size (sum of LI %d data size %d)\n",
+ __FILE__, __LINE__, __FUNCTION__,
+ indicated_data_size, data_size);
+ return;
+ }
+ if (indicated_data_size >= data_size) {
+ LOG_D(RLC, "%s:%d:%s: warning: discard PDU, bad LIs (sum of LI %d data size %d)\n",
+ __FILE__, __LINE__, __FUNCTION__,
+ indicated_data_size, data_size);
+ return;
+ }
+
+ /* put in pdu reception list */
+ entity->rx_size += size;
+ pdu_segment = rlc_rx_new_pdu_segment(sn, 0, size, 1, buffer, data_start);
+ entity->rx_list = rlc_rx_pdu_segment_list_add(sn_compare_rx, entity,
+ entity->rx_list, pdu_segment);
+
+ /* do reception actions (36.322 5.1.2.2.3) */
+ rlc_um_reception_actions(entity, pdu_segment);
+
+ return;
+
+err:
+ LOG_D(RLC, "%s:%d:%s: error decoding PDU, discarding\n", __FILE__, __LINE__, __FUNCTION__);
+
+#undef R
+}
+
+/*************************************************************************/
+/* TX functions */
+/*************************************************************************/
+
+typedef struct {
+ int sdu_count;
+ int data_size;
+ int header_size;
+ int last_sdu_is_full;
+ int first_sdu_length;
+} tx_pdu_size_t;
+
+static int header_size(int sn_field_length, int sdu_count)
+{
+ int bits = 8 + 8 * (sn_field_length == 10) + 12 * (sdu_count - 1);
+ /* padding if we have to */
+ return (bits + 7) / 8;
+}
+
+static tx_pdu_size_t tx_pdu_size(rlc_entity_um_t *entity, int maxsize)
+{
+ tx_pdu_size_t ret;
+ int sdu_count;
+ int sdu_size;
+ int pdu_data_size;
+ rlc_sdu_t *sdu;
+
+ ret.sdu_count = 0;
+ ret.data_size = 0;
+ ret.header_size = 0;
+ ret.last_sdu_is_full = 1;
+
+ /* TX PDU - let's make the biggest PDU we can with the SDUs we have */
+ sdu_count = 0;
+ pdu_data_size = 0;
+ sdu = entity->tx_list;
+ while (sdu != NULL) {
+ int new_header_size = header_size(entity->sn_field_length, sdu_count+1);
+ /* if we cannot put new header + at least 1 byte of data then over */
+ if (new_header_size + pdu_data_size >= maxsize)
+ break;
+ sdu_count++;
+ /* only include the bytes of this SDU not included in PDUs already */
+ sdu_size = sdu->size - sdu->next_byte;
+ /* don't feed more than 'maxsize' bytes */
+ if (new_header_size + pdu_data_size + sdu_size > maxsize) {
+ sdu_size = maxsize - new_header_size - pdu_data_size;
+ ret.last_sdu_is_full = 0;
+ }
+ if (sdu_count == 1)
+ ret.first_sdu_length = sdu_size;
+ pdu_data_size += sdu_size;
+ /* if we put more than 2^11-1 bytes then the LI field cannot be used,
+ * so this is the last SDU we can put
+ */
+ if (sdu_size > 2047)
+ break;
+ sdu = sdu->next;
+ }
+
+ if (sdu_count) {
+ ret.sdu_count = sdu_count;
+ ret.data_size = pdu_data_size;
+ ret.header_size = header_size(entity->sn_field_length, sdu_count);
+ }
+
+ return ret;
+}
+
+rlc_entity_buffer_status_t rlc_entity_um_buffer_status(
+ rlc_entity_t *_entity, int maxsize)
+{
+ rlc_entity_um_t *entity = (rlc_entity_um_t *)_entity;
+ rlc_entity_buffer_status_t ret;
+ tx_pdu_size_t tx_size;
+
+ ret.status_size = 0;
+
+ /* todo: if an SDU has size >2047 in the tx list then processing
+ * stops and computed size will not be accurate. Change the computation
+ * to be more accurate (if needed).
+ */
+ tx_size = tx_pdu_size(entity, maxsize);
+ ret.tx_size = tx_size.data_size + tx_size.header_size;
+
+ ret.retx_size = 0;
+
+ return ret;
+}
+
+int rlc_entity_um_generate_pdu(rlc_entity_t *_entity, char *buffer, int size)
+{
+ rlc_entity_um_t *entity = (rlc_entity_um_t *)_entity;
+ tx_pdu_size_t pdu_size;
+ rlc_sdu_t *sdu;
+ int i;
+ int cursize;
+ int first_sdu_full;
+ int last_sdu_full;
+ rlc_pdu_encoder_t encoder;
+ int fi;
+ int e;
+ int li;
+ char *out;
+ int outpos;
+ int first_sdu_start_byte;
+ int sdu_start_byte;
+
+ pdu_size = tx_pdu_size(entity, size);
+ if (pdu_size.sdu_count == 0)
+ return 0;
+
+ sdu = entity->tx_list;
+
+ first_sdu_start_byte = sdu->next_byte;
+
+ /* reserve SDU bytes */
+ cursize = 0;
+ for (i = 0; i < pdu_size.sdu_count; i++, sdu = sdu->next) {
+ int sdu_size = sdu->size - sdu->next_byte;
+ if (cursize + sdu_size > pdu_size.data_size)
+ sdu_size = pdu_size.data_size - cursize;
+ sdu->next_byte += sdu_size;
+ cursize += sdu_size;
+ }
+
+ first_sdu_full = first_sdu_start_byte == 0;
+ last_sdu_full = pdu_size.last_sdu_is_full;
+
+ /* generate header */
+ rlc_pdu_encoder_init(&encoder, buffer, size);
+
+ if (entity->sn_field_length == 10)
+ rlc_pdu_encoder_put_bits(&encoder, 0, 3); /* R1 */
+
+ fi = 0;
+ if (!first_sdu_full)
+ fi |= 0x02;
+ if (!last_sdu_full)
+ fi |= 0x01;
+ rlc_pdu_encoder_put_bits(&encoder, fi, 2); /* FI */
+
+ /* see the AM code to understand the logic for Es and LIs */
+ if (pdu_size.sdu_count >= 2)
+ e = 1;
+ else
+ e = 0;
+ rlc_pdu_encoder_put_bits(&encoder, e, 1); /* E */
+
+ if (entity->sn_field_length == 10)
+ rlc_pdu_encoder_put_bits(&encoder, entity->vt_us, 10); /* SN */
+ else
+ rlc_pdu_encoder_put_bits(&encoder, entity->vt_us, 5); /* SN */
+
+ /* put LIs */
+ sdu = entity->tx_list;
+ /* first SDU */
+ li = pdu_size.first_sdu_length;
+ /* put E+LI only if at least 2 SDUs */
+ if (pdu_size.sdu_count >= 2) {
+ /* E is 1 if at least 3 SDUs */
+ if (pdu_size.sdu_count >= 3)
+ e = 1;
+ else
+ e = 0;
+ rlc_pdu_encoder_put_bits(&encoder, e, 1); /* E */
+ rlc_pdu_encoder_put_bits(&encoder, li, 11); /* LI */
+ }
+ /* next SDUs, but not the last (no LI for the last) */
+ sdu = sdu->next;
+ for (i = 2; i < pdu_size.sdu_count; i++, sdu = sdu->next) {
+ if (i != pdu_size.sdu_count - 1)
+ e = 1;
+ else
+ e = 0;
+ li = sdu->size;
+ rlc_pdu_encoder_put_bits(&encoder, e, 1); /* E */
+ rlc_pdu_encoder_put_bits(&encoder, li, 11); /* LI */
+ }
+
+ rlc_pdu_encoder_align(&encoder);
+
+ /* generate data */
+ out = buffer + pdu_size.header_size;
+ sdu = entity->tx_list;
+ sdu_start_byte = first_sdu_start_byte;
+ outpos = 0;
+ for (i = 0; i < pdu_size.sdu_count; i++, sdu = sdu->next) {
+ li = sdu->size - sdu_start_byte;
+ if (outpos + li >= pdu_size.data_size)
+ li = pdu_size.data_size - outpos;
+ memcpy(out+outpos, sdu->data + sdu_start_byte, li);
+ outpos += li;
+ sdu_start_byte = 0;
+ }
+
+ /* cleanup sdu list */
+ while (entity->tx_list != NULL &&
+ entity->tx_list->size == entity->tx_list->next_byte) {
+ rlc_sdu_t *c = entity->tx_list;
+ /* release SDU bytes */
+ entity->tx_size -= c->size;
+ entity->tx_list = c->next;
+ rlc_free_sdu(c);
+ }
+ if (entity->tx_list == NULL)
+ entity->tx_end = NULL;
+
+ /* update VT(US) */
+ entity->vt_us = (entity->vt_us + 1) % entity->sn_modulus;
+
+ return pdu_size.header_size + pdu_size.data_size;
+}
+
+/*************************************************************************/
+/* SDU RX functions */
+/*************************************************************************/
+
+void rlc_entity_um_recv_sdu(rlc_entity_t *_entity, char *buffer, int size,
+ int sdu_id)
+{
+ rlc_entity_um_t *entity = (rlc_entity_um_t *)_entity;
+ rlc_sdu_t *sdu;
+
+ if (size > SDU_MAX) {
+ LOG_E(RLC, "%s:%d:%s: fatal: SDU size too big (%d bytes)\n",
+ __FILE__, __LINE__, __FUNCTION__, size);
+ exit(1);
+ }
+
+ if (entity->tx_size + size > entity->tx_maxsize) {
+ LOG_D(RLC, "%s:%d:%s: warning: SDU rejected, SDU buffer full\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
+
+ entity->tx_size += size;
+
+ sdu = rlc_new_sdu(buffer, size, sdu_id);
+ rlc_sdu_list_add(&entity->tx_list, &entity->tx_end, sdu);
+}
+
+/*************************************************************************/
+/* time/timers */
+/*************************************************************************/
+
+static void check_t_reordering(rlc_entity_um_t *entity)
+{
+ int sn;
+
+ /* is t_reordering running and if yes has it expired? */
+ if (entity->t_reordering_start == 0 ||
+ entity->t_current <= entity->t_reordering_start + entity->t_reordering)
+ return;
+
+ /* stop timer */
+ entity->t_reordering_start = 0;
+
+ LOG_D(RLC, "%s:%d:%s: t_reordering expired\n", __FILE__, __LINE__, __FUNCTION__);
+
+ /* update VR(UR) to first SN >= VR(UX) of PDU not received
+ */
+ sn = entity->vr_ux;
+ while (rlc_um_pdu_received(entity, sn))
+ sn = (sn + 1) % entity->sn_modulus;
+ entity->vr_ur = sn;
+
+ rlc_um_reassemble(entity, less_than_vr_ur);
+
+ if (sn_compare_rx(entity, entity->vr_uh, entity->vr_ur) > 0) {
+ entity->t_reordering_start = entity->t_current;
+ entity->vr_ux = entity->vr_uh;
+ }
+}
+
+void rlc_entity_um_set_time(rlc_entity_t *_entity, uint64_t now)
+{
+ rlc_entity_um_t *entity = (rlc_entity_um_t *)_entity;
+
+ entity->t_current = now;
+
+ check_t_reordering(entity);
+}
+
+/*************************************************************************/
+/* discard/re-establishment/delete */
+/*************************************************************************/
+
+void rlc_entity_um_discard_sdu(rlc_entity_t *_entity, int sdu_id)
+{
+ /* implements 36.322 5.3 */
+ rlc_entity_um_t *entity = (rlc_entity_um_t *)_entity;
+ rlc_sdu_t head;
+ rlc_sdu_t *cur;
+ rlc_sdu_t *prev;
+
+ head.next = entity->tx_list;
+ cur = entity->tx_list;
+ prev = &head;
+
+ while (cur != NULL && cur->upper_layer_id != sdu_id) {
+ prev = cur;
+ cur = cur->next;
+ }
+
+ /* if sdu_id not found or some bytes have already been 'PDU-ized'
+ * then do nothing
+ */
+ if (cur == NULL || cur->next_byte != 0)
+ return;
+
+ /* remove SDU from tx_list */
+ prev->next = cur->next;
+ entity->tx_list = head.next;
+ if (entity->tx_end == cur) {
+ if (prev != &head)
+ entity->tx_end = prev;
+ else
+ entity->tx_end = NULL;
+ }
+
+ rlc_free_sdu(cur);
+}
+
+static void clear_entity(rlc_entity_um_t *entity)
+{
+ rlc_rx_pdu_segment_t *cur_rx;
+ rlc_sdu_t *cur_tx;
+
+ entity->vr_ur = 0;
+ entity->vr_ux = 0;
+ entity->vr_uh = 0;
+
+ entity->vt_us = 0;
+
+ entity->t_current = 0;
+
+ entity->t_reordering_start = 0;
+
+ cur_rx = entity->rx_list;
+ while (cur_rx != NULL) {
+ rlc_rx_pdu_segment_t *p = cur_rx;
+ cur_rx = cur_rx->next;
+ rlc_rx_free_pdu_segment(p);
+ }
+ entity->rx_list = NULL;
+ entity->rx_size = 0;
+
+ memset(&entity->reassemble, 0, sizeof(rlc_um_reassemble_t));
+
+ cur_tx = entity->tx_list;
+ while (cur_tx != NULL) {
+ rlc_sdu_t *p = cur_tx;
+ cur_tx = cur_tx->next;
+ rlc_free_sdu(p);
+ }
+ entity->tx_list = NULL;
+ entity->tx_end = NULL;
+ entity->tx_size = 0;
+}
+
+void rlc_entity_um_reestablishment(rlc_entity_t *_entity)
+{
+ rlc_entity_um_t *entity = (rlc_entity_um_t *)_entity;
+
+ rlc_um_reassemble(entity, less_than_vr_uh);
+
+ clear_entity(entity);
+}
+
+void rlc_entity_um_delete(rlc_entity_t *_entity)
+{
+ rlc_entity_um_t *entity = (rlc_entity_um_t *)_entity;
+ clear_entity(entity);
+ free(entity);
+}
diff --git a/openair2/LAYER2/rlc_v2/rlc_entity_um.h b/openair2/LAYER2/rlc_v2/rlc_entity_um.h
new file mode 100644
index 0000000000000000000000000000000000000000..02c5141a7a6613536728e2b81c75ca1b21b1db1f
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_entity_um.h
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#ifndef _RLC_ENTITY_UM_H_
+#define _RLC_ENTITY_UM_H_
+
+#include "rlc_entity.h"
+#include "rlc_pdu.h"
+#include "rlc_sdu.h"
+
+typedef struct {
+ char sdu[SDU_MAX]; /* sdu is reassembled here */
+ int sdu_pos; /* next byte to put in sdu */
+
+ /* decoder of current PDU */
+ rlc_pdu_decoder_t dec;
+ int sn;
+
+ int sdu_head_missing;
+} rlc_um_reassemble_t;
+
+typedef struct {
+ rlc_entity_t common;
+
+ /* configuration */
+ int t_reordering;
+ int sn_field_length;
+
+ int sn_modulus; /* 1024 for sn_field_length == 10, 32 for 5 */
+ int window_size; /* 512 for sn_field_length == 10, 16 for 5 */
+
+ /* runtime rx */
+ int vr_ur;
+ int vr_ux;
+ int vr_uh;
+
+ /* runtime tx */
+ int vt_us;
+
+ /* set to the latest know time by the user of the module. Unit: ms */
+ uint64_t t_current;
+
+ /* timers (stores the TTI of activation, 0 means not active) */
+ uint64_t t_reordering_start;
+
+ /* rx management */
+ rlc_rx_pdu_segment_t *rx_list;
+ int rx_size;
+ int rx_maxsize;
+
+ /* reassembly management */
+ rlc_um_reassemble_t reassemble;
+
+ /* tx management */
+ rlc_sdu_t *tx_list;
+ rlc_sdu_t *tx_end;
+ int tx_size;
+ int tx_maxsize;
+} rlc_entity_um_t;
+
+void rlc_entity_um_recv_sdu(rlc_entity_t *_entity, char *buffer, int size,
+ int sdu_id);
+void rlc_entity_um_recv_pdu(rlc_entity_t *entity, char *buffer, int size);
+rlc_entity_buffer_status_t rlc_entity_um_buffer_status(
+ rlc_entity_t *entity, int maxsize);
+int rlc_entity_um_generate_pdu(rlc_entity_t *_entity, char *buffer, int size);
+void rlc_entity_um_set_time(rlc_entity_t *entity, uint64_t now);
+void rlc_entity_um_discard_sdu(rlc_entity_t *entity, int sdu_id);
+void rlc_entity_um_reestablishment(rlc_entity_t *entity);
+void rlc_entity_um_delete(rlc_entity_t *entity);
+
+#endif /* _RLC_ENTITY_UM_H_ */
diff --git a/openair2/LAYER2/rlc_v2/rlc_oai_api.c b/openair2/LAYER2/rlc_v2/rlc_oai_api.c
new file mode 100644
index 0000000000000000000000000000000000000000..c81cc6ff5ebc47b2d40e3116a2d405858f214f61
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_oai_api.c
@@ -0,0 +1,1015 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+/* from openair */
+#include "rlc.h"
+#include "pdcp.h"
+
+/* from new rlc module */
+#include "asn1_utils.h"
+#include "rlc_ue_manager.h"
+#include "rlc_entity.h"
+
+#include <stdint.h>
+
+static rlc_ue_manager_t *rlc_ue_manager;
+
+/* TODO: handle time a bit more properly */
+static uint64_t rlc_current_time;
+static int rlc_current_time_last_frame;
+static int rlc_current_time_last_subframe;
+
+void mac_rlc_data_ind (
+ const module_id_t module_idP,
+ const rnti_t rntiP,
+ const eNB_index_t eNB_index,
+ const frame_t frameP,
+ const eNB_flag_t enb_flagP,
+ const MBMS_flag_t MBMS_flagP,
+ const logical_chan_id_t channel_idP,
+ char *buffer_pP,
+ const tb_size_t tb_sizeP,
+ num_tb_t num_tbP,
+ crc_t *crcs_pP)
+{
+ rlc_ue_t *ue;
+ rlc_entity_t *rb;
+ int rnti;
+ int channel_id;
+
+ if (enb_flagP == 1 && module_idP != 0) {
+ LOG_E(RLC, "%s:%d:%s: fatal, module_id must be 0 for eNB\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ if (/*module_idP != 0 ||*/ eNB_index != 0 /*|| enb_flagP != 1 || MBMS_flagP != 0*/) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ if (enb_flagP)
+ T(T_ENB_RLC_MAC_UL, T_INT(module_idP), T_INT(rntiP),
+ T_INT(channel_idP), T_INT(tb_sizeP));
+
+ /* TODO: better handle mbms, maybe we should not change rnti here */
+ if (!enb_flagP && MBMS_flagP) {
+ rnti = 0xfffd;
+ /* TODO: handle channel_id properly */
+ if (channel_idP != 5) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ channel_id = 7;
+ } else {
+ rnti = rntiP;
+ channel_id = channel_idP;
+ }
+
+ rlc_manager_lock(rlc_ue_manager);
+ ue = rlc_manager_get_ue(rlc_ue_manager, rnti);
+
+ switch (channel_id) {
+ case 1 ... 2: rb = ue->srb[channel_id - 1]; break;
+ case 3 ... 7: rb = ue->drb[channel_id - 3]; break;
+ default: rb = NULL; break;
+ }
+
+ if (rb != NULL) {
+ rb->set_time(rb, rlc_current_time);
+ rb->recv_pdu(rb, buffer_pP, tb_sizeP);
+ } else {
+ LOG_E(RLC, "%s:%d:%s: fatal: no RB found (rnti %d channel ID %d)\n",
+ __FILE__, __LINE__, __FUNCTION__, rnti, channel_id);
+ exit(1);
+ }
+
+ rlc_manager_unlock(rlc_ue_manager);
+}
+
+tbs_size_t mac_rlc_data_req(
+ const module_id_t module_idP,
+ const rnti_t rntiP,
+ const eNB_index_t eNB_index,
+ const frame_t frameP,
+ const eNB_flag_t enb_flagP,
+ const MBMS_flag_t MBMS_flagP,
+ const logical_chan_id_t channel_idP,
+ const tb_size_t tb_sizeP,
+ char *buffer_pP,
+ const uint32_t sourceL2Id,
+ const uint32_t destinationL2Id
+ )
+{
+ int ret;
+ rlc_ue_t *ue;
+ rlc_entity_t *rb;
+ int maxsize;
+
+ rlc_manager_lock(rlc_ue_manager);
+ ue = rlc_manager_get_ue(rlc_ue_manager, rntiP);
+
+ switch (channel_idP) {
+ case 1 ... 2: rb = ue->srb[channel_idP - 1]; break;
+ case 3 ... 7: rb = ue->drb[channel_idP - 3]; break;
+ default: rb = NULL; break;
+ }
+
+ if (MBMS_flagP == MBMS_FLAG_YES) {
+ rb = ue->drb[channel_idP - 1];
+ }
+
+
+ if (rb != NULL) {
+ rb->set_time(rb, rlc_current_time);
+ maxsize = tb_sizeP;
+ ret = rb->generate_pdu(rb, buffer_pP, maxsize);
+ } else {
+ LOG_E(RLC, "%s:%d:%s: fatal: data req for unknown RB\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ ret = 0;
+ }
+
+ rlc_manager_unlock(rlc_ue_manager);
+
+ if (enb_flagP)
+ T(T_ENB_RLC_MAC_DL, T_INT(module_idP), T_INT(rntiP),
+ T_INT(channel_idP), T_INT(ret));
+
+ return ret;
+}
+
+mac_rlc_status_resp_t mac_rlc_status_ind(
+ const module_id_t module_idP,
+ const rnti_t rntiP,
+ const eNB_index_t eNB_index,
+ const frame_t frameP,
+ const sub_frame_t subframeP,
+ const eNB_flag_t enb_flagP,
+ const MBMS_flag_t MBMS_flagP,
+ const logical_chan_id_t channel_idP,
+ const uint32_t sourceL2Id,
+ const uint32_t destinationL2Id
+ )
+{
+ rlc_ue_t *ue;
+ mac_rlc_status_resp_t ret;
+ rlc_entity_t *rb;
+
+ /* TODO: handle time a bit more properly */
+ if (rlc_current_time_last_frame != frameP ||
+ rlc_current_time_last_subframe != subframeP) {
+ rlc_current_time++;
+ rlc_current_time_last_frame = frameP;
+ rlc_current_time_last_subframe = subframeP;
+ }
+
+ rlc_manager_lock(rlc_ue_manager);
+ ue = rlc_manager_get_ue(rlc_ue_manager, rntiP);
+
+ switch (channel_idP) {
+ case 1 ... 2: rb = ue->srb[channel_idP - 1]; break;
+ case 3 ... 7: rb = ue->drb[channel_idP - 3]; break;
+ default: rb = NULL; break;
+ }
+
+ if (MBMS_flagP == MBMS_FLAG_YES) {
+ rb = ue->drb[channel_idP - 1];
+ }
+
+ if (rb != NULL) {
+ rlc_entity_buffer_status_t buf_stat;
+ rb->set_time(rb, rlc_current_time);
+ /* 36.321 deals with BSR values up to 3000000 bytes, after what it
+ * reports '> 3000000' (table 6.1.3.1-2). Passing 4000000 is thus
+ * more than enough.
+ */
+ buf_stat = rb->buffer_status(rb, 4000000);
+ ret.bytes_in_buffer = buf_stat.status_size
+ + buf_stat.retx_size
+ + buf_stat.tx_size;
+ } else {
+ ret.bytes_in_buffer = 0;
+ }
+
+ rlc_manager_unlock(rlc_ue_manager);
+
+ ret.pdus_in_buffer = 0;
+ /* TODO: creation time may be important (unit: frame, as it seems) */
+ ret.head_sdu_creation_time = 0;
+ ret.head_sdu_remaining_size_to_send = 0;
+ ret.head_sdu_is_segmented = 0;
+ return ret;
+}
+
+rlc_buffer_occupancy_t mac_rlc_get_buffer_occupancy_ind(
+ const module_id_t module_idP,
+ const rnti_t rntiP,
+ const eNB_index_t eNB_index,
+ const frame_t frameP,
+ const sub_frame_t subframeP,
+ const eNB_flag_t enb_flagP,
+ const logical_chan_id_t channel_idP)
+{
+ rlc_ue_t *ue;
+ rlc_buffer_occupancy_t ret;
+ rlc_entity_t *rb;
+
+ if (enb_flagP) {
+ LOG_E(RLC, "Tx mac_rlc_get_buffer_occupancy_ind function is not implemented for eNB LcId=%u\n", channel_idP);
+ exit(1);
+ }
+
+ /* TODO: handle time a bit more properly */
+ if (rlc_current_time_last_frame != frameP ||
+ rlc_current_time_last_subframe != subframeP) {
+ rlc_current_time++;
+ rlc_current_time_last_frame = frameP;
+ rlc_current_time_last_subframe = subframeP;
+ }
+
+ rlc_manager_lock(rlc_ue_manager);
+ ue = rlc_manager_get_ue(rlc_ue_manager, rntiP);
+
+ switch (channel_idP) {
+ case 1 ... 2: rb = ue->srb[channel_idP - 1]; break;
+ case 3 ... 7: rb = ue->drb[channel_idP - 3]; break;
+ default: rb = NULL; break;
+ }
+
+ if (rb != NULL) {
+ rlc_entity_buffer_status_t buf_stat;
+ rb->set_time(rb, rlc_current_time);
+ /* 36.321 deals with BSR values up to 3000000 bytes, after what it
+ * reports '> 3000000' (table 6.1.3.1-2). Passing 4000000 is thus
+ * more than enough.
+ */
+ buf_stat = rb->buffer_status(rb, 4000000);
+ ret = buf_stat.status_size
+ + buf_stat.retx_size
+ + buf_stat.tx_size;
+ } else {
+ ret = 0;
+ }
+
+ rlc_manager_unlock(rlc_ue_manager);
+
+ return ret;
+}
+
+int oai_emulation;
+
+rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
+ const srb_flag_t srb_flagP,
+ const MBMS_flag_t MBMS_flagP,
+ const rb_id_t rb_idP,
+ const mui_t muiP,
+ confirm_t confirmP,
+ sdu_size_t sdu_sizeP,
+ mem_block_t *sdu_pP,
+ const uint32_t *const sourceL2Id,
+ const uint32_t *const destinationL2Id
+ )
+{
+ int rnti = ctxt_pP->rnti;
+ rlc_ue_t *ue;
+ rlc_entity_t *rb;
+
+ if (MBMS_flagP == MBMS_FLAG_YES)
+ rnti = 0xfffd;
+
+ LOG_D(RLC, "%s rnti %d srb_flag %d rb_id %d mui %d confirm %d sdu_size %d MBMS_flag %d\n",
+ __FUNCTION__, rnti, srb_flagP, (int)rb_idP, muiP, confirmP, sdu_sizeP,
+ MBMS_flagP);
+
+ if (ctxt_pP->enb_flag)
+ T(T_ENB_RLC_DL, T_INT(ctxt_pP->module_id),
+ T_INT(ctxt_pP->rnti), T_INT(rb_idP), T_INT(sdu_sizeP));
+
+ rlc_manager_lock(rlc_ue_manager);
+ ue = rlc_manager_get_ue(rlc_ue_manager, rnti);
+
+ rb = NULL;
+
+ if (srb_flagP) {
+ if (rb_idP >= 1 && rb_idP <= 2)
+ rb = ue->srb[rb_idP - 1];
+ } else {
+ if (rb_idP >= 1 && rb_idP <= 5)
+ rb = ue->drb[rb_idP - 1];
+ }
+ if( MBMS_flagP == MBMS_FLAG_YES) {
+ rb = ue->drb[rb_idP - 1];
+ }
+
+ if (rb != NULL) {
+ rb->set_time(rb, rlc_current_time);
+ rb->recv_sdu(rb, (char *)sdu_pP->data, sdu_sizeP, muiP);
+ } else {
+ LOG_E(RLC, "%s:%d:%s: fatal: SDU sent to unknown RB\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ rlc_manager_unlock(rlc_ue_manager);
+
+ free_mem_block(sdu_pP, __func__);
+
+ return RLC_OP_STATUS_OK;
+}
+
+int rlc_module_init(int enb_flag)
+{
+ static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+ static int inited = 0;
+
+ if (pthread_mutex_lock(&lock)) abort();
+
+ if (inited) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ inited = 1;
+
+ rlc_ue_manager = new_rlc_ue_manager(enb_flag);
+
+ if (pthread_mutex_unlock(&lock)) abort();
+
+ return 0;
+}
+
+void rlc_util_print_hex_octets(comp_name_t componentP, unsigned char *dataP, const signed long sizeP)
+{
+}
+
+#include "common/ran_context.h"
+extern RAN_CONTEXT_t RC;
+
+static void deliver_sdu(void *_ue, rlc_entity_t *entity, char *buf, int size)
+{
+ rlc_ue_t *ue = _ue;
+ int is_srb;
+ int rb_id;
+ protocol_ctxt_t ctx;
+ mem_block_t *memblock;
+ int i;
+ int is_enb;
+ int is_mbms;
+
+ /* TODO: be sure it's fine to check rnti for MBMS */
+ is_mbms = ue->rnti == 0xfffd;
+
+ /* is it SRB? */
+ for (i = 0; i < 2; i++) {
+ if (entity == ue->srb[i]) {
+ is_srb = 1;
+ rb_id = i+1;
+ goto rb_found;
+ }
+ }
+
+ /* maybe DRB? */
+ for (i = 0; i < 5; i++) {
+ if (entity == ue->drb[i]) {
+ is_srb = 0;
+ rb_id = i+1;
+ goto rb_found;
+ }
+ }
+
+ LOG_E(RLC, "%s:%d:%s: fatal, no RB found for ue %d\n",
+ __FILE__, __LINE__, __FUNCTION__, ue->rnti);
+ exit(1);
+
+rb_found:
+ LOG_D(RLC, "%s:%d:%s: delivering SDU (rnti %d is_srb %d rb_id %d) size %d",
+ __FILE__, __LINE__, __FUNCTION__, ue->rnti, is_srb, rb_id, size);
+
+ memblock = get_free_mem_block(size, __func__);
+ if (memblock == NULL) {
+ LOG_E(RLC, "%s:%d:%s: ERROR: get_free_mem_block failed\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ memcpy(memblock->data, buf, size);
+
+ /* unused fields? */
+ ctx.instance = ue->module_id;
+ ctx.frame = 0;
+ ctx.subframe = 0;
+ ctx.eNB_index = 0;
+ ctx.configured = 1;
+ ctx.brOption = 0;
+
+ /* used fields? */
+ ctx.module_id = ue->module_id;
+ ctx.rnti = ue->rnti;
+
+ is_enb = rlc_manager_get_enb_flag(rlc_ue_manager);
+ ctx.enb_flag = is_enb;
+
+ if (is_enb) {
+ T(T_ENB_RLC_UL,
+ T_INT(0 /*ctxt_pP->module_id*/),
+ T_INT(ue->rnti), T_INT(rb_id), T_INT(size));
+
+ const ngran_node_t type = RC.rrc[0 /*ctxt_pP->module_id*/]->node_type;
+ AssertFatal(type != ngran_eNB_CU && type != ngran_ng_eNB_CU && type != ngran_gNB_CU,
+ "Can't be CU, bad node type %d\n", type);
+
+ if (NODE_IS_DU(type) && is_srb == 1) {
+ MessageDef *msg = itti_alloc_new_message(TASK_RLC_ENB, F1AP_UL_RRC_MESSAGE);
+ F1AP_UL_RRC_MESSAGE(msg).rnti = ue->rnti;
+ F1AP_UL_RRC_MESSAGE(msg).srb_id = rb_id;
+ F1AP_UL_RRC_MESSAGE(msg).rrc_container = (unsigned char *)buf;
+ F1AP_UL_RRC_MESSAGE(msg).rrc_container_length = size;
+ itti_send_msg_to_task(TASK_DU_F1, ENB_MODULE_ID_TO_INSTANCE(0 /*ctxt_pP->module_id*/), msg);
+ return;
+ }
+ }
+
+ if (!get_pdcp_data_ind_func()(&ctx, is_srb, is_mbms, rb_id, size, memblock, NULL, NULL)) {
+ LOG_E(RLC, "%s:%d:%s: ERROR: pdcp_data_ind failed (is_srb %d rb_id %d rnti %d)\n",
+ __FILE__, __LINE__, __FUNCTION__,
+ is_srb, rb_id, ue->rnti);
+ /* what to do in case of failure? for the moment: nothing */
+ }
+}
+
+static void successful_delivery(void *_ue, rlc_entity_t *entity, int sdu_id)
+{
+ rlc_ue_t *ue = _ue;
+ int i;
+ int is_srb;
+ int rb_id;
+ MessageDef *msg;
+ int is_enb;
+
+ /* is it SRB? */
+ for (i = 0; i < 2; i++) {
+ if (entity == ue->srb[i]) {
+ is_srb = 1;
+ rb_id = i+1;
+ goto rb_found;
+ }
+ }
+
+ /* maybe DRB? */
+ for (i = 0; i < 5; i++) {
+ if (entity == ue->drb[i]) {
+ is_srb = 0;
+ rb_id = i+1;
+ goto rb_found;
+ }
+ }
+
+ LOG_E(RLC, "%s:%d:%s: fatal, no RB found for ue %d\n",
+ __FILE__, __LINE__, __FUNCTION__, ue->rnti);
+ exit(1);
+
+rb_found:
+ LOG_D(RLC, "sdu %d was successfully delivered on %s %d\n",
+ sdu_id,
+ is_srb ? "SRB" : "DRB",
+ rb_id);
+
+ /* TODO: do something for DRBs? */
+ if (is_srb == 0)
+ return;
+
+ is_enb = rlc_manager_get_enb_flag(rlc_ue_manager);
+ if (!is_enb)
+ return;
+
+ msg = itti_alloc_new_message(TASK_RLC_ENB, RLC_SDU_INDICATION);
+ RLC_SDU_INDICATION(msg).rnti = ue->rnti;
+ RLC_SDU_INDICATION(msg).is_successful = 1;
+ RLC_SDU_INDICATION(msg).srb_id = rb_id;
+ RLC_SDU_INDICATION(msg).message_id = sdu_id;
+ /* TODO: accept more than 1 instance? here we send to instance id 0 */
+ itti_send_msg_to_task(TASK_RRC_ENB, 0, msg);
+}
+
+static void max_retx_reached(void *_ue, rlc_entity_t *entity)
+{
+ rlc_ue_t *ue = _ue;
+ int i;
+ int is_srb;
+ int rb_id;
+ MessageDef *msg;
+ int is_enb;
+
+ /* is it SRB? */
+ for (i = 0; i < 2; i++) {
+ if (entity == ue->srb[i]) {
+ is_srb = 1;
+ rb_id = i+1;
+ goto rb_found;
+ }
+ }
+
+ /* maybe DRB? */
+ for (i = 0; i < 5; i++) {
+ if (entity == ue->drb[i]) {
+ is_srb = 0;
+ rb_id = i+1;
+ goto rb_found;
+ }
+ }
+
+ LOG_E(RLC, "%s:%d:%s: fatal, no RB found for ue %d\n",
+ __FILE__, __LINE__, __FUNCTION__, ue->rnti);
+ exit(1);
+
+rb_found:
+ LOG_D(RLC, "max RETX reached on %s %d\n",
+ is_srb ? "SRB" : "DRB",
+ rb_id);
+
+ /* TODO: do something for DRBs? */
+ if (is_srb == 0)
+ return;
+
+ is_enb = rlc_manager_get_enb_flag(rlc_ue_manager);
+ if (!is_enb)
+ return;
+
+ msg = itti_alloc_new_message(TASK_RLC_ENB, RLC_SDU_INDICATION);
+ RLC_SDU_INDICATION(msg).rnti = ue->rnti;
+ RLC_SDU_INDICATION(msg).is_successful = 0;
+ RLC_SDU_INDICATION(msg).srb_id = rb_id;
+ RLC_SDU_INDICATION(msg).message_id = -1;
+ /* TODO: accept more than 1 instance? here we send to instance id 0 */
+ itti_send_msg_to_task(TASK_RRC_ENB, 0, msg);
+}
+
+static void add_srb(int rnti, int module_id, struct LTE_SRB_ToAddMod *s)
+{
+ rlc_entity_t *rlc_am;
+ rlc_ue_t *ue;
+
+ struct LTE_SRB_ToAddMod__rlc_Config *r = s->rlc_Config;
+ struct LTE_SRB_ToAddMod__logicalChannelConfig *l = s->logicalChannelConfig;
+ int srb_id = s->srb_Identity;
+ int logical_channel_group;
+
+ int t_reordering;
+ int t_status_prohibit;
+ int t_poll_retransmit;
+ int poll_pdu;
+ int poll_byte;
+ int max_retx_threshold;
+
+ if (srb_id != 1 && srb_id != 2) {
+ LOG_E(RLC, "%s:%d:%s: fatal, bad srb id %d\n",
+ __FILE__, __LINE__, __FUNCTION__, srb_id);
+ exit(1);
+ }
+
+ switch (l->present) {
+ case LTE_SRB_ToAddMod__logicalChannelConfig_PR_explicitValue:
+ logical_channel_group = *l->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup;
+ break;
+ case LTE_SRB_ToAddMod__logicalChannelConfig_PR_defaultValue:
+ /* default value from 36.331 9.2.1 */
+ logical_channel_group = 0;
+ break;
+ default:
+ LOG_E(RLC, "%s:%d:%s: fatal error\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ /* TODO: accept other values? */
+ if (logical_channel_group != 0) {
+ LOG_E(RLC, "%s:%d:%s: fatal error\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ switch (r->present) {
+ case LTE_SRB_ToAddMod__rlc_Config_PR_explicitValue: {
+ struct LTE_RLC_Config__am *am;
+ if (r->choice.explicitValue.present != LTE_RLC_Config_PR_am) {
+ LOG_E(RLC, "%s:%d:%s: fatal error, must be RLC AM\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ am = &r->choice.explicitValue.choice.am;
+ t_reordering = decode_t_reordering(am->dl_AM_RLC.t_Reordering);
+ t_status_prohibit = decode_t_status_prohibit(am->dl_AM_RLC.t_StatusProhibit);
+ t_poll_retransmit = decode_t_poll_retransmit(am->ul_AM_RLC.t_PollRetransmit);
+ poll_pdu = decode_poll_pdu(am->ul_AM_RLC.pollPDU);
+ poll_byte = decode_poll_byte(am->ul_AM_RLC.pollByte);
+ max_retx_threshold = decode_max_retx_threshold(am->ul_AM_RLC.maxRetxThreshold);
+ break;
+ }
+ case LTE_SRB_ToAddMod__rlc_Config_PR_defaultValue:
+ /* default values from 36.331 9.2.1 */
+ t_reordering = 35;
+ t_status_prohibit = 0;
+ t_poll_retransmit = 45;
+ poll_pdu = -1;
+ poll_byte = -1;
+ max_retx_threshold = 4;
+ break;
+ default:
+ LOG_E(RLC, "%s:%d:%s: fatal error\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ rlc_manager_lock(rlc_ue_manager);
+ ue = rlc_manager_get_ue(rlc_ue_manager, rnti);
+ ue->module_id = module_id;
+ if (ue->srb[srb_id-1] != NULL) {
+ LOG_D(RLC, "%s:%d:%s: warning SRB %d already exist for ue %d, do nothing\n",
+ __FILE__, __LINE__, __FUNCTION__, srb_id, rnti);
+ } else {
+ rlc_am = new_rlc_entity_am(100000,
+ 100000,
+ deliver_sdu, ue,
+ successful_delivery, ue,
+ max_retx_reached, ue,
+ t_reordering, t_status_prohibit,
+ t_poll_retransmit,
+ poll_pdu, poll_byte, max_retx_threshold);
+ rlc_ue_add_srb_rlc_entity(ue, srb_id, rlc_am);
+
+ LOG_D(RLC, "%s:%d:%s: added srb %d to ue %d\n",
+ __FILE__, __LINE__, __FUNCTION__, srb_id, rnti);
+ }
+ rlc_manager_unlock(rlc_ue_manager);
+}
+
+static void add_drb_am(int rnti, int module_id, struct LTE_DRB_ToAddMod *s)
+{
+ rlc_entity_t *rlc_am;
+ rlc_ue_t *ue;
+
+ struct LTE_RLC_Config *r = s->rlc_Config;
+ struct LTE_LogicalChannelConfig *l = s->logicalChannelConfig;
+ int drb_id = s->drb_Identity;
+ int channel_id = *s->logicalChannelIdentity;
+ int logical_channel_group;
+
+ int t_reordering;
+ int t_status_prohibit;
+ int t_poll_retransmit;
+ int poll_pdu;
+ int poll_byte;
+ int max_retx_threshold;
+
+ if (!(drb_id >= 1 && drb_id <= 5)) {
+ LOG_E(RLC, "%s:%d:%s: fatal, bad srb id %d\n",
+ __FILE__, __LINE__, __FUNCTION__, drb_id);
+ exit(1);
+ }
+
+ if (channel_id != drb_id + 2) {
+ LOG_E(RLC, "%s:%d:%s: todo, remove this limitation\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ logical_channel_group = *l->ul_SpecificParameters->logicalChannelGroup;
+
+ /* TODO: accept other values? */
+ if (logical_channel_group != 1) {
+ LOG_E(RLC, "%s:%d:%s: fatal error\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ switch (r->present) {
+ case LTE_RLC_Config_PR_am: {
+ struct LTE_RLC_Config__am *am;
+ am = &r->choice.am;
+ t_reordering = decode_t_reordering(am->dl_AM_RLC.t_Reordering);
+ t_status_prohibit = decode_t_status_prohibit(am->dl_AM_RLC.t_StatusProhibit);
+ t_poll_retransmit = decode_t_poll_retransmit(am->ul_AM_RLC.t_PollRetransmit);
+ poll_pdu = decode_poll_pdu(am->ul_AM_RLC.pollPDU);
+ poll_byte = decode_poll_byte(am->ul_AM_RLC.pollByte);
+ max_retx_threshold = decode_max_retx_threshold(am->ul_AM_RLC.maxRetxThreshold);
+ break;
+ }
+ default:
+ LOG_E(RLC, "%s:%d:%s: fatal error\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ rlc_manager_lock(rlc_ue_manager);
+ ue = rlc_manager_get_ue(rlc_ue_manager, rnti);
+ ue->module_id = module_id;
+ if (ue->drb[drb_id-1] != NULL) {
+ LOG_D(RLC, "%s:%d:%s: warning DRB %d already exist for ue %d, do nothing\n",
+ __FILE__, __LINE__, __FUNCTION__, drb_id, rnti);
+ } else {
+ rlc_am = new_rlc_entity_am(1000000,
+ 1000000,
+ deliver_sdu, ue,
+ successful_delivery, ue,
+ max_retx_reached, ue,
+ t_reordering, t_status_prohibit,
+ t_poll_retransmit,
+ poll_pdu, poll_byte, max_retx_threshold);
+ rlc_ue_add_drb_rlc_entity(ue, drb_id, rlc_am);
+
+ LOG_D(RLC, "%s:%d:%s: added drb %d to ue %d\n",
+ __FILE__, __LINE__, __FUNCTION__, drb_id, rnti);
+ }
+ rlc_manager_unlock(rlc_ue_manager);
+}
+
+static void add_drb_um(int rnti, int module_id, struct LTE_DRB_ToAddMod *s)
+{
+ rlc_entity_t *rlc_um;
+ rlc_ue_t *ue;
+
+ struct LTE_RLC_Config *r = s->rlc_Config;
+ struct LTE_LogicalChannelConfig *l = s->logicalChannelConfig;
+ int drb_id = s->drb_Identity;
+ int channel_id = *s->logicalChannelIdentity;
+ int logical_channel_group;
+
+ int t_reordering;
+ int sn_field_length;
+
+ if (!(drb_id >= 1 && drb_id <= 5)) {
+ LOG_E(RLC, "%s:%d:%s: fatal, bad srb id %d\n",
+ __FILE__, __LINE__, __FUNCTION__, drb_id);
+ exit(1);
+ }
+
+ if (channel_id != drb_id + 2) {
+ LOG_E(RLC, "%s:%d:%s: todo, remove this limitation\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ logical_channel_group = *l->ul_SpecificParameters->logicalChannelGroup;
+
+ /* TODO: accept other values? */
+ if (logical_channel_group != 1) {
+ LOG_E(RLC, "%s:%d:%s: fatal error\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ switch (r->present) {
+ case LTE_RLC_Config_PR_um_Bi_Directional: {
+ struct LTE_RLC_Config__um_Bi_Directional *um;
+ um = &r->choice.um_Bi_Directional;
+ t_reordering = decode_t_reordering(um->dl_UM_RLC.t_Reordering);
+ if (um->dl_UM_RLC.sn_FieldLength != um->ul_UM_RLC.sn_FieldLength) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ sn_field_length = decode_sn_field_length(um->dl_UM_RLC.sn_FieldLength);
+ break;
+ }
+ default:
+ LOG_E(RLC, "%s:%d:%s: fatal error\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ rlc_manager_lock(rlc_ue_manager);
+ ue = rlc_manager_get_ue(rlc_ue_manager, rnti);
+ ue->module_id = module_id;
+ if (ue->drb[drb_id-1] != NULL) {
+ LOG_D(RLC, "%s:%d:%s: warning DRB %d already exist for ue %d, do nothing\n",
+ __FILE__, __LINE__, __FUNCTION__, drb_id, rnti);
+ } else {
+ rlc_um = new_rlc_entity_um(1000000,
+ 1000000,
+ deliver_sdu, ue,
+ t_reordering,
+ sn_field_length);
+ rlc_ue_add_drb_rlc_entity(ue, drb_id, rlc_um);
+
+ LOG_D(RLC, "%s:%d:%s: added drb %d to ue %d\n",
+ __FILE__, __LINE__, __FUNCTION__, drb_id, rnti);
+ }
+ rlc_manager_unlock(rlc_ue_manager);
+}
+
+static void add_drb(int rnti, int module_id, struct LTE_DRB_ToAddMod *s)
+{
+ switch (s->rlc_Config->present) {
+ case LTE_RLC_Config_PR_am:
+ add_drb_am(rnti, module_id, s);
+ break;
+ case LTE_RLC_Config_PR_um_Bi_Directional:
+ add_drb_um(rnti, module_id, s);
+ break;
+ default:
+ LOG_E(RLC, "%s:%d:%s: fatal: unhandled DRB type\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+}
+
+rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP,
+ const LTE_SRB_ToAddModList_t * const srb2add_listP,
+ const LTE_DRB_ToAddModList_t * const drb2add_listP,
+ const LTE_DRB_ToReleaseList_t * const drb2release_listP,
+ const LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP,
+ const uint32_t sourceL2Id,
+ const uint32_t destinationL2Id
+ )
+{
+ int rnti = ctxt_pP->rnti;
+ int module_id = ctxt_pP->module_id;
+ int i;
+ int j;
+
+ if (ctxt_pP->enb_flag == 1 &&
+ (ctxt_pP->module_id != 0 || ctxt_pP->instance != 0)) {
+ LOG_E(RLC, "%s: module_id != 0 or instance != 0 not handled for eNB\n",
+ __FUNCTION__);
+ exit(1);
+ }
+
+ if (0 /*||
+ ctxt_pP->instance != 0 || ctxt_pP->eNB_index != 0 ||
+ ctxt_pP->configured != 1 || ctxt_pP->brOption != 0 */) {
+ LOG_E(RLC, "%s: ctxt_pP not handled (%d %d %d %d %d %d)\n", __FUNCTION__,
+ ctxt_pP->enb_flag , ctxt_pP->module_id, ctxt_pP->instance,
+ ctxt_pP->eNB_index, ctxt_pP->configured, ctxt_pP->brOption);
+ exit(1);
+ }
+
+ if (pmch_InfoList_r9_pP != NULL) {
+ int mbms_rnti = 0xfffd;
+ LTE_MBMS_SessionInfoList_r9_t *mbms_SessionInfoList_r9_p = NULL;
+ LTE_MBMS_SessionInfo_r9_t *MBMS_SessionInfo_p = NULL;
+ mbms_session_id_t mbms_session_id;
+ mbms_service_id_t mbms_service_id;
+ rb_id_t drb_id = 0;
+ logical_chan_id_t lc_id = 0;
+ //LTE_DRB_Identity_t drb_id = 0;
+ //LTE_DRB_Identity_t* pdrb_id = NULL;
+
+ for (i=0; i<pmch_InfoList_r9_pP->list.count; i++) {
+ mbms_SessionInfoList_r9_p = &(pmch_InfoList_r9_pP->list.array[i]->mbms_SessionInfoList_r9);
+
+ for (j=0; j<mbms_SessionInfoList_r9_p->list.count; j++) {
+ MBMS_SessionInfo_p = mbms_SessionInfoList_r9_p->list.array[j];
+ if (0/*MBMS_SessionInfo_p->sessionId_r9*/)
+ mbms_session_id = MBMS_SessionInfo_p->sessionId_r9->buf[0];
+ else
+ mbms_session_id = MBMS_SessionInfo_p->logicalChannelIdentity_r9;
+ lc_id = mbms_session_id;
+ mbms_service_id = MBMS_SessionInfo_p->tmgi_r9.serviceId_r9.buf[2]; //serviceId is 3-octet string
+// mbms_service_id = j;
+
+ // can set the mch_id = i
+ if (ctxt_pP->enb_flag) {
+ drb_id = (mbms_service_id * LTE_maxSessionPerPMCH ) + mbms_session_id;//+ (LTE_maxDRB + 3) * MAX_MOBILES_PER_ENB; // 1
+ } else {
+ drb_id = (mbms_service_id * LTE_maxSessionPerPMCH ) + mbms_session_id; // + (LTE_maxDRB + 3); // 15
+ }
+
+ LOG_I(RLC, PROTOCOL_CTXT_FMT" CONFIG REQ MBMS ASN1 LC ID %u RB ID %u SESSION ID %u SERVICE ID %u, mbms_rnti %x\n",
+ PROTOCOL_CTXT_ARGS(ctxt_pP),
+ lc_id,
+ (int)drb_id,
+ mbms_session_id,
+ mbms_service_id,
+ mbms_rnti
+ );
+
+ rlc_entity_t *rlc_um;
+ rlc_ue_t *ue;
+
+ //drb_id = rb_id;
+
+ rlc_manager_lock(rlc_ue_manager);
+ ue = rlc_manager_get_ue(rlc_ue_manager, mbms_rnti);
+ if (ue->drb[drb_id-1] != NULL) {
+ LOG_D(RLC, "%s:%d:%s: warning DRB %d already exist for ue %d, do nothing\n",
+ __FILE__, __LINE__, __FUNCTION__, (int)drb_id, mbms_rnti);
+ } else {
+ rlc_um = new_rlc_entity_um(1000000,
+ 1000000,
+ deliver_sdu, ue,
+ 0,//LTE_T_Reordering_ms0,//t_reordering,
+ 5//LTE_SN_FieldLength_size5//sn_field_length
+ );
+ rlc_ue_add_drb_rlc_entity(ue, drb_id, rlc_um);
+
+ LOG_D(RLC, "%s:%d:%s: added drb %d to ue %d\n",
+ __FILE__, __LINE__, __FUNCTION__, (int)drb_id, mbms_rnti);
+ }
+ rlc_manager_unlock(rlc_ue_manager);
+
+ }
+ }
+
+ }
+
+ if (drb2release_listP != NULL) {
+ LOG_E(RLC, "%s:%d:%s: TODO\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ if (srb2add_listP != NULL) {
+ for (i = 0; i < srb2add_listP->list.count; i++) {
+ add_srb(rnti, module_id, srb2add_listP->list.array[i]);
+ }
+ }
+
+ if (drb2add_listP != NULL) {
+ for (i = 0; i < drb2add_listP->list.count; i++) {
+ add_drb(rnti, module_id, drb2add_listP->list.array[i]);
+ }
+ }
+
+ return RLC_OP_STATUS_OK;
+}
+
+rlc_op_status_t rrc_rlc_config_req (
+ const protocol_ctxt_t* const ctxt_pP,
+ const srb_flag_t srb_flagP,
+ const MBMS_flag_t mbms_flagP,
+ const config_action_t actionP,
+ const rb_id_t rb_idP,
+ const rlc_info_t rlc_infoP)
+{
+ rlc_ue_t *ue;
+ int i;
+
+ if (mbms_flagP) {
+ LOG_E(RLC, "%s:%d:%s: todo (mbms not supported)\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ if (actionP != CONFIG_ACTION_REMOVE) {
+ LOG_E(RLC, "%s:%d:%s: todo (only CONFIG_ACTION_REMOVE supported)\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ if (ctxt_pP->module_id) {
+ LOG_E(RLC, "%s:%d:%s: todo (only module_id 0 supported)\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ if ((srb_flagP && !(rb_idP >= 1 && rb_idP <= 2)) ||
+ (!srb_flagP && !(rb_idP >= 1 && rb_idP <= 5))) {
+ LOG_E(RLC, "%s:%d:%s: bad rb_id (%d) (is_srb %d)\n", __FILE__, __LINE__, __FUNCTION__, (int)rb_idP, srb_flagP);
+ exit(1);
+ }
+ rlc_manager_lock(rlc_ue_manager);
+ LOG_D(RLC, "%s:%d:%s: remove rb %d (is_srb %d) for UE %d\n", __FILE__, __LINE__, __FUNCTION__, (int)rb_idP, srb_flagP, ctxt_pP->rnti);
+ ue = rlc_manager_get_ue(rlc_ue_manager, ctxt_pP->rnti);
+ if (srb_flagP) {
+ if (ue->srb[rb_idP-1] != NULL) {
+ ue->srb[rb_idP-1]->delete(ue->srb[rb_idP-1]);
+ ue->srb[rb_idP-1] = NULL;
+ } else
+ LOG_W(RLC, "removing non allocated SRB %d, do nothing\n", (int)rb_idP);
+ } else {
+ if (ue->drb[rb_idP-1] != NULL) {
+ ue->drb[rb_idP-1]->delete(ue->drb[rb_idP-1]);
+ ue->drb[rb_idP-1] = NULL;
+ } else
+ LOG_W(RLC, "removing non allocated DRB %d, do nothing\n", (int)rb_idP);
+ }
+ /* remove UE if it has no more RB configured */
+ for (i = 0; i < 2; i++)
+ if (ue->srb[i] != NULL)
+ break;
+ if (i == 2) {
+ for (i = 0; i < 5; i++)
+ if (ue->drb[i] != NULL)
+ break;
+ if (i == 5)
+ rlc_manager_remove_ue(rlc_ue_manager, ctxt_pP->rnti);
+ }
+ rlc_manager_unlock(rlc_ue_manager);
+ return RLC_OP_STATUS_OK;
+}
+
+void rrc_rlc_register_rrc (rrc_data_ind_cb_t rrc_data_indP, rrc_data_conf_cb_t rrc_data_confP)
+{
+ /* nothing to do */
+}
+
+rlc_op_status_t rrc_rlc_remove_ue (const protocol_ctxt_t* const x)
+{
+ LOG_D(RLC, "%s:%d:%s: remove UE %d\n", __FILE__, __LINE__, __FUNCTION__, x->rnti);
+ rlc_manager_lock(rlc_ue_manager);
+ rlc_manager_remove_ue(rlc_ue_manager, x->rnti);
+ rlc_manager_unlock(rlc_ue_manager);
+
+ return RLC_OP_STATUS_OK;
+}
diff --git a/openair2/LAYER2/rlc_v2/rlc_pdu.c b/openair2/LAYER2/rlc_v2/rlc_pdu.c
new file mode 100644
index 0000000000000000000000000000000000000000..c55e2d9c3c54bcd6b7415146f9688f8cc500699c
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_pdu.c
@@ -0,0 +1,266 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "rlc_pdu.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "LOG/log.h"
+
+/**************************************************************************/
+/* RX PDU segment and segment list */
+/**************************************************************************/
+
+rlc_rx_pdu_segment_t *rlc_rx_new_pdu_segment(int sn, int so, int size,
+ int is_last, char *data, int data_offset)
+{
+ rlc_rx_pdu_segment_t *ret = malloc(sizeof(rlc_rx_pdu_segment_t));
+ if (ret == NULL) {
+ LOG_E(RLC, "%s:%d:%s: out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ ret->sn = sn;
+ ret->so = so;
+ ret->size = size;
+ ret->is_last = is_last;
+ ret->next = NULL;
+
+ ret->data = malloc(size);
+ if (ret->data == NULL) {
+ LOG_E(RLC, "%s:%d:%s: out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ memcpy(ret->data, data, size);
+
+ ret->data_offset = data_offset;
+
+ return ret;
+}
+
+void rlc_rx_free_pdu_segment(rlc_rx_pdu_segment_t *pdu_segment)
+{
+ free(pdu_segment->data);
+ free(pdu_segment);
+}
+
+rlc_rx_pdu_segment_t *rlc_rx_pdu_segment_list_add(
+ int (*sn_compare)(void *, int, int), void *sn_compare_data,
+ rlc_rx_pdu_segment_t *list, rlc_rx_pdu_segment_t *pdu_segment)
+{
+ rlc_rx_pdu_segment_t head;
+ rlc_rx_pdu_segment_t *cur;
+ rlc_rx_pdu_segment_t *prev;
+
+ head.next = list;
+ cur = list;
+ prev = &head;
+
+ /* order is by 'sn', if 'sn' is the same then order is by 'so' */
+ while (cur != NULL) {
+ /* check if 'pdu_segment' is before 'cur' in the list */
+ if (sn_compare(sn_compare_data, cur->sn, pdu_segment->sn) > 0 ||
+ (cur->sn == pdu_segment->sn && cur->so > pdu_segment->so)) {
+ break;
+ }
+ prev = cur;
+ cur = cur->next;
+ }
+ prev->next = pdu_segment;
+ pdu_segment->next = cur;
+ return head.next;
+}
+
+/**************************************************************************/
+/* TX PDU management */
+/**************************************************************************/
+
+rlc_tx_pdu_segment_t *rlc_tx_new_pdu(void)
+{
+ rlc_tx_pdu_segment_t *ret = calloc(1, sizeof(rlc_tx_pdu_segment_t));
+ if (ret == NULL) {
+ LOG_E(RLC, "%s:%d:%s: out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ ret->retx_count = -1;
+ return ret;
+}
+
+void rlc_tx_free_pdu(rlc_tx_pdu_segment_t *pdu)
+{
+ free(pdu);
+}
+
+rlc_tx_pdu_segment_t *rlc_tx_pdu_list_append(rlc_tx_pdu_segment_t *list,
+ rlc_tx_pdu_segment_t *pdu)
+{
+ rlc_tx_pdu_segment_t head;
+ rlc_tx_pdu_segment_t *cur;
+
+ head.next = list;
+
+ cur = &head;
+ while (cur->next != NULL) {
+ cur = cur->next;
+ }
+ cur->next = pdu;
+
+ return head.next;
+}
+
+rlc_tx_pdu_segment_t *rlc_tx_pdu_list_add(
+ int (*sn_compare)(void *, int, int), void *sn_compare_data,
+ rlc_tx_pdu_segment_t *list, rlc_tx_pdu_segment_t *pdu_segment)
+{
+ rlc_tx_pdu_segment_t head;
+ rlc_tx_pdu_segment_t *cur;
+ rlc_tx_pdu_segment_t *prev;
+
+ head.next = list;
+ cur = list;
+ prev = &head;
+
+ /* order is by 'sn', if 'sn' is the same then order is by 'so' */
+ while (cur != NULL) {
+ /* check if 'pdu_segment' is before 'cur' in the list */
+ if (sn_compare(sn_compare_data, cur->sn, pdu_segment->sn) > 0 ||
+ (cur->sn == pdu_segment->sn && cur->so > pdu_segment->so)) {
+ break;
+ }
+ prev = cur;
+ cur = cur->next;
+ }
+ prev->next = pdu_segment;
+ pdu_segment->next = cur;
+ return head.next;
+}
+
+/**************************************************************************/
+/* PDU decoder */
+/**************************************************************************/
+
+void rlc_pdu_decoder_init(rlc_pdu_decoder_t *decoder, char *buffer, int size)
+{
+ decoder->error = 0;
+ decoder->byte = 0;
+ decoder->bit = 0;
+ decoder->buffer = buffer;
+ decoder->size = size;
+}
+
+static int get_bit(rlc_pdu_decoder_t *decoder)
+{
+ int ret;
+
+ if (decoder->byte >= decoder->size) {
+ decoder->error = 1;
+ return 0;
+ }
+
+ ret = (decoder->buffer[decoder->byte] >> (7 - decoder->bit)) & 1;
+
+ decoder->bit++;
+ if (decoder->bit == 8) {
+ decoder->bit = 0;
+ decoder->byte++;
+ }
+
+ return ret;
+}
+
+int rlc_pdu_decoder_get_bits(rlc_pdu_decoder_t *decoder, int count)
+{
+ int ret = 0;
+ int i;
+
+ if (count > 31) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ for (i = 0; i < count; i++) {
+ ret <<= 1;
+ ret |= get_bit(decoder);
+ if (decoder->error) return -1;
+ }
+
+ return ret;
+}
+
+void rlc_pdu_decoder_align(rlc_pdu_decoder_t *decoder)
+{
+ if (decoder->bit) {
+ decoder->bit = 0;
+ decoder->byte++;
+ }
+}
+
+/**************************************************************************/
+/* PDU encoder */
+/**************************************************************************/
+
+void rlc_pdu_encoder_init(rlc_pdu_encoder_t *encoder, char *buffer, int size)
+{
+ encoder->byte = 0;
+ encoder->bit = 0;
+ encoder->buffer = buffer;
+ encoder->size = size;
+}
+
+static void put_bit(rlc_pdu_encoder_t *encoder, int bit)
+{
+ if (encoder->byte == encoder->size) {
+ LOG_E(RLC, "%s:%d:%s: fatal, buffer full\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ encoder->buffer[encoder->byte] <<= 1;
+ if (bit)
+ encoder->buffer[encoder->byte] |= 1;
+
+ encoder->bit++;
+ if (encoder->bit == 8) {
+ encoder->bit = 0;
+ encoder->byte++;
+ }
+}
+
+void rlc_pdu_encoder_put_bits(rlc_pdu_encoder_t *encoder, int value, int count)
+{
+ int i;
+ int x;
+
+ if (count > 31) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ x = 1 << (count - 1);
+ for (i = 0; i < count; i++, x >>= 1)
+ put_bit(encoder, value & x);
+}
+
+void rlc_pdu_encoder_align(rlc_pdu_encoder_t *encoder)
+{
+ while (encoder->bit)
+ put_bit(encoder, 0);
+}
diff --git a/openair2/LAYER2/rlc_v2/rlc_pdu.h b/openair2/LAYER2/rlc_v2/rlc_pdu.h
new file mode 100644
index 0000000000000000000000000000000000000000..dbffe9f3cbff92fe706985af5bfcc5156b2f52b9
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_pdu.h
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#ifndef _RLC_PDU_H_
+#define _RLC_PDU_H_
+
+/**************************************************************************/
+/* RX PDU segment and segment list */
+/**************************************************************************/
+
+typedef struct rlc_rx_pdu_segment_t {
+ int sn;
+ int so;
+ int size;
+ int is_last;
+ char *data;
+ int data_offset;
+ struct rlc_rx_pdu_segment_t *next;
+} rlc_rx_pdu_segment_t;
+
+rlc_rx_pdu_segment_t *rlc_rx_new_pdu_segment(int sn, int so, int size,
+ int is_last, char *data, int data_offset);
+
+void rlc_rx_free_pdu_segment(rlc_rx_pdu_segment_t *pdu_segment);
+
+rlc_rx_pdu_segment_t *rlc_rx_pdu_segment_list_add(
+ int (*sn_compare)(void *, int, int), void *sn_compare_data,
+ rlc_rx_pdu_segment_t *list, rlc_rx_pdu_segment_t *pdu_segment);
+
+/**************************************************************************/
+/* TX PDU management */
+/**************************************************************************/
+
+typedef struct rlc_tx_pdu_segment_t {
+ int sn;
+ void *start_sdu; /* real type is rlc_sdu_t * */
+ int sdu_start_byte; /* starting byte in 'start_sdu' */
+ int so; /* starting byte of the segment in full PDU */
+ int data_size; /* number of data bytes (exclude header) */
+ int is_segment;
+ int is_last;
+ int retx_count;
+ struct rlc_tx_pdu_segment_t *next;
+} rlc_tx_pdu_segment_t;
+
+rlc_tx_pdu_segment_t *rlc_tx_new_pdu(void);
+void rlc_tx_free_pdu(rlc_tx_pdu_segment_t *pdu);
+rlc_tx_pdu_segment_t *rlc_tx_pdu_list_append(rlc_tx_pdu_segment_t *list,
+ rlc_tx_pdu_segment_t *pdu);
+rlc_tx_pdu_segment_t *rlc_tx_pdu_list_add(
+ int (*sn_compare)(void *, int, int), void *sn_compare_data,
+ rlc_tx_pdu_segment_t *list, rlc_tx_pdu_segment_t *pdu_segment);
+
+/**************************************************************************/
+/* PDU decoder */
+/**************************************************************************/
+
+typedef struct {
+ int error;
+ int byte; /* next byte to decode */
+ int bit; /* next bit in next byte to decode */
+ char *buffer;
+ int size;
+} rlc_pdu_decoder_t;
+
+void rlc_pdu_decoder_init(rlc_pdu_decoder_t *decoder, char *buffer, int size);
+
+#define rlc_pdu_decoder_in_error(d) ((d)->error == 1)
+
+int rlc_pdu_decoder_get_bits(rlc_pdu_decoder_t *decoder, int count);
+
+void rlc_pdu_decoder_align(rlc_pdu_decoder_t *decoder);
+
+/**************************************************************************/
+/* PDU encoder */
+/**************************************************************************/
+
+typedef struct {
+ int byte; /* next byte to encode */
+ int bit; /* next bit in next byte to encode */
+ char *buffer;
+ int size;
+} rlc_pdu_encoder_t;
+
+void rlc_pdu_encoder_init(rlc_pdu_encoder_t *encoder, char *buffer, int size);
+
+void rlc_pdu_encoder_put_bits(rlc_pdu_encoder_t *encoder, int value, int count);
+
+void rlc_pdu_encoder_align(rlc_pdu_encoder_t *encoder);
+
+#endif /* _RLC_PDU_H_ */
diff --git a/openair2/LAYER2/rlc_v2/rlc_sdu.c b/openair2/LAYER2/rlc_v2/rlc_sdu.c
new file mode 100644
index 0000000000000000000000000000000000000000..16465a9ff13bede7314c4ee0c9eef757242944c5
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_sdu.c
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "rlc_sdu.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "LOG/log.h"
+
+rlc_sdu_t *rlc_new_sdu(char *buffer, int size, int upper_layer_id)
+{
+ rlc_sdu_t *ret = calloc(1, sizeof(rlc_sdu_t));
+ if (ret == NULL)
+ goto oom;
+
+ ret->upper_layer_id = upper_layer_id;
+
+ ret->data = malloc(size);
+ if (ret->data == NULL)
+ goto oom;
+
+ memcpy(ret->data, buffer, size);
+
+ ret->size = size;
+
+ return ret;
+
+oom:
+ LOG_E(RLC, "%s:%d:%s: out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+}
+
+void rlc_free_sdu(rlc_sdu_t *sdu)
+{
+ free(sdu->data);
+ free(sdu);
+}
+
+void rlc_sdu_list_add(rlc_sdu_t **list, rlc_sdu_t **end, rlc_sdu_t *sdu)
+{
+ if (*list == NULL) {
+ *list = sdu;
+ *end = sdu;
+ return;
+ }
+
+ (*end)->next = sdu;
+ *end = sdu;
+}
diff --git a/openair2/UTIL/MEM/mem_pool.h b/openair2/LAYER2/rlc_v2/rlc_sdu.h
similarity index 69%
rename from openair2/UTIL/MEM/mem_pool.h
rename to openair2/LAYER2/rlc_v2/rlc_sdu.h
index cc0face78c673afa37a2b78367fe4d2193956732..2c678956ee47a1286db4a2838a1ac96cc1129e72 100644
--- a/openair2/UTIL/MEM/mem_pool.h
+++ b/openair2/LAYER2/rlc_v2/rlc_sdu.h
@@ -19,20 +19,21 @@
* contact@openairinterface.org
*/
-/***************************************************************************
- mem_pool.h - description
- -------------------
- AUTHOR : Lionel GAUTHIER
- COMPANY : EURECOM
- EMAIL : Lionel.Gauthier@eurecom.fr
+#ifndef _RLC_SDU_H_
+#define _RLC_SDU_H_
+typedef struct rlc_sdu_t {
+ int upper_layer_id;
+ char *data;
+ int size;
+ /* next_byte indicates the starting byte to use to construct a new PDU */
+ int next_byte;
+ int acked_bytes;
+ struct rlc_sdu_t *next;
+} rlc_sdu_t;
- ***************************************************************************/
-#ifndef __MEM_POOL_H__
-# define __MEM_POOL_H__
+rlc_sdu_t *rlc_new_sdu(char *buffer, int size, int upper_layer_id);
+void rlc_free_sdu(rlc_sdu_t *sdu);
+void rlc_sdu_list_add(rlc_sdu_t **list, rlc_sdu_t **end, rlc_sdu_t *sdu);
-# include "list.h"
-# include "mem_block.h"
-
-
-#endif
+#endif /* _RLC_SDU_H_ */
diff --git a/openair2/LAYER2/rlc_v2/rlc_ue_manager.c b/openair2/LAYER2/rlc_v2/rlc_ue_manager.c
new file mode 100644
index 0000000000000000000000000000000000000000..1fd366fda1523a73c35aa91d9127ea66e51c9ffd
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_ue_manager.c
@@ -0,0 +1,190 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#include "rlc_ue_manager.h"
+
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "LOG/log.h"
+
+typedef struct {
+ pthread_mutex_t lock;
+ rlc_ue_t **ue_list;
+ int ue_count;
+ int enb_flag;
+} rlc_ue_manager_internal_t;
+
+rlc_ue_manager_t *new_rlc_ue_manager(int enb_flag)
+{
+ rlc_ue_manager_internal_t *ret;
+
+ ret = calloc(1, sizeof(rlc_ue_manager_internal_t));
+ if (ret == NULL) {
+ LOG_E(RLC, "%s:%d:%s: out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ if (pthread_mutex_init(&ret->lock, NULL)) abort();
+ ret->enb_flag = enb_flag;
+
+ return ret;
+}
+
+int rlc_manager_get_enb_flag(rlc_ue_manager_t *_m)
+{
+ rlc_ue_manager_internal_t *m = _m;
+ return m->enb_flag;
+}
+
+void rlc_manager_lock(rlc_ue_manager_t *_m)
+{
+ rlc_ue_manager_internal_t *m = _m;
+ if (pthread_mutex_lock(&m->lock)) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+}
+
+void rlc_manager_unlock(rlc_ue_manager_t *_m)
+{
+ rlc_ue_manager_internal_t *m = _m;
+ if (pthread_mutex_unlock(&m->lock)) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+}
+
+/* must be called with lock acquired */
+rlc_ue_t *rlc_manager_get_ue(rlc_ue_manager_t *_m, int rnti)
+{
+ /* TODO: optimze */
+ rlc_ue_manager_internal_t *m = _m;
+ int i;
+
+ for (i = 0; i < m->ue_count; i++)
+ if (m->ue_list[i]->rnti == rnti)
+ return m->ue_list[i];
+
+ LOG_D(RLC, "%s:%d:%s: new UE %d\n", __FILE__, __LINE__, __FUNCTION__, rnti);
+
+ m->ue_count++;
+ m->ue_list = realloc(m->ue_list, sizeof(rlc_ue_t *) * m->ue_count);
+ if (m->ue_list == NULL) {
+ LOG_E(RLC, "%s:%d:%s: out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+ m->ue_list[m->ue_count-1] = calloc(1, sizeof(rlc_ue_t));
+ if (m->ue_list[m->ue_count-1] == NULL) {
+ LOG_E(RLC, "%s:%d:%s: out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ m->ue_list[m->ue_count-1]->rnti = rnti;
+
+ return m->ue_list[m->ue_count-1];
+}
+
+/* must be called with lock acquired */
+void rlc_manager_remove_ue(rlc_ue_manager_t *_m, int rnti)
+{
+ rlc_ue_manager_internal_t *m = _m;
+ rlc_ue_t *ue;
+ int i;
+ int j;
+
+ for (i = 0; i < m->ue_count; i++)
+ if (m->ue_list[i]->rnti == rnti)
+ break;
+
+ if (i == m->ue_count) {
+ LOG_D(RLC, "%s:%d:%s: warning: ue %d not found\n",
+ __FILE__, __LINE__, __FUNCTION__,
+ rnti);
+ return;
+ }
+
+ ue = m->ue_list[i];
+
+ for (j = 0; j < 2; j++)
+ if (ue->srb[j] != NULL)
+ ue->srb[j]->delete(ue->srb[j]);
+
+ for (j = 0; j < 5; j++)
+ if (ue->drb[j] != NULL)
+ ue->drb[j]->delete(ue->drb[j]);
+
+ free(ue);
+
+ m->ue_count--;
+ if (m->ue_count == 0) {
+ free(m->ue_list);
+ m->ue_list = NULL;
+ return;
+ }
+
+ memmove(&m->ue_list[i], &m->ue_list[i+1],
+ (m->ue_count - i) * sizeof(rlc_ue_t *));
+ m->ue_list = realloc(m->ue_list, m->ue_count * sizeof(rlc_ue_t *));
+ if (m->ue_list == NULL) {
+ LOG_E(RLC, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+}
+
+/* must be called with lock acquired */
+void rlc_ue_add_srb_rlc_entity(rlc_ue_t *ue, int srb_id, rlc_entity_t *entity)
+{
+ if (srb_id < 1 || srb_id > 2) {
+ LOG_E(RLC, "%s:%d:%s: fatal, bad srb id\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ srb_id--;
+
+ if (ue->srb[srb_id] != NULL) {
+ LOG_E(RLC, "%s:%d:%s: fatal, srb already present\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ ue->srb[srb_id] = entity;
+}
+
+/* must be called with lock acquired */
+void rlc_ue_add_drb_rlc_entity(rlc_ue_t *ue, int drb_id, rlc_entity_t *entity)
+{
+ if (drb_id < 1 || drb_id > 5) {
+ LOG_E(RLC, "%s:%d:%s: fatal, bad drb id\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ drb_id--;
+
+ if (ue->drb[drb_id] != NULL) {
+ LOG_E(RLC, "%s:%d:%s: fatal, drb already present\n",
+ __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ ue->drb[drb_id] = entity;
+}
diff --git a/openair2/LAYER2/rlc_v2/rlc_ue_manager.h b/openair2/LAYER2/rlc_v2/rlc_ue_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..81bb0d0fa1ef767a5d2721872e945738fcf2ff40
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/rlc_ue_manager.h
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ * contact@openairinterface.org
+ */
+
+#ifndef _RLC_UE_MANAGER_H_
+#define _RLC_UE_MANAGER_H_
+
+#include "rlc_entity.h"
+
+typedef void rlc_ue_manager_t;
+
+typedef struct rlc_ue_t {
+ int rnti;
+ int module_id; /* necesarry for the L2 simulator - not clean, to revise */
+ rlc_entity_t *srb[2];
+ rlc_entity_t *drb[5];
+} rlc_ue_t;
+
+/***********************************************************************/
+/* manager functions */
+/***********************************************************************/
+
+rlc_ue_manager_t *new_rlc_ue_manager(int enb_flag);
+
+int rlc_manager_get_enb_flag(rlc_ue_manager_t *m);
+
+void rlc_manager_lock(rlc_ue_manager_t *m);
+void rlc_manager_unlock(rlc_ue_manager_t *m);
+
+rlc_ue_t *rlc_manager_get_ue(rlc_ue_manager_t *m, int rnti);
+void rlc_manager_remove_ue(rlc_ue_manager_t *m, int rnti);
+
+/***********************************************************************/
+/* ue functions */
+/***********************************************************************/
+
+void rlc_ue_add_srb_rlc_entity(rlc_ue_t *ue, int srb_id, rlc_entity_t *entity);
+void rlc_ue_add_drb_rlc_entity(rlc_ue_t *ue, int drb_id, rlc_entity_t *entity);
+
+#endif /* _RLC_UE_MANAGER_H_ */
diff --git a/openair2/LAYER2/rlc_v2/tests/LOG/log.h b/openair2/LAYER2/rlc_v2/tests/LOG/log.h
new file mode 100644
index 0000000000000000000000000000000000000000..5c9fcd643cfca036cc81eca221f4a5e818aee685
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/LOG/log.h
@@ -0,0 +1,10 @@
+#ifndef _LOG_H_
+#define _LOG_H_
+
+#include <stdio.h>
+
+#define LOG_E(x, ...) printf(__VA_ARGS__)
+#define LOG_D(x, ...) printf(__VA_ARGS__)
+#define LOG_W(x, ...) printf(__VA_ARGS__)
+
+#endif /* _LOG_H_ */
diff --git a/openair2/LAYER2/rlc_v2/tests/Makefile b/openair2/LAYER2/rlc_v2/tests/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..14bb186d4c2cf78d1405f1afa9ab218e7461b6e3
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/Makefile
@@ -0,0 +1,32 @@
+CC=gcc
+CFLAGS=-Wall -g --coverage -I.
+
+LIB=rlc_entity.o rlc_entity_am.o rlc_entity_um.o rlc_pdu.o rlc_sdu.o
+
+tests:
+ @./run_tests.sh
+
+all: clean_run $(TEST).run
+
+%.run: $(TEST).bin
+ #valgrind ./$(TEST).bin > $(TEST).run_pre 2> $(TEST).valgrind
+ ./$(TEST).bin > $(TEST).run_pre
+ grep ^TEST $(TEST).run_pre > $(TEST).run
+ gunzip -c $(TEST).txt.gz > $(TEST).txt
+ diff -q $(TEST).txt $(TEST).run
+
+$(TEST).bin: $(TEST).o $(LIB)
+ $(CC) $(CFLAGS) -o $@ $^
+
+%.o: ../%.c
+ $(CC) $(CFLAGS) -I.. -c -o $@ $<
+
+$(TEST).o: test.c
+ $(CC) $(CFLAGS) -c -o $@ $< -DTEST='"$(TEST).h"'
+
+clean_run:
+ rm -f $(TEST).run $(TEST).bin $(TEST).o
+
+clean:
+ rm -f *.o *.bin *.run *.run_pre *.gcov *.gcda *.gcno test*.txt a.out \
+ *.valgrind
diff --git a/openair2/LAYER2/rlc_v2/tests/README b/openair2/LAYER2/rlc_v2/tests/README
new file mode 100644
index 0000000000000000000000000000000000000000..db69cd4fa716be83bafe0422c601c7037268f2b4
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/README
@@ -0,0 +1,38 @@
+To run tests, simply type: make
+
+Each test is made of:
+ testXX.h definition of the test
+ testXX.txt.gz compressed expected output of the test
+
+At runtime, we generate:
+ testXX.run actual output of the test
+
+test.c is the test driving program.
+
+Only the output lines of the test program starting with "TEST" are
+stored into testXX.txt and testXX.run.
+
+A test is considered a success if testXX.txt and testXX.run are equal.
+
+Only failed tests are reported.
+
+How to define a new test?
+
+1 - get the ID
+
+ Look in the file run_tests.sh, the variable test_count gives you
+ the number of existing tests. The ID of your test has to be
+ test_count + 1.
+
+2 - create files
+
+ Create the file test<ID>.h containing the test, then generate test<ID>.run
+ by running 'make all TEST=test<ID>' and copy test<ID>.run to test<ID>.txt.
+ Then compress this file (gzip -9 test<ID>.txt). Be sure that the output
+ is correct, of course.
+
+ For the file names, replace <ID> by the actual number of the test.
+ For example, if your test ID is 47, then name the files test47.h and
+ test47.txt. And run 'make all TEST=test47' to generate test47.run.
+
+The available instructions for a test are described at the top of test.c.
diff --git a/openair2/LAYER2/rlc_v2/tests/make_pdu.c b/openair2/LAYER2/rlc_v2/tests/make_pdu.c
new file mode 100644
index 0000000000000000000000000000000000000000..057cc3e36db2e06958969d9d79dc474ea9a9b7bf
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/make_pdu.c
@@ -0,0 +1,29 @@
+/* gcc -Wall make_pdu.c -I.. ../rlc_pdu.c */
+
+#include "rlc_pdu.h"
+#include <stdio.h>
+
+int main(void)
+{
+ char out[100];
+ rlc_pdu_encoder_t e;
+ int i;
+
+ rlc_pdu_encoder_init(&e, out, 100);
+
+ rlc_pdu_encoder_put_bits(&e, 0, 1); // D/C
+ rlc_pdu_encoder_put_bits(&e, 0, 3); // CPT
+ rlc_pdu_encoder_put_bits(&e, 0, 10); // ack_sn
+ rlc_pdu_encoder_put_bits(&e, 1, 1); // e1
+ rlc_pdu_encoder_put_bits(&e, 10, 10); // nack_sn
+ rlc_pdu_encoder_put_bits(&e, 0, 1); // e1
+ rlc_pdu_encoder_put_bits(&e, 0, 1); // e2
+
+ rlc_pdu_encoder_align(&e);
+
+ for (i = 0; i < e.byte; i++) printf(" %2.2x", (unsigned char)e.buffer[i]);
+
+ printf("\n");
+
+ return 0;
+}
diff --git a/openair2/LAYER2/rlc_v2/tests/run_tests.sh b/openair2/LAYER2/rlc_v2/tests/run_tests.sh
new file mode 100755
index 0000000000000000000000000000000000000000..72feff00363bf3e917a112b2cbbe76bd2b38dec9
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/run_tests.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+test_count=45
+
+for i in `seq $test_count`
+do
+ make all TEST=test$i >/dev/null 2>/dev/null
+ if [ $? != 0 ]
+ then
+ echo TEST $i FAILURE
+ fi
+done
diff --git a/openair2/LAYER2/rlc_v2/tests/test.c b/openair2/LAYER2/rlc_v2/tests/test.c
new file mode 100644
index 0000000000000000000000000000000000000000..734e85f1f56cc38abe6226d6e6865aadf0522d03
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test.c
@@ -0,0 +1,433 @@
+#include "../rlc_entity.h"
+#include "../rlc_entity_am.h"
+#include "../rlc_entity_um.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+/*
+ * ENB_AM <rx_maxsize> <tx_maxsize> <t_reordering> <t_status_prohibit>
+ * <t_poll_retransmit> <poll_pdu> <poll_byte> <max_retx_threshold>
+ * create the eNB RLC AM entity with given parameters
+ *
+ * UE_AM <rx_maxsize> <tx_maxsize> <t_reordering> <t_status_prohibit>
+ * <t_poll_retransmit> <poll_pdu> <poll_byte> <max_retx_threshold>
+ * create the UE RLC AM entity with given parameters
+ *
+ * ENB_UM <rx_maxsize> <tx_maxsize> <t_reordering> <sn_field_length>
+ * create the eNB RLC UM entity with given parameters
+ *
+ * UE_UM <rx_maxsize> <tx_maxsize> <t_reordering> <sn_field_length>
+ * create the UE RLC UM entity with given parameters
+ *
+ * TIME <time>
+ * following actions to be performed at time <time>
+ * <time> starts at 1
+ * You must end your test definition with a line 'TIME, -1'.
+ *
+ * ENB_SDU <id> <size>
+ * send an SDU to eNB with id <i> and size <size>
+ * the SDU is [00 01 ... ff 01 ...]
+ * (ie. start byte is 00 then we increment for each byte, loop if needed)
+ *
+ * UE_SDU <id> <size>
+ * same as ENB_SDU but the SDU is sent to the UE
+ *
+ * ENB_PDU <size> <'size' bytes>
+ * send a custom PDU from eNB to UE (eNB does not see this PDU at all)
+ *
+ * UE_PDU <size> <'size' bytes>
+ * send a custom PDU from UE to eNB (UE does not see this PDU at all)
+ *
+ * ENB_PDU_SIZE <size>
+ * set 'enb_pdu_size'
+ *
+ * UE_PDU_SIZE <size>
+ * set 'ue_pdu_size'
+ *
+ * ENB_RECV_FAILS <fails>
+ * set the 'enb_recv_fails' flag to <fails>
+ * (1: recv will fail, 0: recv will succeed)
+ *
+ * UE_RECV_FAILS <fails>
+ * same as ENB_RECV_FAILS but for 'ue_recv_fails'
+ *
+ * MUST_FAIL
+ * to be used as first command after the first TIME to indicate
+ * that the test must fail (ie. exit with non zero, crash not allowed)
+ *
+ * ENB_BUFFER_STATUS
+ * call buffer_status for eNB and print result
+ *
+ * UE_BUFFER_STATUS
+ * call buffer_status for UE and print result
+ *
+ * ENB_DISCARD_SDU <sdu ID>
+ * discards given SDU
+ *
+ * UE_DISCARD_SDU <sdu ID>
+ * discards given SDU
+ *
+ * RE_ESTABLISH
+ * re-establish both eNB and UE
+ */
+
+enum action {
+ ENB_AM, UE_AM,
+ ENB_UM, UE_UM,
+ TIME, ENB_SDU, UE_SDU, ENB_PDU, UE_PDU,
+ ENB_PDU_SIZE, UE_PDU_SIZE,
+ ENB_RECV_FAILS, UE_RECV_FAILS,
+ MUST_FAIL,
+ ENB_BUFFER_STATUS, UE_BUFFER_STATUS,
+ ENB_DISCARD_SDU, UE_DISCARD_SDU,
+ RE_ESTABLISH
+};
+
+int test[] = {
+/* TEST is defined at compilation time */
+#include TEST
+};
+
+void deliver_sdu_enb_am(void *deliver_sdu_data, struct rlc_entity_t *_entity,
+ char *buf, int size)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ printf("TEST: ENB: %"PRIu64": deliver SDU size %d [",
+ entity->t_current, size);
+ for (int i = 0; i < size; i++) printf(" %2.2x", (unsigned char)buf[i]);
+ printf("]\n");
+}
+
+void deliver_sdu_enb_um(void *deliver_sdu_data, struct rlc_entity_t *_entity,
+ char *buf, int size)
+{
+ rlc_entity_um_t *entity = (rlc_entity_um_t *)_entity;
+ printf("TEST: ENB: %"PRIu64": deliver SDU size %d [",
+ entity->t_current, size);
+ for (int i = 0; i < size; i++) printf(" %2.2x", (unsigned char)buf[i]);
+ printf("]\n");
+}
+
+void successful_delivery_enb(void *successful_delivery_data,
+ rlc_entity_t *_entity, int sdu_id)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ printf("TEST: ENB: %"PRIu64": SDU %d was successfully delivered.\n",
+ entity->t_current, sdu_id);
+}
+
+void max_retx_reached_enb(void *max_retx_reached_data, rlc_entity_t *_entity)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ printf("TEST: ENB: %"PRIu64": max RETX reached! radio link failure!\n",
+ entity->t_current);
+ exit(1);
+}
+
+void deliver_sdu_ue_am(void *deliver_sdu_data, struct rlc_entity_t *_entity,
+ char *buf, int size)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ printf("TEST: UE: %"PRIu64": deliver SDU size %d [",
+ entity->t_current, size);
+ for (int i = 0; i < size; i++) printf(" %2.2x", (unsigned char)buf[i]);
+ printf("]\n");
+}
+
+void deliver_sdu_ue_um(void *deliver_sdu_data, struct rlc_entity_t *_entity,
+ char *buf, int size)
+{
+ rlc_entity_um_t *entity = (rlc_entity_um_t *)_entity;
+ printf("TEST: UE: %"PRIu64": deliver SDU size %d [",
+ entity->t_current, size);
+ for (int i = 0; i < size; i++) printf(" %2.2x", (unsigned char)buf[i]);
+ printf("]\n");
+}
+
+void successful_delivery_ue(void *successful_delivery_data,
+ rlc_entity_t *_entity, int sdu_id)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ printf("TEST: UE: %"PRIu64": SDU %d was successfully delivered.\n",
+ entity->t_current, sdu_id);
+}
+
+void max_retx_reached_ue(void *max_retx_reached_data, rlc_entity_t *_entity)
+{
+ rlc_entity_am_t *entity = (rlc_entity_am_t *)_entity;
+ printf("TEST: UE: %"PRIu64", max RETX reached! radio link failure!\n",
+ entity->t_current);
+ exit(1);
+}
+
+int test_main(void)
+{
+ rlc_entity_t *enb = NULL;
+ rlc_entity_t *ue = NULL;
+ int i;
+ int k;
+ char *sdu;
+ char *pdu;
+ rlc_entity_buffer_status_t buffer_status;
+ int enb_do_buffer_status = 0;
+ int ue_do_buffer_status = 0;
+ int size;
+ int pos;
+ int next_byte_enb = 0;
+ int next_byte_ue = 0;
+ int enb_recv_fails = 0;
+ int ue_recv_fails = 0;
+ int enb_pdu_size = 1000;
+ int ue_pdu_size = 1000;
+
+ sdu = malloc(16001);
+ pdu = malloc(3000);
+ if (sdu == NULL || pdu == NULL) {
+ printf("out of memory\n");
+ exit(1);
+ }
+
+ for (i = 0; i < 16001; i++)
+ sdu[i] = i & 255;
+
+ pos = 0;
+ if (test[pos] != TIME) {
+ printf("%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
+ exit(1);
+ }
+
+ for (i = 1; i < 1000; i++) {
+ if (i == test[pos+1]) {
+ pos += 2;
+ while (test[pos] != TIME)
+ switch (test[pos]) {
+ default: printf("fatal: unknown action\n"); exit(1);
+ case ENB_AM:
+ enb = new_rlc_entity_am(test[pos+1], test[pos+2],
+ deliver_sdu_enb_am, NULL,
+ successful_delivery_enb, NULL,
+ max_retx_reached_enb, NULL,
+ test[pos+3], test[pos+4], test[pos+5],
+ test[pos+6], test[pos+7], test[pos+8]);
+ pos += 9;
+ break;
+ case UE_AM:
+ ue = new_rlc_entity_am(test[pos+1], test[pos+2],
+ deliver_sdu_ue_am, NULL,
+ successful_delivery_ue, NULL,
+ max_retx_reached_ue, NULL,
+ test[pos+3], test[pos+4], test[pos+5],
+ test[pos+6], test[pos+7], test[pos+8]);
+ pos += 9;
+ break;
+ case ENB_UM:
+ enb = new_rlc_entity_um(test[pos+1], test[pos+2],
+ deliver_sdu_enb_um, NULL,
+ test[pos+3], test[pos+4]);
+ pos += 5;
+ break;
+ case UE_UM:
+ ue = new_rlc_entity_um(test[pos+1], test[pos+2],
+ deliver_sdu_ue_um, NULL,
+ test[pos+3], test[pos+4]);
+ pos += 5;
+ break;
+ case ENB_SDU:
+ for (k = 0; k < test[pos+2]; k++, next_byte_enb++)
+ sdu[k] = next_byte_enb;
+ printf("TEST: ENB: %d: recv_sdu (id %d): size %d: [",
+ i, test[pos+1], test[pos+2]);
+ for (k = 0; k < test[pos+2]; k++)
+ printf(" %2.2x", (unsigned char)sdu[k]);
+ printf("]\n");
+ enb->recv_sdu(enb, sdu, test[pos+2], test[pos+1]);
+ pos += 3;
+ break;
+ case UE_SDU:
+ for (k = 0; k < test[pos+2]; k++, next_byte_ue++)
+ sdu[k] = next_byte_ue;
+ printf("TEST: UE: %d: recv_sdu (id %d): size %d: [",
+ i, test[pos+1], test[pos+2]);
+ for (k = 0; k < test[pos+2]; k++)
+ printf(" %2.2x", (unsigned char)sdu[k]);
+ printf("]\n");
+ ue->recv_sdu(ue, sdu, test[pos+2], test[pos+1]);
+ pos += 3;
+ break;
+ case ENB_PDU:
+ for (k = 0; k < test[pos+1]; k++)
+ pdu[k] = test[pos+2+k];
+ printf("TEST: ENB: %d: custom PDU: size %d: [", i, test[pos+1]);
+ for (k = 0; k < test[pos+1]; k++) printf(" %2.2x", (unsigned char)pdu[k]);
+ printf("]\n");
+ if (!ue_recv_fails)
+ ue->recv_pdu(ue, pdu, test[pos+1]);
+ pos += 2 + test[pos+1];
+ break;
+ case UE_PDU:
+ for (k = 0; k < test[pos+1]; k++)
+ pdu[k] = test[pos+2+k];
+ printf("TEST: UE: %d: custom PDU: size %d: [", i, test[pos+1]);
+ for (k = 0; k < test[pos+1]; k++) printf(" %2.2x", (unsigned char)pdu[k]);
+ printf("]\n");
+ if (!enb_recv_fails)
+ enb->recv_pdu(enb, pdu, test[pos+1]);
+ pos += 2 + test[pos+1];
+ break;
+ case ENB_PDU_SIZE:
+ enb_pdu_size = test[pos+1];
+ pos += 2;
+ break;
+ case UE_PDU_SIZE:
+ ue_pdu_size = test[pos+1];
+ pos += 2;
+ break;
+ case ENB_RECV_FAILS:
+ enb_recv_fails = test[pos+1];
+ pos += 2;
+ break;
+ case UE_RECV_FAILS:
+ ue_recv_fails = test[pos+1];
+ pos += 2;
+ break;
+ case MUST_FAIL:
+ /* do nothing, only used by caller */
+ pos++;
+ break;
+ case ENB_BUFFER_STATUS:
+ enb_do_buffer_status = 1;
+ pos++;
+ break;
+ case UE_BUFFER_STATUS:
+ ue_do_buffer_status = 1;
+ pos++;
+ break;
+ case ENB_DISCARD_SDU:
+ printf("TEST: ENB: %d: discard SDU %d\n", i, test[pos+1]);
+ enb->discard_sdu(enb, test[pos+1]);
+ pos += 2;
+ break;
+ case UE_DISCARD_SDU:
+ printf("TEST: UE: %d: discard SDU %d\n", i, test[pos+1]);
+ ue->discard_sdu(ue, test[pos+1]);
+ pos += 2;
+ break;
+ case RE_ESTABLISH:
+ printf("TEST: %d: re-establish eNB and UE\n", i);
+ enb->reestablishment(enb);
+ ue->reestablishment(ue);
+ pos++;
+ break;
+ }
+ }
+
+ enb->set_time(enb, i);
+ ue->set_time(ue, i);
+
+ if (enb_do_buffer_status) {
+ enb_do_buffer_status = 0;
+ buffer_status = enb->buffer_status(enb, enb_pdu_size);
+ printf("TEST: ENB: %d: buffer_status: status_size %d tx_size %d retx_size %d\n",
+ i,
+ buffer_status.status_size,
+ buffer_status.tx_size,
+ buffer_status.retx_size);
+ }
+
+ size = enb->generate_pdu(enb, pdu, enb_pdu_size);
+ if (size) {
+ printf("TEST: ENB: %d: generate_pdu: size %d: [", i, size);
+ for (k = 0; k < size; k++) printf(" %2.2x", (unsigned char)pdu[k]);
+ printf("]\n");
+ if (!ue_recv_fails)
+ ue->recv_pdu(ue, pdu, size);
+ }
+
+ if (ue_do_buffer_status) {
+ ue_do_buffer_status = 0;
+ buffer_status = ue->buffer_status(ue, ue_pdu_size);
+ printf("TEST: UE: %d: buffer_status: status_size %d tx_size %d retx_size %d\n",
+ i,
+ buffer_status.status_size,
+ buffer_status.tx_size,
+ buffer_status.retx_size);
+ }
+
+ size = ue->generate_pdu(ue, pdu, ue_pdu_size);
+ if (size) {
+ printf("TEST: UE: %d: generate_pdu: size %d: [", i, size);
+ for (k = 0; k < size; k++) printf(" %2.2x", (unsigned char)pdu[k]);
+ printf("]\n");
+ if (!enb_recv_fails)
+ enb->recv_pdu(enb, pdu, size);
+ }
+ }
+
+ enb->delete(enb);
+ ue->delete(ue);
+
+ free(sdu);
+ free(pdu);
+
+ return 0;
+}
+
+void usage(void)
+{
+ printf("options:\n");
+ printf(" -no-fork\n");
+ printf(" don't fork (to ease debugging with gdb)\n");
+ exit(0);
+}
+
+int main(int n, char **v)
+{
+ int must_fail = 0;
+ int son;
+ int status;
+ int i;
+ int no_fork = 0;
+
+ for (i = 1; i < n; i++) {
+ if (!strcmp(v[i], "-no-fork")) { no_fork = 1; continue; }
+ usage();
+ }
+
+ if (test[2] == MUST_FAIL)
+ must_fail = 1;
+
+ if (no_fork) return test_main();
+
+ son = fork();
+ if (son == -1) {
+ perror("fork");
+ return 1;
+ }
+
+ if (son == 0)
+ return test_main();
+
+ if (wait(&status) == -1) {
+ perror("wait");
+ return 1;
+ }
+
+ /* child must quit properly */
+ if (!WIFEXITED(status))
+ return 1;
+
+ /* child must fail if expected to */
+ if (must_fail && WEXITSTATUS(status) == 0)
+ return 1;
+
+ /* child must not fail if not expected to */
+ if (!must_fail && WEXITSTATUS(status))
+ return 1;
+
+ return 0;
+}
diff --git a/openair2/LAYER2/rlc_v2/tests/test1.h b/openair2/LAYER2/rlc_v2/tests/test1.h
new file mode 100644
index 0000000000000000000000000000000000000000..c7744da55c28ed7012cadc71d698777351843b7f
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test1.h
@@ -0,0 +1,14 @@
+/*
+ * basic am test:
+ * at time 1, eNB receives an SDU of 10 bytes
+ * at time 10, UE receives an SDU of 5 bytes
+ */
+
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 10,
+ UE_BUFFER_STATUS,
+TIME, 10,
+ UE_SDU, 0, 5,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test1.txt.gz b/openair2/LAYER2/rlc_v2/tests/test1.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..1c6661e9ea1c43c854ecf24cdac718215bbd1f22
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test1.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test10.h b/openair2/LAYER2/rlc_v2/tests/test10.h
new file mode 100644
index 0000000000000000000000000000000000000000..c7aca15eb058d7371963f8f29f68e398fa7e1d0b
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test10.h
@@ -0,0 +1,23 @@
+/*
+ * rlc am test resegmentation of PDU segment with several SDUs
+ * eNB sends 3 SDUs [1..10] [11.20] [21..30], not received
+ * eNB retx with smaller PDUs, not received
+ * eNB retx with still smaller PDUs, not received
+ * then reception on, all passes
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_RECV_FAILS, 1,
+ ENB_RECV_FAILS, 1,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 1, 10,
+ ENB_SDU, 2, 10,
+TIME, 2,
+ ENB_PDU_SIZE, 25,
+TIME, 48,
+ ENB_PDU_SIZE, 15,
+TIME, 100,
+ UE_RECV_FAILS, 0,
+ ENB_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test10.txt.gz b/openair2/LAYER2/rlc_v2/tests/test10.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..68fd3fa0ba7ec7fad990101439087dcdf55693b4
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test10.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test11.h b/openair2/LAYER2/rlc_v2/tests/test11.h
new file mode 100644
index 0000000000000000000000000000000000000000..5801689aea498b2b350967df97de389eaa3481c8
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test11.h
@@ -0,0 +1,37 @@
+/*
+ * rlc am test function rlc_am_reassemble_next_segment
+ * in r->pdu_byte >= r->so + (r->sdu_offset - r->start->data_offset)
+ * + r->sdu_len
+ * when case 'if (r->e)' is false
+ * eNB sends 3 SDUs [1..10] [11.20] [21..30], not received
+ * eNB retx with smaller PDUs, not received
+ * eNB retx with still smaller PDUs, not received
+ * then UE reception on
+ * then custom PDUs, first a small part of head of original PDU
+ * then a bigger part, covering the first part
+ * so that the beginning of this part triggers the 'while'
+ * then eNB reception on, all passes
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_RECV_FAILS, 1,
+ ENB_RECV_FAILS, 1,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 1, 10,
+ ENB_SDU, 2, 10,
+TIME, 2,
+ ENB_PDU_SIZE, 25,
+TIME, 48,
+ ENB_PDU_SIZE, 15,
+TIME, 95,
+ ENB_BUFFER_STATUS,
+TIME, 99,
+ UE_RECV_FAILS, 0,
+ ENB_PDU, 14, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+ ENB_PDU, 25, 0xec, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
+TIME, 100,
+ ENB_RECV_FAILS, 0,
+TIME, 134,
+ UE_BUFFER_STATUS,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test11.txt.gz b/openair2/LAYER2/rlc_v2/tests/test11.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..ea435a666025ab5d90ca2992b91dd94e1551a654
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test11.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test12.h b/openair2/LAYER2/rlc_v2/tests/test12.h
new file mode 100644
index 0000000000000000000000000000000000000000..0387f0aa7f380b65224a4f71f97de78548bb5c59
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test12.h
@@ -0,0 +1,34 @@
+/*
+ * rlc am test function rlc_am_reassemble_next_segment
+ * in r->pdu_byte >= r->so + (r->sdu_offset - r->start->data_offset)
+ * + r->sdu_len
+ * when case 'if (r->e)' is true
+ * eNB sends 4 SDUs [1..5] [6..10] [11.20] [21..30], not received
+ * eNB retx with smaller PDUs, not received
+ * eNB retx with still smaller PDUs, not received
+ * then UE reception on
+ * then custom PDUs, first a small part of head of original PDU
+ * then a bigger part, covering the first part
+ * so that the beginning of this part triggers the 'while'
+ * then eNB reception on, all passes
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_RECV_FAILS, 1,
+ ENB_RECV_FAILS, 1,
+ ENB_SDU, 0, 5,
+ ENB_SDU, 1, 5,
+ ENB_SDU, 2, 10,
+ ENB_SDU, 3, 10,
+TIME, 2,
+ ENB_PDU_SIZE, 25,
+TIME, 48,
+ ENB_PDU_SIZE, 15,
+TIME, 99,
+ UE_RECV_FAILS, 0,
+ ENB_PDU, 15, 0xec, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ ENB_PDU, 25, 0xec, 0x00, 0x00, 0x00, 0x80, 0x50, 0x05, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11,
+TIME, 100,
+ ENB_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test12.txt.gz b/openair2/LAYER2/rlc_v2/tests/test12.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..988d7ae644c008cef2f34adce448d00a3a7ce4e1
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test12.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test13.h b/openair2/LAYER2/rlc_v2/tests/test13.h
new file mode 100644
index 0000000000000000000000000000000000000000..a57bd43a946e3c5fdd3d38a482ba6bdbcee85318
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test13.h
@@ -0,0 +1,30 @@
+/*
+ * rlc am test function process_received_ack with something in
+ * the retransmit_list to put in the ack_list
+ * eNB sends 4 PDUs, not received
+ * eNB retransmits 4th PDU, received, ACKed with NACKs for PDU 1, 2, 3
+ * UE receives custom PDU for 1, 2, 3, 4 (they are not sent by eNB)
+ * (4 resent to have the P bit set)
+ * UE sends ACK for all, eNB puts from retransmit_list to ack_list
+ *
+ * Maybe not very realistic (custom PDUs).
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_RECV_FAILS, 1,
+ ENB_RECV_FAILS, 1,
+ ENB_PDU_SIZE, 12,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 1, 10,
+ ENB_SDU, 2, 10,
+ ENB_SDU, 3, 10,
+TIME, 10,
+ UE_RECV_FAILS, 0,
+ ENB_RECV_FAILS, 0,
+TIME, 87,
+ ENB_PDU, 12, 0x80, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+ ENB_PDU, 12, 0x80, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
+ ENB_PDU, 12, 0x80, 0x02, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
+ ENB_PDU, 12, 0xa0, 0x03, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test13.txt.gz b/openair2/LAYER2/rlc_v2/tests/test13.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..55a26712db1f9d1efb68b8a66a275d20b4867beb
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test13.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test14.h b/openair2/LAYER2/rlc_v2/tests/test14.h
new file mode 100644
index 0000000000000000000000000000000000000000..0a3a50179614faf31f9e6c3fc1e473fd75204c05
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test14.h
@@ -0,0 +1,12 @@
+/*
+ * rlc am test max_retx_reached
+ * eNB sends PDU, never received
+ */
+TIME, 1,
+ MUST_FAIL,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_RECV_FAILS, 1,
+ ENB_RECV_FAILS, 1,
+ ENB_SDU, 0, 10,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test14.txt.gz b/openair2/LAYER2/rlc_v2/tests/test14.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..93aa5de81ea42ae69511552066c75ccf11febbea
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test14.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test15.h b/openair2/LAYER2/rlc_v2/tests/test15.h
new file mode 100644
index 0000000000000000000000000000000000000000..4adf93f81c045c26e8e6d3fab5013f7fc5071514
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test15.h
@@ -0,0 +1,42 @@
+/*
+ * rlc am test so_overlap
+ * eNB sends PDU, not received
+ * then PDU is segmented in 3 parts, part 1 & 3 not received,
+ * then we generate a fake control PDU from UE to eNB that
+ * contains NACK with so_start/so_end being inside part 2.
+ *
+ * code to generate fake control PDU:
+ * rlc_pdu_encoder_init(&e, out, 100);
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // D/C
+ * rlc_pdu_encoder_put_bits(&e, 0, 3); // CPT
+ * rlc_pdu_encoder_put_bits(&e, 2, 10); // ack_sn
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // e1
+ * rlc_pdu_encoder_put_bits(&e, 1, 10); // nack_sn
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // e1
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // e2
+ * rlc_pdu_encoder_put_bits(&e, 14, 15); // so_start
+ * rlc_pdu_encoder_put_bits(&e, 16, 15); // so_end
+ * rlc_pdu_encoder_align(&e);
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 8,
+ ENB_RECV_FAILS, 1,
+TIME, 2,
+ UE_RECV_FAILS, 1,
+ ENB_SDU, 1, 30,
+TIME, 20,
+ ENB_PDU_SIZE, 14,
+TIME, 48,
+ UE_RECV_FAILS, 0,
+TIME, 49,
+ UE_RECV_FAILS, 1,
+TIME, 50,
+ UE_RECV_FAILS, 0,
+TIME, 60,
+ ENB_RECV_FAILS, 0,
+ UE_PDU, 8, 0x00, 0x0a, 0x00, 0xa0, 0x03, 0x80, 0x08, 0x00,
+TIME, 70,
+ UE_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test15.txt.gz b/openair2/LAYER2/rlc_v2/tests/test15.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..f6f25dac9857198c69c7a5c05bd468b9458d65f9
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test15.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test16.h b/openair2/LAYER2/rlc_v2/tests/test16.h
new file mode 100644
index 0000000000000000000000000000000000000000..862cecf344bdcea3978fd055b4c62242702c7bb6
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test16.h
@@ -0,0 +1,48 @@
+/*
+ * rlc am test process_received_nack
+ * Same events as for test15 except the fake control PDU
+ * does not ACK anything (ack_sn = 0) so that PDU in the
+ * wait_list are not transfered into the ack_list and
+ * we cover the case:
+ * } else {
+ * prev = cur;
+ * cur = cur->next;
+ * }
+ * for the wait_list case.
+ *
+ * code to generate fake control PDU:
+ * rlc_pdu_encoder_init(&e, out, 100);
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // D/C
+ * rlc_pdu_encoder_put_bits(&e, 0, 3); // CPT
+ * rlc_pdu_encoder_put_bits(&e, 0, 10); // ack_sn
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // e1
+ * rlc_pdu_encoder_put_bits(&e, 1, 10); // nack_sn
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // e1
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // e2
+ * rlc_pdu_encoder_put_bits(&e, 14, 15); // so_start
+ * rlc_pdu_encoder_put_bits(&e, 16, 15); // so_end
+ * rlc_pdu_encoder_align(&e);
+ */
+
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 8,
+ ENB_RECV_FAILS, 1,
+TIME, 2,
+ UE_RECV_FAILS, 1,
+ ENB_SDU, 1, 30,
+TIME, 20,
+ ENB_PDU_SIZE, 14,
+TIME, 48,
+ UE_RECV_FAILS, 0,
+TIME, 49,
+ UE_RECV_FAILS, 1,
+TIME, 50,
+ UE_RECV_FAILS, 0,
+TIME, 60,
+ ENB_RECV_FAILS, 0,
+ UE_PDU, 8, 0x00, 0x02, 0x00, 0xa0, 0x03, 0x80, 0x08, 0x00,
+TIME, 70,
+ UE_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test16.txt.gz b/openair2/LAYER2/rlc_v2/tests/test16.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..61f36c292ec8ec46edaa3de7d77b235d78322a06
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test16.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test17.h b/openair2/LAYER2/rlc_v2/tests/test17.h
new file mode 100644
index 0000000000000000000000000000000000000000..a2e6c237de9b8302744bb022ad22aa81025a2639
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test17.h
@@ -0,0 +1,30 @@
+/*
+ * rlc am test function process_received_nack
+ * case 'check that VT(A) <= sn < VT(S)'
+ * eNB sends PDU, not received, resends segmented
+ * we generate a fake control PDU containing nack_sn == 10,
+ * to fail the 'check ...' and cover the return.
+ *
+ * code to generate fake control PDU:
+ * rlc_pdu_encoder_init(&e, out, 100);
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // D/C
+ * rlc_pdu_encoder_put_bits(&e, 0, 3); // CPT
+ * rlc_pdu_encoder_put_bits(&e, 0, 10); // ack_sn
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // e1
+ * rlc_pdu_encoder_put_bits(&e, 10, 10); // nack_sn
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // e1
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // e2
+ * rlc_pdu_encoder_align(&e);
+ */
+
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 30,
+ ENB_RECV_FAILS, 1,
+TIME, 20,
+ ENB_PDU_SIZE, 14,
+TIME, 60,
+ ENB_RECV_FAILS, 0,
+ UE_PDU, 4, 0x00, 0x02, 0x05, 0x00,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test17.txt.gz b/openair2/LAYER2/rlc_v2/tests/test17.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..a35b5cecd18759c7c683afd4e83df2fc7ba38293
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test17.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test18.h b/openair2/LAYER2/rlc_v2/tests/test18.h
new file mode 100644
index 0000000000000000000000000000000000000000..0ac25d5c915ad4db43c8bf93fcbaeafae9619f0e
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test18.h
@@ -0,0 +1,10 @@
+/*
+ * test rlc am simulate rx pdu buffer full
+ * eNB sends too big PDU to UE, rejected because buffer full
+ */
+TIME, 1,
+ MUST_FAIL,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 10, 10, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 10,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test18.txt.gz b/openair2/LAYER2/rlc_v2/tests/test18.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e119c2b018fcece7c4504135b4bf09c23d902590
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test18.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test19.h b/openair2/LAYER2/rlc_v2/tests/test19.h
new file mode 100644
index 0000000000000000000000000000000000000000..f28e7609f451a9becdb7f5c4737681c4a69d501a
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test19.h
@@ -0,0 +1,54 @@
+/*
+ * test rlc am bad PDU
+ * eNB sends custom PDUs to UE, all of them are wrong for a reason or another
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ /* data PDU, LI == 0
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // D/C
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // RF
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // P
+ * rlc_pdu_encoder_put_bits(&e, 0, 2); // FI
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 0, 10); // SN
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 0, 11); // LI
+ */
+ ENB_PDU, 4, 0x84, 0x00, 0x00, 0x00,
+ /* data PDU, no data
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // D/C
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // RF
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // P
+ * rlc_pdu_encoder_put_bits(&e, 0, 2); // FI
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 0, 10); // SN
+ */
+ ENB_PDU, 2, 0x80, 0x00,
+ /* data PDU, LI == 2 > data size == 1
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // D/C
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // RF
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // P
+ * rlc_pdu_encoder_put_bits(&e, 0, 2); // FI
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 0, 10); // SN
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 2, 11); // LI
+ * rlc_pdu_encoder_align(&e);
+ * rlc_pdu_encoder_put_bits(&e, 0, 8); // 1 byte of data
+ */
+ ENB_PDU, 5, 0x84, 0x00, 0x00, 0x20, 0x00,
+ /* control PDU, CPT != 0
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // D/C
+ * rlc_pdu_encoder_put_bits(&e, 2, 3); // CPT
+ */
+ ENB_PDU, 1, 0x20,
+ /* data PDU, but only 1 byte
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // D/C
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // RF
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // P
+ * rlc_pdu_encoder_put_bits(&e, 0, 2); // FI
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // E
+ */
+ ENB_PDU, 1, 0x84,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test19.txt.gz b/openair2/LAYER2/rlc_v2/tests/test19.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..a3c034e7298d5298cd54493622afdfca7c51b9be
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test19.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test2.h b/openair2/LAYER2/rlc_v2/tests/test2.h
new file mode 100644
index 0000000000000000000000000000000000000000..ba00920778b2821b5807cb9ecf4e5424df892df7
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test2.h
@@ -0,0 +1,10 @@
+/*
+ * basic am test:
+ * at time 1, eNB receives an SDU of 16000 bytes
+ */
+
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 16000,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test2.txt.gz b/openair2/LAYER2/rlc_v2/tests/test2.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..9961ff3a1020fe5ecf83b49b11ede590b229de6d
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test2.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test20.h b/openair2/LAYER2/rlc_v2/tests/test20.h
new file mode 100644
index 0000000000000000000000000000000000000000..54f4bec720ab5c6b28123d372f541ddfbc88772d
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test20.h
@@ -0,0 +1,28 @@
+/*
+ * rlc am test full tx window
+ * for that eNB sends a lot of small PDUs
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 513,
+ ENB_PDU_SIZE, 3,
+ ENB_RECV_FAILS, 1,
+ ENB_BUFFER_STATUS,
+TIME, 511,
+ UE_BUFFER_STATUS,
+TIME, 512,
+ UE_BUFFER_STATUS,
+TIME, 513,
+ UE_BUFFER_STATUS,
+TIME, 557,
+ ENB_BUFFER_STATUS,
+TIME, 558,
+ ENB_BUFFER_STATUS,
+TIME, 559,
+ ENB_BUFFER_STATUS,
+TIME, 600,
+ ENB_BUFFER_STATUS,
+ ENB_RECV_FAILS, 0,
+TIME, -1
+
diff --git a/openair2/LAYER2/rlc_v2/tests/test20.txt.gz b/openair2/LAYER2/rlc_v2/tests/test20.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..5fedad91a452500def6a850e2da72d99f68346d0
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test20.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test21.h b/openair2/LAYER2/rlc_v2/tests/test21.h
new file mode 100644
index 0000000000000000000000000000000000000000..ba2a2088e683df7682e62b8273ed044d5cfc1e31
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test21.h
@@ -0,0 +1,18 @@
+/*
+ * rlc am test big SDU (size > 2047)
+ * first generate SDU with exactly 2047 bytes
+ * later on generate SDU with exactly 2048 bytes
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 20,
+ ENB_SDU, 1, 2047,
+ ENB_SDU, 2, 20,
+ ENB_PDU_SIZE, 2200,
+TIME, 10,
+ ENB_SDU, 3, 20,
+ ENB_SDU, 4, 2048,
+ ENB_SDU, 5, 20,
+TIME, -1
+
diff --git a/openair2/LAYER2/rlc_v2/tests/test21.txt.gz b/openair2/LAYER2/rlc_v2/tests/test21.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..7fc8cbacdef75cc7a77684509989bc7d414e37d6
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test21.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test22.h b/openair2/LAYER2/rlc_v2/tests/test22.h
new file mode 100644
index 0000000000000000000000000000000000000000..6e2e8cd410acd6e122fb39047d6438a2e33dfe85
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test22.h
@@ -0,0 +1,25 @@
+/*
+ * am test: ask for retx with TX buffer too small
+ * then ask for status with buffer too small
+ */
+
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 100,
+ UE_RECV_FAILS, 1,
+TIME, 47,
+ ENB_PDU_SIZE, 4,
+ ENB_BUFFER_STATUS,
+ UE_BUFFER_STATUS,
+TIME, 48,
+ ENB_PDU_SIZE, 1000,
+ UE_PDU_SIZE, 1,
+ UE_BUFFER_STATUS,
+ UE_RECV_FAILS, 0,
+TIME, 49,
+ UE_BUFFER_STATUS,
+TIME, 50,
+ UE_PDU_SIZE, 1000,
+ UE_BUFFER_STATUS,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test22.txt.gz b/openair2/LAYER2/rlc_v2/tests/test22.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..cdc7f51a162aae7cff631abeb0324a088ab48907
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test22.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test23.h b/openair2/LAYER2/rlc_v2/tests/test23.h
new file mode 100644
index 0000000000000000000000000000000000000000..5ad2d25b7defac794d7cfe9c71e3c440c2dd1070
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test23.h
@@ -0,0 +1,9 @@
+/*
+ * am test: basic test with poll_byte == 1
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, 1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, 1, 4,
+ ENB_SDU, 0, 30,
+ ENB_PDU_SIZE, 10,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test23.txt.gz b/openair2/LAYER2/rlc_v2/tests/test23.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..3d66e6afa45fde0e6ebc6f9907c15b970f3a13d7
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test23.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test24.h b/openair2/LAYER2/rlc_v2/tests/test24.h
new file mode 100644
index 0000000000000000000000000000000000000000..2393f7a95a8249b0c33e93dc36ca65b5996a342d
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test24.h
@@ -0,0 +1,9 @@
+/*
+ * am test: basic test with poll_pdu == 2
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, 2, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, 2, -1, 4,
+ ENB_SDU, 0, 50,
+ ENB_PDU_SIZE, 10,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test24.txt.gz b/openair2/LAYER2/rlc_v2/tests/test24.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6c457987dcf297d3beb6a93f27aeddbac5fd58af
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test24.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test25.h b/openair2/LAYER2/rlc_v2/tests/test25.h
new file mode 100644
index 0000000000000000000000000000000000000000..ddb584cdf64af9a5eb359512a4fd8927e2e235a3
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test25.h
@@ -0,0 +1,8 @@
+/*
+ * am test: reject SDU because not enough room in rx buffer
+ */
+TIME, 1,
+ ENB_AM, 10, 10, 35, 0, 45, -1, -1, 4,
+ UE_AM, 10, 10, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 50,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test25.txt.gz b/openair2/LAYER2/rlc_v2/tests/test25.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..7ad895aaccc095103430cffdf324d3976077f0f2
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test25.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test26.h b/openair2/LAYER2/rlc_v2/tests/test26.h
new file mode 100644
index 0000000000000000000000000000000000000000..95d8367247a6a10ae5e880a8d34e0973d9936a11
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test26.h
@@ -0,0 +1,25 @@
+/*
+ * am test: test function check_t_poll_retransmit
+ * case 'PDU with SN = VT(S)-1 not found?'
+ * eNB sends some PDUs, UE receives none
+ * then UE receives the first retransmitted PDU and nothing more
+ * until poll retransmit occurs again in the eNB to trigger the case
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 10,
+ UE_RECV_FAILS, 1,
+TIME, 2,
+ ENB_SDU, 1, 10,
+TIME, 3,
+ ENB_SDU, 2, 10,
+TIME, 4,
+ ENB_SDU, 3, 10,
+TIME, 50,
+ UE_RECV_FAILS, 0,
+TIME, 51,
+ UE_RECV_FAILS, 1,
+TIME, 100,
+ UE_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test26.txt.gz b/openair2/LAYER2/rlc_v2/tests/test26.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..85f1af55f691179defd6ab24bf8d4c0960d986dc
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test26.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test27.h b/openair2/LAYER2/rlc_v2/tests/test27.h
new file mode 100644
index 0000000000000000000000000000000000000000..224fd1218592c8cd5834ad7dccb736d295553e4e
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test27.h
@@ -0,0 +1,17 @@
+/*
+ * am test: test function check_t_poll_retransmit
+ * case 'do we meet conditions of 36.322 5.2.2.3?'
+ * eNB sends one PDU, UE does not receive
+ * just before calling check_t_poll_retransmit, eNB receives a new SDU
+ * for the function 'check_poll_after_pdu_assembly' to fail
+ * then UE receives all what eNB sends
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 10,
+ UE_RECV_FAILS, 1,
+TIME, 47,
+ ENB_SDU, 1, 10,
+ UE_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test27.txt.gz b/openair2/LAYER2/rlc_v2/tests/test27.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..15fc41defe11b0d13f2b044a3e3b02eab4c133ad
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test27.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test28.h b/openair2/LAYER2/rlc_v2/tests/test28.h
new file mode 100644
index 0000000000000000000000000000000000000000..ac768f36523f6afa52f7459146ec981c58aea2e1
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test28.h
@@ -0,0 +1,18 @@
+/*
+ * am test: test function check_t_reordering,
+ * case 'update VR(MS) to first SN >= VR(X) for which not
+ * all PDU segments have been received'
+ * eNB sends 3 PDUs, first not received, two others received
+ * later on, everything is received
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 10,
+ UE_RECV_FAILS, 1,
+TIME, 2,
+ UE_RECV_FAILS, 0,
+ ENB_SDU, 1, 10,
+TIME, 3,
+ ENB_SDU, 2, 10,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test28.txt.gz b/openair2/LAYER2/rlc_v2/tests/test28.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..760d1f2b84f0aa4849d987f157f258ab7d22b90b
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test28.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test29.h b/openair2/LAYER2/rlc_v2/tests/test29.h
new file mode 100644
index 0000000000000000000000000000000000000000..61bb183641d1251b26afa17055a6bc9b8fd611a3
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test29.h
@@ -0,0 +1,21 @@
+/*
+ * am test: test function check_t_reordering,
+ * case 'VR(H) > VR(MS)'
+ * eNB sends 4 PDUs, only 1st and 3rd are received
+ * later on, everything is received
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 10,
+ UE_RECV_FAILS, 1,
+TIME, 2,
+ UE_RECV_FAILS, 0,
+ ENB_SDU, 1, 10,
+TIME, 3,
+ UE_RECV_FAILS, 1,
+ ENB_SDU, 2, 10,
+TIME, 4,
+ UE_RECV_FAILS, 0,
+ ENB_SDU, 3, 10,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test29.txt.gz b/openair2/LAYER2/rlc_v2/tests/test29.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..265735edbceb54e2a54c0f2d7c171080262c95de
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test29.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test3.h b/openair2/LAYER2/rlc_v2/tests/test3.h
new file mode 100644
index 0000000000000000000000000000000000000000..5a469d82e24a872af68c8e11c83414797acebc87
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test3.h
@@ -0,0 +1,11 @@
+/*
+ * basic am test:
+ * at time 1, eNB receives an SDU of 16001 bytes
+ */
+
+TIME, 1,
+ MUST_FAIL,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 16001,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test3.txt.gz b/openair2/LAYER2/rlc_v2/tests/test3.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..30a96e22781c5f1d3b4711f48fc337cef23a574e
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test3.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test30.h b/openair2/LAYER2/rlc_v2/tests/test30.h
new file mode 100644
index 0000000000000000000000000000000000000000..feeee977fd371854098c482e867a4912f5bf3576
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test30.h
@@ -0,0 +1,16 @@
+/*
+ * am test: test function generate_status
+ * enter the while loop 'go to highest full sn+1 for ACK'
+ * eNB sends several PDUs, only the last is received
+ * UE sends status PDU of a chosen size that let the code enter the while
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 70,
+ ENB_PDU_SIZE, 12,
+ UE_RECV_FAILS, 1,
+TIME, 7,
+ UE_RECV_FAILS, 0,
+ UE_PDU_SIZE, 12,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test30.txt.gz b/openair2/LAYER2/rlc_v2/tests/test30.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..eeb856c3414ce973ac95ab4e3258f6e9aacd3ff1
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test30.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test31.h b/openair2/LAYER2/rlc_v2/tests/test31.h
new file mode 100644
index 0000000000000000000000000000000000000000..a978c69b39a056233c332724f155a24912709015
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test31.h
@@ -0,0 +1,10 @@
+/*
+ * um test: several SDUs in a PDU (field length 5 bits)
+ */
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 5,
+ UE_UM, 100000, 100000, 35, 5,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 1, 20,
+ ENB_SDU, 2, 30,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test31.txt.gz b/openair2/LAYER2/rlc_v2/tests/test31.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2c5e6fcc3415544b1ca81a258e81eef6d190311b
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test31.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test32.h b/openair2/LAYER2/rlc_v2/tests/test32.h
new file mode 100644
index 0000000000000000000000000000000000000000..69d068cc836cd33d8541d76864d015bc9207ff99
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test32.h
@@ -0,0 +1,10 @@
+/*
+ * um test: several SDUs in a PDU (field length 10 bits)
+ */
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 10,
+ UE_UM, 100000, 100000, 35, 10,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 1, 20,
+ ENB_SDU, 2, 30,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test32.txt.gz b/openair2/LAYER2/rlc_v2/tests/test32.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..0b4633045337017eb15e520e995f9754478fa423
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test32.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test33.h b/openair2/LAYER2/rlc_v2/tests/test33.h
new file mode 100644
index 0000000000000000000000000000000000000000..6e907db577f80fe0f565a7d7ed86cef11b8c4638
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test33.h
@@ -0,0 +1,18 @@
+/*
+ * um test: test function rlc_um_reassemble_pdu, discard SDU
+ * case '!(fi & 0x02'
+ * eNB sends 33 PDUs covering 1 SDU, only PDU 0 received (with SN=0 and FI=1)
+ * then eNB sends 1 PDU covering 1 SDU (so SN=1 and FI=0 for this one)
+ * received by UE
+ */
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 5,
+ UE_UM, 100000, 100000, 35, 5,
+ ENB_SDU, 0, 33,
+ ENB_PDU_SIZE, 2,
+TIME, 2,
+ UE_RECV_FAILS, 1,
+TIME, 34,
+ UE_RECV_FAILS, 0,
+ ENB_SDU, 1, 1,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test33.txt.gz b/openair2/LAYER2/rlc_v2/tests/test33.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..08cb366be415251d3c552da7b4f22615fa8f6138
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test33.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test34.h b/openair2/LAYER2/rlc_v2/tests/test34.h
new file mode 100644
index 0000000000000000000000000000000000000000..da119a6047fa5fc03e274b62cb330cf7ce21e925
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test34.h
@@ -0,0 +1,15 @@
+/*
+ * um test: trigger some cases in rlc_um_reception_actions
+ * eNB sends several PDUs, only the beginning PDUs and ending PDUs are
+ * received. Middle PDUs are not.
+ */
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 5,
+ UE_UM, 100000, 100000, 35, 5,
+ ENB_SDU, 0, 40,
+ ENB_PDU_SIZE, 2,
+TIME, 2,
+ UE_RECV_FAILS, 1,
+TIME, 8,
+ UE_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test34.txt.gz b/openair2/LAYER2/rlc_v2/tests/test34.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..aabbe570e56ea236be3853ee4f8f445dbde899fd
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test34.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test35.h b/openair2/LAYER2/rlc_v2/tests/test35.h
new file mode 100644
index 0000000000000000000000000000000000000000..35ccec1a42a4b0e7fbcf05a6d6742ffb44efa02f
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test35.h
@@ -0,0 +1,9 @@
+/*
+ * um: discard PDU because rx buffer full
+ * eNB sends a PDU too big
+ */
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 5,
+ UE_UM, 10, 10, 35, 5,
+ ENB_SDU, 0, 40,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test35.txt.gz b/openair2/LAYER2/rlc_v2/tests/test35.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6581c390c73f05a34696e1effc3a7194e5f97f3c
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test35.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test36.h b/openair2/LAYER2/rlc_v2/tests/test36.h
new file mode 100644
index 0000000000000000000000000000000000000000..0a49527a923350ae87bab862bcb8d094818c0f15
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test36.h
@@ -0,0 +1,14 @@
+/*
+ * um: discard according to 36.322 5.1.2.2.2
+ * eNB sends many PDUs. 1st is received, then not, then again.
+ */
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 5,
+ UE_UM, 100000, 100000, 35, 5,
+ ENB_SDU, 0, 33,
+ ENB_PDU_SIZE, 2,
+TIME, 2,
+ UE_RECV_FAILS, 1,
+TIME, 22,
+ UE_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test36.txt.gz b/openair2/LAYER2/rlc_v2/tests/test36.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6ad38454f9ba8cbe02dbb137842d91cab52bbcca
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test36.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test37.h b/openair2/LAYER2/rlc_v2/tests/test37.h
new file mode 100644
index 0000000000000000000000000000000000000000..b418e2c7151ac82ddae3c623b74feae3360e6502
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test37.h
@@ -0,0 +1,37 @@
+/*
+ * um: some wrong PDUs
+ */
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 5,
+ UE_UM, 100000, 100000, 35, 5,
+ /* LI == 0
+ * rlc_pdu_encoder_put_bits(&e, 0, 2); // FI
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 0, 5); // SN
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 0, 11); // LI
+ */
+ ENB_PDU, 3, 0x20, 0x00, 0x00,
+ /* no data
+ * rlc_pdu_encoder_put_bits(&e, 0, 2); // FI
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 0, 5); // SN
+ */
+ ENB_PDU, 1, 0x00,
+ /* LI == 2 >= data_size == 1
+ * rlc_pdu_encoder_put_bits(&e, 0, 2); // FI
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 0, 5); // SN
+ * rlc_pdu_encoder_put_bits(&e, 0, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 2, 11); // LI
+ * rlc_pdu_encoder_align(&e);
+ * rlc_pdu_encoder_put_bits(&e, 0, 8); // 1 byte of data
+ */
+ ENB_PDU, 4, 0x20, 0x00, 0x20, 0x00,
+ /* PDU with E == 1 but has size 1 byte only (truncated PDU)
+ * rlc_pdu_encoder_put_bits(&e, 0, 2); // FI
+ * rlc_pdu_encoder_put_bits(&e, 1, 1); // E
+ * rlc_pdu_encoder_put_bits(&e, 0, 5); // SN
+ */
+ ENB_PDU, 1, 0x20,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test37.txt.gz b/openair2/LAYER2/rlc_v2/tests/test37.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2a1a837bf0329b2859fa9e71ac9a4bc460c55075
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test37.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test38.h b/openair2/LAYER2/rlc_v2/tests/test38.h
new file mode 100644
index 0000000000000000000000000000000000000000..66a37207e0274ddf93abfd7064908ec4a4c4b32e
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test38.h
@@ -0,0 +1,22 @@
+/*
+ * um: test some cases of functions tx_pdu_size and rlc_entity_um_generate_pdu
+ * eNB has too much data to fit in one PDU
+ * then later eNB wants to send an SDU of size > 2047
+ * then later eNB sends several SDUs in one PDU
+ */
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 5,
+ UE_UM, 100000, 100000, 35, 5,
+ ENB_PDU_SIZE, 2050,
+ ENB_SDU, 0, 1500,
+ ENB_SDU, 1, 1500,
+ ENB_SDU, 2, 10,
+TIME, 10,
+ ENB_SDU, 3, 2048,
+ ENB_SDU, 4, 10,
+TIME, 20,
+ ENB_SDU, 5, 10,
+ ENB_SDU, 6, 10,
+ ENB_SDU, 7, 10,
+ ENB_SDU, 8, 10,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test38.txt.gz b/openair2/LAYER2/rlc_v2/tests/test38.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..57e4ed270acc00bd861eeb824e24cc0a154c3a60
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test38.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test39.h b/openair2/LAYER2/rlc_v2/tests/test39.h
new file mode 100644
index 0000000000000000000000000000000000000000..8c926b3745ff69d70dd75f0d421e763c3451283a
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test39.h
@@ -0,0 +1,9 @@
+/*
+ * um: SDU too big
+ */
+TIME, 1,
+ MUST_FAIL,
+ ENB_UM, 10, 10, 35, 5,
+ UE_UM, 100, 100, 35, 5,
+ ENB_SDU, 0, 16001,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test39.txt.gz b/openair2/LAYER2/rlc_v2/tests/test39.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c4f6501d596f474dd77abbce265bd7ab4e7c9cd4
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test39.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test4.h b/openair2/LAYER2/rlc_v2/tests/test4.h
new file mode 100644
index 0000000000000000000000000000000000000000..8801096de117e51e9a0a07ccc6bd4c22114ef905
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test4.h
@@ -0,0 +1,13 @@
+/*
+ * basic um test: UE field length 5 bits
+ * at time 1, eNB receives an SDU of 10 bytes
+ * at time 10, UE receives an SDU of 5 bytes
+ */
+
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 5,
+ UE_UM, 100000, 100000, 35, 5,
+ ENB_SDU, 0, 10,
+TIME, 10,
+ UE_SDU, 0, 5,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test4.txt.gz b/openair2/LAYER2/rlc_v2/tests/test4.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..4339005cd60ae367d0f4bd3bf919253bcad82241
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test4.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test40.h b/openair2/LAYER2/rlc_v2/tests/test40.h
new file mode 100644
index 0000000000000000000000000000000000000000..478fe1af06536d88afe7c9c72abb4e91742119f7
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test40.h
@@ -0,0 +1,9 @@
+/*
+ * um: not enough room in SDU list
+ */
+TIME, 1,
+ ENB_UM, 10, 10, 35, 5,
+ UE_UM, 100, 100, 35, 5,
+ ENB_SDU, 0, 20,
+ ENB_BUFFER_STATUS,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test40.txt.gz b/openair2/LAYER2/rlc_v2/tests/test40.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..38d4b31cdaa43d1bac222a9d92ea9a615201cae6
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test40.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test41.h b/openair2/LAYER2/rlc_v2/tests/test41.h
new file mode 100644
index 0000000000000000000000000000000000000000..076d3e0d8c041f3310779967507157b91cea6eee
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test41.h
@@ -0,0 +1,45 @@
+/*
+ * um: test function check_t_reordering
+ * eNB sends PDUs, UE receives some and some not
+ */
+TIME, 1,
+ ENB_UM, 10000, 10000, 35, 5,
+ UE_UM, 10000, 10000, 35, 5,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 1, 10,
+ ENB_SDU, 2, 10,
+ ENB_SDU, 3, 10,
+ ENB_SDU, 4, 10,
+ ENB_SDU, 5, 10,
+ ENB_SDU, 6, 10,
+ ENB_SDU, 7, 10,
+ ENB_SDU, 8, 10,
+ ENB_SDU, 9, 10,
+ ENB_SDU, 10, 10,
+ ENB_SDU, 11, 10,
+ ENB_SDU, 12, 10,
+ ENB_SDU, 13, 10,
+ ENB_SDU, 14, 10,
+ ENB_SDU, 15, 10,
+ ENB_SDU, 16, 10,
+ ENB_SDU, 17, 10,
+ ENB_SDU, 18, 10,
+ ENB_SDU, 19, 10,
+ ENB_SDU, 20, 10,
+ ENB_SDU, 21, 10,
+ ENB_SDU, 22, 10,
+ ENB_SDU, 23, 10,
+ ENB_SDU, 24, 10,
+ ENB_SDU, 25, 10,
+ ENB_PDU_SIZE, 40,
+TIME, 2,
+ UE_RECV_FAILS, 1,
+TIME, 3,
+ UE_RECV_FAILS, 0,
+TIME, 6,
+ UE_RECV_FAILS, 1,
+TIME, 7,
+ UE_RECV_FAILS, 0,
+TIME, 8,
+ UE_RECV_FAILS, 1,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test41.txt.gz b/openair2/LAYER2/rlc_v2/tests/test41.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8b799ac084ca15f8c1914c93d71d2c25d6271e7d
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test41.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test42.h b/openair2/LAYER2/rlc_v2/tests/test42.h
new file mode 100644
index 0000000000000000000000000000000000000000..66f27b9dac46468006efea07f7e691db53a45ee1
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test42.h
@@ -0,0 +1,39 @@
+/*
+ * am test: test rlc_entity_am_discard_sdu
+ * eNB and UE get some SDU, later on some are discarded
+ */
+
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 1, 10,
+ ENB_SDU, 2, 10,
+ ENB_SDU, 3, 10,
+ ENB_PDU_SIZE, 23,
+TIME, 2,
+ ENB_DISCARD_SDU, 0,
+ ENB_DISCARD_SDU, 2,
+ ENB_DISCARD_SDU, 3,
+ ENB_DISCARD_SDU, 1,
+TIME, 10,
+ UE_SDU, 0, 5,
+ UE_SDU, 1, 5,
+ UE_SDU, 2, 5,
+ UE_SDU, 3, 5,
+ UE_SDU, 4, 5,
+ UE_SDU, 5, 5,
+ UE_PDU_SIZE, 13,
+TIME, 12,
+ UE_DISCARD_SDU, 3,
+ UE_DISCARD_SDU, 1,
+ UE_DISCARD_SDU, 0,
+ UE_DISCARD_SDU, 5,
+ UE_DISCARD_SDU, 4,
+ UE_DISCARD_SDU, 2,
+TIME, 30,
+ UE_SDU, 6, 5,
+ UE_DISCARD_SDU, 6,
+TIME, 31,
+ UE_SDU, 7, 8,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test42.txt.gz b/openair2/LAYER2/rlc_v2/tests/test42.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..cf9f45c88268e0a986a41c335480dded4f33abbd
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test42.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test43.h b/openair2/LAYER2/rlc_v2/tests/test43.h
new file mode 100644
index 0000000000000000000000000000000000000000..e594437ae8869c8d4f08d975ccaf7ccf5591ee85
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test43.h
@@ -0,0 +1,39 @@
+/*
+ * um test: test rlc_entity_um_discard_sdu
+ * eNB and UE get some SDU, later on some are discarded
+ */
+
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 10,
+ UE_UM, 100000, 100000, 35, 10,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 1, 10,
+ ENB_SDU, 2, 10,
+ ENB_SDU, 3, 10,
+ ENB_PDU_SIZE, 23,
+TIME, 2,
+ ENB_DISCARD_SDU, 0,
+ ENB_DISCARD_SDU, 2,
+ ENB_DISCARD_SDU, 3,
+ ENB_DISCARD_SDU, 1,
+TIME, 10,
+ UE_SDU, 0, 5,
+ UE_SDU, 1, 5,
+ UE_SDU, 2, 5,
+ UE_SDU, 3, 5,
+ UE_SDU, 4, 5,
+ UE_SDU, 5, 5,
+ UE_PDU_SIZE, 13,
+TIME, 12,
+ UE_DISCARD_SDU, 3,
+ UE_DISCARD_SDU, 1,
+ UE_DISCARD_SDU, 0,
+ UE_DISCARD_SDU, 5,
+ UE_DISCARD_SDU, 4,
+ UE_DISCARD_SDU, 2,
+TIME, 30,
+ UE_SDU, 6, 5,
+ UE_DISCARD_SDU, 6,
+TIME, 31,
+ UE_SDU, 7, 8,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test43.txt.gz b/openair2/LAYER2/rlc_v2/tests/test43.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..3387b6530e11728fbd180554a216f20c2b4ef2f8
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test43.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test44.h b/openair2/LAYER2/rlc_v2/tests/test44.h
new file mode 100644
index 0000000000000000000000000000000000000000..cc9873ac34b40f7c030a7bf16ea68860bd3bf808
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test44.h
@@ -0,0 +1,20 @@
+/*
+ * am: test function rlc_entity_am_reestablishment
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ RE_ESTABLISH,
+TIME, 2,
+ ENB_SDU, 0, 10,
+ RE_ESTABLISH,
+TIME, 3,
+ ENB_SDU, 0, 40,
+ ENB_PDU_SIZE, 14,
+ UE_RECV_FAILS, 1,
+TIME, 4,
+ UE_RECV_FAILS, 0,
+TIME, 10,
+ RE_ESTABLISH,
+TIME, -1
+
diff --git a/openair2/LAYER2/rlc_v2/tests/test44.txt.gz b/openair2/LAYER2/rlc_v2/tests/test44.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..bdad9e3fbc5ce1eb162b82c6ea82b0c8cf6fef86
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test44.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test45.h b/openair2/LAYER2/rlc_v2/tests/test45.h
new file mode 100644
index 0000000000000000000000000000000000000000..c27fd8e2f0641bef9abda06882ba332a85bce506
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test45.h
@@ -0,0 +1,30 @@
+/*
+ * um: test function rlc_entity_am_reestablishment
+ * and also the function clear_entity, case 'while (cur_rx != NULL)'
+ */
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 5,
+ UE_UM, 100000, 100000, 35, 5,
+ RE_ESTABLISH,
+TIME, 2,
+ ENB_SDU, 0, 10,
+ RE_ESTABLISH,
+TIME, 3,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 0, 10,
+ ENB_PDU_SIZE, 14,
+TIME, 5,
+ UE_RECV_FAILS, 1,
+TIME, 6,
+ UE_RECV_FAILS, 0,
+TIME, 10,
+ RE_ESTABLISH,
+TIME, 998,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 0, 10,
+ UE_RECV_FAILS, 1,
+TIME, 999,
+ UE_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test45.txt.gz b/openair2/LAYER2/rlc_v2/tests/test45.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c5e3e71d46e7f4a547b59fd5403557ac623e7d4f
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test45.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test5.h b/openair2/LAYER2/rlc_v2/tests/test5.h
new file mode 100644
index 0000000000000000000000000000000000000000..3224817c264296f8491a877f309ea62074064615
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test5.h
@@ -0,0 +1,13 @@
+/*
+ * basic um test: UE field length 10 bits
+ * at time 1, eNB receives an SDU of 10 bytes
+ * at time 10, UE receives an SDU of 5 bytes
+ */
+
+TIME, 1,
+ ENB_UM, 100000, 100000, 35, 10,
+ UE_UM, 100000, 100000, 35, 10,
+ ENB_SDU, 0, 10,
+TIME, 10,
+ UE_SDU, 0, 5,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test5.txt.gz b/openair2/LAYER2/rlc_v2/tests/test5.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..5a27d5260641878ac7e26cda1d77b8eeb7442154
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test5.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test6.h b/openair2/LAYER2/rlc_v2/tests/test6.h
new file mode 100644
index 0000000000000000000000000000000000000000..2115c8a328af4f490353e978be4e77961bf93035
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test6.h
@@ -0,0 +1,27 @@
+/*
+ * rlc am test function segment_already_received
+ * eNB sends SDU [1..900], not received
+ * eNB retx with smaller PDUs [1..600] [601..900]
+ * [1..600] is received but ACK/NACK not
+ * eNB retx with still smaller PDUs [1..400] [401..600] [601..900]
+ * all is received, ACKs/NACKs go through
+ *
+ * this test will fail if NACK mechanism uses SOstart/SOend
+ * (not implemented for the moment)
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_RECV_FAILS, 1,
+ ENB_RECV_FAILS, 1,
+ ENB_SDU, 0, 900,
+TIME, 2,
+ ENB_PDU_SIZE, 600,
+ UE_RECV_FAILS, 0,
+TIME, 48,
+ UE_RECV_FAILS, 1,
+ ENB_PDU_SIZE, 400,
+TIME, 90,
+ UE_RECV_FAILS, 0,
+ ENB_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test6.txt.gz b/openair2/LAYER2/rlc_v2/tests/test6.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..54870821a619725938e1ea529ff533d748d9c7db
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test6.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test7.h b/openair2/LAYER2/rlc_v2/tests/test7.h
new file mode 100644
index 0000000000000000000000000000000000000000..081227a400dcfebf40bfc63b85cb244e17de1d81
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test7.h
@@ -0,0 +1,26 @@
+/*
+ * rlc am test function rlc_am_segment_full
+ * eNB sends SDU [1..900], not received
+ * eNB retx with smaller PDUs [1..600] [601..900]
+ * nothing received
+ * eNB retx with still smaller PDUs [1..400] [401..600] [601..900]
+ * [401..600] received, ACK goes through
+ * link clean, all goes through
+ *
+ * this test will fail if NACK mechanism uses SOstart/SOend
+ * (not implemented for the moment)
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_RECV_FAILS, 1,
+ ENB_RECV_FAILS, 1,
+ ENB_SDU, 0, 900,
+TIME, 2,
+ ENB_PDU_SIZE, 600,
+TIME, 48,
+ ENB_PDU_SIZE, 400,
+TIME, 95,
+ UE_RECV_FAILS, 0,
+ ENB_RECV_FAILS, 0,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test7.txt.gz b/openair2/LAYER2/rlc_v2/tests/test7.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..9976a6050779805882bbefb2dab98fa27fd789bc
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test7.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test8.h b/openair2/LAYER2/rlc_v2/tests/test8.h
new file mode 100644
index 0000000000000000000000000000000000000000..aa7f5bed5be78d0979df6a12f245da7e8e38bdfb
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test8.h
@@ -0,0 +1,19 @@
+/*
+ * basic am test:
+ * at time 1, eNB receives 10 SDUs of 10 bytes
+ */
+
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ ENB_SDU, 0, 10,
+ ENB_SDU, 1, 10,
+ ENB_SDU, 2, 10,
+ ENB_SDU, 3, 10,
+ ENB_SDU, 4, 10,
+ ENB_SDU, 5, 10,
+ ENB_SDU, 6, 10,
+ ENB_SDU, 7, 10,
+ ENB_SDU, 8, 10,
+ ENB_SDU, 9, 10,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test8.txt.gz b/openair2/LAYER2/rlc_v2/tests/test8.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c8016878635a3f971d3c63298ac49ddefe6835b7
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test8.txt.gz differ
diff --git a/openair2/LAYER2/rlc_v2/tests/test9.h b/openair2/LAYER2/rlc_v2/tests/test9.h
new file mode 100644
index 0000000000000000000000000000000000000000..88e23d94e95891923a49a486445c119f4590b85f
--- /dev/null
+++ b/openair2/LAYER2/rlc_v2/tests/test9.h
@@ -0,0 +1,34 @@
+/*
+ * rlc am test function rlc_am_reassemble_next_segment
+ * case 'if pdu_byte is not in [so .. so+len-1]'
+ * eNB sends SDU [1..30], not received
+ * eNB retx with smaller PDUs [1..21] [22..30], not received
+ * eNB retx with still smaller PDUs [1..11] [12..21] [22..30], not received
+ * custom PDU [12..21] sent to UE, received
+ * custom PDU [1..21] sent to UE, received
+ *
+ * Not sure if in a real setup [12..21] is sent and then [1..21] is sent.
+ * In the current RLC implementation, this is impossible. If we send [12..21]
+ * it means [1..21] has been split and so we won't sent it later on.
+ * Maybe with HARQ retransmissions in PHY/MAC in bad radio conditions?
+ *
+ * this test will fail if NACK mechanism uses SOstart/SOend
+ * (not implemented for the moment)
+ */
+TIME, 1,
+ ENB_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_AM, 100000, 100000, 35, 0, 45, -1, -1, 4,
+ UE_RECV_FAILS, 1,
+ ENB_RECV_FAILS, 1,
+ ENB_SDU, 0, 30,
+TIME, 2,
+ ENB_PDU_SIZE, 25,
+TIME, 48,
+ ENB_PDU_SIZE, 15,
+TIME, 100,
+ UE_RECV_FAILS, 0,
+ ENB_RECV_FAILS, 0,
+ ENB_PDU, 14, 0xd8, 0x00, 0x00, 0x0b, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14,
+TIME, 101,
+ ENB_PDU, 25, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14,
+TIME, -1
diff --git a/openair2/LAYER2/rlc_v2/tests/test9.txt.gz b/openair2/LAYER2/rlc_v2/tests/test9.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..cc6d934e708e1ddad7286e7c3eec33cd23c91f94
Binary files /dev/null and b/openair2/LAYER2/rlc_v2/tests/test9.txt.gz differ
diff --git a/openair2/MCE_APP/mce_app.c b/openair2/MCE_APP/mce_app.c
index 32dfa5cc42cc8153134c27322b321f15dd1a1a0d..6f7454c321a7a3fd9e22b480f42e0082b8792348 100644
--- a/openair2/MCE_APP/mce_app.c
+++ b/openair2/MCE_APP/mce_app.c
@@ -343,7 +343,9 @@ void *MCE_app_task(void *args_p) {
/* Try to register each MCE */
// This assumes that node_type of all RRC instances is the same
- if (EPC_MODE_ENABLED) {
+ if ( EPC_MODE_ENABLED && RC.rrc == NULL )
+ LOG_E(RRC, "inconsistent global variables\n");
+ if (EPC_MODE_ENABLED && RC.rrc ) {
register_mce_pending = MCE_app_register(RC.rrc[0]->node_type, mce_id_start, mce_id_end);
}
diff --git a/openair2/PHY_INTERFACE/IF_Module.c b/openair2/PHY_INTERFACE/IF_Module.c
index b5cda35193fea99f9f6f5f580c2f1b38850bde1d..d98c603d78444f2951f2a47bf6413506a959ad83 100644
--- a/openair2/PHY_INTERFACE/IF_Module.c
+++ b/openair2/PHY_INTERFACE/IF_Module.c
@@ -685,7 +685,7 @@ static void dump_dl(Sched_Rsp_t *d) {
/* debug utility functions end */
/****************************************************************************/
-void UL_indication(UL_IND_t *UL_info) {
+void UL_indication(UL_IND_t *UL_info, L1_rxtx_proc_t *proc) {
AssertFatal(UL_info!=NULL,"UL_INFO is null\n");
#ifdef DUMP_FAPI
dump_ul(UL_info);
@@ -767,7 +767,7 @@ void UL_indication(UL_IND_t *UL_info) {
"schedule_response is null (mod %d, cc %d)\n",
module_id,
CC_id);
- ifi->schedule_response(sched_info);
+ ifi->schedule_response(sched_info, proc );
}
LOG_D(PHY,"Schedule_response: SFN_SF:%d%d dl_pdus:%d\n",sched_info->frame,sched_info->subframe,sched_info->DL_req->dl_config_request_body.number_pdu);
diff --git a/openair2/PHY_INTERFACE/IF_Module.h b/openair2/PHY_INTERFACE/IF_Module.h
index f2602220970220b120b57cd1504cca540556b912..42a4459732326a89b12c5c0ca224c71c8303c325 100644
--- a/openair2/PHY_INTERFACE/IF_Module.h
+++ b/openair2/PHY_INTERFACE/IF_Module.h
@@ -34,10 +34,12 @@
#include <stdint.h>
+#include <sched.h>
//#include "openair1/PHY/LTE_TRANSPORT/transport_eNB.h"
#include "nfapi_interface.h"
#include "platform_constants.h"
#include "platform_types.h"
+#include <common/utils/threadPool/thread-pool.h>
#define MAX_NUM_DL_PDU 100
#define MAX_NUM_UL_PDU 100
@@ -130,16 +132,69 @@ typedef struct {
} Sched_Rsp_t;
typedef struct {
- uint8_t Mod_id;
- int CC_id;
- nfapi_config_request_t *cfg;
-} PHY_Config_t;
-
-typedef struct IF_Module_s {
- //define the function pointer
- void (*UL_indication)(UL_IND_t *UL_INFO);
- void (*schedule_response)(Sched_Rsp_t *Sched_INFO);
- void (*PHY_config_req)(PHY_Config_t *config_INFO);
+ uint8_t Mod_id;
+ int CC_id;
+ nfapi_config_request_t *cfg;
+}PHY_Config_t;
+#include <targets/ARCH/COMMON/common_lib.h>
+/// Context data structure for RX/TX portion of subframe processing
+typedef struct {
+ /// Component Carrier index
+ uint8_t CC_id;
+ /// timestamp transmitted to HW
+ openair0_timestamp timestamp_tx;
+ openair0_timestamp timestamp_rx;
+ /// subframe to act upon for transmission
+ int subframe_tx;
+ /// subframe to act upon for reception
+ int subframe_rx;
+ /// frame to act upon for transmission
+ int frame_tx;
+ /// frame to act upon for reception
+ int frame_rx;
+ int frame_prach;
+ int subframe_prach;
+ int frame_prach_br;
+ int subframe_prach_br;
+ /// \brief Instance count for RXn-TXnp4 processing thread.
+ /// \internal This variable is protected by \ref mutex_rxtx.
+ int instance_cnt;
+ /// pthread structure for RXn-TXnp4 processing thread
+ pthread_t pthread;
+ /// pthread attributes for RXn-TXnp4 processing thread
+ pthread_attr_t attr;
+ /// condition variable for tx processing thread
+ pthread_cond_t cond;
+ /// mutex for RXn-TXnp4 processing thread
+ pthread_mutex_t mutex;
+ /// scheduling parameters for RXn-TXnp4 thread
+ struct sched_param sched_param_rxtx;
+
+ /// \internal This variable is protected by \ref mutex_RUs.
+ int instance_cnt_RUs;
+ /// condition variable for tx processing thread
+ pthread_cond_t cond_RUs;
+ /// mutex for RXn-TXnp4 processing thread
+ pthread_mutex_t mutex_RUs;
+ tpool_t *threadPool;
+ int nbEncode;
+ int nbDecode;
+ notifiedFIFO_t *respEncode;
+ notifiedFIFO_t *respDecode;
+ pthread_mutex_t mutex_emulateRF;
+ int instance_cnt_emulateRF;
+ pthread_t pthread_emulateRF;
+ pthread_attr_t attr_emulateRF;
+ pthread_cond_t cond_emulateRF;
+ int first_rx;
+} L1_rxtx_proc_t;
+
+typedef struct IF_Module_s{
+//define the function pointer
+ void (*UL_indication)(UL_IND_t *UL_INFO, L1_rxtx_proc_t *proc);
+ void (*schedule_response)(Sched_Rsp_t *Sched_INFO, L1_rxtx_proc_t *proc);
+ void (*PHY_config_req)(PHY_Config_t* config_INFO);
+
void (*PHY_config_update_sib2_req)(PHY_Config_t* config_INFO);
void (*PHY_config_update_sib13_req)(PHY_Config_t* config_INFO);
uint32_t CC_mask;
@@ -165,7 +220,7 @@ void IF_Module_kill(int Mod_id);
/*Interface for uplink, transmitting the Preamble(list), ULSCH SDU, NAK, Tick (trigger scheduler)
*/
-void UL_indication(UL_IND_t *UL_INFO);
+void UL_indication(UL_IND_t *UL_INFO, L1_rxtx_proc_t *proc);
/*Interface for Downlink, transmitting the DLSCH SDU, DCI SDU*/
void Schedule_Response(Sched_Rsp_t *Sched_INFO);
diff --git a/openair2/PHY_INTERFACE/phy_stub_UE.c b/openair2/PHY_INTERFACE/phy_stub_UE.c
index be7c578267367630b552cb3e6fd3de8cd54a0c25..41fb3ddc3a7eebfcdd376c32a3009e75aa602eb4 100644
--- a/openair2/PHY_INTERFACE/phy_stub_UE.c
+++ b/openair2/PHY_INTERFACE/phy_stub_UE.c
@@ -828,6 +828,40 @@ void dl_config_req_UE_MAC_bch(int sfn,
}
}
+void dl_config_req_UE_MAC_mch(int sfn,
+ int sf,
+ nfapi_dl_config_request_pdu_t *mch,
+ int num_ue) {
+ DevAssert(mch->pdu_type == NFAPI_DL_CONFIG_MCH_PDU_TYPE);
+
+ for (int ue_id = 0; ue_id < num_ue; ue_id++) {
+ if (UE_mac_inst[ue_id].UE_mode[0] == NOT_SYNCHED){
+ LOG_D(MAC,
+ "%s(): Received MCH in NOT_SYNCHED: UE_mode: %d, sfn/sf: %d.%d\n",
+ __func__,
+ UE_mac_inst[ue_id].UE_mode[0],
+ sfn,
+ sf);
+ return;
+
+ } else {
+ const int pdu_index = mch->mch_pdu.mch_pdu_rel8.pdu_index;
+ if (pdu_index < 0 || pdu_index >= tx_req_num_elems) {
+ LOG_E(MAC,
+ "%s(): Problem with receiving data: "
+ "sfn/sf:%d.%d PDU size:%d, TX_PDU index: %d\n",
+ __func__,
+ sfn, sf, mch->pdu_size, mch->mch_pdu.mch_pdu_rel8.pdu_index);
+ return;
+ }
+ ue_send_mch_sdu(ue_id, 0, sfn,
+ tx_request_pdu_list[pdu_index].segments[0].segment_data,
+ tx_request_pdu_list[pdu_index].segments[0].segment_length,
+ 0,0);
+ }
+ }
+}
+
void hi_dci0_req_UE_MAC(int sfn,
int sf,
nfapi_hi_dci0_request_pdu_t* hi_dci0,
@@ -848,7 +882,8 @@ void hi_dci0_req_UE_MAC(int sfn,
// The following set of memcpy functions should be getting called as callback
// functions from pnf_p7_subframe_ind.
-int memcpy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7,
+int memcpy_dl_config_req(L1_rxtx_proc_t *proc,
+ nfapi_pnf_p7_config_t *pnf_p7,
nfapi_dl_config_request_t *req) {
dl_config_req = (nfapi_dl_config_request_t *)malloc(sizeof(nfapi_dl_config_request_t));
@@ -876,10 +911,11 @@ int memcpy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7,
return 0;
}
-int memcpy_ul_config_req(nfapi_pnf_p7_config_t *pnf_p7,
- nfapi_ul_config_request_t *req) {
+int memcpy_ul_config_req (L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t* pnf_p7, nfapi_ul_config_request_t* req)
+{
ul_config_req = malloc(sizeof(nfapi_ul_config_request_t));
+
ul_config_req->sfn_sf = req->sfn_sf;
ul_config_req->vendor_extension = req->vendor_extension;
@@ -923,9 +959,12 @@ int memcpy_tx_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_tx_request_t *req) {
return 0;
}
-int memcpy_hi_dci0_req(nfapi_pnf_p7_config_t *pnf_p7,
- nfapi_hi_dci0_request_t *req) {
+int memcpy_hi_dci0_req (L1_rxtx_proc_t *proc,
+ nfapi_pnf_p7_config_t* pnf_p7,
+ nfapi_hi_dci0_request_t* req) {
hi_dci0_req = (nfapi_hi_dci0_request_t *)malloc(sizeof(nfapi_hi_dci0_request_t));
+ //if(req!=0){
+
hi_dci0_req->sfn_sf = req->sfn_sf;
hi_dci0_req->vendor_extension = req->vendor_extension;
@@ -1040,7 +1079,7 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,
int frame,
int subframe,
L1_rxtx_proc_t *proc,
- nfapi_dl_config_request_pdu_t *dl_config_pdu,
+ nfapi_dl_config_request_pdu_t *dl_config_pdu,
uint8_t codeword_index,
uint8_t *sdu) {
}
@@ -1052,6 +1091,11 @@ void handle_nfapi_ul_pdu(PHY_VARS_eNB *eNB,
uint8_t subframe,
uint8_t srs_present) {
}
+void handle_nfapi_mch_pdu(PHY_VARS_eNB *eNB,
+ L1_rxtx_proc_t *proc,
+ nfapi_dl_config_request_pdu_t *dl_config_pdu,
+ uint8_t *sdu) {
+}
void phy_config_request(PHY_Config_t *phy_config) {
}
diff --git a/openair2/PHY_INTERFACE/phy_stub_UE.h b/openair2/PHY_INTERFACE/phy_stub_UE.h
index 034da51d6f6e943419b76904cd8b53cbbf497440..09356fc9f81da4e01641598de5ea9e589fdee7d0 100644
--- a/openair2/PHY_INTERFACE/phy_stub_UE.h
+++ b/openair2/PHY_INTERFACE/phy_stub_UE.h
@@ -102,6 +102,10 @@ void dl_config_req_UE_MAC_bch(int sfn,
int sf,
nfapi_dl_config_request_pdu_t *bch,
int num_ue);
+void dl_config_req_UE_MAC_mch(int sfn,
+ int sf,
+ nfapi_dl_config_request_pdu_t *bch,
+ int num_ue);
int tx_req_UE_MAC(nfapi_tx_request_t* req);
@@ -114,16 +118,16 @@ void hi_dci0_req_UE_MAC(int sfn,
// The following set of memcpy functions should be getting called as callback functions from
// pnf_p7_subframe_ind.
-int memcpy_dl_config_req (nfapi_pnf_p7_config_t* pnf_p7, nfapi_dl_config_request_t* req);
+int memcpy_dl_config_req (L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t* pnf_p7, nfapi_dl_config_request_t* req);
-int memcpy_ul_config_req (nfapi_pnf_p7_config_t* pnf_p7, nfapi_ul_config_request_t* req);
+int memcpy_ul_config_req (L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t* pnf_p7, nfapi_ul_config_request_t* req);
int memcpy_tx_req (nfapi_pnf_p7_config_t* pnf_p7, nfapi_tx_request_t* req);
-int memcpy_hi_dci0_req (nfapi_pnf_p7_config_t* pnf_p7, nfapi_hi_dci0_request_t* req);
+int memcpy_hi_dci0_req (L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t* pnf_p7, nfapi_hi_dci0_request_t* req);
void UE_config_stub_pnf(void);
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index dc9183a87d5a05a9820b4722d0b20bc43372b32d..456496af637099d8740eb44882809fa2fb95cc21 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -2134,6 +2134,8 @@ rrc_eNB_generate_RRCConnectionRelease(
{
uint8_t buffer[RRC_BUF_SIZE];
uint16_t size = 0;
+ int release_num;
+
memset(buffer, 0, RRC_BUF_SIZE);
T(T_ENB_RRC_CONNECTION_RELEASE, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
@@ -2161,12 +2163,9 @@ rrc_eNB_generate_RRCConnectionRelease(
ue_context_pP->ue_context.rnti,
rrc_eNB_mui,
size);
+ pthread_mutex_lock(&rrc_release_freelist);
- while (pthread_mutex_trylock(&rrc_release_freelist)) {
- /* spin... */
- }
-
- for (uint16_t release_num = 0; release_num < NUMBER_OF_UE_MAX; release_num++) {
+ for (release_num = 0; release_num < NUMBER_OF_UE_MAX; release_num++) {
if (rrc_release_info.RRC_release_ctrl[release_num].flag == 0) {
if (ue_context_pP->ue_context.ue_release_timer_s1 > 0) {
rrc_release_info.RRC_release_ctrl[release_num].flag = 1;
@@ -2186,6 +2185,12 @@ rrc_eNB_generate_RRCConnectionRelease(
}
}
+ /* TODO: what to do if RRC_release_ctrl is full? For now, exit. */
+ if (release_num == NUMBER_OF_UE_MAX) {
+ LOG_E(RRC, "fatal: rrc_release_info.RRC_release_ctrl is full\n");
+ exit(1);
+ }
+
pthread_mutex_unlock(&rrc_release_freelist);
if (NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
@@ -3512,6 +3517,35 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
size,
buffer,
PDCP_TRANSMISSION_MODE_CONTROL);
+
+ /* Refresh SRBs/DRBs */
+ rrc_pdcp_config_asn1_req(ctxt_pP,
+ *SRB_configList2, // NULL,
+ *DRB_configList,
+ NULL,
+ 0xff, // already configured during the securitymodecommand
+ NULL,
+ NULL,
+ NULL
+#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0))
+ , (LTE_PMCH_InfoList_r9_t *) NULL
+#endif
+ , NULL);
+
+ /* Refresh SRBs/DRBs */
+ if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
+ rrc_rlc_config_asn1_req(ctxt_pP,
+ *SRB_configList2, // NULL,
+ *DRB_configList,
+ NULL
+#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0))
+ , (LTE_PMCH_InfoList_r9_t *) NULL,
+ 0,
+ 0
+#endif
+ );
+ }
+
free(Sparams);
Sparams = NULL;
free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP);
@@ -5192,13 +5226,13 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
DRB_rlc_config = CALLOC(1, sizeof(*DRB_rlc_config));
DRB_config->rlc_Config = DRB_rlc_config;
#ifdef RRC_DEFAULT_RAB_IS_AM
- DRB_rlc_config->present = RLC_Config_PR_am;
- DRB_rlc_config->choice.am.ul_AM_RLC.t_PollRetransmit = T_PollRetransmit_ms50;
- DRB_rlc_config->choice.am.ul_AM_RLC.pollPDU = PollPDU_p16;
- DRB_rlc_config->choice.am.ul_AM_RLC.pollByte = PollByte_kBinfinity;
- DRB_rlc_config->choice.am.ul_AM_RLC.maxRetxThreshold = UL_AM_RLC__maxRetxThreshold_t8;
- DRB_rlc_config->choice.am.dl_AM_RLC.t_Reordering = T_Reordering_ms35;
- DRB_rlc_config->choice.am.dl_AM_RLC.t_StatusProhibit = T_StatusProhibit_ms25;
+ DRB_rlc_config->present = LTE_RLC_Config_PR_am;
+ DRB_rlc_config->choice.am.ul_AM_RLC.t_PollRetransmit = LTE_T_PollRetransmit_ms50;
+ DRB_rlc_config->choice.am.ul_AM_RLC.pollPDU = LTE_PollPDU_p16;
+ DRB_rlc_config->choice.am.ul_AM_RLC.pollByte = LTE_PollByte_kBinfinity;
+ DRB_rlc_config->choice.am.ul_AM_RLC.maxRetxThreshold = LTE_UL_AM_RLC__maxRetxThreshold_t8;
+ DRB_rlc_config->choice.am.dl_AM_RLC.t_Reordering = LTE_T_Reordering_ms35;
+ DRB_rlc_config->choice.am.dl_AM_RLC.t_StatusProhibit = LTE_T_StatusProhibit_ms25;
#else
DRB_rlc_config->present = LTE_RLC_Config_PR_um_Bi_Directional;
DRB_rlc_config->choice.um_Bi_Directional.ul_UM_RLC.sn_FieldLength = LTE_SN_FieldLength_size10;
@@ -6029,6 +6063,35 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
ue_context_pP->ue_context.rnti,
rrc_eNB_mui,
size);
+
+ /* Refresh SRBs/DRBs */
+ rrc_pdcp_config_asn1_req(ctxt_pP,
+ *SRB_configList2, // NULL,
+ *DRB_configList,
+ NULL,
+ 0xff, // already configured during the securitymodecommand
+ NULL,
+ NULL,
+ NULL
+#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0))
+ , (LTE_PMCH_InfoList_r9_t *) NULL
+#endif
+ , NULL);
+
+ /* Refresh SRBs/DRBs */
+ if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
+ rrc_rlc_config_asn1_req(ctxt_pP,
+ *SRB_configList2, // NULL,
+ *DRB_configList,
+ NULL
+#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0))
+ , (LTE_PMCH_InfoList_r9_t *) NULL,
+ 0,
+ 0
+#endif
+ );
+ }
+
free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ);
quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = NULL;
free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP);
@@ -6072,12 +6135,14 @@ rrc_eNB_configure_rbs_handover(struct rrc_eNB_ue_context_s *ue_context_p, protoc
NULL,
NULL,
(LTE_PMCH_InfoList_r9_t *) NULL, NULL);
- rrc_rlc_config_asn1_req(ctxt_pP,
- ue_context_p->ue_context.SRB_configList,
- (LTE_DRB_ToAddModList_t *) NULL,
- (LTE_DRB_ToReleaseList_t *) NULL,
- (LTE_PMCH_InfoList_r9_t *) NULL, 0, 0
- );
+ if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
+ rrc_rlc_config_asn1_req(ctxt_pP,
+ ue_context_p->ue_context.SRB_configList,
+ (LTE_DRB_ToAddModList_t *) NULL,
+ (LTE_DRB_ToReleaseList_t *) NULL,
+ (LTE_PMCH_InfoList_r9_t *) NULL, 0, 0
+ );
+ }
if (EPC_MODE_ENABLED) {
rrc_eNB_process_security (
@@ -6212,14 +6277,16 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
(LTE_PMCH_InfoList_r9_t *) NULL,
NULL);
/* Refresh SRBs/DRBs */
- rrc_rlc_config_asn1_req(ctxt_pP,
- SRB_configList, // NULL,
- DRB_configList,
- DRB_Release_configList2,
- (LTE_PMCH_InfoList_r9_t *) NULL,
- 0,
- 0
- );
+ if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
+ rrc_rlc_config_asn1_req(ctxt_pP,
+ SRB_configList, // NULL,
+ DRB_configList,
+ DRB_Release_configList2,
+ (LTE_PMCH_InfoList_r9_t *) NULL,
+ 0,
+ 0
+ );
+ }
/* Set the SRB active in UE context */
if (SRB_configList != NULL) {
@@ -8166,6 +8233,143 @@ void rrc_enb_init(void) {
memset(&rrc_release_info,0,sizeof(RRC_release_list_t));
}
+//-----------------------------------------------------------------------------
+void process_successful_rlc_sdu_indication(int instance,
+ int rnti,
+ int message_id)
+{
+ int release_num;
+ int release_total;
+ RRC_release_ctrl_t *release_ctrl;
+
+ /* Check if the message sent was RRC Connection Release.
+ * If yes then continue the release process.
+ */
+
+ pthread_mutex_lock(&rrc_release_freelist);
+
+ if (rrc_release_info.num_UEs > 0) {
+ release_total = 0;
+
+ for (release_num = 0, release_ctrl = &rrc_release_info.RRC_release_ctrl[0];
+ release_num < NUMBER_OF_UE_MAX;
+ release_num++, release_ctrl++) {
+ if(release_ctrl->flag > 0) {
+ release_total++;
+ } else {
+ continue;
+ }
+
+ if (release_ctrl->flag == 1 && release_ctrl->rnti == rnti && release_ctrl->rrc_eNB_mui == message_id) {
+ release_ctrl->flag = 3;
+ LOG_D(MAC,"DLSCH Release send:index %d rnti %x mui %d flag 1->3\n",
+ release_num,
+ rnti,
+ message_id);
+ break;
+ }
+
+ if (release_ctrl->flag == 2 && release_ctrl->rnti == rnti && release_ctrl->rrc_eNB_mui == message_id) {
+ release_ctrl->flag = 4;
+ LOG_D(MAC, "DLSCH Release send:index %d rnti %x mui %d flag 2->4\n",
+ release_num,
+ rnti,
+ message_id);
+ break;
+ }
+
+ if(release_total >= rrc_release_info.num_UEs)
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&rrc_release_freelist);
+}
+
+//-----------------------------------------------------------------------------
+void process_unsuccessful_rlc_sdu_indication(int instance, int rnti)
+{
+ int release_num;
+ int release_total;
+ RRC_release_ctrl_t *release_ctrl;
+
+ /* radio link failure detected by RLC layer, remove UE properly */
+
+ pthread_mutex_lock(&rrc_release_freelist);
+
+ /* first, check if the rnti is in the list rrc_release_info.RRC_release_ctrl */
+
+ if (rrc_release_info.num_UEs > 0) {
+ release_total = 0;
+
+ for (release_num = 0, release_ctrl = &rrc_release_info.RRC_release_ctrl[0];
+ release_num < NUMBER_OF_UE_MAX;
+ release_num++, release_ctrl++) {
+ if(release_ctrl->flag > 0) {
+ release_total++;
+ } else {
+ continue;
+ }
+
+ if (release_ctrl->flag == 1 && release_ctrl->rnti == rnti) {
+ release_ctrl->flag = 3;
+ LOG_D(MAC,"DLSCH Release send:index %d rnti %x flag 1->3\n",
+ release_num,
+ rnti);
+ goto done;
+ }
+
+ if (release_ctrl->flag == 2 && release_ctrl->rnti == rnti) {
+ release_ctrl->flag = 4;
+ LOG_D(MAC, "DLSCH Release send:index %d rnti %x flag 2->4\n",
+ release_num,
+ rnti);
+ goto done;
+ }
+
+ if(release_total >= rrc_release_info.num_UEs)
+ break;
+ }
+ }
+
+ /* it's not in the list, put it with flag = 4 */
+ for (release_num = 0; release_num < NUMBER_OF_UE_MAX; release_num++) {
+ if (rrc_release_info.RRC_release_ctrl[release_num].flag == 0) {
+ rrc_release_info.RRC_release_ctrl[release_num].flag = 4;
+ rrc_release_info.RRC_release_ctrl[release_num].rnti = rnti;
+ rrc_release_info.RRC_release_ctrl[release_num].rrc_eNB_mui = -1; /* not defined */
+ rrc_release_info.num_UEs++;
+ LOG_D(RRC, "radio link failure detected: index %d rnti %x flag %d \n",
+ release_num,
+ rnti,
+ rrc_release_info.RRC_release_ctrl[release_num].flag);
+ break;
+ }
+ }
+
+ /* TODO: what to do if rrc_release_info.RRC_release_ctrl is full? */
+ if (release_num == NUMBER_OF_UE_MAX) {
+ LOG_E(RRC, "fatal: radio link failure: rrc_release_info.RRC_release_ctrl is full\n");
+ exit(1);
+ }
+
+done:
+ pthread_mutex_unlock(&rrc_release_freelist);
+}
+
+//-----------------------------------------------------------------------------
+void process_rlc_sdu_indication(int instance,
+ int rnti,
+ int is_successful,
+ int srb_id,
+ int message_id)
+{
+ if (is_successful)
+ process_successful_rlc_sdu_indication(instance, rnti, message_id);
+ else
+ process_unsuccessful_rlc_sdu_indication(instance, rnti);
+}
+
//-----------------------------------------------------------------------------
int add_ue_to_remove(struct rrc_eNB_ue_context_s **ue_to_be_removed,
int removed_ue_count,
@@ -8868,6 +9072,13 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
rrc_eNB_process_M2AP_MCE_CONFIGURATION_UPDATE(&ctxt,&M2AP_MCE_CONFIGURATION_UPDATE(msg_p));
break;
+ case RLC_SDU_INDICATION:
+ process_rlc_sdu_indication(instance,
+ RLC_SDU_INDICATION(msg_p).rnti,
+ RLC_SDU_INDICATION(msg_p).is_successful,
+ RLC_SDU_INDICATION(msg_p).srb_id,
+ RLC_SDU_INDICATION(msg_p).message_id);
+ break;
default:
LOG_E(RRC, "[eNB %d] Received unexpected message %s\n", instance, msg_name_p);
@@ -8904,7 +9115,7 @@ rrc_enb_task(
//if (go_nr) rrc_go_nr();
}
}
-}
+ }
/*------------------------------------------------------------------------------*/
void
diff --git a/openair2/RRC/NR/nr_rrc_extern.h b/openair2/RRC/NR/nr_rrc_extern.h
index 8373a53584d96d81283071badef899dcfdf6ebc5..04e0392236bf5ada098861923a84bf3a2da13b4a 100644
--- a/openair2/RRC/NR/nr_rrc_extern.h
+++ b/openair2/RRC/NR/nr_rrc_extern.h
@@ -28,8 +28,8 @@
* \email: navid.nikaein@eurecom.fr, kroempa@gmail.com
*/
-#ifndef __OPENAIR_RRC_EXTERN_H__
-#define __OPENAIR_RRC_EXTERN_H__
+#ifndef __OPENAIR_NR_RRC_EXTERN_H__
+#define __OPENAIR_NR_RRC_EXTERN_H__
#include "nr_rrc_defs.h"
#include "COMMON/mac_rrc_primitives.h"
#include "LAYER2/MAC/mac.h"
@@ -69,10 +69,12 @@ extern uint32_t timeToTrigger_ms[16];
extern float RSRP_meas_mapping[98];
extern float RSRQ_meas_mapping[35];
-extern UE_PF_PO_t UE_PF_PO[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
+extern UE_PF_PO_t UE_PF_PO[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
+
extern pthread_mutex_t ue_pf_po_mutex;
-extern uint16_t reestablish_rnti_map[NUMBER_OF_UE_MAX][2];
+extern uint16_t reestablish_rnti_map[MAX_MOBILES_PER_ENB][2];
+char openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_RrcConfigurationReq *configuration);
#endif
diff --git a/openair2/RRC/NR/rrc_gNB_UE_context.h b/openair2/RRC/NR/rrc_gNB_UE_context.h
index 4681cabb8f216b974536c7f01c4223208802d57d..762d9642897c8ceb3bd28ad25f436e2c7ae50edb 100644
--- a/openair2/RRC/NR/rrc_gNB_UE_context.h
+++ b/openair2/RRC/NR/rrc_gNB_UE_context.h
@@ -28,6 +28,7 @@
* \email: lionel.gauthier@eurecom.fr
*/
#ifndef __RRC_ENB_UE_CONTEXT_H__
+#define __RRC_ENB_UE_CONTEXT_H__
#include "collection/tree.h"
#include "COMMON/platform_types.h"
#include "nr_rrc_defs.h"
@@ -58,7 +59,7 @@ int rrc_gNB_compare_ue_rnti_id(
struct rrc_gNB_ue_context_s* c2_pP
);
-RB_PROTOTYPE(rrc_ue_tree_s, rrc_gNB_ue_context_s, entries, rrc_gNB_compare_ue_rnti_id);
+RB_PROTOTYPE(rrc_nr_ue_tree_s, rrc_gNB_ue_context_s, entries, rrc_gNB_compare_ue_rnti_id);
struct rrc_gNB_ue_context_s*
rrc_gNB_allocate_new_UE_context(
diff --git a/openair2/RRC/NR/rrc_gNB_nsa.c b/openair2/RRC/NR/rrc_gNB_nsa.c
index cf48aef45941854e78c3d60bbf7fc2dc2e141d53..763c208dfe64b72d31e684e8b14b9e9d1bab96e5 100644
--- a/openair2/RRC/NR/rrc_gNB_nsa.c
+++ b/openair2/RRC/NR/rrc_gNB_nsa.c
@@ -41,9 +41,9 @@
void rrc_parse_ue_capabilities(gNB_RRC_INST *rrc,LTE_UE_CapabilityRAT_ContainerList_t *UE_CapabilityRAT_ContainerList) {
struct rrc_gNB_ue_context_s *ue_context_p = NULL;
- OCTET_STRING_t *ueCapabilityRAT_Container_nr;
- OCTET_STRING_t *ueCapabilityRAT_Container_MRDC;
- int list_size;
+ OCTET_STRING_t *ueCapabilityRAT_Container_nr=NULL;
+ OCTET_STRING_t *ueCapabilityRAT_Container_MRDC=NULL;
+ int list_size=0;
AssertFatal(UE_CapabilityRAT_ContainerList!=NULL,"UE_CapabilityRAT_ContainerList is null\n");
AssertFatal((list_size=UE_CapabilityRAT_ContainerList->list.count) >= 2, "UE_CapabilityRAT_ContainerList->list.size %d < 2\n",UE_CapabilityRAT_ContainerList->list.count);
for (int i=0;i<list_size;i++) {
diff --git a/openair2/UTIL/MEM/mem_block.c b/openair2/UTIL/MEM/mem_block.c
deleted file mode 100644
index 0150ef00cdaf208120828c54840d80545b6908ca..0000000000000000000000000000000000000000
--- a/openair2/UTIL/MEM/mem_block.c
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/***************************************************************************
- mem_block.c - description
- -------------------
- AUTHOR : Lionel GAUTHIER
- COMPANY : EURECOM
- EMAIL : Lionel.Gauthier@eurecom.fr
-
-
- ***************************************************************************/
-#define MEM_BLOCK_C
-//#include "rtos_header.h"
-#include "mem_block.h"
-#include "mem_pool.h"
-#include "list.h"
-#include "LAYER2/MAC/mac_extern.h"
-#include "assertions.h"
-/* all function calls are protected by a mutex
- * to ensure that many threads calling them at
- * the same time don't mess up.
- * We might be more clever in the future, it's a
- * bit overkill.
- * Commenting this define removes the protection,
- * so be careful with it.
- */
-#define MEMBLOCK_BIG_LOCK
-
-#ifdef MEMBLOCK_BIG_LOCK
-static pthread_mutex_t mtex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
-//-----------------------------------------------------------------------------
-//#define DEBUG_MEM_MNGT_FREE
-//#define DEBUG_MEM_MNGT_ALLOC_SIZE
-//#define DEBUG_MEM_MNGT_ALLOC
-//-----------------------------------------------------------------------------
-#if defined(DEBUG_MEM_MNGT_ALLOC)
-uint32_t counters[14] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-#endif
-//-----------------------------------------------------------------------------
-/*
- * initialize all ures
- */
-extern mem_pool *memBlockVar;
-void *
-pool_buffer_init (void)
-{
- //-----------------------------------------------------------------------------
-
- uint32_t index, mb_index, pool_index;
- mem_pool *memory = (mem_pool *) &mem_block_var;
- memBlockVar=malloc(sizeof(mem_pool));
- int pool_sizes[14] = { MEM_MNGT_MB0_NB_BLOCKS, MEM_MNGT_MB1_NB_BLOCKS,
- MEM_MNGT_MB2_NB_BLOCKS, MEM_MNGT_MB3_NB_BLOCKS,
- MEM_MNGT_MB4_NB_BLOCKS, MEM_MNGT_MB5_NB_BLOCKS,
- MEM_MNGT_MB6_NB_BLOCKS, MEM_MNGT_MB7_NB_BLOCKS,
- MEM_MNGT_MB8_NB_BLOCKS, MEM_MNGT_MB9_NB_BLOCKS,
- MEM_MNGT_MB10_NB_BLOCKS, MEM_MNGT_MB11_NB_BLOCKS,
- MEM_MNGT_MB12_NB_BLOCKS, MEM_MNGT_MBCOPY_NB_BLOCKS
- };
-
-#ifdef MEMBLOCK_BIG_LOCK
- if (pthread_mutex_lock(&mtex)) abort();
-#endif
-
- memset (memory, 0, sizeof (mem_pool));
- mb_index = 0;
-
- // LG_TEST
- for (pool_index = 0; pool_index <= MEM_MNGT_POOL_ID_COPY; pool_index++) {
- list_init (&memory->mem_lists[pool_index], "POOL");
-
- for (index = 0; index < pool_sizes[pool_index]; index++) {
- //memory->mem_blocks[mb_index + index].previous = NULL; -> done in memset 0
- //memory->mem_blocks[mb_index + index].next = NULL; -> done in memset 0
- switch (pool_index) {
- case 0:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool0[index][0]);
- break;
-
- case 1:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool1[index][0]);
- break;
-
- case 2:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool2[index][0]);
- break;
-
- case 3:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool3[index][0]);
- break;
-
- case 4:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool4[index][0]);
- break;
-
- case 5:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool5[index][0]);
- break;
-
- case 6:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool6[index][0]);
- break;
-
- case 7:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool7[index][0]);
- break;
-
- case 8:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool8[index][0]);
- break;
-
- case 9:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool9[index][0]);
- break;
-
- case 10:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool10[index][0]);
- break;
-
- case 11:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool11[index][0]);
- break;
-
- case 12:
- memory->mem_blocks[mb_index + index].data = (unsigned char*)&(memory->mem_pool12[index][0]);
- break;
-
- default:
- ;
- memory->mem_blocks[mb_index + index].data = NULL; // pool copy
-
- }
-
- memory->mem_blocks[mb_index + index].pool_id = pool_index;
- list_add_tail_eurecom (&memory->mem_blocks[mb_index + index], &memory->mem_lists[pool_index]);
- }
-
- mb_index += pool_sizes[pool_index];
- }
-
-#ifdef MEMBLOCK_BIG_LOCK
- if (pthread_mutex_unlock(&mtex)) abort();
-#endif
-
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-void *
-pool_buffer_clean (void *arg)
-{
- //-----------------------------------------------------------------------------
- return 0;
-}
-//-----------------------------------------------------------------------------
-void
-free_mem_block (mem_block_t * leP, const char* caller)
-{
- //-----------------------------------------------------------------------------
-
- if (!(leP)) {
- LOG_W (RLC,"[MEM_MNGT][FREE] WARNING FREE NULL MEM_BLOCK\n");
- return;
- }
-
-#ifdef MEMBLOCK_BIG_LOCK
- if (pthread_mutex_lock(&mtex)) abort();
-#endif
-
-#ifdef DEBUG_MEM_MNGT_FREE
- LOG_D (RLC,"[MEM_MNGT][FREE] free_mem_block() %p pool: %d\n", leP, leP->pool_id);
-#endif
-#ifdef DEBUG_MEM_MNGT_ALLOC
- check_free_mem_block (leP);
-#endif
-
- if (leP->pool_id <= MEM_MNGT_POOL_ID_COPY) {
- list_add_tail_eurecom (leP, &mem_block_var.mem_lists[leP->pool_id]);
-#ifdef DEBUG_MEM_MNGT_ALLOC
- counters[leP->pool_id] -= 1;
- LGO_D (RLC,"[%s][MEM_MNGT][INFO] after pool[%2d] freed: counters = {%2d %2d %2d %2d %2d %2d %2d %2d %2d %2d %2d %2d}\n",
- caller, leP->pool_id,
- counters[0],counters[1],counters[2],counters[3],counters[4],
- counters[5],counters[6],counters[7],counters[8],counters[9],
- counters[10],counters[11]);
-#endif
- leP = NULL; // this prevent from freeing the block twice
- } else {
- LOG_E (RLC,"[MEM_MNGT][FREE] ERROR free_mem_block() unknown pool_id : %d\n", leP->pool_id);
- }
-
-#ifdef MEMBLOCK_BIG_LOCK
- if (pthread_mutex_unlock(&mtex)) abort();
-#endif
-}
-
-//-----------------------------------------------------------------------------
-mem_block_t *
-get_free_mem_block (uint32_t sizeP, const char* caller)
-{
- //-----------------------------------------------------------------------------
- mem_block_t *le = NULL;
- int pool_selected;
- int size;
-
- if (sizeP > MEM_MNGT_MB12_BLOCK_SIZE) {
- LOG_E (RLC,"[MEM_MNGT][ERROR][FATAL] size requested %d out of bounds\n", sizeP);
- display_mem_load ();
- AssertFatal(1==0,"get_free_mem_block size requested out of bounds");
- return NULL;
- }
-
-#ifdef MEMBLOCK_BIG_LOCK
- if (pthread_mutex_lock(&mtex)) abort();
-#endif
-
- size = sizeP >> 6;
- pool_selected = 0;
-
- while ((size)) {
- pool_selected += 1;
- size = size >> 1;
- }
-
- // pool is selected according to the size requested, now get a block
- // if no block is available pick one in an other pool
- do {
- if ((le = list_remove_head (&mem_block_var.mem_lists[pool_selected]))) {
-#ifdef DEBUG_MEM_MNGT_ALLOC
- counters[pool_selected] += 1;
- LOG_D (RLC,"[%s][MEM_MNGT][INFO] after pool[%2d] allocated: counters = {%2d %2d %2d %2d %2d %2d %2d %2d %2d %2d %2d %2d}\n",
- caller,
- pool_selected,
- counters[0],counters[1],counters[2],counters[3],counters[4],
- counters[5],counters[6],counters[7],counters[8],counters[9],
- counters[10],counters[11]);
-#endif
-#ifdef DEBUG_MEM_MNGT_ALLOC_SIZE
- LOG_D (RLC,"[MEM_MNGT][INFO] ALLOC MEM_BLOCK SIZE %d bytes pool %d (%p)\n", sizeP, pool_selected,le);
-#endif
-
- AssertFatal(le->pool_id == pool_selected, "Unexpected pool ID!");
-
-#ifdef MEMBLOCK_BIG_LOCK
- if (pthread_mutex_unlock(&mtex)) abort();
-#endif
-
- return le;
- }
-
-#ifdef DEBUG_MEM_MNGT_ALLOC
- LOG_E (RLC,"[MEM_MNGT][ERROR][MINOR] memory pool %d is empty trying next pool alloc count = %d\n", pool_selected, counters[pool_selected]);
- // display_mem_load ();
- // check_mem_area ((void *)&mem_block_var);
-#endif
- } while (pool_selected++ < 12);
-
- LOG_E(PHY, "[MEM_MNGT][ERROR][FATAL] failed allocating MEM_BLOCK size %d byes (pool_selected=%d size=%d)\n", sizeP, pool_selected, size);
-// display_mem_load();
-// AssertFatal(1==0,"get_free_mem_block failed");
- LOG_E(MAC,"[MEM_MNGT][ERROR][FATAL] get_free_mem_block failed!!!\n");
-#ifdef MEMBLOCK_BIG_LOCK
- if (pthread_mutex_unlock(&mtex)) abort();
-#endif
-
- return NULL;
-};
-
-//-----------------------------------------------------------------------------
-mem_block_t *
-get_free_copy_mem_block (void)
-{
- //-----------------------------------------------------------------------------
- mem_block_t *le;
-
-#ifdef MEMBLOCK_BIG_LOCK
- AssertFatal(0, "This function is not handled properly but not used anywhere. FIXME?\n");
-#endif
-
- if ((le = list_remove_head (&mem_block_var.mem_lists[MEM_MNGT_POOL_ID_COPY]))) {
-#ifdef DEBUG_MEM_MNGT_ALLOC_SIZE
- LOG_D (RLC,"[MEM_MNGT][INFO] ALLOC COPY MEM BLOCK (%p)\n",le);
-#endif
-#ifdef DEBUG_MEM_MNGT_ALLOC
- counters[MEM_MNGT_POOL_ID_COPY] += 1;
- LOG_D (RLC,"[MEM_MNGT][INFO] pool counters = {%2d %2d %2d %2d %2d %2d %2d %2d %2d %2d %2d %2d}\n",
- counters[0],counters[1],counters[2],counters[3],counters[4],
- counters[5],counters[6],counters[7],counters[8],counters[9],
- counters[10],counters[11]);
-#endif
- return le;
- } else {
- LOG_E (RLC,"[MEM_MNGT][ERROR] POOL COPY IS EMPTY\n");
- //#ifdef DEBUG_MEM_MNGT_ALLOC
- check_mem_area ();
- // break_point ();
- //#endif
-
- AssertFatal(1==0,"mem pool is empty");
- return NULL;
- }
-}
-
-//-----------------------------------------------------------------------------
-mem_block_t *
-copy_mem_block (mem_block_t * leP, mem_block_t * destP)
-{
- //-----------------------------------------------------------------------------
-
-#ifdef MEMBLOCK_BIG_LOCK
- AssertFatal(0, "This function is not handled properly but not used anywhere. FIXME?\n");
-#endif
-
- if ((destP != NULL) && (leP != NULL) && (destP->pool_id == MEM_MNGT_POOL_ID_COPY)) {
- destP->data = leP->data;
- } else {
- LOG_E (RLC,"[MEM_MNGT][COPY] copy_mem_block() pool dest src or dest is NULL\n");
- }
-
- return destP;
-}
-
-//-----------------------------------------------------------------------------
-void
-display_mem_load (void)
-{
- //-----------------------------------------------------------------------------
-#ifdef MEMBLOCK_BIG_LOCK
- /* this function does not need to be protected, do nothing */
-#endif
-
- mem_pool *memory = (mem_pool *) &mem_block_var;
-
- LOG_D (RLC,"POOL 0 (%d elements of %d Bytes): ", MEM_MNGT_MB0_NB_BLOCKS, MEM_MNGT_MB0_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID0]);
- LOG_D (RLC,"POOL 1 (%d elements of %d Bytes): ", MEM_MNGT_MB1_NB_BLOCKS, MEM_MNGT_MB1_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID1]);
- LOG_D (RLC,"POOL 2 (%d elements of %d Bytes): ", MEM_MNGT_MB2_NB_BLOCKS, MEM_MNGT_MB2_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID2]);
- LOG_D (RLC,"POOL 3 (%d elements of %d Bytes): ", MEM_MNGT_MB3_NB_BLOCKS, MEM_MNGT_MB3_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID3]);
- LOG_D (RLC,"POOL 4 (%d elements of %d Bytes): ", MEM_MNGT_MB4_NB_BLOCKS, MEM_MNGT_MB4_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID4]);
- LOG_D (RLC,"POOL 5 (%d elements of %d Bytes): ", MEM_MNGT_MB5_NB_BLOCKS, MEM_MNGT_MB5_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID5]);
- LOG_D (RLC,"POOL 6 (%d elements of %d Bytes): ", MEM_MNGT_MB6_NB_BLOCKS, MEM_MNGT_MB6_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID6]);
- LOG_D (RLC,"POOL 7 (%d elements of %d Bytes): ", MEM_MNGT_MB7_NB_BLOCKS, MEM_MNGT_MB7_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID7]);
- LOG_D (RLC,"POOL 8 (%d elements of %d Bytes): ", MEM_MNGT_MB8_NB_BLOCKS, MEM_MNGT_MB8_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID8]);
- LOG_D (RLC,"POOL 9 (%d elements of %d Bytes): ", MEM_MNGT_MB9_NB_BLOCKS, MEM_MNGT_MB9_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID9]);
- LOG_D (RLC,"POOL 10 (%d elements of %d Bytes): ", MEM_MNGT_MB10_NB_BLOCKS, MEM_MNGT_MB10_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID10]);
- LOG_D (RLC,"POOL 11 (%d elements of %d Bytes): ", MEM_MNGT_MB11_NB_BLOCKS, MEM_MNGT_MB11_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID11]);
- LOG_D (RLC,"POOL 12 (%d elements of %d Bytes): ", MEM_MNGT_MB12_NB_BLOCKS, MEM_MNGT_MB12_BLOCK_SIZE);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID12]);
- LOG_D (RLC,"POOL C (%d elements): ", MEM_MNGT_MBCOPY_NB_BLOCKS);
- list_display (&memory->mem_lists[MEM_MNGT_POOL_ID_COPY]);
-}
-
-//-----------------------------------------------------------------------------
-void
-check_mem_area (void)
-{
- //-----------------------------------------------------------------------------
- int index, mb_index;
- mem_pool *memory = (mem_pool *) &mem_block_var;
-
-#ifdef MEMBLOCK_BIG_LOCK
- AssertFatal(0, "This function is not handled properly but not used anywhere. FIXME?\n");
-#endif
-
- for (index = 0; index < MEM_MNGT_MB0_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[index].data != (unsigned char*)&(memory->mem_pool0[index][0])) && (memory->mem_blocks[index].pool_id != MEM_MNGT_POOL_ID0)) {
- LOG_D (RLC,"[MEM] ERROR POOL0 block index %d\n", index);
- }
- }
-
- mb_index = MEM_MNGT_MB0_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB1_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool1[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID1)) {
- LOG_D (RLC,"[MEM] ERROR POOL1 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB1_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB2_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool2[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID2)) {
- LOG_D (RLC,"[MEM] ERROR POOL2 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB2_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB3_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool3[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID3)) {
- LOG_D (RLC,"[MEM] ERROR POOL3 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB3_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB4_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool4[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID4)) {
- LOG_D (RLC,"[MEM] ERROR POOL4 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB4_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB5_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool5[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID5)) {
- LOG_D (RLC,"[MEM] ERROR POOL5 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB5_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB6_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool6[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID6)) {
- LOG_D (RLC,"[MEM] ERROR POOL6 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB6_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB7_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool7[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID7)) {
- LOG_D (RLC,"[MEM] ERROR POOL7 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB7_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB8_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool8[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID8)) {
- LOG_D (RLC,"[MEM] ERROR POOL8 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB8_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB9_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool9[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID9)) {
- LOG_D (RLC,"[MEM] ERROR POOL9 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB9_NB_BLOCKS;
-
- for (index = mb_index; index < MEM_MNGT_MB10_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool10[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID10)) {
- LOG_D (RLC,"[MEM] ERROR POOL10 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB10_NB_BLOCKS;
-
- for (index = mb_index; index < MEM_MNGT_MB11_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool11[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID11)) {
- LOG_D (RLC,"[MEM] ERROR POOL11 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB11_NB_BLOCKS;
-
- for (index = mb_index; index < MEM_MNGT_MB12_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != (unsigned char*)&(memory->mem_pool12[index][0]))
- && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID12)) {
- LOG_D (RLC,"[MEM] ERROR POOL12 block index %d\n", index);
- }
- }
-
- mb_index += MEM_MNGT_MB12_NB_BLOCKS;
-
- for (index = mb_index; index < MEM_MNGT_NB_ELEMENTS; index++) {
- if ((memory->mem_blocks[index].data != NULL) && (memory->mem_blocks[index].pool_id != MEM_MNGT_POOL_ID_COPY)) {
- LOG_D (RLC,"[MEM] ERROR POOL COPY block index %d\n", index);
- }
- }
-}
-
-//-----------------------------------------------------------------------------
-void
-check_free_mem_block (mem_block_t * leP)
-{
- //-----------------------------------------------------------------------------
- ptrdiff_t block_index;
-
-#ifdef MEMBLOCK_BIG_LOCK
- /* this function does not SEEM TO need to be protected, do nothing (for the moment) */
-#endif
-
- if ((leP >= mem_block_var.mem_blocks) && (leP <= &mem_block_var.mem_blocks[MEM_MNGT_NB_ELEMENTS-1])) {
- // the pointer is inside the memory region
- block_index = leP - mem_block_var.mem_blocks;
- // block_index is now: 0 <= block_index < MEM_MNGT_NB_ELEMENTS
-
- if (block_index < MEM_MNGT_MB0_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool0[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID0)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB0_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB1_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool1[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID1)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB1_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB2_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool2[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID2)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB2_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB3_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool3[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID3)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB3_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB4_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool4[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID4)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB4_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB5_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool5[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID5)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB5_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB6_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool6[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID6)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB6_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB7_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool7[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID7)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB7_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB8_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool8[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID8)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB8_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB9_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool9[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID9)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB9_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB10_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool10[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID10)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB10_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB11_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool11[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID11)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
-
- block_index -= MEM_MNGT_MB11_NB_BLOCKS;
-
- if (block_index < MEM_MNGT_MB12_NB_BLOCKS) {
- if ((leP->data != (unsigned char*)mem_block_var.mem_pool12[block_index]) && (leP->pool_id != MEM_MNGT_POOL_ID12)) {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- return;
- }
- } else {
- LOG_D (RLC,"[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-
- // the block is ok
-}
diff --git a/openair2/UTIL/MEM/mem_block.h b/openair2/UTIL/MEM/mem_block.h
index f40566f6ed2d8051e5cfb8bae9220f1f531e2bec..0d9943064070caab5afb1be339cd08d7bffeeb35 100644
--- a/openair2/UTIL/MEM/mem_block.h
+++ b/openair2/UTIL/MEM/mem_block.h
@@ -57,91 +57,8 @@ mem_block_t *get_free_copy_mem_block (void);
mem_block_t *get_free_copy_mem_block_up (void);
mem_block_t *copy_mem_block (mem_block_t * leP, mem_block_t * destP);
void display_mem_load (void);
-
-void check_mem_area (void);
-void check_free_mem_block (mem_block_t * leP);
-# define MEM_SCALE MAX_MOBILES_PER_ENB
-// definition of the size of the allocated memory area
-# define MEM_MNGT_MB0_BLOCK_SIZE 64
-// 64
-# define MEM_MNGT_MB0_NB_BLOCKS 4096 * MEM_SCALE
-# define MEM_MNGT_POOL_ID0 0
-
-# define MEM_MNGT_MB1_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*2
-// 128
-# define MEM_MNGT_MB1_NB_BLOCKS 4096 * MEM_SCALE
-# define MEM_MNGT_POOL_ID1 1
-
-# define MEM_MNGT_MB2_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*4
-// 256
-# define MEM_MNGT_MB2_NB_BLOCKS 2048 * MEM_SCALE
-# define MEM_MNGT_POOL_ID2 2
-
-# define MEM_MNGT_MB3_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*8
-// 512
-# define MEM_MNGT_MB3_NB_BLOCKS 2048 * MEM_SCALE
-# define MEM_MNGT_POOL_ID3 3
-
-# define MEM_MNGT_MB4_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*16
-// 1024
-# define MEM_MNGT_MB4_NB_BLOCKS 1024 * MEM_SCALE
-# define MEM_MNGT_POOL_ID4 4
-
-# define MEM_MNGT_MB5_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*32
-// 2048
-# define MEM_MNGT_MB5_NB_BLOCKS 1024 * MEM_SCALE // LG WAS 1024
-# define MEM_MNGT_POOL_ID5 5
-
-# define MEM_MNGT_MB6_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*64
-// 4096
-# define MEM_MNGT_MB6_NB_BLOCKS 1024 * MEM_SCALE // LG WAS 256
-# define MEM_MNGT_POOL_ID6 6
-
-# define MEM_MNGT_MB7_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*128
-// 8192
-# define MEM_MNGT_MB7_NB_BLOCKS 64* MEM_SCALE // LG WAS 32
-# define MEM_MNGT_POOL_ID7 7
-
-# define MEM_MNGT_MB8_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*256
-
-#ifdef JUMBO_FRAMES
-# define MEM_MNGT_MB8_NB_BLOCKS 256 * MEM_SCALE
-#else
-# define MEM_MNGT_MB8_NB_BLOCKS 16 * MEM_SCALE
-// 16384
-#endif
-# define MEM_MNGT_POOL_ID8 8
-
-# define MEM_MNGT_MB9_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*512
-// 32768
-# define MEM_MNGT_MB9_NB_BLOCKS 8 * MEM_SCALE
-# define MEM_MNGT_POOL_ID9 9
-
-# define MEM_MNGT_MB10_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*1024
-// 65536
-# define MEM_MNGT_MB10_NB_BLOCKS 0 * MEM_SCALE
-# define MEM_MNGT_POOL_ID10 10
-
-# define MEM_MNGT_MB11_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*2048
-// 131072
-# define MEM_MNGT_MB11_NB_BLOCKS 0 * MEM_SCALE
-# define MEM_MNGT_POOL_ID11 11
-
-# define MEM_MNGT_MB12_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*4096
-// 262144
-# define MEM_MNGT_MB12_NB_BLOCKS 32 * MEM_SCALE
-//# define MEM_MNGT_MB12_NB_BLOCKS 4096 * MEM_SCALE
-
-# define MEM_MNGT_POOL_ID12 12
-
-
-# define MEM_MNGT_MBCOPY_NB_BLOCKS 1024
-# define MEM_MNGT_NB_ELEMENTS MEM_MNGT_MB0_NB_BLOCKS + MEM_MNGT_MB1_NB_BLOCKS + MEM_MNGT_MB2_NB_BLOCKS + MEM_MNGT_MB3_NB_BLOCKS + MEM_MNGT_MB4_NB_BLOCKS + MEM_MNGT_MB5_NB_BLOCKS + MEM_MNGT_MB6_NB_BLOCKS + MEM_MNGT_MB7_NB_BLOCKS + MEM_MNGT_MB8_NB_BLOCKS + MEM_MNGT_MB9_NB_BLOCKS + MEM_MNGT_MB10_NB_BLOCKS + MEM_MNGT_MB11_NB_BLOCKS + MEM_MNGT_MB12_NB_BLOCKS + MEM_MNGT_MBCOPY_NB_BLOCKS
-# define MEM_MNGT_POOL_ID_COPY 13
-
#define LIST_NAME_MAX_CHAR 32
-
typedef struct {
struct mem_block_t *head;
struct mem_block_t *tail;
@@ -156,31 +73,6 @@ typedef struct {
char name[LIST_NAME_MAX_CHAR];
} list_t;
-
-
-typedef struct {
- //-----------------------------------------------------------
- // basic memory management
- //-----------------------------------------------------------
- char mem_pool0[MEM_MNGT_MB0_NB_BLOCKS][MEM_MNGT_MB0_BLOCK_SIZE];
- char mem_pool1[MEM_MNGT_MB1_NB_BLOCKS][MEM_MNGT_MB1_BLOCK_SIZE];
- char mem_pool2[MEM_MNGT_MB2_NB_BLOCKS][MEM_MNGT_MB2_BLOCK_SIZE];
- char mem_pool3[MEM_MNGT_MB3_NB_BLOCKS][MEM_MNGT_MB3_BLOCK_SIZE];
- char mem_pool4[MEM_MNGT_MB4_NB_BLOCKS][MEM_MNGT_MB4_BLOCK_SIZE];
- char mem_pool5[MEM_MNGT_MB5_NB_BLOCKS][MEM_MNGT_MB5_BLOCK_SIZE];
- char mem_pool6[MEM_MNGT_MB6_NB_BLOCKS][MEM_MNGT_MB6_BLOCK_SIZE];
- char mem_pool7[MEM_MNGT_MB7_NB_BLOCKS][MEM_MNGT_MB7_BLOCK_SIZE];
- char mem_pool8[MEM_MNGT_MB8_NB_BLOCKS][MEM_MNGT_MB8_BLOCK_SIZE];
- char mem_pool9[MEM_MNGT_MB9_NB_BLOCKS][MEM_MNGT_MB9_BLOCK_SIZE];
- char mem_pool10[MEM_MNGT_MB10_NB_BLOCKS][MEM_MNGT_MB10_BLOCK_SIZE];
- char mem_pool11[MEM_MNGT_MB11_NB_BLOCKS][MEM_MNGT_MB11_BLOCK_SIZE];
- char mem_pool12[MEM_MNGT_MB12_NB_BLOCKS][MEM_MNGT_MB12_BLOCK_SIZE];
- mem_block_t mem_blocks[MEM_MNGT_NB_ELEMENTS];
- list_t mem_lists[14];
-
-} mem_pool;
-
-
#ifdef __cplusplus
}
#endif
diff --git a/openair2/UTIL/MEM/mem_mngt.c b/openair2/UTIL/MEM/mem_mngt.c
deleted file mode 100644
index 57c90ea4f909268f0c6aadcbacb7305e51f5bf4f..0000000000000000000000000000000000000000
--- a/openair2/UTIL/MEM/mem_mngt.c
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- * contact@openairinterface.org
- */
-
-/***************************************************************************
- mem_mngt.c - description
- -------------------
- AUTHOR : Lionel GAUTHIER
- COMPANY : EURECOM
- EMAIL : Lionel.Gauthier@eurecom.fr
-
-
- ***************************************************************************/
-#define MEM_MNGT_C
-#include "rtos_header.h"
-#include "platform.h"
-#include "protocol_vars_extern.h"
-#include "print.h"
-
-#include "mem_block.h"
-#include "mem_pool.h"
-#include "lists_proto_extern.h"
-#include "umts_sched.h"
-//-----------------------------------------------------------------------------
-#define DEBUG_MEM_MNGT_FREE
-#define DEBUG_MEM_MNGT_ALLOC_SIZE
-#define DEBUG_MEM_MNGT_ALLOC
-#ifdef DEBUG_MEM_MNGT_ADDR
-# define PRINT_MEM_MNGT_ADDR msg
-#else
-# define PRINT_MEM_MNGT_ADDR
-//
-#endif
-//-----------------------------------------------------------------------------
-uint32_t counters[11] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-//-----------------------------------------------------------------------------
-/*
- * initialize all ures
- */
-void *
-pool_buffer_init (void *arg)
-{
- //-----------------------------------------------------------------------------
-
- uint32_t index, mb_index, pool_index;
- mem_pool *memory = (mem_pool *) arg;
- int pool_sizes[11] = { MEM_MNGT_MB0_NB_BLOCKS, MEM_MNGT_MB1_NB_BLOCKS,
- MEM_MNGT_MB2_NB_BLOCKS, MEM_MNGT_MB3_NB_BLOCKS,
- MEM_MNGT_MB4_NB_BLOCKS, MEM_MNGT_MB5_NB_BLOCKS,
- MEM_MNGT_MB6_NB_BLOCKS, MEM_MNGT_MB7_NB_BLOCKS,
- MEM_MNGT_MB8_NB_BLOCKS, MEM_MNGT_MB9_NB_BLOCKS,
- MEM_MNGT_MBCOPY_NB_BLOCKS
- };
-
- memset (memory, 0, sizeof (mem_pool));
- mb_index = 0;
-
- // LG_TEST
- for (pool_index = 0; pool_index <= MEM_MNGT_POOL_ID_COPY; pool_index++) {
- init_list (&memory->mem_lists[pool_index], "POOL");
-
- for (index = 0; index < pool_sizes[pool_index]; index++) {
- //memory->mem_blocks[mb_index + index].previous = NULL; -> done in memset 0
- //memory->mem_blocks[mb_index + index].next = NULL; -> done in memset 0
- switch (pool_index) {
- case 0:
- memory->mem_blocks[mb_index + index].data = &(memory->mem_pool0[index][0]);
- break;
-
- case 1:
- memory->mem_blocks[mb_index + index].data = &(memory->mem_pool1[index][0]);
- break;
-
- case 2:
- memory->mem_blocks[mb_index + index].data = &(memory->mem_pool2[index][0]);
- break;
-
- case 3:
- memory->mem_blocks[mb_index + index].data = &(memory->mem_pool3[index][0]);
- break;
-
- case 4:
- memory->mem_blocks[mb_index + index].data = &(memory->mem_pool4[index][0]);
- break;
-
- case 5:
- memory->mem_blocks[mb_index + index].data = &(memory->mem_pool5[index][0]);
- break;
-
- case 6:
- memory->mem_blocks[mb_index + index].data = &(memory->mem_pool6[index][0]);
- break;
-
- case 7:
- memory->mem_blocks[mb_index + index].data = &(memory->mem_pool7[index][0]);
- break;
-
- case 8:
- memory->mem_blocks[mb_index + index].data = &(memory->mem_pool8[index][0]);
- break;
-
- case 9:
- memory->mem_blocks[mb_index + index].data = &(memory->mem_pool9[index][0]);
- break;
-
- default:
- ;
- memory->mem_blocks[mb_index + index].data = NULL; // pool copy
-
- }
-
- memory->mem_blocks[mb_index + index].pool_id = pool_index;
- add_tail (&memory->mem_blocks[mb_index + index], &memory->mem_lists[pool_index]);
- }
-
- mb_index += pool_sizes[pool_index];
- }
-
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-void *
-pool_buffer_clean (void *arg)
-{
- //-----------------------------------------------------------------------------
-#ifndef NO_THREAD_SAFE
- mem_pool *memory = (mem_pool *) arg;
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID0].mutex);
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID1].mutex);
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID2].mutex);
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID3].mutex);
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID4].mutex);
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID5].mutex);
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID6].mutex);
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID7].mutex);
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID8].mutex);
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID9].mutex);
- pthread_mutex_destroy (&memory->mem_lists[MEM_MNGT_POOL_ID_COPY].mutex);
-#endif
- return 0;
-}
-//-----------------------------------------------------------------------------
-void
-free_mem_block (mem_block_t * leP, __func__)
-{
- //-----------------------------------------------------------------------------
-
- if (!(leP)) {
- msg ("[MEM_MNGT][FREE] WARNING FREE NULL MEM_BLOCK\n");
- return;
- }
-
-#ifdef DEBUG_MEM_MNGT_FREE
- msg ("[MEM_MNGT][FREE] free_mem_block() %p pool: %d\n", leP, leP->pool_id, __func__);
-#endif
-#ifdef DEBUG_MEM_MNGT_ALLOC
- check_free_mem_block (leP, __func__);
-#endif
-
- if (leP->pool_id <= MEM_MNGT_POOL_ID_COPY) {
- add_tail (leP, &mem->mem_lists[leP->pool_id]);
-#ifdef DEBUG_MEM_MNGT_ALLOC
- counters[leP->pool_id] -= 1;
-#endif
- leP = NULL; // this prevent from freeing the block twice
- } else {
- msg ("[MEM_MNGT][FREE] ERROR free_mem_block() unknown pool_id : %d\n", leP->pool_id, __func__);
- }
-}
-
-
-//-----------------------------------------------------------------------------
-mem_block_t *
-get_free_mem_block (uint16_t sizeP, __func__)
-{
- //-----------------------------------------------------------------------------
- mem_block_t *le = NULL;
- int pool_selected;
- int size;
-
- if (sizeP > MEM_MNGT_MB9_BLOCK_SIZE) {
- msg ("[MEM_MNGT][ERROR][FATAL] size requested %d out of bounds %d\n",sizeP,MEM_MNGT_MB9_BLOCK_SIZE);
- wcdma_handle_error (WCDMA_ERROR_OUT_OF_MEM_BLOCK);
- return NULL;
- }
-
- size = sizeP >> 6;
- pool_selected = 0;
-
- while ((size)) {
- pool_selected += 1;
- size = size >> 1;
- }
-
- // pool is selected according to the size requested, now get a block
- // if no block is available pick one in an other pool
- do {
- if ((le = remove_head (&mem->mem_lists[pool_selected]))) {
-#ifdef DEBUG_MEM_MNGT_ALLOC
- counters[pool_selected] += 1;
-#endif
-#ifdef DEBUG_MEM_MNGT_ALLOC_SIZE
- msg ("[MEM_MNGT][INFO] ALLOC MEM_BLOCK SIZE %d bytes pool %d\n", sizeP, pool_selected);
-#endif
- return le;
- }
-
-#ifdef DEBUG_MEM_MNGT_ALLOC
- msg ("[MEM_MNGT][ERROR][MINOR] memory pool %d is empty trying next pool alloc count = %d\n", pool_selected, counters[pool_selected]);
- display_mem_load ();
- check_mem_area (mem);
-#endif
- } while (pool_selected++ < 9);
-
- msg ("[MEM_MNGT][ERROR][FATAL] size %d requested out of bounds or memory pools empty\n", sizeP);
- wcdma_handle_error (WCDMA_ERROR_OUT_OF_MEM_BLOCK);
- return NULL;
-};
-
-//-----------------------------------------------------------------------------
-mem_block_t *
-get_free_copy_mem_block (void)
-{
- //-----------------------------------------------------------------------------
- mem_block_t *le;
-
- if ((le = remove_head (&mem->mem_lists[MEM_MNGT_POOL_ID_COPY]))) {
- return le;
- } else {
- msg ("[MEM_MNGT][ERROR] POOL COPY IS EMPTY\n");
- display_mem_load ();
-#ifdef DEBUG_MEM_MNGT_ALLOC
- check_mem_area (mem);
- break_point ();
-#endif
- wcdma_handle_error (WCDMA_ERROR_OUT_OF_MEM_BLOCK);
-
- return NULL;
- }
-}
-
-//-----------------------------------------------------------------------------
-mem_block_t *
-copy_mem_block (mem_block_t * leP, mem_block_t * destP)
-{
- //-----------------------------------------------------------------------------
-
- if ((destP != NULL) && (leP != NULL) && (destP->pool_id == MEM_MNGT_POOL_ID_COPY)) {
- destP->data = leP->data;
- } else {
- msg ("[MEM_MNGT][COPY] copy_mem_block() pool dest src or dest is NULL\n");
- }
-
- return destP;
-}
-
-//-----------------------------------------------------------------------------
-void
-display_mem_load (void)
-{
- //-----------------------------------------------------------------------------
-
- msg ("POOL 0 (%d elements of %d Bytes): \n", MEM_MNGT_MB0_NB_BLOCKS, MEM_MNGT_MB0_BLOCK_SIZE);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID0]);
- msg ("POOL 1 (%d elements of %d Bytes): \n", MEM_MNGT_MB1_NB_BLOCKS, MEM_MNGT_MB1_BLOCK_SIZE);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID1]);
- msg ("POOL 2 (%d elements of %d Bytes): \n", MEM_MNGT_MB2_NB_BLOCKS, MEM_MNGT_MB2_BLOCK_SIZE);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID2]);
- msg ("POOL 3 (%d elements of %d Bytes): \n", MEM_MNGT_MB3_NB_BLOCKS, MEM_MNGT_MB3_BLOCK_SIZE);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID3]);
- msg ("POOL 4 (%d elements of %d Bytes): \n", MEM_MNGT_MB4_NB_BLOCKS, MEM_MNGT_MB4_BLOCK_SIZE);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID4]);
- msg ("POOL 5 (%d elements of %d Bytes): \n", MEM_MNGT_MB5_NB_BLOCKS, MEM_MNGT_MB5_BLOCK_SIZE);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID5]);
- msg ("POOL 6 (%d elements of %d Bytes): \n", MEM_MNGT_MB6_NB_BLOCKS, MEM_MNGT_MB6_BLOCK_SIZE);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID6]);
- msg ("POOL 7 (%d elements of %d Bytes): \n", MEM_MNGT_MB7_NB_BLOCKS, MEM_MNGT_MB7_BLOCK_SIZE);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID7]);
- msg ("POOL 8 (%d elements of %d Bytes): \n", MEM_MNGT_MB8_NB_BLOCKS, MEM_MNGT_MB8_BLOCK_SIZE);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID8]);
- msg ("POOL 9 (%d elements of %d Bytes): \n", MEM_MNGT_MB9_NB_BLOCKS, MEM_MNGT_MB9_BLOCK_SIZE);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID9]);
- msg ("POOL C (%d elements): \n", MEM_MNGT_MBCOPY_NB_BLOCKS);
- display_list (&mem->mem_lists[MEM_MNGT_POOL_ID_COPY]);
-}
-
-//-----------------------------------------------------------------------------
-void
-check_mem_area (void *arg)
-{
- //-----------------------------------------------------------------------------
- int index, mb_index;
- mem_pool *memory = (mem_pool *) arg;
-
- for (index = 0; index < MEM_MNGT_MB0_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[index].data != &(memory->mem_pool0[index][0])) && (memory->mem_blocks[index].pool_id != MEM_MNGT_POOL_ID0)) {
- msg ("[MEM] ERROR POOL0 block index %d\n", index);
- break_point ();
- }
- }
-
- mb_index = MEM_MNGT_MB0_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB1_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != &(memory->mem_pool1[index][0])) && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID1)) {
- msg ("[MEM] ERROR POOL1 block index %d\n", index);
- break_point ();
- }
- }
-
- mb_index += MEM_MNGT_MB1_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB2_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != &(memory->mem_pool2[index][0])) && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID2)) {
- msg ("[MEM] ERROR POOL2 block index %d\n", index);
- break_point ();
- }
- }
-
- mb_index += MEM_MNGT_MB2_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB3_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != &(memory->mem_pool3[index][0])) && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID3)) {
- msg ("[MEM] ERROR POOL3 block index %d\n", index);
- break_point ();
- }
- }
-
- mb_index += MEM_MNGT_MB3_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB4_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != &(memory->mem_pool4[index][0])) && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID4)) {
- msg ("[MEM] ERROR POOL4 block index %d\n", index);
- break_point ();
- }
- }
-
- mb_index += MEM_MNGT_MB4_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB5_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != &(memory->mem_pool5[index][0])) && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID5)) {
- msg ("[MEM] ERROR POOL5 block index %d\n", index);
- break_point ();
- }
- }
-
- mb_index += MEM_MNGT_MB5_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB6_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != &(memory->mem_pool6[index][0])) && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID6)) {
- msg ("[MEM] ERROR POOL6 block index %d\n", index);
- break_point ();
- }
- }
-
- mb_index += MEM_MNGT_MB6_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB7_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != &(memory->mem_pool7[index][0])) && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID7)) {
- msg ("[MEM] ERROR POOL7 block index %d\n", index);
- break_point ();
- }
- }
-
- mb_index += MEM_MNGT_MB7_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB8_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != &(memory->mem_pool8[index][0])) && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID8)) {
- msg ("[MEM] ERROR POOL8 block index %d\n", index);
- break_point ();
- }
- }
-
- mb_index += MEM_MNGT_MB8_NB_BLOCKS;
-
- for (index = 0; index < MEM_MNGT_MB9_NB_BLOCKS; index++) {
- if ((memory->mem_blocks[mb_index + index].data != &(memory->mem_pool9[index][0])) && (memory->mem_blocks[mb_index + index].pool_id != MEM_MNGT_POOL_ID9)) {
- msg ("[MEM] ERROR POOL9 block index %d\n", index);
- break_point ();
- }
- }
-
- mb_index += MEM_MNGT_MB9_NB_BLOCKS;
-
- for (index = mb_index; index < MEM_MNGT_NB_ELEMENTS; index++) {
- if ((memory->mem_blocks[index].data != NULL) && (memory->mem_blocks[index].pool_id != MEM_MNGT_POOL_ID_COPY)) {
- msg ("[MEM] ERROR POOL COPY block index %d\n", index);
- break_point ();
- }
- }
-}
-
-//-----------------------------------------------------------------------------
-void
-check_free_mem_block (mem_block_t * leP, __func__)
-{
- //-----------------------------------------------------------------------------
- int block_index;
-
- if ((leP >= &mem->mem_blocks[0]) && (leP <= &mem->mem_blocks[MEM_MNGT_NB_ELEMENTS])) {
- block_index = ((uint32_t) leP - (uint32_t) (&mem->mem_blocks[0])) / sizeof (mem_block_t);
-
- if (block_index < MEM_MNGT_MB0_NB_BLOCKS) {
- if (((uint32_t) (leP->data) != (uint32_t) (&(mem->mem_pool0[block_index][0]))) && (leP->pool_id != MEM_MNGT_POOL_ID0)) {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
- } else if (block_index < (MEM_MNGT_MB0_NB_BLOCKS + MEM_MNGT_MB1_NB_BLOCKS)) {
- if ((leP->data != &(mem->mem_pool1[block_index][0])) && (leP->pool_id != MEM_MNGT_POOL_ID1)) {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
- } else if (block_index < MEM_MNGT_MB0_NB_BLOCKS + MEM_MNGT_MB1_NB_BLOCKS + MEM_MNGT_MB2_NB_BLOCKS) {
- if ((leP->data != &(mem->mem_pool2[block_index][0])) && (leP->pool_id != MEM_MNGT_POOL_ID2)) {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
- } else if (block_index < MEM_MNGT_MB0_NB_BLOCKS + MEM_MNGT_MB1_NB_BLOCKS + MEM_MNGT_MB2_NB_BLOCKS + MEM_MNGT_MB3_NB_BLOCKS) {
- if ((leP->data != &(mem->mem_pool3[block_index][0])) && (leP->pool_id != MEM_MNGT_POOL_ID3)) {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
- } else if (block_index < MEM_MNGT_MB0_NB_BLOCKS + MEM_MNGT_MB1_NB_BLOCKS + MEM_MNGT_MB2_NB_BLOCKS + MEM_MNGT_MB3_NB_BLOCKS + MEM_MNGT_MB4_NB_BLOCKS) {
- if ((leP->data != &(mem->mem_pool4[block_index][0])) && (leP->pool_id != MEM_MNGT_POOL_ID4)) {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
- } else if (block_index < MEM_MNGT_MB0_NB_BLOCKS + MEM_MNGT_MB1_NB_BLOCKS + MEM_MNGT_MB2_NB_BLOCKS + MEM_MNGT_MB3_NB_BLOCKS + MEM_MNGT_MB4_NB_BLOCKS +
- MEM_MNGT_MB5_NB_BLOCKS) {
- if ((leP->data != &(mem->mem_pool5[block_index][0])) && (leP->pool_id != MEM_MNGT_POOL_ID5)) {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
- } else if (block_index <
- MEM_MNGT_MB0_NB_BLOCKS + MEM_MNGT_MB1_NB_BLOCKS + MEM_MNGT_MB2_NB_BLOCKS + MEM_MNGT_MB3_NB_BLOCKS + MEM_MNGT_MB4_NB_BLOCKS + MEM_MNGT_MB5_NB_BLOCKS +
- MEM_MNGT_MB6_NB_BLOCKS) {
- if ((leP->data != &(mem->mem_pool6[block_index][0])) && (leP->pool_id != MEM_MNGT_POOL_ID6)) {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
- } else if (block_index <
- MEM_MNGT_MB0_NB_BLOCKS + MEM_MNGT_MB1_NB_BLOCKS + MEM_MNGT_MB2_NB_BLOCKS + MEM_MNGT_MB3_NB_BLOCKS + MEM_MNGT_MB4_NB_BLOCKS + MEM_MNGT_MB5_NB_BLOCKS +
- MEM_MNGT_MB6_NB_BLOCKS +
- MEM_MNGT_MB7_NB_BLOCKS) {
- if ((leP->data != &(mem->mem_pool7[block_index][0])) && (leP->pool_id != MEM_MNGT_POOL_ID7)) {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
- } else if (block_index <
- MEM_MNGT_MB0_NB_BLOCKS + MEM_MNGT_MB1_NB_BLOCKS + MEM_MNGT_MB2_NB_BLOCKS + MEM_MNGT_MB3_NB_BLOCKS + MEM_MNGT_MB4_NB_BLOCKS + MEM_MNGT_MB5_NB_BLOCKS +
- MEM_MNGT_MB6_NB_BLOCKS +
- MEM_MNGT_MB7_NB_BLOCKS + MEM_MNGT_MB8_NB_BLOCKS) {
- if ((leP->data != &(mem->mem_pool8[block_index][0])) && (leP->pool_id != MEM_MNGT_POOL_ID8)) {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
- } else if (block_index <
- MEM_MNGT_MB0_NB_BLOCKS + MEM_MNGT_MB1_NB_BLOCKS + MEM_MNGT_MB2_NB_BLOCKS + MEM_MNGT_MB3_NB_BLOCKS + MEM_MNGT_MB4_NB_BLOCKS + MEM_MNGT_MB5_NB_BLOCKS +
- MEM_MNGT_MB6_NB_BLOCKS +
- MEM_MNGT_MB7_NB_BLOCKS + MEM_MNGT_MB8_NB_BLOCKS + MEM_MNGT_MB9_NB_BLOCKS) {
- if ((leP->data != &(mem->mem_pool9[block_index][0])) && (leP->pool_id != MEM_MNGT_POOL_ID9)) {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
- }
-
- } else {
- msg ("[MEM][ERROR][FATAL] free mem block is corrupted\n");
- }
-}
-
-//-----------------------------------------------------------------------------
-void
-break_point (void)
-{
- //-----------------------------------------------------------------------------
- int break_var;
-
- msg ("[BREAK_POINT]\n");
- break_var = 1;
-}
diff --git a/openair2/UTIL/OPT/probe.c b/openair2/UTIL/OPT/probe.c
index f8cd0ef64c52328a96344c89119ad84fb7fffa19..8c6a74e0429837ffb8cecdddb546fc0f5711e916 100644
--- a/openair2/UTIL/OPT/probe.c
+++ b/openair2/UTIL/OPT/probe.c
@@ -99,8 +99,8 @@ int opt_enabled=0;
//static unsigned char g_PDUBuffer[1600];
//static unsigned int g_PDUOffset;
-static char *in_ip;
-static char *in_path;
+static char in_ip[128]={0};
+static char in_path[128]={0};
FILE *file_fd = NULL;
pcap_hdr_t file_header = {
0xa1b2c3d4, /* magic number */
@@ -447,9 +447,11 @@ int init_opt(void)
char *in_type=NULL;
paramdef_t opt_params[] = OPT_PARAMS_DESC ;
checkedparam_t opt_checkParams[] = OPTPARAMS_CHECK_DESC;
- uint16_t in_port;
- config_set_checkfunctions(opt_params, opt_checkParams, sizeof(opt_params)/sizeof(paramdef_t));
- config_get(opt_params, sizeof(opt_params)/sizeof(paramdef_t), OPT_CONFIGPREFIX);
+ uint16_t in_port=0;
+ config_set_checkfunctions(opt_params, opt_checkParams,
+ sizeof(opt_params)/sizeof(paramdef_t));
+ config_get( opt_params,sizeof(opt_params)/sizeof(paramdef_t),OPT_CONFIGPREFIX);
+
subframesSinceCaptureStart = 0;
int tmptype = config_get_processedint( &(opt_params[OPTTYPE_IDX]));
diff --git a/openair2/X2AP/x2ap_eNB_handler.c b/openair2/X2AP/x2ap_eNB_handler.c
index 95e0910fcde6f2d213ea99ca6ae15c232ced7b63..afaae1756d49b443733bdb02d95f0f1b9ee85d0f 100644
--- a/openair2/X2AP/x2ap_eNB_handler.c
+++ b/openair2/X2AP/x2ap_eNB_handler.c
@@ -1772,7 +1772,7 @@ int x2ap_gNB_handle_ENDC_sGNB_addition_request (instance_t instance,
X2AP_ProtocolIE_ID_id_MeNBtoSgNBContainer, true);
X2AP_MeNBtoSgNBContainer_t *container = &ie->value.choice.MeNBtoSgNBContainer;
-
+ //X2AP_MeNBtoSgNBContainer_t *container = &ie->value.choice.MeNBtoSgNBContainer;
if (container->size > 8192 ) // TODO: this is the size of rrc_buffer in struct x2ap_handover_req_s
{ printf("%s:%d: fatal: buffer too big\n", __FILE__, __LINE__); abort(); }
diff --git a/openair3/NAS/COMMON/UTIL/socket.c b/openair3/NAS/COMMON/UTIL/socket.c
index 25876c3e6ff2e42ec17f7713780cd486f3d679eb..53a6ec8823d063bb5ec1d7d87154015af2981bd6 100644
--- a/openair3/NAS/COMMON/UTIL/socket.c
+++ b/openair3/NAS/COMMON/UTIL/socket.c
@@ -107,7 +107,7 @@ void* socket_udp_open(int type, const char* host, const char* port)
{
struct addrinfo socket_info; /* endpoint information */
struct addrinfo *socket_addr, *sp; /* endpoint address */
- int sfd; /* socket file descriptor */
+ int sfd=-1; /* socket file descriptor */
/*
* Parameters sanity check
diff --git a/openair3/NAS/TOOLS/conf_network.c b/openair3/NAS/TOOLS/conf_network.c
index 96e2183327ad1c8d35215f898566582efe2ee994..7e71c9b4ee79cafbd68404350195e3c4dec18975 100644
--- a/openair3/NAS/TOOLS/conf_network.c
+++ b/openair3/NAS/TOOLS/conf_network.c
@@ -80,7 +80,7 @@ bool parse_plmn_param(config_setting_t *plmn_setting, plmn_conf_param_t *conf) {
bool parse_plmns(config_setting_t *all_plmn_setting, networks_t *networks) {
config_setting_t *plmn_setting = NULL;
- char plmn[10];
+ char plmn[100];
int size = 0;
size = config_setting_length(all_plmn_setting);
diff --git a/openair3/NAS/TOOLS/conf_parser.c b/openair3/NAS/TOOLS/conf_parser.c
index d46142c4614970827c3a050323297480670f848e..3ea1e29554f6f55cd5a7a002cac4263ccb98a319 100644
--- a/openair3/NAS/TOOLS/conf_parser.c
+++ b/openair3/NAS/TOOLS/conf_parser.c
@@ -13,7 +13,7 @@ bool parse_config_file(const char *output_dir, const char *conf_filename, int ou
config_setting_t *root_setting = NULL;
config_setting_t *ue_setting = NULL;
config_setting_t *all_plmn_setting = NULL;
- char user[10];
+ char user[100];
config_t cfg;
networks_t networks;;
diff --git a/targets/ARCH/rfsimulator/README.md b/targets/ARCH/rfsimulator/README.md
index 014f5f7505c6318ac082496b68e92e3d987d9bd3..421cc662bb2a6fe1a462317f578bd15a82dbc430 100644
--- a/targets/ARCH/rfsimulator/README.md
+++ b/targets/ARCH/rfsimulator/README.md
@@ -3,6 +3,12 @@ This is an RF simulator that allows to test OAI without an RF board. It replaces
As much as possible, it works like an RF board, but not in real-time: It can run faster than real-time if there is enough CPU, or slower (it is CPU-bound instead of real-time RF sampling-bound).
+It can be run either in:
+
+- "noS1" mode: the generated IP traffic is sent and received between gNB and UE IP tunnel interfaces ("oaitun") by applications like ping and iperf
+- "phy-test" mode: random UL and DL traffic is generated at every scheduling opportunity
+
+
# build
## From [build_oai](../../../doc/BUILD.md) script
diff --git a/targets/ARCH/rfsimulator/apply_channelmod.c b/targets/ARCH/rfsimulator/apply_channelmod.c
index ef4e564343fb5df20233dea288bdf0a263a31016..faf84bb0aaa47dba7d287a5af4195155451eb33b 100644
--- a/targets/ARCH/rfsimulator/apply_channelmod.c
+++ b/targets/ARCH/rfsimulator/apply_channelmod.c
@@ -1,7 +1,24 @@
/*
- Author: Laurent THOMAS, Open Cells for Nokia
- copyleft: OpenAirInterface Software Alliance and it's licence
-
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
*/
diff --git a/targets/ARCH/rfsimulator/simulator.c b/targets/ARCH/rfsimulator/simulator.c
index 54dfd3b888ab347bdaf7cacc6ac591e121675510..dc448b33e91a20e77d0723b983ea7d03b46cd353 100644
--- a/targets/ARCH/rfsimulator/simulator.c
+++ b/targets/ARCH/rfsimulator/simulator.c
@@ -1,8 +1,27 @@
/*
- Author: Laurent THOMAS, Open Cells for Nokia
- copyleft: OpenAirInterface Software Alliance and it's licence
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
*/
+
/*
* Open issues and limitations
* The read and write should be called in the same thread, that is not new USRP UHD design
@@ -33,7 +52,7 @@
#include <openair1/SIMULATION/TOOLS/sim.h>
#define PORT 4043 //default TCP port for this simulator
-#define CirSize 3072000 // 100ms is enough
+#define CirSize 307200 // 100ms is enough
#define sampleToByte(a,b) ((a)*(b)*sizeof(sample_t))
#define byteToSample(a,b) ((a)/(sizeof(sample_t)*(b)))
@@ -346,7 +365,8 @@ static int rfsimulator_write_internal(rfsimulator_state_t *t, openair0_timestamp
if ( t->lastWroteTS != 0 && abs((double)t->lastWroteTS-timestamp) > (double)CirSize)
LOG_E(HW,"Discontinuous TX gap too large Tx:%lu, %lu\n", t->lastWroteTS, timestamp);
- AssertFatal(t->lastWroteTS <= timestamp+1, " Not supported to send Tx out of order (same in USRP) %lu, %lu\n",
+ if (t->lastWroteTS > timestamp+nsamps)
+ LOG_E(HW,"Not supported to send Tx out of order (same in USRP) %lu, %lu\n",
t->lastWroteTS, timestamp);
t->lastWroteTS=timestamp+nsamps;
@@ -420,7 +440,7 @@ static bool flushInput(rfsimulator_state_t *t, int timeout, int nsamps_for_initi
if ( sz < 0 ) {
if ( errno != EAGAIN ) {
LOG_E(HW,"socket failed %s\n", strerror(errno));
- abort();
+ //abort();
}
} else if ( sz == 0 )
continue;
@@ -439,11 +459,15 @@ static bool flushInput(rfsimulator_state_t *t, int timeout, int nsamps_for_initi
b->headerMode=false;
if ( t->nextTimestamp == 0 ) { // First block in UE, resync with the eNB current TS
- t->nextTimestamp = b->th.timestamp > nsamps_for_initial ? b->th.timestamp - nsamps_for_initial : 0;
- b->lastReceivedTS = b->th.timestamp > nsamps_for_initial ? b->th.timestamp : nsamps_for_initial;
- LOG_W(HW,"UE got first timestamp: starting at %lu\n", t->nextTimestamp);
- b->trashingPacket=true;
- } else if ( b->lastReceivedTS < b->th.timestamp) {
+ t->nextTimestamp=b->th.timestamp> nsamps_for_initial ?
+ b->th.timestamp - nsamps_for_initial :
+ 0;
+ b->lastReceivedTS=b->th.timestamp> nsamps_for_initial ?
+ b->th.timestamp :
+ nsamps_for_initial;
+ LOG_W(HW,"UE got first timestamp: starting at %lu\n", t->nextTimestamp);
+ b->trashingPacket=true;
+ } else if ( b->lastReceivedTS < b->th.timestamp) {
int nbAnt= b->th.nbAnt;
for (uint64_t index=b->lastReceivedTS; index < b->th.timestamp; index++ ) {
@@ -463,8 +487,8 @@ static bool flushInput(rfsimulator_state_t *t, int timeout, int nsamps_for_initi
} else if ( b->lastReceivedTS == b->th.timestamp ) {
// normal case
} else {
- abort();
- AssertFatal(false, "received data in past: current is %lu, new reception: %lu!\n", b->lastReceivedTS, b->th.timestamp);
+ LOG_E(HW, "received data in past: current is %lu, new reception: %lu!\n", b->lastReceivedTS, b->th.timestamp);
+ b->trashingPacket=true;
}
pthread_mutex_lock(&Sockmutex);
diff --git a/targets/ARCH/rfsimulator/stored_node.c b/targets/ARCH/rfsimulator/stored_node.c
index 2b77c5322de45dc59478110dd68c11a06b16d0df..73f6321ffeba98c4c16c373b805bb436a1015897 100644
--- a/targets/ARCH/rfsimulator/stored_node.c
+++ b/targets/ARCH/rfsimulator/stored_node.c
@@ -1,8 +1,27 @@
/*
- Author: Laurent THOMAS, Open Cells
- copyleft: OpenAirInterface Software Alliance and it's licence
+* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The OpenAirInterface Software Alliance licenses this file to You under
+* the OAI Public License, Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.openairinterface.org/?page_id=698
+*
+* Author and copyright: Laurent Thomas, open-cells.com
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*-------------------------------------------------------------------------------
+* For more information about the OpenAirInterface (OAI) Software Alliance:
+* contact@openairinterface.org
*/
+
#include <common/utils/simple_executable.h>
volatile int oai_exit = 0;
diff --git a/targets/COMMON/create_tasks.c b/targets/COMMON/create_tasks.c
index cbbd30b62ca5ecc07287fec616e84c82b8f79eb2..4d57ab4e16625eac82290aa7ffae94665cc01892 100644
--- a/targets/COMMON/create_tasks.c
+++ b/targets/COMMON/create_tasks.c
@@ -41,6 +41,7 @@
# include "f1ap_du_task.h"
# include "enb_app.h"
# include "openair2/LAYER2/MAC/mac_proto.h"
+#include <executables/split_headers.h>
extern RAN_CONTEXT_t RC;
@@ -59,12 +60,12 @@ int create_tasks(uint32_t enb_nb) {
rc = itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL);
AssertFatal(rc >= 0, "Create task for RRC eNB failed\n");
- if (EPC_MODE_ENABLED) {
+ if (EPC_MODE_ENABLED && ! ( split73==SPLIT73_DU ) ) {
rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL);
AssertFatal(rc >= 0, "Create task for SCTP failed\n");
}
- if (EPC_MODE_ENABLED && !NODE_IS_DU(type)) {
+ if (EPC_MODE_ENABLED && !NODE_IS_DU(type) && ! ( split73==SPLIT73_DU ) ) {
rc = itti_create_task(TASK_S1AP, s1ap_eNB_task, NULL);
AssertFatal(rc >= 0, "Create task for S1AP failed\n");
if (!(get_softmodem_params()->emulate_rf)){
diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index 5ea4ec9695ef49d68af729b25579affdda009331..cb04480d3321c1080299ecd7aaaaa4069ced9151 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -261,7 +261,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
eNB->UL_INFO.subframe = proc->subframe_rx;
eNB->UL_INFO.module_id = eNB->Mod_id;
eNB->UL_INFO.CC_id = eNB->CC_id;
- eNB->if_inst->UL_indication(&eNB->UL_INFO);
+ eNB->if_inst->UL_indication(&eNB->UL_INFO, proc);
AssertFatal((ret= pthread_mutex_unlock(&eNB->UL_INFO_mutex))==0,"error unlocking UL_INFO_mutex, return %d\n",ret);
/* this conflict resolution may be totally wrong, to be tested */
/* CONFLICT RESOLUTION: BEGIN */
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 42221064b88f275e8ac4ca7f615a3beaf806688a..d8c5e25593915c3a328384fc8a1734cd659b20c3 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -80,7 +80,7 @@ unsigned short config_frames[4] = {2,9,11,13};
//#include "PHY/TOOLS/time_meas.h"
#ifndef OPENAIR2
-#include "UTIL/OTG/otg_vars.h"
+ #include "UTIL/OTG/otg_vars.h"
#endif
@@ -93,6 +93,7 @@ unsigned short config_frames[4] = {2,9,11,13};
#include "lte-softmodem.h"
#include "NB_IoT_interface.h"
+#include <executables/split_headers.h>
pthread_cond_t nfapi_sync_cond;
@@ -152,6 +153,13 @@ int otg_enabled;
uint64_t num_missed_slots=0; // counter for the number of missed slots
+int split73=0;
+void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_t *data, int dataLen, int r_offset) {
+ AssertFatal(false, "Must not be called in this context\n");
+}
+void sendFs6Ulharq(enum pckType type, int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, int frame, int subframe, uint8_t *harq_ack, uint8_t tdd_mapping_mode, uint16_t tdd_multiplexing_mask, uint16_t rnti, int32_t stat) {
+ AssertFatal(false, "Must not be called in this context\n");
+}
extern void reset_opp_meas(void);
extern void print_opp_meas(void);
@@ -170,7 +178,7 @@ eth_params_t *eth_params;
double cpuf;
int oaisim_flag=0;
-//threads_t threads= {-1,-1,-1,-1,-1,-1,-1,-1};
+
/* forward declarations */
void set_default_frame_parms(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]);
@@ -539,7 +547,7 @@ int main ( int argc, char **argv )
cpuf=get_cpu_freq_GHz();
printf("ITTI init, useMME: %i\n",EPC_MODE_ENABLED);
itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
-
+ // allows to forward in wireshark L2 protocol for decoding
// initialize mscgen log after ITTI
if (get_softmodem_params()->start_msc) {
load_module_shlib("msc",NULL,0,&msc_interface);
@@ -547,8 +555,6 @@ int main ( int argc, char **argv )
MSC_INIT(MSC_E_UTRAN, THREAD_MAX+TASK_MAX);
init_opt();
- // to make a graceful exit when ctrl-c is pressed
- set_softmodem_sighandler();
check_clock();
#ifndef PACKAGE_VERSION
# define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
@@ -579,11 +585,11 @@ int main ( int argc, char **argv )
for (i = 0; i < RC.nb_inst; i++) {
flexran_agent_start(i);
}
-
+
/* initializes PDCP and sets correct RLC Request/PDCP Indication callbacks
* for monolithic/F1 modes */
- init_pdcp();
-
+ init_pdcp();
+
if (create_tasks(1) < 0) {
printf("cannot create ITTI tasks\n");
exit(-1);
@@ -607,7 +613,7 @@ int main ( int argc, char **argv )
ctxt.subframe = 0;
pdcp_run(&ctxt);
}
-
+
/* start threads if only L1 or not a CU */
if (RC.nb_inst == 0 || !NODE_IS_CU(node_type) || NFAPI_MODE == NFAPI_MODE_PNF || NFAPI_MODE == NFAPI_MODE_VNF) {
// init UE_PF_PO and mutex lock
@@ -618,31 +624,44 @@ int main ( int argc, char **argv )
pthread_mutex_init(&sync_mutex, NULL);
rt_sleep_ns(10*100000000ULL);
-
+
if (NFAPI_MODE!=NFAPI_MONOLITHIC) {
LOG_I(ENB_APP,"NFAPI*** - mutex and cond created - will block shortly for completion of PNF connection\n");
pthread_cond_init(&sync_cond,NULL);
pthread_mutex_init(&sync_mutex, NULL);
}
-
+
if (NFAPI_MODE==NFAPI_MODE_VNF) {// VNF
#if defined(PRE_SCD_THREAD)
init_ru_vnf(); // ru pointer is necessary for pre_scd.
#endif
wait_nfapi_init("main?");
}
-
+
LOG_I(ENB_APP,"START MAIN THREADS\n");
// start the main threads
number_of_cards = 1;
printf("RC.nb_L1_inst:%d\n", RC.nb_L1_inst);
-
+
if (RC.nb_L1_inst > 0) {
printf("Initializing eNB threads single_thread_flag:%d wait_for_sync:%d\n", get_softmodem_params()->single_thread_flag,get_softmodem_params()->wait_for_sync);
init_eNB(get_softmodem_params()->single_thread_flag,get_softmodem_params()->wait_for_sync);
- // for (inst=0;inst<RC.nb_L1_inst;inst++)
- // for (CC_id=0;CC_id<RC.nb_L1_CC[inst];CC_id++) phy_init_lte_eNB(RC.eNB[inst][CC_id],0,0);
}
+ for (int x=0; x < RC.nb_L1_inst; x++)
+ for (int CC_id=0; CC_id<RC.nb_L1_CC[x]; CC_id++) {
+ L1_rxtx_proc_t *L1proc= &RC.eNB[x][CC_id]->proc.L1_proc;
+ L1proc->threadPool=(tpool_t*)malloc(sizeof(tpool_t));
+ L1proc->respEncode=(notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+ L1proc->respDecode=(notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+ if ( strlen(get_softmodem_params()->threadPoolConfig) > 0 )
+ initTpool(get_softmodem_params()->threadPoolConfig, L1proc->threadPool, true);
+ else
+ initTpool("n", L1proc->threadPool, true);
+ initNotifiedFIFO(L1proc->respEncode);
+ initNotifiedFIFO(L1proc->respDecode);
+ }
+
+
}
printf("wait_eNBs()\n");
@@ -660,23 +679,23 @@ int main ( int argc, char **argv )
RC.ru[ru_id]->rf_map.card=0;
RC.ru[ru_id]->rf_map.chain=CC_id+(get_softmodem_params()->chain_offset);
}
-
+
config_sync_var=0;
-
+
if (NFAPI_MODE==NFAPI_MODE_PNF) { // PNF
wait_nfapi_init("main?");
}
-
+
printf("wait RUs\n");
- // CI -- Flushing the std outputs for the previous marker to show on the eNB / RRU log file
+ // end of CI modifications
fflush(stdout);
fflush(stderr);
- // end of CI modifications
+ // wait_RUs() is wrong and over complex!
wait_RUs();
LOG_I(ENB_APP,"RC.nb_RU:%d\n", RC.nb_RU);
// once all RUs are ready intiailize the rest of the eNBs ((dependence on final RU parameters after configuration)
printf("ALL RUs ready - init eNBs\n");
-
+
if (NFAPI_MODE!=NFAPI_MODE_PNF && NFAPI_MODE!=NFAPI_MODE_VNF) {
LOG_I(ENB_APP,"Not NFAPI mode - call init_eNB_afterRU()\n");
init_eNB_afterRU();
@@ -723,7 +742,7 @@ int main ( int argc, char **argv )
for (int inst = 0; inst < NB_eNB_INST; inst++) {
for (int cc_id = 0; cc_id < RC.nb_CC[inst]; cc_id++) {
free_transport(RC.eNB[inst][cc_id]);
- phy_free_lte_eNB(RC.eNB[inst][cc_id]);
+ phy_free_lte_eNB(RC.eNB[inst][cc_id]);
}
}
@@ -741,17 +760,17 @@ int main ( int argc, char **argv )
for(ru_id=0; ru_id<RC.nb_RU; ru_id++) {
if (RC.ru[ru_id]->rfdevice.trx_end_func) {
- RC.ru[ru_id]->rfdevice.trx_end_func(&RC.ru[ru_id]->rfdevice);
- RC.ru[ru_id]->rfdevice.trx_end_func = NULL;
+ RC.ru[ru_id]->rfdevice.trx_end_func(&RC.ru[ru_id]->rfdevice);
+ RC.ru[ru_id]->rfdevice.trx_end_func = NULL;
}
if (RC.ru[ru_id]->ifdevice.trx_end_func) {
- RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
- RC.ru[ru_id]->ifdevice.trx_end_func = NULL;
+ RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice);
+ RC.ru[ru_id]->ifdevice.trx_end_func = NULL;
}
}
}
-
+
terminate_opt();
logClean();
printf("Bye.\n");
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index 4bad369791cd9b27951094087654b1bf4f3d6727..0962bb6a2d423b53c15a5df0423525d675dda4f8 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -1132,6 +1132,11 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg)
NFAPI_SFNSF2SF(dl_config_req->sfn_sf),
pdu,
ue_num);
+ } else if (pdu->pdu_type == NFAPI_DL_CONFIG_MCH_PDU_TYPE) {
+ dl_config_req_UE_MAC_mch(NFAPI_SFNSF2SFN(dl_config_req->sfn_sf),
+ NFAPI_SFNSF2SF(dl_config_req->sfn_sf),
+ pdu,
+ ue_num);
}
}
}
@@ -1557,12 +1562,12 @@ void write_dummy(PHY_VARS_UE *UE, openair0_timestamp timestamp) {
for ( int i=0; i < UE->frame_parms.nb_antennas_tx; i++)
samplesVoid[i]=(void *)&v;
- AssertFatal(1 == UE->rfdevice.trx_write_func(&UE->rfdevice,
- timestamp+2*UE->frame_parms.samples_per_tti,
- samplesVoid,
- 1,
- UE->frame_parms.nb_antennas_tx,
- 1),"");
+ AssertFatal( 1 == UE->rfdevice.trx_write_func(&UE->rfdevice,
+ timestamp+2*UE->frame_parms.samples_per_tti,
+ samplesVoid,
+ 1,
+ UE->frame_parms.nb_antennas_tx,
+ 1),"");
}
void *UE_thread(void *arg)
@@ -1613,36 +1618,36 @@ void *UE_thread(void *arg)
int instance_cnt_synch = UE->proc.instance_cnt_synch;
int is_synchronized = UE->is_synchronized;
AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
-
+
if (is_synchronized == 0) {
if (instance_cnt_synch < 0) { // we can invoke the synch
// grab 10 ms of signal and wakeup synch thread
if (UE->mode != loop_through_memory) {
- if (IS_SOFTMODEM_RFSIM) {
- for(int sf=0; sf<10; sf++) {
- for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
- rxp[i] = (void *)&UE->common_vars.rxdata[i][UE->frame_parms.samples_per_tti*sf];
-
+ if (IS_SOFTMODEM_RFSIM ) {
+ for(int sf=0; sf<10; sf++) {
+ for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
+ rxp[i] = (void *)&UE->common_vars.rxdata[i][UE->frame_parms.samples_per_tti*sf];
+
AssertFatal(UE->frame_parms.samples_per_tti == UE->rfdevice.trx_read_func(&UE->rfdevice,
- ×tamp,
- rxp,
- UE->frame_parms.samples_per_tti,
- UE->frame_parms.nb_antennas_rx), "");
- write_dummy(UE, timestamp);
- }
- } else {
- for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
- rxp[i] = (void *)&UE->common_vars.rxdata[i][0];
-
- AssertFatal( UE->frame_parms.samples_per_tti*10 ==
+ ×tamp,
+ rxp,
+ UE->frame_parms.samples_per_tti,
+ UE->frame_parms.nb_antennas_rx), "");
+ write_dummy(UE, timestamp);
+ }
+ } else {
+ for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
+ rxp[i] = (void *)&UE->common_vars.rxdata[i][0];
+
+ AssertFatal( UE->frame_parms.samples_per_tti*10 ==
UE->rfdevice.trx_read_func(&UE->rfdevice,
×tamp,
rxp,
UE->frame_parms.samples_per_tti*10,
UE->frame_parms.nb_antennas_rx), "");
- }
- }
+ }
+ }
AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
instance_cnt_synch = ++UE->proc.instance_cnt_synch;
@@ -1672,10 +1677,10 @@ void *UE_thread(void *arg)
rxp,
UE->frame_parms.samples_per_tti,
UE->frame_parms.nb_antennas_rx);
- if (IS_SOFTMODEM_RFSIM )
- write_dummy(UE, timestamp);
- }
- }
+ if (IS_SOFTMODEM_RFSIM )
+ write_dummy(UE, timestamp);
+ }
+ }
#endif
}
} // UE->is_synchronized==0
@@ -1686,17 +1691,17 @@ void *UE_thread(void *arg)
if (UE->mode != loop_through_memory) {
if (UE->no_timing_correction==0) {
LOG_I(PHY,"Resynchronizing RX by %d samples (mode = %d)\n",UE->rx_offset,UE->mode);
- while ( UE->rx_offset ) {
- size_t s=min(UE->rx_offset,UE->frame_parms.samples_per_tti);
+ while ( UE->rx_offset ) {
+ size_t s=min(UE->rx_offset,UE->frame_parms.samples_per_tti);
AssertFatal(s == UE->rfdevice.trx_read_func(&UE->rfdevice,
- ×tamp,
- (void **)UE->common_vars.rxdata,
- s,
- UE->frame_parms.nb_antennas_rx),"");
- if (IS_SOFTMODEM_RFSIM )
- write_dummy(UE, timestamp);
- UE->rx_offset-=s;
- }
+ ×tamp,
+ (void **)UE->common_vars.rxdata,
+ s,
+ UE->frame_parms.nb_antennas_rx),"");
+ if (IS_SOFTMODEM_RFSIM )
+ write_dummy(UE, timestamp);
+ UE->rx_offset-=s;
+ }
}
UE->rx_offset=0;
@@ -1737,7 +1742,7 @@ void *UE_thread(void *arg)
pthread_mutex_unlock(&proc->mutex_rxtx);
}
- usleep(300);
+ usleep(300);
}
LOG_D(PHY,"Process Subframe %d thread Idx %d \n", sub_frame, UE->current_thread_id[sub_frame]);
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index b03c16af43e4021a14fd7d401690ade787504a4d..2c9271888bd9fd11d6a64b269709e1effd89519e 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -281,13 +281,13 @@ void exit_function(const char *file, const char *function, const int line, const
extern int16_t dlsch_demod_shift;
static void get_options(void) {
- int CC_id;
- int tddflag = 0;
- char *loopfile = NULL;
- int dumpframe = 0;
- int timingadv = 0;
+ int CC_id=0;
+ int tddflag=0;
+ char *loopfile=NULL;
+ int dumpframe=0;
+ int timingadv=0;
uint8_t nfapi_mode = NFAPI_MONOLITHIC;
- int simL1flag = 0;
+ int simL1flag =0;
set_default_frame_parms(frame_parms);
CONFIG_SETRTFLAG(CONFIG_NOEXITONHELP);