X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace.h;h=365382e5164403b2fc3f8a2fccdec619b1db624a;hp=8fe9a9c69f3ef7798930d6b84358cfca725526ef;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=64a35d1b706151f9f002df4975aaa1536a68286e

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index 8fe9a9c6..365382e5 100644
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -15,95 +15,19 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
-#include <glib.h>
 #include <babeltrace/context.h>
 #include <babeltrace/format.h>
 #include <babeltrace/iterator.h>
-#include <babeltrace/trace-collection.h>
 #include <babeltrace/trace-handle.h>
-#include <babeltrace/ctf/events.h>
-
-typedef GQuark bt_event_name;
-
-/* Forward declarations */
-struct bt_iter;
-struct ctf_stream_event;
-struct ctf_stream;
-struct bt_dependencies;
-
-enum bt_cb_ret {
-	BT_CB_OK		= 0,
-	BT_CB_OK_STOP		= 1,
-	BT_CB_ERROR_STOP	= 2,
-	BT_CB_ERROR_CONTINUE	= 3,
-};
-
-struct bt_ctf_data {
-	struct ctf_stream_event *event;
-	struct ctf_stream *stream;
-};
-
-/*
- * Receives a variable number of strings as parameter, ended with NULL.
- */
-struct bt_dependencies *babeltrace_dependencies_create(const char *first, ...);
-
-/*
- * struct bt_dependencies must be destroyed explicitly if not passed as
- * parameter to a bt_iter_add_callback().
- */
-void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
-
-/*
- * bt_iter_add_callback: Add a callback to iterator.
- *
- * @iter: trace collection iterator (input)
- * @event: event to target. 0 for all events.
- * @private_data: private data pointer to pass to the callback
- * @flags: specific flags controlling the behavior of this callback
- *         (or'd).
- *            
- * @callback: function pointer to call
- * @depends: struct bt_dependency detailing the required computation results.
- *           Ends with 0.
- * @weak_depends: struct bt_dependency detailing the optional computation
- *                results that can be optionally consumed by this
- *                callback.
- * @provides: struct bt_dependency detailing the computation results
- *            provided by this callback.
- *            Ends with 0.
- *
- * "depends", "weak_depends" and "provides" memory is handled by the
- * babeltrace library after this call succeeds or fails. These objects
- * can still be used by the caller until the babeltrace iterator is
- * destroyed, but they belong to the babeltrace library.
- *
- * (note to implementor: we need to keep a gptrarray of struct
- * bt_dependencies to "garbage collect" in struct bt_iter, and
- * dependencies need to have a refcount to handle the case where they
- * would be passed to more than one iterator. Upon iterator detroy, we
- * iterate on all the gc ptrarray and decrement the refcounts, freeing
- * if we reach 0.)
- * (note to implementor: we calculate the dependency graph when
- * bt_iter_read_event() is executed after a
- * bt_iter_add_callback(). Beware that it is valid to create/add
- * callbacks/read/add more callbacks/read some more.)
- */
-int bt_iter_add_callback(struct bt_iter *iter,
-		bt_event_name event, void *private_data, int flags,
-		enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
-					   void *caller_data),
-		struct bt_dependencies *depends,
-		struct bt_dependencies *weak_depends,
-		struct bt_dependencies *provides);
-
-/*
- * For flags parameter above.
- */
-enum {
-	BT_FLAGS_FREE_PRIVATE_DATA	= (1 << 0),
-};
 
 #endif /* _BABELTRACE_H */