1 /* Generic infrastructure to implement various diff algorithms (implementation). */
3 * Copyright (c) 2020 Neels Hofmeyr <neels@hofmeyr.de>
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 #include <sys/queue.h>
32 #include <arraylist.h>
33 #include <diff_main.h>
35 #include "diff_internal.h"
36 #include "diff_debug.h"
39 read_at(FILE *f, off_t at_pos, unsigned char *buf, size_t len)
42 if (fseeko(f, at_pos, SEEK_SET) == -1)
44 r = fread(buf, sizeof(char), len, f);
45 if ((r == 0 || r < len) && ferror(f))
53 buf_cmp(const unsigned char *left, size_t left_len,
54 const unsigned char *right, size_t right_len,
55 bool ignore_whitespace)
59 if (ignore_whitespace) {
61 while (il < left_len && ir < right_len) {
62 unsigned char cl = left[il];
63 unsigned char cr = right[ir];
65 if (isspace(cl) && il < left_len) {
69 if (isspace(cr) && ir < right_len) {
81 while (il < left_len) {
82 unsigned char cl = left[il++];
86 while (ir < right_len) {
87 unsigned char cr = right[ir++];
95 cmp = memcmp(left, right, MIN(left_len, right_len));
98 if (left_len == right_len)
100 return (left_len > right_len) ? 1 : -1;
104 diff_atom_cmp(int *cmp,
105 const struct diff_atom *left,
106 const struct diff_atom *right)
108 off_t remain_left, remain_right;
109 int flags = (left->root->diff_flags | right->root->diff_flags);
110 bool ignore_whitespace = (flags & DIFF_FLAG_IGNORE_WHITESPACE);
112 if (!left->len && !right->len) {
116 if (!ignore_whitespace) {
127 if (left->at != NULL && right->at != NULL) {
128 *cmp = buf_cmp(left->at, left->len, right->at, right->len,
133 remain_left = left->len;
134 remain_right = right->len;
135 while (remain_left > 0 || remain_right > 0) {
136 const size_t chunksz = 8192;
137 unsigned char buf_left[chunksz], buf_right[chunksz];
138 const uint8_t *p_left, *p_right;
139 off_t n_left, n_right;
151 n_left = MIN(chunksz, remain_left);
152 n_right = MIN(chunksz, remain_right);
154 if (left->at == NULL) {
155 r = read_at(left->root->f,
156 left->pos + (left->len - remain_left),
164 p_left = left->at + (left->len - remain_left);
167 if (right->at == NULL) {
168 r = read_at(right->root->f,
169 right->pos + (right->len - remain_right),
177 p_right = right->at + (right->len - remain_right);
180 r = buf_cmp(p_left, n_left, p_right, n_right,
187 remain_left -= n_left;
188 remain_right -= n_right;
196 diff_atom_same(bool *same,
197 const struct diff_atom *left,
198 const struct diff_atom *right)
202 if (left->hash != right->hash) {
206 r = diff_atom_cmp(&cmp, left, right);
215 static struct diff_chunk *
216 diff_state_add_solved_chunk(struct diff_state *state,
217 const struct diff_chunk *chunk)
219 diff_chunk_arraylist_t *result;
220 struct diff_chunk *new_chunk;
221 enum diff_chunk_type last_t;
222 enum diff_chunk_type new_t;
224 /* Append to solved chunks; make sure that adjacent chunks of same type are combined, and that a minus chunk
225 * never directly follows a plus chunk. */
226 result = &state->result->chunks;
228 last_t = diff_chunk_type(&result->head[result->len - 1]);
229 new_t = diff_chunk_type(chunk);
231 debug("Add %s chunk:\n", chunk->solved ? "solved" : "UNSOLVED");
233 debug_dump_atoms(&state->left, chunk->left_start, chunk->left_count);
235 debug_dump_atoms(&state->right, chunk->right_start, chunk->right_count);
237 if (new_t == last_t) {
238 new_chunk = &result->head[result->len - 1];
239 new_chunk->left_count += chunk->left_count;
240 new_chunk->right_count += chunk->right_count;
241 debug(" - added chunk touches previous one of same type, joined:\n");
243 debug_dump_atoms(&state->left, new_chunk->left_start, new_chunk->left_count);
245 debug_dump_atoms(&state->right, new_chunk->right_start, new_chunk->right_count);
246 } else if (last_t == CHUNK_PLUS && new_t == CHUNK_MINUS) {
247 enum diff_chunk_type prev_last_t =
249 diff_chunk_type(&result->head[result->len - 2])
251 /* If a minus-chunk follows a plus-chunk, place it above the plus-chunk->
252 * Is the one before that also a minus? combine. */
253 if (prev_last_t == CHUNK_MINUS) {
254 new_chunk = &result->head[result->len - 2];
255 new_chunk->left_count += chunk->left_count;
256 new_chunk->right_count += chunk->right_count;
258 debug(" - added minus-chunk follows plus-chunk,"
259 " put before that plus-chunk and joined"
260 " with preceding minus-chunk:\n");
262 debug_dump_atoms(&state->left, new_chunk->left_start, new_chunk->left_count);
264 debug_dump_atoms(&state->right, new_chunk->right_start, new_chunk->right_count);
266 ARRAYLIST_INSERT(new_chunk, *result, result->len - 1);
271 debug(" - added minus-chunk follows plus-chunk,"
272 " put before that plus-chunk\n");
275 ARRAYLIST_ADD(new_chunk, *result);
283 /* Even if a left or right side is empty, diff output may need to know the
284 * position in that file.
285 * So left_start or right_start must never be NULL -- pass left_count or
286 * right_count as zero to indicate staying at that position without consuming
289 diff_state_add_chunk(struct diff_state *state, bool solved,
290 struct diff_atom *left_start, unsigned int left_count,
291 struct diff_atom *right_start, unsigned int right_count)
293 diff_chunk_arraylist_t *result = NULL;
294 struct diff_chunk *new_chunk;
295 struct diff_chunk chunk = {
297 .left_start = left_start,
298 .left_count = left_count,
299 .right_start = right_start,
300 .right_count = right_count,
303 if (!solved || state->temp_result.len) {
304 /* Append to temp_result */
305 debug("append to temp_result\n");
306 result = &state->temp_result;
307 } else if (!state->result->chunks.len) {
308 /* Append to final result */
309 result = &state->result->chunks;
310 debug("Add first chunk:\n");
312 debug_dump_atoms(&state->left, left_start, left_count);
314 debug_dump_atoms(&state->right, right_start, right_count);
317 ARRAYLIST_ADD(new_chunk, *result);
324 return diff_state_add_solved_chunk(state, &chunk);
328 diff_data_init_root(struct diff_data *d, FILE *f, const uint8_t *data,
329 unsigned long long len, int diff_flags)
331 *d = (struct diff_data){
337 .diff_flags = diff_flags,
342 diff_data_init_subsection(struct diff_data *d, struct diff_data *parent,
343 struct diff_atom *from_atom, unsigned int atoms_count)
345 struct diff_atom *last_atom;
347 if (atoms_count == 0) {
348 *d = (struct diff_data){
353 .root = parent->root,
355 .atoms.len = atoms_count,
361 last_atom = from_atom + atoms_count - 1;
362 *d = (struct diff_data){
364 .pos = from_atom->pos,
365 .data = from_atom->at,
366 .len = (last_atom->pos + last_atom->len) - from_atom->pos,
367 .root = parent->root,
368 .atoms.head = from_atom,
369 .atoms.len = atoms_count,
372 debug("subsection:\n");
377 diff_data_free(struct diff_data *diff_data)
381 if (diff_data->atoms.allocated)
382 ARRAYLIST_FREE(diff_data->atoms);
386 diff_algo_none(const struct diff_algo_config *algo_config,
387 struct diff_state *state)
389 debug("\n** %s\n", __func__);
391 debug_dump(&state->left);
393 debug_dump(&state->right);
394 debug_dump_myers_graph(&state->left, &state->right, NULL, NULL, 0, NULL,
397 /* Add a chunk of equal lines, if any */
398 struct diff_atom *l = state->left.atoms.head;
399 unsigned int l_len = state->left.atoms.len;
400 struct diff_atom *r = state->right.atoms.head;
401 unsigned int r_len = state->right.atoms.len;
402 unsigned int equal_atoms_start = 0;
403 unsigned int equal_atoms_end = 0;
404 unsigned int l_idx = 0;
405 unsigned int r_idx = 0;
407 while (equal_atoms_start < l_len
408 && equal_atoms_start < r_len) {
411 err = diff_atom_same(&same, &l[equal_atoms_start],
412 &r[equal_atoms_start]);
419 while (equal_atoms_end < (l_len - equal_atoms_start)
420 && equal_atoms_end < (r_len - equal_atoms_start)) {
423 err = diff_atom_same(&same, &l[l_len - 1 - equal_atoms_end],
424 &r[r_len - 1 - equal_atoms_end]);
432 /* Add a chunk of equal lines at the start */
433 if (equal_atoms_start) {
434 if (!diff_state_add_chunk(state, true,
435 l, equal_atoms_start,
436 r, equal_atoms_start))
438 l_idx += equal_atoms_start;
439 r_idx += equal_atoms_start;
442 /* Add a "minus" chunk with all lines from the left. */
443 if (equal_atoms_start + equal_atoms_end < l_len) {
444 unsigned int add_len = l_len - equal_atoms_start - equal_atoms_end;
445 if (!diff_state_add_chunk(state, true,
452 /* Add a "plus" chunk with all lines from the right. */
453 if (equal_atoms_start + equal_atoms_end < r_len) {
454 unsigned int add_len = r_len - equal_atoms_start - equal_atoms_end;
455 if (!diff_state_add_chunk(state, true,
462 /* Add a chunk of equal lines at the end */
463 if (equal_atoms_end) {
464 if (!diff_state_add_chunk(state, true,
465 &l[l_idx], equal_atoms_end,
466 &r[r_idx], equal_atoms_end))
474 diff_run_algo(const struct diff_algo_config *algo_config,
475 struct diff_state *state)
479 if (!algo_config || !algo_config->impl
480 || !state->recursion_depth_left
481 || !state->left.atoms.len || !state->right.atoms.len) {
482 debug("Fall back to diff_algo_none():%s%s%s\n",
483 (!algo_config || !algo_config->impl) ? " no-cfg" : "",
484 (!state->recursion_depth_left) ? " max-depth" : "",
485 (!state->left.atoms.len || !state->right.atoms.len)?
487 return diff_algo_none(algo_config, state);
490 ARRAYLIST_FREE(state->temp_result);
491 ARRAYLIST_INIT(state->temp_result, DIFF_RESULT_ALLOC_BLOCKSIZE);
492 rc = algo_config->impl(algo_config, state);
494 case DIFF_RC_USE_DIFF_ALGO_FALLBACK:
495 debug("Got DIFF_RC_USE_DIFF_ALGO_FALLBACK (%p)\n",
496 algo_config->fallback_algo);
497 rc = diff_run_algo(algo_config->fallback_algo, state);
505 /* some error happened */
509 /* Pick up any diff chunks that are still unsolved and feed to
510 * inner_algo. inner_algo will solve unsolved chunks and append to
511 * result, and subsequent solved chunks on this level are then appended
512 * to result afterwards. */
514 for (i = 0; i < state->temp_result.len; i++) {
515 struct diff_chunk *c = &state->temp_result.head[i];
517 diff_state_add_solved_chunk(state, c);
521 /* c is an unsolved chunk, feed to inner_algo */
522 struct diff_state inner_state = {
523 .result = state->result,
524 .recursion_depth_left = state->recursion_depth_left - 1,
525 .kd_buf = state->kd_buf,
526 .kd_buf_size = state->kd_buf_size,
528 diff_data_init_subsection(&inner_state.left, &state->left,
529 c->left_start, c->left_count);
530 diff_data_init_subsection(&inner_state.right, &state->right,
531 c->right_start, c->right_count);
533 rc = diff_run_algo(algo_config->inner_algo, &inner_state);
534 state->kd_buf = inner_state.kd_buf;
535 state->kd_buf_size = inner_state.kd_buf_size;
536 if (rc != DIFF_RC_OK)
542 ARRAYLIST_FREE(state->temp_result);
547 diff_main(const struct diff_config *config,
548 FILE *left_f, const uint8_t *left_data, off_t left_len,
549 FILE *right_f, const uint8_t *right_data, off_t right_len,
552 struct diff_result *result = malloc(sizeof(struct diff_result));
556 *result = (struct diff_result){};
557 diff_data_init_root(&result->left, left_f, left_data, left_len,
559 diff_data_init_root(&result->right, right_f, right_data, right_len,
562 if (!config->atomize_func) {
567 result->rc = config->atomize_func(config->atomize_func_data,
568 &result->left, &result->right);
569 if (result->rc != DIFF_RC_OK)
572 struct diff_state state = {
574 .recursion_depth_left = config->max_recursion_depth ? : 32,
578 diff_data_init_subsection(&state.left, &result->left,
579 result->left.atoms.head,
580 result->left.atoms.len);
581 diff_data_init_subsection(&state.right, &result->right,
582 result->right.atoms.head,
583 result->right.atoms.len);
585 result->rc = diff_run_algo(config->algo, &state);
592 diff_result_free(struct diff_result *result)
596 diff_data_free(&result->left);
597 diff_data_free(&result->right);
598 ARRAYLIST_FREE(result->chunks);