Aligned mark names with values used by ts-perf.

rbuckton · rbuckton · commit 4e04b75d4bc4 · 2016-08-15T11:07:49.000-07:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -89,10 +89,10 @@ namespace ts {
     const binder = createBinder();
 
     export function bindSourceFile(file: SourceFile, options: CompilerOptions) {
-        performance.mark("bindStart");
+        performance.mark("beforeBind");
         binder(file, options);
-        performance.mark("bindEnd");
-        performance.measure("Bind", "bindStart", "bindEnd");
+        performance.mark("afterBind");
+        performance.measure("Bind", "beforeBind", "afterBind");
     }
 
     function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17535,10 +17535,10 @@ namespace ts {
         }
 
         function checkSourceFile(node: SourceFile) {
-            performance.mark("checkStart");
+            performance.mark("beforeCheck");
             checkSourceFileWorker(node);
-            performance.mark("checkEnd");
-            performance.measure("Check", "checkStart", "checkEnd");
+            performance.mark("afterCheck");
+            performance.measure("Check", "beforeCheck", "afterCheck");
         }
 
         // Fully type check a source file and collect the relevant diagnostics.
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -421,10 +421,10 @@ namespace ts {
     }
 
     export function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes = false, scriptKind?: ScriptKind): SourceFile {
-        performance.mark("parseStart");
+        performance.mark("beforeParse");
         const result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
-        performance.mark("parseEnd");
-        performance.measure("Parse", "parseStart", "parseEnd");
+        performance.mark("afterParse");
+        performance.measure("Parse", "beforeParse", "afterParse");
         return result;
     }
 
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -857,10 +857,10 @@ namespace ts {
         function getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile {
             let text: string;
             try {
-                performance.mark("ioReadStart");
+                performance.mark("beforeIORead");
                 text = sys.readFile(fileName, options.charset);
-                performance.mark("ioReadEnd");
-                performance.measure("I/O Read", "ioReadStart", "ioReadEnd");
+                performance.mark("afterIORead");
+                performance.measure("I/O Read", "beforeIORead", "afterIORead");
             }
             catch (e) {
                 if (onError) {
@@ -927,7 +927,7 @@ namespace ts {
 
         function writeFile(fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void) {
             try {
-                performance.mark("ioWriteStart");
+                performance.mark("beforeIOWrite");
                 ensureDirectoriesExist(getDirectoryPath(normalizePath(fileName)));
 
                 if (isWatchSet(options) && sys.createHash && sys.getModifiedTime) {
@@ -937,8 +937,8 @@ namespace ts {
                     sys.writeFile(fileName, data, writeByteOrderMark);
                 }
 
-                performance.mark("ioWriteEnd");
-                performance.measure("I/O Write", "ioWriteStart", "ioWriteEnd");
+                performance.mark("afterIOWrite");
+                performance.measure("I/O Write", "beforeIOWrite", "afterIOWrite");
             }
             catch (e) {
                 if (onError) {
@@ -1120,7 +1120,7 @@ namespace ts {
         // Track source files that are source files found by searching under node_modules, as these shouldn't be compiled.
         const sourceFilesFoundSearchingNodeModules = createMap<boolean>();
 
-        performance.mark("programStart");
+        performance.mark("beforeProgram");
 
         host = host || createCompilerHost(options);
 
@@ -1218,8 +1218,8 @@ namespace ts {
         };
 
         verifyCompilerOptions();
-        performance.mark("programEnd");
-        performance.measure("Program", "programStart", "programEnd");
+        performance.mark("afterProgram");
+        performance.measure("Program", "beforeProgram", "afterProgram");
 
         return program;
 
@@ -1462,15 +1462,15 @@ namespace ts {
             // checked is to not pass the file to getEmitResolver.
             const emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile);
 
-            performance.mark("emitStart");
+            performance.mark("beforeEmit");
 
             const emitResult = emitFiles(
                 emitResolver,
                 getEmitHost(writeFileCallback),
                 sourceFile);
 
-            performance.mark("emitEnd");
-            performance.measure("Emit", "emitStart", "emitEnd");
+            performance.mark("afterEmit");
+            performance.measure("Emit", "beforeEmit", "afterEmit");
             return emitResult;
         }
 
diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts
@@ -242,7 +242,7 @@ namespace ts {
             }
 
             if (extendedDiagnostics) {
-                performance.mark("sourcemapStart");
+                performance.mark("beforeSourcemap");
             }
 
             const sourceLinePos = getLineAndCharacterOfPosition(currentSourceFile, pos);
@@ -286,8 +286,8 @@ namespace ts {
             updateLastEncodedAndRecordedSpans();
 
             if (extendedDiagnostics) {
-                performance.mark("sourcemapEnd");
-                performance.measure("Source Map", "sourcemapStart", "sourcemapEnd");
+                performance.mark("afterSourcemap");
+                performance.measure("Source Map", "beforeSourcemap", "afterSourcemap");
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -17535,10 +17535,10 @@ namespace ts {`
`17535`	`17535`	`}`
`17536`	`17536`
`17537`	`17537`	`function checkSourceFile(node: SourceFile) {`
`17538`		`- performance.mark("checkStart");`
	`17538`	`+ performance.mark("beforeCheck");`
`17539`	`17539`	`checkSourceFileWorker(node);`
`17540`		`- performance.mark("checkEnd");`
`17541`		`- performance.measure("Check", "checkStart", "checkEnd");`
	`17540`	`+ performance.mark("afterCheck");`
	`17541`	`+ performance.measure("Check", "beforeCheck", "afterCheck");`
`17542`	`17542`	`}`
`17543`	`17543`
`17544`	`17544`	`// Fully type check a source file and collect the relevant diagnostics.`
Original file line number	Diff line number	Diff line change
`@@ -421,10 +421,10 @@ namespace ts {`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`export function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes = false, scriptKind?: ScriptKind): SourceFile {`
`424`		`- performance.mark("parseStart");`
	`424`	`+ performance.mark("beforeParse");`
`425`	`425`	`const result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /syntaxCursor/ undefined, setParentNodes, scriptKind);`
`426`		`- performance.mark("parseEnd");`
`427`		`- performance.measure("Parse", "parseStart", "parseEnd");`
	`426`	`+ performance.mark("afterParse");`
	`427`	`+ performance.measure("Parse", "beforeParse", "afterParse");`
`428`	`428`	`return result;`
`429`	`429`	`}`
`430`	`430`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ namespace ts {`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`if (extendedDiagnostics) {`
`245`		`- performance.mark("sourcemapStart");`
	`245`	`+ performance.mark("beforeSourcemap");`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`const sourceLinePos = getLineAndCharacterOfPosition(currentSourceFile, pos);`
`@@ -286,8 +286,8 @@ namespace ts {`
`286`	`286`	`updateLastEncodedAndRecordedSpans();`
`287`	`287`
`288`	`288`	`if (extendedDiagnostics) {`
`289`		`- performance.mark("sourcemapEnd");`
`290`		`- performance.measure("Source Map", "sourcemapStart", "sourcemapEnd");`
	`289`	`+ performance.mark("afterSourcemap");`
	`290`	`+ performance.measure("Source Map", "beforeSourcemap", "afterSourcemap");`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`