[Commit-gnuradio] r8624 - in gnuradio/trunk: . config gcell/src/apps mblock/src/lib omnithread

[eb]

Author: eb
Date: 2008-06-19 09:04:26 -0600 (Thu, 19 Jun 2008)
New Revision: 8624

Added:
   gnuradio/trunk/mblock/src/lib/mb_time.h
   gnuradio/trunk/omnithread/omni_time.cc
   gnuradio/trunk/omnithread/omni_time.h
Removed:
   gnuradio/trunk/mblock/src/lib/mb_time.cc
   gnuradio/trunk/mblock/src/lib/mb_time.h
Modified:
   gnuradio/trunk/config/grc_gcell.m4
   gnuradio/trunk/configure.ac
   gnuradio/trunk/gcell/src/apps/Makefile.am
   gnuradio/trunk/gcell/src/apps/benchmark_dma.cc
   gnuradio/trunk/gcell/src/apps/benchmark_nop.cc
   gnuradio/trunk/mblock/src/lib/Makefile.am
   gnuradio/trunk/omnithread/Makefile.am
Log:
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.



Modified: gnuradio/trunk/config/grc_gcell.m4
===================================================================
--- gnuradio/trunk/config/grc_gcell.m4  2008-06-19 14:26:50 UTC (rev 8623)
+++ gnuradio/trunk/config/grc_gcell.m4  2008-06-19 15:04:26 UTC (rev 8624)
@@ -21,10 +21,8 @@
     GRC_ENABLE(gcell)
     dnl GRC_WITH(gcell)
 
-    dnl Don't do gcell if omnithread or mblock skipped
-    dnl (The mblock dependency should be refactored, we're just using some 
timing utilities)
+    dnl Don't do gcell if omnithread skipped
     GRC_CHECK_DEPENDENCY(gcell, omnithread)
-    GRC_CHECK_DEPENDENCY(gcell, mblock)
 
     dnl If execution gets to here, $passed will be:
     dnl   with : if the --with code didn't error out

Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2008-06-19 14:26:50 UTC (rev 8623)
+++ gnuradio/trunk/configure.ac 2008-06-19 15:04:26 UTC (rev 8624)
@@ -240,10 +240,10 @@
 
 build_dirs="config"
 GRC_OMNITHREAD                 dnl must come before gnuradio-core and mblock
+GRC_GCELL
+GRC_GNURADIO_CORE
 GRC_PMT
 GRC_MBLOCK                     dnl this must come after GRC_PMT
-GRC_GCELL
-GRC_GNURADIO_CORE
 GRC_USRP
 GRC_GR_USRP                    dnl this must come after GRC_USRP
 GRC_GR_GCELL                   dnl this must come after GRC_GCELL and 
GRC_GNURADIO_CORE

Modified: gnuradio/trunk/gcell/src/apps/Makefile.am
===================================================================
--- gnuradio/trunk/gcell/src/apps/Makefile.am   2008-06-19 14:26:50 UTC (rev 
8623)
+++ gnuradio/trunk/gcell/src/apps/Makefile.am   2008-06-19 15:04:26 UTC (rev 
8624)
@@ -22,7 +22,7 @@
 
 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_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)

Modified: gnuradio/trunk/gcell/src/apps/benchmark_dma.cc
===================================================================
--- gnuradio/trunk/gcell/src/apps/benchmark_dma.cc      2008-06-19 14:26:50 UTC 
(rev 8623)
+++ gnuradio/trunk/gcell/src/apps/benchmark_dma.cc      2008-06-19 15:04:26 UTC 
(rev 8624)
@@ -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 @@
 
   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 @@
     }
 
     // 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",

Modified: gnuradio/trunk/gcell/src/apps/benchmark_nop.cc
===================================================================
--- gnuradio/trunk/gcell/src/apps/benchmark_nop.cc      2008-06-19 14:26:50 UTC 
(rev 8623)
+++ gnuradio/trunk/gcell/src/apps/benchmark_nop.cc      2008-06-19 15:04:26 UTC 
(rev 8624)
@@ -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 @@
     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 @@
   }
 
   // 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,

Modified: gnuradio/trunk/mblock/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/mblock/src/lib/Makefile.am   2008-06-19 14:26:50 UTC (rev 
8623)
+++ gnuradio/trunk/mblock/src/lib/Makefile.am   2008-06-19 15:04:26 UTC (rev 
8624)
@@ -61,7 +61,6 @@
        mb_runtime_base.cc              \
        mb_runtime_nop.cc               \
        mb_runtime_thread_per_block.cc  \
-       mb_time.cc                      \
        mb_timer_queue.cc               \
        mb_util.cc                      \
        mb_worker.cc                    

Deleted: gnuradio/trunk/mblock/src/lib/mb_time.cc

Deleted: gnuradio/trunk/mblock/src/lib/mb_time.h

Copied: gnuradio/trunk/mblock/src/lib/mb_time.h (from rev 8623, 
gnuradio/branches/developers/eb/wip/mblock/src/lib/mb_time.h)
===================================================================
--- gnuradio/trunk/mblock/src/lib/mb_time.h                             (rev 0)
+++ gnuradio/trunk/mblock/src/lib/mb_time.h     2008-06-19 15:04:26 UTC (rev 
8624)
@@ -0,0 +1,27 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef INCLUDED_MB_TIME_H
+#define INCLUDED_MB_TIME_H
+
+#include <omni_time.h>
+typedef omni_time mb_time;
+
+#endif /* INCLUDED_MB_TIME_H */

Modified: gnuradio/trunk/omnithread/Makefile.am
===================================================================
--- gnuradio/trunk/omnithread/Makefile.am       2008-06-19 14:26:50 UTC (rev 
8623)
+++ gnuradio/trunk/omnithread/Makefile.am       2008-06-19 15:04:26 UTC (rev 
8624)
@@ -37,11 +37,13 @@
 
 if OMNITHREAD_POSIX
 libgromnithread_la_SOURCES =           \
+       omni_time.cc \
        posix.cc
 endif
 
 if OMNITHREAD_NT
 libgromnithread_la_SOURCES =           \
+       omni_time.cc \
        nt.cc
 endif
 
@@ -67,6 +69,7 @@
 
 grinclude_HEADERS =                    \
        omnithread.h                    \
+       omni_time.h                     \
        ot_mach.h                       \
        ot_nt.h                         \
        ot_posix.h                      \

Copied: gnuradio/trunk/omnithread/omni_time.cc (from rev 8623, 
gnuradio/branches/developers/eb/wip/omnithread/omni_time.cc)
===================================================================
--- gnuradio/trunk/omnithread/omni_time.cc                              (rev 0)
+++ gnuradio/trunk/omnithread/omni_time.cc      2008-06-19 15:04:26 UTC (rev 
8624)
@@ -0,0 +1,84 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2008 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <omni_time.h>
+#include <omnithread.h>
+#include <math.h>
+#include <assert.h>
+
+
+omni_time::omni_time(double real_secs)
+{
+  double floor_secs = floor(real_secs);
+  d_secs = (long) floor_secs;
+  d_nsecs = (long) ((real_secs - floor_secs) * 1e9);     // always positive
+}
+
+omni_time
+omni_time::time(const omni_time &delta_t)
+{
+  unsigned long        abs_sec, abs_nsec;
+  unsigned long rel_sec  = delta_t.d_secs;
+  unsigned long rel_nsec = delta_t.d_nsecs;
+  
+  omni_thread::get_time(&abs_sec, &abs_nsec, rel_sec, rel_nsec);
+  return omni_time(abs_sec, abs_nsec);
+}
+
+
+omni_time
+operator+(const omni_time &x, const omni_time &y)
+{
+  omni_time r(x.d_secs + y.d_secs, x.d_nsecs + y.d_nsecs);
+  while (r.d_nsecs >= 1000000000){
+    r.d_nsecs -= 1000000000;
+    r.d_secs++;
+  }
+  return r;
+}
+
+omni_time
+operator-(const omni_time &x, const omni_time &y)
+{
+  // assert(!(x < y));
+
+  omni_time r(x.d_secs - y.d_secs, x.d_nsecs - y.d_nsecs);
+  while (r.d_nsecs < 0){
+    r.d_nsecs += 1000000000;
+    r.d_secs--;
+  }
+  return r;
+}
+
+omni_time
+operator+(const omni_time &x, double y)
+{
+  return x + omni_time(y);
+}
+
+omni_time
+operator-(const omni_time &x, double y)
+{
+  return x - omni_time(y);
+}

Copied: gnuradio/trunk/omnithread/omni_time.h (from rev 8623, 
gnuradio/branches/developers/eb/wip/omnithread/omni_time.h)
===================================================================
--- gnuradio/trunk/omnithread/omni_time.h                               (rev 0)
+++ gnuradio/trunk/omnithread/omni_time.h       2008-06-19 15:04:26 UTC (rev 
8624)
@@ -0,0 +1,89 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2008 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef INCLUDED_OMNI_TIME_H
+#define INCLUDED_OMNI_TIME_H
+
+struct omni_time {
+  long int d_secs;     // seconds.
+  long int d_nsecs;    // nanoseconds.  Always in [0, 1e9-1]
+
+  omni_time() : d_secs(0), d_nsecs(0) {}
+  omni_time(long secs, long nanosecs=0) : d_secs(secs), d_nsecs(nanosecs) {}
+
+  // N.B., this only makes sense for differences between times.
+  // Double doesn't have enough bits to precisely represent an absolute time.
+  omni_time(double secs);
+
+  // N.B. This only makes sense for differences between times.
+  // Double doesn't have enough bits to precisely represent an absolute time.
+  double double_time() const { return (double)d_secs + d_nsecs * 1e-9; }
+
+  /*!
+   * \brief Return an absolute time suitable for use with
+   * schedule_one_shot_timeout & schedule_periodic_timeout
+   *
+   * The return value is the current time plus the given relative offset.
+   */
+  static omni_time time(const omni_time &relative_offset = omni_time());
+};
+
+
+inline static bool
+operator<(const omni_time &x, const omni_time &y)
+{
+  return ((x.d_secs < y.d_secs)
+         || (x.d_secs == y.d_secs && x.d_nsecs < y.d_nsecs));
+}
+
+inline static bool
+operator>(const omni_time &x, const omni_time &y)
+{
+  return ((x.d_secs > y.d_secs)
+         || (x.d_secs == y.d_secs && x.d_nsecs > y.d_nsecs));
+}
+
+inline static bool
+operator>=(const omni_time &x, const omni_time &y)
+{
+  return ((x.d_secs > y.d_secs)
+         || (x.d_secs == y.d_secs && x.d_nsecs >= y.d_nsecs));
+}
+
+inline static bool
+operator<=(const omni_time &x, const omni_time &y)
+{
+  return ((x.d_secs < y.d_secs)
+         || (x.d_secs == y.d_secs && x.d_nsecs <= y.d_nsecs));
+}
+
+inline static bool
+operator==(const omni_time &x, const omni_time &y)
+{
+  return (x.d_secs == y.d_secs && x.d_nsecs == y.d_nsecs);
+}
+
+
+omni_time operator+(const omni_time &x, const omni_time &y);
+omni_time operator+(const omni_time &x, double y);
+omni_time operator-(const omni_time &x, const omni_time &y);
+omni_time operator-(const omni_time &x, double y);
+
+#endif /* INCLUDED_OMNI_TIME_H */