UL/DL Mode, statistic logs, error protection, subtree srsRAN

.gitignore

@@ -1 +1,2 @@
 /build
+/.vscode

CMakeLists.txt

@@ -98,7 +98,7 @@ message("CMNALIB_LIBRARIES: " ${CMNALIB_LIBRARIES})
 # cmnalib also needs glib:
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(GLIB2		REQUIRED	glib-2.0)
+pkg_check_modules(GLIB2   REQUIRED  glib-2.0)
 
 include_directories(${GLIB2_INCLUDE_DIRS})
 #link_directories(${GLIB2_LIBRARY_DIRS})
@@ -176,6 +176,9 @@ else(SRSRAN_FOUND AND NOT FORCE_SUBPROJECT_SRSRAN)
   message("Download SRSRAN as a subproject and build it.")
 
   # Download and unpack srsRAN at configure time
+  file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/srsRAN-src")
+  file(COPY "${CMAKE_SOURCE_DIR}/srsRAN_4G_mirror/" DESTINATION "${CMAKE_BINARY_DIR}/srsRAN-src")
+
   configure_file(external/cmake/srsRAN.CMakeLists.txt.in srsRAN-download/CMakeLists.txt)
   execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/srsRAN-download" )
@@ -272,7 +275,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
   message("MARCH - FLAGS: ${GCC_ARCH}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=${GCC_ARCH} -Wall -Wno-comment -Wno-write-strings -Winline -Wno-unused-result -Wformat -Wmissing-field-initializers -Wtype-limits -std=c99 -D_GNU_SOURCE")
 
-  find_package(SSE)	# evaluation comes later
+  find_package(SSE) # evaluation comes later
 
   if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb -O0 -DDEBUG_MODE -DBUILD_TYPE_DEBUG")
@@ -292,7 +295,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFORCE_STANDARD_RATE")
   endif (USE_LTE_RATES)
 
-  #find_package(SSE)	# moved upwards before BUILD_TYPE-specific flags. -> AVX512 detection/test code gets subject of O3 optimization -> reports availability even if not present
+  #find_package(SSE)  # moved upwards before BUILD_TYPE-specific flags. -> AVX512 detection/test code gets subject of O3 optimization -> reports availability even if not present
   if (HAVE_AVX2)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse -mavx2 -DLV_HAVE_AVX2 -DLV_HAVE_AVX -DLV_HAVE_SSE")
   else (HAVE_AVX2)
@@ -380,7 +383,7 @@ set(INCLUDE_DIR include)    # PATH to usr/local/include for install
 ########################################################################
 include_directories(${PROJECT_BINARY_DIR}/lib/include)
 include_directories(${PROJECT_SOURCE_DIR}/lib/include)
-include_directories(${PROJECT_SOURCE_DIR}/src)	# for cross includes of top-level applications
+include_directories(${PROJECT_SOURCE_DIR}/src)  # for cross includes of top-level applications
 include_directories(${PROJECT_SOURCE_DIR}/lib)
 ########################################################################
 # Add the subdirectories

external/cmake/srsRAN.CMakeLists.txt.in

@@ -5,8 +5,8 @@ project(srsLTE-download NONE)
 
 include(ExternalProject)
 ExternalProject_Add(srsRAN
-    GIT_REPOSITORY https://github.com/ShaoPaoLao/srsRAN2.git
-    GIT_TAG master
+#    GIT_REPOSITORY https://github.com/ShaoPaoLao/srsRAN2.git
+#    GIT_TAG master
 #    GIT_TAG falcon_v0.1
     SOURCE_DIR "${CMAKE_BINARY_DIR}/srsRAN-src"
     BINARY_DIR "${CMAKE_BINARY_DIR}/srsRAN-build"

lib/include/falcon/util/RNTIManager.h

@@ -31,6 +31,9 @@
 
 #include "Histogram.h"
 #include "Interval.h"
+#include <mutex>
+
+#include <map>
 
 // DCI minimum average llr for accepting DCI for blind decoding
 //#define DCI_MINIMUM_AVG_LLR_BOUND 0.5     //0.5
@@ -108,12 +111,14 @@ class RNTIManager {
   std::vector<std::vector<Interval> > evergreen;
   std::vector<std::vector<Interval> > forbidden;
   std::vector<bool> active;
-  std::list<RNTIActiveSetItem> activeSet;
+  std::map<u_int16_t,RNTIActiveSetItem> activeSet;
   std::vector<uint32_t> lastSeen;
   std::vector<uint32_t> assocFormatIdx;
   uint32_t timestamp;
   uint32_t lifetime;
   uint32_t threshold;
   uint32_t maxCandidatesPerStepPerFormat;
   std::vector<int32_t> remainingCandidates;
+
+  std::mutex rnti_mutex;
 };

lib/src/util/RNTIManager.cc

@@ -215,8 +215,12 @@ uint32_t RNTIManager::getAssociatedFormatIdx(uint16_t rnti) {
 }
 
 ActivationReason RNTIManager::getActivationReason(uint16_t rnti) {
-  for(list<RNTIActiveSetItem>::iterator it = activeSet.begin(); it != activeSet.end(); it++) {
-    if(it->rnti == rnti) return it->reason;
+  std::lock_guard<std::mutex> lock(rnti_mutex);
+  std::map<uint16_t,RNTIActiveSetItem>::const_iterator pos = activeSet.find(rnti);
+  if (pos == activeSet.end()) {
+      //handle the error
+  } else {
+      return pos->second.reason;
   }
   return RM_ACT_UNSET;
 }
@@ -225,11 +229,11 @@ vector<rnti_manager_active_set_t> RNTIManager::getActiveSet() {
   cleanExpired();
   vector<rnti_manager_active_set_t> result(activeSet.size());
   uint32_t index = 0;
-  for(list<RNTIActiveSetItem>::iterator it = activeSet.begin(); it != activeSet.end(); it++) {
-    result[index].rnti = it->rnti;
-    result[index].reason = it->reason;
-    result[index].last_seen = timestamp - lastSeen[it->rnti];
-    result[index].assoc_format_idx = getAssociatedFormatIdx(it->rnti);
+  for(map<u_int16_t,RNTIActiveSetItem>::iterator it = activeSet.begin(); it != activeSet.end(); it++) {
+    result[index].rnti = it->second.rnti;
+    result[index].reason = it->second.reason;
+    result[index].last_seen = timestamp - lastSeen[it->second.rnti];
+    result[index].assoc_format_idx = getAssociatedFormatIdx(it->second.rnti);
     result[index].frequency = getFrequency(result[index].rnti, result[index].assoc_format_idx);
     if(result[index].assoc_format_idx != 0) {
       result[index].frequency += getFrequency(result[index].rnti, 0);
@@ -377,15 +381,19 @@ uint32_t RNTIManager::getLikelyDlFormatIdx(uint16_t rnti) {
 void RNTIManager::activateRNTI(uint16_t rnti, ActivationReason reason) {
   if(!active[rnti]) {
     active[rnti] = true;
-    activeSet.push_back(RNTIActiveSetItem(rnti, reason));
+    std::unique_lock<std::mutex> lock(rnti_mutex);
+    activeSet.insert({rnti,RNTIActiveSetItem(rnti, reason)});
+    lock.unlock();
   }
 }
 
 void RNTIManager::deactivateRNTI(uint16_t rnti) {
   if(active[rnti]) {
     active[rnti] = false;
     assocFormatIdx[rnti] = 0;
-    activeSet.remove(RNTIActiveSetItem(rnti));
+    std::unique_lock<std::mutex> lock(rnti_mutex);
+    activeSet.erase(rnti);
+    lock.unlock();
   }
 }
 
@@ -400,13 +408,15 @@ bool RNTIManager::isExpired(uint16_t rnti) const {
 }
 
 void RNTIManager::cleanExpired() {
-  list<RNTIActiveSetItem>::iterator it = activeSet.begin();
+  map<u_int16_t,RNTIActiveSetItem>::iterator it = activeSet.begin();
   while(it != activeSet.end()) {
-    if(isExpired(it->rnti)) {
+    if(isExpired(it->second.rnti)) {
+      std::unique_lock<std::mutex> lock(rnti_mutex);
       it = activeSet.erase(it);
+      lock.unlock();
     }
     else {
-      ++it;
+      it++;
     }
   }
 }

run_default.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+/home/LTESniffer_mirror/build/src/LTESniffer -a addr=192.168.30.2,type=x300,clock_source=external,time_source=external -d -A 2 -W 16 -f 2130e6 -u 1730e6 -C -m 2 -z 3

src/LTESniffer.cc

@@ -14,9 +14,22 @@ using namespace std;
 
 int main(int argc, char** argv) {
   cout << endl;
-  cout << "LTESniffer" << endl;
+  cout << "LTESniffer Start!!!" << endl;
   cout << endl;
 
+  auto now = std::chrono::system_clock::now();
+  std::time_t cur_time = std::chrono::system_clock::to_time_t(now);
+  std::string str_cur_time(std::ctime(&cur_time));
+  for(std::string::iterator it = str_cur_time.begin(); it != str_cur_time.end(); ++it) {
+    if (*it == ' '){
+      *it = '_';
+    } else if (*it == ':'){
+      *it = '.';
+    } else if (*it == '\n'){
+      *it = '.';
+    }
+  }
+
   Args args;
   ArgManager::parseArgs(args, argc, argv);
 
@@ -29,5 +42,9 @@ int main(int argc, char** argv) {
 
   bool success = SnifferCore.run();
 
+  cout << endl;
+  cout << "LTESniffer End!!!" << endl;
+  cout << endl;
+
   return success ? EXIT_SUCCESS : EXIT_FAILURE;
 }

src/include/DL_Sniffer_PDSCH.h

@@ -65,6 +65,7 @@ class PDSCH_Decoder
 public:
     PDSCH_Decoder(uint32_t idx, 
                   LTESniffer_pcap_writer *pcapwriter, 
+                  std::vector<LTESniffer_stat_writer *> *filewriter_objs,
                   MCSTracking *mcs_tracking,
                   RNTIManager& rntiManager,
                   HARQ *harq,
@@ -149,7 +150,7 @@ class PDSCH_Decoder
     void set_target_rnti(uint16_t rnti) {target_rnti = rnti;}
     void set_debug_mode(bool debug) { en_debug = debug;}
     void set_api_mode(int api_mode_) { api_mode = api_mode_;}
-    void print_api_dl(uint32_t tti, uint16_t rnti, int ident, std::string value, int msg);
+    void print_api_dl(uint32_t tti, uint16_t rnti, int ident, std::string value, int msg, uint32_t ta_rnti);
 
 private:
     int         api_mode            = -1; 
@@ -174,6 +175,7 @@ class PDSCH_Decoder
     srsran_pdsch_res_t              *pdsch_res;
     srsran_pdsch_cfg_t              *pdsch_cfg; //buffer
     LTESniffer_pcap_writer          *pcapwriter;
+    std::vector<LTESniffer_stat_writer *> *filewriter_objs;
     RNTIManager                     &rntiManager;
     int                             mcs_tracking_mode;
     MCSTracking                     *mcs_tracking;

src/include/FileWriter.h

@@ -0,0 +1,22 @@
+/*
+ * LTE DL_Snifer BWS addition
+ */
+#pragma once
+#include <mutex>
+
+// Define a new class for creating a new thread of stat
+class LTESniffer_stat_writer
+{
+public:
+    LTESniffer_stat_writer() {enable_write=false; stat_file = NULL; };
+    void enable(bool en);
+    void open(const std::string filename);
+    void close();
+    void write_stats(std::string); 
+
+private:
+    std::mutex stat_mutex;
+    bool enable_write; 
+    FILE *stat_file;
+    void writer(std::string);
+};

src/include/LTESniffer_Core.h

@@ -33,6 +33,7 @@
 #include "srsran/common/mac_pcap.h"
 #include "Phy.h"
 #include "PcapWriter.h"
+#include "FileWriter.h" 
 #include "HARQ.h"
 #include <ctime>
 #include <iostream>
@@ -65,6 +66,9 @@ using namespace srsran;
 #define UL_SNIFFER_UL_OFFSET_32 32
 #define UL_SNIFFER_UL_OFFSET_64 64
 
+void write_file_and_console(std::string mystring, LTESniffer_stat_writer* filewriter_obj);
+void cell_print(LTESniffer_stat_writer* filewriter_obj, srsran_cell_t* cell, uint32_t sfn);
+
 typedef struct {
   cf_t* ta_temp_buffer;
   cf_t  ta_last_sample[UL_SNIFFER_UL_MAX_OFFSET];
@@ -95,7 +99,7 @@ class LTESniffer_Core : public SignalHandler {
   void resetDCIConsumer();
   void refreshShortcutDiscovery(bool val);
   void setRNTIThreshold(int val);
-  void print_api_header();
+  void print_api_header(LTESniffer_stat_writer  *filewriter_obj);
   bool run();
   void stop();
 private:
@@ -111,6 +115,16 @@ class LTESniffer_Core : public SignalHandler {
   std::mutex              harq_map_mutex;
   Phy                     *phy;
   LTESniffer_pcap_writer  pcapwriter;
+  FILE * errfile;
+  //FILE * outfile;
+  std::vector<LTESniffer_stat_writer *> filewriter_objs;
+  LTESniffer_stat_writer  apiwriter;
+  LTESniffer_stat_writer  dlwriter;
+  LTESniffer_stat_writer  dldciwriter;
+  LTESniffer_stat_writer  ulwriter;
+  LTESniffer_stat_writer  uldciwriter;
+  LTESniffer_stat_writer  rarwriter;
+  LTESniffer_stat_writer  otherwriter;
   srsran::mac_pcap        mac_pcap;
   int                     mcs_tracking_mode;
   MCSTracking             mcs_tracking;