Support unloading of probe providers

[lttng-ust.git] / liblttng-ust / lttng-probes.c

diff --git a/liblttng-ust/lttng-probes.c b/liblttng-ust/lttng-probes.c
index 433171cfb04635c424394a9e2c292f82a70a8ae4..862b19e7c47e3c7c5b5e262e5b1bc02edf3c090f 100644 (file)
--- a/liblttng-ust/lttng-probes.c
+++ b/liblttng-ust/lttng-probes.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include <string.h>
 #include <errno.h>
 #include <urcu/list.h>
@@ -146,20 +147,6 @@ struct cds_list_head *lttng_get_probe_list_head(void)
        return &_probe_list;
 }
 
-static
-const struct lttng_probe_desc *find_provider(const char *provider)
-{
-       struct lttng_probe_desc *iter;
-       struct cds_list_head *probe_list;
-
-       probe_list = lttng_get_probe_list_head();
-       cds_list_for_each_entry(iter, probe_list, head) {
-               if (!strcmp(iter->provider, provider))
-                       return iter;
-       }
-       return NULL;
-}
-
 static
 int check_provider_version(struct lttng_probe_desc *desc)
 {
@@ -194,6 +181,8 @@ int lttng_probe_register(struct lttng_probe_desc *desc)
 {
        int ret = 0;
 
+       lttng_ust_fixup_tls();
+
        /*
         * If version mismatch, don't register, but don't trigger assert
         * on caller. The version check just prints an error.
@@ -201,15 +190,8 @@ int lttng_probe_register(struct lttng_probe_desc *desc)
        if (!check_provider_version(desc))
                return 0;
 
-       ust_lock();
+       ust_lock_nocheck();
 
-       /*
-        * Check if the provider has already been registered.
-        */
-       if (find_provider(desc->provider)) {
-               ret = -EEXIST;
-               goto end;
-       }
        cds_list_add(&desc->lazy_init_head, &lazy_probe_init);
        desc->lazy = 1;
        DBG("adding probe %s containing %u events to lazy registration list",
@@ -221,7 +203,7 @@ int lttng_probe_register(struct lttng_probe_desc *desc)
         */
        if (lttng_session_active())
                fixup_lazy_probes();
-end:
+
        ust_unlock();
        return ret;
 }
@@ -234,15 +216,20 @@ int ltt_probe_register(struct lttng_probe_desc *desc)
 
 void lttng_probe_unregister(struct lttng_probe_desc *desc)
 {
+       lttng_ust_fixup_tls();
+
        if (!check_provider_version(desc))
                return;
 
-       ust_lock();
+       ust_lock_nocheck();
        if (!desc->lazy)
                cds_list_del(&desc->head);
        else
                cds_list_del(&desc->lazy_init_head);
-       DBG("just unregistered probe %s", desc->provider);
+
+       lttng_probe_provider_unregister_events(desc);
+       DBG("just unregistered probes of provider %s", desc->provider);
+
        ust_unlock();
 }