diff options
| author | eb | 2009-01-15 10:23:50 +0000 |
|---|---|---|
| committer | eb | 2009-01-15 10:23:50 +0000 |
| commit | 4b5cfa809a01a494c4f5e6b052414ed9b3d066cb (patch) | |
| tree | 1524eb995c21cccb3d76f62ec0cc8bf9a319a54f /gcell/lib/wrapper | |
| parent | ddd347cc96e38c3758dea53cb0d93391ea566a35 (diff) | |
| download | gnuradio-4b5cfa809a01a494c4f5e6b052414ed9b3d066cb.tar.gz gnuradio-4b5cfa809a01a494c4f5e6b052414ed9b3d066cb.tar.bz2 gnuradio-4b5cfa809a01a494c4f5e6b052414ed9b3d066cb.zip | |
Merged eb/gcell-wip -r10213:10230 into the trunk. This reduces the
overhead of off-loading jobs, such that it is now feasible to off-load
50us jobs on the QS21 and 10us jobs on the PS3. See wiki:Gcell for
performance graphs. There is still plenty of room for improvement.
I'll be revisiting this in a week or so.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10231 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gcell/lib/wrapper')
| -rw-r--r-- | gcell/lib/wrapper/Makefile.am | 13 | ||||
| -rw-r--r-- | gcell/lib/wrapper/qa_gcell_wrapper.cc | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/gcell/lib/wrapper/Makefile.am b/gcell/lib/wrapper/Makefile.am index 5a8e328c2..0676ebb70 100644 --- a/gcell/lib/wrapper/Makefile.am +++ b/gcell/lib/wrapper/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -48,12 +48,15 @@ libwrapper_la_LIBADD = \ libwrapper_qa_la_SOURCES = \ qa_gcell_general.cc \ - qa_gcell_wrapper.cc \ - qa_gcp_fft_1d_r2.cc + qa_gcell_wrapper.cc + +# FFTW now depends on gcell, don't create circular dependency :-) +# qa_gcp_fft_1d_r2.cc libwrapper_qa_la_LIBADD = \ - gcell_general_qa.lo \ - -lfftw3f + gcell_general_qa.lo + +# -lfftw3f # Headers diff --git a/gcell/lib/wrapper/qa_gcell_wrapper.cc b/gcell/lib/wrapper/qa_gcell_wrapper.cc index d53c61057..ccfd2fdee 100644 --- a/gcell/lib/wrapper/qa_gcell_wrapper.cc +++ b/gcell/lib/wrapper/qa_gcell_wrapper.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -27,7 +27,7 @@ #include <qa_gcell_wrapper.h> #include <qa_gcell_general.h> -#include <qa_gcp_fft_1d_r2.h> +//#include <qa_gcp_fft_1d_r2.h> CppUnit::TestSuite * qa_gcell_wrapper::suite() @@ -35,7 +35,7 @@ qa_gcell_wrapper::suite() CppUnit::TestSuite *s = new CppUnit::TestSuite("wrapper"); s->addTest(qa_gcell_general::suite()); - s->addTest(qa_gcp_fft_1d_r2::suite()); + //s->addTest(qa_gcp_fft_1d_r2::suite()); return s; } |