SoW-2019-0002: Dynamic Snapshot

[deliverable/lttng-modules.git] / lttng-probes.c

diff --git a/lttng-probes.c b/lttng-probes.c
index f95391fd0c0c3790c58ada4a82a4f8e43065f82a..24f76f355560bb926438c0fe63908b2750704945 100644 (file)
--- a/lttng-probes.c
+++ b/lttng-probes.c
@@ -124,6 +124,8 @@ void fixup_lazy_probes(void)
        }
        ret = lttng_fix_pending_events();
        WARN_ON_ONCE(ret);
+       ret = lttng_fix_pending_triggers();
+       WARN_ON_ONCE(ret);
        lazy_nesting--;
 }
 
@@ -173,7 +175,7 @@ int lttng_probe_register(struct lttng_probe_desc *desc)
         * the probe immediately, since we cannot delay event
         * registration because they are needed ASAP.
         */
-       if (lttng_session_active())
+       if (lttng_session_active() || lttng_trigger_active())
                fixup_lazy_probes();
 end:
        lttng_unlock_sessions();
@@ -198,7 +200,7 @@ EXPORT_SYMBOL_GPL(lttng_probe_unregister);
  * Called with sessions lock held.
  */
 static
-const struct lttng_event_desc *find_event(const char *name)
+const struct lttng_event_desc *find_event_desc(const char *name)
 {
        struct lttng_probe_desc *probe_desc;
        int i;
@@ -215,28 +217,28 @@ const struct lttng_event_desc *find_event(const char *name)
 /*
  * Called with sessions lock held.
  */
-const struct lttng_event_desc *lttng_event_get(const char *name)
+const struct lttng_event_desc *lttng_event_desc_get(const char *name)
 {
-       const struct lttng_event_desc *event;
+       const struct lttng_event_desc *event_desc;
        int ret;
 
-       event = find_event(name);
-       if (!event)
+       event_desc = find_event_desc(name);
+       if (!event_desc)
                return NULL;
-       ret = try_module_get(event->owner);
+       ret = try_module_get(event_desc->owner);
        WARN_ON_ONCE(!ret);
-       return event;
+       return event_desc;
 }
-EXPORT_SYMBOL_GPL(lttng_event_get);
+EXPORT_SYMBOL_GPL(lttng_event_desc_get);
 
 /*
  * Called with sessions lock held.
  */
-void lttng_event_put(const struct lttng_event_desc *event)
+void lttng_event_desc_put(const struct lttng_event_desc *event_desc)
 {
-       module_put(event->owner);
+       module_put(event_desc->owner);
 }
-EXPORT_SYMBOL_GPL(lttng_event_put);
+EXPORT_SYMBOL_GPL(lttng_event_desc_put);
 
 static
 void *tp_list_start(struct seq_file *m, loff_t *pos)