projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced boost::thread/mutex etc. with std equivalents
[pulseview.git]
/
pv
/
storesession.cpp
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index f60cd26cc621ec9225e16ef57ed37ad2113e80d9..fcba344e9fa8470b6372119eb26e552f83d312ae 100644
(file)
--- a/
pv/storesession.cpp
+++ b/
pv/storesession.cpp
@@
-25,17
+25,17
@@
#include <pv/data/logicsnapshot.h>
#include <pv/view/signal.h>
#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::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::shared_ptr;
using std::string;
using std::pair;
using std::set;
using std::shared_ptr;
using std::string;
+using std::thread;
using std::vector;
namespace pv {
using std::vector;
namespace pv {
@@
-46,6
+46,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)
{
@@
-129,7
+130,7
@@
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;
}
return true;
}
@@
-141,7
+142,7
@@
void StoreSession::wait()
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)
@@
-164,8
+165,7
@@
void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
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();
{
progress_updated();