Skip to content
Snippets Groups Projects
Commit bc53a9af authored by Thomas Laurent's avatar Thomas Laurent
Browse files

fix number of parallel slots processing limit

parent 2da6fb8e
No related branches found
No related tags found
9 merge requests!1757Draft: Use pMAX value in configuration file, instead of hardcoded '23' in asn1_msg.c,!1493fix DL arq errors in UE,!1093Issue in generating NR PRACH for High Speed case,!1074PBCH test case support for non-zero bchpyload,!918Develop nfapi,!847Nr vcd,!782Oai ubuntu docker,!730Nr rlc,!585Test x310
...@@ -422,11 +422,6 @@ function main() { ...@@ -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
......
...@@ -697,13 +697,14 @@ void *UE_thread(void *arg) { ...@@ -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) { ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment