[xray] Remove usage of procid_t

[aganea]

Summary

I'm doing some refactoring in llvm/Support/Program.h and I've noticed that xray uses sys::procid_t but doesn't really need it (a uint32_t thread id is always stored in that map)

[aganea]

tools/llvm-xray/xray-account.h

80

I also noticed this isn't used - please let me know if you want to keep it.

[aganea]

Ping!

[rnk]

lgtm, the serialized types are uint32_t:

struct alignas(32) XRayRecord {
...
  // The thread ID for the currently running thread.
  uint32_t TId = 0;

  // The ID of process that is currently running
  uint32_t PId = 0;

[aganea]

Thank you! :)

[dberris]

LGTM -- really sorry for the delay here, for some reason I didn't get to this earlier. :(

tools/llvm-xray/xray-account.h

 #include "llvm/XRay/XRayRecord.h"
 
 namespace llvm {
 namespace xray {
 
 class LatencyAccountant {
 public:
   typedef std::map<int32_t, std::vector<uint64_t>> FunctionLatencyMap;
-  typedef std::map<llvm::sys::procid_t, std::pair<uint64_t, uint64_t>>
+  typedef std::map<uint32_t, std::pair<uint64_t, uint64_t>>
       PerThreadMinMaxTSCMap;
   typedef std::map<uint8_t, std::pair<uint64_t, uint64_t>> PerCPUMinMaxTSCMap;
   typedef std::vector<std::pair<int32_t, uint64_t>> FunctionStack;
-  typedef std::map<llvm::sys::procid_t, FunctionStack>
-      PerThreadFunctionStackMap;
+  typedef std::map<uint32_t, FunctionStack> PerThreadFunctionStackMap;
 
 private:
   PerThreadFunctionStackMap PerThreadFunctionStack;
   FunctionLatencyMap FunctionLatencies;
   PerThreadMinMaxTSCMap PerThreadMinMaxTSC;
   PerCPUMinMaxTSCMap PerCPUMinMaxTSC;
   FuncIdConversionHelper &FuncIdHelper;
 
public:
   ///   - An exit record does not match any entry records for the same function.
   ///     If we've been set to deduce sibling calls, we try walking up the stack
   ///     and recording times for the higher level functions.
   ///   - A record has a TSC that's before the latest TSC that has been
   ///     recorded. We still record the TSC for the min-max.
   ///
   bool accountRecord(const XRayRecord &Record);
 
-  const FunctionStack *getThreadFunctionStack(llvm::sys::procid_t TId) const {
-    auto I = PerThreadFunctionStack.find(TId);
-    if (I == PerThreadFunctionStack.end())
-      return nullptr;
-    return &I->second;
-  }
-
   const PerThreadFunctionStackMap &getPerThreadFunctionStack() const {
     return PerThreadFunctionStack;
   }
 
   // Output Functions
   // ================
 
   void exportStatsAsText(raw_ostream &OS, const XRayFileHeader &Header) const;

tools/llvm-xray/xray-graph.h

public:
 
   struct FunctionAttr {
     int32_t FuncId;
     uint64_t TSC;
   };
 
   using FunctionStack = SmallVector<FunctionAttr, 4>;
 
-  using PerThreadFunctionStackMap =
-      DenseMap<llvm::sys::procid_t, FunctionStack>;
+  using PerThreadFunctionStackMap = DenseMap<uint32_t, FunctionStack>;
 
   class GraphT : public Graph<FunctionStats, CallStats, int32_t> {
   public:
     TimeStat GraphEdgeMax = {};
     TimeStat GraphVertexMax = {};
   };
 
   GraphT G;