Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moved print messages out from the master thread and added authorship #7

Merged
merged 3 commits into from
Aug 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/common/Symbols.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions src/common/gettime.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#ifndef GETTIME_H
#define GETTIME_H

Expand Down
5 changes: 5 additions & 0 deletions src/common/memory_manage.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#ifndef MEMORY_MANAGE
#define MEMORY_MANAGE
#include <stdio.h>
Expand Down
5 changes: 5 additions & 0 deletions src/receiver/compute_common.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#include "compute_common.hpp"

void init_qam16_table(float **qam16_table)
Expand Down
5 changes: 5 additions & 0 deletions src/receiver/compute_common.hpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#ifndef COMPUTE_COMMON
#define COMPUTE_COMMON

Expand Down
5 changes: 5 additions & 0 deletions src/receiver/dodemul.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#include "dodemul.hpp"

using namespace arma;
Expand Down
5 changes: 5 additions & 0 deletions src/receiver/dodemul.hpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#ifndef DODEMUL
#define DODEMUL

Expand Down
6 changes: 5 additions & 1 deletion src/receiver/dofft.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#include "dofft.hpp"


Expand Down
5 changes: 5 additions & 0 deletions src/receiver/dofft.hpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#ifndef DOFFT
#define DOFFT

Expand Down
5 changes: 5 additions & 0 deletions src/receiver/doprecode.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#include "doprecode.hpp"

using namespace arma;
Expand Down
5 changes: 5 additions & 0 deletions src/receiver/doprecode.hpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#ifndef DOPRECODE
#define DOPRECODE

Expand Down
5 changes: 5 additions & 0 deletions src/receiver/dozf.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#include "dozf.hpp"

using namespace arma;
Expand Down
5 changes: 5 additions & 0 deletions src/receiver/dozf.hpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#ifndef DOZF
#define DOZF

Expand Down
5 changes: 5 additions & 0 deletions src/receiver/main.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#include "packageReceiver.hpp"
#include "millipede.hpp"

Expand Down
362 changes: 208 additions & 154 deletions src/receiver/millipede.cpp

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions src/receiver/millipede.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Author: Peiyao Zhao
* E-Mail: pdszpy19930218@163.com
* Author: Jian Ding
* Email: jianding17@gmail.com
*
*/

Expand Down Expand Up @@ -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,
Expand All @@ -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();
Expand Down
5 changes: 5 additions & 0 deletions src/receiver/offset.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#ifndef OFFSET_H
#define OFFSET_H

Expand Down
4 changes: 2 additions & 2 deletions src/receiver/packageReceiver.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Author: Peiyao Zhao
* E-Mail: pdszpy19930218@163.com
* Author: Jian Ding
* Email: jianding17@gmail.com
*
*/

Expand Down
4 changes: 2 additions & 2 deletions src/receiver/packageReceiver.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Author: Peiyao Zhao
* E-Mail: pdszpy19930218@163.com
* Author: Jian Ding
* Email: jianding17@gmail.com
*
*/

Expand Down
5 changes: 5 additions & 0 deletions src/receiver/stats.cpp
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 6 additions & 0 deletions src/receiver/stats.hpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/

#ifndef STATS
#define STATS

Expand Down
8 changes: 5 additions & 3 deletions src/sender/packageSender.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#include "packageSender.hpp"
#include "cpu_attach.hpp"




bool keep_running = true;

void intHandler(int) {
Expand Down
5 changes: 5 additions & 0 deletions src/sender/packageSender.hpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#ifndef PACKAGESENDER
#define PACKAGESENDER

Expand Down
5 changes: 5 additions & 0 deletions src/sender/sender_cli.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Author: Jian Ding
* Email: [email protected]
*
*/
#include "packageSender.hpp"

int main(int argc, char const *argv[])
Expand Down