Changeset f9798ad in rtems-libbsd

Timestamp:

05/30/16 23:49:31 (7 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

ab5cd63

Parents:

70d52b8

Message:

Add a stats report command.

The report shows the level of changes we have made to the FreeBSD code.

Files:

• builder.py (modified) (5 diffs)
• freebsd-to-rtems.py (modified) (6 diffs)
• libbsd.txt (modified) (2 diffs)

builder.py

@@ -56 +56 @@
 filesProcessedCount = 0
 filesProcessed = []
+filesTotal = 0
+filesTotalLines = 0
+filesTotalInserts = 0
+filesTotalDeletes = 0
+diffDetails = { }
 
 verboseInfo = 1
@@ -65 +70 @@
     return verboseLevel >= level
 
-def changedFileSummary():
+def changedFileSummary(statsReport = False):
+
+    global filesTotal, filesTotalLines, filesTotalInserts, filesTotalDeletes
+
     if isDiffMode == False:
-        print('%d file(s) were changed:' % (filesProcessedCount))
         if verbose():
+            print('%d file(s) were changed:' % (filesProcessedCount))
             for f in sorted(filesProcessed):
                 print(' %s' % (f))
+        else:
+            print('%d file(s) were changed.' % (filesProcessedCount))
+    if statsReport:
+        print('Stats Report:')
+        transparent = filesTotal - len(diffDetails)
+        changes = filesTotalInserts + filesTotalDeletes
+        opacity = (float(changes) / (filesTotalLines + changes)) * 100.0
+        print(' Total File(s):%d  Unchanged:%d (%.1f%%)  Changed:%d' \
+              '   Opacity:%5.1f%% Lines:%d Edits:%d (+):%d (-):%d'  % \
+              (filesTotal, transparent, (float(transparent) / filesTotal) * 100.0, len(diffDetails), \
+               opacity, filesTotalLines, changes, filesTotalInserts, filesTotalDeletes))
+        #
+        # Sort by opacity.
+        #
+        ordered_diffs = sorted(diffDetails.items(), key = lambda diff: diff[1].opacity, reverse = True)
+        for f in ordered_diffs:
+            print('  %s' % (diffDetails[f[0]].status()))
 
 def readFile(name):
@@ -105 +130 @@
     def __str__(self):
         return self.msg
+
+#
+# Diff Record
+#
+class diffRecord:
+    def __init__(self, src, dst, orig, diff, inserts, deletes):
+        self.src = src
+        self.dst = dst
+        self.orig = orig
+        self.diff = diff
+        self.lines = len(orig)
+        self.inserts = inserts
+        self.deletes = deletes
+        self.changes = inserts + deletes
+        self.opacity = (float(self.changes) / (self.lines + self.changes)) * 100.0
+
+    def __repr__(self):
+        return self.src
+
+    def status(self):
+        return 'opacity:%5.1f%% edits:%4d (+):%-4d (-):%-4d %s' % \
+            (self.opacity, self.changes, self.inserts, self.deletes, self.src)
 
 #
@@ -222 +269 @@
         sys.exit(2)
 
+def diffSource(dstLines, srcLines, src, dst):
+    global filesTotal, filesTotalLines, filesTotalInserts, filesTotalDeletes
+    #
+    # Diff, note there is no line termination on each string.  Expand the
+    # generator to list because the generator is not reusable.
+    #
+    diff = list(difflib.unified_diff(dstLines,
+                                     srcLines,
+                                     fromfile = src,
+                                     tofile = dst,
+                                     n = 5,
+                                     lineterm = ''))
+    inserts = 0
+    deletes = 0
+    if len(diff) > 0:
+        if src in diffDetails and \
+           diffDetails[src].dst != dst and diffDetails[src].diff != diff:
+            raise error('repeated diff of file different: src:%s dst:%s' % (src, dst))
+        for l in diff:
+            if l[0] == '-':
+                deletes += 1
+            elif l[0] == '+':
+                inserts += 1
+        diffDetails[src] = diffRecord(src, dst, srcLines, diff, inserts, deletes)
+
+    #
+    # Count the total files, lines and the level of changes.
+    #
+    filesTotal += 1
+    filesTotalLines += len(srcLines)
+    filesTotalInserts += inserts
+    filesTotalDeletes += deletes
+
+    return diff
+
 #
 # Converters provide a way to alter the various types of code. The conversion
@@ -277 +359 @@
 
         #
-        # Diff, note there is no line termination on each string.  Expand the
-        # generator to list because the generator is not reusable.
-        #
-        diff = list(difflib.unified_diff(dstLines,
-                                         srcLines,
-                                         fromfile = src,
-                                         tofile = dst,
-                                         n = 5,
-                                         lineterm = ''))
+        # Diff, note there is no line termination on each string.
+        #
+        diff = diffSource(dstLines, srcLines, src, dst)
 
         #

freebsd-to-rtems.py

@@ -49 +49 @@
 isEarlyExit = False
 isOnlyBuildScripts = False
+statsReport = False
 
 def usage():
@@ -58 +59 @@
     print("  -m|--makefile     Warning: depreciated and will be removed ")
     print("  -b|--buildscripts just generate the build scripts")
+    print("  -S|--stats        Print a statistics report")
     print("  -R|--reverse      default FreeBSD -> RTEMS, reverse that")
     print("  -r|--rtems        RTEMS Libbsd directory (default: '.')")
@@ -65 +67 @@
 # Parse the arguments
 def parseArguments():
-    global isForward, isEarlyExit
+    global isForward, isEarlyExit, statsReport
     global isOnlyBuildScripts
     try:
         opts, args = getopt.getopt(sys.argv[1:],
-                                   "?hdDembRr:f:v",
+                                   "?hdDembSRr:f:v",
                                    [ "help",
                                      "help",
@@ -78 +80 @@
                                      "buildscripts"
                                      "reverse"
+                                     "stats"
                                      "rtems="
                                      "freebsd="
@@ -100 +103 @@
         elif o in ("-b", "--buildscripts") or o in ("-m", "--makefile"):
             isOnlyBuildScripts = True
+        elif o in ("-S", "--stats"):
+            statsReport = True
         elif o in ("-R", "--reverse"):
             isForward = False
@@ -153 +158 @@
         wafGen.processSource(isForward)
     wafGen.generate(libbsd.rtems_version())
-    builder.changedFileSummary()
+    builder.changedFileSummary(statsReport)
 except IOError as ioe:
     print('error: %s' % (str(ioe)))

libbsd.txt

@@ -615 +615 @@
   -m|--makefile     Warning: depreciated and will be removed
   -b|--buildscripts just generate the build scripts
+  -S|--stats        Print a statistics report
   -R|--reverse      default FreeBSD -> RTEMS, reverse that
-  -r|--rtems        RTEMS directory
-  -f|--freebsd      FreeBSD directory
+  -r|--rtems        RTEMS Libbsd directory (default: '.')
+  -f|--freebsd      FreeBSD SVN directory (default: 'freebsd-org')
   -v|--verbose      enable verbose output mode
 ----
@@ -682 +683 @@
 . Run `./create-kernel-namespace.sh` if you imported kernel space headers.  Add only your new defines via `git add -p rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h`.
 . Create one commit from this.
+
+The -S or --stats option generates reports the changes we have made to
+FreeBSD. If the code has been reserved into the original FreeBSD tree it will
+show nothing has changed. To see what we have change:
+
+ $ cd freebsd-org
+ $ git checkout -- .
+ $ cd ..
+ $ ./freebsd-to-rtems.py -R -S -d
+
+The report lists the files change based on the opacity level. The opacity is a
+measure on how much of a file differs from the original FreeBSD source. The
+lower the value the more transparent the source file it.
 
 == Initialization of the BSD Library