hiperf_txt_parser 1.0.7 → 1.0.9

package/dist/traceFormat.d.ts

@@ -41,7 +41,7 @@ export declare function parseCommonFieldsFromRaw(raw: Uint8Array, format: Parsed
 /**
  * 解析 format 中全部字段（含数组），数组字段名会去掉 []，如 args[6] => args: [...]
  */
-export declare function parseAllFieldsFromRaw(raw: Uint8Array, format: ParsedTraceFormat): Record<string, number | bigint | Array<number | bigint>>;
+export declare function parseAllFieldsFromRaw(raw: Uint8Array, format: ParsedTraceFormat): Record<string, number | bigint | string | Array<number | bigint>>;
 /**
  * 将 perf 文本里 raw 段的 hex 行拼成连续字节（小端：每行一个数值，宽度由 hex 位数决定，4→2 字节，8→4 字节，16→8 字节）
  */

package/dist/traceFormat.js

@@ -163,9 +163,38 @@ export function parseCommonFieldsFromRaw(raw, format) {
 export function parseAllFieldsFromRaw(raw, format) {
     const view = new DataView(raw.buffer, raw.byteOffset, raw.byteLength);
     const out = {};
+    const decoder = new TextDecoder("utf-8", { fatal: false });
     for (const field of format.fields) {
         const arr = parseArrayName(field.name);
         const key = arr ? arr.baseName : field.name;
+        const t = normalizeType(field.typeName);
+        // __data_loc char[] reason: 实际存一个 u32，低 16 位为 offset，高 16 位为 length
+        if (t.includes("__data_loc") && t.includes("char")) {
+            const locField = {
+                ...field,
+                typeName: "unsigned int",
+                signed: false,
+                size: 4,
+            };
+            const loc = readFieldScalar(view, locField);
+            if (typeof loc === "number") {
+                const locKey = `__data_loc_${field.name}`;
+                out[locKey] = loc;
+                const offset = loc & 0xffff;
+                const len = (loc >>> 16) & 0xffff;
+                if (offset >= 0 && len > 0 && offset + len <= raw.length) {
+                    const bytes = raw.slice(offset, offset + len);
+                    // 去掉末尾 \0
+                    const nul = bytes.indexOf(0);
+                    const slice = nul >= 0 ? bytes.slice(0, nul) : bytes;
+                    out[field.name] = decoder.decode(slice);
+                }
+                else {
+                    out[field.name] = "";
+                }
+            }
+            continue;
+        }
         const v = readFieldValue(view, field);
         if (v !== undefined) {
             out[key] = v;
@@ -211,6 +240,9 @@ export function buildTraceParserRegistry(formatTexts) {
     return { byEventId, commonFormat };
 }
 function formatArgBySpecifier(value, spec) {
+    if (spec.toLowerCase() === "s") {
+        return typeof value === "string" ? value : String(value);
+    }
     const isBig = typeof value === "bigint";
     const lower = spec.toLowerCase();
     if (lower === "x") {
@@ -225,36 +257,51 @@ function formatArgBySpecifier(value, spec) {
 }
 function renderPrintFmt(printFmt, printArgs, fieldMap) {
     const values = [];
-    for (const expr of printArgs ?? []) {
-        const em = expr.match(/^REC->(\w+)(?:\[(\d+)])?$/);
-        if (!em) {
-            values.push(0);
-            continue;
+    function evalExpr(exprRaw) {
+        // 允许表达式带括号与空格
+        let expr = exprRaw.trim();
+        // 去掉外层括号（可能不止一层，也可能只有一侧被 match 捕获到）
+        while (expr.startsWith("("))
+            expr = expr.slice(1).trim();
+        while (expr.endsWith(")"))
+            expr = expr.slice(0, -1).trim();
+        expr = expr.replace(/\s+/g, "");
+        // (REC->__data_loc_reason&0xffff) / (REC->__data_loc_reason>>16)
+        let m = expr.match(/^REC->(\w+)&0xffff$/);
+        if (m) {
+            const v = fieldMap[m[1]];
+            const n = typeof v === "number" ? v : 0;
+            return n & 0xffff;
+        }
+        m = expr.match(/^REC->(\w+)>>16$/);
+        if (m) {
+            const v = fieldMap[m[1]];
+            const n = typeof v === "number" ? v : 0;
+            return (n >>> 16) & 0xffff;
         }
-        const name = em[1];
-        const idxRaw = em[2];
+        // REC->field 或 REC->field[idx]
+        m = expr.match(/^REC->(\w+)(?:\[(\d+)])?$/);
+        if (!m)
+            return 0;
+        const name = m[1];
+        const idxRaw = m[2];
         const v = fieldMap[name];
         if (idxRaw !== undefined) {
             const idx = parseInt(idxRaw, 10);
             if (Array.isArray(v) && idx >= 0 && idx < v.length) {
-                values.push(v[idx]);
+                return v[idx];
             }
-            else {
-                values.push(0);
-            }
-        }
-        else if (Array.isArray(v)) {
-            values.push(v[0] ?? 0);
-        }
-        else if (v !== undefined) {
-            values.push(v);
-        }
-        else {
-            values.push(0);
+            return 0;
         }
+        if (Array.isArray(v))
+            return v[0] ?? 0;
+        return v ?? 0;
+    }
+    for (const expr of printArgs ?? []) {
+        values.push(evalExpr(expr));
     }
     let valueIdx = 0;
-    return printFmt.replace(/%[0-9]*[lh]*([duxX])/g, (_all, spec) => {
+    return printFmt.replace(/%[0-9]*[lh]*([duxXsS])/g, (_all, spec) => {
         const v = values[valueIdx++] ?? 0;
         return formatArgBySpecifier(v, spec);
     });

package/package.json

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