X-Git-Url: http://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=49c06a3531b874d734ac03659f8b09f14d1f0132;hp=a8ea68eda42fdb92fc0177d02a6c239d6d281bd4;hb=a3ecaea889e67f87307cc3be53e51fb472a67c3b;hpb=f7af9a72c6709249c199989685bcd7d878ba2b33

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index a8ea68eda..49c06a353 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -223,6 +223,7 @@ 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_time_ns = "TIME_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";
@@ -711,7 +712,7 @@ void fini_session_config_validation_ctx(
 }
 
 static
-char *get_session_config_xsd_path()
+char *get_session_config_xsd_path(void)
 {
 	char *xsd_path;
 	const char *base_path = lttng_secure_getenv(DEFAULT_SESSION_CONFIG_XSD_PATH_ENV);
@@ -1094,6 +1095,9 @@ int get_context_type(xmlChar *context_type)
 	} 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_time_ns)) {
+		ret = LTTNG_EVENT_CONTEXT_TIME_NS;
 	} else if (!strcmp((char *) context_type,
 		config_event_context_user_ns)) {
 		ret = LTTNG_EVENT_CONTEXT_USER_NS;
@@ -3767,10 +3771,24 @@ int load_session_from_file(const char *path, const char *session_name,
 			xmlNextElementSibling(session_node)) {
 		ret = process_session_node(session_node,
 			session_name, overwrite, overrides);
-		if (session_name && ret == 0) {
-			/* Target session found and loaded */
-			session_found = 1;
-			break;
+		if (!session_name && ret) {
+			/* Loading error occurred. */
+			goto end;
+		} else if (session_name) {
+			if (ret == 0) {
+				/* Target session found and loaded */
+				session_found = 1;
+				break;
+			} else if (ret == -LTTNG_ERR_NO_SESSION) {
+				/*
+				 * Ignore this error, we are looking for a
+				 * specific session.
+				 */
+				ret = 0;
+			} else {
+				/* Loading error occurred. */
+				goto end;
+			}
 		}
 	}
 end:
@@ -3778,9 +3796,6 @@ 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;
 }