FlexRAN: Simplify stats request handling

* only set up timer for sending requests
* simplify interface for timer setup
* on timer expiry, do not pass through stats request function but
  directly send the reply
* Remove whatever report structure and use stats request directly for
  inferring the data to send

openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c

@@ -63,9 +63,12 @@ pthread_mutex_t sc_update_mtx = PTHREAD_MUTEX_INITIALIZER;
 
 
 int flexran_agent_mac_stats_reply(mid_t mod_id,
-          const report_config_t *report_config,
            Protocol__FlexUeStatsReport **ue_report,
-           Protocol__FlexCellStatsReport **cell_report) {
+           int      n_ue,
+           uint32_t ue_flags,
+           Protocol__FlexCellStatsReport **cell_report,
+           int      n_cc,
+           uint32_t cc_flags) {
 
 
   // Protocol__FlexHeader *header;
@@ -75,18 +78,16 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
   int enb_id = mod_id;
 
   /* Allocate memory for list of UE reports */
-  if (report_config->nr_ue > 0) {
+  if (n_ue > 0) {
 
 
-          for (i = 0; i < report_config->nr_ue; i++) {
+          for (i = 0; i < n_ue; i++) {
 
-                UE_id = flexran_get_mac_ue_id(mod_id, i);
-
-                ue_report[i]->rnti = report_config->ue_report_type[i].ue_rnti;
-                ue_report[i]->has_rnti = 1;
+                const rnti_t rnti = ue_report[i]->rnti;
+                UE_id = flexran_get_mac_ue_id_rnti(mod_id, rnti);
 
                 /* Check flag for creation of buffer status report */
-                if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_BSR) {
+                if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_BSR) {
                       //TODO should be automated
                         ue_report[i]->n_bsr = 4;
                         uint32_t *elem;
@@ -103,7 +104,7 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
                 }
 
                 /* Check flag for creation of PHR report */
-                if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_PHR) {
+                if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_PHR) {
                         ue_report[i]->phr = flexran_get_ue_phr (enb_id, UE_id); // eNB_UE_list->UE_template[UE_PCCID(enb_id,UE_id)][UE_id].phr_info;
                         ue_report[i]->has_phr = 1;
                         ue_report[i]->flags |= PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_PHR;
@@ -111,7 +112,7 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
                 }
 
                 /* Check flag for creation of RLC buffer status report */
-                if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_RLC_BS) {
+                if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_RLC_BS) {
                         ue_report[i]->n_rlc_report = 3; // Set this to the number of LCs for this UE. This needs to be generalized for for LCs
                         Protocol__FlexRlcBsr ** rlc_reports;
                         rlc_reports = malloc(sizeof(Protocol__FlexRlcBsr *) * ue_report[i]->n_rlc_report);
@@ -157,7 +158,7 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
                 }
 
                 /* Check flag for creation of MAC CE buffer status report */
-                if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_MAC_CE_BS) {
+                if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_MAC_CE_BS) {
                         // TODO: Fill in the actual MAC CE buffer status report
                         ue_report[i]->pending_mac_ces = (flexran_get_MAC_CE_bitmap_TA(enb_id, UE_id, 0) | (0 << 1) | (0 << 2) | (0 << 3)) & 15;
                                       // Use as bitmap. Set one or more of the; /* Use as bitmap. Set one or more of the
@@ -169,7 +170,7 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
                 }
 
                 /* Check flag for creation of DL CQI report */
-                if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_DL_CQI) {
+                if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_DL_CQI) {
                         // TODO: Fill in the actual DL CQI report for the UE based on its configuration
                         Protocol__FlexDlCqiReport * dl_report;
                         dl_report = malloc(sizeof(Protocol__FlexDlCqiReport));
@@ -420,7 +421,7 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
                 }
 
                 /* Check flag for creation of paging buffer status report */
-                if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_PBS) {
+                if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_PBS) {
                             //TODO: Fill in the actual paging buffer status report. For this field to be valid, the RNTI
                             //set in the report must be a P-RNTI
                             Protocol__FlexPagingBufferReport *paging_report;
@@ -474,7 +475,7 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
                 }
 
                   /* Check flag for creation of UL CQI report */
-                if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_UL_CQI) {
+                if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_UL_CQI) {
 
                       //Fill in the full UL CQI report of the UE
                       Protocol__FlexUlCqiReport *full_ul_report;
@@ -559,7 +560,7 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
                         ue_report[i]->flags |= PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_UL_CQI;
 
                      }
-                      if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_MAC_STATS) {
+                      if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_MAC_STATS) {
 
                             Protocol__FlexMacStats *macstats;
                             macstats = malloc(sizeof(Protocol__FlexMacStats));
@@ -668,15 +669,15 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
      }
 
   /* Allocate memory for list of cell reports */
-  if (report_config->nr_cc > 0) {
+  if (n_cc > 0) {
 
 
             // Fill in the Cell reports
-            for (i = 0; i < report_config->nr_cc; i++) {
+            for (i = 0; i < n_cc; i++) {
 
 
                       /* Check flag for creation of noise and interference report */
-                      if(report_config->cc_report_type[i].cc_report_flags & PROTOCOL__FLEX_CELL_STATS_TYPE__FLCST_NOISE_INTERFERENCE) {
+                      if(cc_flags & PROTOCOL__FLEX_CELL_STATS_TYPE__FLCST_NOISE_INTERFERENCE) {
                             // TODO: Fill in the actual noise and interference report for this cell
                             Protocol__FlexNoiseInterferenceReport *ni_report;
                             ni_report = malloc(sizeof(Protocol__FlexNoiseInterferenceReport));
@@ -710,8 +711,8 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
  error:
 
   if (cell_report != NULL) {
-    if (report_config->nr_cc > 0) {
-      for (i = 0; i < report_config->nr_cc; i++) {
+    if (n_cc > 0) {
+      for (i = 0; i < n_cc; i++) {
         if (cell_report[i]->noise_inter_report != NULL) {
           free(cell_report[i]->noise_inter_report);
           cell_report[i]->noise_inter_report = NULL;
@@ -723,8 +724,8 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
   }
 
   if (ue_report != NULL) {
-    if (report_config->nr_ue > 0) {
-      for (i = 0; i < report_config->nr_ue; i++) {
+    if (n_ue > 0) {
+      for (i = 0; i < n_ue; i++) {
         if (ue_report[i]->bsr != NULL) {
           free(ue_report[i]->bsr);
           ue_report[i]->bsr = NULL;

openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h

@@ -52,7 +52,13 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
 int flexran_agent_mac_destroy_sf_trigger(Protocol__FlexranMessage *msg);
 
 /* Statistics reply protocol message constructor and destructor */
-int flexran_agent_mac_stats_reply(mid_t mod_id, const report_config_t *report_config, Protocol__FlexUeStatsReport **ue_report, Protocol__FlexCellStatsReport **cell_report);
+int flexran_agent_mac_stats_reply(mid_t mod_id,
+                                  Protocol__FlexUeStatsReport **ue_report,
+                                  int      n_ue,
+                                  uint32_t ue_flags,
+                                  Protocol__FlexCellStatsReport **cell_report,
+                                  int      n_cc,
+                                  uint32_t cc_flags);
 int flexran_agent_mac_destroy_stats_reply(Protocol__FlexStatsReply *reply);
 
 /* DL MAC scheduling decision protocol message constructor (empty command) and destructor */ 

openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.h

@@ -61,12 +61,6 @@ err_code_t flexran_agent_init_cont_mac_stats_update(mid_t mod_id);
 err_code_t flexran_agent_destroy_cont_mac_stats_update(mid_t mod_id);
 
 
-/*Enable/Disable the continuous stats update service for the MAC*/
-err_code_t flexran_agent_enable_cont_mac_stats_update(mid_t mod_id, xid_t xid,
-						  stats_request_config_t *stats_req);
-
-err_code_t flexran_agent_disable_cont_mac_stats_update(mid_t mod_id);
-
 Protocol__FlexranMessage * flexran_agent_generate_diff_mac_stats_report(Protocol__FlexranMessage *new_report,
 								    Protocol__FlexranMessage *old_report);
 

openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.c

@@ -65,25 +65,17 @@ void flexran_agent_pdcp_aggregate_stats(const mid_t mod_id,
 
 
 int flexran_agent_pdcp_stats_reply(mid_t mod_id,       
-				   const report_config_t *report_config,
-				   Protocol__FlexUeStatsReport **ue_report,
-				   Protocol__FlexCellStatsReport **cell_report) {
-  
-  
-  // Protocol__FlexHeader *header;
-  int i;
-  // int cc_id = 0;
- 
-  
-  /* Allocate memory for list of UE reports */
-  if (report_config->nr_ue > 0) {
+                                   Protocol__FlexUeStatsReport **ue_report,
+                                   int n_ue,
+                                   uint32_t ue_flags) {
+  if (n_ue > 0) {
     
-    for (i = 0; i < report_config->nr_ue; i++) {
-      const rnti_t rnti = report_config->ue_report_type[i].ue_rnti;
+    for (int i = 0; i < n_ue; i++) {
+      const rnti_t rnti = ue_report[i]->rnti;
       const uint16_t uid = flexran_get_pdcp_uid_from_rnti(mod_id, rnti);
 
       /* Check flag for creation of buffer status report */
-      if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_PDCP_STATS) {
+      if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_PDCP_STATS) {
 	
 	Protocol__FlexPdcpStats *pdcp_aggr_stats;
 	pdcp_aggr_stats = malloc(sizeof(Protocol__FlexPdcpStats));
@@ -129,12 +121,6 @@ int flexran_agent_pdcp_stats_reply(mid_t mod_id,
   
  error:
   LOG_W(FLEXRAN_AGENT, "Can't allocate PDCP stats\n");
-  
-  /* if (cell_report != NULL)
-        free(cell_report);
-  if (ue_report != NULL)
-        free(ue_report);
-  */
   return -1;
 }
 

openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.h

@@ -48,9 +48,9 @@
 
 /* Send to the controller all the pdcp stat updates that occured during this subframe*/
 int flexran_agent_pdcp_stats_reply(mid_t mod_id,       
-          const report_config_t *report_config,
-           Protocol__FlexUeStatsReport **ue_report,
-           Protocol__FlexCellStatsReport **cell_report);
+                                   Protocol__FlexUeStatsReport **ue_report,
+                                   int n_ue,
+                                   uint32_t ue_flags);
 int flexran_agent_pdcp_destroy_stats_reply(Protocol__FlexStatsReply *reply);
 
 /* Get the stats from RAN API and aggregate them per USER*/

openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c

@@ -380,18 +380,15 @@ void flexran_trigger_rrc_measurements (mid_t mod_id, LTE_MeasResults_t*  measRes
 
 
 int flexran_agent_rrc_stats_reply(mid_t mod_id,       
-          const report_config_t *report_config,
-           Protocol__FlexUeStatsReport **ue_report,
-           Protocol__FlexCellStatsReport **cell_report) {
-
-  if (report_config->nr_ue > 0) {
-    rnti_t rntis[report_config->nr_ue];
-    flexran_get_rrc_rnti_list(mod_id, rntis, report_config->nr_ue);
-    for (int i = 0; i < report_config->nr_ue; i++) {
-      const rnti_t rnti = rntis[i];
+                                  Protocol__FlexUeStatsReport **ue_report,
+                                  int n_ue,
+                                  uint32_t ue_flags) {
+  if (n_ue > 0) {
+    for (int i = 0; i < n_ue; i++) {
+      const rnti_t rnti = ue_report[i]->rnti;
       
       /* Check flag for creation of buffer status report */
-      if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_RRC_MEASUREMENTS) {
+      if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_RRC_MEASUREMENTS) {
       	
         /*Source cell EUTRA Measurements*/
         Protocol__FlexRrcMeasurements *rrc_measurements;
@@ -531,7 +528,7 @@ int flexran_agent_rrc_stats_reply(mid_t mod_id,
   }
   return 0;
  error:
-  for (int i = 0; i < report_config->nr_ue; i++) {
+  for (int i = 0; i < n_ue; i++) {
     if (ue_report[i]->rrc_measurements && ue_report[i]->rrc_measurements->neigh_meas != NULL) {
       for (int j = 0; j < ue_report[i]->rrc_measurements->neigh_meas->n_eutra_meas; j++) {
         free(ue_report[i]->rrc_measurements->neigh_meas->eutra_meas[j]);
@@ -540,8 +537,6 @@ int flexran_agent_rrc_stats_reply(mid_t mod_id,
     }
   }
 
-  if (cell_report != NULL)
-    free(cell_report);
   if (ue_report != NULL)
     free(ue_report);
   return -1;
@@ -575,20 +570,18 @@ int flexran_agent_rrc_destroy_stats_reply(Protocol__FlexStatsReply *reply)
 }
 
 int flexran_agent_rrc_gtp_stats_reply(mid_t mod_id,
-      const report_config_t *report_config,
-      Protocol__FlexUeStatsReport **ue_report,
-      Protocol__FlexCellStatsReport **cell_report) {
+                                      Protocol__FlexUeStatsReport **ue_report,
+                                      int n_ue,
+                                      uint32_t ue_flags) {
   /* This function fills the GTP part of the statistics. The necessary
    * information is, for our purposes, completely maintained in the RRC layer.
    * It would be possible to add a GTP module that handles this, though. */
-  if (report_config->nr_ue > 0) {
-    rnti_t rntis[report_config->nr_ue];
-    flexran_get_rrc_rnti_list(mod_id, rntis, report_config->nr_ue);
-    for (int i = 0; i < report_config->nr_ue; i++) {
-      const rnti_t rnti = rntis[i];
+  if (n_ue > 0) {
+    for (int i = 0; i < n_ue; i++) {
+      const rnti_t rnti = ue_report[i]->rnti;
 
       /* Check flag for creation of buffer status report */
-      if (report_config->ue_report_type[i].ue_report_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_GTP_STATS) {
+      if (ue_flags & PROTOCOL__FLEX_UE_STATS_TYPE__FLUST_GTP_STATS) {
 
         /* get number of rabs for this UE */
         const int num_e_rab = flexran_agent_rrc_gtp_num_e_rab(mod_id, rnti);
@@ -618,7 +611,7 @@ int flexran_agent_rrc_gtp_stats_reply(mid_t mod_id,
   }
   return 0;
 error:
-  for (int i = 0; i < report_config->nr_ue; i++) {
+  for (int i = 0; i < n_ue; i++) {
     if (!ue_report[i]->gtp_stats) continue;
     for (int r = 0; r < ue_report[i]->n_gtp_stats; ++r) {
       if (ue_report[i]->gtp_stats[r]) {

openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.h

@@ -57,12 +57,18 @@ int flexran_agent_destroy_ue_state_change(Protocol__FlexranMessage *msg);
 void flexran_trigger_rrc_measurements (mid_t mod_id, LTE_MeasResults_t *);
 
 /* Statistics reply protocol message constructor and destructor */
-int flexran_agent_rrc_stats_reply(mid_t mod_id, const report_config_t *report_config, Protocol__FlexUeStatsReport **ue_report, Protocol__FlexCellStatsReport **cell_report);
+int flexran_agent_rrc_stats_reply(mid_t mod_id,
+                                  Protocol__FlexUeStatsReport **ue_report,
+                                  int n_ue,
+                                  uint32_t ue_flags);
 int flexran_agent_rrc_destroy_stats_reply(Protocol__FlexStatsReply *reply);
 
 /* Statistic reply for GTP statistics which OAI stores also in the RRC layer.
  * This might be moved to a separate GTP module in the future */
-int flexran_agent_rrc_gtp_stats_reply(mid_t mod_id, const report_config_t *report_config, Protocol__FlexUeStatsReport **ue_report, Protocol__FlexCellStatsReport **cell_report);
+int flexran_agent_rrc_gtp_stats_reply(mid_t mod_id,
+                                      Protocol__FlexUeStatsReport **ue_report,
+                                      int n_ue,
+                                      uint32_t ue_flags);
 int flexran_agent_rrc_gtp_destroy_stats_reply(Protocol__FlexStatsReply *reply);
 
 /* Fill the RRC part of a ue_config message */

openair2/ENB_APP/flexran_agent.c

@@ -202,8 +202,6 @@ int flexran_agent_start(mid_t mod_id)
    *flexran_agent_register_channel(mod_id, channel, FLEXRAN_AGENT_MAC);
    */
 
-  /*Initialize the continuous stats update mechanism*/
-  flexran_agent_init_cont_stats_update(mod_id);
   pthread_t t; 
   threadCreate(&t, receive_thread, flexran, "flexran", -1, OAI_PRIORITY_RT);
 

openair2/ENB_APP/flexran_agent_common.h

@@ -153,21 +153,17 @@ Protocol__FlexranMessage* flexran_agent_handle_message (mid_t mod_id,
 Protocol__FlexranMessage *flexran_agent_handle_timed_task(void *args);
 
 /*Top level Statistics hanlder*/
+Protocol__FlexranMessage *flexran_agent_send_stats_reply(void *args);
 int flexran_agent_handle_stats(mid_t mod_id, const void *params, Protocol__FlexranMessage **msg);
 
 /* Function to be used to handle reply message . */
-int flexran_agent_stats_reply(mid_t enb_id, xid_t xid, const report_config_t *report_config, Protocol__FlexranMessage **msg);
+int flexran_agent_stats_reply(mid_t enb_id, xid_t xid, const Protocol__FlexStatsRequest *stats_req, Protocol__FlexranMessage **msg);
 int flexran_agent_destroy_stats_reply(Protocol__FlexranMessage *msg);
 
 /* Top level Statistics request protocol message constructor and destructor */
-int flexran_agent_stats_request(mid_t mod_id, xid_t xid, const stats_request_config_t *report_config, Protocol__FlexranMessage **msg);
+//int flexran_agent_stats_request(mid_t mod_id, xid_t xid, const stats_request_config_t *report_config, Protocol__FlexranMessage **msg);
 int flexran_agent_destroy_stats_request(Protocol__FlexranMessage *msg);
 
-err_code_t flexran_agent_init_cont_stats_update(mid_t mod_id);
-
-err_code_t flexran_agent_enable_cont_stats_update(mid_t mod_id, xid_t xid, stats_request_config_t *stats_req) ;
-err_code_t flexran_agent_disable_cont_stats_update(mid_t mod_id);
-
 /* Handle a received eNB config reply message as an "order" to reconfigure. It
  * does not come as a reconfiguration message as this is a "structured"
  * ProtoBuf message (as opposed to "unstructured" YAML). There is no destructor

openair2/ENB_APP/flexran_agent_defs.h

@@ -193,38 +193,4 @@ typedef struct {
 
 } agent_reconf_rrc;
 
-
-/* These structs will be used to give
-   instructions for the type of stats reports
-   we need to create */
-
-
-typedef struct {
-  uint16_t ue_rnti;
-  uint32_t ue_report_flags; /* Indicates the report elements
-             required for this UE id. See
-             FlexRAN specification 1.2.4.2 */
-} ue_report_type_t;
-
-typedef struct {
-  uint16_t cc_id;
-  uint32_t cc_report_flags; /* Indicates the report elements
-            required for this CC index. See
-            FlexRAN specification 1.2.4.3 */
-} cc_report_type_t;
-
-typedef struct {
-  int nr_ue;
-  ue_report_type_t *ue_report_type;
-  int nr_cc;
-  cc_report_type_t *cc_report_type;
-} report_config_t;
-
-typedef struct stats_request_config_s{
-  uint8_t report_type;
-  uint8_t report_frequency;
-  uint16_t period; /*In number of subframes*/
-  report_config_t *config;
-} stats_request_config_t;
-
 #endif 

openair2/ENB_APP/flexran_agent_timer.c

@@ -58,48 +58,48 @@ int flexran_agent_compare_timer(struct flexran_agent_timer_element_s *a, struct
   return 0;
 }
 
-err_code_t flexran_agent_create_timer(uint32_t interval_sec,
-                                      uint32_t interval_usec,
-                                      agent_id_t     agent_id,
-                                      instance_t     instance,
+err_code_t flexran_agent_create_timer(mid_t    mod_id,
+                                      uint32_t sf,
                                       uint32_t timer_type,
-                                      xid_t xid,
+                                      xid_t    xid,
                                       flexran_agent_timer_callback_t cb,
-                                      void    *timer_args,
-                                      long *timer_id) {
-  struct flexran_agent_timer_element_s *e = calloc(1, sizeof(*e));
-  DevAssert(e != NULL);
-  //uint32_t timer_id;
+                                      void    *timer_args) {
   int ret=-1;
 
-  if ((interval_sec == 0) && (interval_usec == 0 )) {
-    free(e);
+  if (sf <= 0)
     return TIMER_NULL;
-  }
 
-  if (timer_type >= FLEXRAN_AGENT_TIMER_TYPE_MAX) {
-    free(e);
+  if (timer_type >= FLEXRAN_AGENT_TIMER_TYPE_MAX)
     return TIMER_TYPE_INVALIDE;
-  }
 
+  uint32_t interval_usec = sf * 1000;
+  uint32_t interval_sec = 0;
+  if (interval_usec >= 1000 * 1000) {
+    interval_sec = interval_usec / (1000 * 1000);
+    interval_usec = interval_usec % (1000 * 1000);
+  }
+  struct flexran_agent_timer_element_s *e = calloc(1, sizeof(*e));
+  DevAssert(e != NULL);
+  long timer_id = 0;
+  AssertFatal(e, "cannot allocate memory for FlexRAN timer!\n");
   if (timer_type  ==   FLEXRAN_AGENT_TIMER_TYPE_ONESHOT) {
     ret = timer_setup(interval_sec,
                       interval_usec,
                       TASK_FLEXRAN_AGENT,
-                      instance,
+                      mod_id,
                       TIMER_ONE_SHOT,
                       timer_args,
-                      timer_id);
+                      &timer_id);
 
     e->type = TIMER_ONE_SHOT;
   } else if (timer_type  ==   FLEXRAN_AGENT_TIMER_TYPE_PERIODIC ) {
     ret = timer_setup(interval_sec,
                       interval_usec,
                       TASK_FLEXRAN_AGENT,
-                      instance,
+                      mod_id,
                       TIMER_PERIODIC,
                       timer_args,
-                      timer_id);
+                      &timer_id);
     e->type = TIMER_PERIODIC;
   }
 
@@ -108,10 +108,10 @@ err_code_t flexran_agent_create_timer(uint32_t interval_sec,
     return TIMER_SETUP_FAILED;
   }
 
-  e->agent_id = agent_id;
-  e->instance = instance;
+  e->agent_id = mod_id;
+  e->instance = mod_id;
   e->state = FLEXRAN_AGENT_TIMER_STATE_ACTIVE;
-  e->timer_id = *timer_id;
+  e->timer_id = timer_id;
   e->xid = xid;
   e->timer_args = timer_args;
   e->cb = cb;

openair2/ENB_APP/flexran_agent_timer.h

@@ -89,17 +89,13 @@ typedef struct flexran_agent_timer_instance_s{
 
 err_code_t flexran_agent_init_timer(void);
 
-/* Create a timer for some agent related event with id xid. Will store the id 
-   of the generated timer in timer_id */
-err_code_t flexran_agent_create_timer(uint32_t interval_sec,
-				  uint32_t interval_usec,
-				  agent_id_t     agent_id,
-				  instance_t     instance,
-				  uint32_t timer_type,
-				  xid_t xid,
-				  flexran_agent_timer_callback_t cb,
-				  void*    timer_args,
-				  long *timer_id);
+/* Create a timer for some agent related event with id xid. */
+err_code_t flexran_agent_create_timer(mid_t    mod_id,
+                                      uint32_t sf,
+                                      uint32_t timer_type,
+                                      xid_t    xid,
+                                      flexran_agent_timer_callback_t cb,
+                                      void    *timer_args);
 
 /* Destroy all existing timers */
 err_code_t flexran_agent_destroy_timers(void);