From 4f6fafb66d9bc5bf845e98955f849eeaa87d5509 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@softwareradiosystems.com>
Date: Wed, 18 Oct 2017 15:27:21 +0100
Subject: [PATCH] General code cleanup

---
 srsepc/hdr/mme/mme.h  | 12 +++++-------
 srsepc/src/main.cc    | 10 +++++++---
 srsepc/src/mme/mme.cc | 31 +++++++++++++++++++------------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/srsepc/hdr/mme/mme.h b/srsepc/hdr/mme/mme.h
index 0ee53d4ca..b2c67df3d 100644
--- a/srsepc/hdr/mme/mme.h
+++ b/srsepc/hdr/mme/mme.h
@@ -38,6 +38,7 @@
 #include "srslte/common/logger_file.h"
 #include "srslte/common/log_filter.h"
 #include "srslte/common/buffer_pool.h"
+#include "srslte/common/threads.h"
 #include "s1ap.h"
 
 
@@ -57,20 +58,16 @@ typedef struct{
 } all_args_t;
 
 
-class mme
+class mme:
+  public thread
 {
 public:
   static mme* get_instance(void);
-
   static void cleanup(void);
-  
   int init(all_args_t* args);
-
   void stop();
-
   int get_s1_mme();
-  
-  void main_loop();
+  void run_thread();
 
 private:
 
@@ -79,6 +76,7 @@ private:
   static mme *m_instance;
   s1ap m_s1ap;
 
+  bool m_running;
   srslte::byte_buffer_pool *m_pool;
 
   /*Logs*/
diff --git a/srsepc/src/main.cc b/srsepc/src/main.cc
index 6b2ca1800..4920519dc 100644
--- a/srsepc/src/main.cc
+++ b/srsepc/src/main.cc
@@ -134,7 +134,7 @@ int
 main (int argc,char * argv[] )
 {  
   cout << "---  Software Radio Systems EPC  ---" << endl << endl;
-  signal(SIGINT,    sig_int_handler);
+  signal(SIGINT, sig_int_handler);
 
   all_args_t args;
   parse_args(&args, argc, argv); 
@@ -146,11 +146,15 @@ main (int argc,char * argv[] )
     cout << "Error initializing MME" << endl;
     exit(1);
   }
+  mme->start();
   
-  mme->main_loop();
-  
+  while(running) {
+    sleep(0.5);
+  }
+
   mme->stop();
   mme->cleanup();  
+
   cout << "---  exiting  ---" << endl;  
   return 0;
 }
diff --git a/srsepc/src/mme/mme.cc b/srsepc/src/mme/mme.cc
index d1293855c..8205c408a 100644
--- a/srsepc/src/mme/mme.cc
+++ b/srsepc/src/mme/mme.cc
@@ -37,7 +37,8 @@ namespace srsepc{
 mme*          mme::m_instance = NULL;
 boost::mutex  mme_instance_mutex;
 
-mme::mme()
+mme::mme():
+  m_running(false)
 {
   m_pool = srslte::byte_buffer_pool::get_instance();     
   return;
@@ -71,7 +72,6 @@ mme::cleanup(void)
 int
 mme::init(all_args_t* args)
 {
-
   /*Init loggers*/
   if (!args->log_args.filename.compare("stdout")) {
     m_logger = &m_logger_stdout;
@@ -95,6 +95,12 @@ mme::init(all_args_t* args)
 void
 mme::stop()
 {
+  if(m_running)
+  {
+    m_running = false;
+    thread_cancel();
+    wait_thread_finish();
+  }
   m_s1ap.stop();
   return;
 }
@@ -106,7 +112,7 @@ mme::get_s1_mme()
 }
 
 void
-mme::main_loop()
+mme::run_thread()
 {
   srslte::byte_buffer_t *pdu = m_pool->allocate();
   uint32_t sz = SRSLTE_MAX_BUFFER_SIZE_BYTES - SRSLTE_BUFFER_HEADER_OFFSET;
@@ -118,29 +124,30 @@ mme::main_loop()
   int rd_sz;
   int msg_flags=0;
 
+  //Mark the thread as running
+  m_running=true;
+
   //Get S1-MME socket
   int s1mme = m_s1ap.get_s1_mme();
-  while(true)
+  while(m_running)
   {
-    std::cout << "Waiting for SCTP Msg " << std::endl;
+    //std::cout << "Waiting for SCTP Msg " << std::endl;
+    m_s1ap_log.debug("Waiting for SCTP Msg");
     pdu->reset();
     rd_sz = sctp_recvmsg(s1mme, pdu->msg, sz,(struct sockaddr*) &enb_addr, &fromlen, &sri, &msg_flags);
     if (rd_sz == -1 && errno != EAGAIN){
-      std::cout<< "Error reading from SCTP socket" << std::endl;
-      printf("Error: %s\n", strerror(errno));
+      m_s1ap_log.error("Error reading from SCTP socket: %s", strerror(errno));
     }
     else if (rd_sz == -1 && errno == EAGAIN){
-      std::cout << "Timeout reached" << std::endl;
+      m_s1ap_log("Socket timeout reached");
     }
     else{
       pdu->N_bytes = rd_sz;
-      std::cout<< "Received SCTP msg." << std::endl;
-      std::cout << "\tSize: " << pdu->N_bytes << std::endl;
-      std::cout << "\tMsg: " << pdu->msg << std::endl;
+      m_s1ap_log("Received S1AP msg. Size: %d", pdu->N_bytes);
       m_s1ap.handle_s1ap_rx_pdu(pdu,&sri);
-
     }
   }
+  return;
 }
 
 } //namespace srsepe<