[Commit-gnuradio] r8160 - in gnuradio/branches/developers/eb/gcell-wip/gcell/src: apps lib/runtime

[eb]

Author: eb
Date: 2008-04-08 15:56:15 -0600 (Tue, 08 Apr 2008)
New Revision: 8160

Modified:
   gnuradio/branches/developers/eb/gcell-wip/gcell/src/apps/benchmark_dma.cc
   gnuradio/branches/developers/eb/gcell-wip/gcell/src/apps/benchmark_nop.cc
   
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager.cc
   
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager.h
   
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager_impl.h
   
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/qa_job_manager.cc
Log:
gc_make_job_manager now returns boost::shared_ptr

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/apps/benchmark_dma.cc
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/gcell/src/apps/benchmark_dma.cc   
2008-04-08 21:12:20 UTC (rev 8159)
+++ gnuradio/branches/developers/eb/gcell-wip/gcell/src/apps/benchmark_dma.cc   
2008-04-08 21:56:15 UTC (rev 8160)
@@ -125,7 +125,7 @@
   opts.nspes = nspes;
   //opts.enable_logging = true;
   //opts.log2_nlog_entries = 13;
-  gc_job_manager *mgr = gc_make_job_manager(&opts);
+  gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
 
   if ((gcp_benchmark_udelay = mgr->lookup_proc("benchmark_udelay")) == 
GCP_UNKNOWN_PROC){
     fprintf(stderr, "lookup_proc: failed to find \"benchmark_udelay\"\n");
@@ -211,8 +211,6 @@
           (double) njobs * dma_size / delta * (getput_mask == 
BENCHMARK_GET_PUT ? 2.0 : 1.0));
 
   }
-
-  delete mgr;
 }
 
 static void

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/apps/benchmark_nop.cc
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/gcell/src/apps/benchmark_nop.cc   
2008-04-08 21:12:20 UTC (rev 8159)
+++ gnuradio/branches/developers/eb/gcell-wip/gcell/src/apps/benchmark_nop.cc   
2008-04-08 21:56:15 UTC (rev 8160)
@@ -60,7 +60,7 @@
   opts.program_handle = &benchmark_procs;
   opts.nspes = nspes;
   opts.gang_schedule = true;
-  gc_job_manager *mgr = gc_make_job_manager(&opts);
+  gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
 
   if ((gcp_benchmark_udelay = mgr->lookup_proc("benchmark_udelay")) == 
GCP_UNKNOWN_PROC){
     fprintf(stderr, "lookup_proc: failed to find \"benchmark_udelay\"\n");
@@ -127,8 +127,6 @@
   printf("nspes: %2d  udelay: %4d  elapsed_time: %7.3f  njobs: %g  speedup: 
%6.3f\n",
         mgr->nspes(), usecs, delta, (double) njobs,
         njobs * usecs * 1e-6 / delta);
-
-  delete mgr;
 }
 
 int

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager.cc
===================================================================
--- 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager.cc
   2008-04-08 21:12:20 UTC (rev 8159)
+++ 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager.cc
   2008-04-08 21:56:15 UTC (rev 8160)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -25,10 +25,10 @@
 #include "gc_job_manager.h"
 #include "gc_job_manager_impl.h"
 
-gc_job_manager *
+gc_job_manager_sptr
 gc_make_job_manager(const gc_jm_options *options)
 {
-  return new gc_job_manager_impl(options);
+  return gc_job_manager_sptr(new gc_job_manager_impl(options));
 }
 
 gc_job_manager::gc_job_manager(const gc_jm_options *options)

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager.h
===================================================================
--- 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager.h
    2008-04-08 21:12:20 UTC (rev 8159)
+++ 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager.h
    2008-04-08 21:56:15 UTC (rev 8160)
@@ -23,12 +23,14 @@
 #define INCLUDED_GC_JOB_MANAGER_H
 
 #include <boost/utility.hpp>
+#include <boost/shared_ptr.hpp>
 #include <vector>
 #include <string>
 #include <libspe2.h>
 #include "gc_job_desc.h"
 
 class gc_job_manager;
+typedef boost::shared_ptr<gc_job_manager> gc_job_manager_sptr;
 
 enum gc_wait_mode {
   GC_WAIT_ANY,
@@ -62,7 +64,7 @@
 /*
  * \brief Create an instance of the job manager
  */
-gc_job_manager *
+gc_job_manager_sptr
 gc_make_job_manager(const gc_jm_options *options = 0);
 
 

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager_impl.h
===================================================================
--- 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager_impl.h
       2008-04-08 21:12:20 UTC (rev 8159)
+++ 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/gc_job_manager_impl.h
       2008-04-08 21:56:15 UTC (rev 8160)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -29,7 +29,6 @@
 #include "gc_spu_args.h"
 #include <libspe2.h>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 #include <boost/scoped_array.hpp>
 
 typedef boost::shared_ptr<spe_gang_context> spe_gang_context_sptr;
@@ -169,7 +168,7 @@
   void sync_logfiles();
   void unmap_logfiles();
 
-  friend gc_job_manager *gc_make_job_manager(const gc_jm_options *options);
+  friend gc_job_manager_sptr gc_make_job_manager(const gc_jm_options *options);
   
   gc_job_manager_impl(const gc_jm_options *options = 0);
 

Modified: 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/qa_job_manager.cc
===================================================================
--- 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/qa_job_manager.cc
   2008-04-08 21:12:20 UTC (rev 8159)
+++ 
gnuradio/branches/developers/eb/gcell-wip/gcell/src/lib/runtime/qa_job_manager.cc
   2008-04-08 21:56:15 UTC (rev 8160)
@@ -173,23 +173,21 @@
 void
 qa_job_manager::t1_body()
 {
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   mgr = gc_make_job_manager(&opts);
-  delete mgr;
 }
 
 void
 qa_job_manager::t2_body()
 {
-  gc_job_manager *mgr = 0;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 100;
   opts.gang_schedule = false;
   mgr = gc_make_job_manager(&opts);
-  delete mgr;
 }
 
 void
@@ -200,13 +198,12 @@
   // cppunit.  cppunit is the prime suspect.
 
 #if 0
-  gc_job_manager *mgr = 0;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 100;
   opts.gang_schedule = true;
   CPPUNIT_ASSERT_THROW(mgr = gc_make_job_manager(&opts), std::out_of_range);
-  delete mgr;
 #endif
 }
 
@@ -222,7 +219,7 @@
 void
 qa_job_manager::t4_body()
 {
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 1;
@@ -256,14 +253,12 @@
   for (int i = 0; i < NJOBS; i++){
     mgr->free_job_desc(jds[i]);
   }
-
-  delete mgr;
 }
 
 void
 qa_job_manager::t5_body()
 {
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 0;      // use them all
@@ -293,14 +288,12 @@
   for (int i = 0; i < NJOBS; i++){
     mgr->free_job_desc(jds[i]);
   }
-
-  delete mgr;
 }
 
 void
 qa_job_manager::t6_body()
 {
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 1;      
@@ -330,7 +323,6 @@
   }
 
   mgr->free_job_desc(jd);
-  delete mgr;
 }
 
 static int
@@ -344,7 +336,7 @@
 }
 
 static void
-test_sum_shorts(gc_job_manager *mgr, short *buf, int nshorts)
+test_sum_shorts(gc_job_manager_sptr mgr, short *buf, int nshorts)
 {
   gc_job_desc *jd = mgr->alloc_job_desc();
   gc_proc_id_t gcp_qa_sum_shorts = mgr->lookup_proc("qa_sum_shorts");
@@ -379,7 +371,7 @@
 void
 qa_job_manager::t7_body()
 {
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 1;
@@ -400,8 +392,6 @@
   for (int offset = 0; offset <= 64; offset++){
     test_sum_shorts(mgr, &short_buf[offset], ea_args_maxsize/sizeof(short));
   }
-
-  delete mgr;
 }
 
 //
@@ -410,7 +400,7 @@
 void
 qa_job_manager::t8_body()
 {
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 1;
@@ -433,7 +423,6 @@
   }
 
   mgr->free_job_desc(jd);
-  delete mgr;
 }
 
 //
@@ -444,7 +433,7 @@
 {
   static const int N = 127;
   static const int M = 201;
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 1;
@@ -474,7 +463,6 @@
   }
 
   mgr->free_job_desc(jd);
-  delete mgr;
 }
 
 static bool
@@ -510,7 +498,7 @@
 }
 
 static void
-test_put_seq(gc_job_manager *mgr, int offset, int len, int starting_val)
+test_put_seq(gc_job_manager_sptr mgr, int offset, int len, int starting_val)
 {
   gc_job_desc *jd = mgr->alloc_job_desc();
   gc_proc_id_t gcp_qa_put_seq = mgr->lookup_proc("qa_put_seq");
@@ -556,7 +544,7 @@
 void
 qa_job_manager::t10_body()
 {
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 1;
@@ -576,8 +564,6 @@
   for (int offset = 0; offset <= 64; offset++){
     test_put_seq(mgr, offset, ea_args_maxsize, starting_val++);
   }
-
-  delete mgr;
 }
 
 //
@@ -586,7 +572,7 @@
 void
 qa_job_manager::t11_body()
 {
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 1;
@@ -611,7 +597,6 @@
   }
 
   mgr->free_job_desc(jd);
-  delete mgr;
 }
 
 //
@@ -622,7 +607,7 @@
 {
   static const int N = 127;
   static const int M = 201;
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 1;
@@ -662,7 +647,6 @@
   }
 
   mgr->free_job_desc(jd);
-  delete mgr;
 }
 
 //
@@ -671,7 +655,7 @@
 void
 qa_job_manager::t13_body()
 {
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 1;
@@ -720,8 +704,6 @@
     CPPUNIT_ASSERT(ok);
   }
   mgr->free_job_desc(jd);
-
-  delete mgr;
 }
 
 /*
@@ -743,7 +725,7 @@
 
   memset(buf, 0xff, LEN_PER_JOB * NJOBS);
 
-  gc_job_manager *mgr;
+  gc_job_manager_sptr mgr;
   gc_jm_options opts;
   opts.program_handle = &gcell_qa;
   opts.nspes = 1;
@@ -788,8 +770,6 @@
   // cleanup
   for (int i = 0; i < NJOBS; i++)
     mgr->free_job_desc(jd[i]);
-
-  delete mgr;
 }
 
 void