X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=695142a298256a743f9fb1efddb9153a4a242e94;hp=e207e8b17c2d1e8bd41b4528030fa6dbc7b24652;hb=2d97a0067600335f07eecb2c1d9ba68fc164583e;hpb=d0687332954b69a490567da8f5391e9633f06a5e diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c index e207e8b17..695142a29 100644 --- a/src/common/config/session-config.c +++ b/src/common/config/session-config.c @@ -61,6 +61,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"; @@ -141,12 +142,25 @@ 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_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"; LTTNG_HIDDEN const char * const config_element_rotation_schedules = "rotation_schedules"; LTTNG_HIDDEN const char * const config_element_rotation_schedule_periodic = "periodic"; @@ -177,7 +191,7 @@ const char * const config_loglevel_type_single = "SINGLE"; const char * const config_event_type_all = "ALL"; const char * const config_event_type_tracepoint = "TRACEPOINT"; const char * const config_event_type_probe = "PROBE"; -const char * const config_event_type_userspace_probe = "USERSPACE_PROBE"; +LTTNG_HIDDEN const char * const config_event_type_userspace_probe = "USERSPACE_PROBE"; const char * const config_event_type_function = "FUNCTION"; const char * const config_event_type_function_entry = "FUNCTION_ENTRY"; const char * const config_event_type_noop = "NOOP"; @@ -205,6 +219,25 @@ LTTNG_HIDDEN const char * const config_event_context_need_reschedule = "NEED_RES LTTNG_HIDDEN const char * const config_event_context_migratable = "MIGRATABLE"; LTTNG_HIDDEN const char * const config_event_context_callstack_user= "CALLSTACK_USER"; LTTNG_HIDDEN const char * const config_event_context_callstack_kernel = "CALLSTACK_KERNEL"; +LTTNG_HIDDEN const char * const config_event_context_cgroup_ns = "CGROUP_NS"; +LTTNG_HIDDEN const char * const config_event_context_ipc_ns = "IPC_NS"; +LTTNG_HIDDEN const char * const config_event_context_mnt_ns = "MNT_NS"; +LTTNG_HIDDEN const char * const config_event_context_net_ns = "NET_NS"; +LTTNG_HIDDEN const char * const config_event_context_pid_ns = "PID_NS"; +LTTNG_HIDDEN const char * const config_event_context_user_ns = "USER_NS"; +LTTNG_HIDDEN const char * const config_event_context_uts_ns = "UTS_NS"; +LTTNG_HIDDEN const char * const config_event_context_uid = "UID"; +LTTNG_HIDDEN const char * const config_event_context_euid = "EUID"; +LTTNG_HIDDEN const char * const config_event_context_suid = "SUID"; +LTTNG_HIDDEN const char * const config_event_context_gid = "GID"; +LTTNG_HIDDEN const char * const config_event_context_egid = "EGID"; +LTTNG_HIDDEN const char * const config_event_context_sgid = "SGID"; +LTTNG_HIDDEN const char * const config_event_context_vuid = "VUID"; +LTTNG_HIDDEN const char * const config_event_context_veuid = "VEUID"; +LTTNG_HIDDEN const char * const config_event_context_vsuid = "VSUID"; +LTTNG_HIDDEN const char * const config_event_context_vgid = "VGID"; +LTTNG_HIDDEN const char * const config_event_context_vegid = "VEGID"; +LTTNG_HIDDEN const char * const config_event_context_vsgid = "VSGID"; /* Deprecated symbols */ const char * const config_element_perf; @@ -250,7 +283,7 @@ int config_get_section_entries(const char *override_path, const char *section, config_entry_handler_cb handler, void *user_data) { int ret = 0; - char *path; + const char *path; FILE *config_file = NULL; struct handler_filter_args filter = { section, handler, user_data }; @@ -1047,6 +1080,63 @@ int get_context_type(xmlChar *context_type) } else if (!strcmp((char *) context_type, config_event_context_callstack_kernel)) { ret = LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL; + } else if (!strcmp((char *) context_type, + config_event_context_cgroup_ns)) { + ret = LTTNG_EVENT_CONTEXT_CGROUP_NS; + } else if (!strcmp((char *) context_type, + config_event_context_ipc_ns)) { + ret = LTTNG_EVENT_CONTEXT_IPC_NS; + } else if (!strcmp((char *) context_type, + config_event_context_mnt_ns)) { + ret = LTTNG_EVENT_CONTEXT_MNT_NS; + } else if (!strcmp((char *) context_type, + config_event_context_net_ns)) { + ret = LTTNG_EVENT_CONTEXT_NET_NS; + } else if (!strcmp((char *) context_type, + config_event_context_pid_ns)) { + ret = LTTNG_EVENT_CONTEXT_PID_NS; + } else if (!strcmp((char *) context_type, + config_event_context_user_ns)) { + ret = LTTNG_EVENT_CONTEXT_USER_NS; + } else if (!strcmp((char *) context_type, + config_event_context_uts_ns)) { + ret = LTTNG_EVENT_CONTEXT_UTS_NS; + } else if (!strcmp((char *) context_type, + config_event_context_uid)) { + ret = LTTNG_EVENT_CONTEXT_UID; + } else if (!strcmp((char *) context_type, + config_event_context_euid)) { + ret = LTTNG_EVENT_CONTEXT_EUID; + } else if (!strcmp((char *) context_type, + config_event_context_suid)) { + ret = LTTNG_EVENT_CONTEXT_SUID; + } else if (!strcmp((char *) context_type, + config_event_context_gid)) { + ret = LTTNG_EVENT_CONTEXT_GID; + } else if (!strcmp((char *) context_type, + config_event_context_egid)) { + ret = LTTNG_EVENT_CONTEXT_EGID; + } else if (!strcmp((char *) context_type, + config_event_context_sgid)) { + ret = LTTNG_EVENT_CONTEXT_SGID; + } else if (!strcmp((char *) context_type, + config_event_context_vuid)) { + ret = LTTNG_EVENT_CONTEXT_VUID; + } else if (!strcmp((char *) context_type, + config_event_context_veuid)) { + ret = LTTNG_EVENT_CONTEXT_VEUID; + } else if (!strcmp((char *) context_type, + config_event_context_vsuid)) { + ret = LTTNG_EVENT_CONTEXT_VSUID; + } else if (!strcmp((char *) context_type, + config_event_context_vgid)) { + ret = LTTNG_EVENT_CONTEXT_VGID; + } else if (!strcmp((char *) context_type, + config_event_context_vegid)) { + ret = LTTNG_EVENT_CONTEXT_VEGID; + } else if (!strcmp((char *) context_type, + config_event_context_vsgid)) { + ret = LTTNG_EVENT_CONTEXT_VSGID; } else { goto error; } @@ -1479,9 +1569,8 @@ struct lttng_userspace_probe_location * process_userspace_probe_function_attribute_node( xmlNodePtr attribute_node) { - xmlChar *content; xmlNodePtr function_attribute_node; - char *function_name = NULL, *binary_path = NULL, *lookup_method_name; + char *function_name = NULL, *binary_path = NULL; struct lttng_userspace_probe_location *location = NULL; struct lttng_userspace_probe_location_lookup_method *lookup_method = NULL; @@ -1499,42 +1588,23 @@ process_userspace_probe_function_attribute_node( /* Handle function name, binary path and lookup method. */ if (!strcmp((const char *) function_attribute_node->name, config_element_userspace_probe_function_location_function_name)) { - content = xmlNodeGetContent(function_attribute_node); - if (!content) { - goto error; - } - - function_name = lttng_strndup((char *) content, LTTNG_SYMBOL_NAME_LEN); - free(content); + function_name = (char *) xmlNodeGetContent(function_attribute_node); if (!function_name) { - PERROR("Error duplicating function name"); goto error; } } else if (!strcmp((const char *) function_attribute_node->name, config_element_userspace_probe_location_binary_path)) { - content = xmlNodeGetContent(function_attribute_node); - if (!content) { - goto error; - } - - binary_path = lttng_strndup((char *) content, LTTNG_PATH_MAX); - free(content); + binary_path = (char *) xmlNodeGetContent(function_attribute_node); if (!binary_path) { - PERROR("Error duplicating binary path"); goto error; } } else if (!strcmp((const char *) function_attribute_node->name, config_element_userspace_probe_lookup)) { - content = xmlNodeGetContent(function_attribute_node); - if (!content) { - goto error; - } + char *lookup_method_name; - lookup_method_name = lttng_strndup((char *) content, - CONFIG_USERSPACE_PROBE_LOOKUP_METHOD_NAME_MAX_LEN); - free(content); + lookup_method_name = (char *) xmlNodeGetContent( + function_attribute_node); if (!lookup_method_name) { - PERROR("Error duplicating lookup method name"); goto error; } @@ -1547,12 +1617,13 @@ process_userspace_probe_function_attribute_node( lookup_method = lttng_userspace_probe_location_lookup_method_function_elf_create(); if (!lookup_method) { PERROR("Error creating function default/ELF lookup method"); - free(lookup_method_name); - goto error; } } else { - WARN("Unknown function lookup method."); - free(lookup_method_name); + WARN("Unknown function lookup method"); + } + + free(lookup_method_name); + if (!lookup_method) { goto error; } } else { @@ -1561,20 +1632,19 @@ process_userspace_probe_function_attribute_node( /* Check if all the necessary fields were found. */ if (binary_path && function_name && lookup_method) { + /* Ownership of lookup_method is transferred. */ location = lttng_userspace_probe_location_function_create( binary_path, function_name, lookup_method); - goto end; + lookup_method = NULL; + goto error; } } error: + lttng_userspace_probe_location_lookup_method_destroy(lookup_method); free(binary_path); free(function_name); - if (lookup_method) { - lttng_userspace_probe_location_lookup_method_destroy(lookup_method); - } -end: return location; } @@ -1583,9 +1653,7 @@ struct lttng_userspace_probe_location * process_userspace_probe_tracepoint_attribute_node( xmlNodePtr attribute_node) { - xmlChar *content; xmlNodePtr tracepoint_attribute_node; - char *lookup_method_name = NULL; char *probe_name = NULL, *provider_name = NULL, *binary_path = NULL; struct lttng_userspace_probe_location *location = NULL; struct lttng_userspace_probe_location_lookup_method *lookup_method = NULL; @@ -1602,58 +1670,29 @@ process_userspace_probe_tracepoint_attribute_node( tracepoint_attribute_node)) { if (!strcmp((const char *) tracepoint_attribute_node->name, config_element_userspace_probe_tracepoint_location_probe_name)) { - content = xmlNodeGetContent(tracepoint_attribute_node); - if (!content) { - goto error; - } - - probe_name = lttng_strndup((char*) content, LTTNG_SYMBOL_NAME_LEN); - free(content); + probe_name = (char *) xmlNodeGetContent(tracepoint_attribute_node); if (!probe_name) { - PERROR("Error duplicating probe name"); goto error; } } else if (!strcmp((const char *) tracepoint_attribute_node->name, config_element_userspace_probe_tracepoint_location_provider_name)) { - content = xmlNodeGetContent(tracepoint_attribute_node); - if (!content) { - goto error; - } - - provider_name = lttng_strndup((char*) content, LTTNG_SYMBOL_NAME_LEN); - free(content); + provider_name = (char *) xmlNodeGetContent(tracepoint_attribute_node); if (!provider_name) { - PERROR("Error duplicating provider name"); goto error; } } else if (!strcmp((const char *) tracepoint_attribute_node->name, config_element_userspace_probe_location_binary_path)) { - content = xmlNodeGetContent(tracepoint_attribute_node); - if (!content) { - goto error; - } - - binary_path = lttng_strndup((char*) content, LTTNG_PATH_MAX); - - free(content); - + binary_path = (char *) xmlNodeGetContent(tracepoint_attribute_node); if (!binary_path) { - PERROR("Error duplicating binary path"); goto error; } } else if (!strcmp((const char *) tracepoint_attribute_node->name, config_element_userspace_probe_lookup)) { - content = xmlNodeGetContent(tracepoint_attribute_node); - if (!content) { - goto error; - } - - lookup_method_name = lttng_strndup((char *) content, - CONFIG_USERSPACE_PROBE_LOOKUP_METHOD_NAME_MAX_LEN); - free(content); + char *lookup_method_name; + lookup_method_name = (char *) xmlNodeGetContent( + tracepoint_attribute_node); if (!lookup_method_name) { - PERROR("Error duplicating lookup method name"); goto error; } @@ -1663,35 +1702,36 @@ process_userspace_probe_tracepoint_attribute_node( lttng_userspace_probe_location_lookup_method_tracepoint_sdt_create(); if (!lookup_method) { PERROR("Error creating tracepoint SDT lookup method"); - free(lookup_method_name); - goto error; } } else { - WARN("Unknown tracepoint lookup method."); + WARN("Unknown tracepoint lookup method"); + } + + free(lookup_method_name); + if (!lookup_method) { goto error; } } else { - WARN("Unknown tracepoint attribute."); + WARN("Unknown tracepoint attribute"); goto error; } /* Check if all the necessary fields were found. */ if (binary_path && provider_name && probe_name && lookup_method) { + /* Ownership of lookup_method is transferred. */ location = lttng_userspace_probe_location_tracepoint_create( binary_path, provider_name, probe_name, lookup_method); - goto end; + lookup_method = NULL; + goto error; } } error: + lttng_userspace_probe_location_lookup_method_destroy(lookup_method); free(binary_path); - free(probe_name); free(provider_name); - if (lookup_method) { - lttng_userspace_probe_location_lookup_method_destroy(lookup_method); - } -end: + free(probe_name); return location; } @@ -2103,6 +2143,7 @@ end: free(exclusions[i]); } + lttng_event_destroy(event); free(exclusions); free(filter_expression); return ret; @@ -2634,19 +2675,91 @@ end: return ret; } -static -int process_pid_tracker_node(xmlNodePtr pid_tracker_node, - struct lttng_handle *handle) +static 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; + enum lttng_tracker_id_status status; 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; - node = xmlNextElementSibling(node)) { + for (node = xmlFirstElementChild(id_tracker_node); node; + node = xmlNextElementSibling(node)) { if (!strcmp((const char *) node->name, config_element_targets)) { targets_node = node; @@ -2659,26 +2772,42 @@ 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 = NULL; + tracker_id = lttng_tracker_id_create(); + if (tracker_id == NULL) { + ret = LTTNG_ERR_NOMEM; + goto end; + } + status = lttng_tracker_id_set_all(tracker_id); + if (status != LTTNG_TRACKER_ID_STATUS_OK) { + ret = LTTNG_ERR_INVALID; + goto end; + } + /* The session is explicitly set to target nothing. */ - ret = lttng_untrack_pid(handle, -1); + ret = lttng_untrack_id(handle, tracker_type, tracker_id); + lttng_tracker_id_destroy(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; - node = xmlNextElementSibling(node)) { - if (!strcmp((const char *) node->name, - config_element_pid)) { - int64_t pid; + /* get id node and track it */ + for (node = xmlFirstElementChild(id_target_node); node; + node = xmlNextElementSibling(node)) { + 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 = NULL; content = xmlNodeGetContent(node); if (!content) { @@ -2686,20 +2815,69 @@ 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 = lttng_tracker_id_create(); + if (tracker_id == NULL) { + ret = LTTNG_ERR_NOMEM; + goto end; + } + + status = lttng_tracker_id_set_value( + tracker_id, id); + if (status != LTTNG_TRACKER_ID_STATUS_OK) { + lttng_tracker_id_destroy(tracker_id); + ret = LTTNG_ERR_LOAD_INVALID_CONFIG; + goto end; + } + + ret = lttng_track_id(handle, tracker_type, + tracker_id); + lttng_tracker_id_destroy(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 = NULL; + + content = xmlNodeGetContent(node); + if (!content) { + ret = LTTNG_ERR_LOAD_INVALID_CONFIG; + goto end; + } + + tracker_id = lttng_tracker_id_create(); + if (tracker_id == NULL) { + ret = LTTNG_ERR_NOMEM; + goto end; + } + + status = lttng_tracker_id_set_string(tracker_id, + (const char *) content); + if (status != LTTNG_TRACKER_ID_STATUS_OK) { + lttng_tracker_id_destroy(tracker_id); + ret = LTTNG_ERR_LOAD_INVALID_CONFIG; + goto end; + } + + ret = lttng_track_id(handle, tracker_type, + tracker_id); + lttng_tracker_id_destroy(tracker_id); + free(content); if (ret) { goto end; } } } - node = pid_target_node; + node = id_target_node; } end: @@ -2716,6 +2894,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); @@ -2828,17 +3011,60 @@ 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: @@ -3350,6 +3576,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; } @@ -3369,6 +3596,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; } @@ -3493,10 +3723,14 @@ int load_session_from_path(const char *path, const char *session_name, ret = load_session_from_file(file_path.data, session_name, validation_ctx, overwrite, overrides); - if (session_name && !ret) { + if (session_name && + (!ret || ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) { session_found = 1; break; } + if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) { + goto end; + } /* * Reset the buffer's size to the location of the * path's trailing '/'. @@ -3508,25 +3742,24 @@ int load_session_from_path(const char *path, const char *session_name, 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)) { PERROR("closedir"); } } - if (session_found && !ret) { - ret = 0; + if (!ret && !session_found) { + ret = -LTTNG_ERR_LOAD_SESSION_NOENT; } lttng_dynamic_buffer_reset(&file_path); return ret; @@ -3581,7 +3814,7 @@ int config_load_session(const char *path, const char *session_name, } if (!path) { - char *home_path; + const char *home_path; const char *sys_path; /* Try home path */ @@ -3599,6 +3832,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; } @@ -3616,6 +3850,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; @@ -3656,6 +3891,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);