From bd39b88b61f8a17e1ca4c49706fe047d9253fb23 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 25 Jan 2015 10:08:10 -0500 Subject: [PATCH] Cleanup: Remove unimplemented UST domains MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit They will be implemented as options of the UST domains. Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/cmd.c | 30 ------------------------------ src/bin/lttng-sessiond/context.c | 5 ----- 2 files changed, 35 deletions(-) diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index 91ea88cb7..546da2e53 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -912,11 +912,6 @@ int cmd_disable_channel(struct ltt_session *session, int domain, } break; } -#if 0 - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: -#endif default: ret = LTTNG_ERR_UNKNOWN_DOMAIN; goto error; @@ -953,12 +948,7 @@ int cmd_track_pid(struct ltt_session *session, int domain, int pid) kernel_wait_quiescent(kernel_tracer_fd); break; } -#if 0 case LTTNG_DOMAIN_UST: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: -#endif default: ret = LTTNG_ERR_UNKNOWN_DOMAIN; goto error; @@ -995,12 +985,7 @@ int cmd_untrack_pid(struct ltt_session *session, int domain, int pid) kernel_wait_quiescent(kernel_tracer_fd); break; } -#if 0 case LTTNG_DOMAIN_UST: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: -#endif default: ret = LTTNG_ERR_UNKNOWN_DOMAIN; goto error; @@ -1270,11 +1255,6 @@ int cmd_disable_event(struct ltt_session *session, int domain, break; } -#if 0 - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: -#endif default: ret = LTTNG_ERR_UND; goto error; @@ -1414,11 +1394,6 @@ int cmd_add_context(struct ltt_session *session, int domain, } break; } -#if 0 - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: -#endif default: ret = LTTNG_ERR_UND; goto error; @@ -1745,11 +1720,6 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain, break; } -#if 0 - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: -#endif default: ret = LTTNG_ERR_UND; goto error; diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c index cd4b85f2a..7412144bf 100644 --- a/src/bin/lttng-sessiond/context.c +++ b/src/bin/lttng-sessiond/context.c @@ -262,11 +262,6 @@ int context_ust_add(struct ltt_ust_session *usess, int domain, case LTTNG_DOMAIN_UST: chan_ht = usess->domain_global.channels; break; -#if 0 - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: -#endif default: ret = LTTNG_ERR_UND; goto error; -- 2.34.1