diff options
author | josh.macdonald <jmacd@users.noreply.github.com> | 2007-02-11 02:16:27 +0000 |
---|---|---|
committer | josh.macdonald <jmacd@users.noreply.github.com> | 2007-02-11 02:16:27 +0000 |
commit | a5f03073f9a5ce6f25255566803f9ad9fcf1c469 (patch) | |
tree | 5d4447b2d0b7995cdfebc7a005c17e52f7fab0f8 /xdelta3/xdelta3.h | |
parent | e6a4d603ed05dd9d7e04311ef351700b60852dae (diff) |
Fixes bugs in XDELTA environment variable.
Removes stream.srcwin_size variable, uses stream.src->blksize instead, to address performance regression from xdelta1. Changes the order of checksum computation to be like xdelta1, insert checksums in reverse to give preference to earlier matches.
Removes svn:executable from files.
Diffstat (limited to 'xdelta3/xdelta3.h')
-rw-r--r--[-rwxr-xr-x] | xdelta3/xdelta3.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h index e6c9e20..8c11000 100755..100644 --- a/xdelta3/xdelta3.h +++ b/xdelta3/xdelta3.h | |||
@@ -38,11 +38,6 @@ | |||
38 | #define XD3_DEFAULT_WINSIZE (1U << 18) | 38 | #define XD3_DEFAULT_WINSIZE (1U << 18) |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | /* This is a unit of how far to advance the checksum position in one go. */ | ||
42 | #ifndef XD3_DEFAULT_CKSUM_ADVANCE | ||
43 | #define XD3_DEFAULT_CKSUM_ADVANCE (1U << 14) | ||
44 | #endif | ||
45 | |||
46 | /* Default total size of the source window used in xdelta3-main.h */ | 41 | /* Default total size of the source window used in xdelta3-main.h */ |
47 | #ifndef XD3_DEFAULT_SRCWINSZ | 42 | #ifndef XD3_DEFAULT_SRCWINSZ |
48 | #define XD3_DEFAULT_SRCWINSZ (1U << 26) | 43 | #define XD3_DEFAULT_SRCWINSZ (1U << 26) |
@@ -583,7 +578,6 @@ struct _xd3_config | |||
583 | usize_t winsize; /* The encoder window size. */ | 578 | usize_t winsize; /* The encoder window size. */ |
584 | usize_t sprevsz; /* How far back small string matching goes */ | 579 | usize_t sprevsz; /* How far back small string matching goes */ |
585 | usize_t iopt_size; /* entries in the instruction-optimizing buffer */ | 580 | usize_t iopt_size; /* entries in the instruction-optimizing buffer */ |
586 | usize_t srcwin_size; /* Initial size of the source-window lookahead */ | ||
587 | usize_t srcwin_maxsz; /* srcwin_size grows by a factor of 2 when no matches are found */ | 581 | usize_t srcwin_maxsz; /* srcwin_size grows by a factor of 2 when no matches are found */ |
588 | 582 | ||
589 | xd3_getblk_func *getblk; /* The three callbacks. */ | 583 | xd3_getblk_func *getblk; /* The three callbacks. */ |
@@ -657,7 +651,6 @@ struct _xd3_stream | |||
657 | usize_t sprevmask; /* small string, previous window size mask */ | 651 | usize_t sprevmask; /* small string, previous window size mask */ |
658 | uint iopt_size; | 652 | uint iopt_size; |
659 | uint iopt_unlimited; | 653 | uint iopt_unlimited; |
660 | uint srcwin_size; | ||
661 | uint srcwin_maxsz; | 654 | uint srcwin_maxsz; |
662 | 655 | ||
663 | /* general configuration */ | 656 | /* general configuration */ |
@@ -693,7 +686,7 @@ struct _xd3_stream | |||
693 | * match in the buffer. */ | 686 | * match in the buffer. */ |
694 | 687 | ||
695 | // SRCWIN | 688 | // SRCWIN |
696 | // these variables plus srcwin_size, srcwin_maxsz above (set by config) | 689 | // these variables plus srcwin_maxsz above (set by config) |
697 | int srcwin_decided; /* boolean: true if the srclen,srcbase have been decided. */ | 690 | int srcwin_decided; /* boolean: true if the srclen,srcbase have been decided. */ |
698 | xoff_t srcwin_cksum_pos; /* Source checksum position */ | 691 | xoff_t srcwin_cksum_pos; /* Source checksum position */ |
699 | 692 | ||