summaryrefslogtreecommitdiff
path: root/gnuradio-runtime/lib
diff options
context:
space:
mode:
authorMarcus Müller <mmueller@gnuradio.org>2019-08-17 17:41:00 +0200
committerMarcus Müller <marcus@hostalia.de>2019-08-22 15:05:58 +0200
commitc6cb3bbc35153a9635d69eddab0d252f7441b854 (patch)
treef9ab04c336fa6f228ce0c7b90c3722955a1aa53f /gnuradio-runtime/lib
parentbcf35e64b5662f716e0de59e95fdd9ffb02238a7 (diff)
Use emplace_back(params) instead of push_back(type(params))
This is C++11: you can convert std::vector<complextype> vec; vec.push_back(complextype(foo, bar, baz)); by std::vector<complextype> vec; vec.emplace_back(foo, bar, baz); which saves one unnecessary copy. This mostly happened in rpc code. The automated clang-tidy check failed miserably, so most of this was done by hand.
Diffstat (limited to 'gnuradio-runtime/lib')
-rw-r--r--gnuradio-runtime/lib/block.cc282
-rw-r--r--gnuradio-runtime/lib/top_block.cc12
2 files changed, 144 insertions, 150 deletions
diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc
index a09409708e..5914283908 100644
--- a/gnuradio-runtime/lib/block.cc
+++ b/gnuradio-runtime/lib/block.cc
@@ -667,26 +667,26 @@ void block::setup_pc_rpc()
d_pc_rpc_set = true;
#if defined(GR_CTRLPORT) && defined(GR_PERFORMANCE_COUNTERS)
#include <gnuradio/rpcregisterhelpers.h>
- d_rpc_vars.push_back(rpcbasic_sptr(
+ d_rpc_vars.emplace_back(
new rpcbasic_register_trigger<block>(alias(),
"reset_perf_counters",
&block::reset_perf_counters,
"Reset the Performance Counters",
- RPC_PRIVLVL_MIN)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<block, float>(alias(),
- "noutput_items",
- &block::pc_noutput_items,
- pmt::mp(0),
- pmt::mp(32768),
- pmt::mp(0),
- "",
- "noutput items",
- RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(rpcbasic_sptr(
+ RPC_PRIVLVL_MIN));
+
+ d_rpc_vars.emplace_back(
+ new rpcbasic_register_get<block, float>(alias(),
+ "noutput_items",
+ &block::pc_noutput_items,
+ pmt::mp(0),
+ pmt::mp(32768),
+ pmt::mp(0),
+ "",
+ "noutput items",
+ RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(
new rpcbasic_register_get<block, float>(alias(),
"avg noutput_items",
&block::pc_noutput_items_avg,
@@ -696,9 +696,9 @@ void block::setup_pc_rpc()
"",
"Average noutput items",
RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
+ DISPTIME | DISPOPTSTRIP));
- d_rpc_vars.push_back(rpcbasic_sptr(
+ d_rpc_vars.emplace_back(
new rpcbasic_register_get<block, float>(alias(),
"var noutput_items",
&block::pc_noutput_items_var,
@@ -708,45 +708,45 @@ void block::setup_pc_rpc()
"",
"Var. noutput items",
RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<block, float>(alias(),
- "nproduced",
- &block::pc_nproduced,
- pmt::mp(0),
- pmt::mp(32768),
- pmt::mp(0),
- "",
- "items produced",
- RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<block, float>(alias(),
- "avg nproduced",
- &block::pc_nproduced_avg,
- pmt::mp(0),
- pmt::mp(32768),
- pmt::mp(0),
- "",
- "Average items produced",
- RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<block, float>(alias(),
- "var nproduced",
- &block::pc_nproduced_var,
- pmt::mp(0),
- pmt::mp(32768),
- pmt::mp(0),
- "",
- "Var. items produced",
- RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(rpcbasic_sptr(
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(
+ new rpcbasic_register_get<block, float>(alias(),
+ "nproduced",
+ &block::pc_nproduced,
+ pmt::mp(0),
+ pmt::mp(32768),
+ pmt::mp(0),
+ "",
+ "items produced",
+ RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(
+ new rpcbasic_register_get<block, float>(alias(),
+ "avg nproduced",
+ &block::pc_nproduced_avg,
+ pmt::mp(0),
+ pmt::mp(32768),
+ pmt::mp(0),
+ "",
+ "Average items produced",
+ RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(
+ new rpcbasic_register_get<block, float>(alias(),
+ "var nproduced",
+ &block::pc_nproduced_var,
+ pmt::mp(0),
+ pmt::mp(32768),
+ pmt::mp(0),
+ "",
+ "Var. items produced",
+ RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(
new rpcbasic_register_get<block, float>(alias(),
"work time",
&block::pc_work_time,
@@ -756,9 +756,9 @@ void block::setup_pc_rpc()
"",
"clock cycles in call to work",
RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
+ DISPTIME | DISPOPTSTRIP));
- d_rpc_vars.push_back(rpcbasic_sptr(
+ d_rpc_vars.emplace_back(
new rpcbasic_register_get<block, float>(alias(),
"avg work time",
&block::pc_work_time_avg,
@@ -768,9 +768,9 @@ void block::setup_pc_rpc()
"",
"Average clock cycles in call to work",
RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
+ DISPTIME | DISPOPTSTRIP));
- d_rpc_vars.push_back(rpcbasic_sptr(
+ d_rpc_vars.emplace_back(
new rpcbasic_register_get<block, float>(alias(),
"var work time",
&block::pc_work_time_var,
@@ -780,9 +780,9 @@ void block::setup_pc_rpc()
"",
"Var. clock cycles in call to work",
RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
+ DISPTIME | DISPOPTSTRIP));
- d_rpc_vars.push_back(rpcbasic_sptr(
+ d_rpc_vars.emplace_back(
new rpcbasic_register_get<block, float>(alias(),
"total work time",
&block::pc_work_time_total,
@@ -792,9 +792,9 @@ void block::setup_pc_rpc()
"",
"Total clock cycles in calls to work",
RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
+ DISPTIME | DISPOPTSTRIP));
- d_rpc_vars.push_back(rpcbasic_sptr(new rpcbasic_register_get<block, float>(
+ d_rpc_vars.emplace_back(new rpcbasic_register_get<block, float>(
alias(),
"avg throughput",
&block::pc_throughput_avg,
@@ -804,85 +804,79 @@ void block::setup_pc_rpc()
"items/s",
"Average items throughput in call to work",
RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>(
- alias(),
- "input \% full",
- &block::pc_input_buffers_full,
- pmt::make_f32vector(0, 0),
- pmt::make_f32vector(0, 1),
- pmt::make_f32vector(0, 0),
- "",
- "how full input buffers are",
- RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>(
- alias(),
- "avg input \% full",
- &block::pc_input_buffers_full_avg,
- pmt::make_f32vector(0, 0),
- pmt::make_f32vector(0, 1),
- pmt::make_f32vector(0, 0),
- "",
- "Average of how full input buffers are",
- RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>(
- alias(),
- "var input \% full",
- &block::pc_input_buffers_full_var,
- pmt::make_f32vector(0, 0),
- pmt::make_f32vector(0, 1),
- pmt::make_f32vector(0, 0),
- "",
- "Var. of how full input buffers are",
- RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>(
- alias(),
- "output \% full",
- &block::pc_output_buffers_full,
- pmt::make_f32vector(0, 0),
- pmt::make_f32vector(0, 1),
- pmt::make_f32vector(0, 0),
- "",
- "how full output buffers are",
- RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>(
- alias(),
- "avg output \% full",
- &block::pc_output_buffers_full_avg,
- pmt::make_f32vector(0, 0),
- pmt::make_f32vector(0, 1),
- pmt::make_f32vector(0, 0),
- "",
- "Average of how full output buffers are",
- RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
-
- d_rpc_vars.push_back(
- rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>(
- alias(),
- "var output \% full",
- &block::pc_output_buffers_full_var,
- pmt::make_f32vector(0, 0),
- pmt::make_f32vector(0, 1),
- pmt::make_f32vector(0, 0),
- "",
- "Var. of how full output buffers are",
- RPC_PRIVLVL_MIN,
- DISPTIME | DISPOPTSTRIP)));
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>(
+ alias(),
+ "input \% full",
+ &block::pc_input_buffers_full,
+ pmt::make_f32vector(0, 0),
+ pmt::make_f32vector(0, 1),
+ pmt::make_f32vector(0, 0),
+ "",
+ "how full input buffers are",
+ RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>(
+ alias(),
+ "avg input \% full",
+ &block::pc_input_buffers_full_avg,
+ pmt::make_f32vector(0, 0),
+ pmt::make_f32vector(0, 1),
+ pmt::make_f32vector(0, 0),
+ "",
+ "Average of how full input buffers are",
+ RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>(
+ alias(),
+ "var input \% full",
+ &block::pc_input_buffers_full_var,
+ pmt::make_f32vector(0, 0),
+ pmt::make_f32vector(0, 1),
+ pmt::make_f32vector(0, 0),
+ "",
+ "Var. of how full input buffers are",
+ RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>(
+ alias(),
+ "output \% full",
+ &block::pc_output_buffers_full,
+ pmt::make_f32vector(0, 0),
+ pmt::make_f32vector(0, 1),
+ pmt::make_f32vector(0, 0),
+ "",
+ "how full output buffers are",
+ RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>(
+ alias(),
+ "avg output \% full",
+ &block::pc_output_buffers_full_avg,
+ pmt::make_f32vector(0, 0),
+ pmt::make_f32vector(0, 1),
+ pmt::make_f32vector(0, 0),
+ "",
+ "Average of how full output buffers are",
+ RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP));
+
+ d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>(
+ alias(),
+ "var output \% full",
+ &block::pc_output_buffers_full_var,
+ pmt::make_f32vector(0, 0),
+ pmt::make_f32vector(0, 1),
+ pmt::make_f32vector(0, 0),
+ "",
+ "Var. of how full output buffers are",
+ RPC_PRIVLVL_MIN,
+ DISPTIME | DISPOPTSTRIP));
#endif /* defined(GR_CTRLPORT) && defined(GR_PERFORMANCE_COUNTERS) */
}
diff --git a/gnuradio-runtime/lib/top_block.cc b/gnuradio-runtime/lib/top_block.cc
index 92f4cb7786..7485124bac 100644
--- a/gnuradio-runtime/lib/top_block.cc
+++ b/gnuradio-runtime/lib/top_block.cc
@@ -109,14 +109,14 @@ void top_block::setup_rpc()
return;
// Triggers
- d_rpc_vars.push_back(rpcbasic_sptr(new rpcbasic_register_trigger<top_block>(
- alias(), "stop", &top_block::stop, "Stop the flowgraph", RPC_PRIVLVL_MIN)));
+ d_rpc_vars.emplace_back(new rpcbasic_register_trigger<top_block>(
+ alias(), "stop", &top_block::stop, "Stop the flowgraph", RPC_PRIVLVL_MIN));
- d_rpc_vars.push_back(rpcbasic_sptr(new rpcbasic_register_trigger<top_block>(
- alias(), "lock", &top_block::lock, "Lock the flowgraph", RPC_PRIVLVL_MIN)));
+ d_rpc_vars.emplace_back(new rpcbasic_register_trigger<top_block>(
+ alias(), "lock", &top_block::lock, "Lock the flowgraph", RPC_PRIVLVL_MIN));
- d_rpc_vars.push_back(rpcbasic_sptr(new rpcbasic_register_trigger<top_block>(
- alias(), "unlock", &top_block::unlock, "Unock the flowgraph", RPC_PRIVLVL_MIN)));
+ d_rpc_vars.emplace_back(new rpcbasic_register_trigger<top_block>(
+ alias(), "unlock", &top_block::unlock, "Unock the flowgraph", RPC_PRIVLVL_MIN));
// Getters
add_rpc_variable(rpcbasic_sptr(
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-23 14:27:47 +0000