X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=3d7b058a87034b6c02cc4109347e798b94702b40;hp=55b199a3380bfee054f1152000c7c87c380b55c9;hb=ff046cb6c42a2382ee281e83955b7ae44030b42e;hpb=038a14278afb24e10cd59991c2cafd97264fd3a5 diff --git a/pv/storesession.cpp b/pv/storesession.cpp index 55b199a3..3d7b058a 100644 --- a/pv/storesession.cpp +++ b/pv/storesession.cpp @@ -19,32 +19,20 @@ #include -#ifdef _WIN32 -// Windows: Avoid boost/thread namespace pollution (which includes windows.h). -#define NOGDI -#define NORESOURCE -#endif -#include -#include - #include "storesession.hpp" -#include -#include #include #include #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; @@ -52,16 +40,13 @@ using std::map; using std::min; using std::mutex; using std::pair; -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::ChannelType; using sigrok::ConfigKey; using sigrok::Error; using sigrok::OutputFormat; @@ -69,12 +54,12 @@ using sigrok::OutputFlag; namespace pv { -const size_t StoreSession::BlockSize = 1024 * 1024; +const size_t StoreSession::BlockSize = 10 * 1024 * 1024; -StoreSession::StoreSession(const std::string &file_name, +StoreSession::StoreSession(const string &file_name, const shared_ptr &output_format, const map &options, - const std::pair sample_range, + const pair sample_range, const Session &session) : file_name_(file_name), output_format_(output_format), @@ -116,7 +101,7 @@ bool StoreSession::start() if (!signal->enabled()) continue; - if (signal->type() == ChannelType::LOGIC) { + if (signal->type() == data::SignalBase::LogicChannel) { // All logic channels share the same data segments shared_ptr ldata = signal->logic_data(); @@ -132,7 +117,7 @@ bool StoreSession::start() any_segment = lsegment; } - if (signal->type() == ChannelType::ANALOG) { + if (signal->type() == data::SignalBase::AnalogChannel) { // Each analog channel has its own segments shared_ptr adata = signal->analog_data(); @@ -160,6 +145,7 @@ bool StoreSession::start() uint64_t end_sample; if (sample_range_.first == sample_range_.second) { + // No sample range specified, save everything we have start_sample_ = 0; sample_count_ = any_segment->get_sample_count(); } else { @@ -174,6 +160,12 @@ bool StoreSession::start() } } + // Make sure the sample range is valid + if (start_sample_ > any_segment->get_sample_count()) { + error_ = tr("Can't save range without sample data."); + return false; + } + // Begin storing try { const auto context = session_.device_manager().context(); @@ -190,7 +182,7 @@ bool StoreSession::start() {{ConfigKey::SAMPLERATE, Glib::Variant::create( any_segment->samplerate())}}); output_->receive(meta); - } catch (Error error) { + } catch (Error& error) { error_ = tr("Error while saving: ") + error.what(); return false; } @@ -235,18 +227,18 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_li // 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 ++; + progress_scale++; unit_count_ = sample_count_ >> progress_scale; const unsigned int samples_per_block = - std::min(asamples_per_block, lsamples_per_block); + min(asamples_per_block, lsamples_per_block); while (!interrupt_ && sample_count_) { progress_updated(); const uint64_t packet_len = - std::min((uint64_t)samples_per_block, sample_count_); + min((uint64_t)samples_per_block, sample_count_); try { const auto context = session_.device_manager().context(); @@ -255,11 +247,9 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_li shared_ptr achannel = (achannel_list.at(i))->channel(); shared_ptr asegment = asegment_list.at(i); - const float *adata = - asegment->get_samples(start_sample_, start_sample_ + packet_len); + float *adata = new float[packet_len]; + asegment->get_samples(start_sample_, start_sample_ + packet_len, adata); - // The srzip format currently only supports packets with one - // analog channel. See zip_append_analog() in srzip.c auto analog = context->create_analog_packet( vector >{achannel}, (float *)adata, packet_len, @@ -274,11 +264,11 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_li } if (lsegment) { - const uint8_t* ldata = - lsegment->get_samples(start_sample_, start_sample_ + packet_len); + const size_t data_size = packet_len * lunit_size; + uint8_t* ldata = new uint8_t[data_size]; + lsegment->get_samples(start_sample_, start_sample_ + packet_len, ldata); - const size_t length = packet_len * lunit_size; - auto logic = context->create_logic_packet((void*)ldata, length, lunit_size); + auto logic = context->create_logic_packet((void*)ldata, data_size, lunit_size); const string ldata_str = output_->receive(logic); if (output_stream_.is_open()) @@ -286,7 +276,7 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_li delete[] ldata; } - } catch (Error error) { + } catch (Error& error) { error_ = tr("Error while saving: ") + error.what(); break; } @@ -306,4 +296,4 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_li output_stream_.close(); } -} // pv +} // namespace pv