From 9d4b0931c687d50af2b494b5362cfdaf0adc0b22 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 4 Jul 2018 16:14:20 -0400 Subject: [PATCH] Backport: trackers: update config xsd schema Signed-off-by: Mathieu Desnoyers --- src/common/config/config-session-abi.h | 15 ++ src/common/config/session-config.c | 217 ++++++++++++++++++++++--- src/common/config/session.xsd | 128 ++++++++++++++- 3 files changed, 325 insertions(+), 35 deletions(-) diff --git a/src/common/config/config-session-abi.h b/src/common/config/config-session-abi.h index 66d9cca73..080e03e1d 100644 --- a/src/common/config/config-session-abi.h +++ b/src/common/config/config-session-abi.h @@ -18,6 +18,7 @@ #ifndef CONFIG_SESSION_INTERNAL_H #define CONFIG_SESSION_INTERNAL_H +extern const char * const config_element_all; extern const char * const config_element_channel; extern const char * const config_element_channels; extern const char * const config_element_domain; @@ -72,12 +73,26 @@ extern const char * const config_element_control_uri; extern const char * const config_element_data_uri; extern const char * const config_element_max_size; extern const char * const config_element_pid; +extern const char * const config_element_id; extern const char * const config_element_pids; +extern const char * const config_element_name; extern const char * const config_element_shared_memory_path; extern const char * const config_element_pid_tracker; +extern const char * const config_element_vpid_tracker; +extern const char * const config_element_uid_tracker; +extern const char * const config_element_vuid_tracker; +extern const char * const config_element_gid_tracker; +extern const char * const config_element_vgid_tracker; extern const char * const config_element_trackers; extern const char * const config_element_targets; +extern const char * const config_element_target_type; extern const char * const config_element_target_pid; +extern const char * const config_element_target_vpid; +extern const char * const config_element_target_uid; +extern const char * const config_element_target_vuid; +extern const char * const config_element_target_gid; +extern const char * const config_element_target_vgid; +extern const char * const config_element_tracker_type; extern const char * const config_domain_type_kernel; extern const char * const config_domain_type_ust; diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c index b2d7a6b5b..5ae56a483 100644 --- a/src/common/config/session-config.c +++ b/src/common/config/session-config.c @@ -56,6 +56,7 @@ struct session_config_validation_ctx { xmlSchemaValidCtxtPtr schema_validation_ctx; }; +const char * const config_element_all = "all"; const char * const config_str_yes = "yes"; const char * const config_str_true = "true"; const char * const config_str_on = "on"; @@ -84,7 +85,6 @@ const char * const config_element_probe_attributes = "probe_attributes"; const char * const config_element_symbol_name = "symbol_name"; const char * const config_element_address = "address"; const char * const config_element_offset = "offset"; -const char * const config_element_name = "name"; const char * const config_element_enabled = "enabled"; const char * const config_element_overwrite_mode = "overwrite_mode"; const char * const config_element_subbuf_size = "subbuffer_size"; @@ -122,12 +122,26 @@ const char * const config_element_control_uri = "control_uri"; const char * const config_element_data_uri = "data_uri"; const char * const config_element_max_size = "max_size"; const char * const config_element_pid = "pid"; +const char * const config_element_id = "id"; const char * const config_element_pids = "pids"; +const char * const config_element_name = "name"; const char * const config_element_shared_memory_path = "shared_memory_path"; const char * const config_element_pid_tracker = "pid_tracker"; +const char * const config_element_vpid_tracker = "vpid_tracker"; +const char * const config_element_uid_tracker = "uid_tracker"; +const char * const config_element_vuid_tracker = "vuid_tracker"; +const char * const config_element_gid_tracker = "gid_tracker"; +const char * const config_element_vgid_tracker = "vgid_tracker"; const char * const config_element_trackers = "trackers"; const char * const config_element_targets = "targets"; +const char * const config_element_target_type = "target_type"; const char * const config_element_target_pid = "pid_target"; +const char * const config_element_target_vpid = "vpid_target"; +const char * const config_element_target_uid = "uid_target"; +const char * const config_element_target_vuid = "vuid_target"; +const char * const config_element_target_gid = "gid_target"; +const char * const config_element_target_vgid = "vgid_target"; +const char * const config_element_tracker_type = "tracker_type"; const char * const config_domain_type_kernel = "KERNEL"; const char * const config_domain_type_ust = "UST"; @@ -2267,17 +2281,88 @@ end: } static -int process_pid_tracker_node(xmlNodePtr pid_tracker_node, - struct lttng_handle *handle) +int get_tracker_elements(enum lttng_tracker_type tracker_type, + const char **element_id_tracker, + const char **element_target_id, + const char **element_id, + const char **element_id_alias, + const char **element_name) +{ + int ret = 0; + + switch (tracker_type) { + case LTTNG_TRACKER_PID: + *element_id_tracker = config_element_pid_tracker; + *element_target_id = config_element_target_pid; + *element_id = config_element_id; + *element_id_alias = config_element_pid; + *element_name = NULL; + break; + case LTTNG_TRACKER_VPID: + *element_id_tracker = config_element_vpid_tracker; + *element_target_id = config_element_target_vpid; + *element_id = config_element_id; + *element_id_alias = NULL; + *element_name = NULL; + break; + case LTTNG_TRACKER_UID: + *element_id_tracker = config_element_uid_tracker; + *element_target_id = config_element_target_uid; + *element_id = config_element_id; + *element_id_alias = NULL; + *element_name = config_element_name; + break; + case LTTNG_TRACKER_VUID: + *element_id_tracker = config_element_vuid_tracker; + *element_target_id = config_element_target_vuid; + *element_id = config_element_id; + *element_id_alias = NULL; + *element_name = config_element_name; + break; + case LTTNG_TRACKER_GID: + *element_id_tracker = config_element_gid_tracker; + *element_target_id = config_element_target_gid; + *element_id = config_element_id; + *element_id_alias = NULL; + *element_name = config_element_name; + break; + case LTTNG_TRACKER_VGID: + *element_id_tracker = config_element_vgid_tracker; + *element_target_id = config_element_target_vgid; + *element_id = config_element_id; + *element_id_alias = NULL; + *element_name = config_element_name; + break; + default: + ret = LTTNG_ERR_INVALID; + } + return ret; +} + +static +int process_id_tracker_node(xmlNodePtr id_tracker_node, + struct lttng_handle *handle, enum lttng_tracker_type tracker_type) { int ret = 0, child; xmlNodePtr targets_node = NULL; xmlNodePtr node; + const char *element_id_tracker; + const char *element_target_id; + const char *element_id; + const char *element_id_alias; + const char *element_name; assert(handle); - assert(pid_tracker_node); + assert(id_tracker_node); + + ret = get_tracker_elements(tracker_type, &element_id_tracker, + &element_target_id, &element_id, &element_id_alias, &element_name); + if (ret) { + return ret; + } + /* get the targets node */ - for (node = xmlFirstElementChild(pid_tracker_node); node; + for (node = xmlFirstElementChild(id_tracker_node); node; node = xmlNextElementSibling(node)) { if (!strcmp((const char *) node->name, config_element_targets)) { @@ -2291,26 +2376,31 @@ int process_pid_tracker_node(xmlNodePtr pid_tracker_node, goto end; } - /* Go through all pid_target node */ + /* Go through all id target node */ child = xmlChildElementCount(targets_node); if (child == 0) { + struct lttng_tracker_id tracker_id; + + tracker_id.type = LTTNG_ID_ALL; /* The session is explicitly set to target nothing. */ - ret = lttng_untrack_pid(handle, -1); + ret = lttng_untrack_id(handle, tracker_type, &tracker_id); if (ret) { goto end; } } for (node = xmlFirstElementChild(targets_node); node; node = xmlNextElementSibling(node)) { - xmlNodePtr pid_target_node = node; + xmlNodePtr id_target_node = node; - /* get pid node and track it */ - for (node = xmlFirstElementChild(pid_target_node); node; + /* get id node and track it */ + for (node = xmlFirstElementChild(id_target_node); node; node = xmlNextElementSibling(node)) { - if (!strcmp((const char *) node->name, - config_element_pid)) { - int64_t pid; + if (!strcmp((const char *) node->name, element_id) || + (element_id_alias && !strcmp((const char *) node->name, + element_id_alias))) { + int64_t id; xmlChar *content = NULL; + struct lttng_tracker_id tracker_id; content = xmlNodeGetContent(node); if (!content) { @@ -2318,20 +2408,40 @@ int process_pid_tracker_node(xmlNodePtr pid_tracker_node, goto end; } - ret = parse_int(content, &pid); + ret = parse_int(content, &id); free(content); if (ret) { ret = LTTNG_ERR_LOAD_INVALID_CONFIG; goto end; } - ret = lttng_track_pid(handle, (int) pid); + tracker_id.type = LTTNG_ID_VALUE; + tracker_id.value = (int) id; + ret = lttng_track_id(handle, tracker_type, &tracker_id); + if (ret) { + goto end; + } + } + if (element_name && !strcmp((const char *) node->name, + element_name)) { + xmlChar *content = NULL; + struct lttng_tracker_id tracker_id; + + content = xmlNodeGetContent(node); + if (!content) { + ret = LTTNG_ERR_LOAD_INVALID_CONFIG; + goto end; + } + tracker_id.type = LTTNG_ID_STRING; + tracker_id.string = (char *) content; + ret = lttng_track_id(handle, tracker_type, &tracker_id); + free(content); if (ret) { goto end; } } } - node = pid_target_node; + node = id_target_node; } end: @@ -2348,6 +2458,11 @@ int process_domain_node(xmlNodePtr domain_node, const char *session_name) xmlNodePtr channels_node = NULL; xmlNodePtr trackers_node = NULL; xmlNodePtr pid_tracker_node = NULL; + xmlNodePtr vpid_tracker_node = NULL; + xmlNodePtr uid_tracker_node = NULL; + xmlNodePtr vuid_tracker_node = NULL; + xmlNodePtr gid_tracker_node = NULL; + xmlNodePtr vgid_tracker_node = NULL; xmlNodePtr node; assert(session_name); @@ -2431,17 +2546,54 @@ int process_domain_node(xmlNodePtr domain_node, const char *session_name) for (node = xmlFirstElementChild(trackers_node); node; node = xmlNextElementSibling(node)) { - if (!strcmp((const char *)node->name,config_element_pid_tracker)) { + if (!strcmp((const char *)node->name, config_element_pid_tracker)) { pid_tracker_node = node; - ret = process_pid_tracker_node(pid_tracker_node, handle); + ret = process_id_tracker_node(pid_tracker_node, handle, + LTTNG_TRACKER_PID); + if (ret) { + goto end; + } + } + if (!strcmp((const char *)node->name, config_element_vpid_tracker)) { + vpid_tracker_node = node; + ret = process_id_tracker_node(vpid_tracker_node, handle, + LTTNG_TRACKER_VPID); + if (ret) { + goto end; + } + } + if (!strcmp((const char *)node->name, config_element_uid_tracker)) { + uid_tracker_node = node; + ret = process_id_tracker_node(uid_tracker_node, handle, + LTTNG_TRACKER_UID); + if (ret) { + goto end; + } + } + if (!strcmp((const char *)node->name, config_element_vuid_tracker)) { + vuid_tracker_node = node; + ret = process_id_tracker_node(vuid_tracker_node, handle, + LTTNG_TRACKER_VUID); + if (ret) { + goto end; + } + } + if (!strcmp((const char *)node->name, config_element_gid_tracker)) { + gid_tracker_node = node; + ret = process_id_tracker_node(gid_tracker_node, handle, + LTTNG_TRACKER_GID); + if (ret) { + goto end; + } + } + if (!strcmp((const char *)node->name, config_element_vgid_tracker)) { + vgid_tracker_node = node; + ret = process_id_tracker_node(vgid_tracker_node, handle, + LTTNG_TRACKER_VGID); if (ret) { goto end; } } - } - - if (!pid_tracker_node) { - lttng_track_pid(handle, -1); } end: @@ -2774,6 +2926,7 @@ int load_session_from_file(const char *path, const char *session_name, sessions_node = xmlDocGetRootElement(doc); if (!sessions_node) { + ret = -LTTNG_ERR_LOAD_INVALID_CONFIG; goto end; } @@ -2793,6 +2946,9 @@ end: if (!ret) { ret = session_found ? 0 : -LTTNG_ERR_LOAD_SESSION_NOENT; } + if (ret == -LTTNG_ERR_NO_SESSION) { + ret = -LTTNG_ERR_LOAD_SESSION_NOENT; + } return ret; } @@ -2892,7 +3048,7 @@ int load_session_from_path(const char *path, const char *session_name, ret = load_session_from_file(file_path, session_name, validation_ctx, overwrite, overrides); - if (session_name && !ret) { + if (session_name && (!ret || ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) { session_found = 1; break; } @@ -2900,16 +3056,19 @@ int load_session_from_path(const char *path, const char *session_name, free(entry); free(file_path); + if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) { + goto end; + } } else { ret = load_session_from_file(path, session_name, validation_ctx, overwrite, overrides); if (ret) { goto end; - } else { - session_found = 1; } + session_found = 1; } + ret = 0; end: if (directory) { if (closedir(directory)) { @@ -2917,8 +3076,8 @@ end: } } - if (session_found && !ret) { - ret = 0; + if (!ret && !session_found) { + ret = -LTTNG_ERR_LOAD_SESSION_NOENT; } return ret; @@ -2992,6 +3151,7 @@ int config_load_session(const char *path, const char *session_name, DEFAULT_SESSION_CONFIG_AUTOLOAD, home_path); if (ret < 0) { PERROR("snprintf session autoload home config path"); + ret = -LTTNG_ERR_INVALID; goto end; } @@ -3009,6 +3169,7 @@ int config_load_session(const char *path, const char *session_name, DEFAULT_SESSION_HOME_CONFIGPATH, home_path); if (ret < 0) { PERROR("snprintf session home config path"); + ret = -LTTNG_ERR_INVALID; goto end; } path_ptr = path; @@ -3049,6 +3210,8 @@ int config_load_session(const char *path, const char *session_name, if (!ret) { session_loaded = true; } + } else { + ret = 0; } } else { ret = access(path, F_OK); diff --git a/src/common/config/session.xsd b/src/common/config/session.xsd index 5c006b6e9..502933ee6 100644 --- a/src/common/config/session.xsd +++ b/src/common/config/session.xsd @@ -226,16 +226,17 @@ elementFormDefault="qualified" version="2.8"> - + - + + - + - - + + @@ -243,14 +244,125 @@ elementFormDefault="qualified" version="2.8"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + -- 2.34.1