Fix: sessiond: bad fd used while rotating exiting app's buffers

[lttng-tools.git] / src / bin / lttng-sessiond / manage-apps.c

diff --git a/src/bin/lttng-sessiond/manage-apps.c b/src/bin/lttng-sessiond/manage-apps.c
index b5b77d896573a8dcdcd1c2269baf19d64573f6ab..6ddf63bdfa6cb4b066bf60d9d27d67824c750ab1 100644 (file)
--- a/src/bin/lttng-sessiond/manage-apps.c
+++ b/src/bin/lttng-sessiond/manage-apps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -54,7 +54,7 @@ static void *thread_application_management(void *data)
        rcu_register_thread();
        rcu_thread_online();
 
-       health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_MANAGE);
+       health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_APP_MANAGE);
 
        if (testpoint(sessiond_thread_manage_apps)) {
                goto error_testpoint;
@@ -163,7 +163,7 @@ static void *thread_application_management(void *data)
                                        }
 
                                        /* Socket closed on remote end. */
-                                       ust_app_unregister(pollfd);
+                                       ust_app_unregister_by_socket(pollfd);
                                } else {
                                        ERR("Unexpected poll events %u for sock %d", revents, pollfd);
                                        goto error;
@@ -190,7 +190,7 @@ error_testpoint:
                health_error();
                ERR("Health error occurred in %s", __func__);
        }
-       health_unregister(health_sessiond);
+       health_unregister(the_health_sessiond);
        DBG("Application communication apps thread cleanup complete");
        rcu_thread_offline();
        rcu_unregister_thread();