Fix: define _LGPL_SOURCE in C files

[lttng-tools.git] / src / bin / lttng / commands / list.c

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 62ed042f999cd43768fd3e5f147cdce20f508efe..f69d34db99aab59b115cf3c6cdf9b77f2a3a9252 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <inttypes.h>
 #include <popt.h>
 #include <stdio.h>
@@ -31,6 +32,7 @@ static int opt_userspace;
 static int opt_kernel;
 static int opt_jul;
 static int opt_log4j;
+static int opt_python;
 static char *opt_channel;
 static int opt_domain;
 static int opt_fields;
@@ -60,6 +62,7 @@ static struct poptOption long_options[] = {
        {"kernel",    'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
        {"jul",       'j', POPT_ARG_VAL, &opt_jul, 1, 0, 0},
        {"log4j",     'l', POPT_ARG_VAL, &opt_log4j, 1, 0, 0},
+       {"python",    'p', POPT_ARG_VAL, &opt_python, 1, 0, 0},
 #if 0
        /* Not implemented yet */
        {"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
@@ -92,6 +95,8 @@ static void usage(FILE *ofp)
        fprintf(ofp, "  -k, --kernel            Select kernel domain\n");
        fprintf(ofp, "  -u, --userspace         Select user-space domain.\n");
        fprintf(ofp, "  -j, --jul               Apply for Java application using JUL\n");
+       fprintf(ofp, "  -l, --log4j             Apply for Java application using LOG4J\n");
+       fprintf(ofp, "  -p, --python            Apply for Python application using logging\n");
        fprintf(ofp, "  -f, --fields            List event fields.\n");
        fprintf(ofp, "      --syscall           List available system calls.\n");
 #if 0
@@ -233,7 +238,7 @@ static void print_events(struct lttng_event *event)
                                indent6,
                                event->name,
                                logleveltype_string(event->loglevel_type),
-                               mi_lttng_loglevel_string(event->loglevel),
+                               mi_lttng_loglevel_string(event->loglevel, handle->domain.type),
                                event->loglevel,
                                enabled_string(event->enabled),
                                exclusion_string(event->exclusion),
@@ -390,7 +395,7 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
                }
 
                /* Write an event */
-               ret = mi_lttng_event(writer, &events[i], 0);
+               ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
                if (ret) {
                        goto end;
                }
@@ -426,6 +431,8 @@ static int list_agent_events(void)
                domain.type = LTTNG_DOMAIN_JUL;
        } else if (opt_log4j) {
                domain.type = LTTNG_DOMAIN_LOG4J;
+       } else if (opt_python) {
+               domain.type = LTTNG_DOMAIN_PYTHON;
        }
 
        agent_domain_str = get_domain_str(domain.type);
@@ -640,7 +647,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 
                        if (!event_element_open) {
                                /* Open and write the event */
-                               ret = mi_lttng_event(writer, &cur_event, 1);
+                               ret = mi_lttng_event(writer, &cur_event, 1,
+                                               handle->domain.type);
                                if (ret) {
                                        goto end;
                                }
@@ -778,7 +786,7 @@ static int mi_list_kernel_events(struct lttng_event *events, int count,
        }
 
        for (i = 0; i < count; i++) {
-               ret = mi_lttng_event(writer, &events[i], 0);
+               ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
                if (ret) {
                        goto end;
                }
@@ -866,7 +874,7 @@ static int mi_list_syscalls(struct lttng_event *events, int count)
        }
 
        for (i = 0; i < count; i++) {
-               ret = mi_lttng_event(writer, &events[i], 0);
+               ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
                if (ret) {
                        goto end;
                }
@@ -939,7 +947,7 @@ static int mi_list_session_agent_events(struct lttng_event *events, int count)
        }
 
        for (i = 0; i < count; i++) {
-               ret = mi_lttng_event(writer, &events[i], 0);
+               ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
                if (ret) {
                        goto end;
                }
@@ -988,7 +996,8 @@ static int list_session_agent_events(void)
                        MSG("%s- %s%s (loglevel%s %s)", indent4, events[i].name,
                                        enabled_string(events[i].enabled),
                                        logleveltype_string(events[i].loglevel_type),
-                                       mi_lttng_loglevel_string(events[i].loglevel));
+                                       mi_lttng_loglevel_string(events[i].loglevel,
+                                               handle->domain.type));
                }
 
                MSG("");
@@ -1015,7 +1024,7 @@ static int mi_list_events(struct lttng_event *events, int count)
        }
 
        for (i = 0; i < count; i++) {
-               ret = mi_lttng_event(writer, &events[i], 0);
+               ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
                if (ret) {
                        goto end;
                }
@@ -1199,7 +1208,7 @@ static int list_channels(const char *channel_name)
                }
        } else {
                /* Pretty print */
-               if (channel_name == NULL) {
+               if (count) {
                        MSG("Channels:\n-------------");
                }
 
@@ -1466,6 +1475,9 @@ static int list_domains(const char *session_name)
                        case LTTNG_DOMAIN_LOG4J:
                                MSG("  - LOG4j (Logging for Java)");
                                break;
+                       case LTTNG_DOMAIN_PYTHON:
+                               MSG("  - Python (logging)");
+                               break;
                        default:
                                break;
                        }
@@ -1558,6 +1570,8 @@ int cmd_list(int argc, const char **argv)
                domain.type = LTTNG_DOMAIN_JUL;
        } else if (opt_log4j) {
                domain.type = LTTNG_DOMAIN_LOG4J;
+       } else if (opt_python) {
+               domain.type = LTTNG_DOMAIN_PYTHON;
        }
 
        if (!opt_kernel && opt_syscall) {
@@ -1566,7 +1580,7 @@ int cmd_list(int argc, const char **argv)
                goto end;
        }
 
-       if (opt_kernel || opt_userspace || opt_jul || opt_log4j) {
+       if (opt_kernel || opt_userspace || opt_jul || opt_log4j || opt_python) {
                handle = lttng_create_handle(session_name, &domain);
                if (handle == NULL) {
                        ret = CMD_FATAL;
@@ -1575,7 +1589,8 @@ int cmd_list(int argc, const char **argv)
        }
 
        if (session_name == NULL) {
-               if (!opt_kernel && !opt_userspace && !opt_jul && !opt_log4j) {
+               if (!opt_kernel && !opt_userspace && !opt_jul && !opt_log4j
+                               && !opt_python) {
                        ret = list_sessions(NULL);
                        if (ret) {
                                goto end;
@@ -1604,7 +1619,7 @@ int cmd_list(int argc, const char **argv)
                                goto end;
                        }
                }
-               if (opt_jul || opt_log4j) {
+               if (opt_jul || opt_log4j || opt_python) {
                        ret = list_agent_events();
                        if (ret) {
                                goto end;
@@ -1702,6 +1717,9 @@ int cmd_list(int argc, const char **argv)
                                case LTTNG_DOMAIN_LOG4J:
                                        MSG("=== Domain: LOG4j (Logging for Java) ===\n");
                                        break;
+                               case LTTNG_DOMAIN_PYTHON:
+                                       MSG("=== Domain: Python (logging) ===\n");
+                                       break;
                                default:
                                        MSG("=== Domain: Unimplemented ===\n");
                                        break;
@@ -1727,7 +1745,8 @@ int cmd_list(int argc, const char **argv)
                                }
 
                                if (domains[i].type == LTTNG_DOMAIN_JUL ||
-                                               domains[i].type == LTTNG_DOMAIN_LOG4J) {
+                                               domains[i].type == LTTNG_DOMAIN_LOG4J ||
+                                               domains[i].type == LTTNG_DOMAIN_PYTHON) {
                                        ret = list_session_agent_events();
                                        if (ret) {
                                                goto end;