[hlprof] Move ProfileGen to haxelib (#742)

other/profiler/ProfileGen.hx → other/haxelib/hlprof/ProfileGen.hx

@@ -1,355 +1,362 @@
-
-class StackElement {
-	static var UID = 0;
-	public var id : Int;
-	public var desc : String;
-	public var file : String;
-	public var line : Int;
-	public function new(desc:String) {
-		id = UID++;
-		if( desc.charCodeAt(desc.length-1) == ')'.code ) {
-			var p = desc.lastIndexOf('(');
-			var sep = desc.lastIndexOf(':');
-			if( p > 0 && sep > p ) {
-				file = desc.substr(p+1,sep-p-1);
-				var sline = desc.substr(sep+1,desc.length - sep - 2);
-				line = Std.parseInt(sline);
-				desc = desc.substr(0,p);
-				desc = desc.split("$").join("");
-				if( StringTools.endsWith(desc,".__constructor__") )
-					desc = desc.substr(0,-15)+"new";
-			}
-		}
-		if( file != null ) {
-			file = file.split("\\").join("/");
-			if( file.charCodeAt(1) == ':'.code )
-				file = file.split("/haxe/std/").pop();
-			file = file.split("/").join(".");
-		}
-		this.desc = desc;
-	}
-}
-
-class StackLink {
-	static var UID = 1;
-	public var id : Int;
-	public var elt : StackElement;
-	public var parent : StackLink;
-	public var children : Map<String,StackLink> = new Map();
-	public var written : Bool;
-	public function new(elt) {
-		id = UID++;
-		this.elt = elt;
-	}
-	public function getChildren(elt:StackElement) {
-		var c = children.get(elt.desc);
-		if( c == null ) {
-			c = new StackLink(elt);
-			c.parent = this;
-			children.set(elt.desc,c);
-		}
-		return c;
-	}
-}
-
-class Frame {
-	public var samples : Array<{ thread : Int, time : Float, stack : Array<StackElement> }> = [];
-	public var startTime : Float;
-	public function new() {
-	}
-}
-
-class Thread {
-
-	public var tid : Int;
-	public var curFrame : Frame;
-	public var frames : Array<Frame>;
-	public var name : String;
-
-	public function new(tid) {
-		this.tid = tid;
-		curFrame = new Frame();
-		frames = [curFrame];
-	}
-}
-
-class ProfileGen {
-
-	static function makeStacks( st : Array<StackLink> ) {
-		var write = [];
-		for( s in st ) {
-			var s = s;
-			while( s != null ) {
-				if( s.written ) break;
-				s.written = true;
-				write.push(s);
-				s = s.parent;
-			}
-		}
-		write.sort(function(s1,s2) return s1.id - s2.id);
-		return [for( s in write ) {
-			callFrame : s.elt.file == null ? cast {
-				functionName : s.elt.desc,
-				scriptId : 0,
-			} : {
-				functionName : s.elt.desc,
-				scriptId : 1,
-				url : s.elt.file.split("\\").join("/"),
-				lineNumber : s.elt.line - 1,
-			},
-			id : s.id,
-			parent : s.parent == null ? null : s.parent.id,
-		}];
-	}
-
-	static function main() {
-		var args = Sys.args();
-		var outFile = null;
-		var file = null;
-		var debug = false;
-		var mintime = 0.0;
-		var keepLines = false;
-
-		while( args.length > 0 ) {
-			var arg = args[0];
-			args.shift();
-			if( arg.charCodeAt(0) != "-".code ) {
-				file = arg;
-				continue;
-			}
-			switch( arg ) {
-			case "-d"|"--debug":
-				debug = true;
-			case "-o"|"--out":
-				outFile = args.shift();
-			case "--min-time-ms":
-				mintime = Std.parseFloat(args.shift()) / 1000.0;
-			case "--keep-lines":
-				keepLines = true;
-			default:
-				throw "Unknown parameter "+arg;
-			}
-		}
-
-		if( file == null ) file = "hlprofile.dump";
-		if( sys.FileSystem.isDirectory(file) ) file += "/hlprofile.dump";
-		if( outFile == null ) outFile = file;
-
-		var f = sys.io.File.read(file);
-		if( f.readString(4) != "PROF" ) throw "Invalid profiler file";
-		var version = f.readInt32();
-		var sampleCount = f.readInt32();
-		var gcMajor = new StackElement("GC Major");
-		var rootElt = new StackElement("(root)");
-		var hthreads = new Map();
-		var threads = [];
-		var tcur : Thread = null;
-		var fileMaps : Array<{ byDesc : Map<String,StackElement>, byLine : Map<Int,StackElement> }> = [];
-		while( true ) {
-			var time = try f.readDouble() catch( e : haxe.io.Eof ) break;
-			if( time == -1 ) break;
-			var tid = f.readInt32();
-			if( tcur == null || tid != tcur.tid ) {
-				tcur = hthreads.get(tid);
-				if( tcur == null ) {
-					tcur = new Thread(tid);
-					tcur.curFrame.startTime = time;
-					hthreads.set(tid,tcur);
-					threads.push(tcur);
-				}
-			}
-			var msgId = f.readInt32();
-			if( msgId < 0 ) {
-				var count = msgId & 0x3FFFFFFF;
-				var stack = [];
-				for( i in 0...count ) {
-					var file = f.readInt32();
-					if( file == -1 )
-						continue;
-					var line = f.readInt32();
-					var elt : StackElement = null;
-					if( file < 0 ) {
-						file &= 0x7FFFFFFF;
-						elt = fileMaps[file].byLine.get(line);
-						if( elt == null ) throw "assert";
-					} else {
-						var len = f.readInt32();
-						var buf = new StringBuf();
-						for( i in 0...len ) buf.addChar(f.readUInt16());
-						var str = buf.toString();
-						var maps = fileMaps[file];
-						if( maps == null ) {
-							maps = { byLine : new Map(), byDesc : new Map() };
-							fileMaps[file] = maps;
-						}
-						elt = new StackElement(str);
-						if( !keepLines ) {
-							var ePrev = maps.byDesc.get(elt.desc);
-							if( ePrev != null ) {
-								if( elt.line < ePrev.line ) ePrev.line = elt.line;
-								elt = ePrev;
-							} else
-								maps.byDesc.set(elt.desc, elt);
-						}
-						maps.byLine.set(line,elt);
-					}
-					stack[i] = elt;
-				}
-				if( msgId & 0x40000000 != 0 )
-					stack.unshift(gcMajor);
-				if( tcur.curFrame.samples.length == 100000 ) {
-					tcur.curFrame = new Frame();
-					tcur.curFrame.startTime = time;
-					tcur.frames.push(tcur.curFrame);
-				}
-				tcur.curFrame.samples.push({ time : time, thread : tid, stack : stack });
-			} else {
-				var size = f.readInt32();
-				var data = f.read(size);
-				switch( msgId ) {
-				case 0:
-					if(mintime > 0 && tcur.frames.length > 0) {
-						var lastFrame = tcur.frames[tcur.frames.length-1];
-						if(lastFrame.samples.length == 0 || (lastFrame.samples[lastFrame.samples.length-1].time - lastFrame.startTime) < mintime)
-							tcur.frames.pop();
-					}
-					tcur.curFrame = new Frame();
-					tcur.curFrame.startTime = time;
-					tcur.frames.push(tcur.curFrame);
-				default:
-					Sys.println("Unknown profile message #"+msgId);
-				}
-			}
-		}
-
-		for( t in threads )
-			t.name = "Thread "+t.tid;
-		threads[0].name = "Main";
-
-		var namesCount = try f.readInt32() catch( e : haxe.io.Eof ) 0;
-		for( i in 0...namesCount ) {
-			var tid = f.readInt32();
-			var tname = f.readString(f.readInt32());
-			var t = hthreads.get(tid);
-			t.name = tname;
-		}
-
-		var mainTid = threads[0].tid;
-		var json : Array<Dynamic> = [for( t in threads )
-			{
-    			pid : 0,
-    			tid : t.tid,
- 	 			ts : 0,
-				ph : "M",
-				cat : "__metadata",
-				name : "thread_name",
-				args : { name : t.name }
-			}
-		];
-		json.push({
-			args: {
-				data: {
-					frameTreeNodeId: 0,
-					frames: [
-						{
-							processId: 0,
-							url: "http://_"
-						}
-					],
-					persistentIds: true
-				}
-			},
-			cat: "disabled-by-default-devtools.timeline",
-			name: "TracingStartedInBrowser",
-			pid: 0,
-			tid: 0,
-			ts: 0
-		});
-
-		var count = 1;
-		var f0 = threads[0].frames[0];
-		var t0 = f0.samples.length == 0 ? f0.startTime : f0.samples[0].time;
-
-		for( thread in threads ) {
-			var tid = thread.tid;
-
-			function timeStamp(t:Float) {
-				return Std.int((t - t0) * 1000000) + 1;
-			}
-
-			var lastT = 0.;
-			var rootStack = new StackLink(rootElt);
-			var profileId = count++;
-
-			json.push({
-				pid : 0,
-				tid : tid,
-				ts : 0,
-				ph : "P",
-				cat : "disabled-by-default-v8.cpu_profiler",
-			    name : "Profile",
-				id : "0x"+profileId,
-				args: { data : { startTime : 0 } },
-			});
-
-			for( f in thread.frames ) {
-				if( f.samples.length == 0 ) continue;
-				var ts = timeStamp(f.startTime);
-				var tend = timeStamp(f.samples[f.samples.length-1].time);
-				json.push({
-					pid : 0,
-					tid : tid,
-					ts : ts,
-					dur : tend - ts, 
-					ph : "X",
-					cat : "disabled-by-default-devtools.timeline",
-					name : "RunTask",
-				});
-			}
-			for( f in thread.frames ) {
-				if( f.samples.length == 0 ) continue;
-
-				var timeDeltas = [];
-				var allStacks = [];
-				var lines = [];
-
-				for( s in f.samples) {
-					var st = rootStack;
-					var line = 0;
-					for( i in 0...s.stack.length ) {
-						var s = s.stack[s.stack.length - 1 - i];
-						if( s == null || s.file == "?" ) continue;
-						line = s.line;
-						st = st.getChildren(s);
-					}
-					lines.push(line);
-					allStacks.push(st);
-					var t = Math.ffloor((s.time - t0) * 1000000);
-					timeDeltas.push(t - lastT);
-					lastT = t;
-				}
-				json.push({
-					pid : 0,
-					tid : tid,
-					ts : 0,
-					ph : "P",
-					cat : "disabled-by-default-v8.cpu_profiler",
-					name : "ProfileChunk",
-					id : "0x"+profileId,
-					args : {
-						data : {
-							cpuProfile : {
-								nodes : makeStacks(allStacks),
-								samples : [for( s in allStacks ) s.id],
-								//lines : lines,
-							},
-							timeDeltas : timeDeltas,
-						}
-					}
-				});
-			}
-		}
-		sys.io.File.saveContent(outFile, debug ? haxe.Json.stringify(json,"\t") : haxe.Json.stringify(json));
-	}
-
-}
+package hlprof;
+
+class StackElement {
+	static var UID = 0;
+	public var id : Int;
+	public var desc : String;
+	public var file : String;
+	public var line : Int;
+	public function new(desc:String) {
+		id = UID++;
+		if( desc.charCodeAt(desc.length-1) == ')'.code ) {
+			var p = desc.lastIndexOf('(');
+			var sep = desc.lastIndexOf(':');
+			if( p > 0 && sep > p ) {
+				file = desc.substr(p+1,sep-p-1);
+				var sline = desc.substr(sep+1,desc.length - sep - 2);
+				line = Std.parseInt(sline);
+				desc = desc.substr(0,p);
+				desc = desc.split("$").join("");
+				if( StringTools.endsWith(desc,".__constructor__") )
+					desc = desc.substr(0,-15)+"new";
+			}
+		}
+		if( file != null ) {
+			file = file.split("\\").join("/");
+			if( file.charCodeAt(1) == ':'.code )
+				file = file.split("/haxe/std/").pop();
+			file = file.split("/").join(".");
+		}
+		this.desc = desc;
+	}
+}
+
+class StackLink {
+	static var UID = 1;
+	public var id : Int;
+	public var elt : StackElement;
+	public var parent : StackLink;
+	public var children : Map<String,StackLink> = new Map();
+	public var written : Bool;
+	public function new(elt) {
+		id = UID++;
+		this.elt = elt;
+	}
+	public function getChildren(elt:StackElement) {
+		var c = children.get(elt.desc);
+		if( c == null ) {
+			c = new StackLink(elt);
+			c.parent = this;
+			children.set(elt.desc,c);
+		}
+		return c;
+	}
+}
+
+class Frame {
+	public var samples : Array<{ thread : Int, time : Float, stack : Array<StackElement> }> = [];
+	public var startTime : Float;
+	public function new() {
+	}
+}
+
+class Thread {
+
+	public var tid : Int;
+	public var curFrame : Frame;
+	public var frames : Array<Frame>;
+	public var name : String;
+
+	public function new(tid) {
+		this.tid = tid;
+		curFrame = new Frame();
+		frames = [curFrame];
+	}
+}
+
+class ProfileGen {
+
+	static function makeStacks( st : Array<StackLink> ) {
+		var write = [];
+		for( s in st ) {
+			var s = s;
+			while( s != null ) {
+				if( s.written ) break;
+				s.written = true;
+				write.push(s);
+				s = s.parent;
+			}
+		}
+		write.sort(function(s1,s2) return s1.id - s2.id);
+		return [for( s in write ) {
+			callFrame : s.elt.file == null ? cast {
+				functionName : s.elt.desc,
+				scriptId : 0,
+			} : {
+				functionName : s.elt.desc,
+				scriptId : 1,
+				url : s.elt.file.split("\\").join("/"),
+				lineNumber : s.elt.line - 1,
+			},
+			id : s.id,
+			parent : s.parent == null ? null : s.parent.id,
+		}];
+	}
+
+	public static function run( args : Array<String> ) {
+		var outFile = null;
+		var file = null;
+		var debug = false;
+		var mintime = 0.0;
+		var keepLines = false;
+
+		while( args.length > 0 ) {
+			var arg = args[0];
+			args.shift();
+			if( arg.charCodeAt(0) != "-".code ) {
+				file = arg;
+				continue;
+			}
+			switch( arg ) {
+			case "-d"|"--debug":
+				debug = true;
+			case "-o"|"--out":
+				outFile = args.shift();
+			case "--min-time-ms":
+				mintime = Std.parseFloat(args.shift()) / 1000.0;
+			case "--keep-lines":
+				keepLines = true;
+			default:
+				throw "Unknown parameter "+arg;
+			}
+		}
+
+		if( file == null ) file = "hlprofile.dump";
+		if( sys.FileSystem.isDirectory(file) ) file += "/hlprofile.dump";
+		if( outFile == null ) outFile = file;
+
+		#if js
+		var f = new haxe.io.BytesInput(sys.io.File.getBytes(file));
+		#else
+		var f = sys.io.File.read(file);
+		#end
+		if( f.readString(4) != "PROF" ) throw "Invalid profiler file";
+		var version = f.readInt32();
+		var sampleCount = f.readInt32();
+		var gcMajor = new StackElement("GC Major");
+		var rootElt = new StackElement("(root)");
+		var hthreads = new Map();
+		var threads = [];
+		var tcur : Thread = null;
+		var fileMaps : Array<{ byDesc : Map<String,StackElement>, byLine : Map<Int,StackElement> }> = [];
+		while( true ) {
+			var time = try f.readDouble() catch( e : haxe.io.Eof ) break;
+			if( time == -1 ) break;
+			var tid = f.readInt32();
+			if( tcur == null || tid != tcur.tid ) {
+				tcur = hthreads.get(tid);
+				if( tcur == null ) {
+					tcur = new Thread(tid);
+					tcur.curFrame.startTime = time;
+					hthreads.set(tid,tcur);
+					threads.push(tcur);
+				}
+			}
+			var msgId = f.readInt32();
+			if( msgId < 0 ) {
+				var count = msgId & 0x3FFFFFFF;
+				var stack = [];
+				for( i in 0...count ) {
+					var file = f.readInt32();
+					if( file == -1 )
+						continue;
+					var line = f.readInt32();
+					var elt : StackElement = null;
+					if( file < 0 ) {
+						file &= 0x7FFFFFFF;
+						elt = fileMaps[file].byLine.get(line);
+						if( elt == null ) throw "assert";
+					} else {
+						var len = f.readInt32();
+						var buf = new StringBuf();
+						for( i in 0...len ) buf.addChar(f.readUInt16());
+						var str = buf.toString();
+						var maps = fileMaps[file];
+						if( maps == null ) {
+							maps = { byLine : new Map(), byDesc : new Map() };
+							fileMaps[file] = maps;
+						}
+						elt = new StackElement(str);
+						if( !keepLines ) {
+							var ePrev = maps.byDesc.get(elt.desc);
+							if( ePrev != null ) {
+								if( elt.line < ePrev.line ) ePrev.line = elt.line;
+								elt = ePrev;
+							} else
+								maps.byDesc.set(elt.desc, elt);
+						}
+						maps.byLine.set(line,elt);
+					}
+					stack[i] = elt;
+				}
+				if( msgId & 0x40000000 != 0 )
+					stack.unshift(gcMajor);
+				if( tcur.curFrame.samples.length == 100000 ) {
+					tcur.curFrame = new Frame();
+					tcur.curFrame.startTime = time;
+					tcur.frames.push(tcur.curFrame);
+				}
+				tcur.curFrame.samples.push({ time : time, thread : tid, stack : stack });
+			} else {
+				var size = f.readInt32();
+				var data = f.read(size);
+				switch( msgId ) {
+				case 0:
+					if(mintime > 0 && tcur.frames.length > 0) {
+						var lastFrame = tcur.frames[tcur.frames.length-1];
+						if(lastFrame.samples.length == 0 || (lastFrame.samples[lastFrame.samples.length-1].time - lastFrame.startTime) < mintime)
+							tcur.frames.pop();
+					}
+					tcur.curFrame = new Frame();
+					tcur.curFrame.startTime = time;
+					tcur.frames.push(tcur.curFrame);
+				default:
+					Sys.println("Unknown profile message #"+msgId);
+				}
+			}
+		}
+
+		for( t in threads )
+			t.name = "Thread "+t.tid;
+		threads[0].name = "Main";
+
+		var namesCount = try f.readInt32() catch( e : haxe.io.Eof ) 0;
+		for( i in 0...namesCount ) {
+			var tid = f.readInt32();
+			var tname = f.readString(f.readInt32());
+			var t = hthreads.get(tid);
+			t.name = tname;
+		}
+
+		var mainTid = threads[0].tid;
+		var json : Array<Dynamic> = [for( t in threads )
+			{
+				pid : 0,
+				tid : t.tid,
+				ts : 0,
+				ph : "M",
+				cat : "__metadata",
+				name : "thread_name",
+				args : { name : t.name }
+			}
+		];
+		json.push({
+			args: {
+				data: {
+					frameTreeNodeId: 0,
+					frames: [
+						{
+							processId: 0,
+							url: "http://_"
+						}
+					],
+					persistentIds: true
+				}
+			},
+			cat: "disabled-by-default-devtools.timeline",
+			name: "TracingStartedInBrowser",
+			pid: 0,
+			tid: 0,
+			ts: 0
+		});
+
+		var count = 1;
+		var f0 = threads[0].frames[0];
+		var t0 = f0.samples.length == 0 ? f0.startTime : f0.samples[0].time;
+
+		for( thread in threads ) {
+			var tid = thread.tid;
+
+			function timeStamp(t:Float) {
+				return Std.int((t - t0) * 1000000) + 1;
+			}
+
+			var lastT = 0.;
+			var rootStack = new StackLink(rootElt);
+			var profileId = count++;
+
+			json.push({
+				pid : 0,
+				tid : tid,
+				ts : 0,
+				ph : "P",
+				cat : "disabled-by-default-v8.cpu_profiler",
+				name : "Profile",
+				id : "0x"+profileId,
+				args: { data : { startTime : 0 } },
+			});
+
+			for( f in thread.frames ) {
+				if( f.samples.length == 0 ) continue;
+				var ts = timeStamp(f.startTime);
+				var tend = timeStamp(f.samples[f.samples.length-1].time);
+				json.push({
+					pid : 0,
+					tid : tid,
+					ts : ts,
+					dur : tend - ts,
+					ph : "X",
+					cat : "disabled-by-default-devtools.timeline",
+					name : "RunTask",
+				});
+			}
+			for( f in thread.frames ) {
+				if( f.samples.length == 0 ) continue;
+
+				var timeDeltas = [];
+				var allStacks = [];
+				var lines = [];
+
+				for( s in f.samples) {
+					var st = rootStack;
+					var line = 0;
+					for( i in 0...s.stack.length ) {
+						var s = s.stack[s.stack.length - 1 - i];
+						if( s == null || s.file == "?" ) continue;
+						line = s.line;
+						st = st.getChildren(s);
+					}
+					lines.push(line);
+					allStacks.push(st);
+					var t = Math.ffloor((s.time - t0) * 1000000);
+					timeDeltas.push(t - lastT);
+					lastT = t;
+				}
+				json.push({
+					pid : 0,
+					tid : tid,
+					ts : 0,
+					ph : "P",
+					cat : "disabled-by-default-v8.cpu_profiler",
+					name : "ProfileChunk",
+					id : "0x"+profileId,
+					args : {
+						data : {
+							cpuProfile : {
+								nodes : makeStacks(allStacks),
+								samples : [for( s in allStacks ) s.id],
+								//lines : lines,
+							},
+							timeDeltas : timeDeltas,
+						}
+					}
+				});
+			}
+		}
+		sys.io.File.saveContent(outFile, debug ? haxe.Json.stringify(json,"\t") : haxe.Json.stringify(json));
+	}
+
+	static function main() {
+		run(Sys.args());
+	}
+}

other/haxelib/profiler.hxml

@@ -0,0 +1,2 @@
+-main hlprof.ProfileGen
+-hl profiler.hl

other/profiler/.gitignore

@@ -1,2 +0,0 @@
-/Profile.json
-/hlprofile.dump

other/profiler/.vscode/launch.json

@@ -1,20 +0,0 @@
-{
-	// Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
-	// Pointez pour afficher la description des attributs existants.
-	// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"name": "HashLink (launch)",
-			"request": "launch",
-			"type": "hl",
-			"hxml": "profiler.hxml",
-			"cwd": "${workspaceFolder}",
-			"args": ["--out","Profile.json","--debug"],
-			"preLaunchTask": {
-				"type": "haxe",
-				"args": "active configuration"
-			}
-		}
-	]
-}

other/profiler/.vscode/tasks.json

@@ -1,15 +0,0 @@
-{
-// Consultez https://go.microsoft.com/fwlink/?LinkId=733558
-	// pour voir la documentation sur le format de tasks.json
-	"version": "2.0.0",
-	"tasks": [
-		{
-			"type": "haxe",
-			"args": "active configuration",
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			}
-		}
-	]
-}

other/profiler/profiler.hxml

@@ -1,2 +0,0 @@
--hl profiler.hl
--main ProfileGen