Merge pull request #7 from jianding17/develop

moved print messages out from the master thread and added authorship

src/common/Symbols.hpp

@@ -47,6 +47,17 @@
 #define TASK_DECODE 8
 #define TASK_ENCODE 9
 
+#define PRINT_RX_PILOTS 0
+#define PRINT_RX 1
+#define PRINT_FFT_PILOTS 2
+#define PRINT_FFT_DATA 3
+#define PRINT_ZF 4
+#define PRINT_DEMUL 5
+#define PRINT_PRECODE 6
+#define PRINT_IFFT 7
+#define PRINT_TX_FIRST 8
+#define PRINT_TX 9
+
 
 #define BIGSTATION 0
 #define ENABLE_DOWNLINK 0

src/common/gettime.h

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #ifndef GETTIME_H   
 #define GETTIME_H
 

src/common/memory_manage.h

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #ifndef MEMORY_MANAGE
 #define MEMORY_MANAGE
 #include <stdio.h>

src/receiver/compute_common.cpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #include "compute_common.hpp"
 
 void init_qam16_table(float **qam16_table)

src/receiver/compute_common.hpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #ifndef COMPUTE_COMMON
 #define COMPUTE_COMMON
 

src/receiver/dodemul.cpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #include "dodemul.hpp"
 
 using namespace arma;

src/receiver/dodemul.hpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #ifndef DODEMUL
 #define DODEMUL
 

src/receiver/dofft.cpp

@@ -1,4 +1,8 @@
-
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #include "dofft.hpp"
 
 

src/receiver/dofft.hpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #ifndef DOFFT
 #define DOFFT
 

src/receiver/doprecode.cpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #include "doprecode.hpp"
 
 using namespace arma;

src/receiver/doprecode.hpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #ifndef DOPRECODE
 #define DOPRECODE
 

src/receiver/dozf.cpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #include "dozf.hpp"
 
 using namespace arma;

src/receiver/dozf.hpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #ifndef DOZF
 #define DOZF
 

src/receiver/main.cpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #include "packageReceiver.hpp"
 #include "millipede.hpp"
 

src/receiver/millipede.hpp

@@ -1,6 +1,6 @@
 /**
- * Author: Peiyao Zhao
- * E-Mail: pdszpy19930218@163.com
+ * Author: Jian Ding
+ * Email: jianding17@gmail.com
  * 
  */
 
@@ -96,6 +96,7 @@ class Millipede
         int id;
     };
 
+    inline void update_frame_count(int *frame_count);
     /* Add tasks into task queue based on event type */
     void schedule_task(Event_data do_task, moodycamel::ConcurrentQueue<Event_data> * in_queue, moodycamel::ProducerToken const& ptok);
     void schedule_fft_task(int offset, int frame_id, int frame_id_in_buffer, int subframe_id, int ant_id, int prev_frame_id,
@@ -106,6 +107,11 @@ class Millipede
     void schedule_precode_task(int frame_id, int data_subframe_id, moodycamel::ProducerToken const& ptok_precode);
     void schedule_ifft_task(int frame_id, int data_subframe_id, moodycamel::ProducerToken const& ptok_ifft);  
 
+    void update_rx_counters(int frame_id, int frame_id_in_buffer, int subframe_id, int ant_id);
+    void print_per_frame_done(int task_type, int frame_id, int frame_id_in_buffer);
+    void print_per_subframe_done(int task_type, int frame_id, int frame_id_in_buffer, int subframe_id);
+    void print_per_task_done(int task_type, int frame_id, int subframe_id, int ant_or_sc_id); 
+
     void initialize_uplink_buffers();
     void initialize_downlink_buffers();
     void free_uplink_buffers();

src/receiver/offset.h

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #ifndef OFFSET_H   
 #define OFFSET_H
 

src/receiver/packageReceiver.cpp

@@ -1,6 +1,6 @@
 /**
- * Author: Peiyao Zhao
- * E-Mail: pdszpy19930218@163.com
+ * Author: Jian Ding
+ * Email: jianding17@gmail.com
  * 
  */
 

src/receiver/packageReceiver.hpp

@@ -1,6 +1,6 @@
 /**
- * Author: Peiyao Zhao
- * E-Mail: pdszpy19930218@163.com
+ * Author: Jian Ding
+ * Email: jianding17@gmail.com
  * 
  */
 

src/receiver/stats.cpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #include "stats.hpp"
 
 Stats::Stats(double **in_CSI_task_duration, int *in_CSI_task_count, double **in_FFT_task_duration, int *in_FFT_task_count, 

src/receiver/stats.hpp

@@ -1,3 +1,9 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
+
 #ifndef STATS
 #define STATS
 

src/sender/packageSender.cpp

@@ -1,9 +1,11 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #include "packageSender.hpp"
 #include "cpu_attach.hpp"
 
-
-
-
 bool keep_running = true;
 
 void intHandler(int) {

src/sender/packageSender.hpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #ifndef PACKAGESENDER
 #define PACKAGESENDER
 

src/sender/sender_cli.cpp

@@ -1,3 +1,8 @@
+/**
+ * Author: Jian Ding
+ * Email: [email protected]
+ * 
+ */
 #include "packageSender.hpp"
 
 int main(int argc, char const *argv[])