X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=5500292a8df777563b624a5365a241bd7e93978b;hp=5eaff586b6ff787a7fc6a9bb4308a3b2deac3132;hb=3d79f521396c8e908fd237f5328153165099f5c3;hpb=d23445348bf04a698e062a3b917360313ecbcaad diff --git a/pv/storesession.cpp b/pv/storesession.cpp index 5eaff586..5500292a 100644 --- a/pv/storesession.cpp +++ b/pv/storesession.cpp @@ -20,17 +20,34 @@ #include -#include "storesession.h" +#ifdef _WIN32 +// Windows: Avoid boost/thread namespace pollution (which includes windows.h). +#define NOGDI +#define NORESOURCE +#endif +#include +#include -#include -#include -#include -#include +#include "storesession.hpp" + +#include +#include +#include +#include +#include +#include + +#include + +using boost::shared_lock; +using boost::shared_mutex; using std::deque; using std::dynamic_pointer_cast; +using std::ios_base; using std::lock_guard; using std::make_pair; +using std::map; using std::min; using std::mutex; using std::pair; @@ -38,19 +55,33 @@ using std::set; using std::shared_ptr; using std::string; using std::thread; +using std::unordered_set; using std::vector; +using Glib::VariantBase; + +using sigrok::ConfigKey; +using sigrok::Error; +using sigrok::OutputFormat; +using sigrok::OutputFlag; + namespace pv { const size_t StoreSession::BlockSize = 1024 * 1024; StoreSession::StoreSession(const std::string &file_name, - const SigSession &session) : - _file_name(file_name), - _session(session), - _interrupt(false), - _units_stored(0), - _unit_count(0) + const shared_ptr &output_format, + const map &options, + const std::pair sample_range, + const Session &session) : + file_name_(file_name), + output_format_(output_format), + options_(options), + sample_range_(sample_range), + session_(session), + interrupt_(false), + units_stored_(0), + unit_count_(0) { } @@ -59,132 +90,162 @@ StoreSession::~StoreSession() wait(); } -pair StoreSession::progress() const +pair StoreSession::progress() const { - return make_pair(_units_stored.load(), _unit_count.load()); + return make_pair(units_stored_.load(), unit_count_.load()); } const QString& StoreSession::error() const { - lock_guard lock(_mutex); - return _error; + lock_guard lock(mutex_); + return error_; } bool StoreSession::start() { - set< shared_ptr > data_set = - _session.get_data(); - const vector< shared_ptr > sigs = - _session.get_signals(); + const unordered_set< shared_ptr > sigs(session_.signals()); + + // Add enabled channels to the data set + set< shared_ptr > data_set; + + for (shared_ptr signal : sigs) + if (signal->enabled()) + data_set.insert(signal->data()); // Check we have logic data if (data_set.empty() || sigs.empty()) { - _error = tr("No data to save."); + error_ = tr("No data to save."); return false; } if (data_set.size() > 1) { - _error = tr("PulseView currently only has support for " + error_ = tr("PulseView currently only has support for " "storing a single data stream."); return false; } // Get the logic data - //shared_ptr data; if (!(data = dynamic_pointer_cast(*data_set.begin()))) { - _error = tr("PulseView currently only has support for " - "storing a logic data."); + error_ = tr("PulseView currently only has support for " + "storing logic data."); return false; } - // Get the snapshot - const deque< shared_ptr > &snapshots = - data->get_snapshots(); + // Get the segment + const deque< shared_ptr > &segments = + data->logic_segments(); - if (snapshots.empty()) { - _error = tr("No snapshots to save."); + if (segments.empty()) { + error_ = tr("No segments to save."); return false; } - const shared_ptr snapshot(snapshots.front()); - assert(snapshot); + const shared_ptr segment(segments.front()); + assert(segment); - // Make a list of probes - char **const probes = new char*[sigs.size() + 1]; - for (size_t i = 0; i < sigs.size(); i++) { - shared_ptr sig(sigs[i]); - assert(sig); - probes[i] = strdup(sig->get_name().toUtf8().constData()); + // Check whether the user wants to export a certain sample range + if (sample_range_.first == sample_range_.second) { + start_sample_ = 0; + sample_count_ = segment->get_sample_count(); + } else { + start_sample_ = std::min(sample_range_.first, sample_range_.second); + sample_count_ = std::abs(sample_range_.second - sample_range_.first); } - probes[sigs.size()] = NULL; // Begin storing - if (sr_session_save_init(_file_name.c_str(), - data->samplerate(), probes) != SR_OK) { - _error = tr("Error while saving."); + try { + const auto context = session_.device_manager().context(); + auto device = session_.device()->device(); + + map options = options_; + + if (!output_format_->test_flag(OutputFlag::INTERNAL_IO_HANDLING)) + output_stream_.open(file_name_, ios_base::binary | + ios_base::trunc | ios_base::out); + + output_ = output_format_->create_output(file_name_, device, options); + auto meta = context->create_meta_packet( + {{ConfigKey::SAMPLERATE, Glib::Variant::create( + segment->samplerate())}}); + output_->receive(meta); + } catch (Error error) { + error_ = tr("Error while saving."); return false; } - // Delete the probes array - for (size_t i = 0; i <= sigs.size(); i++) - free(probes[i]); - delete[] probes; - - _thread = std::thread(&StoreSession::store_proc, this, snapshot); + thread_ = std::thread(&StoreSession::store_proc, this, segment); return true; } void StoreSession::wait() { - if (_thread.joinable()) - _thread.join(); + if (thread_.joinable()) + thread_.join(); } void StoreSession::cancel() { - _interrupt = true; + interrupt_ = true; } -void StoreSession::store_proc(shared_ptr snapshot) +void StoreSession::store_proc(shared_ptr segment) { - assert(snapshot); + assert(segment); - uint64_t start_sample = 0; + unsigned progress_scale = 0; /// TODO: Wrap this in a std::unique_ptr when we transition to C++11 uint8_t *const data = new uint8_t[BlockSize]; assert(data); - const int unit_size = snapshot->unit_size(); + const int unit_size = segment->unit_size(); assert(unit_size != 0); - _unit_count = snapshot->get_sample_count(); + // Qt needs the progress values to fit inside an int. If they would + // not, scale the current and max values down until they do. + while ((sample_count_ >> progress_scale) > INT_MAX) + progress_scale ++; + + unit_count_ = sample_count_ >> progress_scale; const unsigned int samples_per_block = BlockSize / unit_size; - while (!_interrupt && start_sample < _unit_count) + while (!interrupt_ && sample_count_) { progress_updated(); - const uint64_t end_sample = min( - start_sample + samples_per_block, _unit_count.load()); - snapshot->get_samples(data, start_sample, end_sample); + const uint64_t packet_len = + std::min((uint64_t)samples_per_block, sample_count_); + + segment->get_samples(data, start_sample_, start_sample_ + packet_len); - if(sr_session_append(_file_name.c_str(), data, unit_size, - end_sample - start_sample) != SR_OK) - { - _error = tr("Error while saving."); + size_t length = packet_len * unit_size; + + try { + const auto context = session_.device_manager().context(); + auto logic = context->create_logic_packet(data, length, unit_size); + const string data = output_->receive(logic); + if (output_stream_.is_open()) + output_stream_ << data; + } catch (Error error) { + error_ = tr("Error while saving."); break; } - start_sample = end_sample; - _units_stored = start_sample; + sample_count_ -= packet_len; + start_sample_ += packet_len; + units_stored_ = unit_count_ - (sample_count_ >> progress_scale); } - _unit_count = 0; + // Zeroing the progress variables indicates completion + units_stored_ = unit_count_ = 0; + progress_updated(); + output_.reset(); + output_stream_.close(); + delete[] data; }