Fix: don't ask data pending if session was not started

[lttng-tools.git] / src / bin / lttng-sessiond / jul.h

diff --git a/src/bin/lttng-sessiond/jul.h b/src/bin/lttng-sessiond/jul.h
index 72ca91c72bc52699aa4d413fac7cb7faad88087a..55c9e18c758cdd3beb59bb9b9210dc626987593d 100644 (file)
--- a/src/bin/lttng-sessiond/jul.h
+++ b/src/bin/lttng-sessiond/jul.h
@@ -30,6 +30,11 @@
  */
 struct lttng_ht *jul_apps_ht_by_sock;
 
+struct jul_ht_key {
+       const char *name;
+       enum lttng_loglevel_jul loglevel;
+};
+
 /*
  * Registration message payload from a JUL application. The PID is used to find
  * back the corresponding UST app object so both socket can be linked.
@@ -54,14 +59,6 @@ struct jul_app {
         */
        struct lttcomm_sock *sock;
 
-       /*
-        * Associated UST app. socket. To get a reference to the ust application
-        * object corresponding to that socket, a lookup MUST be done each time
-        * since there is important synchronization issue for the lockless hash
-        * table shared accross multiple threads.
-        */
-       int ust_app_sock;
-
        /* Initialized with the JUL sock value. */
        struct lttng_ht_node_ulong node;
 };
@@ -75,6 +72,8 @@ struct jul_event {
         * the JUL API.
         */
        char name[LTTNG_SYMBOL_NAME_LEN];
+       enum lttng_loglevel_jul loglevel;
+       enum lttng_loglevel_type loglevel_type;
 
        /*
         * Tells if the event is enabled or not on the JUL Agent.
@@ -115,7 +114,10 @@ void jul_destroy_domain(struct jul_domain *dom);
 /* JUL event API. */
 struct jul_event *jul_create_event(const char *name);
 void jul_add_event(struct jul_event *event, struct jul_domain *dom);
-struct jul_event *jul_find_by_name(const char *name, struct jul_domain *dom);
+struct jul_event *jul_find_event(const char *name,
+               enum lttng_loglevel_jul loglevel, struct jul_domain *dom);
+struct jul_event *jul_find_event_by_name(const char *name,
+               struct jul_domain *dom);
 void jul_delete_event(struct jul_event *event, struct jul_domain *dom);
 void jul_destroy_event(struct jul_event *event);
 
@@ -124,9 +126,8 @@ struct jul_app *jul_create_app(pid_t pid, struct lttcomm_sock *sock);
 void jul_add_app(struct jul_app *app);
 void jul_delete_app(struct jul_app *app);
 struct jul_app *jul_find_app_by_sock(int sock);
-void jul_attach_app(struct jul_app *japp);
-void jul_detach_app(struct jul_app *app);
 void jul_destroy_app(struct jul_app *app);
+int jul_send_registration_done(struct jul_app *app);
 
 /* JUL action API */
 int jul_enable_event(struct jul_event *event);