X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=23b3b1feea0050490e3a895d3054507e91a88536;hp=b5202fe6abe0807a35088e5b88ef8cd82e0779ce;hb=d78d661021eb1c5761c631dbd525697769fe638b;hpb=3edea7d55416a57bf38afd0baa431ef2cc702b9a

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index b5202fe6a..23b3b1fee 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -59,7 +59,11 @@ struct lttng_channel *channel_new_default_attr(int dom)
 		chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
 		break;
 	case LTTNG_DOMAIN_UST:
+#if 0
 	case LTTNG_DOMAIN_UST_PID:
+	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+	case LTTNG_DOMAIN_UST_EXEC_NAME:
+#endif
 		chan->attr.subbuf_size = DEFAULT_UST_CHANNEL_SUBBUF_SIZE;
 		chan->attr.num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
 		chan->attr.output = DEFAULT_UST_CHANNEL_OUTPUT;
@@ -184,9 +188,12 @@ int channel_ust_enable(struct ltt_ust_session *usess, int domain,
 		/* Enable channel for global domain */
 		ret = ust_app_enable_channel_glb(usess, uchan);
 		break;
+#if 0
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
+#endif
+	default:
 		ret = LTTCOMM_NOT_IMPLEMENTED;
 		goto error;
 	}
@@ -243,9 +250,11 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain,
 		/* Enable channel for global domain */
 		ret = ust_app_create_channel_glb(usess, uchan);
 		break;
+#if 0
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
+#endif
 	default:
 		ret = LTTCOMM_NOT_IMPLEMENTED;
 		goto error_free_chan;
@@ -298,9 +307,12 @@ int channel_ust_disable(struct ltt_ust_session *usess, int domain,
 		/* Disable channel for global domain */
 		ret = ust_app_disable_channel_glb(usess, uchan);
 		break;
+#if 0
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
+#endif
+	default:
 		ret = LTTCOMM_NOT_IMPLEMENTED;
 		goto error;
 	}