X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fctf-ir%2Fstream.c;h=2e7c2b4ed309b94634aa854c895f48b7726279f8;hb=26e21a82c47a15d1080dc142cb20c0b0b0b5a929;hp=8e5b18c5ab304c093e3dec6aef0fb3c9c8892c56;hpb=ad8474550bfc1968366fe45818c046fa5bc15581;p=babeltrace.git

diff --git a/lib/ctf-ir/stream.c b/lib/ctf-ir/stream.c
index 8e5b18c5..2e7c2b4e 100644
--- a/lib/ctf-ir/stream.c
+++ b/lib/ctf-ir/stream.c
@@ -47,31 +47,12 @@
 BT_HIDDEN
 void bt_stream_common_finalize(struct bt_stream_common *stream)
 {
-	int i;
-
 	BT_LOGD("Finalizing common stream object: addr=%p, name=\"%s\"",
 		stream, bt_stream_common_get_name(stream));
 
-	/* Call destroy listeners in reverse registration order */
-	if (stream->destroy_listeners) {
-		for (i = stream->destroy_listeners->len - 1; i >= 0; i--) {
-			struct bt_stream_common_destroy_listener *listener =
-				&g_array_index(stream->destroy_listeners,
-					struct bt_stream_common_destroy_listener, i);
-
-			BT_LOGD("Calling destroy listener: func=%p, data=%p, index=%d",
-				listener->func, listener->data, i);
-			listener->func(stream, listener->data);
-		}
-	}
-
 	if (stream->name) {
 		g_string_free(stream->name, TRUE);
 	}
-
-	if (stream->destroy_listeners) {
-		g_array_free(stream->destroy_listeners, TRUE);
-	}
 }
 
 static
@@ -147,12 +128,6 @@ int bt_stream_common_initialize(
 	bt_object_set_parent(&stream->base, &trace->base);
 	stream->stream_class = stream_class;
 	stream->id = (int64_t) id;
-	stream->destroy_listeners = g_array_new(FALSE, TRUE,
-		sizeof(struct bt_stream_common_destroy_listener));
-	if (!stream->destroy_listeners) {
-		BT_LOGE_STR("Failed to allocate a GArray.");
-		goto error;
-	}
 
 	if (name) {
 		stream->name = g_string_new(name);
@@ -293,44 +268,3 @@ int64_t bt_stream_get_id(struct bt_stream *stream)
 {
 	return bt_stream_common_get_id(BT_TO_COMMON(stream));
 }
-
-BT_HIDDEN
-void bt_stream_common_add_destroy_listener(struct bt_stream_common *stream,
-		bt_stream_common_destroy_listener_func func, void *data)
-{
-	struct bt_stream_common_destroy_listener listener;
-
-	BT_ASSERT(stream);
-	BT_ASSERT(func);
-	listener.func = func;
-	listener.data = data;
-	g_array_append_val(stream->destroy_listeners, listener);
-	BT_LOGV("Added stream destroy listener: stream-addr=%p, "
-		"stream-name=\"%s\", func=%p, data=%p",
-		stream, bt_stream_common_get_name(stream), func, data);
-}
-
-BT_HIDDEN
-void bt_stream_common_remove_destroy_listener(struct bt_stream_common *stream,
-		bt_stream_common_destroy_listener_func func, void *data)
-{
-	size_t i;
-
-	BT_ASSERT(stream);
-	BT_ASSERT(func);
-
-	for (i = 0; i < stream->destroy_listeners->len; i++) {
-		struct bt_stream_common_destroy_listener *listener =
-			&g_array_index(stream->destroy_listeners,
-				struct bt_stream_common_destroy_listener, i);
-
-		if (listener->func == func && listener->data == data) {
-			g_array_remove_index(stream->destroy_listeners, i);
-			i--;
-			BT_LOGV("Removed stream destroy listener: stream-addr=%p, "
-				"stream-name=\"%s\", func=%p, data=%p",
-				stream, bt_stream_common_get_name(stream),
-				func, data);
-		}
-	}
-}