diff options
Diffstat (limited to 'gnuradio-runtime/include/gnuradio')
20 files changed, 78 insertions, 78 deletions
diff --git a/gnuradio-runtime/include/gnuradio/block_detail.h b/gnuradio-runtime/include/gnuradio/block_detail.h index b336cb86f7..41568c8ab3 100644 --- a/gnuradio-runtime/include/gnuradio/block_detail.h +++ b/gnuradio-runtime/include/gnuradio/block_detail.h @@ -229,7 +229,7 @@ namespace gr { float pc_work_time_var(); float pc_work_time_total(); - + tpb_detail d_tpb; // used by thread-per-block scheduler int d_produce_or; @@ -261,7 +261,7 @@ namespace gr { float d_var_work_time; float d_total_work_time; float d_pc_counter; - + block_detail(unsigned int ninputs, unsigned int noutputs); friend struct tpb_detail; diff --git a/gnuradio-runtime/include/gnuradio/fxpt_vco.h b/gnuradio-runtime/include/gnuradio/fxpt_vco.h index cbc204c1b8..28560db905 100644 --- a/gnuradio-runtime/include/gnuradio/fxpt_vco.h +++ b/gnuradio-runtime/include/gnuradio/fxpt_vco.h @@ -50,7 +50,7 @@ namespace gr { d_phase += fxpt::float_to_fixed(delta_phase); } - float get_phase() const { + float get_phase() const { return fxpt::fixed_to_float(d_phase); } diff --git a/gnuradio-runtime/include/gnuradio/ice_application_base.h b/gnuradio-runtime/include/gnuradio/ice_application_base.h index 1cb60fbf96..126327151a 100644 --- a/gnuradio-runtime/include/gnuradio/ice_application_base.h +++ b/gnuradio-runtime/include/gnuradio/ice_application_base.h @@ -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) @@ -43,14 +43,14 @@ namespace { static const unsigned int ICEAPPLICATION_ACTIVATION_TIMEOUT_MS(600); }; -class GR_RUNTIME_API ice_application_common : public Ice::Application +class GR_RUNTIME_API ice_application_common : public Ice::Application { public: template<typename TserverBase, typename TserverClass> friend class ice_application_base; static boost::shared_ptr<ice_application_common> Instance(); ~ice_application_common() {;} static int d_reacquire_attributes; - + protected: static bool d_main_called; static bool d_have_ice_config; @@ -67,34 +67,34 @@ public: boost::shared_ptr<ice_application_common> d_application; ice_application_base(TserverClass* _this); ~ice_application_base() {;} - + static TserverBase* i(); static const std::vector<std::string> endpoints(); - + protected: bool have_ice_config() { return d_application->d_have_ice_config; } void set_endpoint(const std::string& endpoint) { d_application->d_endpointStr = endpoint;} - + //this one is the key... overwrite in templated/inherited variants virtual TserverBase* i_impl() = 0; - //tools for the i_impl... + //tools for the i_impl... //tell it when it has to resync with the communicator virtual bool reacquire_sync(); virtual void sync_reacquire(); static TserverClass* d_this; - + int d_reacquire; //static int d_reacquire_attributes; - + private: void starticeexample(); - + bool application_started(); - + int run(int, char*[]); - + static void kickoff(); }; @@ -106,7 +106,7 @@ TserverClass* ice_application_base<TserverBase, TserverClass>::d_this(0); template<typename TserverBase, typename TserverClass> ice_application_base<TserverBase, TserverClass>::ice_application_base(TserverClass* _this) - : d_reacquire(0) + : d_reacquire(0) { //d_reacquire_attributes = 0; d_this = _this; @@ -123,13 +123,13 @@ void ice_application_base<TserverBase, TserverClass>::starticeexample() if(conffile.size() > 0) { std::stringstream iceconf; - ice_application_common::d_have_ice_config = true; + ice_application_common::d_have_ice_config = true; ice_application_common::d_main_called = true; iceconf << conffile; d_application->main(0, argv, iceconf.str().c_str()); } else { - ice_application_common::d_have_ice_config = false; + ice_application_common::d_have_ice_config = false; ice_application_common::d_main_called = true; d_application->main(0, argv); } @@ -139,17 +139,17 @@ template<typename TserverBase, typename TserverClass> void ice_application_base<TserverBase, TserverClass>::kickoff() { static bool run_once = false; - + //if(!d_this->application_started()) { if(!run_once) { ++d_this->d_application->d_reacquire_attributes; - + ice_application_common::d_thread = boost::shared_ptr<boost::thread> (new boost::thread(boost::bind(&ice_application_base::starticeexample, d_this))); - + ::timespec timer_ts, rem_ts; timer_ts.tv_sec = 0; timer_ts.tv_nsec = ICEAPPLICATION_ACTIVATION_TIMEOUT_MS*1000; - + int iter = 0; while(!d_this->application_started()) { #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) @@ -164,10 +164,10 @@ void ice_application_base<TserverBase, TserverClass>::kickoff() break; } } - + run_once = true; } - + return; } @@ -195,20 +195,20 @@ template<typename TserverBase, typename TserverClass> TserverBase* ice_application_base<TserverBase, TserverClass>::i() { //printf("indacall\n"); - + assert(d_this != 0); if(!d_this->application_started()) { //printf("anotherkickoff\n"); kickoff(); } //printf("donekickedoff\n"); - + /*else if(!d_proxy) { d_proxy = d_this->i_impl(); assert(d_proxy != 0); }*/ - return d_this->i_impl(); + return d_this->i_impl(); } /*template<typename TserverBase, typename TserverClass> diff --git a/gnuradio-runtime/include/gnuradio/ice_server_template.h b/gnuradio-runtime/include/gnuradio/ice_server_template.h index 45c1756a48..5e77d29265 100644 --- a/gnuradio-runtime/include/gnuradio/ice_server_template.h +++ b/gnuradio-runtime/include/gnuradio/ice_server_template.h @@ -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) @@ -35,7 +35,7 @@ public: const std::string& contolPortName, const std::string& endpointName); ~ice_server_template(); - + protected: //virtual bool application_started(); TserverBase* i_impl(); @@ -50,10 +50,10 @@ private: template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass> ice_server_template<TserverBase, TserverClass, TImplClass, TIceClass>::ice_server_template - (TImplClass* _this, const std::string& controlPortName, const std::string& endpointName) + (TImplClass* _this, const std::string& controlPortName, const std::string& endpointName) : ice_application_base<TserverBase, TImplClass>(_this), d_iceserver(0), - d_contolPortName(controlPortName), + d_contolPortName(controlPortName), d_endpointName(endpointName) {;} @@ -69,7 +69,7 @@ ice_server_template<TserverBase, TserverClass,TImplClass, TIceClass>::~ice_serve template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass> TserverBase* ice_server_template<TserverBase, TserverClass, TImplClass, TIceClass>::i_impl() -{ +{ if(ice_application_base<TserverBase, TImplClass>::d_this->reacquire_sync()) { d_adapter = (ice_application_base<TserverBase, TImplClass>::d_this->have_ice_config()) ? ice_application_base<TserverBase, TImplClass>::d_this->d_this->d_application->communicator()->createObjectAdapter(d_contolPortName) : @@ -77,7 +77,7 @@ TserverBase* ice_server_template<TserverBase, TserverClass, TImplClass, TIceClas TserverClass* server_ice(new TserverClass()); TIceClass obj(server_ice); - + Ice::Identity id(ice_application_base<TserverBase, TImplClass>::d_this->d_this->d_application->communicator()->stringToIdentity(d_endpointName)); d_adapter->add(obj, id); d_adapter->activate(); diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_passing.h b/gnuradio-runtime/include/gnuradio/messages/msg_passing.h index 6ad6c40b08..42b300a574 100644 --- a/gnuradio-runtime/include/gnuradio/messages/msg_passing.h +++ b/gnuradio-runtime/include/gnuradio/messages/msg_passing.h @@ -99,7 +99,7 @@ namespace gr { /*! * \brief send message to msg_accepter * - * \param accepter is the target of the send. + * \param accepter is the target of the send. * aprecond: pmt::is_msg_accepter(accepter) * \param which_port A pmt symbol describing the port by name. * \param msg is the message to send. It's usually a pmt tuple. diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_producer.h b/gnuradio-runtime/include/gnuradio/messages/msg_producer.h index 758320fc6a..046db9b204 100644 --- a/gnuradio-runtime/include/gnuradio/messages/msg_producer.h +++ b/gnuradio-runtime/include/gnuradio/messages/msg_producer.h @@ -45,7 +45,7 @@ namespace gr { }; typedef boost::shared_ptr<msg_producer> msg_producer_sptr; - + } /* namespace messages */ } /* namespace gr */ diff --git a/gnuradio-runtime/include/gnuradio/pycallback_object.h b/gnuradio-runtime/include/gnuradio/pycallback_object.h index 709ca0e732..989aed1d00 100644 --- a/gnuradio-runtime/include/gnuradio/pycallback_object.h +++ b/gnuradio-runtime/include/gnuradio/pycallback_object.h @@ -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) @@ -32,7 +32,7 @@ enum pyport_t { PYPORT_FLOAT }; -class Instance +class Instance { public: static boost::shared_ptr<ice_application_common> get_application() @@ -51,8 +51,8 @@ int pycallback_object_count = 500; template <class myType> class pmt_assist { public: - static pmt::pmt_t make(myType _val) - { + static pmt::pmt_t make(myType _val) + { return pmt::mp(_val); } }; @@ -67,7 +67,7 @@ pmt::pmt_t pmt_assist<std::vector<float> >::make(std::vector<float> _val) template<> pmt::pmt_t pmt_assist<std::vector<gr_complex> >::make(std::vector<gr_complex> _val) { - return pmt::init_c32vector(_val.size(), &_val[0]); + return pmt::init_c32vector(_val.size(), &_val[0]); } template <class myType> class pycallback_object @@ -165,31 +165,31 @@ private: // template specialization conversion functions // get data out of the PyObject and into the real world -template<> +template<> std::string pycallback_object<std::string>::pyCast(PyObject* obj) { return std::string(PyString_AsString(obj)); } -template<> +template<> double pycallback_object<double>::pyCast(PyObject* obj) { return PyFloat_AsDouble(obj); } -template<> +template<> float pycallback_object<float>::pyCast(PyObject* obj) { return (float)PyFloat_AsDouble(obj); } -template<> +template<> int pycallback_object<int>::pyCast(PyObject* obj) { return PyInt_AsLong(obj); } -template<> +template<> std::vector<float> pycallback_object<std::vector<float> >::pyCast(PyObject* obj) { int size = PyObject_Size(obj); @@ -200,14 +200,14 @@ std::vector<float> pycallback_object<std::vector<float> >::pyCast(PyObject* obj) return rval; } -template<> +template<> std::vector<gr_complex> pycallback_object<std::vector<gr_complex> >::pyCast(PyObject* obj) { int size = PyObject_Size(obj); std::vector<gr_complex> rval(size); for(int i=0; i<size; i++){ rval[i] = \ gr_complex((float)PyComplex_RealAsDouble(PyList_GetItem(obj, i)), - (float)PyComplex_ImagAsDouble(PyList_GetItem(obj, i))); + (float)PyComplex_ImagAsDouble(PyList_GetItem(obj, i))); } return rval; } diff --git a/gnuradio-runtime/include/gnuradio/realtime.h b/gnuradio-runtime/include/gnuradio/realtime.h index b07caf6b21..bd912e2983 100644 --- a/gnuradio-runtime/include/gnuradio/realtime.h +++ b/gnuradio-runtime/include/gnuradio/realtime.h @@ -27,7 +27,7 @@ #include <gnuradio/realtime_impl.h> namespace gr { - + /*! * \brief If possible, enable high-priority "real time" scheduling. * \ingroup misc diff --git a/gnuradio-runtime/include/gnuradio/rpcmanager.h b/gnuradio-runtime/include/gnuradio/rpcmanager.h index 12cf279406..5635572a8b 100644 --- a/gnuradio-runtime/include/gnuradio/rpcmanager.h +++ b/gnuradio-runtime/include/gnuradio/rpcmanager.h @@ -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) @@ -45,7 +45,7 @@ class GR_RUNTIME_API rpcmanager : public virtual rpcmanager_base rpcserver_booter_register_helper() { rpcmanager::register_booter(new T()); } - + //TODO: unregister }; diff --git a/gnuradio-runtime/include/gnuradio/rpcmanager_base.h b/gnuradio-runtime/include/gnuradio/rpcmanager_base.h index 60425c4a15..16ff956b01 100644 --- a/gnuradio-runtime/include/gnuradio/rpcmanager_base.h +++ b/gnuradio-runtime/include/gnuradio/rpcmanager_base.h @@ -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/include/gnuradio/rpcpmtconverters_ice.h b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h index e592f4cdfb..8b2c52890b 100644 --- a/gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h +++ b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h @@ -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) @@ -28,7 +28,7 @@ namespace rpcpmtconverter { - pmt::pmt_t to_pmt(const GNURadio::KnobPtr& knob, const Ice::Current& c); + pmt::pmt_t to_pmt(const GNURadio::KnobPtr& knob, const Ice::Current& c); GNURadio::KnobPtr from_pmt(const pmt::pmt_t& knob, const Ice::Current& c); } diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h index cc19d7ff48..98aae92b90 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h @@ -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/include/gnuradio/rpcserver_base.h b/gnuradio-runtime/include/gnuradio/rpcserver_base.h index e2a1f6ef24..af0b9e762d 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_base.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_base.h @@ -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/include/gnuradio/rpcserver_booter_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h index aac9ef8de6..bf95c60165 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h @@ -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/include/gnuradio/rpcserver_booter_base.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h index 682944dada..127ceaa88d 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h @@ -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/include/gnuradio/rpcserver_booter_ice.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h index 11095ac433..9c64095bb0 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h @@ -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/include/gnuradio/rpcserver_ice.h b/gnuradio-runtime/include/gnuradio/rpcserver_ice.h index c1c3d46a42..260c7f06b5 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_ice.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_ice.h @@ -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) @@ -62,7 +62,7 @@ private: QueryCallbackMap_t d_getcallbackmap; template<typename T, typename TMap> struct set_f - : public std::unary_function<T,void> + : public std::unary_function<T,void> { set_f(const Ice::Current& _c, TMap& _setcallbackmap, const priv_lvl_t& _cur_priv) : c(_c), d_setcallbackmap(_setcallbackmap), cur_priv(_cur_priv) @@ -98,7 +98,7 @@ private: const priv_lvl_t& _cur_priv, GNURadio::KnobMap& _outknobs) : c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs) {} - + void operator()(const T& p) { QueryCallbackMap_t::const_iterator iter(d_getcallbackmap.find(p)); diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_selector.h b/gnuradio-runtime/include/gnuradio/rpcserver_selector.h index fa63c9a2dc..f45e919b0b 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_selector.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_selector.h @@ -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/include/gnuradio/tags.h b/gnuradio-runtime/include/gnuradio/tags.h index 0bd7b8537f..4e63d77755 100644 --- a/gnuradio-runtime/include/gnuradio/tags.h +++ b/gnuradio-runtime/include/gnuradio/tags.h @@ -27,7 +27,7 @@ #include <pmt/pmt.h> namespace gr { - + struct GR_RUNTIME_API tag_t { //! the item \p tag occurred at (as a uint64_t) diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h index f646ab65f6..a58d172867 100644 --- a/gnuradio-runtime/include/gnuradio/thread/thread.h +++ b/gnuradio-runtime/include/gnuradio/thread/thread.h @@ -141,11 +141,11 @@ namespace gr { /*! \brief get current thread priority for a given thread ID */ GR_RUNTIME_API int thread_priority(gr_thread_t thread); - + /*! \brief set current thread priority for a given thread ID */ GR_RUNTIME_API int set_thread_priority(gr_thread_t thread, int priority); - + GR_RUNTIME_API void set_thread_name(gr_thread_t thread, std::string name); |