Skip to content

O
OpenXG-RAN
Commit a373ab3a authored by knopp's avatar knopp
Browse files
Options

proper scheduling priorities for SCHED_DEADLINE in lte-ue.c 

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7701 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 54593973
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 35 deletions
targets/RT/USER/lte-ue.c
View file @ a373ab3a
...@@ -436,6 +436,13 @@ static void *UE_thread_synch(void *arg) ...@@ -436,6 +436,13 @@ static void *UE_thread_synch(void *arg)
} }
else { else {
UE->is_synchronized = 1; UE->is_synchronized = 1;
if( UE->mode == rx_dump_frame ){
write_output("rxsig_frame0.m","rxsf0", &UE->lte_ue_common_vars.rxdata[0][0],10*UE->lte_frame_parms.samples_per_tti,1,1);
LOG_I(PHY,"Dummping Frame ... bye bye \n");
exit(0);
}
#ifndef EXMIMO #ifndef EXMIMO
UE->slot_rx = 0; UE->slot_rx = 0;
UE->slot_tx = 4; UE->slot_tx = 4;
...@@ -572,7 +579,7 @@ static void *UE_thread_tx(void *arg) ...@@ -572,7 +579,7 @@ static void *UE_thread_tx(void *arg)
attr.size = sizeof(attr); attr.size = sizeof(attr);
attr.sched_flags = 0; attr.sched_flags = 0;
attr.sched_nice = 0; attr.sched_nice = 0;
attr.sched_priority = sched_get_priority_max(SCHED_DEADLINE)-1; attr.sched_priority = 0;
/* This creates a 1ms reservation every 10ms period*/ /* This creates a 1ms reservation every 10ms period*/
attr.sched_policy = SCHED_DEADLINE; attr.sched_policy = SCHED_DEADLINE;
...@@ -721,7 +728,7 @@ static void *UE_thread_rx(void *arg) ...@@ -721,7 +728,7 @@ static void *UE_thread_rx(void *arg)
attr.size = sizeof(attr); attr.size = sizeof(attr);
attr.sched_flags = 0; attr.sched_flags = 0;
attr.sched_nice = 0; attr.sched_nice = 0;
attr.sched_priority = sched_get_priority_max(SCHED_DEADLINE)-1; attr.sched_priority = 0;
// This creates a .5ms reservation every 1ms period // This creates a .5ms reservation every 1ms period
attr.sched_policy = SCHED_DEADLINE; attr.sched_policy = SCHED_DEADLINE;
...@@ -888,7 +895,6 @@ static void *UE_thread_rx(void *arg) ...@@ -888,7 +895,6 @@ static void *UE_thread_rx(void *arg)
} }
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_RX, 0 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_RX, 0 );
if (pthread_mutex_lock(&UE->mutex_rx) != 0) { if (pthread_mutex_lock(&UE->mutex_rx) != 0) {
LOG_E( PHY, "[SCHED][UE] error locking mutex for UE RX\n" ); LOG_E( PHY, "[SCHED][UE] error locking mutex for UE RX\n" );
exit_fun("noting to add"); exit_fun("noting to add");
...@@ -962,7 +968,7 @@ void *UE_thread(void *arg) ...@@ -962,7 +968,7 @@ void *UE_thread(void *arg)
attr.size = sizeof(attr); attr.size = sizeof(attr);
attr.sched_flags = 0; attr.sched_flags = 0;
attr.sched_nice = 0; attr.sched_nice = 0;
attr.sched_priority = sched_get_priority_max(SCHED_DEADLINE); attr.sched_priority = 0;//sched_get_priority_max(SCHED_DEADLINE);
// This creates a .5 ms reservation // This creates a .5 ms reservation
attr.sched_policy = SCHED_DEADLINE; attr.sched_policy = SCHED_DEADLINE;
...@@ -1005,9 +1011,11 @@ void *UE_thread(void *arg) ...@@ -1005,9 +1011,11 @@ void *UE_thread(void *arg)
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_HW_FRAME, frame ); VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_HW_FRAME, frame );
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_DUMMY_DUMP, dummy_dump ); VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_DUMMY_DUMP, dummy_dump );
while (rxpos < (1+hw_subframe)*UE->lte_frame_parms.samples_per_tti) { while (rxpos < (1+hw_subframe)*UE->lte_frame_parms.samples_per_tti) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 );
#ifndef USRP_DEBUG #ifndef USRP_DEBUG
DevAssert( UE->lte_frame_parms.nb_antennas_rx <= 2 ); DevAssert( UE->lte_frame_parms.nb_antennas_rx <= 2 );
...@@ -1019,6 +1027,7 @@ void *UE_thread(void *arg) ...@@ -1019,6 +1027,7 @@ void *UE_thread(void *arg)
/* if (dummy_dump == 0) /* if (dummy_dump == 0)
printf("writing %d samples to %d (first_rx %d)\n",spp - ((first_rx==1) ? rx_off_diff : 0),rxpos,first_rx); printf("writing %d samples to %d (first_rx %d)\n",spp - ((first_rx==1) ? rx_off_diff : 0),rxpos,first_rx);
*/ */
if (UE->mode != loop_through_memory) {
rxs = openair0.trx_read_func(&openair0, rxs = openair0.trx_read_func(&openair0,
&timestamp, &timestamp,
rxp, rxp,
...@@ -1029,6 +1038,7 @@ void *UE_thread(void *arg) ...@@ -1029,6 +1038,7 @@ void *UE_thread(void *arg)
exit_fun("problem in rx"); exit_fun("problem in rx");
return &UE_thread_retval; return &UE_thread_retval;
} }
}
if (rx_off_diff !=0) if (rx_off_diff !=0)
LOG_D(PHY,"frame %d, rx_offset %d, rx_off_diff %d\n",UE->frame_rx,UE->rx_offset,rx_off_diff); LOG_D(PHY,"frame %d, rx_offset %d, rx_off_diff %d\n",UE->frame_rx,UE->rx_offset,rx_off_diff);
...@@ -1036,7 +1046,7 @@ void *UE_thread(void *arg) ...@@ -1036,7 +1046,7 @@ void *UE_thread(void *arg)
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 );
// Transmit TX buffer based on timestamp from RX // Transmit TX buffer based on timestamp from RX
if (tx_enabled) { if ((tx_enabled) && (UE->mode!=loop_through_memory)) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1 );
DevAssert( UE->lte_frame_parms.nb_antennas_tx <= 2 ); DevAssert( UE->lte_frame_parms.nb_antennas_tx <= 2 );
...@@ -1054,7 +1064,8 @@ void *UE_thread(void *arg) ...@@ -1054,7 +1064,8 @@ void *UE_thread(void *arg)
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 );
} }
else if (UE->mode == loop_through_memory)
rt_sleep_ns(1000000);
#else #else
// define USRP_DEBUG is active // define USRP_DEBUG is active
rt_sleep_ns(1000000); rt_sleep_ns(1000000);
...@@ -1095,6 +1106,7 @@ void *UE_thread(void *arg) ...@@ -1095,6 +1106,7 @@ void *UE_thread(void *arg)
if (instance_cnt_rx == 0) { if (instance_cnt_rx == 0) {
LOG_D(HW,"signalling rx thread to wake up, hw_frame %d, hw_subframe %d (time %lli)\n", frame, hw_subframe, rt_get_time_ns()-T0 );
if (pthread_cond_signal(&UE->cond_rx) != 0) { if (pthread_cond_signal(&UE->cond_rx) != 0) {
LOG_E( PHY, "[SCHED][UE] ERROR pthread_cond_signal for UE RX thread\n" ); LOG_E( PHY, "[SCHED][UE] ERROR pthread_cond_signal for UE RX thread\n" );
exit_fun("nothing to add"); exit_fun("nothing to add");
...@@ -1102,6 +1114,10 @@ void *UE_thread(void *arg) ...@@ -1102,6 +1114,10 @@ void *UE_thread(void *arg)
} }
LOG_D(HW,"signalled rx thread to wake up, hw_frame %d, hw_subframe %d (time %lli)\n", frame, hw_subframe, rt_get_time_ns()-T0 ); LOG_D(HW,"signalled rx thread to wake up, hw_frame %d, hw_subframe %d (time %lli)\n", frame, hw_subframe, rt_get_time_ns()-T0 );
if (UE->mode == loop_through_memory) {
printf("Processing subframe %d",UE->slot_rx>>1);
getchar();
}
if (UE->mode == rx_calib_ue) { if (UE->mode == rx_calib_ue) {
if (frame == 10) { if (frame == 10) {
...@@ -1128,13 +1144,15 @@ void *UE_thread(void *arg) ...@@ -1128,13 +1144,15 @@ void *UE_thread(void *arg)
return &UE_thread_retval; return &UE_thread_retval;
} }
if ((tx_enabled)&&(UE->mode != loop_through_memory)) {
if (pthread_mutex_lock(&UE->mutex_tx) != 0) { if (pthread_mutex_lock(&UE->mutex_tx) != 0) {
LOG_E( PHY, "[SCHED][UE] error locking mutex for UE TX thread\n" ); LOG_E( PHY, "[SCHED][UE] error locking mutex for UE TX thread\n" );
exit_fun("nothing to add"); exit_fun("nothing to add");
return &UE_thread_retval; return &UE_thread_retval;
} }
if (tx_enabled) {
int instance_cnt_tx = ++UE->instance_cnt_tx; int instance_cnt_tx = ++UE->instance_cnt_tx;
if (pthread_mutex_unlock(&UE->mutex_tx) != 0) { if (pthread_mutex_unlock(&UE->mutex_tx) != 0) {
...@@ -1227,6 +1245,7 @@ void *UE_thread(void *arg) ...@@ -1227,6 +1245,7 @@ void *UE_thread(void *arg)
// dump ahead in time to start of frame // dump ahead in time to start of frame
#ifndef USRP_DEBUG #ifndef USRP_DEBUG
if (UE->mode != loop_through_memory) {
rxs = openair0.trx_read_func(&openair0, rxs = openair0.trx_read_func(&openair0,
&timestamp, &timestamp,
(void**)rxdata, (void**)rxdata,
...@@ -1236,11 +1255,15 @@ void *UE_thread(void *arg) ...@@ -1236,11 +1255,15 @@ void *UE_thread(void *arg)
exit_fun("problem in rx"); exit_fun("problem in rx");
return &UE_thread_retval; return &UE_thread_retval;
} }
UE->rx_offset=0;
tx_enabled = 1;
}
else
rt_sleep_ns(1000000);
#else #else
rt_sleep_ns(10000000); rt_sleep_ns(10000000);
#endif #endif
UE->rx_offset=0;
tx_enabled = 1;
} else if ((UE->rx_offset<(FRAME_LENGTH_COMPLEX_SAMPLES/2)) && } else if ((UE->rx_offset<(FRAME_LENGTH_COMPLEX_SAMPLES/2)) &&
(UE->rx_offset > RX_OFF_MIN) && (UE->rx_offset > RX_OFF_MIN) &&
(start_rx_stream==1) && (start_rx_stream==1) &&
...@@ -1253,7 +1276,7 @@ void *UE_thread(void *arg) ...@@ -1253,7 +1276,7 @@ void *UE_thread(void *arg)
(start_rx_stream==1) && (start_rx_stream==1) &&
(rx_correction_timer == 0)) { // moving to the left so drop rx_off_diff samples (rx_correction_timer == 0)) { // moving to the left so drop rx_off_diff samples
rx_off_diff = FRAME_LENGTH_COMPLEX_SAMPLES - RX_OFF_MIN - UE->rx_offset; rx_off_diff = FRAME_LENGTH_COMPLEX_SAMPLES - RX_OFF_MIN - UE->rx_offset;
LOG_D(PHY,"UE->rx_offset %d < %d, diff %d\n",UE->rx_offset,FRAME_LENGTH_COMPLEX_SAMPLES-RX_OFF_MIN,rx_off_diff);(UE->rx_offset>(FRAME_LENGTH_COMPLEX_SAMPLES/2)); LOG_D(PHY,"UE->rx_offset %d < %d, diff %d\n",UE->rx_offset,FRAME_LENGTH_COMPLEX_SAMPLES-RX_OFF_MIN,rx_off_diff);
rx_correction_timer = 5; rx_correction_timer = 5;
} }
...@@ -1326,7 +1349,7 @@ void *UE_thread(void *arg) ...@@ -1326,7 +1349,7 @@ void *UE_thread(void *arg)
attr.size = sizeof(attr); attr.size = sizeof(attr);
attr.sched_flags = 0; attr.sched_flags = 0;
attr.sched_nice = 0; attr.sched_nice = 0;
attr.sched_priority = sched_get_priority_max(SCHED_DEADLINE); attr.sched_priority = 0;
// This creates a .25 ms reservation // This creates a .25 ms reservation
attr.sched_policy = SCHED_DEADLINE; attr.sched_policy = SCHED_DEADLINE;
...@@ -1756,7 +1779,7 @@ int setup_ue_buffers(PHY_VARS_UE **phy_vars_ue, openair0_config_t *openair0_cfg, ...@@ -1756,7 +1779,7 @@ int setup_ue_buffers(PHY_VARS_UE **phy_vars_ue, openair0_config_t *openair0_cfg,
if (phy_vars_ue[CC_id]) { if (phy_vars_ue[CC_id]) {
frame_parms = &(phy_vars_ue[CC_id]->lte_frame_parms); frame_parms = &(phy_vars_ue[CC_id]->lte_frame_parms);
} else { } else {
printf("phy_vars_eNB[%d] not initialized\n", CC_id); printf("phy_vars_UE[%d] not initialized\n", CC_id);
return(-1); return(-1);
} }
......
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