X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fstoresession.cpp;h=ee1a3a03f096cf5c55d3a0ce16ea3f3c85496669;hb=5f9a52096e07e399d76da6724c1cf56bf4511c9f;hp=bdb0f27981839087fac4f01c90ee05cac4b5cb47;hpb=3e8a7cc6af5558a249c114b1609ececa2a381774;p=pulseview.git
diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index bdb0f27..ee1a3a0 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -14,36 +14,25 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#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
#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;
@@ -51,10 +40,8 @@ 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;
@@ -67,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),
@@ -103,61 +90,82 @@ const QString& StoreSession::error() const
bool StoreSession::start()
{
- const unordered_set< shared_ptr > sigs(session_.signals());
+ const unordered_set< shared_ptr > sigs(session_.signalbases());
- // Add enabled channels to the data set
- set< shared_ptr > data_set;
+ shared_ptr any_segment;
+ shared_ptr lsegment;
+ vector< shared_ptr > achannel_list;
+ vector< shared_ptr > asegment_list;
- for (shared_ptr signal : sigs)
- if (signal->enabled())
- data_set.insert(signal->data());
+ for (const shared_ptr& signal : sigs) {
+ if (!signal->enabled())
+ continue;
- // Check we have logic data
- if (data_set.empty() || sigs.empty()) {
- error_ = tr("No data to save.");
- return false;
- }
+ if (signal->type() == data::SignalBase::LogicChannel) {
+ // All logic channels share the same data segments
+ shared_ptr ldata = signal->logic_data();
- if (data_set.size() > 1) {
- error_ = tr("PulseView currently only has support for "
- "storing a single data stream.");
- return false;
- }
+ const deque< shared_ptr > &lsegments =
+ ldata->logic_segments();
- // Get the logic data
- shared_ptr data;
- if (!(data = dynamic_pointer_cast(*data_set.begin()))) {
- error_ = tr("PulseView currently only has support for "
- "storing logic data.");
- return false;
- }
+ if (lsegments.empty()) {
+ error_ = tr("Can't save logic channel without data.");
+ return false;
+ }
- // Get the segment
- const deque< shared_ptr > &segments =
- data->logic_segments();
+ lsegment = lsegments.front();
+ any_segment = lsegment;
+ }
- if (segments.empty()) {
- error_ = tr("No segments to save.");
- return false;
+ if (signal->type() == data::SignalBase::AnalogChannel) {
+ // Each analog channel has its own segments
+ shared_ptr adata = signal->analog_data();
+
+ const deque< shared_ptr > &asegments =
+ adata->analog_segments();
+
+ if (asegments.empty()) {
+ error_ = tr("Can't save analog channel without data.");
+ return false;
+ }
+
+ asegment_list.push_back(asegments.front());
+ any_segment = asegments.front();
+
+ achannel_list.push_back(signal);
+ }
}
- const shared_ptr segment(segments.front());
- assert(segment);
+ if (!any_segment) {
+ error_ = tr("No channels enabled.");
+ return false;
+ }
// Check whether the user wants to export a certain sample range
+ uint64_t end_sample;
+
if (sample_range_.first == sample_range_.second) {
+ // No sample range specified, save everything we have
start_sample_ = 0;
- sample_count_ = segment->get_sample_count();
+ sample_count_ = any_segment->get_sample_count();
} else {
if (sample_range_.first > sample_range_.second) {
start_sample_ = sample_range_.second;
- sample_count_ = sample_range_.first - sample_range_.second;
+ end_sample = min(sample_range_.first, any_segment->get_sample_count());
+ sample_count_ = end_sample - start_sample_;
} else {
start_sample_ = sample_range_.first;
- sample_count_ = sample_range_.second - sample_range_.first;
+ end_sample = min(sample_range_.second, any_segment->get_sample_count());
+ sample_count_ = end_sample - start_sample_;
}
}
+ // 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();
@@ -172,14 +180,15 @@ bool StoreSession::start()
output_ = output_format_->create_output(file_name_, device, options);
auto meta = context->create_meta_packet(
{{ConfigKey::SAMPLERATE, Glib::Variant::create(
- segment->samplerate())}});
+ any_segment->samplerate())}});
output_->receive(meta);
- } catch (Error error) {
- error_ = tr("Error while saving.");
+ } catch (Error& error) {
+ error_ = tr("Error while saving: ") + error.what();
return false;
}
- thread_ = std::thread(&StoreSession::store_proc, this, segment);
+ thread_ = std::thread(&StoreSession::store_proc, this,
+ achannel_list, asegment_list, lsegment);
return true;
}
@@ -194,47 +203,81 @@ void StoreSession::cancel()
interrupt_ = true;
}
-void StoreSession::store_proc(shared_ptr segment)
+void StoreSession::store_proc(vector< shared_ptr > achannel_list,
+ vector< shared_ptr > asegment_list,
+ shared_ptr lsegment)
{
- assert(segment);
-
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);
+ int aunit_size = 0;
+ int lunit_size = 0;
+ unsigned int lsamples_per_block = INT_MAX;
+ unsigned int asamples_per_block = INT_MAX;
- const int unit_size = segment->unit_size();
- assert(unit_size != 0);
+ if (!asegment_list.empty()) {
+ // We assume all analog channels use the sample unit size
+ aunit_size = asegment_list.front()->unit_size();
+ asamples_per_block = BlockSize / aunit_size;
+ }
+ if (lsegment) {
+ lunit_size = lsegment->unit_size();
+ lsamples_per_block = BlockSize / lunit_size;
+ }
// 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 = BlockSize / unit_size;
+ const unsigned int samples_per_block =
+ min(asamples_per_block, lsamples_per_block);
- while (!interrupt_ && sample_count_)
- {
+ while (!interrupt_ && sample_count_) {
progress_updated();
const uint64_t packet_len =
- std::min((uint64_t)samples_per_block, sample_count_);
-
- segment->get_samples(data, start_sample_, start_sample_ + packet_len);
-
- size_t length = packet_len * unit_size;
+ min((uint64_t)samples_per_block, sample_count_);
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.");
+
+ for (unsigned int i = 0; i < achannel_list.size(); i++) {
+ shared_ptr achannel = (achannel_list.at(i))->channel();
+ shared_ptr asegment = asegment_list.at(i);
+
+ float *adata = new float[packet_len];
+ asegment->get_samples(start_sample_, start_sample_ + packet_len, adata);
+
+ auto analog = context->create_analog_packet(
+ vector >{achannel},
+ (float *)adata, packet_len,
+ sigrok::Quantity::VOLTAGE, sigrok::Unit::VOLT,
+ vector());
+ const string adata_str = output_->receive(analog);
+
+ if (output_stream_.is_open())
+ output_stream_ << adata_str;
+
+ delete[] adata;
+ }
+
+ if (lsegment) {
+ 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);
+
+ auto logic = context->create_logic_packet((void*)ldata, data_size, lunit_size);
+ const string ldata_str = output_->receive(logic);
+
+ if (output_stream_.is_open())
+ output_stream_ << ldata_str;
+
+ delete[] ldata;
+ }
+ } catch (Error& error) {
+ error_ = tr("Error while saving: ") + error.what();
break;
}
@@ -246,12 +289,11 @@ void StoreSession::store_proc(shared_ptr segment)
// Zeroing the progress variables indicates completion
units_stored_ = unit_count_ = 0;
+ store_successful();
progress_updated();
output_.reset();
output_stream_.close();
-
- delete[] data;
}
-} // pv
+} // namespace pv