5 files changed, 76 insertions, 14 deletions

diff --git a/xdelta3/Makefile b/xdelta3/Makefile
index 1bb4664..968ab15 100755
--- a/xdelta3/Makefile
+++ b/xdelta3/Makefile
@@ -30,7 +30,7 @@ EXTRA = Makefile COPYING linkxd3lib.c badcopy.c www \
         draft-korn-vcdiff.txt xdelta3.vcproj badcopy.vcproj
 
 # $Format: "REL=$Xdelta3Version$" $
-REL=0j
+REL=0k
 RELDIR = xdelta3$(REL)
 
 all: xdelta3-debug xdelta3 $(PYTGT)
@@ -50,6 +50,7 @@ tar:
 
 clean:
         rm -f $(TARGETS)
+        rm -rf build Debug Release
 
 xdelta3: $(SOURCES)
         $(CC) -O3 -Wall -Wshadow xdelta3.c -lm -o xdelta3 \
diff --git a/xdelta3/setup.py b/xdelta3/setup.py
index 8691bfb..ffde8ad 100755
--- a/xdelta3/setup.py
+++ b/xdelta3/setup.py
@@ -33,7 +33,7 @@ xdelta3_ext = Extension('xdelta3',
                                          ])
 
 # $Format: "REL='$Xdelta3Version$'" $
-REL='0j'
+REL='0k'
 
 setup(name='xdelta3',
       version=REL,
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 06190d0..e80b332 100755
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -84,7 +84,7 @@ const char* xd3_mainerror(int err_num);
 #define PRINTHDR_SPECIAL -4378291
 
 /* The number of soft-config variables.  */
-#define XD3_SOFTCFG_VARCNT 1
+#define XD3_SOFTCFG_VARCNT 10
 
 /* this is used as in XPR(NT XD3_LIB_ERRMSG (stream, ret)) to print an error message
  * from the library. */
@@ -2278,7 +2278,8 @@ main_input (xd3_cmd     cmd,
                   (got < XD3_SOFTCFG_VARCNT-1 && *e == 0) ||
                   (got == XD3_SOFTCFG_VARCNT-1 && *e != 0))
                 {
-                  XPR(NT "invalid string match specifier (-C)\n");
+                  XPR(NT "invalid string match specifier (-C) %d: %s\n",
+                      got, s);
                   return EXIT_FAILURE;
                 }
             }
diff --git a/xdelta3/xdelta3-regtest.py b/xdelta3/xdelta3-regtest.py
index 536c086..4cb3a35 100755
--- a/xdelta3/xdelta3-regtest.py
+++ b/xdelta3/xdelta3-regtest.py
@@ -21,7 +21,7 @@
 # TODO: This is really part test, part performance evaluation suite, and
 # really incomplete.
 
-import os, sys, math, re, time, types, array
+import os, sys, math, re, time, types, array, random
 import xdelta3
 
 HIST_SIZE      = 10   # the number of buckets
@@ -31,7 +31,7 @@ TIME_TOO_SHORT = 0.050
 
 MIN_REPS       = 1
 MAX_REPS       = 1
-SKIP_TRIALS    = 1
+SKIP_TRIALS    = 2
 MIN_TRIALS     = 3
 MAX_TRIALS     = 15
 
@@ -216,6 +216,15 @@ class RcsFile:
         os.remove(self.Verf(self.totrev-1))
         os.remove(self.Verf(self.totrev-2))
         return ntrials
+
+    def AppendVersion(self, f, n):
+        self.Checkout(n)
+        rf = open(self.Verf(n), "r")
+        data = rf.read()
+        f.write(data)
+        rf.close()
+        return len(data)
+
 #
 # This class recursively scans a directory for rcsfiles
 class RcsFinder:
@@ -428,6 +437,7 @@ def RunCommandIO(args,infn,outfn):
 
 def RunXdelta3(args):
     try:
+        #print 'RUN', args
         xdelta3.main(args)
     except Exception, e:
         raise CommandError(args, "xdelta3.main exception")
@@ -453,6 +463,7 @@ class Xdelta3Pair:
         self.type        = 'xdelta3'
         self.decode_args = '-dqf'
         self.encode_args = '-eqf'
+        self.extra       = []
         self.presrc      = '-s'
         self.canrep      = 1
 
@@ -465,8 +476,9 @@ class Xdelta3Pair:
 
     def Run(self,trial,reps):
         RunXdelta3(['-P',
-                    '%d' % reps,
-                    self.encode_args,
+                    '%d' % reps] +
+                   self.extra + 
+                   [self.encode_args,
                     self.presrc,
                     self.old,
                     self.new,
@@ -498,7 +510,7 @@ def Test():
                                                                         len(rcsf.skipped))
     print StatList([x.rcssize for x in rcsf.rcsfiles], "rcssize", 1).str
     print StatList([x.totrev for x in rcsf.rcsfiles], "totrev", 1).str
-    pairs = rcsf.PairsByDate(Xdelta3Pair())
+    return rcsf
 
 def Decimals(max):
     l = [0]
@@ -547,6 +559,52 @@ def ReportSpeed(L,tr,desc):
     print '%s 0-run length %u: dsize %u: time %.3f ms: encode %.0f B/sec: in %ux%u trials' % \
           (desc, L, tr.r1.dsize, tr.time.mean * 1000.0, ((L+tr.r1.dsize) / tr.time.mean), tr.trials, tr.reps)
 
+def BigFileRuns(rcsf):
+    rand = random.Random()
+    f1 = open(TMPDIR + "/big.1", "w")
+    f2 = open(TMPDIR + "/big.2", "w")
+    f1sz = 0
+    f2sz = 0
+    for file in rcsf.rcsfiles:
+        if file.versions < 2:
+            continue
+        r1 = 0
+        r2 = 0
+        while r1 == r2:
+            r1 = rand.randint(0, len(file.versions) - 1)
+            r2 = rand.randint(0, len(file.versions) - 1)
+        f1sz += file.AppendVersion(f1, r1)
+        f2sz += file.AppendVersion(f2, r2)
+
+    f1.close()
+    f2.close()
+
+    print "Test input sizes: %d %d" % (f1sz, f2sz)
+
+    while 1:
+
+        extras = [
+            ['-1'],
+            ['-C', '32,32,4,2,2,1,0,0,64,0'],
+            ['-9'],
+            ['-C', '64,64,4,128,16,0,1,8,128,0'],
+            ]
+
+        for extra in extras:
+            runner = Xdelta3Pair()
+            runner.extra = extra
+            result = TimeRun(runner.Runner(TMPDIR + "/big.1", 1,
+                                           TMPDIR + "/big.2", 2))
+
+            print 'testing %s dsize %d: time %.7f: in %u/%u trials' % \
+                  (extra,
+                   result.r1.dsize,
+                   result.time.mean,
+                   result.trials,
+                   result.reps)
+        # continue
+    # end
+
 def RunSpeed():
     for L in Decimals(MAX_RUN):
         SetFileSize(RUNFILE, L)
@@ -558,9 +616,11 @@ def RunSpeed():
 if __name__ == "__main__":
     try:
         os.mkdir(TMPDIR)
-        Test()
-        RunSpeed()
+        rcsf = Test()
+        #rcsf.PairsByDate(Xdelta3Pair())
+        #RunSpeed()
+        BigFileRuns(rcsf)
     except CommandError:
         pass
-    else:
-        RunCommand(['rm', '-rf', TMPDIR])
+
+    RunCommand(['rm', '-rf', TMPDIR])
diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj
index 4bb85e5..3775204 100755
--- a/xdelta3/xdelta3.prj
+++ b/xdelta3/xdelta3.prj
@@ -9,7 +9,7 @@
 (Checkin-Login jmacd)
 (Populate-Ignore ())
 (Project-Keywords
- (Xdelta3Version "0j")
+ (Xdelta3Version "0k")
  (WWWLeftNavBar "<table cellpadding=\"20px\" width=700> <tr> <td class=\"leftbdr\" valign=top height=600 width=100> <div class=\"leftbody\"> <h1>Xdelta</h1> <a href=\"xdelta3.html\">overview</a><br> <a href=\"xdelta3-cmdline.html\">command&nbsp;line</a><br> <a href=\"xdelta3-api-guide.html\">api&nbsp;guide</a><br> <br><a href=\"http://xdelta.org\">xdelta.org</a></h2> </div> </td> <td valign=top width=500>")
  )
 (Files