summaryrefslogtreecommitdiff
path: root/gnuradio-runtime/lib
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-07-07 12:18:00 -0400
committerTom Rondeau <tom@trondeau.com>2014-07-07 12:18:00 -0400
commit597b93798a804cde1783d6d2ab53b348d57c44cd (patch)
treeb65e73bb0de634ff5d209b15971ebdabf369a45c /gnuradio-runtime/lib
parent1151e5502ccd440ebd89599cf7e4be4fb5ed8334 (diff)
Removing trailing/extra whitespaces before release.
We should be more careful about letting these into the code in the future. In emacs, we can use (add-hook 'before-save-hook 'delete-trailing-whitespace).
Diffstat (limited to 'gnuradio-runtime/lib')
-rw-r--r--gnuradio-runtime/lib/basic_block.cc18
-rw-r--r--gnuradio-runtime/lib/block_detail.cc8
-rw-r--r--gnuradio-runtime/lib/block_executor.cc8
-rw-r--r--gnuradio-runtime/lib/block_gateway_impl.cc2
-rw-r--r--gnuradio-runtime/lib/circular_file.cc2
-rw-r--r--gnuradio-runtime/lib/constants.cc.in6
-rw-r--r--gnuradio-runtime/lib/controlport/CMakeLists.txt2
-rw-r--r--gnuradio-runtime/lib/controlport/ICE_LICENSE30
-rw-r--r--gnuradio-runtime/lib/controlport/frontend.ice10
-rw-r--r--gnuradio-runtime/lib/controlport/gnuradio.ice26
-rw-r--r--gnuradio-runtime/lib/controlport/rpcmanager.cc2
-rw-r--r--gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc2
-rw-r--r--gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc4
-rw-r--r--gnuradio-runtime/lib/controlport/rpcserver_ice.cc6
-rw-r--r--gnuradio-runtime/lib/controlport/rpcserver_selector.cc2
-rw-r--r--gnuradio-runtime/lib/flat_flowgraph.h2
-rw-r--r--gnuradio-runtime/lib/hier_block2_detail.cc6
-rw-r--r--gnuradio-runtime/lib/math/qa_sincos.cc12
-rw-r--r--gnuradio-runtime/lib/math/qa_sincos.h2
-rw-r--r--gnuradio-runtime/lib/messages/msg_queue.cc2
-rw-r--r--gnuradio-runtime/lib/msg_handler.cc2
-rw-r--r--gnuradio-runtime/lib/pmt/CMakeLists.txt4
-rw-r--r--gnuradio-runtime/lib/pmt/pmt.cc2
-rw-r--r--gnuradio-runtime/lib/pmt/pmt_serialize.cc8
-rw-r--r--gnuradio-runtime/lib/pmt/qa_pmt_prims.cc4
-rw-r--r--gnuradio-runtime/lib/pmt/unv_template.cc.t2
-rw-r--r--gnuradio-runtime/lib/qa_logger.cc8
-rw-r--r--gnuradio-runtime/lib/qa_logger.h10
-rw-r--r--gnuradio-runtime/lib/realtime.cc2
-rw-r--r--gnuradio-runtime/lib/scheduler_tpb.cc6
-rw-r--r--gnuradio-runtime/lib/test.cc4
-rw-r--r--gnuradio-runtime/lib/test.h2
-rw-r--r--gnuradio-runtime/lib/thread/thread.cc22
-rw-r--r--gnuradio-runtime/lib/vmcircbuf.cc2
-rw-r--r--gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc10
35 files changed, 120 insertions, 120 deletions
diff --git a/gnuradio-runtime/lib/basic_block.cc b/gnuradio-runtime/lib/basic_block.cc
index 40edf09b01..3cd23c8996 100644
--- a/gnuradio-runtime/lib/basic_block.cc
+++ b/gnuradio-runtime/lib/basic_block.cc
@@ -71,8 +71,8 @@ namespace gr {
void
basic_block::set_block_alias(std::string name)
- {
- global_block_registry.register_symbolic_name(this, name);
+ {
+ global_block_registry.register_symbolic_name(this, name);
}
// ** Message passing interface **
@@ -131,7 +131,7 @@ namespace gr {
if(!pmt::dict_has_key(d_message_subscribers, port_id)) {
throw std::runtime_error("port does not exist");
}
-
+
pmt::pmt_t currlist = pmt::dict_ref(d_message_subscribers, port_id, pmt::PMT_NIL);
// iterate through subscribers on port
while(pmt::is_pair(currlist)) {
@@ -139,7 +139,7 @@ namespace gr {
pmt::pmt_t block = pmt::car(target);
pmt::pmt_t port = pmt::cdr(target);
-
+
currlist = pmt::cdr(currlist);
basic_block_sptr blk = global_block_registry.block_lookup(block);
//blk->post(msg);
@@ -150,14 +150,14 @@ namespace gr {
// - subscribe to a message port
void
basic_block::message_port_sub(pmt::pmt_t port_id, pmt::pmt_t target){
- if(!pmt::dict_has_key(d_message_subscribers, port_id)){
+ if(!pmt::dict_has_key(d_message_subscribers, port_id)){
std::stringstream ss;
ss << "Port does not exist: \"" << pmt::write_string(port_id) << "\" on block: "
<< pmt::write_string(target) << std::endl;
throw std::runtime_error(ss.str());
}
pmt::pmt_t currlist = pmt::dict_ref(d_message_subscribers,port_id,pmt::PMT_NIL);
-
+
// ignore re-adds of the same target
if(!pmt::list_has(currlist, target))
d_message_subscribers = pmt::dict_add(d_message_subscribers,port_id,pmt::list_add(currlist,target));
@@ -166,13 +166,13 @@ namespace gr {
void
basic_block::message_port_unsub(pmt::pmt_t port_id, pmt::pmt_t target)
{
- if(!pmt::dict_has_key(d_message_subscribers, port_id)) {
+ if(!pmt::dict_has_key(d_message_subscribers, port_id)) {
std::stringstream ss;
ss << "Port does not exist: \"" << pmt::write_string(port_id) << "\" on block: "
<< pmt::write_string(target) << std::endl;
throw std::runtime_error(ss.str());
}
-
+
// ignore unsubs of unknown targets
pmt::pmt_t currlist = pmt::dict_ref(d_message_subscribers,port_id,pmt::PMT_NIL);
d_message_subscribers = pmt::dict_add(d_message_subscribers,port_id,pmt::list_rm(currlist,target));
@@ -230,7 +230,7 @@ namespace gr {
return m;
}
- pmt::pmt_t
+ pmt::pmt_t
basic_block::message_subscribers(pmt::pmt_t port)
{
return pmt::dict_ref(d_message_subscribers,port,pmt::PMT_NIL);
diff --git a/gnuradio-runtime/lib/block_detail.cc b/gnuradio-runtime/lib/block_detail.cc
index 896e621a39..77c457cf7f 100644
--- a/gnuradio-runtime/lib/block_detail.cc
+++ b/gnuradio-runtime/lib/block_detail.cc
@@ -44,7 +44,7 @@ namespace gr {
d_input(ninputs), d_output(noutputs),
d_done(false),
d_ins_noutput_items(0),
- d_avg_noutput_items(0),
+ d_avg_noutput_items(0),
d_var_noutput_items(0),
d_ins_nproduced(0),
d_avg_nproduced(0),
@@ -240,7 +240,7 @@ namespace gr {
}
}
- int
+ int
block_detail::thread_priority(){
if(threaded) {
return gr::thread::thread_priority(thread);
@@ -248,7 +248,7 @@ namespace gr {
return -1;
}
- int
+ int
block_detail::set_thread_priority(int priority){
if(threaded) {
return gr::thread::set_thread_priority(thread,priority);
@@ -317,7 +317,7 @@ namespace gr {
gr::thread::scoped_lock guard(*d_input[i]->mutex());
float pfull = static_cast<float>(d_input[i]->items_available()) /
static_cast<float>(d_input[i]->max_possible_items_available());
-
+
d = pfull - d_avg_input_buffers_full[i];
d_ins_input_buffers_full[i] = pfull;
d_avg_input_buffers_full[i] = d_avg_input_buffers_full[i] + d/d_pc_counter;
diff --git a/gnuradio-runtime/lib/block_executor.cc b/gnuradio-runtime/lib/block_executor.cc
index 9be8eaa48d..ded1324fa3 100644
--- a/gnuradio-runtime/lib/block_executor.cc
+++ b/gnuradio-runtime/lib/block_executor.cc
@@ -193,14 +193,14 @@ namespace gr {
int new_alignment = 0;
int alignment_state = -1;
double rrate;
-
+
block *m = d_block.get();
block_detail *d = m->detail().get();
LOG(*d_log << std::endl << m);
max_noutput_items = round_down(d_max_noutput_items, m->output_multiple());
-
+
if(d->done()){
assert(0);
return DONE;
@@ -237,7 +237,7 @@ namespace gr {
d_output_items.resize (0);
d_start_nitems_read.resize(d->ninputs());
LOG(*d_log << " sink\n");
-
+
max_items_avail = 0;
for(int i = 0; i < d->ninputs (); i++) {
{
@@ -432,7 +432,7 @@ namespace gr {
if(d_use_pc)
d->start_perf_counters();
#endif /* GR_PERFORMANCE_COUNTERS */
-
+
// Do the actual work of the block
int n = m->general_work(noutput_items, d_ninput_items,
d_input_items, d_output_items);
diff --git a/gnuradio-runtime/lib/block_gateway_impl.cc b/gnuradio-runtime/lib/block_gateway_impl.cc
index 13f4326d7e..535e4f74ca 100644
--- a/gnuradio-runtime/lib/block_gateway_impl.cc
+++ b/gnuradio-runtime/lib/block_gateway_impl.cc
@@ -30,7 +30,7 @@ namespace gr {
* Helper routines
**********************************************************************/
template <typename OutType, typename InType>
- void
+ void
copy_pointers(OutType &out, const InType &in)
{
out.resize(in.size());
diff --git a/gnuradio-runtime/lib/circular_file.cc b/gnuradio-runtime/lib/circular_file.cc
index 4d7d06082a..9cef419426 100644
--- a/gnuradio-runtime/lib/circular_file.cc
+++ b/gnuradio-runtime/lib/circular_file.cc
@@ -184,7 +184,7 @@ namespace gr {
int buffer_current = d_header[HD_BUFFER_CURRENT];
int buffer_size = d_header[HD_BUFFER_SIZE];
int total = 0;
-
+
nbytes = std::min(nbytes, buffer_size - d_bytes_read);
while(nbytes > 0) {
diff --git a/gnuradio-runtime/lib/constants.cc.in b/gnuradio-runtime/lib/constants.cc.in
index 7173c60792..c174091d5f 100644
--- a/gnuradio-runtime/lib/constants.cc.in
+++ b/gnuradio-runtime/lib/constants.cc.in
@@ -62,18 +62,18 @@ namespace gr {
c_compiler()
{
return "@cmake_c_compiler_version@";
- }
+ }
const std::string
cxx_compiler()
{
return "@cmake_cxx_compiler_version@";
- }
+ }
const std::string
compiler_flags()
{
return "@COMPILER_INFO@";
- }
+ }
} /* namespace gr */
diff --git a/gnuradio-runtime/lib/controlport/CMakeLists.txt b/gnuradio-runtime/lib/controlport/CMakeLists.txt
index c05a82bf4f..bd46659eb2 100644
--- a/gnuradio-runtime/lib/controlport/CMakeLists.txt
+++ b/gnuradio-runtime/lib/controlport/CMakeLists.txt
@@ -45,7 +45,7 @@ list(APPEND gnuradio_runtime_sources
)
# Append generated file in build directory
-list(APPEND gnuradio_runtime_sources
+list(APPEND gnuradio_runtime_sources
${CMAKE_CURRENT_BINARY_DIR}/gnuradio.cpp
)
diff --git a/gnuradio-runtime/lib/controlport/ICE_LICENSE b/gnuradio-runtime/lib/controlport/ICE_LICENSE
index 43ea7572d9..51ab60d453 100644
--- a/gnuradio-runtime/lib/controlport/ICE_LICENSE
+++ b/gnuradio-runtime/lib/controlport/ICE_LICENSE
@@ -12,43 +12,43 @@ details.
You should have received a copy of the GNU General Public License version
2 along with this program; if not, see http://www.gnu.org/licenses.
-Linking Ice statically or dynamically with other software (such as a
-library, module or application) is making a combined work based on Ice.
+Linking Ice statically or dynamically with other software (such as a
+library, module or application) is making a combined work based on Ice.
Thus, the terms and conditions of the GNU General Public License version
2 cover this combined work.
-If such software can only be used together with Ice, then not only the
+If such software can only be used together with Ice, then not only the
combined work but the software itself is a work derived from Ice and as
-such shall be licensed under the terms of the GNU General Public License
-version 2. This includes the situation where Ice is only being used
+such shall be licensed under the terms of the GNU General Public License
+version 2. This includes the situation where Ice is only being used
through an abstraction layer.
As a special exception to the above, ZeroC grants to the contributors for
-the following projects the permission to license their Ice-based software
-under the terms of the GNU Lesser General Public License (LGPL) version
+the following projects the permission to license their Ice-based software
+under the terms of the GNU Lesser General Public License (LGPL) version
2.1 or of the BSD license:
- Orca Robotics (http://orca-robotics.sourceforge.net)
-
+
- Mumble (http://mumble.sourceforge.net)
-This exception does not extend to the parts of Ice used by these
+This exception does not extend to the parts of Ice used by these
projects, or to any other derived work: as a whole, any work based on Ice
shall be licensed under the terms and conditions of the GNU General
Public License version 2.
You may also combine Ice with any software not derived from Ice, provided
-the license of such software is compatible with the GNU General Public
+the license of such software is compatible with the GNU General Public
License version 2. In addition, as a special exception, ZeroC grants you
permission to combine Ice with:
-
+
- the OpenSSL library, or with a modified version of the OpenSSL library
that uses the same license as OpenSSL
- any library not derived from Ice and licensed under the terms of
- the Apache License, version 2.0
- (http://www.apache.org/licenses/LICENSE-2.0.html)
+ the Apache License, version 2.0
+ (http://www.apache.org/licenses/LICENSE-2.0.html)
-If you modify this copy of Ice, you may extend any of the exceptions
-provided above to your version of Ice, but you are not obligated to
+If you modify this copy of Ice, you may extend any of the exceptions
+provided above to your version of Ice, but you are not obligated to
do so.
diff --git a/gnuradio-runtime/lib/controlport/frontend.ice b/gnuradio-runtime/lib/controlport/frontend.ice
index 50d056df72..e4d346dba0 100644
--- a/gnuradio-runtime/lib/controlport/frontend.ice
+++ b/gnuradio-runtime/lib/controlport/frontend.ice
@@ -28,10 +28,10 @@ module GNURadio {
// primitive types
dictionary<string, string> StrStrDict;
dictionary<string, string> TunerArgs;
- struct F32Range
+ struct F32Range
{
- float min;
- float max;
+ float min;
+ float max;
};
// exception types
@@ -111,7 +111,7 @@ module GNURadio {
sequence<Tuner*> TunerSeq;
sequence<Channel*> ChannelSeq;
-
+
interface Channelizer extends AbstractReceiver {
idempotent ChannelizerStatus status();
idempotent Tuner* getTuner();
@@ -131,7 +131,7 @@ module GNURadio {
};
};
-
+
module Booter {
dictionary<string, string> WaveformArgs;
exception WaveformRunningError {
diff --git a/gnuradio-runtime/lib/controlport/gnuradio.ice b/gnuradio-runtime/lib/controlport/gnuradio.ice
index 3d6101087a..01db91b7be 100644
--- a/gnuradio-runtime/lib/controlport/gnuradio.ice
+++ b/gnuradio-runtime/lib/controlport/gnuradio.ice
@@ -42,23 +42,23 @@ class KnobL extends Knob { long value; };
class KnobS extends Knob { string value; };
class KnobZ extends Knob { complex value; };
-sequence<bool> VectorB; sequence<byte> VectorC;
+sequence<bool> VectorB; sequence<byte> VectorC;
sequence<int> VectorI; sequence<float> VectorF;
sequence<double> VectorD; sequence<string> VectorS;
sequence<long> VectorL; sequence<short> VectorT;
-class KnobVecB extends Knob { VectorB value; };
-class KnobVecC extends Knob { VectorC value; };
-class KnobVecI extends Knob { VectorI value; };
-class KnobVecT extends Knob { VectorT value; };
-class KnobVecF extends Knob { VectorF value; };
-class KnobVecD extends Knob { VectorD value; };
-class KnobVecL extends Knob { VectorL value; };
-class KnobVecS extends Knob { VectorS value; };
+class KnobVecB extends Knob { VectorB value; };
+class KnobVecC extends Knob { VectorC value; };
+class KnobVecI extends Knob { VectorI value; };
+class KnobVecT extends Knob { VectorT value; };
+class KnobVecF extends Knob { VectorF value; };
+class KnobVecD extends Knob { VectorD value; };
+class KnobVecL extends Knob { VectorL value; };
+class KnobVecS extends Knob { VectorS value; };
-enum KnobType { KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT,
- KNOBDOUBLE, KNOBSTRING, KNOBLONG, KNOBVECBOOL,
- KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE,
+enum KnobType { KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT,
+ KNOBDOUBLE, KNOBSTRING, KNOBLONG, KNOBVECBOOL,
+ KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE,
KNOBVECSTRING, KNOBVECLONG, KNOBSHORT};
const int DISPNULL = 0x0000;
@@ -69,7 +69,7 @@ const int DISPSPEC = 0x0008;
const int DISPRAST = 0x0010;
const int DISPOPTCPLX = 0x0100;
const int DISPOPTLOG = 0x0200;
-const int DISPOPTSTEM = 0x0400;
+const int DISPOPTSTEM = 0x0400;
const int DISPOPTSTRIP = 0x0800;
const int DISPOPTSCATTER = 0x1000;
diff --git a/gnuradio-runtime/lib/controlport/rpcmanager.cc b/gnuradio-runtime/lib/controlport/rpcmanager.cc
index 59ec518960..0c7bc135be 100644
--- a/gnuradio-runtime/lib/controlport/rpcmanager.cc
+++ b/gnuradio-runtime/lib/controlport/rpcmanager.cc
@@ -42,7 +42,7 @@ rpcmanager::get()
{
if(aggregator_registered) {
return aggregator.get();
- }
+ }
else if(booter_registered) {
return boot;
}
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc b/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc
index e86306910d..201dfb3929 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc
@@ -25,7 +25,7 @@
rpcserver_booter_aggregator::rpcserver_booter_aggregator() :
d_type(std::string("aggregator")), server(new rpcserver_aggregator())
{;}
-
+
rpcserver_booter_aggregator::~rpcserver_booter_aggregator()
{;}
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc b/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc
index cffa268a6d..f60a218747 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc
@@ -1,9 +1,9 @@
/* -*- c++ -*- */
-/*
+/*
* Copyright 2012 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_ice.cc b/gnuradio-runtime/lib/controlport/rpcserver_ice.cc
index 5409f5e931..cba6be578e 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_ice.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_ice.cc
@@ -1,9 +1,9 @@
/* -*- c++ -*- */
-/*
+/*
* Copyright 2012 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
@@ -55,7 +55,7 @@ rpcserver_ice::registerConfigureCallback(const std::string &id,
if(DEBUG)
std::cout << "rpcserver_ice registering set: " << id << std::endl;
-
+
d_setcallbackmap.insert(ConfigureCallbackMap_t::value_type(id, callback));
}
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
index 697ec497b1..d515e78963 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
@@ -36,5 +36,5 @@ bool rpcmanager::make_aggregator(false);
#endif
#ifdef RPCSERVER_XMLRPC
- #error TODO XMLRPC
+ #error TODO XMLRPC
#endif
diff --git a/gnuradio-runtime/lib/flat_flowgraph.h b/gnuradio-runtime/lib/flat_flowgraph.h
index f740299fa7..6c299ee5f9 100644
--- a/gnuradio-runtime/lib/flat_flowgraph.h
+++ b/gnuradio-runtime/lib/flat_flowgraph.h
@@ -48,7 +48,7 @@ namespace gr {
// Wire list of gr::block together in new flat_flowgraph
void setup_connections();
-
+
// Merge applicable connections from existing flat flowgraph
void merge_connections(flat_flowgraph_sptr sfg);
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc
index 1f5f5b0738..ad8fc87122 100644
--- a/gnuradio-runtime/lib/hier_block2_detail.cc
+++ b/gnuradio-runtime/lib/hier_block2_detail.cc
@@ -154,7 +154,7 @@ namespace gr {
{
if(HIER_BLOCK2_DETAIL_DEBUG)
std::cout << "connecting message port..." << std::endl;
-
+
// register the subscription
// this is done later...
// src->message_port_sub(srcport, pmt::cons(dst->alias_pmt(), dstport));
@@ -591,7 +591,7 @@ namespace gr {
// propogate non hier connections through
if(normal_connection){
sfg->connect( q->src(), q->dst() );
- }
+ }
}
for(std::vector<std::pair<msg_endpoint, bool> >::iterator it = resolved_endpoints.begin();
@@ -610,7 +610,7 @@ namespace gr {
}
}
*/
-
+
// Construct unique list of blocks used either in edges, inputs,
// outputs, or by themselves. I still hate STL.
basic_block_vector_t blocks; // unique list of used blocks
diff --git a/gnuradio-runtime/lib/math/qa_sincos.cc b/gnuradio-runtime/lib/math/qa_sincos.cc
index 7def8a9bb8..a6234d19d6 100644
--- a/gnuradio-runtime/lib/math/qa_sincos.cc
+++ b/gnuradio-runtime/lib/math/qa_sincos.cc
@@ -35,14 +35,14 @@ qa_sincos::t1()
static const unsigned int N = 1000;
double c_sin, c_cos;
double gr_sin, gr_cos;
-
+
for(unsigned i = 0; i < N; i++) {
double x = i/100.0;
c_sin = sin(x);
c_cos = cos(x);
-
+
gr::sincos(x, &gr_sin, &gr_cos);
-
+
CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
}
@@ -54,14 +54,14 @@ qa_sincos::t2()
static const unsigned int N = 1000;
float c_sin, c_cos;
float gr_sin, gr_cos;
-
+
for(unsigned i = 0; i < N; i++) {
float x = i/100.0;
c_sin = sinf(x);
c_cos = cosf(x);
-
+
gr::sincosf(x, &gr_sin, &gr_cos);
-
+
CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
}
diff --git a/gnuradio-runtime/lib/math/qa_sincos.h b/gnuradio-runtime/lib/math/qa_sincos.h
index c54b75f97f..9fec5958c0 100644
--- a/gnuradio-runtime/lib/math/qa_sincos.h
+++ b/gnuradio-runtime/lib/math/qa_sincos.h
@@ -32,7 +32,7 @@ class qa_sincos : public CppUnit::TestCase
CPPUNIT_TEST(t1);
CPPUNIT_TEST(t2);
CPPUNIT_TEST_SUITE_END();
-
+
private:
void t1();
void t2();
diff --git a/gnuradio-runtime/lib/messages/msg_queue.cc b/gnuradio-runtime/lib/messages/msg_queue.cc
index 6db2d2daa2..321b229358 100644
--- a/gnuradio-runtime/lib/messages/msg_queue.cc
+++ b/gnuradio-runtime/lib/messages/msg_queue.cc
@@ -98,6 +98,6 @@ namespace gr {
while(delete_head_nowait() != pmt::pmt_t())
;
}
-
+
} /* namespace messages */
} /* namespace gr */
diff --git a/gnuradio-runtime/lib/msg_handler.cc b/gnuradio-runtime/lib/msg_handler.cc
index 32d14eb715..f23b424e1a 100644
--- a/gnuradio-runtime/lib/msg_handler.cc
+++ b/gnuradio-runtime/lib/msg_handler.cc
@@ -27,7 +27,7 @@
#include <gnuradio/msg_handler.h>
namespace gr {
-
+
msg_handler::~msg_handler()
{
}
diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt
index 193ccbe62f..dc4fe1be46 100644
--- a/gnuradio-runtime/lib/pmt/CMakeLists.txt
+++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt
@@ -86,7 +86,7 @@ list(APPEND gnuradio_pmt_libs
${LOG4CPP_LIBRARIES}
)
-add_custom_target(pmt_generated
+add_custom_target(pmt_generated
DEPENDS ${PMT_SERIAL_TAGS_H} ${CMAKE_CURRENT_BINARY_DIR}/pmt_unv_int.h)
@@ -133,7 +133,7 @@ include_directories(${CPPUNIT_INCLUDE_DIRS})
link_directories(${CPPUNIT_LIBRARY_DIRS})
add_library(test-gnuradio-pmt SHARED ${test_gnuradio_pmt_sources})
-target_link_libraries(test-gnuradio-pmt gnuradio-runtime gnuradio-pmt
+target_link_libraries(test-gnuradio-pmt gnuradio-runtime gnuradio-pmt
${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES})
########################################################################
diff --git a/gnuradio-runtime/lib/pmt/pmt.cc b/gnuradio-runtime/lib/pmt/pmt.cc
index 8315100ab3..e3b93255bc 100644
--- a/gnuradio-runtime/lib/pmt/pmt.cc
+++ b/gnuradio-runtime/lib/pmt/pmt.cc
@@ -1388,7 +1388,7 @@ list_has(pmt_t list, const pmt_t& item)
pmt_t right = cdr(list);
if(equal(left,item))
return true;
- return list_has(right, item);
+ return list_has(right, item);
} else {
if(is_null(list))
return false;
diff --git a/gnuradio-runtime/lib/pmt/pmt_serialize.cc b/gnuradio-runtime/lib/pmt/pmt_serialize.cc
index fc5763aed4..5cc2005ca7 100644
--- a/gnuradio-runtime/lib/pmt/pmt_serialize.cc
+++ b/gnuradio-runtime/lib/pmt/pmt_serialize.cc
@@ -276,14 +276,14 @@ serialize(pmt_t obj, std::streambuf &sb)
}
if(is_number(obj)) {
-
+
if(is_uint64(obj)) {
uint64_t i = to_uint64(obj);
ok = serialize_untagged_u8(PST_UINT64, sb);
ok &= serialize_untagged_u64(i, sb);
return ok;
}
- else {
+ else {
if(is_integer(obj)) {
long i = to_long(obj);
if(sizeof(long) > 4) {
@@ -581,7 +581,7 @@ deserialize(std::streambuf &sb)
goto error;
return make_rectangular( r,i );
}
-
+
case PST_TUPLE:
{
pmt_t tuple;
@@ -614,7 +614,7 @@ deserialize(std::streambuf &sb)
if(!deserialize_untagged_u32(&nitems, sb))
goto error;
-
+
deserialize_untagged_u8(&npad, sb);
for(size_t i = 0; i < npad; i++)
deserialize_untagged_u8(&u8, sb);
diff --git a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
index bfe71fbe5a..2f46b014db 100644
--- a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
+++ b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
@@ -478,7 +478,7 @@ qa_pmt_prims::test_any()
// ------------------------------------------------------------------------
-class qa_pmt_msg_accepter_nop : public gr::messages::msg_accepter
+class qa_pmt_msg_accepter_nop : public gr::messages::msg_accepter
{
public:
qa_pmt_msg_accepter_nop(){};
@@ -496,7 +496,7 @@ qa_pmt_prims::test_msg_accepter()
boost::any a0;
a0 = std::string("Hello!");
pmt::pmt_t p0 = pmt::make_any(a0);
-
+
gr::messages::msg_accepter_sptr ma0 = \
gr::messages::msg_accepter_sptr(new qa_pmt_msg_accepter_nop());
pmt::pmt_t p1 = pmt::make_msg_accepter(ma0);
diff --git a/gnuradio-runtime/lib/pmt/unv_template.cc.t b/gnuradio-runtime/lib/pmt/unv_template.cc.t
index 8678894973..0342367f7e 100644
--- a/gnuradio-runtime/lib/pmt/unv_template.cc.t
+++ b/gnuradio-runtime/lib/pmt/unv_template.cc.t
@@ -90,7 +90,7 @@ init_@TAG@vector(size_t k, const @TYPE@ *data)
pmt_t
init_@TAG@vector(size_t k, const std::vector< @TYPE@ > &data)
{
-
+
return pmt_t(new pmt_@TAG@vector(k, &data[0]));
}
diff --git a/gnuradio-runtime/lib/qa_logger.cc b/gnuradio-runtime/lib/qa_logger.cc
index b147b36da1..904893cc4d 100644
--- a/gnuradio-runtime/lib/qa_logger.cc
+++ b/gnuradio-runtime/lib/qa_logger.cc
@@ -1,18 +1,18 @@
/*
* Copyright 2012 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gnuradio-runtime/lib/qa_logger.h b/gnuradio-runtime/lib/qa_logger.h
index 35f7f1f6c4..2e237eebf8 100644
--- a/gnuradio-runtime/lib/qa_logger.h
+++ b/gnuradio-runtime/lib/qa_logger.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2012 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU Example Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Example Public License for more details.
- *
+ *
* You should have received a copy of the GNU Example Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -31,7 +31,7 @@
class qa_logger : public CppUnit::TestCase
{
public:
- CPPUNIT_TEST_SUITE(qa_logger);
+ CPPUNIT_TEST_SUITE(qa_logger);
CPPUNIT_TEST(t1);
CPPUNIT_TEST_SUITE_END();
diff --git a/gnuradio-runtime/lib/realtime.cc b/gnuradio-runtime/lib/realtime.cc
index 99deff5b52..603e97a2f1 100644
--- a/gnuradio-runtime/lib/realtime.cc
+++ b/gnuradio-runtime/lib/realtime.cc
@@ -27,7 +27,7 @@
#include <gnuradio/realtime.h>
namespace gr {
-
+
rt_status_t
enable_realtime_scheduling()
{
diff --git a/gnuradio-runtime/lib/scheduler_tpb.cc b/gnuradio-runtime/lib/scheduler_tpb.cc
index 2fe9e10f6a..0319a43a88 100644
--- a/gnuradio-runtime/lib/scheduler_tpb.cc
+++ b/gnuradio-runtime/lib/scheduler_tpb.cc
@@ -29,7 +29,7 @@
#include <sstream>
namespace gr {
-
+
class tpb_container
{
block_sptr d_block;
@@ -56,7 +56,7 @@ namespace gr {
: scheduler(ffg, max_noutput_items)
{
int block_max_noutput_items;
-
+
// Get a topologically sorted vector of all the blocks in use.
// Being topologically sorted probably isn't going to matter, but
// there's a non-zero chance it might help...
@@ -84,7 +84,7 @@ namespace gr {
else {
block_max_noutput_items = max_noutput_items;
}
-
+
d_threads.create_thread(
gr::thread::thread_body_wrapper<tpb_container>
(tpb_container(blocks[i], block_max_noutput_items),
diff --git a/gnuradio-runtime/lib/test.cc b/gnuradio-runtime/lib/test.cc
index 775dc2bde4..37da40e641 100644
--- a/gnuradio-runtime/lib/test.cc
+++ b/gnuradio-runtime/lib/test.cc
@@ -51,10 +51,10 @@ namespace gr {
unsigned int sizeof_input_item,
int min_outputs, int max_outputs,
unsigned int sizeof_output_item,
- unsigned int history,
+ unsigned int history,
unsigned int output_multiple,
double relative_rate,
- bool fixed_rate,
+ bool fixed_rate,
consume_type_t cons_type, produce_type_t prod_type)
: block (name,
io_signature::make(min_inputs, max_inputs, sizeof_input_item),
diff --git a/gnuradio-runtime/lib/test.h b/gnuradio-runtime/lib/test.h
index cbe42f94e8..24266ab977 100644
--- a/gnuradio-runtime/lib/test.h
+++ b/gnuradio-runtime/lib/test.h
@@ -129,7 +129,7 @@ namespace gr {
* returns true. Generally speaking, you don't need to override
* this.
*/
- int fixed_rate_ninput_to_noutput(int ninput) {
+ int fixed_rate_ninput_to_noutput(int ninput) {
return (int)((double)ninput/relative_rate());
}
diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc
index 8c59b6df74..e393ae5438 100644
--- a/gnuradio-runtime/lib/thread/thread.cc
+++ b/gnuradio-runtime/lib/thread/thread.cc
@@ -124,20 +124,20 @@ namespace gr {
set_thread_name(gr_thread_t thread, std::string name)
{
const DWORD SET_THREAD_NAME_EXCEPTION = 0x406D1388;
-
+
DWORD dwThreadId = GetThreadId(thread);
if (dwThreadId == 0)
return;
-
+
if (name.empty())
name = boost::str(boost::format("thread %lu") % dwThreadId);
-
+
THREADNAME_INFO info;
info.dwType = 0x1000;
info.szName = name.c_str();
info.dwThreadID = dwThreadId;
info.dwFlags = 0;
-
+
__try
{
RaiseException(SET_THREAD_NAME_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
@@ -221,7 +221,7 @@ namespace gr {
param.sched_priority = priority;
return pthread_setschedparam(thread, policy, &param);
}
-
+
void
set_thread_name(gr_thread_t thread, std::string name)
{
@@ -334,18 +334,18 @@ namespace gr {
param.sched_priority = priority;
return pthread_setschedparam(thread, policy, &param);
}
-
+
void
set_thread_name(gr_thread_t thread, std::string name)
{
if (thread != pthread_self()) // Naming another thread is not supported
return;
-
+
if (name.empty())
name = boost::str(boost::format("thread %llu") % ((unsigned long long)thread));
-
+
const int max_len = 16; // Maximum accepted by PR_SET_NAME
-
+
if ((int)name.size() > max_len) // Shorten the name if necessary by taking as many characters from the front
{ // so that the unique_id can still fit on the end
int i = name.size() - 1;
@@ -356,10 +356,10 @@ namespace gr {
if ((n == 0) && (s != "0"))
break;
}
-
+
name = name.substr(0, std::max(0, max_len - ((int)name.size() - (i + 1)))) + name.substr(i + 1);
}
-
+
prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
}
diff --git a/gnuradio-runtime/lib/vmcircbuf.cc b/gnuradio-runtime/lib/vmcircbuf.cc
index ff5093d5c4..d17ed72c43 100644
--- a/gnuradio-runtime/lib/vmcircbuf.cc
+++ b/gnuradio-runtime/lib/vmcircbuf.cc
@@ -184,7 +184,7 @@ namespace gr {
}
return buf.c_str();
}
-
+
static bool
test_a_bunch(vmcircbuf_factory *factory, int n, int size, int *start_ptr, bool verbose)
{
diff --git a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
index 4d8741807b..27ad4f3829 100644
--- a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
+++ b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
@@ -64,24 +64,24 @@ namespace gr {
// Attempt to allocate buffers (handle bad_alloc errors)
int attempts_remain(MAX_SYSV_SHM_ATTEMPTS);
while(attempts_remain-- > 0){
-
+
int shmid_guard = -1;
int shmid1 = -1;
int shmid2 = -1;
-
+
// We use this as a guard page. We'll map it read-only on both ends of the buffer.
// Ideally we'd map it no access, but I don't think that's possible with SysV
if((shmid_guard = shmget(IPC_PRIVATE, pagesize, IPC_CREAT | 0400)) == -1) {
perror("gr::vmcircbuf_sysv_shm: shmget (0)");
continue;
}
-
+
if((shmid2 = shmget(IPC_PRIVATE, 2 * size + 2 * pagesize, IPC_CREAT | 0700)) == -1) {
perror("gr::vmcircbuf_sysv_shm: shmget(1)");
shmctl(shmid_guard, IPC_RMID, 0);
continue;
}
-
+
if((shmid1 = shmget(IPC_PRIVATE, size, IPC_CREAT | 0700)) == -1) {
perror("gr::vmcircbuf_sysv_shm: shmget (2)");
shmctl(shmid_guard, IPC_RMID, 0);
@@ -148,7 +148,7 @@ namespace gr {
shmctl(shmid1, IPC_RMID, 0);
shmctl(shmid_guard, IPC_RMID, 0);
-
+
// Now remember the important stuff
d_base = (char*)first_copy + pagesize;
d_size = size;