From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun, 25 Jan 2015 15:08:10 +0000 (-0500)
Subject: Cleanup: Remove unimplemented UST domains
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=bd39b88b61f8a17e1ca4c49706fe047d9253fb23;p=lttng-tools.git

Cleanup: Remove unimplemented UST domains

They will be implemented as options of the UST domains.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

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;