* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "storesession.h"
+#include <cassert>
-#include <pv/sigsession.h>
-#include <pv/data/logic.h>
-#include <pv/data/logicsnapshot.h>
-#include <pv/view/signal.h>
+#include "storesession.hpp"
+
+#include <pv/devicemanager.hpp>
+#include <pv/session.hpp>
+#include <pv/data/logic.hpp>
+#include <pv/data/logicsegment.hpp>
+#include <pv/devices/device.hpp>
+#include <pv/view/signal.hpp>
+
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
+using boost::shared_lock;
+using boost::shared_mutex;
-using boost::mutex;
-using boost::thread;
-using boost::lock_guard;
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;
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),
- _units_stored(0),
- _unit_count(0)
+ const shared_ptr<OutputFormat> &output_format,
+ const map<string, VariantBase> &options, const Session &session) :
+ file_name_(file_name),
+ output_format_(output_format),
+ options_(options),
+ session_(session),
+ interrupt_(false),
+ units_stored_(0),
+ unit_count_(0)
{
}
wait();
}
-pair<uint64_t, uint64_t> StoreSession::progress() const
+pair<int, int> StoreSession::progress() const
{
- lock_guard<mutex> lock(_mutex);
- return make_pair(_units_stored, _unit_count);
+ 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();
+ shared_lock<shared_mutex> lock(session_.signals_mutex());
+ const unordered_set< shared_ptr<view::Signal> > &sigs(session_.signals());
+
+ // Add enabled channels to the data set
+ set< shared_ptr<data::SignalData> > data_set;
+
+ for (shared_ptr<view::Signal> 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::SignalData
shared_ptr<data::Logic> data;
if (!(data = dynamic_pointer_cast<data::Logic>(*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<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(_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<string, Glib::VariantBase> 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<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 = boost::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()
{
- _thread.interrupt();
+ 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;
+ uint64_t start_sample = 0, sample_count;
+ 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);
- {
- lock_guard<mutex> lock(_mutex);
- _unit_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;
const unsigned int samples_per_block = BlockSize / unit_size;
- while (!boost::this_thread::interruption_requested() &&
- start_sample < _unit_count)
+ while (!interrupt_ && start_sample < sample_count)
{
progress_updated();
const uint64_t end_sample = min(
- start_sample + samples_per_block, _unit_count);
- snapshot->get_samples(data, start_sample, end_sample);
-
- if(sr_session_append(_file_name.c_str(), data, unit_size,
- end_sample - start_sample) != SR_OK)
- {
- _error = tr("Error while saving.");
+ start_sample + samples_per_block, sample_count);
+ segment->get_samples(data, start_sample, end_sample);
+
+ size_t length = (end_sample - start_sample) * 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;
-
- {
- lock_guard<mutex> lock(_mutex);
- _units_stored = start_sample;
- }
+ units_stored_ = start_sample >> progress_scale;
}
+ // Zeroing the progress variables indicates completion
+ units_stored_ = unit_count_ = 0;
+
progress_updated();
+ output_.reset();
+ output_stream_.close();
+
delete[] data;
}
projects / pulseview.git / blobdiff