maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FlexRAN RAN API: extend scheduler set&get functions

Browse Source 
- setter & getter have been renamed
- setter sets scheduler name and links to the corresponding function
- it also returns whether it succeeded (whether the scheduler callback is
  non-null)
- it performs a strdup on the scheduler name
- the remove function free the scheduler function name
This commit is contained in:
Robert Schmidt
2018-09-03 18:10:28 +02:00
parent 21f6609472
commit 0778481f75
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/ENB_APP/flexran_agent_ran_api.c
+15 -10
View File
@@ -26,6 +26,7 @@
* \version 0.1 * \version 0.1
*/ */
#include <dlfcn.h>
#include "flexran_agent_ran_api.h" #include "flexran_agent_ran_api.h"
static inline int phy_is_present(mid_t mod_id, uint8_t cc_id) static inline int phy_is_present(mid_t mod_id, uint8_t cc_id)
@@ -1483,6 +1484,7 @@ int flexran_remove_dl_slice(mid_t mod_id, int slice_idx)
slice_info_t *sli = &RC.mac[mod_id]->slice_info; slice_info_t *sli = &RC.mac[mod_id]->slice_info;
if (sli->n_dl <= 1) return -1; if (sli->n_dl <= 1) return -1;
if (sli->dl[slice_idx].sched_name) free(sli->dl[slice_idx].sched_name);
--sli->n_dl; --sli->n_dl;
/* move last element to the position of the removed one */ /* move last element to the position of the removed one */
if (slice_idx != sli->n_dl) if (slice_idx != sli->n_dl)
@@ -1701,16 +1703,17 @@ void flexran_set_dl_slice_accounting_policy(mid_t mod_id, int slice_idx, Protoco
} }
} }
char *flexran_get_dl_slice_scheduler_name(mid_t mod_id, int slice_idx) char *flexran_get_dl_slice_scheduler(mid_t mod_id, int slice_idx)
{ {
if (!mac_is_present(mod_id)) return NULL; if (!mac_is_present(mod_id)) return NULL;
return RC.mac[mod_id]->slice_info.dl[slice_idx].sched_name; return RC.mac[mod_id]->slice_info.dl[slice_idx].sched_name;
} }
void flexran_set_dl_slice_scheduler_name(mid_t mod_id, int slice_idx, char *name) int flexran_set_dl_slice_scheduler(mid_t mod_id, int slice_idx, char *name)
{ {
if (!mac_is_present(mod_id)) return; if (!mac_is_present(mod_id)) return 0;
RC.mac[mod_id]->slice_info.dl[slice_idx].sched_name = name; RC.mac[mod_id]->slice_info.dl[slice_idx].sched_name = strdup(name);
RC.mac[mod_id]->slice_info.dl[slice_idx].update_sched = 1; RC.mac[mod_id]->slice_info.dl[slice_idx].sched_cb = dlsym(NULL, name);
return RC.mac[mod_id]->slice_info.dl[slice_idx].sched_cb != NULL;
} }
int flexran_create_ul_slice(mid_t mod_id, slice_id_t slice_id, int slice_default_values_idx) int flexran_create_ul_slice(mid_t mod_id, slice_id_t slice_id, int slice_default_values_idx)
@@ -1760,6 +1763,7 @@ int flexran_remove_ul_slice(mid_t mod_id, int slice_idx)
slice_info_t *sli = &RC.mac[mod_id]->slice_info; slice_info_t *sli = &RC.mac[mod_id]->slice_info;
if (sli->n_ul <= 1) return -1; if (sli->n_ul <= 1) return -1;
if (sli->dl[slice_idx].sched_name) free(sli->dl[slice_idx].sched_name);
--sli->n_ul; --sli->n_ul;
/* move last element to the position of the removed one */ /* move last element to the position of the removed one */
if (slice_idx != sli->n_ul) if (slice_idx != sli->n_ul)
@@ -1832,14 +1836,15 @@ void flexran_set_ul_slice_maxmcs(mid_t mod_id, int slice_idx, int maxmcs)
RC.mac[mod_id]->slice_info.ul[slice_idx].maxmcs = maxmcs; RC.mac[mod_id]->slice_info.ul[slice_idx].maxmcs = maxmcs;
} }
char *flexran_get_ul_slice_scheduler_name(mid_t mod_id, int slice_idx) char *flexran_get_ul_slice_scheduler(mid_t mod_id, int slice_idx)
{ {
if (!mac_is_present(mod_id)) return NULL; if (!mac_is_present(mod_id)) return NULL;
return RC.mac[mod_id]->slice_info.ul[slice_idx].sched_name; return RC.mac[mod_id]->slice_info.ul[slice_idx].sched_name;
} }
void flexran_set_ul_slice_scheduler_name(mid_t mod_id, int slice_idx, char *name) int flexran_set_ul_slice_scheduler(mid_t mod_id, int slice_idx, char *name)
{ {
if (!mac_is_present(mod_id)) return; if (!mac_is_present(mod_id)) return 0;
RC.mac[mod_id]->slice_info.ul[slice_idx].sched_name = name; RC.mac[mod_id]->slice_info.ul[slice_idx].sched_name = strdup(name);
RC.mac[mod_id]->slice_info.ul[slice_idx].update_sched = 1; RC.mac[mod_id]->slice_info.ul[slice_idx].sched_cb = dlsym(NULL, name);
return RC.mac[mod_id]->slice_info.ul[slice_idx].sched_cb != NULL;
} }
openair2/ENB_APP/flexran_agent_ran_api.h
+4 -4
View File
@@ -589,9 +589,9 @@ Protocol__FlexDlAccountingPolicy flexran_get_dl_slice_accounting_policy(mid_t mo
void flexran_set_dl_slice_accounting_policy(mid_t mod_id, int slice_idx, Protocol__FlexDlAccountingPolicy accounting); void flexran_set_dl_slice_accounting_policy(mid_t mod_id, int slice_idx, Protocol__FlexDlAccountingPolicy accounting);
/* Get the scheduler name for a slice in DL */ /* Get the scheduler name for a slice in DL */
char *flexran_get_dl_slice_scheduler_name(mid_t mod_id, int slice_idx); char *flexran_get_dl_slice_scheduler(mid_t mod_id, int slice_idx);
/* Set the scheduler name for a slice in DL */ /* Set the scheduler name for a slice in DL */
void flexran_set_dl_slice_scheduler_name(mid_t mod_id, int slice_idx, char *name); int flexran_set_dl_slice_scheduler(mid_t mod_id, int slice_idx, char *name);
/* Get the number of slices in UL */ /* Get the number of slices in UL */
int flexran_get_num_ul_slices(mid_t mod_id); int flexran_get_num_ul_slices(mid_t mod_id);
@@ -653,6 +653,6 @@ void flexran_set_ul_slice_maxmcs(mid_t mod_id, int slice_idx, int maxmcs);
/*void flexran_get_ul_slice_accounting_policy(mid_t mod_id, int slice_idx, Protocol__UlAccountingPolicy accountin);*/ /*void flexran_get_ul_slice_accounting_policy(mid_t mod_id, int slice_idx, Protocol__UlAccountingPolicy accountin);*/
/* Get the scheduler name for a slice in UL */ /* Get the scheduler name for a slice in UL */
char *flexran_get_ul_slice_scheduler_name(mid_t mod_id, int slice_idx); char *flexran_get_ul_slice_scheduler(mid_t mod_id, int slice_idx);
/* Set the scheduler name for a slice in UL */ /* Set the scheduler name for a slice in UL */
void flexran_set_ul_slice_scheduler_name(mid_t mod_id, int slice_idx, char *name); int flexran_set_ul_slice_scheduler(mid_t mod_id, int slice_idx, char *name);