[Commit-gnuradio] r10230 - in gnuradio/branches/developers/eb/gcell-wip/gcell: apps include/gcell include/gcell/spu lib/runtime lib/runtime/spu lib/wrapper

[eb]

Author: eb
Date: 2009-01-15 01:42:46 -0700 (Thu, 15 Jan 2009)
New Revision: 10230

Modified:
   gnuradio/branches/developers/eb/gcell-wip/gcell/apps/Makefile.am
   gnuradio/branches/developers/eb/gcell-wip/gcell/include/gcell/gc_mbox.h
   
gnuradio/branches/developers/eb/gcell-wip/gcell/include/gcell/spu/gc_jd_queue.h
   
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/gc_job_manager_impl.cc
   gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_main.c
   gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_random.c
   
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_spu_config.h
   
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_spu_jd_queue.c
   gnuradio/branches/developers/eb/gcell-wip/gcell/lib/wrapper/Makefile.am
   
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/wrapper/qa_gcell_wrapper.cc
Log:
house cleaning

Modified: gnuradio/branches/developers/eb/gcell-wip/gcell/apps/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/gcell/apps/Makefile.am    
2009-01-15 08:07:42 UTC (rev 10229)
+++ gnuradio/branches/developers/eb/gcell-wip/gcell/apps/Makefile.am    
2009-01-15 08:42:46 UTC (rev 10230)
@@ -1,5 +1,5 @@
 #
-# Copyright 2007,2008 Free Software Foundation, Inc.
+# Copyright 2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/include/gcell/gc_mbox.h
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/gcell/include/gcell/gc_mbox.h     
2009-01-15 08:07:42 UTC (rev 10229)
+++ gnuradio/branches/developers/eb/gcell-wip/gcell/include/gcell/gc_mbox.h     
2009-01-15 08:42:46 UTC (rev 10230)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2008 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/include/gcell/spu/gc_jd_queue.h
===================================================================
--- 
gnuradio/branches/developers/eb/gcell-wip/gcell/include/gcell/spu/gc_jd_queue.h 
    2009-01-15 08:07:42 UTC (rev 10229)
+++ 
gnuradio/branches/developers/eb/gcell-wip/gcell/include/gcell/spu/gc_jd_queue.h 
    2009-01-15 08:42:46 UTC (rev 10230)
@@ -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
  * 

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/gc_job_manager_impl.cc
===================================================================
--- 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/gc_job_manager_impl.cc
  2009-01-15 08:07:42 UTC (rev 10229)
+++ 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/gc_job_manager_impl.cc
  2009-01-15 08:42:46 UTC (rev 10230)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_main.c
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_main.c   
2009-01-15 08:07:42 UTC (rev 10229)
+++ gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_main.c   
2009-01-15 08:42:46 UTC (rev 10230)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2008 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -60,8 +60,6 @@
 
 static struct gc_proc_def *gc_proc_def;        // procedure entry points
 
-extern int jdq_empty, jdq_locked, jdq_ok;
-
 // ------------------------------------------------------------------------
 
 // state for DMA'ing arguments in and out
@@ -210,19 +208,7 @@
   backoff = _backoff_start;
 }
 
-#if 0
 
-static void
-backoff_delay(void)
-{
-  gc_cdelay(backoff);
-
-  // capped exponential backoff
-  backoff = ((backoff << 1) + 1) & _backoff_cap;
-}
-
-#else
-
 #define RANDOM_WEIGHT  0.2
 
 static void
@@ -230,15 +216,16 @@
 {
   gc_cdelay(backoff);
 
+  // capped exponential backoff
   backoff = ((backoff << 1) + 1);
   if (backoff > _backoff_cap)
     backoff = _backoff_cap;
 
+  // plus some randomness
   float r = (RANDOM_WEIGHT * (2.0 * (gc_uniform_deviate() - 0.5)));
   backoff = backoff * (1.0 + r);
 }
 
-#endif
 #endif // !CHECK_QUEUE_ON_MSG
 
 // ------------------------------------------------------------------------
@@ -685,7 +672,6 @@
 
            gc_log_write2(GCL_SS_SYS, 0x11, jd.sys.job_id, total_jobs);
          }
-
          else if (s == GCQ_EMPTY){
            break;
          }
@@ -697,10 +683,6 @@
 #endif
       if (MBOX_MSG_OP(msg) == OP_EXIT){
        flush_completion_info();
-       if (0){
-         printf("spu[%2d] jdq_empty = %8d  jdq_locked = %8d  jdq_ok = %8d\n",
-                spu_args.spu_idx, jdq_empty, jdq_locked, jdq_ok);
-       }
        return;
       }
       else if (MBOX_MSG_OP(msg) == OP_GET_SPU_BUFSIZE){
@@ -729,13 +711,6 @@
   ci_tags  = mfc_multi_tag_reserve(2);
   put_tags = mfc_multi_tag_reserve(2);
 
-#if 0  
-  printf("gc_sys_tag = %d\n", gc_sys_tag);
-  printf("get_tag    = %d\n", get_tag);
-  printf("ci_tags    = %d\n", ci_tags);
-  printf("put_tags   = %d\n", put_tags);
-#endif
-
   // dma the args in
   mfc_get(&spu_args, argp, sizeof(spu_args), gc_sys_tag, 0, 0);
   mfc_write_tag_mask(1 << gc_sys_tag); // the tag we're interested in

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_random.c
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_random.c 
2009-01-15 08:07:42 UTC (rev 10229)
+++ gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_random.c 
2009-01-15 08:42:46 UTC (rev 10230)
@@ -22,15 +22,9 @@
 
 static int last_val = 0;
 
-#if 1
 # define M  259200     // values from Numerical Recipes in C, 1988
 # define A    7141
 # define C   54773
-#else
-# define M  714025     // values from Numerical Recipes in C, 1988 (too big)
-# define A    4096
-# define C  150889
-#endif
 
 void 
 gc_set_seed(int seed)
@@ -38,6 +32,10 @@
   last_val = ((unsigned int) seed) % M;
 }
 
+/*
+ * Return a uniformly distributed value in the range [0, 1.0)
+ * (Linear congruential generator. YMMV. Caveat emptor.)
+ */
 float
 gc_uniform_deviate(void)
 {

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_spu_config.h
===================================================================
--- 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_spu_config.h 
    2009-01-15 08:07:42 UTC (rev 10229)
+++ 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_spu_config.h 
    2009-01-15 08:42:46 UTC (rev 10230)
@@ -1,6 +1,6 @@
-/* -*- c++ -*- */
+/* -*- c -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,14 +24,16 @@
 #include <gcell/gc_job_desc.h>
 
 #define CACHE_LINE_SIZE             128              // in bytes
+
 #if 1
 # define       GC_SPU_BUFSIZE_BASE  (40 * 1024)      //  must be multiple of 
CACHE_LINE_SIZE
 #else
 # define       GC_SPU_BUFSIZE_BASE  (20 * 1024)      //  must be multiple of 
CACHE_LINE_SIZE
 #endif
+
 #define        GC_SPU_BUFSIZE (GC_SPU_BUFSIZE_BASE + MAX_ARGS_EA * 
CACHE_LINE_SIZE)
 
-#define NGETBUFS       1       // single buffer job arg gets
-#define        NPUTBUFS        2       // double buffer job arg puts
+#define NGETBUFS       1       // gets are single buffered
+#define NPUTBUFS       2       // puts are double buffered
 
 #endif /* INCLUDED_GCELL_GC_SPU_CONFIG_H */

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_spu_jd_queue.c
===================================================================
--- 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_spu_jd_queue.c
   2009-01-15 08:07:42 UTC (rev 10229)
+++ 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/runtime/spu/gc_spu_jd_queue.c
   2009-01-15 08:42:46 UTC (rev 10230)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2008 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/wrapper/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/gcell/lib/wrapper/Makefile.am     
2009-01-15 08:07:42 UTC (rev 10229)
+++ gnuradio/branches/developers/eb/gcell-wip/gcell/lib/wrapper/Makefile.am     
2009-01-15 08:42:46 UTC (rev 10230)
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/wrapper/qa_gcell_wrapper.cc
===================================================================
--- 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/wrapper/qa_gcell_wrapper.cc 
    2009-01-15 08:07:42 UTC (rev 10229)
+++ 
gnuradio/branches/developers/eb/gcell-wip/gcell/lib/wrapper/qa_gcell_wrapper.cc 
    2009-01-15 08:42:46 UTC (rev 10230)
@@ -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
  *