commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 05/07: qtgui: switched from using fft::mall


From: git
Subject: [Commit-gnuradio] [gnuradio] 05/07: qtgui: switched from using fft::malloc to volk_malloc.
Date: Sat, 18 Jan 2014 20:31:59 +0000 (UTC)

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 38d88e49d0c94068d85379920621b5ae0299cd39
Author: Tom Rondeau <address@hidden>
Date:   Tue Jan 14 18:14:18 2014 -0500

    qtgui: switched from using fft::malloc to volk_malloc.
---
 gr-qtgui/lib/const_sink_c_impl.cc       | 20 ++++++++++++--------
 gr-qtgui/lib/freq_sink_c_impl.cc        | 30 ++++++++++++++++++------------
 gr-qtgui/lib/freq_sink_f_impl.cc        | 30 ++++++++++++++++++------------
 gr-qtgui/lib/histogram_sink_f_impl.cc   | 10 ++++++----
 gr-qtgui/lib/time_raster_sink_b_impl.cc | 20 ++++++++++++--------
 gr-qtgui/lib/time_raster_sink_f_impl.cc | 20 ++++++++++++--------
 gr-qtgui/lib/time_sink_c_impl.cc        | 10 ++++++----
 gr-qtgui/lib/time_sink_f_impl.cc        | 10 ++++++----
 gr-qtgui/lib/waterfall_sink_c_impl.cc   | 30 ++++++++++++++++++------------
 gr-qtgui/lib/waterfall_sink_f_impl.cc   | 30 ++++++++++++++++++------------
 10 files changed, 126 insertions(+), 84 deletions(-)

diff --git a/gr-qtgui/lib/const_sink_c_impl.cc 
b/gr-qtgui/lib/const_sink_c_impl.cc
index 3fda1ed..fd9338f 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -67,8 +67,10 @@ namespace gr {
       d_index = 0;
 
       for(int i = 0; i < d_nconnections; i++) {
-       d_residbufs_real.push_back(fft::malloc_double(d_size));
-       d_residbufs_imag.push_back(fft::malloc_double(d_size));
+       d_residbufs_real.push_back((double*)volk_malloc(d_size*sizeof(double),
+                                                        volk_get_alignment()));
+       d_residbufs_imag.push_back((double*)volk_malloc(d_size*sizeof(double),
+                                                        volk_get_alignment()));
        memset(d_residbufs_real[i], 0, d_size*sizeof(double));
        memset(d_residbufs_imag[i], 0, d_size*sizeof(double));
       }
@@ -88,8 +90,8 @@ namespace gr {
 
       // d_main_gui is a qwidget destroyed with its parent
       for(int i = 0; i < d_nconnections; i++) {
-       fft::free(d_residbufs_real[i]);
-       fft::free(d_residbufs_imag[i]);
+       volk_free(d_residbufs_real[i]);
+       volk_free(d_residbufs_imag[i]);
       }
 
       delete d_argv;
@@ -259,10 +261,12 @@ namespace gr {
       if(newsize != d_size) {
        // Resize residbuf and replace data
        for(int i = 0; i < d_nconnections; i++) {
-         fft::free(d_residbufs_real[i]);
-         fft::free(d_residbufs_imag[i]);
-         d_residbufs_real[i] = fft::malloc_double(newsize);
-         d_residbufs_imag[i] = fft::malloc_double(newsize);
+         volk_free(d_residbufs_real[i]);
+         volk_free(d_residbufs_imag[i]);
+         d_residbufs_real[i] = (double*)volk_malloc(newsize*sizeof(double),
+                                                     volk_get_alignment());
+         d_residbufs_imag[i] = (double*)volk_malloc(newsize*sizeof(double),
+                                                     volk_get_alignment());
 
          memset(d_residbufs_real[i], 0, newsize*sizeof(double));
          memset(d_residbufs_imag[i], 0, newsize*sizeof(double));
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index 03401a7..1339e2b 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -75,13 +75,16 @@ namespace gr {
       d_shift = true;
 
       d_fft = new fft::fft_complex(d_fftsize, true);
-      d_fbuf = fft::malloc_float(d_fftsize);
+      d_fbuf = (float*)volk_malloc(d_fftsize*sizeof(float),
+                                   volk_get_alignment());
       memset(d_fbuf, 0, d_fftsize*sizeof(float));
 
       d_index = 0;
       for(int i = 0; i < d_nconnections; i++) {
-       d_residbufs.push_back(fft::malloc_complex(d_fftsize));
-       d_magbufs.push_back(fft::malloc_double(d_fftsize));
+       
d_residbufs.push_back((gr_complex*)volk_malloc(d_fftsize*sizeof(gr_complex),
+                                                       volk_get_alignment()));
+       d_magbufs.push_back((double*)volk_malloc(d_fftsize*sizeof(double),
+                                                 volk_get_alignment()));
 
        memset(d_residbufs[i], 0, d_fftsize*sizeof(gr_complex));
        memset(d_magbufs[i], 0, d_fftsize*sizeof(double));
@@ -98,11 +101,11 @@ namespace gr {
         d_main_gui->close();
 
       for(int i = 0; i < d_nconnections; i++) {
-       fft::free(d_residbufs[i]);
-       fft::free(d_magbufs[i]);
+       volk_free(d_residbufs[i]);
+       volk_free(d_magbufs[i]);
       }
       delete d_fft;
-      fft::free(d_fbuf);
+      volk_free(d_fbuf);
 
       delete d_argv;
     }
@@ -394,11 +397,13 @@ namespace gr {
       if(newfftsize != d_fftsize) {
        // Resize residbuf and replace data
        for(int i = 0; i < d_nconnections; i++) {
-         fft::free(d_residbufs[i]);
-         fft::free(d_magbufs[i]);
+         volk_free(d_residbufs[i]);
+         volk_free(d_magbufs[i]);
 
-         d_residbufs[i] = fft::malloc_complex(newfftsize);
-         d_magbufs[i] = fft::malloc_double(newfftsize);
+         d_residbufs[i] = 
(gr_complex*)volk_malloc(newfftsize*sizeof(gr_complex),
+                                                    volk_get_alignment());
+         d_magbufs[i] = (double*)volk_malloc(newfftsize*sizeof(double),
+                                              volk_get_alignment());
 
          memset(d_residbufs[i], 0, newfftsize*sizeof(gr_complex));
          memset(d_magbufs[i], 0, newfftsize*sizeof(double));
@@ -416,8 +421,9 @@ namespace gr {
        delete d_fft;
        d_fft = new fft::fft_complex(d_fftsize, true);
     
-       fft::free(d_fbuf);
-       d_fbuf = fft::malloc_float(d_fftsize);
+       volk_free(d_fbuf);
+       d_fbuf = (float*)volk_malloc(d_fftsize*sizeof(float),
+                                     volk_get_alignment());
        memset(d_fbuf, 0, d_fftsize*sizeof(float));
       }
     }
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index a673e18..98c55b9 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -75,13 +75,16 @@ namespace gr {
       d_shift = true;
 
       d_fft = new fft::fft_complex(d_fftsize, true);
-      d_fbuf = fft::malloc_float(d_fftsize);
+      d_fbuf = (float*)volk_malloc(d_fftsize*sizeof(float),
+                                   volk_get_alignment());
       memset(d_fbuf, 0, d_fftsize*sizeof(float));
 
       d_index = 0;
       for(int i = 0; i < d_nconnections; i++) {
-       d_residbufs.push_back(fft::malloc_float(d_fftsize));
-       d_magbufs.push_back(fft::malloc_double(d_fftsize));
+       d_residbufs.push_back((float*)volk_malloc(d_fftsize*sizeof(float),
+                                                  volk_get_alignment()));
+       d_magbufs.push_back((double*)volk_malloc(d_fftsize*sizeof(double),
+                                                 volk_get_alignment()));
 
        memset(d_residbufs[i], 0, d_fftsize*sizeof(float));
        memset(d_magbufs[i], 0, d_fftsize*sizeof(double));
@@ -98,11 +101,11 @@ namespace gr {
         d_main_gui->close();
 
       for(int i = 0; i < d_nconnections; i++) {
-       fft::free(d_residbufs[i]);
-       fft::free(d_magbufs[i]);
+       volk_free(d_residbufs[i]);
+       volk_free(d_magbufs[i]);
       }
       delete d_fft;
-      fft::free(d_fbuf);
+      volk_free(d_fbuf);
 
       delete d_argv;
     }
@@ -397,11 +400,13 @@ namespace gr {
       if(newfftsize != d_fftsize) {
        // Resize residbuf and replace data
        for(int i = 0; i < d_nconnections; i++) {
-         fft::free(d_residbufs[i]);
-         fft::free(d_magbufs[i]);
+         volk_free(d_residbufs[i]);
+         volk_free(d_magbufs[i]);
 
-         d_residbufs[i] = fft::malloc_float(newfftsize);
-         d_magbufs[i] = fft::malloc_double(newfftsize);
+         d_residbufs[i] = (float*)volk_malloc(newfftsize*sizeof(float),
+                                               volk_get_alignment());
+         d_magbufs[i] = (double*)volk_malloc(newfftsize*sizeof(double),
+                                              volk_get_alignment());
 
          memset(d_residbufs[i], 0, newfftsize*sizeof(float));
          memset(d_magbufs[i], 0, newfftsize*sizeof(double));
@@ -419,8 +424,9 @@ namespace gr {
        delete d_fft;
        d_fft = new fft::fft_complex(d_fftsize, true);
 
-       fft::free(d_fbuf);
-       d_fbuf = fft::malloc_float(d_fftsize);
+       volk_free(d_fbuf);
+       d_fbuf = (float*)volk_malloc(d_fftsize*sizeof(float),
+                                     volk_get_alignment());
        memset(d_fbuf, 0, d_fftsize*sizeof(float));
       }
     }
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc 
b/gr-qtgui/lib/histogram_sink_f_impl.cc
index bc4ac84..8a3ba69 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.cc
+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
@@ -70,7 +70,8 @@ namespace gr {
       d_index = 0;
 
       for(int i = 0; i < d_nconnections; i++) {
-       d_residbufs.push_back(fft::malloc_double(d_size));
+       d_residbufs.push_back((double*)volk_malloc(d_size*sizeof(double),
+                                                   volk_get_alignment()));
        memset(d_residbufs[i], 0, d_size*sizeof(double));
       }
 
@@ -89,7 +90,7 @@ namespace gr {
 
       // d_main_gui is a qwidget destroyed with its parent
       for(int i = 0; i < d_nconnections; i++) {
-       fft::free(d_residbufs[i]);
+       volk_free(d_residbufs[i]);
       }
 
       delete d_argv;
@@ -262,8 +263,9 @@ namespace gr {
       if(newsize != d_size) {
        // Resize residbuf and replace data
        for(int i = 0; i < d_nconnections; i++) {
-         fft::free(d_residbufs[i]);
-         d_residbufs[i] = fft::malloc_double(newsize);
+         volk_free(d_residbufs[i]);
+         d_residbufs[i] = (double*)volk_malloc(newsize*sizeof(double),
+                                                volk_get_alignment());
 
          memset(d_residbufs[i], 0, newsize*sizeof(double));
        }
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc 
b/gr-qtgui/lib/time_raster_sink_b_impl.cc
index 078603d..26daffe 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
@@ -81,11 +81,13 @@ namespace gr {
       d_scale = 1.0f;
 
       d_icols = static_cast<int>(ceil(d_cols));
-      d_tmpflt = fft::malloc_float(d_icols);
+      d_tmpflt = (float*)volk_malloc(d_icols*sizeof(float),
+                                     volk_get_alignment());
       memset(d_tmpflt, 0, d_icols*sizeof(float));
       
       for(int i = 0; i < d_nconnections; i++) {
-       d_residbufs.push_back(fft::malloc_double(d_icols));
+       d_residbufs.push_back((double*)volk_malloc(d_icols*sizeof(double),
+                                                   volk_get_alignment()));
        memset(d_residbufs[i], 0, d_icols*sizeof(double));
       }
 
@@ -100,9 +102,9 @@ namespace gr {
       if(!d_main_gui->isClosed())
         d_main_gui->close();
 
-      fft::free(d_tmpflt);
+      volk_free(d_tmpflt);
       for(int i = 0; i < d_nconnections; i++) {
-       fft::free(d_residbufs[i]);
+       volk_free(d_residbufs[i]);
       }
 
       delete d_argv;
@@ -381,12 +383,14 @@ namespace gr {
        d_cols = cols;
        d_index = 0;
         d_icols = static_cast<int>(ceil(d_cols));
-       fft::free(d_tmpflt);
-       d_tmpflt = fft::malloc_float(d_icols);
+       volk_free(d_tmpflt);
+       d_tmpflt = (float*)volk_malloc(d_icols*sizeof(float),
+                                       volk_get_alignment());
        memset(d_tmpflt, 0, d_icols*sizeof(float));
        for(int i = 0; i < d_nconnections; i++) {
-         fft::free(d_residbufs[i]);
-         d_residbufs[i] = fft::malloc_double(d_icols);
+         volk_free(d_residbufs[i]);
+         d_residbufs[i] = (double*)volk_malloc(d_icols*sizeof(double),
+                                                volk_get_alignment());
          memset(d_residbufs[i], 0, d_icols*sizeof(double));
        }
       }
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc 
b/gr-qtgui/lib/time_raster_sink_f_impl.cc
index 6052d75..10b7f76 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
@@ -79,11 +79,13 @@ namespace gr {
       d_index = 0;
 
       d_icols = static_cast<int>(ceil(d_cols));
-      d_tmpflt = fft::malloc_float(d_icols);
+      d_tmpflt = (float*)volk_malloc(d_icols*sizeof(float),
+                                     volk_get_alignment());
       memset(d_tmpflt, 0, d_icols*sizeof(float));
       
       for(int i = 0; i < d_nconnections; i++) {
-       d_residbufs.push_back(fft::malloc_double(d_icols));
+       d_residbufs.push_back((double*)volk_malloc(d_icols*sizeof(double),
+                                                   volk_get_alignment()));
        memset(d_residbufs[i], 0, d_icols*sizeof(double));
       }
 
@@ -98,9 +100,9 @@ namespace gr {
       if(!d_main_gui->isClosed())
         d_main_gui->close();
 
-      fft::free(d_tmpflt);
+      volk_free(d_tmpflt);
       for(int i = 0; i < d_nconnections; i++) {
-       fft::free(d_residbufs[i]);
+       volk_free(d_residbufs[i]);
       }
 
       delete d_argv;
@@ -379,12 +381,14 @@ namespace gr {
        d_cols = cols;
        d_index = 0;
         d_icols = static_cast<int>(ceil(d_cols));
-       fft::free(d_tmpflt);
-       d_tmpflt = fft::malloc_float(d_icols);
+       volk_free(d_tmpflt);
+       d_tmpflt = (float*)volk_malloc(d_icols*sizeof(float),
+                                       volk_get_alignment());
        memset(d_tmpflt, 0, d_icols*sizeof(float));
        for(int i = 0; i < d_nconnections; i++) {
-         fft::free(d_residbufs[i]);
-         d_residbufs[i] = fft::malloc_double(d_icols);
+         volk_free(d_residbufs[i]);
+         d_residbufs[i] = (double*)volk_malloc(d_icols*sizeof(double),
+                                                volk_get_alignment());
          memset(d_residbufs[i], 0, d_icols*sizeof(double));
        }
       }
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index 82aba02..f246578 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -65,7 +65,8 @@ namespace gr {
       d_main_gui = NULL;
 
       for(int n = 0; n < d_nconnections; n++) {
-       d_buffers.push_back(fft::malloc_double(d_buffer_size));
+       d_buffers.push_back((double*)volk_malloc(d_buffer_size*sizeof(double),
+                                              volk_get_alignment()));
        memset(d_buffers[n], 0, d_buffer_size*sizeof(double));
       }
 
@@ -92,7 +93,7 @@ namespace gr {
 
       // d_main_gui is a qwidget destroyed with its parent
       for(int n = 0; n < d_nconnections; n++) {
-       fft::free(d_buffers[n]);
+       volk_free(d_buffers[n]);
       }
 
       delete d_argv;
@@ -298,8 +299,9 @@ namespace gr {
 
        // Resize buffers and replace data
        for(int n = 0; n < d_nconnections; n++) {
-         fft::free(d_buffers[n]);
-         d_buffers[n] = fft::malloc_double(d_buffer_size);
+         volk_free(d_buffers[n]);
+         d_buffers[n] = (double*)volk_malloc(d_buffer_size*sizeof(double),
+                                              volk_get_alignment());
          memset(d_buffers[n], 0, d_buffer_size*sizeof(double));
        }
 
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index afb07e3..596a416 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -67,7 +67,8 @@ namespace gr {
       d_main_gui = NULL;
 
       for(int n = 0; n < d_nconnections; n++) {
-       d_buffers.push_back(fft::malloc_double(d_buffer_size));
+       d_buffers.push_back((double*)volk_malloc(d_buffer_size*sizeof(double),
+                                                 volk_get_alignment()));
        memset(d_buffers[n], 0, d_buffer_size*sizeof(double));
       }
 
@@ -94,7 +95,7 @@ namespace gr {
 
       // d_main_gui is a qwidget destroyed with its parent
       for(int n = 0; n < d_nconnections; n++) {
-       fft::free(d_buffers[n]);
+       volk_free(d_buffers[n]);
       }
 
       delete d_argv;
@@ -300,8 +301,9 @@ namespace gr {
 
        // Resize buffers and replace data
        for(int n = 0; n < d_nconnections; n++) {
-         fft::free(d_buffers[n]);
-         d_buffers[n] = fft::malloc_double(d_buffer_size);
+         volk_free(d_buffers[n]);
+         d_buffers[n] = (double*)volk_malloc(d_buffer_size*sizeof(double),
+                                              volk_get_alignment());
          memset(d_buffers[n], 0, d_buffer_size*sizeof(double));
        }
 
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc 
b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index 24983cd..9fc4f21 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -75,13 +75,16 @@ namespace gr {
       d_shift = true;
 
       d_fft = new fft::fft_complex(d_fftsize, true);
-      d_fbuf = fft::malloc_float(d_fftsize);
+      d_fbuf = (float*)volk_malloc(d_fftsize*sizeof(float),
+                                   volk_get_alignment());
       memset(d_fbuf, 0, d_fftsize*sizeof(float));
 
       d_index = 0;
       for(int i = 0; i < d_nconnections; i++) {
-       d_residbufs.push_back(fft::malloc_complex(d_fftsize));
-       d_magbufs.push_back(fft::malloc_double(d_fftsize));
+       
d_residbufs.push_back((gr_complex*)volk_malloc(d_fftsize*sizeof(gr_complex),
+                                                       volk_get_alignment()));
+       d_magbufs.push_back((double*)volk_malloc(d_fftsize*sizeof(double),
+                                                 volk_get_alignment()));
        memset(d_residbufs[i], 0, d_fftsize*sizeof(float));
        memset(d_magbufs[i], 0, d_fftsize*sizeof(double));
       }
@@ -97,11 +100,11 @@ namespace gr {
         d_main_gui->close();
 
       for(int i = 0; i < d_nconnections; i++) {
-       fft::free(d_residbufs[i]);
-       fft::free(d_magbufs[i]);
+       volk_free(d_residbufs[i]);
+       volk_free(d_magbufs[i]);
       }
       delete d_fft;
-      fft::free(d_fbuf);
+      volk_free(d_fbuf);
 
       delete d_argv;
     }
@@ -368,11 +371,13 @@ namespace gr {
 
        // Resize residbuf and replace data
        for(int i = 0; i < d_nconnections; i++) {
-         fft::free(d_residbufs[i]);
-         fft::free(d_magbufs[i]);
+         volk_free(d_residbufs[i]);
+         volk_free(d_magbufs[i]);
 
-         d_residbufs[i] = fft::malloc_complex(newfftsize);
-         d_magbufs[i] = fft::malloc_double(newfftsize);
+         d_residbufs[i] = 
(gr_complex*)volk_malloc(newfftsize*sizeof(gr_complex),
+                                                    volk_get_alignment());
+         d_magbufs[i] = (double*)volk_malloc(newfftsize*sizeof(double),
+                                              volk_get_alignment());
 
          memset(d_residbufs[i], 0, newfftsize*sizeof(gr_complex));
          memset(d_magbufs[i], 0, newfftsize*sizeof(double));
@@ -390,8 +395,9 @@ namespace gr {
        delete d_fft;
        d_fft = new fft::fft_complex(d_fftsize, true);
 
-       fft::free(d_fbuf);
-       d_fbuf = fft::malloc_float(d_fftsize);
+       volk_free(d_fbuf);
+       d_fbuf = (float*)volk_malloc(d_fftsize*sizeof(float),
+                                     volk_get_alignment());
        memset(d_fbuf, 0, d_fftsize*sizeof(float));
       }
     }
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc 
b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index d4cfee3..50525f1 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -74,13 +74,16 @@ namespace gr {
       d_shift = true;
 
       d_fft = new fft::fft_complex(d_fftsize, true);
-      d_fbuf = fft::malloc_float(d_fftsize);
+      d_fbuf = (float*)volk_malloc(d_fftsize*sizeof(float),
+                                   volk_get_alignment());
       memset(d_fbuf, 0, d_fftsize*sizeof(float));
 
       d_index = 0;
       for(int i = 0; i < d_nconnections; i++) {
-       d_residbufs.push_back(fft::malloc_float(d_fftsize));
-       d_magbufs.push_back(fft::malloc_double(d_fftsize));
+       d_residbufs.push_back((float*)volk_malloc(d_fftsize*sizeof(float),
+                                                  volk_get_alignment()));
+       d_magbufs.push_back((double*)volk_malloc(d_fftsize*sizeof(double),
+                                                 volk_get_alignment()));
        memset(d_residbufs[i], 0, d_fftsize*sizeof(float));
        memset(d_magbufs[i], 0, d_fftsize*sizeof(double));
       }
@@ -96,11 +99,11 @@ namespace gr {
         d_main_gui->close();
 
       for(int i = 0; i < d_nconnections; i++) {
-       fft::free(d_residbufs[i]);
-       fft::free(d_magbufs[i]);
+       volk_free(d_residbufs[i]);
+       volk_free(d_magbufs[i]);
       }
       delete d_fft;
-      fft::free(d_fbuf);
+      volk_free(d_fbuf);
 
       delete d_argv;
     }
@@ -369,11 +372,13 @@ namespace gr {
 
        // Resize residbuf and replace data
        for(int i = 0; i < d_nconnections; i++) {
-         fft::free(d_residbufs[i]);
-         fft::free(d_magbufs[i]);
+         volk_free(d_residbufs[i]);
+         volk_free(d_magbufs[i]);
 
-         d_residbufs[i] = fft::malloc_float(newfftsize);
-         d_magbufs[i] = fft::malloc_double(newfftsize);
+         d_residbufs[i] = (float*)volk_malloc(newfftsize*sizeof(float),
+                                               volk_get_alignment());
+         d_magbufs[i] = (double*)volk_malloc(newfftsize*sizeof(double),
+                                              volk_get_alignment());
 
          memset(d_residbufs[i], 0, newfftsize*sizeof(float));
          memset(d_magbufs[i], 0, newfftsize*sizeof(double));
@@ -391,8 +396,9 @@ namespace gr {
        delete d_fft;
        d_fft = new fft::fft_complex(d_fftsize, true);
 
-       fft::free(d_fbuf);
-       d_fbuf = fft::malloc_float(d_fftsize);
+       volk_free(d_fbuf);
+       d_fbuf = (float*)volk_malloc(d_fftsize*sizeof(float),
+                                     volk_get_alignment());
        memset(d_fbuf, 0, d_fftsize*sizeof(float));
       }
     }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]