This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2628

xdiff: expand xdl_optimize_ctxs
AbandonedPublic

Authored by quark on Mar 3 2018, 9:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

The function has 2 steps: trim_ends, and cleanup_records. We'll be inserting
something in-between that is not "optimize", but "initialize". So expand the
function to make the latter change easier.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 6527

mercurial/thirdparty/xdiff/xprepare.c

static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash, static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash,
unsigned int hbits, xrecord_t *rec); unsigned int hbits, xrecord_t *rec);
static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_t const *xpp, static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_t const *xpp,
xdlclassifier_t *cf, xdfile_t *xdf); xdlclassifier_t *cf, xdfile_t *xdf);
static void xdl_free_ctx(xdfile_t *xdf); static void xdl_free_ctx(xdfile_t *xdf);
static int xdl_clean_mmatch(char const *dis, long i, long s, long e); static int xdl_clean_mmatch(char const *dis, long i, long s, long e);
static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2); static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2);
static int xdl_trim_ends(xdfile_t *xdf1, xdfile_t *xdf2); static int xdl_trim_ends(xdfile_t *xdf1, xdfile_t *xdf2);
static int xdl_optimize_ctxs(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2);
static int xdl_init_classifier(xdlclassifier_t *cf, long size, long flags) { static int xdl_init_classifier(xdlclassifier_t *cf, long size, long flags) {
cf->flags = flags; cf->flags = flags;
cf->hbits = xdl_hashbits((unsigned int) size); cf->hbits = xdl_hashbits((unsigned int) size);
} }
if (xdl_prepare_ctx(2, mf2, enl2, xpp, &cf, &xe->xdf2) < 0) { if (xdl_prepare_ctx(2, mf2, enl2, xpp, &cf, &xe->xdf2) < 0) {
xdl_free_ctx(&xe->xdf1); xdl_free_ctx(&xe->xdf1);
xdl_free_classifier(&cf); xdl_free_classifier(&cf);
return -1; return -1;
} }
if (xdl_optimize_ctxs(&cf, &xe->xdf1, &xe->xdf2) < 0) { if (xdl_trim_ends(&xe->xdf1, &xe->xdf2) < 0) {
xdl_free_ctx(&xe->xdf2);
xdl_free_ctx(&xe->xdf1);
xdl_free_classifier(&cf);
return -1;
}
if (xdl_cleanup_records(&cf, &xe->xdf1, &xe->xdf2) < 0) {
xdl_free_ctx(&xe->xdf2); xdl_free_ctx(&xe->xdf2);
xdl_free_ctx(&xe->xdf1); xdl_free_ctx(&xe->xdf1);
xdl_free_classifier(&cf); xdl_free_classifier(&cf);
return -1; return -1;
} }
xdl_free_classifier(&cf); xdl_free_classifier(&cf);
if ((*recs1)->ha != (*recs2)->ha) if ((*recs1)->ha != (*recs2)->ha)
break; break;
xdf1->dend = xdf1->nrec - i - 1; xdf1->dend = xdf1->nrec - i - 1;
xdf2->dend = xdf2->nrec - i - 1; xdf2->dend = xdf2->nrec - i - 1;
return 0; return 0;
} }
static int xdl_optimize_ctxs(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2) {
if (xdl_trim_ends(xdf1, xdf2) < 0 ||
xdl_cleanup_records(cf, xdf1, xdf2) < 0) {
return -1;
}
return 0;
}