Fix: define _LGPL_SOURCE in C files

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

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 2a1bfb5f4670110e24ffab931f085dac4ed57f0c..41b8502cfee8aeaab2c46e97d0b18a21e43bbdb1 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <inttypes.h>
 #include <urcu/list.h>
@@ -1138,6 +1139,7 @@ int cmd_disable_event(struct ltt_session *session, int domain,
        }
        case LTTNG_DOMAIN_LOG4J:
        case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_PYTHON:
        {
                struct agent *agt;
                struct ltt_ust_session *usess = session->ust_session;
@@ -1542,6 +1544,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
        }
        case LTTNG_DOMAIN_LOG4J:
        case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_PYTHON:
        {
                const char *default_event_name, *default_chan_name;
                struct agent *agt;
@@ -1581,10 +1584,19 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                memcpy(&tmp_dom, domain, sizeof(tmp_dom));
                tmp_dom.type = LTTNG_DOMAIN_UST;
 
-               if (domain->type == LTTNG_DOMAIN_LOG4J) {
+               switch (domain->type) {
+               case LTTNG_DOMAIN_LOG4J:
                        default_chan_name = DEFAULT_LOG4J_CHANNEL_NAME;
-               } else {
+                       break;
+               case LTTNG_DOMAIN_JUL:
                        default_chan_name = DEFAULT_JUL_CHANNEL_NAME;
+                       break;
+               case LTTNG_DOMAIN_PYTHON:
+                       default_chan_name = DEFAULT_PYTHON_CHANNEL_NAME;
+                       break;
+               default:
+                       /* The switch/case we are in should avoid this else big problem */
+                       assert(0);
                }
 
                ret = cmd_enable_event(session, &tmp_dom, (char *) default_chan_name,
@@ -1756,6 +1768,7 @@ ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events)
                break;
        case LTTNG_DOMAIN_LOG4J:
        case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_PYTHON:
                nb_events = agent_list_events(events, domain);
                if (nb_events < 0) {
                        ret = LTTNG_ERR_UST_LIST_FAIL;
@@ -1836,7 +1849,9 @@ int cmd_start_trace(struct ltt_session *session)
         * possible to enable channel thus inform the client.
         */
        if (usess && usess->domain_global.channels) {
+               rcu_read_lock();
                nb_chan += lttng_ht_get_count(usess->domain_global.channels);
+               rcu_read_unlock();
        }
        if (ksession) {
                nb_chan += ksession->channel_count;
@@ -2376,6 +2391,10 @@ ssize_t cmd_list_domains(struct ltt_session *session,
                }
        }
 
+       if (!nb_dom) {
+               goto end;
+       }
+
        *domains = zmalloc(nb_dom * sizeof(struct lttng_domain));
        if (*domains == NULL) {
                ret = LTTNG_ERR_FATAL;
@@ -2401,7 +2420,7 @@ ssize_t cmd_list_domains(struct ltt_session *session,
                        }
                }
        }
-
+end:
        return nb_dom;
 
 error:
@@ -2435,12 +2454,12 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
                                        session->ust_session->domain_global.channels);
                }
                DBG3("Number of UST global channels %zd", nb_chan);
-               if (nb_chan <= 0) {
+               if (nb_chan < 0) {
                        ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+                       goto error;
                }
                break;
        default:
-               *channels = NULL;
                ret = LTTNG_ERR_UND;
                goto error;
        }
@@ -2453,10 +2472,6 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
                }
 
                list_lttng_channels(domain, session, *channels);
-       } else {
-               *channels = NULL;
-               /* Ret value was set in the domain switch case */
-               goto error;
        }
 
        return nb_chan;
@@ -2492,6 +2507,7 @@ ssize_t cmd_list_events(int domain, struct ltt_session *session,
        }
        case LTTNG_DOMAIN_LOG4J:
        case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_PYTHON:
                if (session->ust_session) {
                        struct lttng_ht_iter iter;
                        struct agent *agt;