From: David Goulet <david.goulet@polymtl.ca>
Date: Tue, 29 Nov 2011 19:38:35 +0000 (-0500)
Subject: Remove unused UST channel code
X-Git-Tag: v2.0-pre15~66
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=3c4adb6fabd48ab775d110e15d197ac66e9c8f37

Remove unused UST channel code

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---

diff --git a/lttng-sessiond/channel.c b/lttng-sessiond/channel.c
index fb46b4ad6..146807cb2 100644
--- a/lttng-sessiond/channel.c
+++ b/lttng-sessiond/channel.c
@@ -75,37 +75,6 @@ error_alloc:
 	return NULL;
 }
 
-/*
- * Copy two ltt ust channel. Dst and src must be already allocated.
- */
-int channel_ust_copy(struct ltt_ust_channel *dst,
-		struct ltt_ust_channel *src)
-{
-	//struct ltt_ust_event *uevent, *new_uevent;
-
-	memcpy(dst, src, sizeof(struct ltt_ust_channel));
-	dst->events = hashtable_new_str(0);
-
-	/*
-	cds_list_for_each_entry(uevent, &src->events.head, list) {
-		new_uevent = zmalloc(sizeof(struct ltt_ust_event));
-		if (new_uevent == NULL) {
-			perror("zmalloc ltt_ust_event");
-			goto error;
-		}
-
-		memcpy(new_uevent, uevent, sizeof(struct ltt_ust_event));
-		cds_list_add(&new_uevent->list, &dst->events.head);
-		dst->events.count++;
-	}
-	*/
-
-	return 0;
-
-//error:
-//	return -1;
-}
-
 /*
  * Disable kernel channel of the kernel session.
  */
@@ -195,115 +164,3 @@ error:
 	free(defattr);
 	return ret;
 }
-
-/*
- * Create UST channel and enable it on the tracer.
- */
-int channel_ust_create(struct ltt_ust_session *usess,
-		struct lttng_channel *attr)
-{
-	int ret;
-	struct ltt_ust_channel *uchan;
-	//struct lttng_ust_channel_attr uattr;
-	//struct object_data *obj;
-
-	uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
-			attr->name);
-	if (uchan == NULL) {
-		uchan = trace_ust_create_channel(attr, usess->pathname);
-		if (uchan == NULL) {
-			ret = LTTCOMM_UST_CHAN_FAIL;
-			goto error;
-		}
-		rcu_read_lock();
-		hashtable_add_unique(usess->domain_global.channels, &uchan->node);
-		rcu_read_unlock();
-	} else {
-		ret = LTTCOMM_UST_CHAN_EXIST;
-		goto error;
-	}
-
-	/* TODO: NOTIFY ust application to update */
-	/*
-	ret = ustctl_create_channel(sock, usession->handle, &uattr, &obj);
-	if (ret < 0) {
-		ret = LTTCOMM_UST_CHAN_FAIL;
-		goto error;
-	}
-	*/
-
-	/*
-	uchan->attr.overwrite = uattr.overwrite;
-	uchan->attr.subbuf_size = uattr.subbuf_size;
-	uchan->attr.num_subbuf = uattr.num_subbuf;
-	uchan->attr.switch_timer_interval = uattr.switch_timer_interval;
-	uchan->attr.read_timer_interval = uattr.read_timer_interval;
-	uchan->attr.output = uattr.output;
-	uchan->handle = obj->handle;
-	uchan->attr.shm_fd = obj->shm_fd;
-	uchan->attr.wait_fd = obj->wait_fd;
-	uchan->attr.memory_map_size = obj->memory_map_size;
-	uchan->obj = obj;
-	*/
-
-	/* Add channel to session */
-	//rcu_read_lock();
-	//cds_list_add(&uchan->list, &usession->channels.head);
-	//usession->channels.count++;
-	//rcu_read_unlock();
-
-	//DBG2("Channel %s UST create successfully for sock:%d", uchan->name, sock);
-
-	ret = LTTCOMM_OK;
-
-error:
-	return ret;
-}
-
-/*
- * Enable UST channel on the tracer.
- */
-int channel_ust_enable(struct ltt_ust_session *usession,
-		struct ltt_ust_channel *uchan, int sock)
-{
-	int ret = LTTCOMM_OK;
-#ifdef DISABLE
-	struct object_data obj;
-
-	obj.shm_fd = uchan->attr.shm_fd;
-	obj.wait_fd = uchan->attr.wait_fd;
-	obj.memory_map_size = uchan->attr.memory_map_size;
-	ret = ustctl_enable(sock, &obj);
-	if (ret < 0) {
-		ret = LTTCOMM_UST_CHAN_FAIL;
-		goto end;
-	}
-	ret = LTTCOMM_OK;
-end:
-#endif
-	return ret;
-}
-
-/*
- * Disable UST channel on the tracer.
- */
-int channel_ust_disable(struct ltt_ust_session *usession,
-		struct ltt_ust_channel *uchan, int sock)
-{
-	int ret = LTTCOMM_OK;
-#ifdef DISABLE
-	struct object_data obj;
-
-	obj.shm_fd = uchan->attr.shm_fd;
-	obj.wait_fd = uchan->attr.wait_fd;
-	obj.memory_map_size = uchan->attr.memory_map_size;
-	ret = ustctl_disable(sock, &obj);
-	if (ret < 0) {
-		ret = LTTCOMM_UST_CHAN_FAIL;
-		goto end;
-	}
-	ret = LTTCOMM_OK;
-end:
-#endif
-	return ret;
-}
diff --git a/lttng-sessiond/channel.h b/lttng-sessiond/channel.h
index 37c1b8c0a..656a1d526 100644
--- a/lttng-sessiond/channel.h
+++ b/lttng-sessiond/channel.h
@@ -30,15 +30,6 @@ int channel_kernel_enable(struct ltt_kernel_session *ksession,
 int channel_kernel_create(struct ltt_kernel_session *ksession,
 		struct lttng_channel *chan, int kernel_pipe);
 
-int channel_ust_create(struct ltt_ust_session *usession,
-		struct lttng_channel *chan);
-int channel_ust_copy(struct ltt_ust_channel *dst,
-		struct ltt_ust_channel *src);
-int channel_ust_disable(struct ltt_ust_session *usession,
-		struct ltt_ust_channel *uchan, int sock);
-int channel_ust_enable(struct ltt_ust_session *usession,
-		struct ltt_ust_channel *uchan, int sock);
-
 struct lttng_channel *channel_new_default_attr(int domain);
 
 #endif /* _LTT_CHANNEL_H */