From 921429d20affac9217ab7387d709b23e87d59075 Mon Sep 17 00:00:00 2001
From: Tim O'Shea <tim.oshea753@gmail.com>
Date: Mon, 18 Mar 2013 09:25:41 -0700
Subject: core: fix typo in logger header file
---
gnuradio-core/src/lib/runtime/gr_logger.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gnuradio-core/src')
diff --git a/gnuradio-core/src/lib/runtime/gr_logger.h b/gnuradio-core/src/lib/runtime/gr_logger.h
index 13f31d60b8..2ccd498822 100644
--- a/gnuradio-core/src/lib/runtime/gr_logger.h
+++ b/gnuradio-core/src/lib/runtime/gr_logger.h
@@ -530,7 +530,7 @@ typedef void* gr_logger_ptr;
#define GR_GET_LEVEL(name, level)
#define GR_LOG_GET_LEVEL(logger, level)
#define GR_ADD_CONSOLE_APPENDER(logger,target,pattern)
-#define GR_LOG_ADD_CONSOLE_APPENDER(logger,,target,pattern)
+#define GR_LOG_ADD_CONSOLE_APPENDER(logger,target,pattern)
#define GR_ADD_FILE_APPENDER(name,filename,append,pattern)
#define GR_LOG_ADD_FILE_APPENDER(logger,filename,append,pattern)
#define GR_ADD_ROLLINGFILE_APPENDER(name,filename,filesize,bkup_index,append,mode,pattern)
--
cgit v1.2.3
From 9954d0394f7ba5c301f3e6d3e4fccdc90ad1d3c8 Mon Sep 17 00:00:00 2001
From: Tim O'Shea <tim.oshea753@gmail.com>
Date: Mon, 18 Mar 2013 10:14:25 -0700
Subject: core: fix use of inaccesible methods in pycallback
---
gnuradio-core/src/lib/runtime/pycallback_object.h | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
(limited to 'gnuradio-core/src')
diff --git a/gnuradio-core/src/lib/runtime/pycallback_object.h b/gnuradio-core/src/lib/runtime/pycallback_object.h
index f6247c0c6d..f2cd085641 100644
--- a/gnuradio-core/src/lib/runtime/pycallback_object.h
+++ b/gnuradio-core/src/lib/runtime/pycallback_object.h
@@ -25,6 +25,7 @@
#include <ice_application_base.h>
#include <IcePy_Communicator.h>
#include <pythread.h>
+#include <boost/format.hpp>
enum pyport_t {
PYPORT_STRING,
@@ -78,11 +79,17 @@ public:
DisplayType dtype) :
d_callback(NULL),
d_functionbase(functionbase), d_units(units), d_desc(desc),
- d_min(min), d_max(max), d_deflt(deflt), d_dtype(dtype)
+ d_min(min), d_max(max), d_deflt(deflt), d_dtype(dtype),
+ d_name(name), d_id(pycallback_object_count++)
{
d_callback = NULL;
}
-
+
+ void add_rpc_variable(rpcbasic_sptr s)
+ {
+ d_rpc_vars.push_back(s);
+ }
+
myType get() {
myType rVal;
if(d_callback == NULL) {
@@ -123,7 +130,7 @@ public:
#ifdef GR_CTRLPORT
add_rpc_variable(
rpcbasic_sptr(new rpcbasic_register_get<pycallback_object, myType>(
- alias(), d_functionbase.c_str(),
+ (boost::format("%s%d") % d_name % d_id).str() , d_functionbase.c_str(),
&pycallback_object::get, pmt_assist<myType>::make(d_min),
pmt_assist<myType>::make(d_max), pmt_assist<myType>::make(d_deflt),
d_units.c_str(), d_desc.c_str(), RPC_PRIVLVL_MIN, d_dtype)));
@@ -140,6 +147,10 @@ private:
printf("TYPE NOT IMPLEMENTED!\n");
assert(0);
};
+ std::vector<boost::any> d_rpc_vars; // container for all RPC variables
+ std::string d_name;
+ int d_id;
+
};
--
cgit v1.2.3