pcm-raw: improve format print for registers

Author: rdementi

src/pcm-raw.cpp

@@ -1225,40 +1225,42 @@ const char * getTypeString(uint64 typeID)
 std::string getMSREventString(const uint64 & index, const std::string & type, const PCM::MSRType & msrType)
 {
     std::stringstream c;
-    c << type << ":0x" << std::hex << index << ":" << getTypeString(msrType);
+    c << type << "/MSR 0x" << std::hex << index << "/" << getTypeString(msrType);
     return c.str();
 }
 
 std::string getPCICFGEventString(const PCM::RawEventEncoding & eventEnc, const std::string& type)
 {
     std::stringstream c;
-    c << type << ":0x" << std::hex << eventEnc[PCM::PCICFGEventPosition::deviceID] << ":0x" << eventEnc[PCM::PCICFGEventPosition::offset] << ":0x" << eventEnc[PCM::PCICFGEventPosition::width] << ":"
+    c << type << "/deviceID 0x" << std::hex << eventEnc[PCM::PCICFGEventPosition::deviceID]
+              << "/offset 0x" << eventEnc[PCM::PCICFGEventPosition::offset]
+              << "/width 0x" << eventEnc[PCM::PCICFGEventPosition::width] << "/"
         << getTypeString(eventEnc[PCM::PCICFGEventPosition::type]);
     return c.str();
 }
 
 std::string getMMIOEventString(const PCM::RawEventEncoding& eventEnc, const std::string& type)
 {
     std::stringstream c;
-    c << type << ":0x" << std::hex <<
+    c << type << "/deviceID 0x" << std::hex <<
                           eventEnc[PCM::MMIOEventPosition::deviceID] <<
-                 ":0x" << eventEnc[PCM::MMIOEventPosition::offset] <<
-                 ":0x" << eventEnc[PCM::MMIOEventPosition::membar_bits1] <<
-                 ":0x" << eventEnc[PCM::MMIOEventPosition::membar_bits2] <<
-                 ":0x" << eventEnc[PCM::MMIOEventPosition::width] <<
-                 ":" << getTypeString(eventEnc[PCM::MMIOEventPosition::type]);
+                 "/offset 0x" << eventEnc[PCM::MMIOEventPosition::offset] <<
+                 "/membar_bits1 0x" << eventEnc[PCM::MMIOEventPosition::membar_bits1] <<
+                 "/membar_bits2 0x" << eventEnc[PCM::MMIOEventPosition::membar_bits2] <<
+                 "/width 0x" << eventEnc[PCM::MMIOEventPosition::width] <<
+                 "/" << getTypeString(eventEnc[PCM::MMIOEventPosition::type]);
     return c.str();
 }
 
 std::string getPMTEventString(const PCM::RawEventEncoding& eventEnc, const std::string& type)
 {
     std::stringstream c;
-    c << type << ":0x" << std::hex <<
+    c << type << "/UID 0x" << std::hex <<
                           eventEnc[PCM::PMTEventPosition::UID] <<
-                 ":0x" << eventEnc[PCM::PMTEventPosition::offset] <<
-                 ":0x" << eventEnc[PCM::PMTEventPosition::lsb] <<
-                 ":0x" << eventEnc[PCM::PMTEventPosition::msb] <<
-                 ":" << getTypeString(eventEnc[PCM::PMTEventPosition::type]);
+                 "/offset 0x" << eventEnc[PCM::PMTEventPosition::offset] <<
+                 "/lsb 0x" << eventEnc[PCM::PMTEventPosition::lsb] <<
+                 "/msb 0x" << eventEnc[PCM::PMTEventPosition::msb] <<
+                 "/" << getTypeString(eventEnc[PCM::PMTEventPosition::type]);
     return c.str();
 }