gnuradio-core: allows configuring FFTW to use ESTIMATE vs. MEASURE

[debian/gnuradio] / gnuradio-core / src / lib / general / gri_fft.cc

diff --git a/gnuradio-core/src/lib/general/gri_fft.cc b/gnuradio-core/src/lib/general/gri_fft.cc
index f6e28e1d1e7e055b39decb96b74b3c6f76bf358c..1ce14eefdc5ae052aad0778e17585ed1edcd6f3f 100644 (file)
--- a/gnuradio-core/src/lib/general/gri_fft.cc
+++ b/gnuradio-core/src/lib/general/gri_fft.cc
@@ -28,16 +28,21 @@
 #include <stdio.h>
 #include <cassert>
 #include <stdexcept>
-#include <boost/thread.hpp>
+#include <gr_prefs.h>
 
-typedef boost::mutex::scoped_lock scoped_lock;
-static boost::mutex  s_planning_mutex;
 
+boost::mutex &
+gri_fft_planner::mutex()
+{
+  static boost::mutex  s_planning_mutex;
+
+  return s_planning_mutex;
+}
 
 static char *
 wisdom_filename ()
 {
-  static char *filename = ".gr_fftw_wisdom";
+  static const char *filename = ".gr_fftw_wisdom";
 
   char *home = getenv ("HOME");
   if (home){
@@ -86,7 +91,7 @@ gri_fftw_export_wisdom ()
 gri_fft_complex::gri_fft_complex (int fft_size, bool forward)
 {
   // Hold global mutex during plan construction and destruction.
-  scoped_lock  lock(s_planning_mutex);
+  gri_fft_planner::scoped_lock lock(gri_fft_planner::mutex());
 
   assert (sizeof (fftwf_complex) == sizeof (gr_complex));
   
@@ -109,7 +114,9 @@ gri_fft_complex::gri_fft_complex (int fft_size, bool forward)
                              reinterpret_cast<fftwf_complex *>(d_inbuf), 
                              reinterpret_cast<fftwf_complex *>(d_outbuf),
                              forward ? FFTW_FORWARD : FFTW_BACKWARD,
-                             FFTW_MEASURE);
+                             gr_prefs::singleton()->get_bool("fftw", "estimate", false) == true ? FFTW_ESTIMATE
+                             : FFTW_MEASURE);
+
 
   if (d_plan == NULL) {
     fprintf(stderr, "gri_fft_complex: error creating plan\n");
@@ -121,7 +128,7 @@ gri_fft_complex::gri_fft_complex (int fft_size, bool forward)
 gri_fft_complex::~gri_fft_complex ()
 {
   // Hold global mutex during plan construction and destruction.
-  scoped_lock  lock(s_planning_mutex);
+  gri_fft_planner::scoped_lock lock(gri_fft_planner::mutex());
 
   fftwf_destroy_plan ((fftwf_plan) d_plan);
   fftwf_free (d_inbuf);
@@ -139,7 +146,7 @@ gri_fft_complex::execute ()
 gri_fft_real_fwd::gri_fft_real_fwd (int fft_size)
 {
   // Hold global mutex during plan construction and destruction.
-  scoped_lock  lock(s_planning_mutex);
+  gri_fft_planner::scoped_lock lock(gri_fft_planner::mutex());
 
   assert (sizeof (fftwf_complex) == sizeof (gr_complex));
   
@@ -161,7 +168,8 @@ gri_fft_real_fwd::gri_fft_real_fwd (int fft_size)
   d_plan = fftwf_plan_dft_r2c_1d (fft_size,
                                  d_inbuf,
                                  reinterpret_cast<fftwf_complex *>(d_outbuf),
-                                 FFTW_MEASURE);
+                                 gr_prefs::singleton()->get_bool("fftw", "estimate", false) == true ? FFTW_ESTIMATE
+                             : FFTW_MEASURE);
 
   if (d_plan == NULL) {
     fprintf(stderr, "gri_fft_real_fwd: error creating plan\n");
@@ -173,7 +181,7 @@ gri_fft_real_fwd::gri_fft_real_fwd (int fft_size)
 gri_fft_real_fwd::~gri_fft_real_fwd ()
 {
   // Hold global mutex during plan construction and destruction.
-  scoped_lock  lock(s_planning_mutex);
+  gri_fft_planner::scoped_lock lock(gri_fft_planner::mutex());
 
   fftwf_destroy_plan ((fftwf_plan) d_plan);
   fftwf_free (d_inbuf);
@@ -190,6 +198,9 @@ gri_fft_real_fwd::execute ()
 
 gri_fft_real_rev::gri_fft_real_rev (int fft_size)
 {
+  // Hold global mutex during plan construction and destruction.
+  gri_fft_planner::scoped_lock lock(gri_fft_planner::mutex());
+
   assert (sizeof (fftwf_complex) == sizeof (gr_complex));
   
   if (fft_size <= 0)