Merge branch 'master' into next

1 files changed, 36 insertions, 3 deletions

diff --git a/gnuradio-core/src/lib/general/gri_fft.h b/gnuradio-core/src/lib/general/gri_fft.h
index 91a82fb55..ed80badf1 100644
--- a/gnuradio-core/src/lib/general/gri_fft.h
+++ b/gnuradio-core/src/lib/general/gri_fft.h
@@ -49,12 +49,13 @@ public:
  */
 class GR_CORE_API gri_fft_complex {
   int	      d_fft_size;
+  int         d_nthreads;
   gr_complex *d_inbuf;
   gr_complex *d_outbuf;
   void	     *d_plan;
   
 public:
-  gri_fft_complex (int fft_size, bool forward = true);
+  gri_fft_complex (int fft_size, bool forward = true, int nthreads=1);
   virtual ~gri_fft_complex ();
 
   /*
@@ -69,6 +70,16 @@ public:
   int outbuf_length () const { return d_fft_size; }
 
   /*!
+   *  Set the number of threads to use for caclulation.
+   */
+  void set_nthreads(int n);
+
+  /*!
+   *  Get the number of threads being used by FFTW
+   */
+  int nthreads() const { return d_nthreads; }
+
+  /*!
    * compute FFT.  The input comes from inbuf, the output is placed in outbuf.
    */
   void execute ();
@@ -80,12 +91,13 @@ public:
  */
 class GR_CORE_API gri_fft_real_fwd {
   int	      d_fft_size;
+  int         d_nthreads;
   float	     *d_inbuf;
   gr_complex *d_outbuf;
   void	     *d_plan;
   
 public:
-  gri_fft_real_fwd (int fft_size);
+  gri_fft_real_fwd (int fft_size, int nthreads=1);
   virtual ~gri_fft_real_fwd ();
 
   /*
@@ -100,6 +112,16 @@ public:
   int outbuf_length () const { return d_fft_size / 2 + 1; }
 
   /*!
+   *  Set the number of threads to use for caclulation.
+   */
+  void set_nthreads(int n);
+
+  /*!
+   *  Get the number of threads being used by FFTW
+   */
+  int nthreads() const { return d_nthreads; }
+
+  /*!
    * compute FFT.  The input comes from inbuf, the output is placed in outbuf.
    */
   void execute ();
@@ -111,12 +133,13 @@ public:
  */
 class GR_CORE_API gri_fft_real_rev {
   int	      d_fft_size;
+  int         d_nthreads;
   gr_complex *d_inbuf;
   float	     *d_outbuf;
   void	     *d_plan;
   
 public:
-  gri_fft_real_rev (int fft_size);
+  gri_fft_real_rev (int fft_size, int nthreads=1);
   virtual ~gri_fft_real_rev ();
 
   /*
@@ -131,6 +154,16 @@ public:
   int outbuf_length () const { return d_fft_size; }
 
   /*!
+   *  Set the number of threads to use for caclulation.
+   */
+  void set_nthreads(int n);
+
+  /*!
+   *  Get the number of threads being used by FFTW
+   */
+  int nthreads() const { return d_nthreads; }
+
+  /*!
    * compute FFT.  The input comes from inbuf, the output is placed in outbuf.
    */
   void execute ();