diff options
| author | eb | 2008-06-19 15:04:26 +0000 |
|---|---|---|
| committer | eb | 2008-06-19 15:04:26 +0000 |
| commit | 8b04fb2beeae36bbbb8d66ce95dea7df8edb65be (patch) | |
| tree | 4af4834b661ea2d6d502f30e6f2844ba0033d7f0 /gcell/src/apps | |
| parent | df0ae475f782814c95d4f9be166aaffbcc7d47b1 (diff) | |
| download | gnuradio-8b04fb2beeae36bbbb8d66ce95dea7df8edb65be.tar.gz gnuradio-8b04fb2beeae36bbbb8d66ce95dea7df8edb65be.tar.bz2 gnuradio-8b04fb2beeae36bbbb8d66ce95dea7df8edb65be.zip | |
Moved mb_time to omni_time and left mb_time.h with typedef to maintain
backwards compatibility. Removed gcell's dependency on mblocks. Now
gcell only depends on omnithread. Merged eb/wip -r8621:8623 to trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8624 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gcell/src/apps')
| -rw-r--r-- | gcell/src/apps/Makefile.am | 6 | ||||
| -rw-r--r-- | gcell/src/apps/benchmark_dma.cc | 6 | ||||
| -rw-r--r-- | gcell/src/apps/benchmark_nop.cc | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/gcell/src/apps/Makefile.am b/gcell/src/apps/Makefile.am index e8cbf3cfc..7dd695653 100644 --- a/gcell/src/apps/Makefile.am +++ b/gcell/src/apps/Makefile.am @@ -22,7 +22,7 @@ include $(top_srcdir)/Makefile.common SUBDIRS = spu . -AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(MBLOCK_INCLUDES) \ +AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) \ $(GCELL_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) @@ -41,7 +41,7 @@ test_all_SOURCES = test_all.cc test_all_LDADD = $(GCELL_QA_LA) $(GCELL_LA) benchmark_dma_SOURCES = benchmark_dma.cc -benchmark_dma_LDADD = spu/benchmark_procs $(GCELL_LA) $(MBLOCK_LA) +benchmark_dma_LDADD = spu/benchmark_procs $(GCELL_LA) benchmark_nop_SOURCES = benchmark_nop.cc -benchmark_nop_LDADD = spu/benchmark_procs $(GCELL_LA) $(MBLOCK_LA) +benchmark_nop_LDADD = spu/benchmark_procs $(GCELL_LA) diff --git a/gcell/src/apps/benchmark_dma.cc b/gcell/src/apps/benchmark_dma.cc index 961876ad8..7dfaa4c22 100644 --- a/gcell/src/apps/benchmark_dma.cc +++ b/gcell/src/apps/benchmark_dma.cc @@ -23,7 +23,7 @@ #include <config.h> #endif #include "gc_job_manager.h" -#include "mb_time.h" +#include <omni_time.h> #include <getopt.h> #include <stdlib.h> #include <stdio.h> @@ -148,7 +148,7 @@ run_test(unsigned int nspes, unsigned int usecs, unsigned int dma_size, int getp for (int iter = 0; iter < 1; iter++){ - mb_time t_start = mb_time::time(); + omni_time t_start = omni_time::time(); nsubmitted = 0; ncompleted = 0; @@ -203,7 +203,7 @@ run_test(unsigned int nspes, unsigned int usecs, unsigned int dma_size, int getp } // stop timing - mb_time t_stop = mb_time::time(); + omni_time t_stop = omni_time::time(); double delta = (t_stop - t_start).double_time(); printf("nspes: %2d udelay: %4d elapsed_time: %7.3f dma_size: %5d dma_throughput: %7.3e\n", diff --git a/gcell/src/apps/benchmark_nop.cc b/gcell/src/apps/benchmark_nop.cc index b87137d50..f427c85d8 100644 --- a/gcell/src/apps/benchmark_nop.cc +++ b/gcell/src/apps/benchmark_nop.cc @@ -23,7 +23,7 @@ #include <config.h> #endif #include "gc_job_manager.h" -#include "mb_time.h" +#include <omni_time.h> #include <getopt.h> #include <stdlib.h> #include <stdio.h> @@ -73,7 +73,7 @@ run_test(unsigned int nspes, unsigned int usecs, int njobs) init_jd(all_jds[i], usecs); } - mb_time t_start = mb_time::time(); + omni_time t_start = omni_time::time(); ci = 0; njds[0] = 0; @@ -122,7 +122,7 @@ run_test(unsigned int nspes, unsigned int usecs, int njobs) } // stop timing - mb_time t_stop = mb_time::time(); + omni_time t_stop = omni_time::time(); double delta = (t_stop - t_start).double_time(); printf("nspes: %2d udelay: %4d elapsed_time: %7.3f njobs: %g speedup: %6.3f\n", mgr->nspes(), usecs, delta, (double) njobs, |