Commit e8f4e4e0 authored by Xenofon Foukas's avatar Xenofon Foukas

Separated control from data plane in MAC agent scheduler

parent 3d3c0c7c
...@@ -1010,6 +1010,7 @@ set (MAC_SRC ...@@ -1010,6 +1010,7 @@ set (MAC_SRC
${MAC_DIR}/pre_processor.c ${MAC_DIR}/pre_processor.c
${MAC_DIR}/config.c ${MAC_DIR}/config.c
${MAC_DIR}/eNB_agent_scheduler_dlsch_ue.c ${MAC_DIR}/eNB_agent_scheduler_dlsch_ue.c
${MAC_DIR}/eNB_agent_scheduler_dataplane.c
) )
set (ENB_APP_SRC set (ENB_APP_SRC
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
//Agent-related headers //Agent-related headers
#include "ENB_APP/enb_agent_extern.h" #include "ENB_APP/enb_agent_extern.h"
#include "ENB_APP/enb_agent_mac.h" #include "ENB_APP/enb_agent_mac.h"
#include "LAYER2/MAC/enb_agent_mac_proto.h"
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
# include "intertask_interface.h" # include "intertask_interface.h"
...@@ -273,7 +274,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -273,7 +274,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -322,7 +323,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -322,7 +323,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -353,7 +354,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -353,7 +354,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -390,7 +391,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -390,7 +391,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -419,7 +420,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -419,7 +420,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -463,7 +464,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -463,7 +464,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -494,7 +495,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -494,7 +495,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -531,7 +532,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -531,7 +532,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -559,7 +560,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -559,7 +560,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -612,7 +613,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -612,7 +613,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -637,7 +638,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -637,7 +638,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -665,7 +666,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -665,7 +666,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -699,7 +700,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -699,7 +700,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -723,7 +724,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -723,7 +724,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -751,7 +752,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -751,7 +752,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -790,7 +791,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -790,7 +791,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -818,7 +819,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -818,7 +819,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -851,7 +852,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -851,7 +852,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -877,7 +878,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -877,7 +878,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -903,7 +904,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -903,7 +904,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -929,7 +930,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -929,7 +930,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
...@@ -957,7 +958,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -957,7 +958,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status, mbsfn_status,
msg); msg);
apply_scheduling_decisions(module_idP, apply_dl_scheduling_decisions(module_idP,
frameP, frameP,
subframeP, subframeP,
mbsfn_status, mbsfn_status,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment