Merge branch 'rc/histogram-diff'

* rc/histogram-diff:
xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()

diff --combined xdiff/xprepare.c
index eba31ffaeebb4fe15f45ce854aa2ed3f63489b8c,5b676b7ca5c7d5e8b27b594f3ca8f008cc031fad..5a33d1a86964472a82a63f18ab3c9b4da9b23165
--- 1/xdiff/xprepare.c
--- 2/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@@ -36,7 -36,6 +36,7 @@@ typedef struct s_xdlclass 
        char const *line;
        long size;
        long idx;
 +      long len1, len2;
  } xdlclass_t;
  
  typedef struct s_xdlclassifier {
@@@ -44,8 -43,6 +44,8 @@@
        long hsize;
        xdlclass_t **rchash;
        chastore_t ncha;
 +      xdlclass_t **rcrecs;
 +      long alloc;
        long count;
        long flags;
  } xdlclassifier_t;
@@@ -55,15 -52,15 +55,15 @@@
  
  static int xdl_init_classifier(xdlclassifier_t *cf, long size, long flags);
  static void xdl_free_classifier(xdlclassifier_t *cf);
 -static int xdl_classify_record(xdlclassifier_t *cf, xrecord_t **rhash, unsigned int hbits,
 -                             xrecord_t *rec);
 -static int xdl_prepare_ctx(mmfile_t *mf, long narec, xpparam_t const *xpp,
 +static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash,
 +                             unsigned int hbits, xrecord_t *rec);
 +static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_t const *xpp,
                           xdlclassifier_t *cf, 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_cleanup_records(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_optimize_ctxs(xdfile_t *xdf1, xdfile_t *xdf2);
 +static int xdl_optimize_ctxs(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2);
  
  
  
@@@ -85,14 -82,6 +85,14 @@@ static int xdl_init_classifier(xdlclass
        }
        memset(cf->rchash, 0, cf->hsize * sizeof(xdlclass_t *));
  
 +      cf->alloc = size;
 +      if (!(cf->rcrecs = (xdlclass_t **) xdl_malloc(cf->alloc * sizeof(xdlclass_t *)))) {
 +
 +              xdl_free(cf->rchash);
 +              xdl_cha_free(&cf->ncha);
 +              return -1;
 +      }
 +
        cf->count = 0;
  
        return 0;
@@@ -101,18 -90,16 +101,18 @@@
  
  static void xdl_free_classifier(xdlclassifier_t *cf) {
  
 +      xdl_free(cf->rcrecs);
        xdl_free(cf->rchash);
        xdl_cha_free(&cf->ncha);
  }
  
  
 -static int xdl_classify_record(xdlclassifier_t *cf, xrecord_t **rhash, unsigned int hbits,
 -                             xrecord_t *rec) {
 +static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash,
 +                             unsigned int hbits, xrecord_t *rec) {
        long hi;
        char const *line;
        xdlclass_t *rcrec;
 +      xdlclass_t **rcrecs;
  
        line = rec->ptr;
        hi = (long) XDL_HASHLONG(rec->ha, cf->hbits);
@@@ -128,25 -115,13 +128,25 @@@
                        return -1;
                }
                rcrec->idx = cf->count++;
 +              if (cf->count > cf->alloc) {
 +                      cf->alloc *= 2;
 +                      if (!(rcrecs = (xdlclass_t **) xdl_realloc(cf->rcrecs, cf->alloc * sizeof(xdlclass_t *)))) {
 +
 +                              return -1;
 +                      }
 +                      cf->rcrecs = rcrecs;
 +              }
 +              cf->rcrecs[rcrec->idx] = rcrec;
                rcrec->line = line;
                rcrec->size = rec->size;
                rcrec->ha = rec->ha;
 +              rcrec->len1 = rcrec->len2 = 0;
                rcrec->next = cf->rchash[hi];
                cf->rchash[hi] = rcrec;
        }
  
 +      (pass == 1) ? rcrec->len1++ : rcrec->len2++;
 +
        rec->ha = (unsigned long) rcrec->idx;
  
        hi = (long) XDL_HASHLONG(rec->ha, hbits);
@@@ -157,7 -132,7 +157,7 @@@
  }
  
  
 -static int xdl_prepare_ctx(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) {
        unsigned int hbits;
        long nrec, hsize, bsize;
@@@ -210,7 -185,7 +210,7 @@@
                        recs[nrec++] = crec;
  
                        if (!(xpp->flags & XDF_HISTOGRAM_DIFF) &&
 -                              xdl_classify_record(cf, rhash, hbits, crec) < 0)
 +                              xdl_classify_record(pass, cf, rhash, hbits, crec) < 0)
                                goto abort;
                }
        }
@@@ -264,6 -239,8 +264,8 @@@ int xdl_prepare_env(mmfile_t *mf1, mmfi
        long enl1, enl2, sample;
        xdlclassifier_t cf;
  
+       memset(&cf, 0, sizeof(cf));
+ 
        /*
         * For histogram diff, we can afford a smaller sample size and
         * thus a poorer estimate of the number of lines, as the hash
@@@ -282,30 -259,30 +284,30 @@@
                return -1;
        }
  
 -      if (xdl_prepare_ctx(mf1, enl1, xpp, &cf, &xe->xdf1) < 0) {
 +      if (xdl_prepare_ctx(1, mf1, enl1, xpp, &cf, &xe->xdf1) < 0) {
  
                xdl_free_classifier(&cf);
                return -1;
        }
 -      if (xdl_prepare_ctx(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_classifier(&cf);
                return -1;
        }
  
 -      if (!(xpp->flags & XDF_HISTOGRAM_DIFF))
 -              xdl_free_classifier(&cf);
 -
        if (!(xpp->flags & XDF_PATIENCE_DIFF) &&
                        !(xpp->flags & XDF_HISTOGRAM_DIFF) &&
 -                      xdl_optimize_ctxs(&xe->xdf1, &xe->xdf2) < 0) {
 +                      xdl_optimize_ctxs(&cf, &xe->xdf1, &xe->xdf2) < 0) {
  
                xdl_free_ctx(&xe->xdf2);
                xdl_free_ctx(&xe->xdf1);
                return -1;
        }
  
 +      if (!(xpp->flags & XDF_HISTOGRAM_DIFF))
 +              xdl_free_classifier(&cf);
 +
        return 0;
  }
  
@@@ -380,10 -357,11 +382,10 @@@ static int xdl_clean_mmatch(char const 
   * matches on the other file. Also, lines that have multiple matches
   * might be potentially discarded if they happear in a run of discardable.
   */
 -static int xdl_cleanup_records(xdfile_t *xdf1, xdfile_t *xdf2) {
 -      long i, nm, rhi, nreff, mlim;
 -      unsigned long hav;
 +static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2) {
 +      long i, nm, nreff;
        xrecord_t **recs;
 -      xrecord_t *rec;
 +      xdlclass_t *rcrec;
        char *dis, *dis1, *dis2;
  
        if (!(dis = (char *) xdl_malloc(xdf1->nrec + xdf2->nrec + 2))) {
@@@ -394,16 -372,26 +396,16 @@@
        dis1 = dis;
        dis2 = dis1 + xdf1->nrec + 1;
  
 -      if ((mlim = xdl_bogosqrt(xdf1->nrec)) > XDL_MAX_EQLIMIT)
 -              mlim = XDL_MAX_EQLIMIT;
        for (i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart]; i <= xdf1->dend; i++, recs++) {
 -              hav = (*recs)->ha;
 -              rhi = (long) XDL_HASHLONG(hav, xdf2->hbits);
 -              for (nm = 0, rec = xdf2->rhash[rhi]; rec; rec = rec->next)
 -                      if (rec->ha == hav && ++nm == mlim)
 -                              break;
 -              dis1[i] = (nm == 0) ? 0: (nm >= mlim) ? 2: 1;
 +              rcrec = cf->rcrecs[(*recs)->ha];
 +              nm = rcrec ? rcrec->len2 : 0;
 +              dis1[i] = (nm == 0) ? 0: 1;
        }
  
 -      if ((mlim = xdl_bogosqrt(xdf2->nrec)) > XDL_MAX_EQLIMIT)
 -              mlim = XDL_MAX_EQLIMIT;
        for (i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart]; i <= xdf2->dend; i++, recs++) {
 -              hav = (*recs)->ha;
 -              rhi = (long) XDL_HASHLONG(hav, xdf1->hbits);
 -              for (nm = 0, rec = xdf1->rhash[rhi]; rec; rec = rec->next)
 -                      if (rec->ha == hav && ++nm == mlim)
 -                              break;
 -              dis2[i] = (nm == 0) ? 0: (nm >= mlim) ? 2: 1;
 +              rcrec = cf->rcrecs[(*recs)->ha];
 +              nm = rcrec ? rcrec->len1 : 0;
 +              dis2[i] = (nm == 0) ? 0: 1;
        }
  
        for (nreff = 0, i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart];
@@@ -465,10 -453,10 +467,10 @@@ static int xdl_trim_ends(xdfile_t *xdf1
  }
  
  
 -static int xdl_optimize_ctxs(xdfile_t *xdf1, xdfile_t *xdf2) {
 +static int xdl_optimize_ctxs(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2) {
  
        if (xdl_trim_ends(xdf1, xdf2) < 0 ||
 -          xdl_cleanup_records(xdf1, xdf2) < 0) {
 +          xdl_cleanup_records(cf, xdf1, xdf2) < 0) {
  
                return -1;
        }