Update hardcoded loglevels, allow shortcuts, add to lttng.h API

[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 6040d008d09a7b5f55f06dfdb05f7eb42981bf53..69671bd714d1c6854d2303a08e7fe9044a4c5bbc 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -175,15 +175,14 @@ static const char *loglevel_string(int value)
        case 4: return "TRACE_WARNING";
        case 5: return "TRACE_NOTICE";
        case 6: return "TRACE_INFO";
-       case 7: return "TRACE_SYSTEM";
-       case 8: return "TRACE_PROGRAM";
-       case 9: return "TRACE_PROCESS";
-       case 10: return "TRACE_MODULE";
-       case 11: return "TRACE_UNIT";
-       case 12: return "TRACE_FUNCTION";
-       case 13: return "TRACE_DEFAULT";
-       case 14: return "TRACE_VERBOSE";
-       case 15: return "TRACE_DEBUG";
+       case 7: return "TRACE_DEBUG_SYSTEM";
+       case 8: return "TRACE_DEBUG_PROGRAM";
+       case 9: return "TRACE_DEBUG_PROCESS";
+       case 10: return "TRACE_DEBUG_MODULE";
+       case 11: return "TRACE_DEBUG_UNIT";
+       case 12: return "TRACE_DEBUG_FUNCTION";
+       case 13: return "TRACE_DEBUG_LINE";
+       case 14: return "TRACE_DEBUG";
        default: return "<<UNKNOWN>>";
        }
 }
@@ -221,7 +220,7 @@ static void print_events(struct lttng_event *event)
                MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
                break;
        case LTTNG_EVENT_SYSCALL:
-               MSG("%s (type: syscall)%s", indent6,
+               MSG("%ssyscalls (type: syscall)%s", indent6,
                                enabled_string(event->enabled));
                break;
        case LTTNG_EVENT_NOOP:
@@ -604,16 +603,14 @@ int cmd_list(int argc, const char **argv)
        } else if (opt_userspace) {
                DBG2("Listing userspace global domain");
                domain.type = LTTNG_DOMAIN_UST;
-       } else {
-               usage(stderr);
-               ret = CMD_UNDEFINED;
-               goto end;
        }
 
-       handle = lttng_create_handle(session_name, &domain);
-       if (handle == NULL) {
-               ret = CMD_FATAL;
-               goto end;
+       if (opt_kernel || opt_userspace) {
+               handle = lttng_create_handle(session_name, &domain);
+               if (handle == NULL) {
+                       ret = CMD_FATAL;
+                       goto end;
+               }
        }
 
        if (session_name == NULL) {
@@ -676,7 +673,9 @@ int cmd_list(int argc, const char **argv)
                                }
 
                                /* Clean handle before creating a new one */
-                               lttng_destroy_handle(handle);
+                               if (handle) {
+                                       lttng_destroy_handle(handle);
+                               }
 
                                handle = lttng_create_handle(session_name, &domains[i]);
                                if (handle == NULL) {
@@ -696,7 +695,9 @@ end:
        if (domains) {
                free(domains);
        }
-       lttng_destroy_handle(handle);
+       if (handle) {
+               lttng_destroy_handle(handle);
+       }
 
        poptFreeContext(pc);
        return ret;