[hamradio-commits] [gnss-sdr] 89/251: Stop on error
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Wed Sep 2 00:22:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit d912ea75001836d2445d65279ea7cdd5cc9da437
Author: Anthony Arnold <anthony.arnold at uqconnect.edu.au>
Date: Fri May 15 18:41:51 2015 +1000
Stop on error
---
.../signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc | 5 ++++-
.../signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
index 4d95ba9..bc4bf51 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
@@ -152,6 +152,9 @@ int rtl_tcp_signal_source_c::work (int noutput_items,
{
gr_complex *out = reinterpret_cast <gr_complex *>( output_items[0] );
int i = 0;
+ if (io_service_.stopped ()) {
+ return -1;
+ }
{
boost::mutex::scoped_lock lock (mutex_);
@@ -282,7 +285,7 @@ rtl_tcp_signal_source_c::handle_read (const boost::system::error_code &ec,
std::cout << "Error during read: " << ec << std::endl;
LOG (WARNING) << "Error during read: " << ec;
boost::mutex::scoped_lock lock (mutex_);
- buffer_.clear ();
+ io_service_.stop ();
not_empty_.notify_one ();
}
else {
diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
index c60b412..ca3a696 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
@@ -115,7 +115,7 @@ private:
}
inline bool not_empty ( ) const {
- return unread_ > 0;
+ return unread_ > 0 && !io_service_.stopped ();
}
};
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list