Bug 918581 - Extend merge-profile.py to support secondary threads. r=vlad

--HG--
extra : rebase_source : 28357bbb17b15c7cb40c53ee3442bc6366fcf015

tools/profiler/merge-profiles.py

@@ -36,8 +36,8 @@ def MergeProfiles(files):
             minStartTime = min(minStartTime, fileData['profileJSON']['meta']['startTime'])
             meta['startTime'] = minStartTime
 
-        thread = fileData['profileJSON']['threads'][0]
-        thread['name'] = pname + " (" + pid + ")"
+        for thread in fileData['profileJSON']['threads']:
+            thread['name'] = thread['name'] + " (" + pname + ":" + pid + ")"
             threads.append(thread)
 
             # Note that pid + sym, pid + location could be ambigious
@@ -56,7 +56,7 @@ def MergeProfiles(files):
         for sym in filesyms.keys():
             symTable[pidStr + sym] = filesyms[sym]
 
-    # For each process, make the time offsets line up based on the
+    # For each thread, make the time offsets line up based on the
     # earliest start
     for thread in threads:
         delta = thread['startTime'] - minStartTime