<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b5c368f1c2bfac2b0dc565cd0d06b5e2b17dc22b">https://github.com/macports/macports-ports/commit/b5c368f1c2bfac2b0dc565cd0d06b5e2b17dc22b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b5c368f gnuradio-next: update to 20190814-41348a2b
</span>b5c368f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b5c368f1c2bfac2b0dc565cd0d06b5e2b17dc22b
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Aug 15 14:52:08 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio-next: update to 20190814-41348a2b
</span>---
science/gnuradio/Portfile | 15 ++-
...h-fix-GNURadioControlPortClient-usage.next.diff | 97 ++++++++++++++++
.../files/patch-fixes_for-thrift.next.diff | 122 ++++++++++-----------
3 files changed, 168 insertions(+), 66 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ab42d16..1293221 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,11 +77,11 @@ subport gnuradio-next {
</span> name gnuradio-next
conflicts gnuradio gnuradio-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio a44a511a35fc78f6aa7ecf067507c921a2865788
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190802-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0cce441c0e660a3ad3b45c45239330fe434596f2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b1fcbdb101ef250ff18ebfe4b4e6fe03b0c325092f636c6d356b0b6f04353154 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3370028
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio 41348a2b6f7cdb200a88dbcfba936e5a438094c6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190814-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c8b689116c8ecc9a596641d94cac05046e489380 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c85080a1713586467574ab0968b5bc802cc34f23027f0f492a15ab3048ed6315 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3368359
</span> revision 0
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,6 +200,11 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-fixes_for-thrift.next.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix usage of GNURadioControlPortClient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-GNURadioControlPortClient-usage.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# override githib PortGroup homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix-GNURadioControlPortClient-usage.next.diff b/science/gnuradio/files/patch-fix-GNURadioControlPortClient-usage.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0cb8772
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix-GNURadioControlPortClient-usage.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,97 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/python/blocks/qa_cpp_py_binding.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/python/blocks/qa_cpp_py_binding.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,11 +155,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ep = gr.rpcmanager_get().endpoints()[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hostname = re.search(r"-h (\S+|\d+\.\d+\.\d+\.\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portnum = re.search(r"-p (\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv = [None, hostname, portnum]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Initialize a simple ControlPort client from endpoint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from gnuradio.ctrlport.GNURadioControlPortClient import GNURadioControlPortClient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ radiosys = GNURadioControlPortClient(hostname, portnum, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get all exported knobs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/python/blocks/qa_cpp_py_binding_set.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/python/blocks/qa_cpp_py_binding_set.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,11 +122,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ep = gr.rpcmanager_get().endpoints()[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hostname = re.search(r"-h (\S+|\d+\.\d+\.\d+\.\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portnum = re.search(r"-p (\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv = [None, hostname, portnum]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Initialize a simple ControlPort client from endpoint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from gnuradio.ctrlport.GNURadioControlPortClient import GNURadioControlPortClient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ radiosys = GNURadioControlPortClient(hostname, portnum, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.tb.start()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/python/blocks/qa_ctrlport_probes.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/python/blocks/qa_ctrlport_probes.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,11 +60,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ep = gr.rpcmanager_get().endpoints()[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hostname = re.search(r"-h (\S+|\d+\.\d+\.\d+\.\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portnum = re.search(r"-p (\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv = [None, hostname, portnum]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Initialize a simple ControlPort client from endpoint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from gnuradio.ctrlport.GNURadioControlPortClient import GNURadioControlPortClient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ radiosys = GNURadioControlPortClient(hostname, portnum, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get all exported knobs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,11 +100,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ep = gr.rpcmanager_get().endpoints()[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hostname = re.search(r"-h (\S+|\d+\.\d+\.\d+\.\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portnum = re.search(r"-p (\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv = [None, hostname, portnum]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Initialize a simple ControlPort client from endpoint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from gnuradio.ctrlport.GNURadioControlPortClient import GNURadioControlPortClient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ radiosys = GNURadioControlPortClient(hostname, portnum, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get all exported knobs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,11 +139,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ep = gr.rpcmanager_get().endpoints()[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hostname = re.search(r"-h (\S+|\d+\.\d+\.\d+\.\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portnum = re.search(r"-p (\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv = [None, hostname, portnum]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Initialize a simple ControlPort client from endpoint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from gnuradio.ctrlport.GNURadioControlPortClient import GNURadioControlPortClient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ radiosys = GNURadioControlPortClient(hostname, portnum, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get all exported knobs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,11 +179,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ep = gr.rpcmanager_get().endpoints()[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hostname = re.search(r"-h (\S+|\d+\.\d+\.\d+\.\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portnum = re.search(r"-p (\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv = [None, hostname, portnum]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Initialize a simple ControlPort client from endpoint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from gnuradio.ctrlport.GNURadioControlPortClient import GNURadioControlPortClient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ radiosys = GNURadioControlPortClient(hostname, portnum, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get all exported knobs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,11 +218,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ep = gr.rpcmanager_get().endpoints()[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hostname = re.search(r"-h (\S+|\d+\.\d+\.\d+\.\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portnum = re.search(r"-p (\d+)", ep).group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv = [None, hostname, portnum]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Initialize a simple ControlPort client from endpoint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from gnuradio.ctrlport.GNURadioControlPortClient import GNURadioControlPortClient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ radiosys = GNURadioControlPortClient(hostname, portnum, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get all exported knobs
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fixes_for-thrift.next.diff b/science/gnuradio/files/patch-fixes_for-thrift.next.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 68fc904..41d9acb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fixes_for-thrift.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fixes_for-thrift.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,16 +77,16 @@
</span> +#include <gnuradio/rpc_shared_ptr_selection.h>
class rpcserver_booter_base;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- //class rpcserver_booter_aggregator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // class rpcserver_booter_aggregator;
</span> @@ -31,7 +31,7 @@
class rpcmanager_base
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- typedef boost::shared_ptr<rpcserver_booter_base> rpcserver_booter_base_sptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef GR_RPC_SHARED_PTR<rpcserver_booter_base> rpcserver_booter_base_sptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef boost::shared_ptr<rpcserver_booter_base> rpcserver_booter_base_sptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef GR_RPC_SHARED_PTR<rpcserver_booter_base> rpcserver_booter_base_sptr;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rpcmanager_base() {;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ~rpcmanager_base() {;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rpcmanager_base() { ; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~rpcmanager_base() { ; }
</span> --- gnuradio-runtime/include/gnuradio/rpcserver_base.h.orig
+++ gnuradio-runtime/include/gnuradio/rpcserver_base.h
@@ -23,6 +23,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,15 +97,15 @@
</span> #include <gnuradio/rpccallbackregister_base.h>
class rpcserver_base : public virtual callbackregister_base
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +46,7 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void setCurPrivLevel(const priv_lvl_t priv) { cur_priv = priv; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void setCurPrivLevel(const priv_lvl_t priv) { cur_priv = priv; }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- typedef boost::shared_ptr<rpcserver_base> rpcserver_base_sptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef GR_RPC_SHARED_PTR<rpcserver_base> rpcserver_base_sptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protected:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- priv_lvl_t cur_priv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef boost::shared_ptr<rpcserver_base> rpcserver_base_sptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef GR_RPC_SHARED_PTR<rpcserver_base> rpcserver_base_sptr;
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ priv_lvl_t cur_priv;
</span> --- gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h.orig
+++ gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
@@ -24,9 +24,9 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,18 +113,18 @@
</span>
#include <gnuradio/api.h>
+#include <gnuradio/rpc_shared_ptr_selection.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gnuradio/rpcserver_booter_base.h>
</span> #include <gnuradio/rpcserver_aggregator.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/rpcserver_booter_base.h>
</span> -#include <boost/shared_ptr.hpp>
#include <string>
class rpcserver_server;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,7 @@
</span>
private:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string d_type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::shared_ptr<rpcserver_aggregator> server;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GR_RPC_SHARED_PTR<rpcserver_aggregator> server;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string d_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost::shared_ptr<rpcserver_aggregator> server;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GR_RPC_SHARED_PTR<rpcserver_aggregator> server;
</span> };
#endif /* RPCSERVER_BOOTER_AGGREGATOR */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,57 +132,57 @@
</span> +++ gnuradio-runtime/include/gnuradio/thrift_server_template.h
@@ -25,6 +25,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gnuradio/prefs.h>
</span> #include <gnuradio/logger.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/prefs.h>
</span> +#include <gnuradio/rpc_shared_ptr_selection.h>
#include <gnuradio/thrift_application_base.h>
#include <iostream>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,11 +51,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- friend class thrift_application_base<TserverBase, TImplClass>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,11 +51,11 @@ protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ friend class thrift_application_base<TserverBase, TImplClass>;
</span>
private:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::shared_ptr<TserverClass> d_handler;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::shared_ptr<thrift::TProcessor> d_processor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::shared_ptr<thrift::transport::TServerTransport> d_serverTransport;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::shared_ptr<thrift::transport::TTransportFactory> d_transportFactory;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::shared_ptr<thrift::protocol::TProtocolFactory> d_protocolFactory;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GR_RPC_SHARED_PTR<TserverClass> d_handler;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GR_RPC_SHARED_PTR<thrift::TProcessor> d_processor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GR_RPC_SHARED_PTR<thrift::transport::TServerTransport> d_serverTransport;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GR_RPC_SHARED_PTR<thrift::transport::TTransportFactory> d_transportFactory;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GR_RPC_SHARED_PTR<thrift::protocol::TProtocolFactory> d_protocolFactory;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Custom TransportFactory that allows you to override the default Thrift buffer size
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * of 512 bytes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,10 +68,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual ~TBufferedTransportFactory() {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual boost::shared_ptr<thrift::transport::TTransport> getTransport(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::shared_ptr<thrift::transport::TTransport> trans)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual GR_RPC_SHARED_PTR<thrift::transport::TTransport> getTransport(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GR_RPC_SHARED_PTR<thrift::transport::TTransport> trans)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return boost::shared_ptr<thrift::transport::TTransport>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return GR_RPC_SHARED_PTR<thrift::transport::TTransport>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (new thrift::transport::TBufferedTransport(trans, bufferSize));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,11 +127,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //std::cout << "Thrift Multi-threaded server : " << d_nthreads << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::shared_ptr<thrift::concurrency::ThreadManager> threadManager
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GR_RPC_SHARED_PTR<thrift::concurrency::ThreadManager> threadManager
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (thrift::concurrency::ThreadManager::newSimpleThreadManager(nthreads));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- threadManager->threadFactory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (boost::shared_ptr<thrift::concurrency::PlatformThreadFactory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (GR_RPC_SHARED_PTR<thrift::concurrency::PlatformThreadFactory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (new thrift::concurrency::PlatformThreadFactory()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- threadManager->start();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost::shared_ptr<TserverClass> d_handler;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost::shared_ptr<thrift::TProcessor> d_processor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost::shared_ptr<thrift::transport::TServerTransport> d_serverTransport;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost::shared_ptr<thrift::transport::TTransportFactory> d_transportFactory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost::shared_ptr<thrift::protocol::TProtocolFactory> d_protocolFactory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GR_RPC_SHARED_PTR<TserverClass> d_handler;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GR_RPC_SHARED_PTR<thrift::TProcessor> d_processor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GR_RPC_SHARED_PTR<thrift::transport::TServerTransport> d_serverTransport;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GR_RPC_SHARED_PTR<thrift::transport::TTransportFactory> d_transportFactory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GR_RPC_SHARED_PTR<thrift::protocol::TProtocolFactory> d_protocolFactory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Custom TransportFactory that allows you to override the default Thrift buffer size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * of 512 bytes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,10 +72,10 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual ~TBufferedTransportFactory() {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- virtual boost::shared_ptr<thrift::transport::TTransport>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- getTransport(boost::shared_ptr<thrift::transport::TTransport> trans)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ virtual GR_RPC_SHARED_PTR<thrift::transport::TTransport>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getTransport(GR_RPC_SHARED_PTR<thrift::transport::TTransport> trans)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return boost::shared_ptr<thrift::transport::TTransport>(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return GR_RPC_SHARED_PTR<thrift::transport::TTransport>(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ new thrift::transport::TBufferedTransport(trans, bufferSize));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,11 +134,11 @@ thrift_server_template<TserverBase, TserverClass, TImplClass>::thrift_server_tem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_processor, d_serverTransport, d_transportFactory, d_protocolFactory));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // std::cout << "Thrift Multi-threaded server : " << d_nthreads << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost::shared_ptr<thrift::concurrency::ThreadManager> threadManager(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GR_RPC_SHARED_PTR<thrift::concurrency::ThreadManager> threadManager(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thrift::concurrency::ThreadManager::newSimpleThreadManager(nthreads));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ threadManager->threadFactory(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost::shared_ptr<thrift::concurrency::PlatformThreadFactory>(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GR_RPC_SHARED_PTR<thrift::concurrency::PlatformThreadFactory>(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ new thrift::concurrency::PlatformThreadFactory()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ threadManager->start();
</span> --- gnuradio-runtime/lib/CMakeLists.txt.orig
+++ gnuradio-runtime/lib/CMakeLists.txt
@@ -142,9 +142,37 @@
</pre><pre style='margin:0'>
</pre>