clean up changes for submission

openair2/UTIL/LOG/vcd_signal_dumper.c

@@ -174,10 +174,8 @@ const char* eurecomVariablesNames[] = {
   "ue0_SFN5",
   "ue0_SFN6",
   "ue0_SFN7",
-#if 1 // 2016-11-29 wilson debug thread busy crash
   "ue0_trx_read_ns",
   "ue0_trx_write_ns",
-#endif
 };
 
 const char* eurecomFunctionsNames[] = {
@@ -192,7 +190,6 @@ const char* eurecomFunctionsNames[] = {
   "ue_thread_synch",
   "ue_thread_rxtx0",
   "ue_thread_rxtx1",
-#if 1 // 2016-11-29 wilson debug thread busy crash
   "trx_read_sf9",
   "trx_write_sf9",
   "ue_signal_cond_rxtx",
@@ -204,7 +201,6 @@ const char* eurecomFunctionsNames[] = {
   "ue_lock_mutex_rxtx_for_cnt_decrement1",
   "ue_lock_mutex_rxtx_for_cnt_increment0",
   "ue_lock_mutex_rxtx_for_cnt_increment1",
-#endif
 
  /* RRH signals  */ 
   "eNB_tx",
@@ -235,13 +231,11 @@ const char* eurecomFunctionsNames[] = {
   "phy_eNB_slot_fep",
   "phy_procedures_ue_tx",
   "phy_procedures_ue_rx",
-#if 1 // 2016-12-01 wilson debug long TX runtime in special subframe
   "phy_procedures_ue_tx_ulsch_uespec",
   "phy_procedures_ue_tx_pucch",
   "phy_procedures_ue_tx_ulsch_common",
   "phy_procedures_ue_tx_prach",
   "phy_procedures_ue_tx_ulsch_rar",
-#endif
   "phy_procedures_eNB_lte",
   "phy_procedures_UE_lte",
   "pdsch_thread",

openair2/UTIL/LOG/vcd_signal_dumper.h

@@ -146,10 +146,8 @@ typedef enum {
   VCD_SIGNAL_DUMPER_VARIABLES_UE0_SFN5,
   VCD_SIGNAL_DUMPER_VARIABLES_UE0_SFN6,
   VCD_SIGNAL_DUMPER_VARIABLES_UE0_SFN7,
-#if 1 // 2016-11-29 wilson debug thread busy crash
   VCD_SIGNAL_DUMPER_VARIABLES_UE0_TRX_READ_NS,
   VCD_SIGNAL_DUMPER_VARIABLES_UE0_TRX_WRITE_NS,
-#endif
   VCD_SIGNAL_DUMPER_VARIABLES_LAST,
   VCD_SIGNAL_DUMPER_VARIABLES_END = VCD_SIGNAL_DUMPER_VARIABLES_LAST,
 } vcd_signal_dump_variables;
@@ -166,7 +164,6 @@ typedef enum {
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_SYNCH,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_RXTX0,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_RXTX1,
-#if 1 // 2016-11-29 wilson debug thread busy crash
   VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ_SF9,
   VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_SF9,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SIGNAL_COND_RXTX,
@@ -178,7 +175,6 @@ typedef enum {
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_LOCK_MUTEX_RXTX_FOR_CNT_DECREMENT1,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_LOCK_MUTEX_RXTX_FOR_CNT_INCREMENT0,
   VCD_SIGNAL_DUMPER_FUNCTIONS_UE_LOCK_MUTEX_RXTX_FOR_CNT_INCREMENT1,
-#endif
 
   /* RRH signals  */ 
   VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_TX,
@@ -209,13 +205,11 @@ typedef enum {
   VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_SLOT_FEP,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_RX,
-#if 1 // 2016-12-01 wilson debug long TX runtime in special subframe
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PUCCH,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_COMMON,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PRACH,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_RAR,
-#endif
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_LTE,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_LTE,
   VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_THREAD,