X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ffs-sink-trace.h;h=89c38efdfb1be7fee5af2ce8b9a6fe0398a9dc45;hb=516bf0a77e025cfccce2fa400b757e94dc0bf1d8;hp=f60cad93aef5743a76da46fc63a6defb44292157;hpb=91d8147391efdc4d42cc4e1c171a65c0372a008f;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/fs-sink-trace.h b/src/plugins/ctf/fs-sink/fs-sink-trace.h
index f60cad93..89c38efd 100644
--- a/src/plugins/ctf/fs-sink/fs-sink-trace.h
+++ b/src/plugins/ctf/fs-sink/fs-sink-trace.h
@@ -1,33 +1,16 @@
-#ifndef BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_TRACE_H
-#define BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_TRACE_H
-
 /*
- * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * 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.
+ * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
+#ifndef BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_TRACE_H
+#define BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_TRACE_H
+
 #include "common/macros.h"
 #include <babeltrace2/babeltrace.h>
 #include "ctfser/ctfser.h"
 #include <glib.h>
-#include <stdbool.h>
 #include <stdint.h>
 
 #include "fs-sink-ctf-meta.h"
@@ -35,17 +18,18 @@
 struct fs_sink_comp;
 
 struct fs_sink_trace {
+	bt_logging_level log_level;
 	struct fs_sink_comp *fs_sink;
 
 	/* Owned by this */
-	struct fs_sink_ctf_trace_class *tc;
+	struct fs_sink_ctf_trace *trace;
 
 	/*
-	 * Weak reference: this object does not own it, and `tc` above
-	 * does not own its trace IR trace class either. Instead, we add
-	 * a "trace destruction" listener (in create_trace()) so that
-	 * this object gets destroyed when the trace object is
-	 * destroyed.
+	 * Weak reference: this object does not own it, and `trace`
+	 * above does not own its trace IR trace and trace class either.
+	 * Instead, we add a "trace destruction" listener (in
+	 * create_trace()) so that this object gets destroyed when the
+	 * trace object is destroyed.
 	 *
 	 * Otherwise (with a strong reference), we would keep this trace
 	 * object alive until the upstream message iterator ends. This
@@ -54,7 +38,7 @@ struct fs_sink_trace {
 	 */
 	const bt_trace *ir_trace;
 
-	uint64_t ir_trace_destruction_listener_id;
+	bt_listener_id ir_trace_destruction_listener_id;
 
 	/* Trace's directory */
 	GString *path;