X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=06a6d616af7a01d4c9207e6d7b86156e2d3b499e;hp=e11d6d11fbcffa74d813d0722dcc7a4e65bc10aa;hb=0c82ac624169ec9ec062f395e55abfe992d0fd91;hpb=0525e9ae15d215943d8187e7f190d5a45e723085 diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c index e11d6d11f..06a6d616a 100644 --- a/src/bin/lttng-sessiond/channel.c +++ b/src/bin/lttng-sessiond/channel.c @@ -15,7 +15,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE +#include #include #include @@ -24,6 +25,7 @@ #include #include "channel.h" +#include "lttng-sessiond.h" #include "kernel.h" #include "ust-ctl.h" #include "utils.h" @@ -32,7 +34,8 @@ /* * Return allocated channel attributes. */ -struct lttng_channel *channel_new_default_attr(int dom) +struct lttng_channel *channel_new_default_attr(int dom, + enum lttng_buffer_type type) { struct lttng_channel *chan; @@ -48,26 +51,48 @@ struct lttng_channel *channel_new_default_attr(int dom) goto error; } + /* Same for all domains. */ chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE; - chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER; - chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER; + chan->attr.tracefile_size = DEFAULT_CHANNEL_TRACEFILE_SIZE; + chan->attr.tracefile_count = DEFAULT_CHANNEL_TRACEFILE_COUNT; switch (dom) { case LTTNG_DOMAIN_KERNEL: + assert(type == LTTNG_BUFFER_GLOBAL); chan->attr.subbuf_size = default_get_kernel_channel_subbuf_size(); chan->attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM; chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT; + chan->attr.switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER; + chan->attr.read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER; + chan->attr.live_timer_interval = DEFAULT_KERNEL_CHANNEL_LIVE_TIMER; 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_get_ust_channel_subbuf_size(); - chan->attr.num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM; - chan->attr.output = DEFAULT_UST_CHANNEL_OUTPUT; + switch (type) { + case LTTNG_BUFFER_PER_UID: + chan->attr.subbuf_size = default_get_ust_uid_channel_subbuf_size(); + chan->attr.num_subbuf = DEFAULT_UST_UID_CHANNEL_SUBBUF_NUM; + chan->attr.output = DEFAULT_UST_UID_CHANNEL_OUTPUT; + chan->attr.switch_timer_interval = + DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER; + chan->attr.read_timer_interval = + DEFAULT_UST_UID_CHANNEL_READ_TIMER; + chan->attr.live_timer_interval = + DEFAULT_UST_UID_CHANNEL_LIVE_TIMER; + break; + case LTTNG_BUFFER_PER_PID: + default: + chan->attr.subbuf_size = default_get_ust_pid_channel_subbuf_size(); + chan->attr.num_subbuf = DEFAULT_UST_PID_CHANNEL_SUBBUF_NUM; + chan->attr.output = DEFAULT_UST_PID_CHANNEL_OUTPUT; + chan->attr.switch_timer_interval = + DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER; + chan->attr.read_timer_interval = + DEFAULT_UST_PID_CHANNEL_READ_TIMER; + chan->attr.live_timer_interval = + DEFAULT_UST_UID_CHANNEL_LIVE_TIMER; + break; + } break; default: goto error; /* Not implemented */ @@ -155,7 +180,8 @@ int channel_kernel_create(struct ltt_kernel_session *ksession, /* Creating channel attributes if needed */ if (attr == NULL) { - defattr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL); + defattr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL, + LTTNG_BUFFER_GLOBAL); if (defattr == NULL) { ret = LTTNG_ERR_FATAL; goto error; @@ -163,8 +189,14 @@ int channel_kernel_create(struct ltt_kernel_session *ksession, attr = defattr; } + if (ksession->snapshot_mode) { + /* Force channel attribute for snapshot mode. */ + attr->attr.overwrite = 1; + attr->attr.output = LTTNG_EVENT_MMAP; + } + /* Channel not found, creating it */ - ret = kernel_create_channel(ksession, attr, ksession->trace_path); + ret = kernel_create_channel(ksession, attr); if (ret < 0) { ret = LTTNG_ERR_KERN_CHAN_FAIL; goto error; @@ -186,7 +218,7 @@ error: /* * Enable UST channel for session and domain. */ -int channel_ust_enable(struct ltt_ust_session *usess, int domain, +int channel_ust_enable(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan) { int ret = LTTNG_OK; @@ -201,43 +233,30 @@ int channel_ust_enable(struct ltt_ust_session *usess, int domain, goto end; } - switch (domain) { - case LTTNG_DOMAIN_UST: - DBG2("Channel %s being enabled in UST global domain", uchan->name); + DBG2("Channel %s being enabled in UST domain", uchan->name); - /* - * Enable channel for UST global domain on all applications. Ignore - * return value here since whatever error we got, it means that the - * channel was not created on one or many registered applications and - * we can not report this to the user yet. However, at this stage, the - * channel was successfully created on the session daemon side so the - * enable-channel command is a success. - */ - (void) 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 = LTTNG_ERR_UND; - goto error; - } + /* + * Enable channel for UST global domain on all applications. Ignore return + * value here since whatever error we got, it means that the channel was + * not created on one or many registered applications and we can not report + * this to the user yet. However, at this stage, the channel was + * successfully created on the session daemon side so the enable-channel + * command is a success. + */ + (void) ust_app_enable_channel_glb(usess, uchan); uchan->enabled = 1; DBG2("Channel %s enabled successfully", uchan->name); end: -error: return ret; } /* * Create UST channel for session and domain. */ -int channel_ust_create(struct ltt_ust_session *usess, int domain, - struct lttng_channel *attr) +int channel_ust_create(struct ltt_ust_session *usess, + struct lttng_channel *attr, enum lttng_buffer_type type) { int ret = LTTNG_OK; struct ltt_ust_channel *uchan = NULL; @@ -247,7 +266,7 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain, /* Creating channel attributes if needed */ if (attr == NULL) { - defattr = channel_new_default_attr(domain); + defattr = channel_new_default_attr(LTTNG_DOMAIN_UST, type); if (defattr == NULL) { ret = LTTNG_ERR_FATAL; goto error; @@ -255,9 +274,10 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain, attr = defattr; } - if (attr->attr.subbuf_size < DEFAULT_UST_CHANNEL_SUBBUF_SIZE) { - ret = LTTNG_ERR_INVALID; - goto error; + if (usess->snapshot_mode) { + /* Force channel attribute for snapshot mode. */ + attr->attr.overwrite = 1; + attr->attr.output = LTTNG_EVENT_MMAP; } /* @@ -271,6 +291,14 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain, goto error; } + /* + * Invalid subbuffer size if it's lower then the page size. + */ + if (attr->attr.subbuf_size < page_size) { + ret = LTTNG_ERR_INVALID; + goto error; + } + if (!attr->attr.num_subbuf || (attr->attr.num_subbuf & (attr->attr.num_subbuf - 1))) { ret = LTTNG_ERR_INVALID; @@ -282,31 +310,68 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain, goto error; } + /* + * The tracefile_size should not be < to the subbuf_size, otherwise + * we won't be able to write the packets on disk + */ + if ((attr->attr.tracefile_size > 0) && + (attr->attr.tracefile_size < attr->attr.subbuf_size)) { + ret = LTTNG_ERR_INVALID; + goto error; + } + + /* Validate buffer type. */ + switch (type) { + case LTTNG_BUFFER_PER_PID: + break; + case LTTNG_BUFFER_PER_UID: + break; + default: + ret = LTTNG_ERR_BUFFER_NOT_SUPPORTED; + goto error; + } + /* Create UST channel */ - uchan = trace_ust_create_channel(attr, usess->pathname); + uchan = trace_ust_create_channel(attr, LTTNG_DOMAIN_UST); if (uchan == NULL) { ret = LTTNG_ERR_FATAL; goto error; } - uchan->enabled = 1; - switch (domain) { - case LTTNG_DOMAIN_UST: - DBG2("Channel %s being created in UST global domain", uchan->name); + /* + * HACK: Set the channel's subdomain (JUL, Log4j, Python, etc.) + * based on the default name. + */ + if (!strcmp(uchan->name, DEFAULT_JUL_CHANNEL_NAME)) { + uchan->domain = LTTNG_DOMAIN_JUL; + } else if (!strcmp(uchan->name, DEFAULT_LOG4J_CHANNEL_NAME)) { + uchan->domain = LTTNG_DOMAIN_LOG4J; + } else if (!strcmp(uchan->name, DEFAULT_PYTHON_CHANNEL_NAME)) { + uchan->domain = LTTNG_DOMAIN_PYTHON; + } - /* 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 = LTTNG_ERR_UND; + uchan->enabled = 1; + if (trace_ust_is_max_id(usess->used_channel_id)) { + ret = LTTNG_ERR_UST_CHAN_FAIL; + goto error; + } + uchan->id = trace_ust_get_next_chan_id(usess); + + DBG2("Channel %s is being created for UST with buffer %d and id %" PRIu64, + uchan->name, type, uchan->id); + + /* Flag session buffer type. */ + if (!usess->buffer_type_changed) { + usess->buffer_type = type; + usess->buffer_type_changed = 1; + } else if (usess->buffer_type != type) { + /* Buffer type was already set. Refuse to create channel. */ + ret = LTTNG_ERR_BUFFER_TYPE_MISMATCH; goto error_free_chan; } + /* Enable channel for global domain */ + ret = ust_app_create_channel_glb(usess, uchan); if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) { ret = LTTNG_ERR_UST_CHAN_FAIL; goto error_free_chan; @@ -314,7 +379,18 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain, /* Adding the channel to the channel hash table. */ rcu_read_lock(); - lttng_ht_add_unique_str(usess->domain_global.channels, &uchan->node); + if (strncmp(uchan->name, DEFAULT_METADATA_NAME, + sizeof(uchan->name))) { + lttng_ht_add_unique_str(usess->domain_global.channels, &uchan->node); + } else { + /* + * Copy channel attribute to session if this is metadata so if NO + * application exists we can access that data in the shadow copy during + * the global update of newly registered application. + */ + memcpy(&usess->metadata_attr, &uchan->attr, + sizeof(usess->metadata_attr)); + } rcu_read_unlock(); DBG2("Channel %s created successfully", uchan->name); @@ -336,7 +412,7 @@ error: /* * Disable UST channel for session and domain. */ -int channel_ust_disable(struct ltt_ust_session *usess, int domain, +int channel_ust_disable(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan) { int ret = LTTNG_OK; @@ -350,23 +426,9 @@ int channel_ust_disable(struct ltt_ust_session *usess, int domain, goto end; } - /* Get the right channel's hashtable */ - switch (domain) { - case LTTNG_DOMAIN_UST: - DBG2("Channel %s being disabled in UST global domain", uchan->name); - /* 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 = LTTNG_ERR_UND; - goto error; - } - + DBG2("Channel %s being disabled in UST global domain", uchan->name); + /* Disable channel for global domain */ + ret = ust_app_disable_channel_glb(usess, uchan); if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) { ret = LTTNG_ERR_UST_CHAN_DISABLE_FAIL; goto error;