* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <cassert>
+
#include "storesession.h"
#include <pv/sigsession.h>
#include <pv/data/logicsnapshot.h>
#include <pv/view/signal.h>
-using boost::mutex;
-using boost::thread;
-using boost::lock_guard;
+#include <libsigrok/libsigrok.hpp>
+
using std::deque;
using std::dynamic_pointer_cast;
+using std::lock_guard;
using std::make_pair;
using std::min;
+using std::mutex;
using std::pair;
using std::set;
using std::shared_ptr;
using std::string;
+using std::thread;
using std::vector;
+using sigrok::Error;
+
namespace pv {
const size_t StoreSession::BlockSize = 1024 * 1024;
const SigSession &session) :
_file_name(file_name),
_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
const shared_ptr<data::LogicSnapshot> snapshot(snapshots.front());
assert(snapshot);
- // Make a list of probes
- char **const probes = new char*[sigs.size() + 1];
+ // Make a list of channels
+ char **const channels = 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());
+ channels[i] = strdup(sig->get_name().toUtf8().constData());
}
- probes[sigs.size()] = NULL;
+ channels[sigs.size()] = NULL;
// Begin storing
- if (sr_session_save_init(_file_name.c_str(),
- data->samplerate(), probes) != SR_OK) {
+ try {
+ SigSession::_sr_session->begin_save(_file_name);
+ } catch (Error error) {
_error = tr("Error while saving.");
return false;
}
- // Delete the probes array
+ // Delete the channels array
for (size_t i = 0; i <= sigs.size(); i++)
- free(probes[i]);
- delete[] probes;
+ free(channels[i]);
+ delete[] channels;
- _thread = boost::thread(&StoreSession::store_proc, this, snapshot);
+ _thread = std::thread(&StoreSession::store_proc, this, snapshot);
return true;
}
void StoreSession::cancel()
{
- _thread.interrupt();
+ _interrupt = true;
}
void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
{
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);
- {
- lock_guard<mutex> lock(_mutex);
- _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 (!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);
+ 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 {
+ SigSession::_sr_session->append(data, length, unit_size);
+ } 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;
}
+ _unit_count = 0;
progress_updated();
delete[] data;