t/gr-foo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more updates

Browse Source
This commit is contained in:
Bastian Bloessl
2019-03-13 20:51:40 +00:00
parent 8360cae375
commit 50c2310644
4 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -8
View File
@@ -81,19 +81,12 @@ if(NOT CMAKE_MODULES_DIR)
set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake) set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
endif(NOT CMAKE_MODULES_DIR) endif(NOT CMAKE_MODULES_DIR)
set(GR_RUNTIME_DIR bin)
set(GR_LIBRARY_DIR lib${LIB_SUFFIX})
set(GR_INCLUDE_DIR include/foo) set(GR_INCLUDE_DIR include/foo)
SET(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/foo) set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/foo)
set(GR_DATA_DIR share)
set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME}) set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
set(GR_DOC_DIR ${GR_DATA_DIR}/doc)
set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}) set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
set(GR_CONF_DIR etc)
set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d) set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d)
set(GR_LIBEXEC_DIR libexec)
set(GR_PKG_LIBEXEC_DIR ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME}) set(GR_PKG_LIBEXEC_DIR ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
######################################################################## ########################################################################
# On Apple only, set install name and use rpath correctly, if not already set # On Apple only, set install name and use rpath correctly, if not already set
lib/periodic_msg_source_impl.cc
+7 -7
View File
@@ -43,7 +43,7 @@ periodic_msg_source_impl::periodic_msg_source_impl(pmt::pmt_t msg,
} }
periodic_msg_source_impl::~periodic_msg_source_impl() { periodic_msg_source_impl::~periodic_msg_source_impl() {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
d_finished = true; d_finished = true;
d_thread->interrupt(); d_thread->interrupt();
@@ -60,7 +60,7 @@ periodic_msg_source_impl::run(periodic_msg_source_impl *instance) {
while(1) { while(1) {
long delay; long delay;
{ {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
if(d_finished || !d_nmsg_left) { if(d_finished || !d_nmsg_left) {
d_finished = true; d_finished = true;
if(d_quit) { if(d_quit) {
@@ -86,32 +86,32 @@ periodic_msg_source_impl::run(periodic_msg_source_impl *instance) {
void void
periodic_msg_source_impl::set_nmsg(int nmsg) { periodic_msg_source_impl::set_nmsg(int nmsg) {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
d_nmsg_total = nmsg; d_nmsg_total = nmsg;
} }
int int
periodic_msg_source_impl::get_nmsg() { periodic_msg_source_impl::get_nmsg() {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
return d_nmsg_total; return d_nmsg_total;
} }
void void
periodic_msg_source_impl::set_delay(long delay) { periodic_msg_source_impl::set_delay(long delay) {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
d_interval = delay; d_interval = delay;
} }
long long
periodic_msg_source_impl::get_delay() { periodic_msg_source_impl::get_delay() {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
return d_interval; return d_interval;
} }
void void
periodic_msg_source_impl::start_tx() { periodic_msg_source_impl::start_tx() {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
if(is_running()) return; if(is_running()) return;
lib/random_periodic_msg_source_impl.cc
+7 -7
View File
@@ -49,7 +49,7 @@ random_periodic_msg_source_impl::random_periodic_msg_source_impl(int msg_len,
} }
random_periodic_msg_source_impl::~random_periodic_msg_source_impl() { random_periodic_msg_source_impl::~random_periodic_msg_source_impl() {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
d_finished = true; d_finished = true;
d_thread->interrupt(); d_thread->interrupt();
d_thread->join(); d_thread->join();
@@ -65,7 +65,7 @@ random_periodic_msg_source_impl::run(random_periodic_msg_source_impl *instance)
while(1) { while(1) {
long delay; long delay;
{ {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
if(d_finished || !d_nmsg_left) { if(d_finished || !d_nmsg_left) {
d_finished = true; d_finished = true;
if(d_quit) { if(d_quit) {
@@ -104,32 +104,32 @@ random_periodic_msg_source_impl::generate_msg() {
} }
void void
random_periodic_msg_source_impl::set_nmsg(int nmsg) { random_periodic_msg_source_impl::set_nmsg(int nmsg) {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
d_nmsg_total = nmsg; d_nmsg_total = nmsg;
} }
int int
random_periodic_msg_source_impl::get_nmsg() { random_periodic_msg_source_impl::get_nmsg() {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
return d_nmsg_total; return d_nmsg_total;
} }
void void
random_periodic_msg_source_impl::set_delay(long delay) { random_periodic_msg_source_impl::set_delay(long delay) {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
d_interval = delay; d_interval = delay;
} }
long long
random_periodic_msg_source_impl::get_delay() { random_periodic_msg_source_impl::get_delay() {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
return d_interval; return d_interval;
} }
void void
random_periodic_msg_source_impl::start_tx() { random_periodic_msg_source_impl::start_tx() {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
if(is_running()) return; if(is_running()) return;
lib/rtt_measure_impl.cc
+2 -2
View File
@@ -83,7 +83,7 @@ rtt_measure_impl::general_work(int noutput, gr_vector_int& ninput_items,
boost::posix_time::ptime boost::posix_time::ptime
rtt_measure_impl::start_time() rtt_measure_impl::start_time()
{ {
gr::thread::scoped_lock(d_mutex); gr::thread::scoped_lock d_mutex;
return d_start_time; return d_start_time;
} }
@@ -91,4 +91,4 @@ rtt_measure::sptr
rtt_measure::make(unsigned long interval) rtt_measure::make(unsigned long interval)
{ {
return gnuradio::get_initial_sptr(new rtt_measure_impl(interval)); return gnuradio::get_initial_sptr(new rtt_measure_impl(interval));
} }