projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/CMakeLists.txt: Drop obsolete boost-thread references.
[pulseview.git]
/
pv
/
storesession.cpp
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index fcba344e9fa8470b6372119eb26e552f83d312ae..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>
@@
-59,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
@@
-158,10
+159,7
@@
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;
@@
-170,7
+168,7
@@
void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
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,
@@
-181,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;