From c088a546ac7ae55748e5421201f3387f3e1286f9 Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Mon, 27 Aug 2007 18:49:11 +0000
Subject: Merged r6171:6186 from jcorgan/fg into trunk.

Changes hierarchical flow graph API to use gr.top_block instead
of gr.runtime.

See discuss-gnuradio mailing list for explanation of changes.

GRC has not been updated to use the changed API.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6187 221aa14e-8319-0410-a670-987f0aec2ac5
---
 gnuradio-core/src/lib/runtime/gr_runtime.h | 105 -----------------------------
 1 file changed, 105 deletions(-)
 delete mode 100644 gnuradio-core/src/lib/runtime/gr_runtime.h

(limited to 'gnuradio-core/src/lib/runtime/gr_runtime.h')

diff --git a/gnuradio-core/src/lib/runtime/gr_runtime.h b/gnuradio-core/src/lib/runtime/gr_runtime.h
deleted file mode 100644
index 1168b3eda9..0000000000
--- a/gnuradio-core/src/lib/runtime/gr_runtime.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2007 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 GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_RUNTIME_H
-#define INCLUDED_GR_RUNTIME_H
-
-#include <gr_runtime_types.h>
-
-class gr_runtime_impl;
-
-gr_runtime_sptr gr_make_runtime(gr_hier_block2_sptr top_block);
-
-/*!
- *\brief Runtime object that controls simple flow graph operation
- *
- * This class is instantiated with a top-level gr_hier_block2. The
- * runtime then flattens the hierarchical block into a gr_simple_flowgraph,
- * and allows control through start(), stop(), wait(), and run().
- * 
- */
-class gr_runtime
-{
-private:
-  gr_runtime(gr_hier_block2_sptr top_block);
-  friend gr_runtime_sptr gr_make_runtime(gr_hier_block2_sptr top_block);
-
-  gr_runtime_impl *d_impl;
-    
-public:
-  ~gr_runtime();
-
-  /*!
-   * Start the flow graph.  Creates an undetached scheduler thread for
-   * each flow graph partition. Returns to caller once created.
-   */
-  void start();
-  
-  /*!
-   * Stop a running flow graph.  Tells each created scheduler thread
-   * to exit, then returns to caller.
-   */
-  void stop();
-
-  /*!
-   * Wait for a stopped flow graph to complete.  Joins each completed
-   * thread.
-   */
-  void wait();
-
-  /*!
-   * Calls start(), then wait().  Used to run a flow graph that will stop
-   * on its own, or to run a flow graph indefinitely until SIGTERM is
-   * received().
-   */
-  void run();
-
-  /*!
-   * Restart a running flow graph, after topology changes have
-   * been made to its top_block (or children). Causes each created 
-   * scheduler thread to end, recalculates the flow graph, and 
-   * recreates new threads (possibly a different number from before.)
-   */
-  void restart();
-
-  /*!
-   * Lock a flow graph in preparation for reconfiguration.  When an equal
-   * number of calls to lock() and unlock() have occurred, the flow graph
-   * will be restarted automatically.
-   *
-   * N.B. lock() and unlock() cannot be called from a flow graph thread or
-   * deadlock will occur when reconfiguration happens.
-   */
-  void lock();
-
-  /*!
-   * Lock a flow graph in preparation for reconfiguration.  When an equal
-   * number of calls to lock() and unlock() have occurred, the flow graph
-   * will be restarted automatically.
-   *
-   * N.B. lock() and unlock() cannot be called from a flow graph thread or
-   * deadlock will occur when reconfiguration happens.
-   */
-  void unlock();
-};
-
-#endif /* INCLUDED_GR_RUNTIME_H */
-- 
cgit v1.2.3