Cleanup common_lib.h

This change reduces the number of dependecies of common_lib.h and simplifies
the task of implementing an external OAI radio library.

radio/BLADERF/bladerf_lib.c

@@ -8,6 +8,7 @@
 
 #include <libbladeRF.h>
 #include "common_lib.h"
+#include "log.h"
 
 /*! \brief BladeRF specific data structure */
 typedef struct {

radio/COMMON/common_lib.c

@@ -17,6 +17,9 @@
 #include "common/utils/load_module_shlib.h"
 #include "common/utils/LOG/log.h"
 #include "executables/softmodem-common.h"
+#include "common/config/config_paramdesc.h"
+#include "common/config/config_userapi.h"
+#include "common/cmake_defs.h"
 
 #define MAX_GAP 100ULL
 const char *const devtype_names[MAX_RF_DEV_TYPE] =
@@ -224,6 +227,9 @@ int openair0_write_reorder_common(nrue_ru_write_t nrue_ru_write,
     ctx->nextTS = timestamp;
     pthread_mutex_init(&ctx->mutex_write, NULL);
     pthread_mutex_init(&ctx->mutex_store, NULL);
+    for (int i = 0; i < WRITE_QUEUE_SZ; i++) {
+      ctx->queue[i].txp = malloc(sizeof(void *) * NB_ANTENNAS_TX);
+    }
     ctx->initDone = true;
   }
   if (pthread_mutex_trylock(&ctx->mutex_write) == 0) {
@@ -270,8 +276,10 @@ void openair0_write_reorder_clear_context(openair0_device_t *device)
     LOG_E(HW, "write_reorder_clear_context call while still writing on the device\n");
   pthread_mutex_destroy(&ctx->mutex_write);
   pthread_mutex_lock(&ctx->mutex_store);
-  for (int i = 0; i < WRITE_QUEUE_SZ; i++)
+  for (int i = 0; i < WRITE_QUEUE_SZ; i++) {
     ctx->queue[i].active = false;
+    free(ctx->queue[i].txp);
+  }
   pthread_mutex_unlock(&ctx->mutex_store);
   pthread_mutex_destroy(&ctx->mutex_store);
   ctx->initDone = false;

radio/COMMON/common_lib.h

@@ -11,10 +11,8 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include "common/cmake_defs.h"
-#include <openair1/PHY/TOOLS/tools_defs.h>
+#include <stdbool.h>
 #include "record_player.h"
-#include "common/utils/threadPool/notified_fifo.h"
 
 /* default name of shared library implementing the radio front end */
 #define OAI_RF_LIBNAME        "oai_device"
@@ -140,14 +138,6 @@ typedef enum {
   TX_GPIO_CHANGE = 0x1000,
 } radio_tx_gpio_flag_t;
 
-/*! \brief Structure used for initializing UDP read threads */
-typedef struct {
-  openair0_device_t *device;
-  int thread_id;
-  pthread_t pthread;
-  notifiedFIFO_t *resp;
-} udp_ctx_t;
-
 typedef enum {
   RU_GPIO_CONTROL_NONE,
   RU_GPIO_CONTROL_GENERIC,
@@ -351,7 +341,7 @@ typedef struct {
   struct {
     bool active;
     openair0_timestamp_t timestamp;
-    void *txp[NB_ANTENNAS_TX];
+    void **txp;
     int nsamps;
     int nbAnt;
     int flags;
@@ -393,9 +383,6 @@ struct openair0_device {
   /*!brief pointer to FH state, used in ECPRI split 8*/
   fhstate_t fhstate;
 
-  /*!brief UDP TX thread context*/
-  udp_ctx_t **utx;
-
   /*!brief Used in ECPRI split 8 to indicate numerator of sampling rate ratio*/
   int sampling_rate_ratio_n;
 
@@ -631,7 +618,6 @@ struct openair0_device {
   void *(*get_internal_parameter)(char *id);
   /* \brief timing statistics for TX fronthaul (ethernet)
    */
-  time_stats_t tx_fhaul;
   re_order_t reOrder;
 };
 
@@ -689,10 +675,6 @@ extern void iqrecorder_end(openair0_device_t *device);
 
 int openair0_write_reorder(openair0_device_t *device, openair0_timestamp_t timestamp, void **txp, int nsamps, int nbAnt, int flags);
 void openair0_write_reorder_clear_context(openair0_device_t *device);
-#include <unistd.h>
-#ifndef gettid
-#define gettid() syscall(__NR_gettid)
-#endif
 /**@}*/
 
 #ifdef __cplusplus

radio/COMMON/record_player.c

@@ -11,6 +11,8 @@
 #include "assertions.h"
 #include "common_lib.h"
 #include "record_player.h"
+#include "common/config/config_paramdesc.h"
+#include "common/config/config_userapi.h"
 
 /*! \brief read the oai recorder or player configuration, called from common device code
  * \param recplay_conf:  store parameters

radio/COMMON/record_player.h

@@ -9,8 +9,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "common/config/config_paramdesc.h"
-#include "common/config/config_userapi.h"
 
 #ifdef __cplusplus
 extern "C"

radio/ETHERNET/eth_udp.c

@@ -365,7 +365,8 @@ void *trx_eth_write_udp_cmd(udpTXelem_t *udpTXelem)
 int trx_eth_write_udp(openair0_device_t *device, openair0_timestamp_t timestamp, void **buff, int fd_ind, int nsamps, int flags, int nant)
 {
     union udpTXReqUnion id = {.s={(uint64_t)timestamp,nsamps,0}};
-    notifiedFIFO_elt_t *req=newNotifiedFIFO_elt(sizeof(udpTXelem_t), id.p, device->utx[fd_ind]->resp,NULL);
+    eth_state_t *eth = (eth_state_t*)device->priv;
+    notifiedFIFO_elt_t *req=newNotifiedFIFO_elt(sizeof(udpTXelem_t), id.p, eth->utx[fd_ind]->resp,NULL);
     udpTXelem_t * udptxelem=(udpTXelem_t *) NotifiedFifoData(req);
     udptxelem->device = device;
     udptxelem->timestamp = timestamp;
@@ -375,7 +376,7 @@ int trx_eth_write_udp(openair0_device_t *device, openair0_timestamp_t timestamp,
     udptxelem->nsamps = nsamps;
     udptxelem->flags = flags;
     udptxelem->nant = nant;
-    pushNotifiedFIFO(device->utx[fd_ind]->resp, req);
+    pushNotifiedFIFO(eth->utx[fd_ind]->resp, req);
     LOG_D(PHY,"Pushed to TX FH FIFO, TS %llu, nsamps %d, nant %d buffs[0] %p buffs[1] %p\n",
           (unsigned long long)timestamp,nsamps,nant,udptxelem->buff[0],udptxelem->buff[1]);
     return(0);
@@ -386,14 +387,11 @@ void *udp_write_thread(void *arg) {
    utx->resp = malloc(sizeof(*utx->resp));
    initNotifiedFIFO(utx->resp);
    LOG_D(PHY,"UDP write thread started on core %d\n",sched_getcpu()); 
-   reset_meas(&utx->device->tx_fhaul);
    while (oai_exit == 0) {
       notifiedFIFO_elt_t *res = pullNotifiedFIFO(utx->resp);
       udpTXelem_t *udptxelem = (udpTXelem_t *)NotifiedFifoData(res);
       LOG_D(PHY,"Pulled from TX FH FIFO, TS %llu, nsamps %d, nant %d\n",(unsigned long long)udptxelem->timestamp,udptxelem->nsamps,udptxelem->nant);
-      start_meas(&utx->device->tx_fhaul);
       trx_eth_write_udp_cmd(udptxelem);
-      stop_meas(&utx->device->tx_fhaul);
       // send data to RU
       delNotifiedFIFO_elt(res);
    }

radio/ETHERNET/ethernet_lib.c

@@ -6,6 +6,7 @@
  * \brief API to stream I/Q samples over standard ethernet
  */
 
+#include "utils.h"
 #include <arpa/inet.h>
 #include <linux/if_packet.h>
 #include <stdio.h>
@@ -37,20 +38,30 @@ int trx_eth_start(openair0_device_t *device)
        AssertFatal(device->thirdparty_init != NULL, "device->thirdparty_init is null\n");
        AssertFatal(device->thirdparty_init(device) == 0, "third-party init failed\n");
        device->openair0_cfg->samples_per_packet = 256;
-       eth->num_fd = 1; //max(device->openair0_cfg->rx_num_channels,device->openair0_cfg->tx_num_channels); 
-       udp_ctx_t *u[1+eth->num_fd];
-       device->utx = (udp_ctx_t**)malloc(sizeof(device->utx));
-       for (int i=0;i<eth->num_fd;i++) {
-          u[i] = malloc(sizeof(udp_ctx_t));
-          u[i]->thread_id=i;
-          u[i]->device = device;
-	  printf("UDP Read Thread %d on core %d\n",i,device->openair0_cfg->rxfh_cores[i]);
-          threadCreate(&u[i]->pthread,udp_read_thread,u[i],"udp read thread",device->openair0_cfg->rxfh_cores[i],OAI_PRIORITY_RT_MAX);
-          device->utx[i] = malloc(sizeof(udp_ctx_t));
-          device->utx[i]->thread_id=i;
-          device->utx[i]->device = device;
-	  printf("UDP Write Thread %d on core %d\n",i,device->openair0_cfg->txfh_cores[i]);
-          threadCreate(&device->utx[i]->pthread,udp_write_thread,device->utx[i],"udp write thread",device->openair0_cfg->txfh_cores[i],OAI_PRIORITY_RT_MAX);
+       eth->num_fd = 1; //max(device->openair0_cfg->rx_num_channels,device->openair0_cfg->tx_num_channels);
+       udp_ctx_t *u[1 + eth->num_fd];
+       eth->utx = malloc_or_fail(sizeof(eth->utx));
+       for (int i = 0; i < eth->num_fd; i++) {
+         u[i] = malloc_or_fail(sizeof(udp_ctx_t));
+         u[i]->thread_id = i;
+         u[i]->device = device;
+         printf("UDP Read Thread %d on core %d\n", i, device->openair0_cfg->rxfh_cores[i]);
+         threadCreate(&u[i]->pthread,
+                      udp_read_thread,
+                      u[i],
+                      "udp read thread",
+                      device->openair0_cfg->rxfh_cores[i],
+                      OAI_PRIORITY_RT_MAX);
+         eth->utx[i] = malloc_or_fail(sizeof(udp_ctx_t));
+         eth->utx[i]->thread_id = i;
+         eth->utx[i]->device = device;
+         printf("UDP Write Thread %d on core %d\n", i, device->openair0_cfg->txfh_cores[i]);
+         threadCreate(&eth->utx[i]->pthread,
+                      udp_write_thread,
+                      eth->utx[i],
+                      "udp write thread",
+                      device->openair0_cfg->txfh_cores[i],
+                      OAI_PRIORITY_RT_MAX);
        }
        device->sampling_rate_ratio_n=1;
        device->sampling_rate_ratio_d=1;

radio/ETHERNET/ethernet_lib.h

@@ -17,6 +17,7 @@
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/ether.h>
+#include "common/utils/threadPool/notified_fifo.h"
 
 #define MAX_INST 4
 
@@ -29,6 +30,14 @@
 #define APP_HEADER_SIZE_BYTES (ECPRICOMMON_BYTES + ECPRIPCID_BYTES + sizeof(openair0_timestamp_t))
 #define ECPRIREV 1 // ECPRI Version 1, C=0 - single ECPRI message per OAI TX packet
 
+/*! \brief Structure used for initializing UDP read threads */
+typedef struct {
+  openair0_device_t *device;
+  int thread_id;
+  pthread_t pthread;
+  notifiedFIFO_t *resp;
+} udp_ctx_t;
+
 /*!\brief opaque ethernet data structure */
 typedef struct {
   
@@ -115,6 +124,8 @@ typedef struct {
   struct ether_header ehd;
   /*!\brief local address (user) for RAW socket*/
   struct sockaddr_ll local_addrd_ll;
+  /*!brief UDP TX thread context*/
+  udp_ctx_t **utx;
 } eth_state_t;
 
 

radio/emulator/rf_emulator.c

@@ -16,6 +16,7 @@
 #include "radio/vrtsim/noise_device.h"
 #include "simde/x86/avx512.h"
 #include "SIMULATION/TOOLS/sim.h"
+#include "common/config/config_userapi.h"
 
 #define RF_EMULATOR_SECTION "rf_emulator"
 // clang-format off

radio/fhi_72/oran-config.c

@@ -14,6 +14,7 @@
 
 #include "stdio.h"
 #include "string.h"
+#include "log.h"
 
 #ifdef OAI_MPLANE
 #include "mplane/ru-mplane-api.h"

radio/fhi_72/oran-params.h

@@ -7,6 +7,7 @@
 
 #include "stdbool.h"
 #include "stdint.h"
+#include "common/config/config_userapi.h"
 
 #define CONFIG_STRING_ORAN "fhi_72"
 

radio/rfsimulator/simulator.cpp

@@ -30,6 +30,7 @@
 #include <common/utils/telnetsrv/telnetsrv.h>
 #include <common/config/config_userapi.h>
 #include "common_lib.h"
+#include "common/utils/threadPool/pthread_utils.h"
 extern "C" {
 #include <common/utils/load_module_shlib.h>
 #include <openair1/SIMULATION/TOOLS/sim.h>