Add gid to registration

[lttng-ust.git] / libust / ltt-events.c

diff --git a/libust/ltt-events.c b/libust/ltt-events.c
index 8f9b7ed26410248176ec6174ce5101790bb3be23..94d57c3372b5c7b7a58a43899c0c658272c0c35f 100644 (file)
--- a/libust/ltt-events.c
+++ b/libust/ltt-events.c
@@ -50,10 +50,10 @@ struct ltt_session *ltt_session_create(void)
 {
        struct ltt_session *session;
 
-       pthread_mutex_lock(&sessions_mutex);
        session = zmalloc(sizeof(struct ltt_session));
        if (!session)
                return NULL;
+       pthread_mutex_lock(&sessions_mutex);
        CDS_INIT_LIST_HEAD(&session->chan);
        CDS_INIT_LIST_HEAD(&session->events);
        uuid_generate(session->uuid);
@@ -402,7 +402,7 @@ int lttng_metadata_printf(struct ltt_session *session,
                                ret != -ENOBUFS || !ret;
                        }),
                        LTTNG_METADATA_TIMEOUT_MSEC);
-               if (!waitret || waitret == -EINTR || ret) {
+               if (waitret == -ETIMEDOUT || waitret == -EINTR || ret) {
                        DBG("LTTng: Failure to write metadata to buffers (%s)\n",
                                waitret == -EINTR ? "interrupted" :
                                        (ret == -ENOBUFS ? "timeout" : "I/O error"));
@@ -870,8 +870,7 @@ void ltt_transport_unregister(struct ltt_transport *transport)
        pthread_mutex_unlock(&sessions_mutex);
 }
 
-static
-void __attribute__((destructor)) ltt_events_exit(void)
+void ltt_events_exit(void)
 {
        struct ltt_session *session, *tmpsession;