[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 13/21: runtime: moved global block registry
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 13/21: runtime: moved global block registry to a static get function. |
|
Date: |
Sat, 9 May 2015 14:05:37 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch android
in repository gnuradio.
commit d5567e3b79aff2293ad61d69972e6d1edb0c26b5
Author: Tom Rondeau <address@hidden>
Date: Tue Apr 28 10:54:55 2015 -0400
runtime: moved global block registry to a static get function.
The static initialized registry alone causes problems with some static
builds, specifically when using controlport.
---
gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h | 8 ++++----
gnuradio-runtime/lib/block_registry.cc | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
index f82f5ed..4a5c07a 100644
--- a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
+++ b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
@@ -671,7 +671,7 @@ struct rpcbasic_register_set : public rpcbasic_base
d_desc = desc_;
d_minpriv = minpriv_;
d_display = display_;
- d_object =
dynamic_cast<T*>(global_block_registry.block_lookup(pmt::intern(block_alias)).get());
+ d_object =
dynamic_cast<T*>(global_block_registry()->block_lookup(pmt::intern(block_alias)).get());
#ifdef GR_RPCSERVER_ENABLED
callbackregister_base::configureCallback_t
extractor(new rpcbasic_extractor<T,Tto>(d_object, function),
@@ -829,7 +829,7 @@ struct rpcbasic_register_trigger : public rpcbasic_base
{
d_desc = desc_;
d_minpriv = minpriv_;
- d_object =
dynamic_cast<T*>(global_block_registry.block_lookup(pmt::intern(block_alias)).get());
+ d_object =
dynamic_cast<T*>(global_block_registry()->block_lookup(pmt::intern(block_alias)).get());
#ifdef GR_RPCSERVER_ENABLED
callbackregister_base::configureCallback_t
extractor(new rpcbasic_extractor<T,void>(d_object, function),
@@ -987,7 +987,7 @@ public:
d_desc = desc_;
d_minpriv = minpriv_;
d_display = display_;
- d_object =
dynamic_cast<T*>(global_block_registry.block_lookup(pmt::intern(block_alias)).get());
+ d_object =
dynamic_cast<T*>(global_block_registry()->block_lookup(pmt::intern(block_alias)).get());
#ifdef GR_RPCSERVER_ENABLED
callbackregister_base::queryCallback_t
inserter(new rpcbasic_inserter<T,Tfrom>(d_object, function),
@@ -1021,7 +1021,7 @@ public:
d_desc = desc_;
d_minpriv = minpriv_;
d_display = display_;
- d_object =
dynamic_cast<T*>(global_block_registry.block_lookup(pmt::intern(block_alias)).get());
+ d_object =
dynamic_cast<T*>(global_block_registry()->block_lookup(pmt::intern(block_alias)).get());
#ifdef GR_RPCSERVER_ENABLED
callbackregister_base::queryCallback_t
inserter(new rpcbasic_inserter<T,Tfrom>(d_object, (Tfrom
(T::*)())function),
diff --git a/gnuradio-runtime/lib/block_registry.cc
b/gnuradio-runtime/lib/block_registry.cc
index 70d7e44..0f5e905 100644
--- a/gnuradio-runtime/lib/block_registry.cc
+++ b/gnuradio-runtime/lib/block_registry.cc
@@ -27,6 +27,7 @@
#include <gnuradio/tpb_detail.h>
#include <stdio.h>
+//gr::block_registry global_block_registry;
gr::block_registry* global_block_registry()
{
- [Commit-gnuradio] [gnuradio] branch android updated (1e31c64 -> ff27361), git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 01/21: cmake: android: adding exceptions and atomic to Boost deps; ordering in this patch is important., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 10/21: runtime: android: need to use a usable, writable location for android apps, so use the tmp path that we set up to point to the app's home directory., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 02/21: logger: android: adding Android log functions for different logging levels., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 07/21: runtime: trying to use ANDROID to define certain behavior, git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 16/21: build: fixing complaints for static builds against libuhd.a., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 06/21: volk: using hypot instead of cabsf., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 04/21: runtime: android: issues related to vmcircbuf; only mmap_tmpfile version working currently., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 09/21: fft: defined a setting for the FFTW plan options if android or not., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 05/21: fft: android: problems with wisdom files and MEASURE version of FFTW. Defaulting to suboptimal ESTIMATE until we figure it out., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 13/21: runtime: moved global block registry to a static get function.,
git <=
- [Commit-gnuradio] [gnuradio] 17/21: controlport: android: cleaning up; better logs; help to support android., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 15/21: controlport: fixing complaints about no non-virtual dtor., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 03/21: runtime: android: Android does not support pthread_setaffinity_np; turned this into a nop call., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 18/21: controlport: better handling of Thrift checks for cross-compiling., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 14/21: controlport: build: allowing ControlPort and probes in static builds., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 08/21: cmake: changed to using C checks for headers instead of C++., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 11/21: runtime: android: more conversion of statics vars to static functions., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 20/21: runtime: android: setting better path for prefs files on Android., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 21/21: runtime: android: tweaking vmcircbuf setup for Android., git, 2015/05/09
- [Commit-gnuradio] [gnuradio] 19/21: android: cmake: prioritize ANDROID_STANDALONE_TOOLCHAIN over ANDROID_NDK., git, 2015/05/09