fix(profiling): resetProfiles doesn't reset all profiles (NativeScript#5425)

MartoYankov · web-flow · commit 68d86fb6c623 · 2018-02-19T13:18:50.000+02:00
diff --git a/tests/app/profiling/profiling-tests.ts b/tests/app/profiling/profiling-tests.ts
@@ -1,4 +1,4 @@
-import { assert, assertEqual, assertFalse, assertTrue, assertThrows } from "../TKUnit";
+import { assert, assertEqual, assertFalse, assertNull, assertTrue, assertThrows } from "../TKUnit";
 import { enable, disable, profile, time, start, stop, timer, isRunning, resetProfiles } from "tns-core-modules/profiling";
 
 enable();
@@ -99,6 +99,19 @@ export function test_isRunning_withReentrancy() {
     assertFalse(isRunning(name), "isRunning should be false after second stop");
 }
 
+export function test_reset_profiles() {
+    resetProfiles();
+    const name = "test_reset_profiles";
+
+    start(name);
+    stop(name);
+    resetProfiles();
+
+    const res = timer(name);
+
+    assertNull(res);
+}
+
 export function test_start_stop() {
     resetProfiles();
     const name = "test_start_stop";
diff --git a/tns-core-modules/profiling/profiling.ts b/tns-core-modules/profiling/profiling.ts
@@ -46,6 +46,7 @@ export function start(name: string): void {
             runCount: 1
         };
         timers[name] = info;
+        profileNames.push(name);
     }
 }
 
@@ -94,7 +95,7 @@ export function isRunning(name: string): boolean {
 
 function countersProfileFunctionFactory<F extends Function>(fn: F, name: string, type: MemberType = MemberType.Instance): F {
     profileNames.push(name);
-    return <any>function() {
+    return <any>function () {
         start(name);
         try {
             return fn.apply(this, arguments);
@@ -105,15 +106,15 @@ function countersProfileFunctionFactory<F extends Function>(fn: F, name: string,
 }
 
 function timelineProfileFunctionFactory<F extends Function>(fn: F, name: string, type: MemberType = MemberType.Instance): F {
-    return type === MemberType.Instance ? <any>function() {
+    return type === MemberType.Instance ? <any>function () {
         const start = time();
         try {
             return fn.apply(this, arguments);
         } finally {
             const end = time();
             console.log(`Timeline: Modules: ${name} ${this}  (${start}ms. - ${end}ms.)`);
         }
-    } : function() {
+    } : function () {
         const start = time();
         try {
             return fn.apply(this, arguments);
@@ -154,10 +155,10 @@ try {
     if (appConfig && appConfig.profiling) {
         enable(appConfig.profiling);
     }
-} catch(e1) {
+} catch (e1) {
     try {
         console.log("Profiling startup failed to figure out defaults from package.json, error: " + e1);
-    } catch(e2) {
+    } catch (e2) {
         // We can get here if an exception is thrown in the mksnapshot as there is no console there.
     }
 }
