mirror of
https://github.com/clearlinux/bsdiff.git
synced 2026-08-19 04:38:02 +00:00
Split suffix sort code into a separate source file
To prepare for the possibility of testing other suffix sort algorithms in the future, split this code into a separate source file for clarity. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
This commit is contained in:
Patrick McCarty
+2
-1
@@ -67,7 +67,8 @@ lib_LTLIBRARIES = \
|
||||
|
||||
libbsdiff_la_SOURCES = \
|
||||
src/diff.c \
|
||||
src/patch.c
|
||||
src/patch.c \
|
||||
src/sufsort.c
|
||||
|
||||
libbsdiff_la_LIBADD = \
|
||||
$(zlib_LIBS)
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#define __INCLUDE_GUARD_BSHEADER_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <sys/types.h> // for u_char
|
||||
|
||||
#include "bsdiff.h"
|
||||
|
||||
@@ -177,4 +178,6 @@ static inline int eblock_get_enc(enc_flags_t enc)
|
||||
}
|
||||
}
|
||||
|
||||
int qsufsort(int64_t *, int64_t *, u_char *, int64_t);
|
||||
|
||||
#endif
|
||||
|
||||
-168
@@ -32,8 +32,6 @@ __FBSDID
|
||||
#define _GNU_SOURCE
|
||||
#include "config.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#ifdef BSDIFF_WITH_BZIP2
|
||||
#include <bzlib.h>
|
||||
#endif
|
||||
@@ -76,172 +74,6 @@ static int bsdiff_fulldl;
|
||||
#undef MIN
|
||||
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
|
||||
|
||||
/* NOTES:
|
||||
* I and V are chunks of memory (arrays) with length = (oldfile size +1) * sizeof(int64_t).
|
||||
* Additionally, we pass in arraylen now. The parent function qsufsort receives it, so it
|
||||
* should be available here as well for error checking.
|
||||
* start: is actually the point in the array sent in during the suffix sort, which sorts by
|
||||
* small blocks/chunks.
|
||||
* len: refers to the length of the current chunk being processed - NOT the array length(s).
|
||||
* h: will never be more than 8, and increases by *2 during suffix sort (h += h) */
|
||||
static void split(int64_t *I, int64_t *V, int64_t arraylen, int64_t start, int64_t len,
|
||||
int64_t h)
|
||||
{
|
||||
int64_t i, j, k, x, tmp, jj, kk;
|
||||
|
||||
if (len < 16) {
|
||||
for (k = start; k < start + len; k += j) {
|
||||
j = 1;
|
||||
x = V[I[k] + h];
|
||||
for (i = 1; k + i < start + len; i++) {
|
||||
if (V[I[k + i] + h] < x) {
|
||||
x = V[I[k + i] + h];
|
||||
j = 0;
|
||||
}
|
||||
if (V[I[k + i] + h] == x) {
|
||||
tmp = I[k + j];
|
||||
I[k + j] = I[k + i];
|
||||
I[k + i] = tmp;
|
||||
j++;
|
||||
}
|
||||
}
|
||||
for (i = 0; i < j; i++) {
|
||||
V[I[k + i]] = k + j - 1;
|
||||
}
|
||||
if (j == 1) {
|
||||
I[k] = -1;
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
x = V[I[start + len / 2] + h];
|
||||
jj = 0;
|
||||
kk = 0;
|
||||
for (i = start; i < start + len; i++) {
|
||||
if (V[I[i] + h] < x) {
|
||||
jj++;
|
||||
}
|
||||
if (V[I[i] + h] == x) {
|
||||
kk++;
|
||||
}
|
||||
}
|
||||
jj += start;
|
||||
kk += jj;
|
||||
|
||||
i = start;
|
||||
j = 0;
|
||||
k = 0;
|
||||
while (i < jj) {
|
||||
if (V[I[i] + h] < x) {
|
||||
i++;
|
||||
} else if (V[I[i] + h] == x) {
|
||||
tmp = I[i];
|
||||
I[i] = I[jj + j];
|
||||
I[jj + j] = tmp;
|
||||
j++;
|
||||
} else {
|
||||
tmp = I[i];
|
||||
I[i] = I[kk + k];
|
||||
I[kk + k] = tmp;
|
||||
k++;
|
||||
}
|
||||
}
|
||||
|
||||
while (jj + j < kk) {
|
||||
if (V[I[jj + j] + h] == x) {
|
||||
j++;
|
||||
} else {
|
||||
tmp = I[jj + j];
|
||||
I[jj + j] = I[kk + k];
|
||||
I[kk + k] = tmp;
|
||||
k++;
|
||||
}
|
||||
}
|
||||
|
||||
if (jj > start) {
|
||||
split(I, V, arraylen, start, jj - start, h);
|
||||
}
|
||||
|
||||
for (i = 0; i < kk - jj; i++) {
|
||||
V[I[jj + i]] = kk - 1;
|
||||
}
|
||||
if (jj == kk - 1) {
|
||||
I[jj] = -1;
|
||||
}
|
||||
|
||||
if (start + len > kk) {
|
||||
split(I, V, arraylen, kk, start + len - kk, h);
|
||||
}
|
||||
}
|
||||
|
||||
/* The old_data (previous file data) is passed into this suffix sort and sorted
|
||||
* accordingly using the I and V arrays, which are both of length oldsize +1. */
|
||||
static int qsufsort(int64_t *I, int64_t *V, u_char *old, int64_t oldsize)
|
||||
{
|
||||
int64_t buckets[QSUF_BUCKET_SIZE];
|
||||
int64_t i, h, len;
|
||||
|
||||
for (i = 0; i < QSUF_BUCKET_SIZE; i++) {
|
||||
buckets[i] = 0;
|
||||
}
|
||||
for (i = 0; i < oldsize; i++) {
|
||||
buckets[old[i]]++;
|
||||
}
|
||||
for (i = 1; i < QSUF_BUCKET_SIZE; i++) {
|
||||
buckets[i] += buckets[i - 1];
|
||||
}
|
||||
for (i = QSUF_BUCKET_SIZE - 1; i > 0; i--) {
|
||||
buckets[i] = buckets[i - 1];
|
||||
}
|
||||
buckets[0] = 0;
|
||||
|
||||
for (i = 0; i < oldsize; i++) {
|
||||
if (buckets[old[i]] > oldsize + 1) {
|
||||
return -1;
|
||||
}
|
||||
I[++buckets[old[i]]] = i;
|
||||
}
|
||||
|
||||
for (i = 0; i < oldsize; i++) {
|
||||
V[i] = buckets[old[i]];
|
||||
}
|
||||
V[oldsize] = 0;
|
||||
for (i = 1; i < QSUF_BUCKET_SIZE; i++) {
|
||||
if (buckets[i] == buckets[i - 1] + 1) {
|
||||
I[buckets[i]] = -1;
|
||||
}
|
||||
}
|
||||
I[0] = -1;
|
||||
|
||||
for (h = 1; I[0] != -(oldsize + 1); h += h) {
|
||||
len = 0;
|
||||
for (i = 0; i < oldsize + 1;) {
|
||||
if (I[i] < 0) {
|
||||
len -= I[i];
|
||||
i -= I[i];
|
||||
} else {
|
||||
if (len) {
|
||||
I[i - len] = -len;
|
||||
}
|
||||
len = V[I[i]] + 1 - i;
|
||||
split(I, V, oldsize, i, len, h);
|
||||
i += len;
|
||||
len = 0;
|
||||
}
|
||||
}
|
||||
if (len) {
|
||||
I[i - len] = -len;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < oldsize + 1; i++) {
|
||||
I[V[i]] = i;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int64_t matchlen(u_char *old, int64_t oldsize, u_char *new,
|
||||
int64_t newsize)
|
||||
{
|
||||
|
||||
+194
@@ -0,0 +1,194 @@
|
||||
/*-
|
||||
* Copyright 2003-2005 Colin Percival
|
||||
* All rights reserved
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted providing that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
||||
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "bsheader.h"
|
||||
|
||||
/* NOTES:
|
||||
* I and V are chunks of memory (arrays) with length = (oldfile size +1) * sizeof(int64_t).
|
||||
* Additionally, we pass in arraylen now. The parent function qsufsort receives it, so it
|
||||
* should be available here as well for error checking.
|
||||
* start: is actually the point in the array sent in during the suffix sort, which sorts by
|
||||
* small blocks/chunks.
|
||||
* len: refers to the length of the current chunk being processed - NOT the array length(s).
|
||||
* h: will never be more than 8, and increases by *2 during suffix sort (h += h) */
|
||||
static void split(int64_t *I, int64_t *V, int64_t arraylen, int64_t start, int64_t len,
|
||||
int64_t h)
|
||||
{
|
||||
int64_t i, j, k, x, tmp, jj, kk;
|
||||
|
||||
if (len < 16) {
|
||||
for (k = start; k < start + len; k += j) {
|
||||
j = 1;
|
||||
x = V[I[k] + h];
|
||||
for (i = 1; k + i < start + len; i++) {
|
||||
if (V[I[k + i] + h] < x) {
|
||||
x = V[I[k + i] + h];
|
||||
j = 0;
|
||||
}
|
||||
if (V[I[k + i] + h] == x) {
|
||||
tmp = I[k + j];
|
||||
I[k + j] = I[k + i];
|
||||
I[k + i] = tmp;
|
||||
j++;
|
||||
}
|
||||
}
|
||||
for (i = 0; i < j; i++) {
|
||||
V[I[k + i]] = k + j - 1;
|
||||
}
|
||||
if (j == 1) {
|
||||
I[k] = -1;
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
x = V[I[start + len / 2] + h];
|
||||
jj = 0;
|
||||
kk = 0;
|
||||
for (i = start; i < start + len; i++) {
|
||||
if (V[I[i] + h] < x) {
|
||||
jj++;
|
||||
}
|
||||
if (V[I[i] + h] == x) {
|
||||
kk++;
|
||||
}
|
||||
}
|
||||
jj += start;
|
||||
kk += jj;
|
||||
|
||||
i = start;
|
||||
j = 0;
|
||||
k = 0;
|
||||
while (i < jj) {
|
||||
if (V[I[i] + h] < x) {
|
||||
i++;
|
||||
} else if (V[I[i] + h] == x) {
|
||||
tmp = I[i];
|
||||
I[i] = I[jj + j];
|
||||
I[jj + j] = tmp;
|
||||
j++;
|
||||
} else {
|
||||
tmp = I[i];
|
||||
I[i] = I[kk + k];
|
||||
I[kk + k] = tmp;
|
||||
k++;
|
||||
}
|
||||
}
|
||||
|
||||
while (jj + j < kk) {
|
||||
if (V[I[jj + j] + h] == x) {
|
||||
j++;
|
||||
} else {
|
||||
tmp = I[jj + j];
|
||||
I[jj + j] = I[kk + k];
|
||||
I[kk + k] = tmp;
|
||||
k++;
|
||||
}
|
||||
}
|
||||
|
||||
if (jj > start) {
|
||||
split(I, V, arraylen, start, jj - start, h);
|
||||
}
|
||||
|
||||
for (i = 0; i < kk - jj; i++) {
|
||||
V[I[jj + i]] = kk - 1;
|
||||
}
|
||||
if (jj == kk - 1) {
|
||||
I[jj] = -1;
|
||||
}
|
||||
|
||||
if (start + len > kk) {
|
||||
split(I, V, arraylen, kk, start + len - kk, h);
|
||||
}
|
||||
}
|
||||
|
||||
/* The old_data (previous file data) is passed into this suffix sort and sorted
|
||||
* accordingly using the I and V arrays, which are both of length oldsize +1. */
|
||||
int qsufsort(int64_t *I, int64_t *V, u_char *old, int64_t oldsize)
|
||||
{
|
||||
int64_t buckets[QSUF_BUCKET_SIZE];
|
||||
int64_t i, h, len;
|
||||
|
||||
for (i = 0; i < QSUF_BUCKET_SIZE; i++) {
|
||||
buckets[i] = 0;
|
||||
}
|
||||
for (i = 0; i < oldsize; i++) {
|
||||
buckets[old[i]]++;
|
||||
}
|
||||
for (i = 1; i < QSUF_BUCKET_SIZE; i++) {
|
||||
buckets[i] += buckets[i - 1];
|
||||
}
|
||||
for (i = QSUF_BUCKET_SIZE - 1; i > 0; i--) {
|
||||
buckets[i] = buckets[i - 1];
|
||||
}
|
||||
buckets[0] = 0;
|
||||
|
||||
for (i = 0; i < oldsize; i++) {
|
||||
if (buckets[old[i]] > oldsize + 1) {
|
||||
return -1;
|
||||
}
|
||||
I[++buckets[old[i]]] = i;
|
||||
}
|
||||
|
||||
for (i = 0; i < oldsize; i++) {
|
||||
V[i] = buckets[old[i]];
|
||||
}
|
||||
V[oldsize] = 0;
|
||||
for (i = 1; i < QSUF_BUCKET_SIZE; i++) {
|
||||
if (buckets[i] == buckets[i - 1] + 1) {
|
||||
I[buckets[i]] = -1;
|
||||
}
|
||||
}
|
||||
I[0] = -1;
|
||||
|
||||
for (h = 1; I[0] != -(oldsize + 1); h += h) {
|
||||
len = 0;
|
||||
for (i = 0; i < oldsize + 1;) {
|
||||
if (I[i] < 0) {
|
||||
len -= I[i];
|
||||
i -= I[i];
|
||||
} else {
|
||||
if (len) {
|
||||
I[i - len] = -len;
|
||||
}
|
||||
len = V[I[i]] + 1 - i;
|
||||
split(I, V, oldsize, i, len, h);
|
||||
i += len;
|
||||
len = 0;
|
||||
}
|
||||
}
|
||||
if (len) {
|
||||
I[i - len] = -len;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < oldsize + 1; i++) {
|
||||
I[V[i]] = i;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user