Changeset 8624

Show
Ignore:
Timestamp:
06/19/08 09:04:26
Author:
eb
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/trunk/config/grc_gcell.m4

    r8244 r8624  
    2222    dnl GRC_WITH(gcell) 
    2323 
    24     dnl Don't do gcell if omnithread or mblock skipped 
    25     dnl (The mblock dependency should be refactored, we're just using some timing utilities) 
     24    dnl Don't do gcell if omnithread skipped 
    2625    GRC_CHECK_DEPENDENCY(gcell, omnithread) 
    27     GRC_CHECK_DEPENDENCY(gcell, mblock) 
    2826 
    2927    dnl If execution gets to here, $passed will be: 

  • gnuradio/trunk/configure.ac

    r8613 r8624  
    241241build_dirs="config" 
    242242GRC_OMNITHREAD                  dnl must come before gnuradio-core and mblock 
     243GRC_GCELL 
     244GRC_GNURADIO_CORE 
    243245GRC_PMT 
    244246GRC_MBLOCK                      dnl this must come after GRC_PMT 
    245 GRC_GCELL 
    246 GRC_GNURADIO_CORE 
    247247GRC_USRP 
    248248GRC_GR_USRP                     dnl this must come after GRC_USRP 

  • gnuradio/trunk/gcell/src/apps/Makefile.am

    r8086 r8624  
    2323SUBDIRS = spu . 
    2424 
    25 AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(MBLOCK_INCLUDES) \ 
     25AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) \ 
    2626        $(GCELL_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) 
    2727 
    …… 
    4242 
    4343benchmark_dma_SOURCES = benchmark_dma.cc 
    44 benchmark_dma_LDADD = spu/benchmark_procs $(GCELL_LA) $(MBLOCK_LA) 
     44benchmark_dma_LDADD = spu/benchmark_procs $(GCELL_LA) 
    4545 
    4646benchmark_nop_SOURCES = benchmark_nop.cc 
    47 benchmark_nop_LDADD = spu/benchmark_procs $(GCELL_LA) $(MBLOCK_LA) 
     47benchmark_nop_LDADD = spu/benchmark_procs $(GCELL_LA) 

  • gnuradio/trunk/gcell/src/apps/benchmark_dma.cc

    r8209 r8624  
    2424#endif 
    2525#include "gc_job_manager.h" 
    26 #include "mb_time.h" 
     26#include <omni_time.h> 
    2727#include <getopt.h> 
    2828#include <stdlib.h> 
    …… 
    149149  for (int iter = 0; iter < 1; iter++){ 
    150150 
    151     mb_time t_start = mb_time::time(); 
     151    omni_time t_start = omni_time::time(); 
    152152 
    153153    nsubmitted = 0; 
    …… 
    204204 
    205205    // stop timing 
    206     mb_time t_stop = mb_time::time(); 
     206    omni_time t_stop = omni_time::time(); 
    207207 
    208208    double delta = (t_stop - t_start).double_time(); 

  • gnuradio/trunk/gcell/src/apps/benchmark_nop.cc

    r8209 r8624  
    2424#endif 
    2525#include "gc_job_manager.h" 
    26 #include "mb_time.h" 
     26#include <omni_time.h> 
    2727#include <getopt.h> 
    2828#include <stdlib.h> 
    …… 
    7474  } 
    7575 
    76   mb_time t_start = mb_time::time(); 
     76  omni_time t_start = omni_time::time(); 
    7777 
    7878  ci = 0; 
    …… 
    123123 
    124124  // stop timing 
    125   mb_time t_stop = mb_time::time(); 
     125  omni_time t_stop = omni_time::time(); 
    126126  double delta = (t_stop - t_start).double_time(); 
    127127  printf("nspes: %2d  udelay: %4d  elapsed_time: %7.3f  njobs: %g  speedup: %6.3f\n", 

  • gnuradio/trunk/mblock/src/lib/Makefile.am

    r7769 r8624  
    6262        mb_runtime_nop.cc               \ 
    6363        mb_runtime_thread_per_block.cc  \ 
    64         mb_time.cc                      \ 
    6564        mb_timer_queue.cc               \ 
    6665        mb_util.cc                      \ 

  • gnuradio/trunk/omnithread/Makefile.am

    r7769 r8624  
    3838if OMNITHREAD_POSIX 
    3939libgromnithread_la_SOURCES =            \ 
     40        omni_time.cc \ 
    4041        posix.cc 
    4142endif 
    …… 
    4344if OMNITHREAD_NT 
    4445libgromnithread_la_SOURCES =            \ 
     46        omni_time.cc \ 
    4547        nt.cc 
    4648endif 
    …… 
    6870grinclude_HEADERS =                     \ 
    6971        omnithread.h                    \ 
     72        omni_time.h                     \ 
    7073        ot_mach.h                       \ 
    7174        ot_nt.h                         \