7 files changed, 69 insertions, 57 deletions

diff --git a/xdelta3/Makefile b/xdelta3/Makefile
index e5e5eeb..4b25ab7 100755
--- a/xdelta3/Makefile
+++ b/xdelta3/Makefile
@@ -38,11 +38,11 @@ PYTGT = build/lib.linux-i686-2.4/xdelta3.so
 
 PYFILES = xdelta3-regtest.py setup.py
 
-EXTRA = Makefile COPYING linkxd3lib.c badcopy.c \
+EXTRA = Makefile COPYING linkxd3lib.c badcopy.c xdelta3.swig \
         draft-korn-vcdiff.txt xdelta3.vcproj badcopy.vcproj
 
 # $Format: "REL=$Xdelta3Version$" $
-REL=0n
+REL=0o
 RELDIR = xdelta3$(REL)
 
 all: xdelta3-debug xdelta3 $(PYTGT)
@@ -113,7 +113,6 @@ xdelta3_wrap.o: xdelta3_wrap.c
 
 xdelta3module.so: xdelta3_wrap.o xdelta3.o
         ld -shared xdelta3.o xdelta3_wrap.o -o xdelta3module.so /usr/lib/libpython2.4.so
-        cp -f xdelta3module.so /usr/lib/python2.4/site-packages/xdelta3module.so
 
 xdelta3-decoder: $(SOURCES)
         $(CC) -O2 -Wall -Wshadow xdelta3.c \
diff --git a/xdelta3/setup.py b/xdelta3/setup.py
index 24b80de..d7f11c4 100755
--- a/xdelta3/setup.py
+++ b/xdelta3/setup.py
@@ -52,7 +52,7 @@ xdelta3_ext = Extension('xdelta3main',
                                                ])
 
 # $Format: "REL='$Xdelta3Version$'" $
-REL='0n'
+REL='0o'
 
 # This provides xdelta3.main(), which calls the xdelta3 command-line main()
 # from python.
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 8db266d..9e47d61 100755
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -326,7 +326,7 @@ static int
 main_version (void)
 {
   /* $Format: "  P(RINT \"VERSION=3.$Xdelta3Version$\\n\");" $ */
-  P(RINT "VERSION=3.0n\n");
+  P(RINT "VERSION=3.0o\n");
   return EXIT_SUCCESS;
 }
 
diff --git a/xdelta3/xdelta3-regtest.py b/xdelta3/xdelta3-regtest.py
index 33f0715..1b84940 100755
--- a/xdelta3/xdelta3-regtest.py
+++ b/xdelta3/xdelta3-regtest.py
@@ -44,10 +44,10 @@ MAX_RUN        = 1000 * 1000 * 10
 
 # How many results per round
 MAX_RESULTS = 100
-KEEP_P = (0.3)
+KEEP_P = (0.5)
 FAST_P = (0.0)
 SLOW_P = (0.0)
-FILE_P = (0.50)
+FILE_P = (0.30)
 
 CONFIG_ORDER = [ 'large_look',
                  'large_step',
@@ -62,16 +62,16 @@ CONFIG_ORDER = [ 'large_look',
 
 def INPUT_SPEC(rand):
     return {
-    'large_look' : lambda d: rand.choice([9]),
-    'large_step' : lambda d: rand.choice([4, 5]),
+    'large_look' : lambda d: rand.choice([9, 11, 13, 15]),
+    'large_step' : lambda d: rand.choice([11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 ]),
 
-    'small_chain'  : lambda d: rand.randrange(4, 65, 4),
-    'small_lchain' : lambda d: rand.randrange(1, 17, 1),
+    'small_chain'  : lambda d: rand.choice([1]),
+    'small_lchain' : lambda d: rand.choice([1]),
 
-    'max_lazy'     : lambda d: rand.choice([18]),
-    'long_enough'  : lambda d: rand.choice([35]),
+    'max_lazy'     : lambda d: rand.choice([9, 13, 18]),
+    'long_enough'  : lambda d: rand.choice([9, 13, 18]),
 
-    'small_look'   : lambda d: 4,
+    'small_look'   : lambda d: rand.choice([4]),
     'promote'      : lambda d: 0,
     'trylazy'      : lambda d: 1,
     'ssmatch'      : lambda d: 0,
@@ -782,12 +782,8 @@ class RandomTester:
         t_rect = time_major - 1.0
         s_rect = size_minor - 1.0
 
-        assert(time_major >= size_minor)
-
         rect_ratio = s_rect / t_rect
 
-        assert(rect_ratio <= 1.000001)
-
         for test in self.results:
 
             # Transform the major min/max region linearly to normalize the
@@ -851,6 +847,7 @@ class RandomTester:
                 test_totals[c].append(test)
             #end
             s = 0.0
+            self.results.append(test)
             r.append(test.config())
             all_r = test_totals[c]
             for t in all_r:
@@ -867,7 +864,6 @@ class RandomTester:
             print 'Score: %0.6f %s (%.1f%s%s)' % \
                   (test.score, test, s / len(all_r), stars, (len(all_r) > 2) and (' in %d' % len(all_r)) or "")
         #end
-
         
         return r
     #end
@@ -887,19 +883,27 @@ if __name__ == "__main__":
     try:
         RunCommand(['rm', '-rf', TMPDIR])
         os.mkdir(TMPDIR)
-        rcsf = Test()
+        #rcsf = Test()
         configs = []
 
         while 1:
             #f1 = '/tmp/big.1'
             #f2 = '/tmp/big.2'
             test = RandomTester(configs)
-            f1, f2 = test.MakeBigFiles(rcsf)
+            #f1, f2 = test.MakeBigFiles(rcsf)
             while not test.HasEnoughResults():
+                f1 = '/tmp/WESNOTH_tmp/wesnoth-1.1.12.tar'
+                f2 = '/tmp/WESNOTH_tmp/wesnoth-1.1.13.tar'
+                #f1 = '/tmp/big.1'
+                #f2 = '/tmp/big.2'
                 test.RandomBigRun(f1, f2)
             #end
             configs = test.ScoreTests()
-            test.Reset()
+
+            #test.Reset()
+            test.results = test.results[0:len(configs)]
+            configs = []
+            #break
             #end
         #end
 
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 7f9d7ab..ca8d7c9 100755
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -832,7 +832,7 @@ int     xd3_encode_memory (const uint8_t *input,
                            usize_t        input_size,
                            const uint8_t *source,
                            usize_t        source_size,
-                           uint8_t       *output,
+                           uint8_t       *output_buffer,
                            usize_t       *output_size,
                            usize_t        avail_output,
                            int            flags);
@@ -842,7 +842,7 @@ int     xd3_decode_memory (const uint8_t *input,
                            usize_t        input_size,
                            const uint8_t *source,
                            usize_t        source_size,
-                           uint8_t       *output,
+                           uint8_t       *output_buf,
                            usize_t       *output_size,
                            usize_t        avail_output,
                            int            flags);
diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj
index 67bb489..a1a3fb9 100755
--- a/xdelta3/xdelta3.prj
+++ b/xdelta3/xdelta3.prj
@@ -1,34 +1,34 @@
 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 4)
 (Project-Description "")
-(Project-Version xdelta3 0 13)
-(Parent-Version xdelta3 0 12)
-(Version-Log "fix /dont_run_xdelta3_test_as_root stupid")
+(Project-Version xdelta3 0 14)
+(Parent-Version xdelta3 0 13)
+(Version-Log "add FASTEST, update DEFAULT compression levels")
 (New-Version-Log "")
-(Checkin-Time "Sun, 04 Feb 2007 02:47:02 -0800")
+(Checkin-Time "Wed, 07 Feb 2007 03:07:16 -0800")
 (Checkin-Login jmacd)
 (Populate-Ignore ())
 (Project-Keywords
- (Xdelta3Version "0n")
+ (Xdelta3Version "0o")
  )
 (Files
   (COPYING (xdelta3/b/29_COPYING 1.1 644))
 
-  (xdelta3-cfgs.h (xdelta3/9_xdelta3-cf 1.4 744))
+  (xdelta3-cfgs.h (xdelta3/9_xdelta3-cf 1.5 744))
   (xdelta3-decode.h (xdelta3/b/30_xdelta3-de 1.4 744))
   (xdelta3-djw.h (xdelta3/8_xdelta3-dj 1.5 744))
   (xdelta3-fgk.h (xdelta3/7_xdelta3-fg 1.3 744))
   (xdelta3-list.h (xdelta3/6_xdelta3-li 1.3 644))
-  (xdelta3-main.h (xdelta3/5_xdelta3-ma 1.8 744))
-  (xdelta3-python.h (xdelta3/4_xdelta3-py 1.3 644))
-  (xdelta3-regtest.py (xdelta3/10_xdelta3-re 1.7 744))
+  (xdelta3-main.h (xdelta3/5_xdelta3-ma 1.9 744))
+  (xdelta3-python.h (xdelta3/4_xdelta3-py 1.4 744))
+  (xdelta3-regtest.py (xdelta3/10_xdelta3-re 1.8 744))
   (xdelta3-second.h (xdelta3/3_xdelta3-se 1.4 744))
-  (xdelta3-test.h (xdelta3/2_xdelta3-te 1.7 744))
-  (xdelta3.c (xdelta3/16_xdelta3.c 1.7 744))
-  (xdelta3.h (xdelta3/1_xdelta3.h 1.6 744))
+  (xdelta3-test.h (xdelta3/2_xdelta3-te 1.8 744))
+  (xdelta3.c (xdelta3/16_xdelta3.c 1.8 744))
+  (xdelta3.h (xdelta3/1_xdelta3.h 1.7 744))
 
-  (Makefile (xdelta3/0_Makefile 1.6 744))
-  (setup.py (xdelta3/11_setup.py 1.3 744))
+  (Makefile (xdelta3/0_Makefile 1.7 744))
+  (setup.py (xdelta3/11_setup.py 1.4 744))
 
   (draft-korn-vcdiff.txt (xdelta3/b/22_draft-korn 1.1 644))
 
@@ -39,6 +39,9 @@
   (README (xdelta3/b/31_README 1.1 744))
   (badcopy.vcproj (xdelta3/b/32_badcopy.vc 1.1 744))
   (xdelta3.vcproj (xdelta3/b/33_xdelta3.vc 1.2 744))
+
+  (xdelta3.swig (xdelta3/b/27_xdelta3.sw 1.1 744))
+
 )
 (Merge-Parents)
 (New-Merge-Parents)
diff --git a/xdelta3/xdelta3.swig b/xdelta3/xdelta3.swig
index 4397b9d..9546e42 100755
--- a/xdelta3/xdelta3.swig
+++ b/xdelta3/xdelta3.swig
@@ -1,29 +1,35 @@
 %module xdelta3
+%import cstring.i
 %{
 #include "xdelta3.h"
 
-DL_EXPORT(void) initxdelta3 (void)
-{
-  SWIG_init();
-}
+#undef SWIG_init
+#undef SWIG_name
+
+#define SWIG_init    initxdelta3
+#define SWIG_name    "xdelta3"
 
 %}
 
-int     xd3_encode_memory (const uint8_t *input,
-                           usize_t        input_size,
-                           const uint8_t *source,
-                           usize_t        source_size,
-                           uint8_t       *output,
-                           usize_t       *output_size,
-                           usize_t        avail_output,
-                           int            flags);
+%cstring_input_binary(const char *input, unsigned int input_size);
+%cstring_input_binary(const char *source, unsigned int source_size);
+%cstring_output_withsize(char *output_buf, unsigned int avail_output);
 
-int     xd3_decode_memory (const uint8_t *input,
-                           usize_t        input_size,
-                           const uint8_t *source,
-                           usize_t        source_size,
-                           uint8_t       *output,
-                           usize_t       *output_size,
-                           usize_t        avail_output,
+int     xd3_encode_memory (const char *input,
+                           unsigned int input_size,
+                           const char *source,
+                           unsigned int source_size,
+                           char               *output_buf,
+                           unsigned int       *OUTPUT,
+                           unsigned int        avail_output,
                            int            flags);
 
+int     xd3_decode_memory (const char         *input,
+                           unsigned int        input_size,
+                           const char         *source,
+                           unsigned int        source_size,
+                           char               *output_buf,
+                           unsigned int       *OUTPUT,
+                           unsigned int        avail_output,
+                           int                 flags);
+