Author: miguel Date: 2007-05-27 20:40:11 -0400 (Sun, 27 May 2007) New Revision: 78021
Added: trunk/release/moma/ trunk/release/moma/Makefile trunk/release/moma/README trunk/release/moma/end trunk/release/moma/head trunk/release/moma/moma.cs trunk/release/moma/moma.css trunk/release/moma/moma.exe trunk/release/moma/moma.exe.mdb trunk/release/moma/side Log: Add Moma Report tools Added: trunk/release/moma/Makefile =================================================================== --- trunk/release/moma/Makefile 2007-05-27 23:08:27 UTC (rev 78020) +++ trunk/release/moma/Makefile 2007-05-28 00:40:11 UTC (rev 78021) @@ -0,0 +1,6 @@ +all: + -rm output/* + gmcs -debug moma.cs && mono --debug moma.exe ~/Results/Fresh ~/Results/1.2.4 output + +push: + (cd output; rsync -a . primates.ximian.com:public_html/newmomareports) \ No newline at end of file Property changes on: trunk/release/moma/Makefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/release/moma/README =================================================================== --- trunk/release/moma/README 2007-05-27 23:08:27 UTC (rev 78020) +++ trunk/release/moma/README 2007-05-28 00:40:11 UTC (rev 78021) @@ -0,0 +1,6 @@ +These are the tools used to process the Moma reports and post them on the web, +they are missing a few results that used to be part of the shell scripts that +we used to ran in the past. + +The new C# program runs in a couple of seconds, compared to the 20 minute run +that was based on a bunch of repetitive shell commands Added: trunk/release/moma/end =================================================================== --- trunk/release/moma/end 2007-05-27 23:08:27 UTC (rev 78020) +++ trunk/release/moma/end 2007-05-28 00:40:11 UTC (rev 78021) @@ -0,0 +1,4 @@ +</div> +</div> +</body> +</html> Added: trunk/release/moma/head =================================================================== --- trunk/release/moma/head 2007-05-27 23:08:27 UTC (rev 78020) +++ trunk/release/moma/head 2007-05-28 00:40:11 UTC (rev 78021) @@ -0,0 +1,23 @@ +<html> + <head> + <link rel="stylesheet" href="moma.css" type="text/css"> + </head> + <body> + +<h1>Mono Feedback</h1> +<div id="container"> +<div id="content"> +<p>Comment submissions through <a href="http://www.mono-project.com/Moma";>Mono Migration Analysis 1.1</a> + +<p>When present, the <span style="color: #0a0">change:</span> labels +the number of APIs that have been implemented since the original +report was submitted. + +<p>The summary results are not currently available, as I just rewrote +the hundred of messy shell scripts that took forever to run using a <a +href="http://anonsvn.mono-project.com/viewcvs/trunk/release/moma";>C# +program</a>. + +<p>For the previous program summaries, see <a +href="http://primates.ximian.com/~miguel/momareports-previous";>http://primates.ximian.com/~miguel/momareports-previous</a>. + Added: trunk/release/moma/moma.cs =================================================================== --- trunk/release/moma/moma.cs 2007-05-27 23:08:27 UTC (rev 78020) +++ trunk/release/moma/moma.cs 2007-05-28 00:40:11 UTC (rev 78021) @@ -0,0 +1,425 @@ +// +// Moma Report Generator +// +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Text; + + +class Moma { + public static Dictionary<string,int> API = new Dictionary<string, int> (); + public static Dictionary<string,string> TodoExplanation = new Dictionary<string, string> (); + static StreamWriter sw; + public static string outputdir; + + public static void LoadTodoExplanations (string fname) + { + using (FileStream fs = File.OpenRead (fname)){ + StreamReader sr = new StreamReader (fs); + string s; + + while ((s = sr.ReadLine ()) != null){ + int p = s.IndexOf ('-'); + TodoExplanation [s.Substring (0, p)] = s.Substring (p + 1); + } + } + } + + public static void Load (string fname, int kind) + { + using (FileStream fs = File.OpenRead (fname)){ + StreamReader sr = new StreamReader (fs); + string s; + + while ((s = sr.ReadLine ()) != null){ + if (API.ContainsKey (s)) + API [s] = API [s] | kind; + else + API [s] = kind; + } + } + } + + static string CleanHTML (string s) + { + return s.Replace ("<", "<").Replace (">", ">").Replace ("&", "&"); + } + + public static void p (string format, params object [] args) + { + sw.WriteLine (String.Format (format, args)); + } + + public static void concat (string fname) + { + using (FileStream fs = File.OpenRead (fname)){ + StreamReader sr = new StreamReader (fs); + sw.Write (sr.ReadToEnd ()); + sr.Close (); + } + } + + static void Main (string [] args) + { + if (args.Length < 3){ + Console.WriteLine ("rgen ReportDirs ApiDir Output"); + Console.WriteLine ("example:\n"); + Console.WriteLine (" rgen Reports 1.2.4 output"); + return; + } + + Load (Path.Combine (args [1], "todo.txt"), 1); + Load (Path.Combine (args [1], "missing.txt"), 2); + Load (Path.Combine (args [1], "exception.txt"), 4); + + LoadTodoExplanations (Path.Combine (args [1], "monotodo.txt")); + + outputdir = args [2]; + if (!Directory.Exists (outputdir)){ + try { + Directory.CreateDirectory (outputdir); + } catch { + Console.Error.WriteLine ("Failed to create directory {0}", outputdir); + return; + } + } + + if (File.Exists (Path.Combine (outputdir, "index.html"))){ + Console.Error.WriteLine ("File index.html exists in the target directory"); + return; + } + File.Copy ("moma.css", Path.Combine (outputdir, "moma.css")); + + sw = new StreamWriter (File.OpenWrite (Path.Combine (outputdir, "index.html"))); + + Console.WriteLine ("Loaded {0} API definitions", API.Count); + + string [] files = Directory.GetFiles (args [0], "*.txt"); + ArrayList reports = new ArrayList (); + + foreach (string f in files){ + // Ignore all the junk temporary files I have lying around + if (Path.GetFileName (f).Length < 20) + continue; + + Report r = null; + try { + r = new Report (f); + } catch (Exception e) { + Console.WriteLine ("Error on {0} {1}", f, e); + return; + } + + //if (reports.Count == 100) + //break; + + reports.Add (r); + } + Console.WriteLine ("{0} API entry points", Report.GlobalApi.Count); + Console.WriteLine ("{0} reports loaded", reports.Count); + +#if false + foreach (string s in Report.GlobalApi.Keys){ + int v = Report.GlobalApi [s]; + + Console.WriteLine ("{0:x} {1} {2}", v >> 24, v & 0xffffff, s); + } +#endif + + concat ("head"); + + foreach (Report r in reports){ + p ("<div class=\"sub\">"); + p ("<div class='col1'>"); + p ("<p><b>Definitions:</b> {0}</p>", r.Definitions); + p ("</div><div class='col2'>"); + p ("<p align='right'><b>Date:</b> {0}</p>", r.Date.Substring (0, r.Date.IndexOf (' '))); + p ("</div>"); + if (r.Comments.Length > 0) + p ("<p><b>Comments:</b> {0}</p>", CleanHTML (r.Comments)); + p ("<p align=\"right\"><b><a href=\"{0}\">Report</a></b><br>", r.Name); + + r.DumpStats (outputdir); + p ("</div>"); + } + p ("</div>"); + + concat ("side"); + p ("<b>Submissions:</b> {0}", reports.Count); + concat ("end"); + + sw.Close (); + } +} + +public class Report { + Dictionary <string,string> meta = new Dictionary<string,string>(); + Dictionary <string,int> local = new Dictionary<string,int> (); + public static Dictionary <string,int> GlobalApi = new Dictionary<string,int> (); + public string Date; + public string Ip; + public string Definitions; + public string Name; + public string Comments; + + class CountCompare : IComparer { + Report r; + + public CountCompare (Report r) + { + this.r = r; + } + + public int Compare (object x, object y) + { + int xn = r.local [(string) x]; + int yn = r.local [(string) y]; + + return (yn & 0xffffff) - (xn & 0xffffff); + } + } + + class PInvokeCompare : IComparer { + + // Some PINV declarations contain newlines in their definitions, skip if we fail + public int Compare (object x, object y) + { + string sx = (string) x; + int px = sx.IndexOf ('-'); + if (px == -1) + return 0; + + string libx = sx.Substring (px+1); + + string sy = (string) y; + int py = sy.IndexOf ('-'); + if (py == -1) + return 0; + string liby = sy.Substring (py+1); + + int c = libx.CompareTo (liby); + if (c != 0) + return c; + + string apix = ""; + try { + apix = sx.Substring (0, px); + } catch { + Console.WriteLine ("Got [{0}] and {1}", sx, px); + } + string apiy = sy.Substring (0, py); + + return apix.CompareTo (apiy); + } + } + + PInvokeCompare pinvoke_compare = new PInvokeCompare(); + + public Report (string f) + { + Name = Path.GetFileName (f); + using (FileStream fs = File.OpenRead (f)){ + StreamReader sr = new StreamReader (fs); + + Date = sr.ReadLine (); + Ip = sr.ReadLine (); + + string r = ReadMeta (sr); + + Definitions = meta ["@Definitions"]; + Comments = meta ["@Comments"]; + + for (; r != null && r.Length > 6; r = sr.ReadLine ()) { + int ikind = 0; + + if (r [r.Length-1] == '\r') + r = r.Substring (0, r.Length-1); + + switch (r.Substring (0, 6)){ + case "[TODO]": ikind = 1 << 24; break; + case "[NIEX]": ikind = 2 << 24; break; + case "[MISS]": ikind = 4 << 24; break; + case "[PINV]": ikind = 8 << 24; break; + } + string rest = r.Substring (7); + + Register (local, ikind, rest); + Register (GlobalApi, ikind, rest); + } + } + } + + void Register (Dictionary<string,int> api, int ikind, string rest) + { + if (api.ContainsKey (rest)){ + int v = api [rest]; + + api [rest] = (ikind | (v & 0x7f000000)) | + ((v & 0xffffff) + 1); + } else + api [rest] = ikind + 1; + } + + // + // Reads the line that start with @ and sticks them in the metadata + // dictionary. Other entries (the ones that start with [ are returned + // for processing + // + string ReadMeta (StreamReader sr) + { + string s; + + while ((s = sr.ReadLine ()) != null){ + if (s.Length == 0 || s [0] == '[') + return s; + + if (s [0] != '@') + return s; + + int p = s.IndexOf (':'); + string v = s.Substring (p + 2); + meta [s.Substring (0,p)] = v; + } + return s; + } + + void p (StreamWriter sw, string format, params object [] args) + { + sw.WriteLine (String.Format (format, args)); + } + + static string map (int n) + { + // In order of usefulness in the report. + + if ((n & 2) != 0) + return "MISS"; + if ((n & 4) != 0) + return "NIEX"; + if ((n & 1) != 0) + return "TODO"; + + return "UNKN"; + } + public void DumpStats (string outputdir) + { + int todo = 0, miss = 0, niex = 0, pinv = 0; + int change = 0; + + ArrayList implemented = new ArrayList (); + ArrayList pinvokes = new ArrayList (); + ArrayList issues = new ArrayList (); + + using (FileStream fs = File.OpenWrite (Path.Combine (outputdir, Name))){ + StreamWriter rw = new StreamWriter (fs); + + foreach (string apicall in local.Keys){ + int k; + int c; + + c = local [apicall]; + if ((c & (8 << 24)) != 0){ + pinv++; + pinvokes.Add (apicall); + } else { + if (Moma.API.TryGetValue (apicall, out k)){ + if ((k & 1) != 0) + todo++; + else if ((k & 2) != 0) + miss++; + else if ((k & 4) != 0) + niex++; + + issues.Add (apicall); + } else { + change++; + implemented.Add (apicall); + } + } + } + + if (issues.Count > 0){ + p (rw, ""); + p (rw, "Pending issues:"); + + issues.Sort (new CountCompare (this)); + foreach (string s in issues){ + int n; + + // + // If its listed on the API file, use the info from that + // file, instead of the one that was submitted + // + if (!Moma.API.TryGetValue (s, out n)) + n = local [s]; + + p (rw, " {0,4} [{1}] {2}", n & 0xffffff, map (n), s.Substring (s.IndexOf (' ')+1)); + + // If it is a todo, add the annotation of what the message is + if ((n & 1) != 0){ + p (rw, " {0}", Moma.TodoExplanation [s]); + } + } + } + + if (pinvokes.Count > 0){ + p (rw, ""); + p (rw, "****************************************************"); + p (rw, "P/Invokes made by this program"); + try { + pinvokes.Sort (pinvoke_compare); + } catch { + Console.WriteLine ("On report {0}",Name); + } + string clib = ""; + + foreach (string s in pinvokes){ + int pos = s.IndexOf ('-'); + if (pos == -1) + pos = 0; + string lib = s.Substring (pos + 1); + + if (lib != clib){ + p (rw, ""); + p (rw, " Library: {0}", lib); + clib = lib; + } + p (rw, " {0}", s.Substring (0, pos)); + } + } + + if (implemented.Count > 0){ + p (rw, ""); + p (rw, "****************************************************"); + p (rw, "Methods that have been implemented:"); + foreach (string s in implemented) + p (rw, " {0}", s.Substring (s.IndexOf (' ')+1)); + + } + rw.Flush (); + } + + // + // Summary + // + if (miss == 0 && niex == 0 && todo == 0){ + if (pinv == 0) + Moma.p ("<b>All done</b>"); + else + Moma.p ("<b>Only P/Invokes pending</b>"); + Moma.p ("<br>"); + } + if (miss != 0) + Moma.p ("{0} miss.", miss); + if (niex != 0) + Moma.p ("{0} niex.", niex); + if (todo != 0) + Moma.p ("{0} todo.", todo); + if (pinv != 0) + Moma.p ("{0} pinv.", pinv); + if (change != 0) + Moma.p ("<span style='color: #0a0;'>change: {0}</span>", change); + } +} Property changes on: trunk/release/moma/moma.cs ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/release/moma/moma.css =================================================================== --- trunk/release/moma/moma.css 2007-05-27 23:08:27 UTC (rev 78020) +++ trunk/release/moma/moma.css 2007-05-28 00:40:11 UTC (rev 78021) @@ -0,0 +1,40 @@ +body { + align: center; + background-color: #fff; + padding-left: 5%; + width: 80%; + color: #000; +} + +h1 { + background: #7A6A99; + color: #fff; + padding: 15pt; +} +#content { + width: 65%; + float: left; +} +#sidebar { + top: 0; + left: 30%; + float: right; +} +.sub { + border: 2px solid #5B5767; + background: #E0E0E0; + padding-left: 1em; + padding-right: 1em; + text-align: left; + margin-bottom: 1em; +} + +.col1 { + float: left; + width: 50%; +} + +.col2 { + float: left; + width: 50%; +} \ No newline at end of file Added: trunk/release/moma/moma.exe =================================================================== (Binary files differ) Property changes on: trunk/release/moma/moma.exe ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/release/moma/moma.exe.mdb =================================================================== (Binary files differ) Property changes on: trunk/release/moma/moma.exe.mdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/release/moma/side =================================================================== --- trunk/release/moma/side 2007-05-27 23:08:27 UTC (rev 78020) +++ trunk/release/moma/side 2007-05-28 00:40:11 UTC (rev 78021) @@ -0,0 +1,3 @@ +<div id="sidebar"> +<div class="sub" style="padding: 15pt;"> + _______________________________________________ Mono-patches maillist - [email protected] http://lists.ximian.com/mailman/listinfo/mono-patches
