issue #227 - monomorphic fibers frames

Sage · Aug 10, 2014 · d7c9c6b · d7c9c6b
1 parent 4e1deb7
commit d7c9c6b
Showing 1 changed file with 23 additions and 14 deletions.
diff --git a/lib/fibers/runtime.js b/lib/fibers/runtime.js
@@ -28,13 +28,19 @@ this.globals = globals;
  *	 ...
  * }, 1);
  */
+ function Frame(fn, file, line) {
+	this.prev = globals.frame;
+	this.name = fn.name;
+	this.file = file;
+	this.line = line;
+	// initialize streamline-flamegraph fields to make it monomorphic
+	this.recurse = 0;
+	this.yielded = 0;
+	this.id = 0;
+}
+
 function pushFrame(fn, file, line) {
-	var frame = globals.frame = {
-		prev: globals.frame,
-		name: fn.name,
-		file: file,
-		line: line,
-	}
+	var frame = globals.frame = new Frame(fn, file, line);
 	globals.emitter.emit('enter');
 	return frame;
 }
@@ -161,18 +167,21 @@ function invoke(that, fn, args, options) {
 				globals.frame = frame;
 				if (globals.yielded) emitter.emit('resume');
 				globals.yielded = false;
-				//emitter.emit('enter');
-			}
-			try {
+				try {
+					if (e) {
+						fiber.throwInto(e);
+					} else {
+						fiber.run(v);
+					}
+				} finally {
+					globals.frame = oldFrame;
+				}
+			} else {
 				if (e) {
 					fiber.throwInto(e);
 				} else {
 					fiber.run(v);
-				}
-			} finally {
-				if (emitter) {
-					globals.frame = oldFrame;
-				}
+				}				
 			}
 		}
 	};