X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=54c962a86847baf3f74d941bbcfb23018e14bfc8;hp=37b522a91c153487708c1f1b6afeb45b29f268d4;hb=a2814ea7573bf5edd5323d6f89c48ff14105db69;hpb=6fa5fe7cc78bea0b0bba154a0f911d3df530e18f diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h index 37b522a91..54c962a86 100644 --- a/src/bin/lttng-sessiond/consumer.h +++ b/src/bin/lttng-sessiond/consumer.h @@ -1,18 +1,8 @@ /* - * Copyright (C) 2012 - David Goulet + * Copyright (C) 2012 David Goulet * - * 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. */ #ifndef _CONSUMER_H @@ -152,6 +142,9 @@ struct consumer_output { uint32_t relay_major_version; uint32_t relay_minor_version; + /* True if relayd supports the clear feature. */ + bool relay_allows_clear; + /* * Subdirectory path name used for both local and network * consumer ("kernel", "ust", or empty). @@ -220,7 +213,8 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock, enum lttng_stream_type type, uint64_t session_id, const char *session_name, const char *hostname, const char *base_path, int session_live_timer, - const uint64_t *current_chunk_id, time_t session_creation_time); + const uint64_t *current_chunk_id, time_t session_creation_time, + bool session_name_contains_creation_time); int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock, int pipe); int consumer_send_destroy_relayd(struct consumer_socket *sock, @@ -239,6 +233,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, unsigned int switch_timer_interval, unsigned int read_timer_interval, unsigned int live_timer_interval, + bool is_in_live_session, unsigned int monitor_timer_interval, int output, int type, @@ -281,6 +276,7 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg, uint64_t tracefile_count, unsigned int monitor, unsigned int live_timer_interval, + bool is_in_live_session, unsigned int monitor_timer_interval, struct lttng_trace_chunk *trace_chunk); int consumer_is_data_pending(uint64_t session_id, @@ -314,13 +310,21 @@ int consumer_init(struct consumer_socket *socket, int consumer_create_trace_chunk(struct consumer_socket *socket, uint64_t relayd_id, uint64_t session_id, - struct lttng_trace_chunk *chunk); + struct lttng_trace_chunk *chunk, + const char *domain_subdir); int consumer_close_trace_chunk(struct consumer_socket *socket, uint64_t relayd_id, uint64_t session_id, - struct lttng_trace_chunk *chunk); + struct lttng_trace_chunk *chunk, + char *closed_trace_chunk_path); int consumer_trace_chunk_exists(struct consumer_socket *socket, uint64_t relayd_id, uint64_t session_id, struct lttng_trace_chunk *chunk, enum consumer_trace_chunk_exists_status *result); +char *setup_channel_trace_path(struct consumer_output *consumer, + const char *session_path, size_t *consumer_path_offset); + +/* Clear command */ +int consumer_clear_channel(struct consumer_socket *socket, uint64_t key); + #endif /* _CONSUMER_H */