summaryrefslogtreecommitdiff
path: root/gr-blocks/lib
diff options
context:
space:
mode:
Diffstat (limited to 'gr-blocks/lib')
-rw-r--r--gr-blocks/lib/CMakeLists.txt1
-rw-r--r--gr-blocks/lib/file_source_impl.cc98
-rw-r--r--gr-blocks/lib/file_source_impl.h13
-rw-r--r--gr-blocks/lib/keep_m_in_n_impl.cc4
-rw-r--r--gr-blocks/lib/keep_m_in_n_impl.h2
-rw-r--r--gr-blocks/lib/patterned_interleaver_impl.cc87
-rw-r--r--gr-blocks/lib/patterned_interleaver_impl.h61
7 files changed, 237 insertions, 29 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 0b6c89298..3a8ffac75 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -160,6 +160,7 @@ list(APPEND gr_blocks_sources
multiply_const_cc_impl.cc
multiply_const_ff_impl.cc
nlog10_ff_impl.cc
+ patterned_interleaver_impl.cc
repeat_impl.cc
short_to_char_impl.cc
short_to_float_impl.cc
diff --git a/gr-blocks/lib/file_source_impl.cc b/gr-blocks/lib/file_source_impl.cc
index 0d20827b7..ed1f50c43 100644
--- a/gr-blocks/lib/file_source_impl.cc
+++ b/gr-blocks/lib/file_source_impl.cc
@@ -54,39 +54,87 @@ namespace gr {
file_source::sptr file_source::make(size_t itemsize, const char *filename, bool repeat)
{
- return gnuradio::get_initial_sptr(new file_source_impl(itemsize, filename, repeat));
+ return gnuradio::get_initial_sptr
+ (new file_source_impl(itemsize, filename, repeat));
}
file_source_impl::file_source_impl(size_t itemsize, const char *filename, bool repeat)
: gr_sync_block("file_source",
gr_make_io_signature(0, 0, 0),
gr_make_io_signature(1, 1, itemsize)),
- d_itemsize(itemsize), d_fp (0), d_repeat(repeat)
+ d_itemsize(itemsize), d_fp(0), d_new_fp(0), d_repeat(repeat),
+ d_updated(false)
{
- // we use "open" to use to the O_LARGEFILE flag
+ open(filename, repeat);
+ }
+
+ file_source_impl::~file_source_impl()
+ {
+ fclose ((FILE*)d_fp);
+ }
+
+ bool
+ file_source_impl::seek(long seek_point, int whence)
+ {
+ return fseek((FILE*)d_fp, seek_point *d_itemsize, whence) == 0;
+ }
+
+
+ void
+ file_source_impl::open(const char *filename, bool repeat)
+ {
+ // obtain exclusive access for duration of this function
+ boost::mutex::scoped_lock lock(fp_mutex);
int fd;
- if ((fd = open (filename, O_RDONLY | OUR_O_LARGEFILE | OUR_O_BINARY)) < 0){
- perror (filename);
- throw std::runtime_error ("can't open file");
+ // we use "open" to use to the O_LARGEFILE flag
+ if((fd = ::open(filename, O_RDONLY | OUR_O_LARGEFILE | OUR_O_BINARY)) < 0) {
+ perror(filename);
+ throw std::runtime_error("can't open file");
+ }
+
+ if(d_new_fp) {
+ fclose(d_new_fp);
+ d_new_fp = 0;
}
- if ((d_fp = fdopen (fd, "rb")) == NULL) {
+ if((d_new_fp = fdopen (fd, "rb")) == NULL) {
perror(filename);
+ ::close(fd); // don't leak file descriptor if fdopen fails
throw std::runtime_error("can't open file");
}
+
+ d_updated = true;
+ d_repeat = repeat;
}
- file_source_impl::~file_source_impl()
+ void
+ file_source_impl::close()
{
- fclose ((FILE *) d_fp);
+ // obtain exclusive access for duration of this function
+ boost::mutex::scoped_lock lock(fp_mutex);
+
+ if(d_new_fp != NULL) {
+ fclose(d_new_fp);
+ d_new_fp = NULL;
+ }
+ d_updated = true;
}
-
- bool
- file_source_impl::seek(long seek_point, int whence)
+
+ void
+ file_source_impl::do_update()
{
- return fseek ((FILE *) d_fp, seek_point *d_itemsize, whence) == 0;
+ if(d_updated) {
+ boost::mutex::scoped_lock lock(fp_mutex); // hold while in scope
+
+ if(d_fp)
+ fclose(d_fp);
+
+ d_fp = d_new_fp; // install new file pointer
+ d_new_fp = 0;
+ d_updated = false;
+ }
}
int
@@ -94,37 +142,41 @@ namespace gr {
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- char *o = (char *) output_items[0];
+ char *o = (char*)output_items[0];
int i;
int size = noutput_items;
- while (size) {
- i = fread(o, d_itemsize, size, (FILE *) d_fp);
+ do_update(); // update d_fp is reqd
+ if(d_fp == NULL)
+ throw std::runtime_error("work with file not open");
+
+ boost::mutex::scoped_lock lock(fp_mutex); // hold for the rest of this function
+ while(size) {
+ i = fread(o, d_itemsize, size, (FILE*)d_fp);
size -= i;
o += i * d_itemsize;
- if (size == 0) // done
+ if(size == 0) // done
break;
- if (i > 0) // short read, try again
+ if(i > 0) // short read, try again
continue;
// We got a zero from fread. This is either EOF or error. In
// any event, if we're in repeat mode, seek back to the beginning
// of the file and try again, else break
-
- if (!d_repeat)
+ if(!d_repeat)
break;
- if (fseek ((FILE *) d_fp, 0, SEEK_SET) == -1) {
+ if(fseek ((FILE *) d_fp, 0, SEEK_SET) == -1) {
fprintf(stderr, "[%s] fseek failed\n", __FILE__);
exit(-1);
}
}
- if (size > 0) { // EOF or error
- if (size == noutput_items) // we didn't read anything; say we're done
+ if(size > 0) { // EOF or error
+ if(size == noutput_items) // we didn't read anything; say we're done
return -1;
return noutput_items - size; // else return partial result
}
diff --git a/gr-blocks/lib/file_source_impl.h b/gr-blocks/lib/file_source_impl.h
index c35d563d1..600fe80ab 100644
--- a/gr-blocks/lib/file_source_impl.h
+++ b/gr-blocks/lib/file_source_impl.h
@@ -31,15 +31,22 @@ namespace gr {
class BLOCKS_API file_source_impl : public file_source
{
private:
- size_t d_itemsize;
- void *d_fp;
- bool d_repeat;
+ size_t d_itemsize;
+ FILE *d_fp;
+ FILE *d_new_fp;
+ bool d_repeat;
+ bool d_updated;
+ boost::mutex fp_mutex;
+ void do_update();
+
public:
file_source_impl(size_t itemsize, const char *filename, bool repeat);
~file_source_impl();
bool seek(long seek_point, int whence);
+ void open(const char *filename, bool repeat);
+ void close();
int work(int noutput_items,
gr_vector_const_void_star &input_items,
diff --git a/gr-blocks/lib/keep_m_in_n_impl.cc b/gr-blocks/lib/keep_m_in_n_impl.cc
index b3efdd962..312b09c25 100644
--- a/gr-blocks/lib/keep_m_in_n_impl.cc
+++ b/gr-blocks/lib/keep_m_in_n_impl.cc
@@ -39,10 +39,10 @@ namespace gr {
: gr_block("keep_m_in_n",
gr_make_io_signature (1, 1, itemsize),
gr_make_io_signature (1, 1, itemsize)),
- d_itemsize(itemsize),
d_m(m),
d_n(n),
- d_offset(offset)
+ d_offset(offset),
+ d_itemsize(itemsize)
{
// sanity checking
assert(d_m > 0);
diff --git a/gr-blocks/lib/keep_m_in_n_impl.h b/gr-blocks/lib/keep_m_in_n_impl.h
index 5e264dba0..0b8819489 100644
--- a/gr-blocks/lib/keep_m_in_n_impl.h
+++ b/gr-blocks/lib/keep_m_in_n_impl.h
@@ -30,8 +30,8 @@ namespace gr {
class BLOCKS_API keep_m_in_n_impl : public keep_m_in_n
{
- int d_n;
int d_m;
+ int d_n;
int d_count;
int d_offset;
int d_itemsize;
diff --git a/gr-blocks/lib/patterned_interleaver_impl.cc b/gr-blocks/lib/patterned_interleaver_impl.cc
new file mode 100644
index 000000000..437c733a1
--- /dev/null
+++ b/gr-blocks/lib/patterned_interleaver_impl.cc
@@ -0,0 +1,87 @@
+/* -*- 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)
+ * 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,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "patterned_interleaver_impl.h"
+#include <gr_io_signature.h>
+
+namespace gr {
+ namespace blocks {
+
+ patterned_interleaver::sptr patterned_interleaver::make(size_t itemsize, std::vector<int> pattern)
+ {
+ return gnuradio::get_initial_sptr(new patterned_interleaver_impl(itemsize, pattern));
+ }
+
+ patterned_interleaver_impl::patterned_interleaver_impl(size_t itemsize, std::vector<int> pattern)
+ : gr_block ("patterned_interleaver",
+ gr_make_io_signature (pattern_max(pattern)+1, pattern_max(pattern)+1, itemsize),
+ gr_make_io_signature (1, 1, itemsize)),
+ d_pattern(pattern), d_counts( pattern_max(pattern)+1, 0), d_itemsize(itemsize)
+ {
+ BOOST_FOREACH( int i, d_pattern)
+ { d_counts[i]++; }
+ set_output_multiple(d_pattern.size());
+ }
+
+ int
+ patterned_interleaver_impl::general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ size_t nblks = noutput_items/d_pattern.size();
+
+ std::vector<const char*> ii;
+ for(size_t i=0; i<input_items.size(); i++){
+ ii.push_back((const char*)input_items[i]);
+ }
+
+ char *oo = (char *) output_items[0];
+
+ for(size_t i=0; i<nblks; i++){
+ for(size_t j=0; j<d_pattern.size(); j++){
+ memcpy(oo, ii[d_pattern[j]], d_itemsize);
+ oo += d_itemsize;
+ ii[d_pattern[j]] += d_itemsize;
+ }
+ }
+
+ for(size_t i=0; i<d_counts.size(); i++){
+ consume(i, d_counts[i]*nblks );
+ }
+ return nblks*d_pattern.size();
+ }
+
+ void patterned_interleaver_impl::forecast (int noutput_items,
+ gr_vector_int &ninput_items_required){
+ int nblks = noutput_items / d_pattern.size();
+ for(size_t i=0; i<ninput_items_required.size(); i++){
+ ninput_items_required[i] = d_counts[i] * nblks;
+ }
+ }
+
+ } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/patterned_interleaver_impl.h b/gr-blocks/lib/patterned_interleaver_impl.h
new file mode 100644
index 000000000..4266c9636
--- /dev/null
+++ b/gr-blocks/lib/patterned_interleaver_impl.h
@@ -0,0 +1,61 @@
+/* -*- 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)
+ * 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,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_PATTERNED_INTERLEAVER_IMPL_H
+#define INCLUDED_PATTERNED_INTERLEAVER_IMPL_H
+
+#include <blocks/patterned_interleaver.h>
+#include <boost/foreach.hpp>
+
+namespace gr {
+ namespace blocks {
+
+ class BLOCKS_API patterned_interleaver_impl : public patterned_interleaver
+ {
+ public:
+ patterned_interleaver_impl(size_t itemsize, std::vector<int> pattern);
+
+ int general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ int pattern_max(std::vector<int> pattern){
+ int mval(0);
+ BOOST_FOREACH( int i, pattern)
+ { mval = std::max(mval, i); }
+ return mval;
+ }
+
+ void forecast (int noutput_items,
+ gr_vector_int &ninput_items_required);
+
+ std::vector<int> d_pattern;
+ std::vector<int> d_counts;
+ size_t d_itemsize;
+
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif
generated by cgit (git 2.34.1) at 2025-02-28 18:45:37 +0000