X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=d89da4e32c402f1a623b80bfa4abe5ac2ce9d8f9;hp=cf50f0e44515573c81ce2d13b58ffd3711b6f579;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hpb=b01b201a053f492b09bde7e970d950ad636eb75c diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h index cf50f0e44..d89da4e32 100644 --- a/src/common/sessiond-comm/sessiond-comm.h +++ b/src/common/sessiond-comm/sessiond-comm.h @@ -1,20 +1,10 @@ /* - * Copyright (C) 2011 - David Goulet - * Julien Desfossez - * Mathieu Desnoyers + * Copyright (C) 2011 David Goulet + * Copyright (C) 2011 Julien Desfossez + * Copyright (C) 2011 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. */ /* @@ -95,9 +85,9 @@ enum lttcomm_sessiond_command { /* 29 */ /* 30 */ LTTNG_SAVE_SESSION = 31, - LTTNG_TRACK_PID = 32, - LTTNG_UNTRACK_PID = 33, - LTTNG_LIST_TRACKER_PIDS = 34, + LTTNG_TRACK_ID = 32, + LTTNG_UNTRACK_ID = 33, + LTTNG_LIST_TRACKER_IDS = 34, LTTNG_SET_SESSION_SHM_PATH = 40, LTTNG_REGENERATE_METADATA = 41, LTTNG_REGENERATE_STATEDUMP = 42, @@ -140,6 +130,8 @@ enum lttcomm_relayd_command { RELAYD_CLOSE_TRACE_CHUNK = 20, /* Ask the relay whether a trace chunk exists (2.11+) */ RELAYD_TRACE_CHUNK_EXISTS = 21, + /* Get the current configuration of a relayd peer (2.12+) */ + RELAYD_GET_CONFIGURATION = 22, /* Feature branch specific commands start at 10000. */ }; @@ -352,8 +344,21 @@ struct lttcomm_session_msg { char shm_path[PATH_MAX]; } LTTNG_PACKED set_shm_path; struct { - uint32_t pid; - } LTTNG_PACKED pid_tracker; + uint32_t tracker_type; /* enum lttng_tracker_type */ + uint32_t id_type; /* enum lttng_tracker_id_type */ + union { + int32_t value; + uint32_t var_len; + } u; + /* + * for LTTNG_ID_STRING, followed by a variable length + * zero-terminated string of length "var_len", which + * includes the final \0. + */ + } LTTNG_PACKED id_tracker; + struct { + uint32_t tracker_type; /* enum lttng_tracker_type */ + } LTTNG_PACKED id_tracker_list; struct { uint32_t length; } LTTNG_PACKED trigger; @@ -457,6 +462,21 @@ struct lttcomm_session_destroy_command_header { int32_t rotation_state; }; +/* + * tracker command header. + */ +struct lttcomm_tracker_command_header { + uint32_t nb_tracker_id; +} LTTNG_PACKED; + +struct lttcomm_tracker_id_header { + uint32_t type; /* enum lttng_tracker_id_type */ + union { + int32_t value; + uint32_t var_data_len; + } u; +} LTTNG_PACKED; + /* * Data structure for the response from sessiond to the lttng client. */