mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-10 20:10:05 +00:00
Code Issues Releases Wiki Activity

Use std::ifstream instead of FILE for reading sample data

Browse Source
This commit is contained in:
Victor Castillo 2024-08-19 15:37:58 +02:00
parent 4d1540181d
commit f1957476b8
No known key found for this signature in database
GPG Key ID: 8EF1FC8B7182F608
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/algorithms/signal_source/libs/ion_gsms.cc
View File

@ -30,14 +30,14 @@ IONGSMSFileSource::IONGSMSFileSource(
"ion_gsms_file_source", "ion_gsms_file_source",
gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0),
make_output_signature(block, stream_ids)), make_output_signature(block, stream_ids)),
file_stream_(metadata_filepath.parent_path() / file.Url().Value()),
io_buffer_offset_(0), io_buffer_offset_(0),
maximum_item_rate_(0), maximum_item_rate_(0),
chunk_cycle_length_(0) chunk_cycle_length_(0)
{ {
fs::path data_filepath = metadata_filepath.parent_path() / file.Url().Value(); fs::path data_filepath = metadata_filepath.parent_path() / file.Url().Value();
fd_ = std::fopen(data_filepath.c_str(), "rb");
std::size_t block_offset = file.Offset(); std::size_t block_offset = file.Offset();
std::fseek(fd_, file.Offset() + block_offset + block.SizeHeader(), SEEK_SET); file_stream_.seekg(file.Offset() + block_offset + block.SizeHeader());
std::size_t output_stream_offset = 0; std::size_t output_stream_offset = 0;
for (const auto& chunk : block.Chunks()) for (const auto& chunk : block.Chunks())
@ -56,12 +56,6 @@ IONGSMSFileSource::IONGSMSFileSource(
} }
IONGSMSFileSource::~IONGSMSFileSource()
{
std::fclose(fd_);
}
int IONGSMSFileSource::work( int IONGSMSFileSource::work(
int noutput_items, int noutput_items,
gr_vector_const_void_star& input_items __attribute__((unused)), gr_vector_const_void_star& input_items __attribute__((unused)),
@ -70,7 +64,7 @@ int IONGSMSFileSource::work(
const std::size_t max_sample_output = std::floor((noutput_items - 1.0) / maximum_item_rate_); const std::size_t max_sample_output = std::floor((noutput_items - 1.0) / maximum_item_rate_);
io_buffer_.resize(max_sample_output * chunk_cycle_length_); io_buffer_.resize(max_sample_output * chunk_cycle_length_);
io_buffer_offset_ = 0; io_buffer_offset_ = 0;
std::fread(io_buffer_.data(), sizeof(decltype(io_buffer_)::value_type), io_buffer_.size(), fd_); file_stream_.read(io_buffer_.data(), sizeof(decltype(io_buffer_)::value_type) * io_buffer_.size());
items_produced_.resize(output_items.size()); items_produced_.resize(output_items.size());
for (int& i : items_produced_) for (int& i : items_produced_)
@ -83,7 +77,7 @@ int IONGSMSFileSource::work(
for (auto& c : chunk_data_) for (auto& c : chunk_data_)
{ {
auto* chunk = c.get(); auto* chunk = c.get();
io_buffer_offset_ += chunk->read_from_buffer(io_buffer_.data(), io_buffer_offset_); io_buffer_offset_ += chunk->read_from_buffer(reinterpret_cast<uint8_t*>(io_buffer_.data()), io_buffer_offset_);
chunk->write_to_output(output_items, items_produced_); chunk->write_to_output(output_items, items_produced_);
} }
} }

7
src/algorithms/signal_source/libs/ion_gsms.h
View File

@ -27,6 +27,7 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <fstream>
/** \addtogroup Signal_Source /** \addtogroup Signal_Source
* \{ */ * \{ */
@ -44,8 +45,6 @@ public:
const GnssMetadata::Block& block, const GnssMetadata::Block& block,
const std::vector<std::string>& stream_ids); const std::vector<std::string>& stream_ids);
~IONGSMSFileSource() override;
int work( int work(
int noutput_items, int noutput_items,
gr_vector_const_void_star& input_items, gr_vector_const_void_star& input_items,
@ -57,8 +56,8 @@ public:
private: private:
static gr::io_signature::sptr make_output_signature(const GnssMetadata::Block& block, const std::vector<std::string>& stream_ids); static gr::io_signature::sptr make_output_signature(const GnssMetadata::Block& block, const std::vector<std::string>& stream_ids);
FILE* fd_; std::ifstream file_stream_;
std::vector<uint8_t> io_buffer_; std::vector<char> io_buffer_;
std::size_t io_buffer_offset_; std::size_t io_buffer_offset_;
std::vector<int> items_produced_; std::vector<int> items_produced_;
std::size_t output_stream_count_; std::size_t output_stream_count_;