Update to new session API.

[pulseview.git] / pv / storesession.cpp

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index f60cd26cc621ec9225e16ef57ed37ad2113e80d9..9b8dac9c579783aafada6f25fea13f0db53a19af 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <cassert>
+
 #include "storesession.h"
 
 #include <pv/sigsession.h>
@@ -25,17 +27,17 @@
 #include <pv/data/logicsnapshot.h>
 #include <pv/view/signal.h>
 
-using boost::mutex;
-using boost::thread;
-using boost::lock_guard;
 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;
 
 namespace pv {
@@ -46,6 +48,7 @@ StoreSession::StoreSession(const std::string &file_name,
        const SigSession &session) :
        _file_name(file_name),
        _session(session),
+       _interrupt(false),
        _units_stored(0),
        _unit_count(0)
 {
@@ -56,10 +59,9 @@ StoreSession::~StoreSession()
        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
@@ -118,7 +120,7 @@ bool StoreSession::start()
        probes[sigs.size()] = NULL;
 
        // Begin storing
-       if (sr_session_save_init(_file_name.c_str(),
+       if (sr_session_save_init(SigSession::_sr_session, _file_name.c_str(),
                data->samplerate(), probes) != SR_OK) {
                _error = tr("Error while saving.");
                return false;
@@ -129,7 +131,7 @@ bool StoreSession::start()
                free(probes[i]);
        delete[] probes;
 
-       _thread = boost::thread(&StoreSession::store_proc, this, snapshot);
+       _thread = std::thread(&StoreSession::store_proc, this, snapshot);
        return true;
 }
 
@@ -141,14 +143,15 @@ void StoreSession::wait()
 
 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];
@@ -157,37 +160,37 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
        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)
+               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.");
                        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;