* Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <string.h>
#include <unistd.h>
#include <lttng/lttng.h>
#include <lttng-sessiond-comm.h>
#include <lttngerr.h>
+#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
+#include <ust/lttng-ust-ctl.h>
+#include <ust/lttng-ust-abi.h>
+#else
+#include "lttng-ust-ctl.h"
+#include "lttng-ust-abi.h"
+#endif
#include "channel.h"
+#include "hashtable.h"
#include "kernel-ctl.h"
#include "ust-ctl.h"
#include "utils.h"
/*
* Return allocated channel attributes.
*/
-static struct lttng_channel *init_default_attr(int dom)
+struct lttng_channel *channel_new_default_attr(int dom)
{
struct lttng_channel *chan;
chan->attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
break;
+ case LTTNG_DOMAIN_UST:
case LTTNG_DOMAIN_UST_PID:
chan->attr.subbuf_size = DEFAULT_UST_CHANNEL_SUBBUF_SIZE;
chan->attr.num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
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 = malloc(sizeof(struct ltt_ust_event));
+ if (new_uevent == NULL) {
+ perror("malloc 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.
*/
/* Creating channel attributes if needed */
if (attr == NULL) {
- attr = init_default_attr(LTTNG_DOMAIN_KERNEL);
+ /* FIXME: this appears to be a memory leak */
+ attr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL);
if (attr == NULL) {
ret = LTTCOMM_FATAL;
goto error;
/*
* Create UST channel and enable it on the tracer.
*/
-int channel_ust_create(struct ltt_ust_session *usession,
- struct lttng_channel *chan, int sock)
+int channel_ust_create(struct ltt_ust_session *usess,
+ struct lttng_channel *attr)
{
int ret;
- struct lttng_channel *attr = chan;
-
- /* Creating channel attributes if needed */
- if (attr == NULL) {
- attr = init_default_attr(LTTNG_DOMAIN_UST_PID);
- if (attr == NULL) {
- ret = LTTCOMM_FATAL;
+ 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;
}
- ret = ustctl_create_channel(sock, usession, attr);
+ /* 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;
}
-
- DBG2("Channel %s UST create successfully for sock:%d", attr->name, sock);
+ */
+
+ /*
+ 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;
int channel_ust_enable(struct ltt_ust_session *usession,
struct ltt_ust_channel *uchan, int sock)
{
- int ret;
- ret = LTTCOMM_OK;
-
- ret = ustctl_enable_channel(sock, usession, uchan);
+ 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 error;
+ goto end;
}
-
ret = LTTCOMM_OK;
-
-error:
+end:
+#endif
return ret;
}
int channel_ust_disable(struct ltt_ust_session *usession,
struct ltt_ust_channel *uchan, int sock)
{
- int ret;
- ret = LTTCOMM_OK;
-
- ret = ustctl_disable_channel(sock, usession, uchan);
+ 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 error;
+ goto end;
}
-
ret = LTTCOMM_OK;
-
-error:
+end:
+#endif
return ret;
}
projects / lttng-tools.git / blobdiff