summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-11-16Merge branch 'next' into taggingTom Rondeau
2010-11-14First hack at pruning tags to keep from growing.Tom Rondeau
2010-11-14Fixing constructor interface to work better through python (int instead of ↵Tom Rondeau
uint64_t).
2010-11-14Adds argument to annotator test blocks to determine when they add a new tag.Tom Rondeau
2010-11-14Fixing some bugs.Tom Rondeau
2010-11-13More test methods. Better testing of the all-to-all policy and more tests ↵Tom Rondeau
for the 1-to-1.
2010-11-13Block executor propagation method returns an error indicator to stop the ↵Tom Rondeau
flowgraph in an error instead of throwing.
2010-11-13Fixing how 1-to-1 annotator handles inputs to better test propagataion method.Tom Rondeau
2010-11-13Renamed annotator block that goes all-to-all now so that it can take in ↵Tom Rondeau
arbitrary number of inputs and pass tags on that way.
2010-11-11Reworked 1-to-1 annotator block to better testing purposes.Tom Rondeau
2010-11-11Switches to using the new annotator block with a known graph structure to ↵Tom Rondeau
run tests against the all-to-all tag propagation policy to make sure the tags are flowing downstream properly. Adding stub for testing the 1-to-1 tag propagation policy.
2010-11-11Modifying the all-to-all stream annotator for better use in testing. It now ↵Tom Rondeau
add tags at pre-determined points in the stream and also grabs all tags that flow past and stores them locally. These tags are to be used for testing that the correct tags are coming through.
2010-11-11Adding an annotator block that moves tags using 1-to-1 policy.Tom Rondeau
2010-11-11Renaming random_annotator to annotator_1toall that moves tags from single ↵Tom Rondeau
input to all outputs.
2010-11-11Fixed small bug in how tags are propagated downstream. Also using seq. ↵Tom Rondeau
numbers in annotator test block to better keep track.
2010-11-08Burned by another copy-paste error. Correctly checking and acting if its a sink.Tom Rondeau
2010-11-08Adding mutex protection around adding and getting tags from buffers.Tom Rondeau
2010-11-08Made propagate_tags a function to be called from block_executor to move tags ↵Tom Rondeau
downstream. Also made d_start_nitems_read a member of gr_block_executor to better handle allocation.
2010-11-08Renaming "handling_method" to "propagation_policy".Tom Rondeau
2010-11-08cleaning up; comments, naming, typos, excess code, etc. Moving to make ↵Tom Rondeau
gr_block_executor more readable.
2010-11-07Moving tag handling setup back into gr_block so it can be set in the ↵Tom Rondeau
constructor of a derived block.
2010-11-07Moving tags downstream is moved into gr_block_executor. Predefined three ↵Tom Rondeau
methods of moving tags that are selectable by a gr_block.
2010-11-07Cleaning up. Better use of PMTs; comment mods; returning vectors when ↵Tom Rondeau
getting tags.
2010-11-07Merge branch 'master' into nextTom Rondeau
* master: Sneaking in a few warning fixes to this branch. Adding ability for FIR filter with internal buffer to decimate. Adds a new parameter "y_axis_label" to scopesink2 and the GRC .xml file that contains the string for the Y axis label. It defaults to 'Counts' to be consistent with the old version. Adding ccf version of fir filter to gitignore. Removing nonexistent gri .i file from Makefile. Got a bit carried away with the copy/paste. Removing ccf version of filter that is now autogenerated. Fixing up filters a bit to pass QA tests for all versions. Fixes Makefile for fir filter generators. Using generators to make gri_fir_filter_with_buffer_XXX into all possible in/out/tap types we support. Work on examples for the synthesize filterbank block. The cleans up the simple example and adds a new example that synthesizes a number of signals and then channelizes them again. It displays the synthesized PSD as well as the PSD and time waveform of one of the channels that's specified in teh code. Adding QA code for fir filter with buffer. Cleaning up synthesis filter and using new FIR filter with buffer. Cleaning up the new FIR filter implementation. Protects against some corner cases and adds filterN. Adding a test example for the synthesis filter. Adding a FIR filter implemented with its own internal buffer. This one keeps its own delay line and just takes in input samples instead of a pointer to an external buffer. rearrange includes to always be: internal GR, external, with GR. Can now set more channels than input signals. Empty channels are established as the outtermost channels (around fs/2 and -fs/2). Fixing ordering so that the input channels line up in the output signal properly. Adding the synthesis filterbank (the opposite of the channelizer). It's ugly right now and uses a lot of memory to handle the buffers for each filter/input stream.
2010-11-06Don't directly output tag info to screen from gr_random_annotator; instead, ↵Tom Rondeau
store the stream and write it to stdout when block is being destroyed. This avoids issues of the muliple threads writing simultaneously to screen.
2010-11-06Adding call in scheduler to handle tag movements between blocks and some ↵Tom Rondeau
helper functions to get access and keep track of tags.
2010-11-06Because tags can be appended from upstream, they are not consecutive in ↵Tom Rondeau
time, so we need to cycle through them all.
2010-11-06Better formatting of tag information to make info more readable.Tom Rondeau
2010-11-06buffer_reader does not hold its own tags but looks upstream to the ↵Tom Rondeau
associated buffer to get them.
2010-11-04Fixing api call to gr_buffer_reader that no longer takes in which_input.Tom Rondeau
2010-11-04gr_buffer_reader doesn't need to know which input it is.Tom Rondeau
2010-11-04Moving add_item_tag into gr_buffer and get_tags_in_range to ↵Tom Rondeau
gr_buffer_reader. gr_block_detail takes care of the high-level adding and retrieving tags via the buffers/readers; also takes care of filtering tags by key. Tags are now added to the gr_buffers on 'which_output' while they are retrieved from the gr_buffer_reader based on 'which_input."
2010-11-04Making annotator block build up tags with the noutput_items as the value ↵Tom Rondeau
held. Simply prints info to stdout when tags are retreived.
2010-11-04Makding random_annotator simply copy input to output streams; fixes IO ↵Tom Rondeau
signatures.
2010-11-04Adding shell block for a random annotator. This will be used only for ↵Tom Rondeau
testing the stream tags, which is why its sitting in runtime.
2010-11-04Changing API to match changes to gr_block, including adding "srcid" param to ↵Tom Rondeau
add_item_tag. Added documentation to header file. Changing to deque from list. Still holding the deque locally in block_detail, but will be moved to gr_buffer. Adding tag just builds the tag tuple and appends it; doesn't worry about duplications.
2010-11-04Moves gr_block functions dealing with tags into protected space. Adds ↵Tom Rondeau
documentation to functions in header. Adds a "srcid" parameter to the add_item_tag function.
2010-11-04Fixing buffer to update abs_write_offset counter. Keeping access to counters ↵Tom Rondeau
exposed through gr_block for now, just remaining to nitem_*.
2010-11-02Moved number items read/written from gr_block_detail into gr_buffer ↵Tom Rondeau
(abs_written_offset) and gr_buffer_reader (abs_read_offset). Keeps the API exposed in gr_blocks for now.
2010-11-02Adding QA code to perform some tests on tags. Setting and getting items ↵Tom Rondeau
read/written; testing adding and retrieving tags.
2010-11-02Adding some protection to the nitems read/written accessors. Should this ↵Tom Rondeau
return 0 or throw?
2010-11-02Sneaking in a few warning fixes to this branch.Tom Rondeau
2010-11-02Adding ability for FIR filter with internal buffer to decimate.Tom Rondeau
Also adds QA code to test decimate by 2 and 5. Removes lib/filter/gri_fir_filter_with_buffer_ccf.h that is autogenerated.
2010-10-31Using pmt_eqv for key testing instead of == to make sure typing is worked ↵Tom Rondeau
out properly.
2010-10-31Checks for duplicate entry when adding a new tag.Tom Rondeau
add_item_tag looks at the last tag entered with the given key and tests if the value is the same. If it is the same value, then don't do add a new item. If the value is different, add a new tag of that key to the list.
2010-10-31get_tags_in_range now gets items between start and end INCLUSIVELY.Tom Rondeau
2010-10-31Adds functional ability to call get_tags_in_range with a specified key.Tom Rondeau
2010-10-31Fix to get_tags_in_range. Returns proper list and handles times when list is ↵Tom Rondeau
empty.
2010-10-29Merge branch 'makefile_var_ordering'Tom Rondeau
2010-10-28uhd: added ref clock option to single usrp blocks, minor grc fix on empty ↵Josh Blum
option keys