#include <lttng/lttng.h>
#include "ust-registry.h"
+#include "utils.h"
/*
* Hash table match function for event in the registry.
/*
* We need to execute ht_destroy outside of RCU read-side critical
- * section, so we postpone its execution using call_rcu. It is simpler
- * than to change the semantic of the many callers of
- * destroy_channel().
+ * section and outside of call_rcu thread, so we postpone its execution
+ * using ht_cleanup_push. It is simpler than to change the semantic of
+ * the many callers of delete_ust_app_session().
*/
static
void destroy_channel_rcu(struct rcu_head *head)
struct ust_registry_channel *chan =
caa_container_of(head, struct ust_registry_channel, rcu_head);
- lttng_ht_destroy(chan->ht);
+ if (chan->ht) {
+ ht_cleanup_push(chan->ht);
+ }
free(chan);
}
if (!chan) {
PERROR("zmalloc ust registry channel");
ret = -ENOMEM;
- goto error;
+ goto error_alloc;
}
chan->ht = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
lttng_ht_add_unique_u64(session->channels, &chan->node);
rcu_read_unlock();
+ return 0;
+
error:
+ destroy_channel(chan);
+error_alloc:
return ret;
}
session = zmalloc(sizeof(*session));
if (!session) {
PERROR("zmalloc ust registry session");
- goto error;
+ goto error_alloc;
}
pthread_mutex_init(&session->lock, NULL);
return 0;
error:
+ ust_registry_session_destroy(session);
+error_alloc:
return -1;
}
}
rcu_read_unlock();
- lttng_ht_destroy(reg->channels);
+ if (reg->channels) {
+ ht_cleanup_push(reg->channels);
+ }
free(reg->metadata);
}