mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-19 05:33:02 +00:00
Code Issues Releases Wiki Activity

replace exception by receiver stop command

Browse Source
This commit is contained in:
Marc Majoral 2021-02-15 21:44:05 +01:00
parent c0e4b2aee5
commit b279c3bcbd
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
View File

@ -312,7 +312,7 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(const ConfigurationInterface *con
} }
uint32_t num_freq_bands = (freq_band.compare("L1L2")) ? 1 : 2; uint32_t num_freq_bands = (freq_band.compare("L1L2")) ? 1 : 2;
buffer_monitor_fpga = std::make_shared<Fpga_buffer_monitor>(device_io_name_buffer_monitor, num_freq_bands, dump_, dump_filename); buffer_monitor_fpga = std::make_shared<Fpga_buffer_monitor>(device_io_name_buffer_monitor, num_freq_bands, dump_, dump_filename, queue);
thread_buffer_monitor = std::thread([&] { run_buffer_monitor_process(); }); thread_buffer_monitor = std::thread([&] { run_buffer_monitor_process(); });
} }

33
src/algorithms/signal_source/libs/fpga_buffer_monitor.cc
View File

@ -20,6 +20,7 @@
*/ */
#include "fpga_buffer_monitor.h" #include "fpga_buffer_monitor.h"
#include "command_event.h"
#include "gnss_sdr_create_directory.h" #include "gnss_sdr_create_directory.h"
#include "gnss_sdr_filesystem.h" #include "gnss_sdr_filesystem.h"
#include <glog/logging.h> #include <glog/logging.h>
@ -29,11 +30,12 @@
#include <iostream> // for cout #include <iostream> // for cout
#include <sys/mman.h> // for mmap #include <sys/mman.h> // for mmap
Fpga_buffer_monitor::Fpga_buffer_monitor(const std::string &device_name, uint32_t num_freq_bands, bool dump, std::string dump_filename) Fpga_buffer_monitor::Fpga_buffer_monitor(const std::string &device_name, uint32_t num_freq_bands, bool dump, std::string dump_filename, Concurrent_Queue<pmt::pmt_t> *queue)
{ {
d_num_freq_bands = num_freq_bands; d_num_freq_bands = num_freq_bands;
d_dump = dump; d_dump = dump;
d_dump_filename = dump_filename; d_dump_filename = dump_filename;
d_queue = queue;
// open device descriptor // open device descriptor
if ((d_device_descriptor = open(device_name.c_str(), O_RDWR | O_SYNC)) == -1) if ((d_device_descriptor = open(device_name.c_str(), O_RDWR | O_SYNC)) == -1)
@ -143,23 +145,31 @@ Fpga_buffer_monitor::~Fpga_buffer_monitor()
void Fpga_buffer_monitor::check_buffer_overflow_and_monitor_buffer_status(void) void Fpga_buffer_monitor::check_buffer_overflow_and_monitor_buffer_status(void)
{ {
// check buffer overflow flags // check buffer overflow flags
bool overflow_detected = false;
uint32_t buffer_overflow_status = d_map_base[overflow_flags_reg_addr]; uint32_t buffer_overflow_status = d_map_base[overflow_flags_reg_addr];
if ((buffer_overflow_status & overflow_freq_band_0_bit_pos) != 0) if ((buffer_overflow_status & overflow_freq_band_0_bit_pos) != 0)
{ {
overflow_detected = true;
std::cout << "Buffer overflow in frequency band 0" << std::endl; std::cout << "Buffer overflow in frequency band 0" << std::endl;
throw std::exception();
} }
if (d_num_freq_bands > 1) if (d_num_freq_bands > 1)
{ {
if ((buffer_overflow_status & overflow_freq_band_1_bit_pos) != 0) if ((buffer_overflow_status & overflow_freq_band_1_bit_pos) != 0)
{ {
overflow_detected = true;
std::cout << "Buffer overflow in frequency band 1" << std::endl; std::cout << "Buffer overflow in frequency band 1" << std::endl;
throw std::exception();
} }
} }
if (overflow_detected)
{
LOG(INFO) << "Stopping receiver, FPGA buffer overflow detected.";
d_queue->push(pmt::make_any(command_event_make(200, 0)));
}
// buffer monitor
if (d_dump == 1) if (d_dump == 1)
{ {
uint32_t current_buff_occ_freq_band_0 = d_map_base[current_buff_occ_freq_band_0_reg_addr] * num_sapmples_per_buffer_element; uint32_t current_buff_occ_freq_band_0 = d_map_base[current_buff_occ_freq_band_0_reg_addr] * num_sapmples_per_buffer_element;
@ -178,21 +188,22 @@ void Fpga_buffer_monitor::check_buffer_overflow_and_monitor_buffer_status(void)
strftime(buff_time_ch, sizeof(buff_time_ch), "%d-%m-%Y %H:%M:%S", timeinfo); strftime(buff_time_ch, sizeof(buff_time_ch), "%d-%m-%Y %H:%M:%S", timeinfo);
std::string buffer_time(buff_time_ch); std::string buffer_time(buff_time_ch);
d_dump_file << buffer_time << std::endl; d_dump_file << buffer_time << " ";
std::string buffer_txt; std::string buffer_txt;
// current buffer occupancy frequency band 0 // current buffer occupancy frequency band 0
buffer_txt = std::to_string(current_buff_occ_freq_band_0); buffer_txt = std::to_string(current_buff_occ_freq_band_0);
d_dump_file << buffer_txt << std::endl; d_dump_file << buffer_txt << " ";
// temporary maximum buffer occupancy frequency band 0 // temporary maximum buffer occupancy frequency band 0
buffer_txt = std::to_string(temp_max_buff_occ_freq_band_0); buffer_txt = std::to_string(temp_max_buff_occ_freq_band_0);
d_dump_file << buffer_txt << std::endl; d_dump_file << buffer_txt << " ";
// maximum buffer occupancy frequency band 0 // maximum buffer occupancy frequency band 0
buffer_txt = std::to_string(d_max_buff_occ_freq_band_0); buffer_txt = std::to_string(d_max_buff_occ_freq_band_0);
d_dump_file << buffer_txt << std::endl; d_dump_file << buffer_txt;
if (d_num_freq_bands > 1) if (d_num_freq_bands > 1)
{ {
d_dump_file << " ";
uint32_t current_buff_occ_freq_band_1 = d_map_base[current_buff_occ_freq_band_1_reg_addr] * num_sapmples_per_buffer_element; uint32_t current_buff_occ_freq_band_1 = d_map_base[current_buff_occ_freq_band_1_reg_addr] * num_sapmples_per_buffer_element;
uint32_t temp_max_buff_occ_freq_band_1 = d_map_base[max_buff_occ_freq_band_1_reg_addr] * num_sapmples_per_buffer_element; uint32_t temp_max_buff_occ_freq_band_1 = d_map_base[max_buff_occ_freq_band_1_reg_addr] * num_sapmples_per_buffer_element;
if (temp_max_buff_occ_freq_band_1 > d_max_buff_occ_freq_band_1) if (temp_max_buff_occ_freq_band_1 > d_max_buff_occ_freq_band_1)
@ -202,14 +213,18 @@ void Fpga_buffer_monitor::check_buffer_overflow_and_monitor_buffer_status(void)
// current buffer occupancy frequency band 1 // current buffer occupancy frequency band 1
buffer_txt = std::to_string(current_buff_occ_freq_band_1); buffer_txt = std::to_string(current_buff_occ_freq_band_1);
d_dump_file << buffer_txt << std::endl; d_dump_file << buffer_txt << " ";
// temporary maximum buffer occupancy frequency band 1 // temporary maximum buffer occupancy frequency band 1
buffer_txt = std::to_string(temp_max_buff_occ_freq_band_1); buffer_txt = std::to_string(temp_max_buff_occ_freq_band_1);
d_dump_file << buffer_txt << std::endl; d_dump_file << buffer_txt << " ";
// maximum buffer occupancy frequency band 1 // maximum buffer occupancy frequency band 1
buffer_txt = std::to_string(d_max_buff_occ_freq_band_1); buffer_txt = std::to_string(d_max_buff_occ_freq_band_1);
d_dump_file << buffer_txt << std::endl; d_dump_file << buffer_txt << std::endl;
} }
else
{
d_dump_file << std::endl;
}
} }
} }

10
src/algorithms/signal_source/libs/fpga_buffer_monitor.h
View File

@ -22,8 +22,10 @@
#ifndef GNSS_SDR_FPGA_BUFFER_MONITOR_H #ifndef GNSS_SDR_FPGA_BUFFER_MONITOR_H
#define GNSS_SDR_FPGA_BUFFER_MONITOR_H #define GNSS_SDR_FPGA_BUFFER_MONITOR_H
#include <cstdint> // for int32_t #include "concurrent_queue.h"
#include <fstream> // for string, ofstream #include <pmt/pmt.h> // pmt
#include <cstdint> // for int32_t
#include <fstream> // for string, ofstream
/** \addtogroup Signal_Source /** \addtogroup Signal_Source
* \{ */ * \{ */
@ -40,7 +42,7 @@ public:
/*! /*!
* \brief Constructor * \brief Constructor
*/ */
explicit Fpga_buffer_monitor(const std::string& device_name, uint32_t num_freq_bands, bool dump, std::string dump_filename); explicit Fpga_buffer_monitor(const std::string& device_name, uint32_t num_freq_bands, bool dump, std::string dump_filename, Concurrent_Queue<pmt::pmt_t>* queue);
/*! /*!
* \brief Destructor * \brief Destructor
@ -84,6 +86,8 @@ private:
bool d_dump; bool d_dump;
std::string d_dump_filename; std::string d_dump_filename;
std::ofstream d_dump_file; std::ofstream d_dump_file;
Concurrent_Queue<pmt::pmt_t>* d_queue;
}; };