commit f7741419e9da309a7688e90e92ac7d362d0d4b68
author Hector Dearman <hjd@google.com> Fri Mar 13 15:29:58 2020 +0000
committer Hector Dearman <hjd@google.com> Fri Mar 13 15:29:58 2020 +0000
tree c024c845e2921b3948389ed5021f295cc8acbaec
parent c9ba12998fd210389c57fc46d63ab3ea5a3d7881

ui: Use track name helper for thread tracks

Before: https://screenshot.googleplex.com/mTtMgNfBQC6
After: https://screenshot.googleplex.com/jqNtyingSUH
Change-Id: I66f68f7019f82ac49e1f44aefcae3094c3d03a59

ui/src/controller/trace_controller.ts

diff --git a/ui/src/controller/trace_controller.ts b/ui/src/controller/trace_controller.ts
index 2906d43..996ba33 100644
--- a/ui/src/controller/trace_controller.ts
+++ b/ui/src/controller/trace_controller.ts
@@ -674,7 +674,7 @@
         });
 
         const name =
-            this.getTrackName(utid, processName, pid, threadName, tid, upid);
+            getTrackName({utid, processName, pid, threadName, tid, upid});
         const addTrackGroup = Actions.addTrackGroup({
           engineId: this.engineId,
           summaryTrackId,
@@ -748,7 +748,7 @@
         tracksToAdd.push({
           engineId: this.engineId,
           kind: THREAD_STATE_TRACK_KIND,
-          name: `${threadName} [${tid}]`,
+          name: getTrackName({utid, tid, threadName}),
           trackGroup: pUuid,
           config: {utid}
         });
@@ -758,12 +758,10 @@
         tracksToAdd.push({
           engineId: this.engineId,
           kind: SLICE_TRACK_KIND,
-          name: `${threadName} [${tid}]`,
+          name: getTrackName({utid, tid, threadName}),
           trackGroup: pUuid,
-          config: {
-            maxDepth: threadTrack.maxDepth,
-            trackId: threadTrack.trackId
-          },
+          config:
+              {maxDepth: threadTrack.maxDepth, trackId: threadTrack.trackId},
         });
       }
     }
@@ -945,19 +943,37 @@
       timestamp: Date.now() / 1000,
     }));
   }
+}
 
-  private getTrackName(
-      utid: number, processName: string|null, pid: number|null,
-      threadName: string|null, tid: number|null, upid: number|null) {
-    if (upid !== null && processName !== null && pid !== null) {
-      return `${processName} ${pid}`;
-    } else if (upid !== null && pid !== null) {
-      return `Process ${pid}`;
-    } else if (threadName !== null && tid !== null) {
-      return `${threadName} ${tid}`;
-    } else if (tid !== null) {
-      return `Thread ${tid}`;
-    }
+function getTrackName(args: Partial<{
+  utid: number,
+  processName: string | null,
+  pid: number | null,
+  threadName: string | null,
+  tid: number | null,
+  upid: number | null
+}>) {
+  const {upid, utid, processName, threadName, pid, tid} = args;
+
+  const hasUpid = upid !== undefined && upid !== null;
+  const hasUtid = utid !== undefined && utid !== null;
+  const hasProcessName = processName !== undefined && processName !== null;
+  const hasThreadName = threadName !== undefined && threadName !== null;
+  const hasTid = tid !== undefined && tid !== null;
+  const hasPid = pid !== undefined && pid !== null;
+
+  if (hasUpid && hasPid && hasProcessName) {
+    return `${processName} ${pid}`;
+  } else if (hasUpid && hasPid) {
+    return `Process ${pid}`;
+  } else if (hasThreadName && hasTid) {
+    return `${threadName} ${tid}`;
+  } else if (hasTid) {
+    return `Thread ${tid}`;
+  } else if (hasUpid) {
+    return `upid: ${upid}`;
+  } else if (hasUtid) {
     return `utid: ${utid}`;
   }
+  return 'Unknown';
 }