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

clean up dlsch decoding

Browse Source
This commit is contained in:
Hongzhi Wang
2019-07-18 10:25:58 +02:00
parent 973a0795b4
commit 660278a6d8
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+1 -11
View File
@@ -868,21 +868,15 @@ uint32_t nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
opp_enabled=1; opp_enabled=1;
if (harq_process->C>1) { if (harq_process->C>1) {
for (int nb_seg =1 ; nb_seg<harq_process->C; nb_seg++){ for (int nb_seg =1 ; nb_seg<harq_process->C; nb_seg++){
printf("mthread pool C >1\n");
displayList(&Tpool->incomingFifo);
if ( (res=tryPullTpool(&nf, Tpool)) != NULL ) { if ( (res=tryPullTpool(&nf, Tpool)) != NULL ) {
printf("mthread pool non null\n");
pushNotifiedFIFO_nothreadSafe(&freeBlocks,res); pushNotifiedFIFO_nothreadSafe(&freeBlocks,res);
} }
printf("mthread after push\n");
displayList(&freeBlocks);
AssertFatal((msgToPush=pullNotifiedFIFO_nothreadSafe(&freeBlocks)) != NULL,"chained list failure"); AssertFatal((msgToPush=pullNotifiedFIFO_nothreadSafe(&freeBlocks)) != NULL,"chained list failure");
nr_rxtx_thread_data_t *curMsg=(nr_rxtx_thread_data_t *)NotifiedFifoData(msgToPush); nr_rxtx_thread_data_t *curMsg=(nr_rxtx_thread_data_t *)NotifiedFifoData(msgToPush);
curMsg->UE=phy_vars_ue; curMsg->UE=phy_vars_ue;
memset(&curMsg->proc, 0, sizeof(curMsg->proc)); memset(&curMsg->proc, 0, sizeof(curMsg->proc));
printf("mthread frame %d slot %d\n", proc->frame_rx, proc->nr_tti_rx);
curMsg->proc.frame_rx = proc->frame_rx; curMsg->proc.frame_rx = proc->frame_rx;
curMsg->proc.nr_tti_rx = proc->nr_tti_rx; curMsg->proc.nr_tti_rx = proc->nr_tti_rx;
curMsg->proc.num_seg = nb_seg; curMsg->proc.num_seg = nb_seg;
@@ -891,12 +885,9 @@ uint32_t nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
curMsg->proc.harq_pid=harq_pid; curMsg->proc.harq_pid=harq_pid;
curMsg->proc.llr8_flag = llr8_flag; curMsg->proc.llr8_flag = llr8_flag;
printf("mthread after pull");
msgToPush->key=nb_seg; msgToPush->key=nb_seg;
pushTpool(Tpool, msgToPush); pushTpool(Tpool, msgToPush);
printf("mthread after pushTpool\n");
displayList(&Tpool->incomingFifo);
/*Qm= harq_process->Qm; /*Qm= harq_process->Qm;
Nl=harq_process->Nl; Nl=harq_process->Nl;
r_thread = harq_process->C/2-1; r_thread = harq_process->C/2-1;
@@ -1666,7 +1657,6 @@ void *dlsch_thread(void *arg) {
while (nbDlProcessing >= RX_NB_TH_DL) { while (nbDlProcessing >= RX_NB_TH_DL) {
if ( (res=tryPullTpool(&nf, Tpool)) != NULL ) { if ( (res=tryPullTpool(&nf, Tpool)) != NULL ) {
printf("dlsch thread trypull non null\n");
nr_rxtx_thread_data_t *tmp=(nr_rxtx_thread_data_t *)res->msgData; nr_rxtx_thread_data_t *tmp=(nr_rxtx_thread_data_t *)res->msgData;
nbDlProcessing--; nbDlProcessing--;
pushNotifiedFIFO_nothreadSafe(&freeBlocks,res); pushNotifiedFIFO_nothreadSafe(&freeBlocks,res);
openair1/SCHED_NR_UE/defs.h
+1 -1
View File
@@ -44,7 +44,7 @@
#define OPENAIR_THREAD_STACK_SIZE PTHREAD_STACK_MIN //4096 //RTL_PTHREAD_STACK_MIN*6 #define OPENAIR_THREAD_STACK_SIZE PTHREAD_STACK_MIN //4096 //RTL_PTHREAD_STACK_MIN*6
//#define DLC_THREAD_STACK_SIZE 4096 //DLC stack size //#define DLC_THREAD_STACK_SIZE 4096 //DLC stack size
//#define UE_SLOT_PARALLELISATION //#define UE_SLOT_PARALLELISATION
#define UE_DLSCH_PARALLELISATION// //#define UE_DLSCH_PARALLELISATION
/*enum openair_SCHED_STATUS { /*enum openair_SCHED_STATUS {
openair_SCHED_STOPPED=1, openair_SCHED_STOPPED=1,