#include <pv/data/logicsnapshot.h>
#include <pv/view/signal.h>
+#include <libsigrok/libsigrok.hpp>
+
+using boost::shared_lock;
+using boost::shared_mutex;
+
using std::deque;
using std::dynamic_pointer_cast;
using std::lock_guard;
using std::thread;
using std::vector;
+using sigrok::ConfigKey;
+using sigrok::Error;
+
namespace pv {
const size_t StoreSession::BlockSize = 1024 * 1024;
wait();
}
-pair<uint64_t, uint64_t> StoreSession::progress() const
+pair<int, int> StoreSession::progress() const
{
return make_pair(_units_stored.load(), _unit_count.load());
}
{
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 vector< shared_ptr<view::Signal> > &sigs(_session.signals());
// Check we have logic data
if (data_set.empty() || sigs.empty()) {
}
// 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 "
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;
-
// Begin storing
- if (sr_session_save_init(_file_name.c_str(),
- data->samplerate(), probes) != SR_OK) {
+ try {
+ auto context = _session.session()->context();
+ auto output_format = context->output_formats()["srzip"];
+ auto device = _session.device();
+ _output = output_format->create_output(device,
+ {{"filename",
+ Glib::Variant<Glib::ustring>::create(_file_name)}});
+ auto meta = context->create_meta_packet(
+ {{ConfigKey::SAMPLERATE,
+ Glib::Variant<guint64>::create(data->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);
return true;
}
{
assert(snapshot);
- 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];
const int unit_size = snapshot->unit_size();
assert(unit_size != 0);
- _unit_count = snapshot->get_sample_count();
+ sample_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 && start_sample < sample_count)
{
progress_updated();
const uint64_t end_sample = min(
- start_sample + samples_per_block, _unit_count.load());
+ start_sample + samples_per_block, sample_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)
- {
+ size_t length = end_sample - start_sample;
+
+ try {
+ auto context = _session.session()->context();
+ auto logic = context->create_logic_packet(data, length, unit_size);
+ _output->receive(logic);
+ } catch (Error error) {
_error = tr("Error while saving.");
break;
}
start_sample = end_sample;
- _units_stored = start_sample;
+ _units_stored = start_sample >> progress_scale;
}
- _unit_count = 0;
progress_updated();
+ _output.reset();
+
delete[] data;
}