##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

xdiff: add a preprocessing step that trims files...
xdiff: add a preprocessing step that trims files xdiff has a `xdl_trim_ends` step that removes common lines, unmatchable lines. That is in theory good, but happens too late - after splitting, hashing, and adjusting the hash values so they are unique. Those splitting, hashing and adjusting hash values steps could have noticeable overhead. Diffing two large files with minor (one-line-ish) changes are not uncommon. In that case, the raw performance of those preparation steps seriously matter. Even allocating an O(N) array and storing line offsets to it is expensive. Therefore my previous attempts [1] [2] cannot be good enough since they do not remove the O(N) array assignment. This patch adds a preprocessing step - `xdl_trim_files` that runs before other preprocessing steps. It counts common prefix and suffix and lines in them (needed for displaying line number), without doing anything else. Testing with a crafted large (169MB) file, with minor change: ``` open('a','w').write(''.join('%s\n' % (i % 100000) for i in xrange(30000000) if i != 6000000)) open('b','w').write(''.join('%s\n' % (i % 100000) for i in xrange(30000000) if i != 6003000)) ``` Running xdiff by a simple binary [3], this patch improves the xdiff perf by more than 10x for the above case: ``` # xdiff before this patch 2.41s user 1.13s system 98% cpu 3.592 total # xdiff after this patch 0.14s user 0.16s system 98% cpu 0.309 total # gnu diffutils 0.12s user 0.15s system 98% cpu 0.272 total # (best of 20 runs) ``` It's still slightly slower than GNU diffutils. But it's pretty close now. Testing with real repo data: For the whole repo, this patch makes xdiff 25% faster: ``` # hg perfbdiff --count 100 --alldata -c d334afc585e2 --blocks [--xdiff] # xdiff, after ! wall 0.058861 comb 0.050000 user 0.050000 sys 0.000000 (best of 100) # xdiff, before ! wall 0.077816 comb 0.080000 user 0.080000 sys 0.000000 (best of 91) # bdiff ! wall 0.117473 comb 0.120000 user 0.120000 sys 0.000000 (best of 67) ``` For files that are long (ex. commands.py), the speedup is more than 3x, very significant: ``` # hg perfbdiff --count 3000 --blocks commands.py.i 1 [--xdiff] # xdiff, after ! wall 0.690583 comb 0.690000 user 0.690000 sys 0.000000 (best of 12) # xdiff, before ! wall 2.240361 comb 2.210000 user 2.210000 sys 0.000000 (best of 4) # bdiff ! wall 2.469852 comb 2.440000 user 2.440000 sys 0.000000 (best of 4) ``` [1]: https://phab.mercurial-scm.org/D2631 [2]: https://phab.mercurial-scm.org/D2634 [3]: ``` // Code to run xdiff from command line. No proper error handling. #include <stdlib.h> #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include "mercurial/thirdparty/xdiff/xdiff.h" #define ensure(x) if (!(x)) exit(255); mmfile_t readfile(const char *path) { struct stat st; int fd = open(path, O_RDONLY); fstat(fd, &st); mmfile_t file = { malloc(st.st_size), st.st_size }; ensure(read(fd, file.ptr, st.st_size) == st.st_size); close(fd); return file; } int main(int argc, char const *argv[]) { mmfile_t a = readfile(argv[1]), b = readfile(argv[2]); xpparam_t xpp = {0}; xdemitconf_t xecfg = {0}; xdemitcb_t ecb = {0}; xdl_diff(&a, &b, &xpp, &xecfg, &ecb); return 0; } ``` Differential Revision: https://phab.mercurial-scm.org/D2686
Augie Fackler - - Load All Authors

File last commit:

r34698:ce77b056 default
r36838:f33a87cf default
Show More
bitmanipulation.h
50 lines | 944 B | text/x-c | CLexer
/ mercurial / bitmanipulation.h
History | Source | Raw |Copy content |Copy permalink
Maciej Fijalkowski
internals: move the bitmanipulation routines into its own file...
 r29444 #ifndef _HG_BITMANIPULATION_H_
#define _HG_BITMANIPULATION_H_
Martin von Zweigbergk
bitmanipulation: add missing include of string.h...
 r32646 #include <string.h>
Maciej Fijalkowski
internals: move the bitmanipulation routines into its own file...
 r29444 #include "compat.h"
static inline uint32_t getbe32(const char *c)
{
const unsigned char *d = (const unsigned char *)c;
Augie Fackler
bitmanipulation: reformat with clang-format...
 r34698 return ((d[0] << 24) | (d[1] << 16) | (d[2] << 8) | (d[3]));
Maciej Fijalkowski
internals: move the bitmanipulation routines into its own file...
 r29444 }
static inline int16_t getbeint16(const char *c)
{
const unsigned char *d = (const unsigned char *)c;
Augie Fackler
bitmanipulation: reformat with clang-format...
 r34698 return ((d[0] << 8) | (d[1]));
Maciej Fijalkowski
internals: move the bitmanipulation routines into its own file...
 r29444 }
static inline uint16_t getbeuint16(const char *c)
{
const unsigned char *d = (const unsigned char *)c;
Augie Fackler
bitmanipulation: reformat with clang-format...
 r34698 return ((d[0] << 8) | (d[1]));
Maciej Fijalkowski
internals: move the bitmanipulation routines into its own file...
 r29444 }
static inline void putbe32(uint32_t x, char *c)
{
c[0] = (x >> 24) & 0xff;
c[1] = (x >> 16) & 0xff;
c[2] = (x >> 8) & 0xff;
Augie Fackler
bitmanipulation: reformat with clang-format...
 r34698 c[3] = (x)&0xff;
Maciej Fijalkowski
internals: move the bitmanipulation routines into its own file...
 r29444 }
static inline double getbefloat64(const char *c)
{
const unsigned char *d = (const unsigned char *)c;
double ret;
int i;
uint64_t t = 0;
for (i = 0; i < 8; i++) {
Augie Fackler
bitmanipulation: reformat with clang-format...
 r34698 t = (t << 8) + d[i];
Maciej Fijalkowski
internals: move the bitmanipulation routines into its own file...
 r29444 }
memcpy(&ret, &t, sizeof(t));
return ret;
}
#endif