First stab at tracing thread IDs.

[apitrace] / cli / cli_dump.cpp

diff --git a/cli/cli_dump.cpp b/cli/cli_dump.cpp
index f6c51291af3597e6d5f2067a1c7a2bb401ed491a..adecb22e4abd1d0178f0f25d64a13f8d669756fe 100644 (file)
--- a/cli/cli_dump.cpp
+++ b/cli/cli_dump.cpp
@@ -58,6 +58,7 @@ usage(void)
         "    --colour=<WHEN>     Colored syntax highlighting\n"
         "                        WHEN is 'auto', 'always', or 'never'\n"
         "    --no-arg-names      Don't dump argument names\n"
+        "    --thread-ids        Dump thread ids\n"
     ;
 }
 
@@ -65,6 +66,7 @@ static int
 command(int argc, char *argv[])
 {
     trace::DumpFlags dumpFlags = 0;
+    bool dumpThreadIds = false;
 
     int i;
 
@@ -98,6 +100,8 @@ command(int argc, char *argv[])
             color = COLOR_OPTION_NEVER;
         } else if (!strcmp(arg, "--no-arg-names")) {
             dumpFlags |= trace::DUMP_FLAG_NO_ARG_NAMES;
+        } else if (!strcmp(arg, "--thread-ids")) {
+            dumpThreadIds = true;
         } else {
             std::cerr << "error: unknown option " << arg << "\n";
             usage();
@@ -130,6 +134,9 @@ command(int argc, char *argv[])
         while ((call = p.parse_call())) {
             if (verbose ||
                 !(call->flags & trace::CALL_FLAG_VERBOSE)) {
+                if (dumpThreadIds) {
+                    std::cout << std::hex << call->thread_id << std::dec << " ";
+                }
                 trace::dump(*call, std::cout, dumpFlags);
             }
             delete call;