X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=d58fd4981d3f5830f8c3c64b92f95d7347da92a4;hp=9b8dac9c579783aafada6f25fea13f0db53a19af;hb=c1035a1452fa2aec5414975e83e531c10504b80c;hpb=bb3030b34e44733036acdfe5b4d4ec0705146831

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 9b8dac9c..d58fd498 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -20,17 +20,24 @@
 
 #include <cassert>
 
-#include "storesession.h"
+#include "storesession.hpp"
 
-#include <pv/sigsession.h>
-#include <pv/data/logic.h>
-#include <pv/data/logicsnapshot.h>
-#include <pv/view/signal.h>
+#include <pv/session.hpp>
+#include <pv/data/logic.hpp>
+#include <pv/data/logicsegment.hpp>
+#include <pv/view/signal.hpp>
+
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
+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;
@@ -40,17 +47,22 @@ using std::string;
 using std::thread;
 using std::vector;
 
+using sigrok::ConfigKey;
+using sigrok::Error;
+using sigrok::OutputFormat;
+
 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<OutputFormat> &output_format, const Session &session) :
+	file_name_(file_name),
+	output_format_(output_format),
+	session_(session),
+	interrupt_(false),
+	units_stored_(0),
+	unit_count_(0)
 {
 }
 
@@ -61,94 +73,100 @@ StoreSession::~StoreSession()
 
 pair<int, int> 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<mutex> lock(_mutex);
-	return _error;
+	lock_guard<mutex> lock(mutex_);
+	return error_;
 }
 
 bool StoreSession::start()
 {
 	set< shared_ptr<data::SignalData> > data_set =
-		_session.get_data();
-	const vector< shared_ptr<view::Signal> > sigs =
-		_session.get_signals();
+		session_.get_data();
+
+	shared_lock<shared_mutex> lock(session_.signals_mutex());
+	const vector< shared_ptr<view::Signal> > &sigs(session_.signals());
 
 	// 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::SignalData
 	shared_ptr<data::Logic> data;
 	if (!(data = dynamic_pointer_cast<data::Logic>(*data_set.begin()))) {
-		_error = tr("PulseView currently only has support for "
+		error_ = tr("PulseView currently only has support for "
 			"storing a logic data.");
 		return false;
 	}
 
-	// Get the snapshot
-	const deque< shared_ptr<data::LogicSnapshot> > &snapshots =
-		data->get_snapshots();
+	// Get the segment
+	const deque< shared_ptr<data::LogicSegment> > &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<data::LogicSnapshot> snapshot(snapshots.front());
-	assert(snapshot);
-
-	// Make a list of probes
-	char **const probes = new char*[sigs.size() + 1];
-	for (size_t i = 0; i < sigs.size(); i++) {
-		shared_ptr<view::Signal> sig(sigs[i]);
-		assert(sig);
-		probes[i] = strdup(sig->get_name().toUtf8().constData());
-	}
-	probes[sigs.size()] = NULL;
+	const shared_ptr<data::LogicSegment> segment(segments.front());
+	assert(segment);
 
 	// Begin storing
-	if (sr_session_save_init(SigSession::_sr_session, _file_name.c_str(),
-		data->samplerate(), probes) != SR_OK) {
-		_error = tr("Error while saving.");
+	try {
+		auto context = session_.session()->context();
+		auto device = session_.device();
+
+		map<string, Glib::VariantBase> options;
+
+		// If the output has the capability to write files, use it.
+		// Otherwise, open the output stream.
+		const auto opt_list = output_format_->options();
+		if (opt_list.find("filename") != opt_list.end())
+			options["filename"] =
+				Glib::Variant<Glib::ustring>::create(file_name_);
+		else
+			output_stream_.open(file_name_, ios_base::binary |
+				ios_base::trunc | ios_base::out);
+
+		output_ = output_format_->create_output(device, options);
+		auto meta = context->create_meta_packet(
+			{{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::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<data::LogicSnapshot> snapshot)
+void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
 {
-	assert(snapshot);
+	assert(segment);
 
 	uint64_t start_sample = 0, sample_count;
 	unsigned progress_scale = 0;
@@ -157,42 +175,53 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
 	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);
 
-	sample_count = snapshot->get_sample_count();
+	sample_count = segment->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;
+	unit_count_ = sample_count >> progress_scale;
 
 	const unsigned int samples_per_block = BlockSize / unit_size;
 
-	while (!_interrupt && start_sample < sample_count)
+	while (!interrupt_ && start_sample < sample_count)
 	{
 		progress_updated();
 
 		const uint64_t end_sample = min(
 			start_sample + samples_per_block, sample_count);
-		snapshot->get_samples(data, start_sample, end_sample);
-
-		if(sr_session_append(SigSession::_sr_session, _file_name.c_str(), data,
-			unit_size, end_sample - start_sample) != SR_OK)
-		{
-			_error = tr("Error while saving.");
+		segment->get_samples(data, start_sample, end_sample);
+
+		size_t length = end_sample - start_sample;
+
+		try {
+			auto context = session_.session()->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 >> progress_scale;
+		units_stored_ = start_sample >> 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;
 }