From eddebae1e4feac96bf0f2b095674c0c202dea7e7 Mon Sep 17 00:00:00 2001
From: Laurent Thomas <lts@open-cells.com>
Date: Thu, 21 Jan 2021 13:47:18 +0100
Subject: [PATCH] fix after code review
---
common/utils/ocp_itti/intertask_interface.cpp | 13 ++++++-------
common/utils/ocp_itti/intertask_interface.h | 11 +++++------
executables/main-ocp.c | 2 +-
executables/nr-softmodem.c | 2 +-
executables/nr-uesoftmodem.c | 2 +-
executables/ocp-gnb.c | 2 +-
openair1/SIMULATION/LTE_PHY/dlsim.c | 1 -
openair1/SIMULATION/LTE_PHY/dlsim_tm4.c | 1 -
openair1/SIMULATION/LTE_PHY/mbmssim.c | 1 -
openair1/SIMULATION/LTE_PHY/pucchsim.c | 1 -
openair1/SIMULATION/LTE_PHY/ulsim.c | 1 -
openair2/SIMULATION/NR_RRC/itti_sim.c | 2 +-
openair3/TEST/EPC_TEST/play_scenario.c | 2 +-
openair3/TEST/oaisim_mme_itti_test.c | 2 +-
openair3/TEST/oaisim_mme_test_s1c.c | 2 +-
targets/RT/USER/lte-softmodem.c | 2 +-
targets/RT/USER/lte-uesoftmodem.c | 2 +-
17 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/common/utils/ocp_itti/intertask_interface.cpp b/common/utils/ocp_itti/intertask_interface.cpp
index 964f5409fd0..2189be9fe8b 100644
--- a/common/utils/ocp_itti/intertask_interface.cpp
+++ b/common/utils/ocp_itti/intertask_interface.cpp
@@ -336,15 +336,15 @@ extern "C" {
usleep(100*1000); // Allow the tasks to receive the message before going returning to main thread
}
- int itti_create_queue(const task_info_t *task_info) {
+ int itti_create_queue(const task_info_t *taskInfo) {
pthread_mutex_lock (&lock_nb_queues);
int newQueue=nb_queues++;
AssertFatal(tasks=(task_list_t **) realloc(tasks, nb_queues * sizeof(*tasks)),"");
tasks[newQueue]= new task_list_t;
pthread_mutex_unlock (&lock_nb_queues);
- LOG_I(TMR,"Starting itti queue: %s as task %d\n", tasks_info->name, newQueue);
+ LOG_I(TMR,"Starting itti queue: %s as task %d\n", taskInfo->name, newQueue);
pthread_mutex_init(&tasks[newQueue]->queue_cond_lock, NULL);
- memcpy(&tasks[newQueue]->admin, tasks_info, sizeof(task_info_t));
+ memcpy(&tasks[newQueue]->admin, taskInfo, sizeof(task_info_t));
AssertFatal( ( tasks[newQueue]->epoll_fd = epoll_create1(0) ) >=0, "");
AssertFatal( ( tasks[newQueue]->sem_fd = eventfd(0, EFD_SEMAPHORE) ) >=0, "");
itti_subscribe_event_fd((task_id_t)newQueue, tasks[newQueue]->sem_fd);
@@ -356,14 +356,13 @@ extern "C" {
}
int itti_init(task_id_t task_max,
- MessagesIds messages_id_max,
- const task_info_t *tasks_info,
- const message_info_t *messages_info) {
+ const task_info_t *tasks
+ ) {
pthread_mutex_init(&lock_nb_queues, NULL);
nb_queues=0;
for(int i=0; i<task_max; ++i) {
- itti_create_queue(&tasks_info[i]);
+ itti_create_queue(&tasks[i]);
}
return 0;
diff --git a/common/utils/ocp_itti/intertask_interface.h b/common/utils/ocp_itti/intertask_interface.h
index beec7678293..d84ccda60a9 100644
--- a/common/utils/ocp_itti/intertask_interface.h
+++ b/common/utils/ocp_itti/intertask_interface.h
@@ -264,7 +264,7 @@ void *rrc_enb_process_itti_msg(void *);
#include <openair3/NGAP/ngap_gNB.h>
#ifdef ITTI_SIM
-#include <openair2/COMMON/itti_sim_messages_types.h>
+ #include <openair2/COMMON/itti_sim_messages_types.h>
#endif
/*
@@ -301,7 +301,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*);
+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) \
@@ -403,8 +403,8 @@ typedef struct MessageHeader_s {
MessagesIds messageId; /**< Unique message id as referenced in enum MessagesIds */
task_id_t originTaskId; /**< ID of the sender task */
task_id_t destinationTaskId; /**< ID of the destination task */
- instance_t originInstance;
- instance_t destinationInstance;
+ instance_t originInstance;
+ instance_t destinationInstance;
itti_lte_time_t lte_time;
MessageHeaderSize ittiMsgSize; /**< Message size (not including header size) */
} MessageHeader;
@@ -566,8 +566,7 @@ void *malloc_or_fail(size_t size);
int memory_read(const char *datafile, void *data, size_t size);
int itti_free(task_id_t task_id, void *ptr);
-int itti_init(task_id_t task_max, MessagesIds messages_id_max, const task_info_t *tasks_info,
- const message_info_t *messages_info);
+int itti_init(task_id_t task_max, const task_info_t *tasks_info);
int timer_setup(
uint32_t interval_sec,
uint32_t interval_us,
diff --git a/executables/main-ocp.c b/executables/main-ocp.c
index f464bbd7bc7..39e7b558acb 100644
--- a/executables/main-ocp.c
+++ b/executables/main-ocp.c
@@ -1141,7 +1141,7 @@ int main ( int argc, char **argv ) {
if (opp_enabled ==1)
reset_opp_meas();
- itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+ itti_init(TASK_MAX, tasks_info);
init_opt();
#ifndef PACKAGE_VERSION
# define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index c3bfd09eb09..266f6245471 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -863,7 +863,7 @@ int main( int argc, char **argv )
}
cpuf=get_cpu_freq_GHz();
- itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+ itti_init(TASK_MAX, tasks_info);
// initialize mscgen log after ITTI
MSC_INIT(MSC_E_UTRAN, ADDED_QUEUES_MAX+TASK_MAX);
diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c
index e25b1038605..0737ed2207b 100644
--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
@@ -514,7 +514,7 @@ int main( int argc, char **argv ) {
initTpool(params_dl, Tpool_dl, false);
#endif
cpuf=get_cpu_freq_GHz();
- itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+ itti_init(TASK_MAX, tasks_info);
init_opt() ;
load_nrLDPClib();
diff --git a/executables/ocp-gnb.c b/executables/ocp-gnb.c
index ff8d8840e94..4ddc7870d9c 100644
--- a/executables/ocp-gnb.c
+++ b/executables/ocp-gnb.c
@@ -928,7 +928,7 @@ int main( int argc, char **argv ) {
get_common_options(SOFTMODEM_GNB_BIT );
AssertFatal(!CONFIG_ISFLAGSET(CONFIG_ABORT),"Getting configuration failed\n");
cpuf=get_cpu_freq_GHz();
- itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+ itti_init(TASK_MAX, tasks_info);
set_taus_seed (0);
init_opt();
init_pdcp();
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c
index 87489353d33..667913d377f 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
@@ -905,7 +905,6 @@ int main(int argc, char **argv) {
// moreover you need to init itti with the following line
// however itti will catch all signals, so ctrl-c won't work anymore
// alternatively you can disable ITTI completely in CMakeLists.txt
- //itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
T_stdout = 1;
if (common_flag == 0) {
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c b/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
index 8a646bb9d53..a585e8efc69 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
@@ -689,7 +689,6 @@ int main(int argc, char **argv)
// moreover you need to init itti with the following line
// however itti will catch all signals, so ctrl-c won't work anymore
// alternatively you can disable ITTI completely in CMakeLists.txt
- //itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
if (common_flag == 0) {
switch (N_RB_DL) {
diff --git a/openair1/SIMULATION/LTE_PHY/mbmssim.c b/openair1/SIMULATION/LTE_PHY/mbmssim.c
index 8a2f10df3e6..b1f4d933b3b 100644
--- a/openair1/SIMULATION/LTE_PHY/mbmssim.c
+++ b/openair1/SIMULATION/LTE_PHY/mbmssim.c
@@ -997,7 +997,6 @@ int main(int argc, char **argv) {
// moreover you need to init itti with the following line
// however itti will catch all signals, so ctrl-c won't work anymore
// alternatively you can disable ITTI completely in CMakeLists.txt
- //itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
if (common_flag == 0) {
switch (N_RB_DL) {
diff --git a/openair1/SIMULATION/LTE_PHY/pucchsim.c b/openair1/SIMULATION/LTE_PHY/pucchsim.c
index 396fce7a910..127bfcb533c 100644
--- a/openair1/SIMULATION/LTE_PHY/pucchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pucchsim.c
@@ -283,7 +283,6 @@ int main(int argc, char **argv) {
}
logInit();
- //itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
g_log->log_component[PHY].level = LOG_DEBUG;
g_log->log_component[PHY].flag = LOG_HIGH;
diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c
index 344425fa627..80beee4bed7 100644
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
@@ -409,7 +409,6 @@ int main(int argc, char **argv) {
// enable these lines if you need debug info
// however itti will catch all signals, so ctrl-c won't work anymore
// alternatively you can disable ITTI completely in CMakeLists.txt
- // itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
// set_comp_log(PHY,LOG_DEBUG,LOG_HIGH,1);
// set_glog(LOG_DEBUG,LOG_HIGH);
//hapZEbm:n:Y:X:x:s:w:e:q:d:D:O:c:r:i:f:y:c:oA:C:R:g:N:l:S:T:QB:PI:LF
diff --git a/openair2/SIMULATION/NR_RRC/itti_sim.c b/openair2/SIMULATION/NR_RRC/itti_sim.c
index 9f81aa1901e..77369d44356 100644
--- a/openair2/SIMULATION/NR_RRC/itti_sim.c
+++ b/openair2/SIMULATION/NR_RRC/itti_sim.c
@@ -557,7 +557,7 @@ int main( int argc, char **argv )
}
cpuf=get_cpu_freq_GHz();
- itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+ itti_init(TASK_MAX, tasks_info);
// initialize mscgen log after ITTI
MSC_INIT(MSC_E_UTRAN, ADDED_QUEUES_MAX+TASK_MAX);
diff --git a/openair3/TEST/EPC_TEST/play_scenario.c b/openair3/TEST/EPC_TEST/play_scenario.c
index 858448b815d..ebaffdb39ed 100644
--- a/openair3/TEST/EPC_TEST/play_scenario.c
+++ b/openair3/TEST/EPC_TEST/play_scenario.c
@@ -1204,7 +1204,7 @@ int main( int argc, char **argv )
logInit();
set_glog(LOG_TRACE, LOG_MED);
- itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+ itti_init(TASK_MAX, tasks_info);
set_comp_log(ENB_APP, LOG_TRACE, LOG_MED, 1);
set_comp_log(S1AP, LOG_TRACE, LOG_MED, 1);
diff --git a/openair3/TEST/oaisim_mme_itti_test.c b/openair3/TEST/oaisim_mme_itti_test.c
index 0b381a04156..ecfbdb0acb6 100644
--- a/openair3/TEST/oaisim_mme_itti_test.c
+++ b/openair3/TEST/oaisim_mme_itti_test.c
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
/* Calling each layer init function */
log_init(&mme_config);
- itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+ itti_init(TASK_MAX, tasks_info);
sctp_init(&mme_config);
udp_init(&mme_config);
s1ap_mme_init(&mme_config);
diff --git a/openair3/TEST/oaisim_mme_test_s1c.c b/openair3/TEST/oaisim_mme_test_s1c.c
index 53f8a1d5ebc..94a554ab5f2 100644
--- a/openair3/TEST/oaisim_mme_test_s1c.c
+++ b/openair3/TEST/oaisim_mme_test_s1c.c
@@ -309,7 +309,7 @@ int main( int argc, char **argv )
/* Read eNB configuration file */
enb_properties = enb_config_init(conf_config_file_name);
- itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+ itti_init(TASK_MAX, tasks_info);
itti_wait_ready(1);
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index cdafb1e3eb4..a602e762f16 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -544,7 +544,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, MESSAGES_ID_MAX, tasks_info, messages_info);
+ itti_init(TASK_MAX, tasks_info);
// allows to forward in wireshark L2 protocol for decoding
// initialize mscgen log after ITTI
if (get_softmodem_params()->start_msc) {
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index dce7a208741..9bf179efb92 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -601,7 +601,7 @@ int main( int argc, char **argv ) {
pthread_mutex_init(&sync_mutex, NULL);
printf("ITTI init\n");
- itti_init(TASK_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
+ itti_init(TASK_MAX, tasks_info);
// initialize mscgen log after ITTI
if (get_softmodem_params()->start_msc) {
--
GitLab