Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next

lib/examples/CMakeLists.txt

@@ -63,10 +63,10 @@ endif(SRSGUI_FOUND)
 if(RF_FOUND)
 
   add_executable(cell_search cell_search.c)
-  target_link_libraries(cell_search srslte_phy srslte_rf)
+  target_link_libraries(cell_search srslte_phy srslte_common srslte_rf)
 
   add_executable(cell_measurement cell_measurement.c)
-  target_link_libraries(cell_measurement srslte_phy srslte_rf)
+  target_link_libraries(cell_measurement srslte_phy srslte_common srslte_rf)
 
   add_executable(usrp_capture usrp_capture.c)
   target_link_libraries(usrp_capture srslte_phy srslte_rf)

lib/examples/cell_measurement.c

@@ -40,6 +40,7 @@
 #include "srslte/srslte.h"
 #include "srslte/phy/rf/rf.h"
 #include "srslte/phy/rf/rf_utils.h"
+#include "srslte/common/crash_handler.h"
 
 cell_search_cfg_t cell_detect_config = {
   SRSLTE_DEFAULT_MAX_FRAMES_PBCH,

lib/examples/cell_search.c

@@ -38,6 +38,7 @@
 #include "srslte/srslte.h"
 
 #include "srslte/phy/rf/rf_utils.h"
+#include "srslte/common/crash_handler.h"
 
 
 #ifndef DISABLE_RF

lib/examples/pdsch_enodeb.c

@@ -33,6 +33,7 @@
 #include <pthread.h>
 #include <semaphore.h>
 #include <signal.h>
+#include "srslte/common/crash_handler.h"
 #include <srslte/phy/common/phy_common.h>
 #include <srslte/phy/phch/pdsch_cfg.h>
 #include "srslte/common/gen_mch_tables.h"

lib/examples/pdsch_ue.c

@@ -37,6 +37,7 @@
 #include <pthread.h>
 #include <semaphore.h>
 #include "srslte/common/gen_mch_tables.h"
+#include "srslte/common/crash_handler.h"
 #include <srslte/phy/common/phy_common.h>
 #include "srslte/phy/io/filesink.h"
 #include "srslte/srslte.h"

lib/include/srslte/common/crash_handler.h

@@ -0,0 +1,50 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 Software Radio Systems Limited
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+/******************************************************************************
+ *  File:         debug.h
+ *
+ *  Description:  Debug output utilities.
+ *
+ *  Reference:
+ *****************************************************************************/
+
+#ifndef SRSLTE_CRASH_HANDLER_H
+#define SRSLTE_CRASH_HANDLER_H
+
+#include <stdio.h>
+#include "srslte/config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void srslte_debug_handle_crash(int argc, char **argv);
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+#endif // SRSLTE_CRASH_HANDLER_H

lib/include/srslte/phy/utils/debug.h

@@ -78,6 +78,4 @@ SRSLTE_API extern int handler_registered;
         else{srslte_phy_log_print(LOG_LEVEL_ERROR, _fmt, ##__VA_ARGS__);} // 
 #endif /* CMAKE_BUILD_TYPE==Debug */
 
-void srslte_debug_handle_crash(int argc, char **argv);
-
 #endif // SRSLTE_DEBUG_H

lib/include/srslte/srslte.h

@@ -31,7 +31,7 @@
 #ifdef __cplusplus
     extern "C" {
 #endif
-      
+
 #include <complex.h>
 #include <math.h>
 
@@ -49,7 +49,7 @@
 #include "srslte/phy/common/sequence.h"
 #include "srslte/phy/common/phy_common.h"
 #include "srslte/phy/common/phy_logger.h"
-            
+
 #include "srslte/phy/ch_estimation/chest_ul.h"
 #include "srslte/phy/ch_estimation/chest_dl.h"
 #include "srslte/phy/ch_estimation/refsignal_dl.h"
@@ -104,7 +104,7 @@
 #include "srslte/phy/phch/regs.h"
 #include "srslte/phy/phch/sch.h"
 #include "srslte/phy/phch/uci.h"
-      
+
 #include "srslte/phy/ue/ue_sync.h"
 #include "srslte/phy/ue/ue_mib.h"
 #include "srslte/phy/ue/ue_cell_search.h"

lib/src/common/crash_handler.c

@@ -0,0 +1,90 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 Software Radio Systems Limited
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+#include <pthread.h>
+#include <stdio.h>
+#include <execinfo.h>
+#include <signal.h>
+#include <stdlib.h>
+
+#include "srslte/version.h"
+#include "srslte/common/crash_handler.h"
+
+const static char crash_file_name[] = "./srsLTE.backtrace.crash";
+static int bt_argc;
+static char **bt_argv;
+
+static void crash_handler(int sig) {
+  void *array[128];
+  int size;
+
+
+  /* Get all stack traces */
+  size = backtrace(array, 128);
+
+  FILE *f = fopen(crash_file_name, "a");
+  if (!f) {
+    printf("srsLTE crashed... we could not save backtrace in '%s'...\n", crash_file_name);
+  } else {
+    char **symbols = backtrace_symbols(array, size);
+
+    time_t lnTime;
+    struct tm *stTime;
+    char strdate[32];
+
+    time(&lnTime);
+    stTime = localtime(&lnTime);
+
+    strftime(strdate, 32, "%d/%m/%Y %H:%M:%S", stTime);
+
+    fprintf(f, "--- command='");
+    for (int i = 0; i < bt_argc; i++) {
+      fprintf(f, "%s%s", (i == 0) ? "" : " ", bt_argv[i]);
+    }
+    fprintf(f, "' version=%s signal=%d date='%s' ---\n", SRSLTE_VERSION_STRING, sig, strdate);
+
+    for (int i = 0; i < size; i++) {
+      fprintf(f, "\t%s\n", symbols[i]);
+    }
+    fprintf(f, "\n");
+
+    printf("srsLTE crashed... backtrace saved in '%s'...\n", crash_file_name);
+    fclose(f);
+  }
+  printf("---  exiting  ---\n");
+  exit(1);
+}
+
+void srslte_debug_handle_crash(int argc, char **argv) {
+  bt_argc = argc;
+  bt_argv = argv;
+
+  signal(SIGSEGV, crash_handler);
+  signal(SIGABRT, crash_handler);
+  signal(SIGILL, crash_handler);
+  signal(SIGFPE, crash_handler);
+  signal(SIGPIPE, crash_handler);
+}

lib/src/phy/utils/debug.c

@@ -24,14 +24,8 @@
  *
  */
 
-#include <pthread.h>
-#include <stdio.h>
-#include <execinfo.h>
-#include <signal.h>
 #include <stdlib.h>
-
 #include "srslte/phy/utils/debug.h"
-#include "srslte/version.h"
 
 int srslte_verbose = 0;
 int handler_registered = 0;
@@ -45,57 +39,3 @@ void get_time_interval(struct timeval * tdata) {
     tdata[0].tv_usec += 1000000;
   }
 }
-
-const static char crash_file_name[] = "./srsLTE.backtrace.crash";
-static int bt_argc;
-static char **bt_argv;
-
-static void crash_handler(int sig) {
-  void *array[128];
-  int size;
-
-  /* Get all stack traces */
-  size = backtrace(array, 128);
-
-  FILE *f = fopen(crash_file_name, "a");
-  if (!f) {
-    printf("srsLTE crashed... we could not save backtrace in '%s'...\n", crash_file_name);
-  } else {
-    char **symbols = backtrace_symbols(array, size);
-
-    time_t lnTime;
-    struct tm *stTime;
-    char strdate[32];
-
-    time(&lnTime);
-    stTime = localtime(&lnTime);
-
-    strftime(strdate, 32, "%d/%m/%Y %H:%M:%S", stTime);
-
-    fprintf(f, "--- command='");
-    for (int i = 0; i < bt_argc; i++) {
-      fprintf(f, "%s%s", (i == 0) ? "" : " ", bt_argv[i]);
-    }
-    fprintf(f, "' version=%s signal=%d date='%s' ---\n", SRSLTE_VERSION_STRING, sig, strdate);
-
-    for (int i = 0; i < size; i++) {
-      fprintf(f, "\t%s\n", symbols[i]);
-    }
-    fprintf(f, "\n");
-
-    printf("srsLTE crashed... backtrace saved in '%s'...\n", crash_file_name);
-    fclose(f);
-  }
-  printf("---  exiting  ---\n");
-  exit(1);
-}
-
-void srslte_debug_handle_crash(int argc, char **argv) {
-  bt_argc = argc;
-  bt_argv = argv;
-
-  signal(SIGSEGV, crash_handler);
-  signal(SIGABRT, crash_handler);
-  signal(SIGILL, crash_handler);
-  signal(SIGFPE, crash_handler);
-}

srsenb/src/main.cc

@@ -31,6 +31,7 @@
 #include <pthread.h>
 
 #include "srslte/common/config_file.h"
+#include "srslte/common/crash_handler.h"
 
 #include <iostream>
 #include <string>

srsepc/src/CMakeLists.txt

@@ -34,17 +34,17 @@ if (RPATH)
 endif (RPATH)
 
 
-add_executable(srsepc main.cc )
+add_executable(srsepc main.cc)
-target_link_libraries(srsepc  srsepc_mme
+target_link_libraries( srsepc  srsepc_mme
-                              srsepc_hss
+                               srsepc_hss
-                              srsepc_sgw
+                               srsepc_sgw
-                              srslte_upper
+                               srslte_upper
-                              srslte_common
+                               srslte_common
-                              ${CMAKE_THREAD_LIBS_INIT} 
+                               ${CMAKE_THREAD_LIBS_INIT}
-                              ${Boost_LIBRARIES} 
+                               ${Boost_LIBRARIES}
-                              ${SEC_LIBRARIES}
+                               ${SEC_LIBRARIES}
-                              ${LIBCONFIGPP_LIBRARIES}
+                               ${LIBCONFIGPP_LIBRARIES}
-                              ${SCTP_LIBRARIES})
+                               ${SCTP_LIBRARIES})
 
 add_executable(srsmbms mbms-gw/main.cc )
 target_link_libraries(srsmbms   srsepc_mbms_gw

srsepc/src/main.cc

@@ -27,6 +27,7 @@
 #include <signal.h>
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string.hpp>
+#include "srslte/common/crash_handler.h"
 #include "srslte/common/bcd_helpers.h"
 #include "srslte/common/config_file.h"
 #include "srsepc/hdr/mme/mme.h"
@@ -39,7 +40,7 @@ namespace bpo = boost::program_options;
 
 bool running = true;
 
-void 
+void
 sig_int_handler(int signo){
   running = false;
 }
@@ -282,11 +283,13 @@ level(std::string l)
 int
 main (int argc,char * argv[] )
 {
-  cout << endl <<"---  Software Radio Systems EPC  ---" << endl << endl;
   signal(SIGINT, sig_int_handler);
   signal(SIGTERM, sig_int_handler);
   signal(SIGKILL, sig_int_handler);
 
+  cout << endl <<"---  Software Radio Systems EPC  ---" << endl << endl;
+  srslte_debug_handle_crash(argc, argv);
+
   all_args_t args;
   parse_args(&args, argc, argv); 
 
@@ -340,16 +343,16 @@ main (int argc,char * argv[] )
   if (spgw->init(&args.spgw_args,&spgw_log)) {
     cout << "Error initializing SP-GW" << endl;
     exit(1);
-  } 
+  }
 
-  mme->start(); 
+  mme->start();
   spgw->start();
   while(running) {
     sleep(1);
   }
 
   mme->stop();
-  mme->cleanup();   
+  mme->cleanup();
   spgw->stop();
   spgw->cleanup();
   hss->stop();

srsue/hdr/upper/rrc.h

@@ -280,7 +280,7 @@ public:
   void stop();
 
   rrc_state_t get_state();
-  void set_args(rrc_args_t *args);
+  void set_args(rrc_args_t args);
 
   // Timeout callback interface
   void timer_expired(uint32_t timeout_id);

srsue/src/main.cc

@@ -38,6 +38,7 @@
 
 #include "srsue/hdr/ue.h"
 #include "srslte/common/config_file.h"
+#include "srslte/common/crash_handler.h"
 #include "srslte/srslte.h"
 #include "srsue/hdr/metrics_stdout.h"
 #include "srsue/hdr/metrics_csv.h"

srsue/src/ue.cc

@@ -232,7 +232,10 @@ bool ue::init(all_args_t *args_) {
   args->rrc.supported_bands[0] = srslte_band_get_band(args->rf.dl_earfcn);
   args->rrc.nof_supported_bands = 1;
   args->rrc.ue_category = atoi(args->ue_category_str.c_str());
-  rrc.set_args(&args->rrc);
+
+  // set args and initialize RRC
+  rrc.set_args(args->rrc);
+  rrc.init(&phy, &mac, &rlc, &pdcp, &nas, usim, &gw, &mac, &rrc_log);
 
   // Currently EARFCN list is set to only one frequency as indicated in ue.conf
   std::vector<uint32_t> earfcn_list;

srsue/src/upper/rrc.cc

@@ -237,8 +237,8 @@ bool rrc::have_drb() {
   return drb_up;
 }
 
-void rrc::set_args(rrc_args_t *args) {
+void rrc::set_args(rrc_args_t args_) {
-  memcpy(&this->args, args, sizeof(rrc_args_t));
+  args = args_;
 }
 
 /*