Fix: add missing JUL loglevel handling

[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 4aa0ef144dbbb78f33fb8aa07f095cb30f02fb04..1bcd5ef795edb190af64aa635ce7c0b12177cdc9 100644 (file)
--- a/src/bin/lttng-sessiond/jul.h
+++ b/src/bin/lttng-sessiond/jul.h
@@ -15,8 +15,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef _JUL_H
-#define _JUL_H
+#ifndef LTTNG_SESSIOND_JUL_H
+#define LTTNG_SESSIOND_JUL_H
 
 #define _GNU_SOURCE
 #include <inttypes.h>
@@ -54,14 +54,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 +67,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.
@@ -124,8 +118,6 @@ 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);
 
 /* JUL action API */
@@ -134,4 +126,4 @@ int jul_disable_event(struct jul_event *event);
 void jul_update(struct jul_domain *domain, int sock);
 int jul_list_events(struct lttng_event **events);
 
-#endif /* _JUL_H */
+#endif /* LTTNG_SESSIOND_JUL_H */