hiperf_txt_parser 1.0.10 → 1.0.11

package/dist/traceFormat.js

@@ -292,8 +292,7 @@ function formatArgBySpecifier(value, spec) {
 }
 function renderPrintFmt(printFmt, printArgs, fieldMap) {
     const values = [];
-    function evalExpr(exprRaw) {
-        // 允许表达式带括号与空格
+    function normalizeExpr(exprRaw) {
         let expr = exprRaw.trim();
         // 去掉外层括号（可能不止一层，也可能只有一侧被 match 捕获到）
         while (expr.startsWith("("))
@@ -301,6 +300,11 @@ function renderPrintFmt(printFmt, printArgs, fieldMap) {
         while (expr.endsWith(")"))
             expr = expr.slice(0, -1).trim();
         expr = expr.replace(/\s+/g, "");
+        return expr;
+    }
+    function evalExpr(exprRaw) {
+        // 允许表达式带括号与空格
+        const expr = normalizeExpr(exprRaw);
         // (REC->__data_loc_reason&0xffff) / (REC->__data_loc_reason>>16)
         let m = expr.match(/^REC->(\w+)&0xffff$/);
         if (m) {
@@ -332,12 +336,25 @@ function renderPrintFmt(printFmt, printArgs, fieldMap) {
             return v[0] ?? 0;
         return v ?? 0;
     }
+    const normalizedArgs = (printArgs ?? []).map(normalizeExpr);
     for (const expr of printArgs ?? []) {
         values.push(evalExpr(expr));
     }
     let valueIdx = 0;
     return printFmt.replace(/%[0-9]*[lh]*([duxXsS])/g, (_all, spec) => {
-        const v = values[valueIdx++] ?? 0;
+        const idx = valueIdx++;
+        const v = values[idx] ?? 0;
+        const argExpr = normalizedArgs[idx] ?? "";
+        // %s + REC->__data_loc_xxx 时，优先打印已解析出来的 xxx 字符串
+        if (spec.toLowerCase() === "s") {
+            const m = argExpr.match(/^REC->__data_loc_(\w+)$/);
+            if (m) {
+                const s = fieldMap[m[1]];
+                if (typeof s === "string") {
+                    return s;
+                }
+            }
+        }
         return formatArgBySpecifier(v, spec);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hiperf_txt_parser",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Parse perf data.txt and output structured TypeScript data",
   "type": "module",
   "main": "dist/index.js",