X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fctf-trace.c;h=f2af1a3d0fb17229e2939e5e294deeae3ecc443b;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=7c39e85068733270ebd7599bfaa5b03e6ff60ca8;hpb=a1075e32c32bc39d2d8e3cb2458346c4afa6fc08;p=lttng-tools.git diff --git a/src/bin/lttng-relayd/ctf-trace.c b/src/bin/lttng-relayd/ctf-trace.c index 7c39e8506..f2af1a3d0 100644 --- a/src/bin/lttng-relayd/ctf-trace.c +++ b/src/bin/lttng-relayd/ctf-trace.c @@ -1,24 +1,13 @@ /* - * Copyright (C) 2013 - Julien Desfossez - * David Goulet - * 2015 - Mathieu Desnoyers + * Copyright (C) 2013 Julien Desfossez + * Copyright (C) 2013 David Goulet + * Copyright (C) 2015 Mathieu Desnoyers * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2 only, as - * published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program 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 - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _LGPL_SOURCE -#include #include #include @@ -51,7 +40,7 @@ static void ctf_trace_destroy(struct ctf_trace *trace) * have put back their ref since the've been closed by the * control side. */ - assert(cds_list_empty(&trace->stream_list)); + LTTNG_ASSERT(cds_list_empty(&trace->stream_list)); session_put(trace->session); trace->session = NULL; free(trace->path); @@ -68,7 +57,7 @@ static void ctf_trace_release(struct urcu_ref *ref) iter.iter.node = &trace->node.node; ret = lttng_ht_del(trace->session->ctf_traces_ht, &iter); - assert(!ret); + LTTNG_ASSERT(!ret); ctf_trace_destroy(trace); }