hm-pt-core 1.0.2 → 1.0.3

package/README.md

@@ -19,7 +19,7 @@ npm install hm-pt-core
 
 | hm-pt-core | hiperf_txt_parser | hmtrace-parser |
 |------------|-------------------|----------------|
-| 1.0.x      | 2.0.x             | 0.8.x          |
+| 1.0.x（当前 **1.0.3**） | **2.1.x**             | **0.8.x**          |
 
 ## 开发
 

package/dist/index.d.ts

@@ -9,5 +9,5 @@ export type { Endian, BuildTraceParserRegistryOptions } from "./trace/parse.js";
 export { TraceFieldDecodeError } from "./trace/parse.js";
 export type { PrintfSpec } from "./trace/printf.js";
 export { parseTraceFormat, parseCommonFieldsFromRaw, parseAllFieldsFromRaw, rawHexLinesToBuffer, bufferToRawHexLines, buildTraceParserRegistry, } from "./trace/parse.js";
-export { formatPrintfValue, tokenizePrintfFormat } from "./trace/printf.js";
+export { formatPrintfValue, tokenizePrintfFormat, renderPrintFmt, renderPrintFmtAsFieldDict } from "./trace/printf.js";
 export { decodeRawByRegistry } from "./trace/decode_raw.js";

package/dist/index.js

@@ -4,5 +4,5 @@
 export { isPerfDataLike } from "./perf/is_perf_data_like.js";
 export { TraceFieldDecodeError } from "./trace/parse.js";
 export { parseTraceFormat, parseCommonFieldsFromRaw, parseAllFieldsFromRaw, rawHexLinesToBuffer, bufferToRawHexLines, buildTraceParserRegistry, } from "./trace/parse.js";
-export { formatPrintfValue, tokenizePrintfFormat } from "./trace/printf.js";
+export { formatPrintfValue, tokenizePrintfFormat, renderPrintFmt, renderPrintFmtAsFieldDict } from "./trace/printf.js";
 export { decodeRawByRegistry } from "./trace/decode_raw.js";

package/dist/trace/parse.js

@@ -138,6 +138,24 @@ function scanBalancedPrintArgs(argsPart) {
     }
     return args;
 }
+/**
+ * 从 print fmt 逗号后参数段提取表达式。
+ * 内核 trace 常在首个 __data_loc 参数外套 ((char*)((void *)...))，括号平衡切分只得 1 段；
+ * 此时回退为按 `REC->` 切分（与 hiperf 1.x 行为一致）。
+ */
+function parsePrintArgExpressions(argsPart) {
+    const balanced = scanBalancedPrintArgs(argsPart);
+    const recExprs = argsPart.match(/REC->[^,]+/g)?.map((s) => s.trim().replace(/\)+$/, "")) ?? [];
+    if (recExprs.length > balanced.length) {
+        return recExprs;
+    }
+    if (recExprs.length === 1 &&
+        balanced.length === 1 &&
+        balanced[0] !== recExprs[0]) {
+        return recExprs;
+    }
+    return balanced;
+}
 function parsePrintFmtLine(line) {
     const prefix = line.match(/^print\s+fmt\s*:\s*/i);
     if (!prefix)
@@ -151,7 +169,7 @@ function parsePrintFmtLine(line) {
     const argsMatch = rest.match(/^,\s*(.*)$/);
     if (!argsMatch)
         return undefined;
-    return { printFmt: lit.value, printArgs: scanBalancedPrintArgs(argsMatch[1]) };
+    return { printFmt: lit.value, printArgs: parsePrintArgExpressions(argsMatch[1]) };
 }
 function splitTypeAndName(rest) {
     const trimmed = rest.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hm-pt-core",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "DFX perf trace shared types and trace format decode primitives",
   "type": "module",
   "main": "dist/index.js",