ret = ustctl_create_session(app->sock);
if (ret < 0) {
ERR("Creating session for app pid %d", app->pid);
+ delete_ust_app_session(-1, ua_sess);
/* This means that the tracer is gone... */
ua_sess = (void*) -1UL;
- goto error;
+ goto end;
}
ua_sess->handle = ret;
end:
health_code_update(&health_thread_cmd);
return ua_sess;
-
-error:
- delete_ust_app_session(-1, ua_sess);
- health_code_update(&health_thread_cmd);
- return NULL;
}
/*
/* Assign second node for deletion */
iter.iter.node = <a->pid_n.node;
+ /*
+ * Ignore return value since the node might have been removed before by an
+ * add replace during app registration because the PID can be reassigned by
+ * the OS.
+ */
ret = lttng_ht_del(ust_app_ht, &iter);
- assert(!ret);
+ if (ret) {
+ DBG3("Unregister app by PID %d failed. This can happen on pid reuse",
+ lta->pid);
+ }
/* Free memory */
call_rcu(<a->pid_n.head, delete_ust_app_rcu);
&uiter)) != -ENOENT) {
health_code_update(&health_thread_cmd);
if (count >= nbmem) {
+ /* In case the realloc fails, we free the memory */
+ void *tmp_ptr = (void *) tmp;
DBG2("Reallocating event list from %zu to %zu entries", nbmem,
2 * nbmem);
nbmem *= 2;
tmp = realloc(tmp, nbmem * sizeof(struct lttng_event));
if (tmp == NULL) {
PERROR("realloc ust app events");
+ free(tmp_ptr);
ret = -ENOMEM;
goto rcu_error;
}
&uiter)) != -ENOENT) {
health_code_update(&health_thread_cmd);
if (count >= nbmem) {
+ /* In case the realloc fails, we free the memory */
+ void *tmp_ptr = (void *) tmp;
DBG2("Reallocating event field list from %zu to %zu entries", nbmem,
2 * nbmem);
nbmem *= 2;
tmp = realloc(tmp, nbmem * sizeof(struct lttng_event_field));
if (tmp == NULL) {
PERROR("realloc ust app event fields");
+ free(tmp_ptr);
ret = -ENOMEM;
goto rcu_error;
}
memcpy(tmp[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN);
tmp[count].type = uiter.type;
- tmp[count].written = uiter.written;
+ tmp[count].nowrite = uiter.nowrite;
memcpy(tmp[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN);
tmp[count].event.loglevel = uiter.loglevel;
void ust_app_clean_list(void)
{
int ret;
+ struct ust_app *app;
struct lttng_ht_iter iter;
- struct lttng_ht_node_ulong *node;
DBG2("UST app cleaning registered apps hash table");
rcu_read_lock();
- cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, node, node) {
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
ret = lttng_ht_del(ust_app_ht, &iter);
assert(!ret);
- call_rcu(&node->head, delete_ust_app_rcu);
+ call_rcu(&app->pid_n.head, delete_ust_app_rcu);
}
/* Cleanup socket hash table */
- cds_lfht_for_each_entry(ust_app_ht_by_sock->ht, &iter.iter, node, node) {
+ cds_lfht_for_each_entry(ust_app_ht_by_sock->ht, &iter.iter, app,
+ sock_n.node) {
ret = lttng_ht_del(ust_app_ht_by_sock, &iter);
assert(!ret);
}
/* Order is important */
cds_list_add_tail(&ustream->list, &ua_chan->streams.head);
ret = snprintf(ustream->name, sizeof(ustream->name), "%s_%u",
- ua_chan->name, ua_chan->streams.count++);
+ ua_chan->name, ua_chan->streams.count);
+ ua_chan->streams.count++;
if (ret < 0) {
PERROR("asprintf UST create stream");
/*
}
ua_sess = create_ust_app_session(usess, app);
- if (ua_sess == NULL) {
+ if (ua_sess == NULL || ua_sess == (void *) -1UL) {
+ /* Tracer is gone for this session and has been freed */
goto error;
}