Merged eb/gcell -r8215:8243 into trunk. This adds gr-gcell, the GNU

[debian/gnuradio] / gcell / src / lib / runtime / gc_job_manager.h

diff --git a/gcell/src/lib/runtime/gc_job_manager.h b/gcell/src/lib/runtime/gc_job_manager.h
index aa30dc24baa423f768080361c6c9d7c6e0d7ae47..67abce7ed00b1fcda31999a4f28cdbb44f9d8eef 100644 (file)
--- a/gcell/src/lib/runtime/gc_job_manager.h
+++ b/gcell/src/lib/runtime/gc_job_manager.h
@@ -33,6 +33,7 @@
 class gc_job_manager;
 typedef boost::shared_ptr<gc_job_manager> gc_job_manager_sptr;
 typedef boost::shared_ptr<spe_program_handle_t> spe_program_handle_sptr;
+typedef boost::shared_ptr<gc_job_desc> gc_job_desc_sptr;
 
 /*!
  * \brief Return a boost::shared_ptr to an spe_program_handle_t
@@ -86,10 +87,19 @@ struct gc_jm_options {
 
   gc_jm_options() :
     max_jobs(0), max_client_threads(0), nspes(0),
-    gang_schedule(true), use_affinity(false),
+    gang_schedule(false), use_affinity(false),
     enable_logging(false), log2_nlog_entries(12)
   {
   }
+
+  gc_jm_options(spe_program_handle_sptr program_handle_,
+               unsigned int nspes_ = 0) :
+    max_jobs(0), max_client_threads(0), nspes(nspes_),
+    gang_schedule(false), use_affinity(false),
+    enable_logging(false), log2_nlog_entries(12),
+    program_handle(program_handle_)
+  {
+  }
 };
 
 enum gc_wait_mode {
@@ -236,6 +246,11 @@ public:
    */
   virtual std::vector<std::string> proc_names() = 0;
 
+  virtual void set_debug(int debug);
+  virtual int debug();
+
+  /* ----- static methods ----- */
+
   /*!
    * \brief Set the singleton gc_job_manager instance.
    * \param mgr is the job manager instance.
@@ -256,9 +271,15 @@ public:
    */
   static gc_job_manager_sptr singleton();
 
+  /*!
+   * \brief return a boost::shared_ptr to a job descriptor.
+   */
+  static gc_job_desc_sptr make_jd_sptr(gc_job_manager_sptr mgr, gc_job_desc *jd);
 
-  virtual void set_debug(int debug);
-  virtual int debug();
+  /*!
+   * \brief allocate a job descriptor and return a boost::shared_ptr to it.
+   */
+  static gc_job_desc_sptr alloc_job_desc(gc_job_manager_sptr mgr);
 };