Fix: consumerd: double unlock on rotate channel error path

[lttng-tools.git] / include / lttng / channel-internal.h

diff --git a/include/lttng/channel-internal.h b/include/lttng/channel-internal.h
index d78a720d4e378dc183c0101740892eac1eec8a35..04b19322f96ea35f1340b6e5d6f74ac569ca3246 100644 (file)
--- a/include/lttng/channel-internal.h
+++ b/include/lttng/channel-internal.h
@@ -1,27 +1,20 @@
 /*
- * Copyright (C) 2015 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library 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 Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef LTTNG_CHANNEL_INTERNAL_H
 #define LTTNG_CHANNEL_INTERNAL_H
 
+#include <common/macros.h>
+
 struct lttng_channel_extended {
        uint64_t discarded_events;
        uint64_t lost_packets;
        uint64_t monitor_timer_interval;
+       int64_t blocking_timeout;
 } LTTNG_PACKED;
 
 #endif /* LTTNG_CHANNEL_INTERNAL_H */