From a30a0fe162f3663d4197717aab47e20013c0f89d Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 4 Jul 2018 16:11:17 -0400 Subject: [PATCH] Backport: trackers: change error code from "pid" to "id" Signed-off-by: Mathieu Desnoyers --- include/lttng/lttng-error.h | 9 +++++++-- src/common/error.c | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/lttng/lttng-error.h b/include/lttng/lttng-error.h index 69fecaac4..4336c6de6 100644 --- a/include/lttng/lttng-error.h +++ b/include/lttng/lttng-error.h @@ -134,8 +134,8 @@ enum lttng_error_code { LTTNG_ERR_EXCLUSION_NOMEM = 111, /* Lack of memory while processing event exclusions */ LTTNG_ERR_INVALID_EVENT_NAME = 112, /* Invalid event name */ LTTNG_ERR_INVALID_CHANNEL_NAME = 113, /* Invalid channel name */ - LTTNG_ERR_PID_TRACKED = 114, /* PID already tracked */ - LTTNG_ERR_PID_NOT_TRACKED = 115, /* PID not tracked */ + LTTNG_ERR_ID_TRACKED = 114, /* ID already tracked */ + LTTNG_ERR_ID_NOT_TRACKED = 115, /* ID not tracked */ LTTNG_ERR_INVALID_CHANNEL_DOMAIN = 116, /* Invalid channel domain */ LTTNG_ERR_OVERFLOW = 117, /* Overflow occurred. */ LTTNG_ERR_SESSION_NOT_STARTED = 118, /* Session not started */ @@ -146,6 +146,11 @@ enum lttng_error_code { LTTNG_ERR_REGEN_STATEDUMP_NOMEM = 123, /* Failed to regenerate the state dump, not enough memory */ LTTNG_ERR_NOT_SNAPSHOT_SESSION = 124, /* Session is not in snapshot mode. */ LTTNG_ERR_AGENT_TRACING_DISABLED = 139, /* Agent tracing disabled. */ + LTTNG_ERR_USER_NOT_FOUND = 140, /* User not found. */ + LTTNG_ERR_GROUP_NOT_FOUND = 141, /* Group not found. */ + + LTTNG_ERR_PID_TRACKED = 114, /* Backward compat alias to LTTNG_ERR_ID_TRACKED */ + LTTNG_ERR_PID_NOT_TRACKED = 115, /* Backward compat alias to LTTNG_ERR_ID_NOT_TRACKED */ /* MUST be last element */ LTTNG_ERR_NR, /* Last element */ diff --git a/src/common/error.c b/src/common/error.c index b6d2ff42f..7c35d5939 100644 --- a/src/common/error.c +++ b/src/common/error.c @@ -175,8 +175,8 @@ static const char *error_string_array[] = { [ ERROR_INDEX(LTTNG_ERR_MI_NOT_IMPLEMENTED) ] = "Mi feature not implemented", [ ERROR_INDEX(LTTNG_ERR_INVALID_EVENT_NAME) ] = "Invalid event name", [ ERROR_INDEX(LTTNG_ERR_INVALID_CHANNEL_NAME) ] = "Invalid channel name", - [ ERROR_INDEX(LTTNG_ERR_PID_TRACKED) ] = "PID already tracked", - [ ERROR_INDEX(LTTNG_ERR_PID_NOT_TRACKED) ] = "PID not tracked", + [ ERROR_INDEX(LTTNG_ERR_ID_TRACKED) ] = "ID already tracked", + [ ERROR_INDEX(LTTNG_ERR_ID_NOT_TRACKED) ] = "ID not tracked", [ ERROR_INDEX(LTTNG_ERR_INVALID_CHANNEL_DOMAIN) ] = "Invalid channel domain", [ ERROR_INDEX(LTTNG_ERR_OVERFLOW) ] = "Overflow occurred", [ ERROR_INDEX(LTTNG_ERR_SESSION_NOT_STARTED) ] = "Session not started", @@ -187,6 +187,8 @@ static const char *error_string_array[] = { [ ERROR_INDEX(LTTNG_ERR_REGEN_STATEDUMP_NOMEM) ] = "Failed to regenerate the state dump, not enough memory", [ ERROR_INDEX(LTTNG_ERR_NOT_SNAPSHOT_SESSION) ] = "Snapshot command can't be applied to a non-snapshot session", [ ERROR_INDEX(LTTNG_ERR_AGENT_TRACING_DISABLED) ] = "Session daemon agent tracing is disabled", + [ ERROR_INDEX(LTTNG_ERR_USER_NOT_FOUND) ] = "User not found.", + [ ERROR_INDEX(LTTNG_ERR_GROUP_NOT_FOUND) ] = "Group not found.", /* Last element */ [ ERROR_INDEX(LTTNG_ERR_NR) ] = "Unknown error code" -- 2.34.1