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
/
data
/
decoderstack.h
diff --git
a/pv/data/decoderstack.h
b/pv/data/decoderstack.h
index 4b2717279ba034fab245855c5273030eec521fd8..ab700ae0404bfd85129f761ed3886f413c03100b 100644
(file)
--- a/
pv/data/decoderstack.h
+++ b/
pv/data/decoderstack.h
@@
-23,11
+23,14
@@
#include "signaldata.h"
#include "signaldata.h"
+#include <atomic>
+#include <condition_variable>
#include <list>
#include <list>
+#include <map>
+#include <memory>
+#include <thread>
#include <boost/optional.hpp>
#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
#include <QObject>
#include <QString>
#include <QObject>
#include <QString>
@@
-37,7
+40,7
@@
struct srd_decoder;
struct srd_decoder_annotation_row;
struct srd_decoder;
struct srd_decoder_annotation_row;
-struct srd_
probe
;
+struct srd_
channel
;
struct srd_proto_data;
struct srd_session;
struct srd_proto_data;
struct srd_session;
@@
-80,8
+83,8
@@
public:
virtual ~DecoderStack();
virtual ~DecoderStack();
- const std::list<
boost
::shared_ptr<decode::Decoder> >& stack() const;
- void push(
boost
::shared_ptr<decode::Decoder> decoder);
+ const std::list<
std
::shared_ptr<decode::Decoder> >& stack() const;
+ void push(
std
::shared_ptr<decode::Decoder> decoder);
void remove(int index);
int64_t samples_decoded() const;
void remove(int index);
int64_t samples_decoded() const;
@@
-134,18
+137,18
@@
private:
* @todo A proper solution should be implemented to allow multiple
* decode operations.
*/
* @todo A proper solution should be implemented to allow multiple
* decode operations.
*/
- static
boost
::mutex _global_decode_mutex;
+ static
std
::mutex _global_decode_mutex;
- std::list<
boost
::shared_ptr<decode::Decoder> > _stack;
+ std::list<
std
::shared_ptr<decode::Decoder> > _stack;
-
boost
::shared_ptr<pv::data::LogicSnapshot> _snapshot;
+
std
::shared_ptr<pv::data::LogicSnapshot> _snapshot;
- mutable
boost
::mutex _input_mutex;
- mutable
boost
::condition_variable _input_cond;
+ mutable
std
::mutex _input_mutex;
+ mutable
std
::condition_variable _input_cond;
int64_t _sample_count;
bool _frame_complete;
int64_t _sample_count;
bool _frame_complete;
- mutable
boost
::mutex _output_mutex;
+ mutable
std
::mutex _output_mutex;
int64_t _samples_decoded;
std::map<const decode::Row, decode::RowData> _rows;
int64_t _samples_decoded;
std::map<const decode::Row, decode::RowData> _rows;
@@
-154,7
+157,8
@@
private:
QString _error_message;
QString _error_message;
- boost::thread _decode_thread;
+ std::thread _decode_thread;
+ std::atomic<bool> _interrupt;
friend class DecoderStackTest::TwoDecoderStack;
};
friend class DecoderStackTest::TwoDecoderStack;
};