diff options
| author | Thomas Habets <thomas@habets.se> | 2020-08-24 22:20:38 +0100 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-10-26 12:16:34 -0400 |
| commit | fecc7d136cf74f30c38228362bc17ff33ed07ee6 (patch) | |
| tree | 9c5d07706441f283a92c534c44848c6fa98cc6c7 | |
| parent | 6d087b028266a0ffbf5c379ea85e56135a02acaa (diff) | |
filter: Remove manual memory management in QA
| -rw-r--r-- | gr-filter/lib/qa_mmse_fir_interpolator_cc.cc | 6 | ||||
| -rw-r--r-- | gr-filter/lib/qa_mmse_fir_interpolator_ff.cc | 5 | ||||
| -rw-r--r-- | gr-filter/lib/qa_mmse_interp_differentiator_cc.cc | 6 | ||||
| -rw-r--r-- | gr-filter/lib/qa_mmse_interp_differentiator_ff.cc | 5 |
4 files changed, 8 insertions, 14 deletions
diff --git a/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc b/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc index dff8c50db9..f8cc8b5e62 100644 --- a/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc +++ b/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc @@ -15,7 +15,7 @@ #include <gnuradio/fft/fft.h> #include <gnuradio/filter/mmse_fir_interpolator_cc.h> #include <gnuradio/math.h> -#include <volk/volk.h> +#include <volk/volk_alloc.hh> #include <boost/test/unit_test.hpp> #include <cmath> #include <cstdint> @@ -46,8 +46,7 @@ static gr_complex test_fcn(double index) BOOST_AUTO_TEST_CASE(t1) { static const unsigned N = 100; - gr_complex* input = - (gr_complex*)volk_malloc((N + 10) * sizeof(gr_complex), volk_get_alignment()); + volk::vector<gr_complex> input(N + 10); for (unsigned i = 0; i < N + 10; i++) input[i] = test_fcn((double)i); @@ -64,7 +63,6 @@ BOOST_AUTO_TEST_CASE(t1) // printf ("%9.6f %9.6f %9.6f\n", expected, actual, expected - actual); } } - volk_free(input); } /* diff --git a/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc b/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc index e84b44c863..e3bb04c808 100644 --- a/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc +++ b/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc @@ -15,7 +15,7 @@ #include <gnuradio/fft/fft.h> #include <gnuradio/filter/mmse_fir_interpolator_ff.h> #include <gnuradio/math.h> -#include <volk/volk.h> +#include <volk/volk_alloc.hh> #include <boost/test/unit_test.hpp> #include <cmath> #include <cstdio> @@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE(t1) // use aligned malloc and make sure that everything in this // buffer is properly initialized. static const unsigned N = 100; - float* input = (float*)volk_malloc((N + 10) * sizeof(float), volk_get_alignment()); + volk::vector<float> input(N + 10); for (unsigned i = 0; i < N + 10; i++) input[i] = test_fcn((double)i); @@ -51,7 +51,6 @@ BOOST_AUTO_TEST_CASE(t1) // printf ("%9.6f %9.6f %9.6f\n", expected, actual, expected - actual); } } - volk_free(input); } } /* namespace filter */ diff --git a/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc b/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc index 0286f932bd..64a26aa4ee 100644 --- a/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc +++ b/gr-filter/lib/qa_mmse_interp_differentiator_cc.cc @@ -15,7 +15,7 @@ #include <gnuradio/fft/fft.h> #include <gnuradio/filter/mmse_interp_differentiator_cc.h> #include <gnuradio/math.h> -#include <volk/volk.h> +#include <volk/volk_alloc.hh> #include <boost/test/unit_test.hpp> #include <cmath> #include <cstdint> @@ -84,8 +84,7 @@ static gr_complex test_fcn_d(double index) BOOST_AUTO_TEST_CASE(t1) { static const unsigned N = 100; - gr_complex* input = - (gr_complex*)volk_malloc((N + 10) * sizeof(gr_complex), volk_get_alignment()); + volk::vector<gr_complex> input(N + 10); for (unsigned i = 0; i < N + 10; i++) input[i] = test_fcn((double)i); @@ -105,7 +104,6 @@ BOOST_AUTO_TEST_CASE(t1) // expected.imag(), actual.imag(), expected.imag() - actual.imag()); } } - volk_free(input); } } /* namespace filter */ diff --git a/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc b/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc index 4719c157f5..15077da9ce 100644 --- a/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc +++ b/gr-filter/lib/qa_mmse_interp_differentiator_ff.cc @@ -15,7 +15,7 @@ #include <gnuradio/fft/fft.h> #include <gnuradio/filter/mmse_interp_differentiator_ff.h> #include <gnuradio/math.h> -#include <volk/volk.h> +#include <volk/volk_alloc.hh> #include <boost/test/unit_test.hpp> #include <cmath> #include <cstdint> @@ -58,7 +58,7 @@ static float test_fcn_d(double index) BOOST_AUTO_TEST_CASE(t1) { static const unsigned N = 100; - float* input = (float*)volk_malloc((N + 10) * sizeof(float), volk_get_alignment()); + volk::vector<float> input(N + 10); for (unsigned i = 0; i < N + 10; i++) input[i] = test_fcn((double)i); @@ -75,7 +75,6 @@ BOOST_AUTO_TEST_CASE(t1) // printf ("%9.6f %9.6f %9.6f\n", expected, actual, expected - actual); } } - volk_free(input); } } /* namespace filter */ |