projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Remember directory of last file that was opened/saved.
[pulseview.git]
/
pv
/
storesession.cpp
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index ebb4b0ed374349e657fff6e14373c244afa23310..5eaff586b6ff787a7fc6a9bb4308a3b2deac3132 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
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <cassert>
+
#include "storesession.h"
#include <pv/sigsession.h>
#include "storesession.h"
#include <pv/sigsession.h>
@@
-25,17
+27,17
@@
#include <pv/data/logicsnapshot.h>
#include <pv/view/signal.h>
#include <pv/data/logicsnapshot.h>
#include <pv/view/signal.h>
-using boost::dynamic_pointer_cast;
-using boost::mutex;
-using boost::shared_ptr;
-using boost::thread;
-using boost::lock_guard;
using std::deque;
using std::deque;
+using std::dynamic_pointer_cast;
+using std::lock_guard;
using std::make_pair;
using std::min;
using std::make_pair;
using std::min;
+using std::mutex;
using std::pair;
using std::set;
using std::pair;
using std::set;
+using std::shared_ptr;
using std::string;
using std::string;
+using std::thread;
using std::vector;
namespace pv {
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),
const SigSession &session) :
_file_name(file_name),
_session(session),
+ _interrupt(false),
_units_stored(0),
_unit_count(0)
{
_units_stored(0),
_unit_count(0)
{
@@
-58,8
+61,7
@@
StoreSession::~StoreSession()
pair<uint64_t, uint64_t> StoreSession::progress() const
{
pair<uint64_t, uint64_t> 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 QString& StoreSession::error() const
@@
-129,18
+131,19
@@
bool StoreSession::start()
free(probes[i]);
delete[] probes;
free(probes[i]);
delete[] probes;
- _thread =
boost
::thread(&StoreSession::store_proc, this, snapshot);
+ _thread =
std
::thread(&StoreSession::store_proc, this, snapshot);
return true;
}
void StoreSession::wait()
{
return true;
}
void StoreSession::wait()
{
- _thread.join();
+ if (_thread.joinable())
+ _thread.join();
}
void StoreSession::cancel()
{
}
void StoreSession::cancel()
{
- _
thread.interrupt()
;
+ _
interrupt = true
;
}
void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
}
void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
@@
-156,20
+159,16
@@
void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
const int unit_size = snapshot->unit_size();
assert(unit_size != 0);
const int unit_size = snapshot->unit_size();
assert(unit_size != 0);
- {
- lock_guard<mutex> lock(_mutex);
- _unit_count = snapshot->get_sample_count();
- }
+ _unit_count = snapshot->get_sample_count();
const unsigned int samples_per_block = BlockSize / unit_size;
const unsigned int samples_per_block = BlockSize / unit_size;
- while (!boost::this_thread::interruption_requested() &&
- start_sample < _unit_count)
+ while (!_interrupt && start_sample < _unit_count)
{
progress_updated();
const uint64_t end_sample = min(
{
progress_updated();
const uint64_t end_sample = min(
- start_sample + samples_per_block, _unit_count);
+ start_sample + samples_per_block, _unit_count
.load()
);
snapshot->get_samples(data, start_sample, end_sample);
if(sr_session_append(_file_name.c_str(), data, unit_size,
snapshot->get_samples(data, start_sample, end_sample);
if(sr_session_append(_file_name.c_str(), data, unit_size,
@@
-180,13
+179,10
@@
void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
}
start_sample = end_sample;
}
start_sample = end_sample;
-
- {
- lock_guard<mutex> lock(_mutex);
- _units_stored = start_sample;
- }
+ _units_stored = start_sample;
}
}
+ _unit_count = 0;
progress_updated();
delete[] data;
progress_updated();
delete[] data;