X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.h;h=82400a5ae8fa1073caba517eec8d355323c429e5;hp=cb006f18e6824b6406c3469b246330a06ff03039;hb=f37d0f861f20a72a0b77fb43fa27744521dd7995;hpb=a2a75fa4301617ab0d2b97614a989e3ad6efa4bb diff --git a/src/common/config/session-config.h b/src/common/config/session-config.h index cb006f18e..82400a5ae 100644 --- a/src/common/config/session-config.h +++ b/src/common/config/session-config.h @@ -1,18 +1,8 @@ /* - * Copyright (C) 2013 - Jérémie Galarneau + * Copyright (C) 2013 Jérémie Galarneau * - * 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 _CONFIG_H @@ -34,6 +24,7 @@ struct config_load_session_override_attr { char *path_url; char *ctrl_url; char *data_url; + char *session_name; }; /* Instance of a configuration writer. */ @@ -84,8 +75,8 @@ int config_parse_value(const char *value); /* * Create an instance of a configuration writer. * - * fd_output File to which the XML content must be written. The file will be - * closed once the config_writer has been destroyed. + * fd_output File to which the XML content must be written. fd_output is + * owned by the caller. * * indent If other than 0 the XML will be pretty printed * with indentation and newline. @@ -223,12 +214,14 @@ int config_writer_write_element_string(struct config_writer *writer, * * overwrite Overwrite current session configuration if it exists. * autoload Tell to load the auto session(s). + * overrides The override attribute structure specifying override parameters. * * Returns zero if the session could be loaded successfully. Returns * a negative LTTNG_ERR code on error. */ LTTNG_HIDDEN int config_load_session(const char *path, const char *session_name, - int overwrite, unsigned int autoload); + int overwrite, unsigned int autoload, + const struct config_load_session_override_attr *overrides); #endif /* _CONFIG_H */