Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-12 | 2 | -2/+3 | |
|\| | | | | | ||||||
| * | | | | | core: typedef vector<unsigned int> so SWIG can handle including it multiple ↵ | Tom Rondeau | 2013-02-12 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | times. | |||||
* | | | | | | sched: added ControlPort interface to setup and access perf counters. | Tom Rondeau | 2013-02-07 | 7 | -2/+78 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/runtime/gr_block.h | |||||
* | | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-07 | 6 | -1/+240 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt | |||||
| * | | | | | sched: swiging perf counters into Python. | Tom Rondeau | 2013-02-07 | 1 | -0/+9 | |
| | | | | | | ||||||
| * | | | | | sched: adding in perf counters to measure performance of blocks during ↵ | Tom Rondeau | 2013-02-07 | 5 | -1/+231 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exectution of flowgraph. Conflicts: CMakeLists.txt gnuradio-core/src/lib/runtime/gr_block.cc gnuradio-core/src/lib/runtime/gr_block_detail.cc gnuradio-core/src/lib/runtime/gr_block_detail.h | |||||
* | | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-07 | 8 | -0/+115 | |
|\| | | | | | ||||||
| * | | | | | Merge branch 'master' of gnuradio.org:gnuradio | Tom Rondeau | 2013-02-07 | 2 | -5/+7 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | docs: fixed missed parameter documentation in fastnoise_source block. | Tom Rondeau | 2013-02-07 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | gruel: renamed mask to dword_mask | Nicholas Corgan | 2013-02-06 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | QA: adding a test to make sure the set_processor_affinity calls work and ↵ | Tom Rondeau | 2013-02-06 | 2 | -0/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | top_block starts correctly. | |||||
| * | | | | | | core: working thread affinity concept into gr_blocks. | Tom Rondeau | 2013-02-06 | 6 | -0/+86 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example in gnuradio-core/src/examples/mp-sched/affinity_set.py Documentation describing API in docs/doxygen/other/thread_affinity.dox | |||||
* | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2013-02-07 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Merge branch 'maint' | Johnathan Corgan | 2013-02-07 | 1 | -5/+5 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | | ||||||
| | * | | | | blocks: fix use of bare boost::mutex::scoped_lock | Johnathan Corgan | 2013-02-07 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gr_file_source gr::blocks::file_source | |||||
* | | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-06 | 4 | -3/+6 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merges fastnoise_source from master and reorganizes it to gr-analog. Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt gnuradio-core/src/lib/general/general.i gnuradio-core/src/lib/gengen/CMakeLists.txt gnuradio-core/src/lib/hier/gr_channel_model.cc gnuradio-core/src/lib/hier/gr_channel_model.h | |||||
| * | | | | | adding gr_fastnoise_source and making it the default for gr_channel_model | Tim O'Shea | 2013-02-05 | 6 | -3/+245 | |
| | | | | | | | | | | | | | | | | | | | | | | | | this is a 4x-6x speedup depending on the processor/os | |||||
| * | | | | | core: adding gr_random_pdu message passing block | Tim O'Shea | 2013-02-05 | 2 | -0/+3 | |
| | |/ / / | |/| | | | ||||||
* | | | | | ctrlport: fixing interface to rpcbasic_register_variable for new API to ↵ | Tom Rondeau | 2013-02-04 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | | | other functions. | |||||
* | | | | | ctrlport: adding back old (almost) style API for controlport. | Tom Rondeau | 2013-02-04 | 1 | -0/+99 | |
| | | | | | | | | | | | | | | | | | | | | Allows us to create controlport interfaces from a name and object pointer and not just the alias of a gr_basic_block. | |||||
* | | | | | ctrlport: updated all blocks using controlport to use new style of setup_rpc. | Tom Rondeau | 2013-01-23 | 6 | -31/+56 | |
| | | | | | | | | | | | | | | | | | | | | QA fixed and passing. | |||||
* | | | | | ctrlport: Changed RPC setup call to only require block's alias and not all ↵ | Tom Rondeau | 2013-01-23 | 6 | -25/+70 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the other info we used to require. gr_top_block shows the new interface. The flowgraph now automatically calls setup_rpc on every block when the flowgraph is run. No need to have setup_rpc() in the block's constructor. | |||||
* | | | | | core: exporting the block registry (for RPC setup). | Tom Rondeau | 2013-01-23 | 1 | -2/+3 | |
| | | | | | ||||||
* | | | | | digital: fixed up examples for the updated location of blocks. | Tom Rondeau | 2013-01-15 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-01-15 | 7 | -2/+92 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-digital/examples/demod/ber_simulation.grc gr-digital/examples/demod/digital_freq_lock.grc gr-digital/examples/demod/pam_sync.grc gr-digital/examples/demod/pam_timing.grc | |||||
| * | | | | Merge remote-tracking branch 'mbant/equal_for_tags' | Tom Rondeau | 2013-01-15 | 7 | -2/+92 | |
| |\ \ \ \ | ||||||
| | * | | | | core: added remove_tag_item() | Martin Braun | 2013-01-15 | 6 | -2/+87 | |
| | | | | | | ||||||
| | * | | | | core: added operator == for tags | Martin Braun | 2013-01-15 | 1 | -0/+5 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2013-01-14 | 1 | -0/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt | |||||
| * | | | | | Merge branch 'maint' | Johnathan Corgan | 2013-01-14 | 1 | -0/+1 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | core: gr_socket_pdu missing iostream | Josh Blum | 2013-01-14 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2013-01-14 | 3 | -0/+177 | |
|\| | | | | | ||||||
| * | | | | | core: adding gr_random_pdu message passing block | Tim O'Shea | 2013-01-14 | 3 | -0/+177 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt gnuradio-core/src/lib/general/general.i | |||||
* | | | | | pmt: fixing a few files with older pmt naming style. | Tom Rondeau | 2013-01-13 | 1 | -92/+90 | |
| | | | | | ||||||
* | | | | | Merge master/fix_build_dir_order into next, then fix conflicts and redo come ↵ | Michael L Dickens | 2013-01-04 | 2 | -14/+17 | |
|\| | | | | | | | | | | | | | | | | | | | of the INCLUDE_DIRS order | |||||
| * | | | | Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ↵ | Michael L Dickens | 2013-01-01 | 2 | -11/+15 | |
| | | | | | | | | | | | | | | | | | | | | ordered as: internal build and source for this component, other components (internal build and source, or already installed), non-project non-system dependencies (e.g., Qt, Boost, Python), system dependencies (e.g., CoreAudio). | |||||
* | | | | | ctrlport: removing unused and unecessary file. | Tom Rondeau | 2013-01-02 | 1 | -126/+0 | |
| | | | | | ||||||
* | | | | | pmt: too hasty in fixing a conflict in the merge. | Tom Rondeau | 2013-01-02 | 1 | -9/+9 | |
| | | | | | ||||||
* | | | | | Merge branch 'pmt_rename' into next | Tom Rondeau | 2013-01-02 | 29 | -205/+199 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/io/gr_pdu.cc gruel/src/lib/pmt/pmt.cc gruel/src/lib/pmt/qa_pmt_prims.cc gruel/src/lib/pmt/unv_template.cc.t gruel/src/swig/pmt_swig.i | |||||
| * | | | | | gruel: updating all GR blocks that use PMTs to use new naming. | Tom Rondeau | 2012-12-21 | 29 | -196/+190 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-12-31 | 2 | -11/+11 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | core: fixed some unused parameter warnings | Alexandru Csete | 2012-12-31 | 2 | -11/+11 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Tom Rondeau | 2012-12-21 | 5 | -14/+21 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-12-20 | 5 | -14/+21 | |
| |\| | | | | | | |/ / / / | |/| | | | | ||||||
| | * | | | | core: fixed pdu MSVC compatibility issues | Nicholas Corgan | 2012-12-20 | 5 | -14/+21 | |
| | | | | | | ||||||
* | | | | | | blocks: removes blocks moved to gr-blocks from gnuradio-core. | Tom Rondeau | 2012-12-21 | 163 | -8373/+5 | |
|/ / / / / | | | | | | | | | | | | | | | | Also fixes up some other missing moves. | |||||
* | | | | | Merge branch 'master' into next | Tom Rondeau | 2012-12-18 | 1 | -2/+2 | |
|\| | | | | ||||||
| * | | | | core: gr_tag_debug handles lacking srcid | Martin Braun | 2012-12-18 | 1 | -2/+2 | |
| |/ / / | ||||||
* | | | | Merge branch 'master' into next | Tom Rondeau | 2012-12-14 | 2 | -12/+15 | |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: gr-utils/src/python/CMakeLists.txt | |||||
| * | | | blocks: moving file metadata sink/source to gr-blocks. | Tom Rondeau | 2012-12-14 | 8 | -1293/+0 | |
| | | | |