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

fix number of parallel slots processing limit

Browse Source
This commit is contained in:
laurent
2019-04-09 10:17:12 +02:00
parent 2da6fb8efb
commit bc53a9afee
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/build_oai
-5
View File
@@ -422,11 +422,6 @@ function main() {
CMAKE_CMD="$CMAKE_CMD .." CMAKE_CMD="$CMAKE_CMD .."
echo_info "CMAKE_CMD=$CMAKE_CMD" echo_info "CMAKE_CMD=$CMAKE_CMD"
if [ "$eNB" = "1" -o "$gNB" = "1" ] && [ "$UE" = "1" -o "$nrUE" = "1" ]; then
echo_error "Cannot build UE/nrUE and eNB/gNB on one build_oai execution"
echo_error "use 2 build_oai invocations"
exit
fi
######################################################### #########################################################
# check validity of HW and TP parameters for eNB / gNB # check validity of HW and TP parameters for eNB / gNB
executables/nr-ue.c
+9 -8
View File
@@ -697,13 +697,14 @@ void *UE_thread(void *arg) {
decoded_frame_rx=tmp->proc.decoded_frame_rx; decoded_frame_rx=tmp->proc.decoded_frame_rx;
} }
while (nbSlotProcessing >= RX_NB_TH && (res=tryPullTpool(&nf, Tpool)) != NULL ) { while (nbSlotProcessing >= RX_NB_TH ) {
nbSlotProcessing--; if ( (res=tryPullTpool(&nf, Tpool)) != NULL ) {
processingData_t *tmp=(processingData_t *)res->msgData; nbSlotProcessing--;
processingData_t *tmp=(processingData_t *)res->msgData;
if (tmp->proc.decoded_frame_rx != -1)
decoded_frame_rx=tmp->proc.decoded_frame_rx; if (tmp->proc.decoded_frame_rx != -1)
decoded_frame_rx=tmp->proc.decoded_frame_rx;
}
usleep(200); usleep(200);
} }
@@ -711,7 +712,7 @@ void *UE_thread(void *arg) {
((decoded_frame_rx+1) % MAX_FRAME_NUMBER) != proc->frame_rx ) ((decoded_frame_rx+1) % MAX_FRAME_NUMBER) != proc->frame_rx )
LOG_D(PHY,"Decoded frame index (%d) is not compatible with current context (%d), UE should go back to synch mode\n", LOG_D(PHY,"Decoded frame index (%d) is not compatible with current context (%d), UE should go back to synch mode\n",
decoded_frame_rx, proc->frame_rx); decoded_frame_rx, proc->frame_rx);
nbSlotProcessing++;
pushTpool(Tpool, processingMsg[thread_idx]); pushTpool(Tpool, processingMsg[thread_idx]);
} // while !oai_exit } // while !oai_exit