Blob


1 /* Myers diff algorithm implementation, invented by Eugene W. Myers [1].
2 * Implementations of both the Myers Divide Et Impera (using linear space)
3 * and the canonical Myers algorithm (using quadratic space). */
4 /*
5 * Copyright (c) 2020 Neels Hofmeyr <neels@hofmeyr.de>
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.
10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */
20 #include <diff/diff_main.h>
22 #include "debug.h"
24 /* Myers' diff algorithm [1] is nicely explained in [2].
25 * [1] http://www.xmailserver.org/diff2.pdf
26 * [2] https://blog.jcoglan.com/2017/02/12/the-myers-diff-algorithm-part-1/ ff.
27 *
28 * Myers approaches finding the smallest diff as a graph problem.
29 * The crux is that the original algorithm requires quadratic amount of memory:
30 * both sides' lengths added, and that squared. So if we're diffing lines of text, two files with 1000 lines each would
31 * blow up to a matrix of about 2000 * 2000 ints of state, about 16 Mb of RAM to figure out 2 kb of text.
32 * The solution is using Myers' "divide and conquer" extension algorithm, which does the original traversal from both
33 * ends of the files to reach a middle where these "snakes" touch, hence does not need to backtrace the traversal, and
34 * so gets away with only keeping a single column of that huge state matrix in memory.
35 *
36 * Todo: the divide and conquer requires linear *space*, not necessarily linear *time*. It recurses, apparently doing
37 * multiple Myers passes, and also it apparently favors fragmented diffs in cases where chunks of text were moved to a
38 * different place. Up to a given count of diff atoms (text lines), it might be desirable to accept the quadratic memory
39 * usage, get nicer diffs and less re-iteration of the same data?
40 */
42 struct diff_box {
43 unsigned int left_start;
44 unsigned int left_end;
45 unsigned int right_start;
46 unsigned int right_end;
47 };
49 #define diff_box_empty(DIFF_SNAKE) ((DIFF_SNAKE)->left_end == 0)
52 /* If the two contents of a file are A B C D E and X B C Y,
53 * the Myers diff graph looks like:
54 *
55 * k0 k1
56 * \ \
57 * k-1 0 1 2 3 4 5
58 * \ A B C D E
59 * 0 o-o-o-o-o-o
60 * X | | | | | |
61 * 1 o-o-o-o-o-o
62 * B | |\| | | |
63 * 2 o-o-o-o-o-o
64 * C | | |\| | |
65 * 3 o-o-o-o-o-o
66 * Y | | | | | |\
67 * 4 o-o-o-o-o-o c1
68 * \ \
69 * c-1 c0
70 *
71 * Moving right means delete an atom from the left-hand-side,
72 * Moving down means add an atom from the right-hand-side.
73 * Diagonals indicate identical atoms on both sides, the challenge is to use as many diagonals as possible.
74 *
75 * The original Myers algorithm walks all the way from the top left to the bottom right, remembers all steps, and then
76 * backtraces to find the shortest path. However, that requires keeping the entire graph in memory, which needs
77 * quadratic space.
78 *
79 * Myers adds a variant that uses linear space -- note, not linear time, only linear space: walk forward and backward,
80 * find a meeting point in the middle, and recurse on the two separate sections. This is called "divide and conquer".
81 *
82 * d: the step number, starting with 0, a.k.a. the distance from the starting point.
83 * k: relative index in the state array for the forward scan, indicating on which diagonal through the diff graph we
84 * currently are.
85 * c: relative index in the state array for the backward scan, indicating the diagonal number from the bottom up.
86 *
87 * The "divide and conquer" traversal through the Myers graph looks like this:
88 *
89 * | d= 0 1 2 3 2 1 0
90 * ----+--------------------------------------------
91 * k= | c=
92 * 4 | 3
93 * |
94 * 3 | 3,0 5,2 2
95 * | / \
96 * 2 | 2,0 5,3 1
97 * | / \
98 * 1 | 1,0 4,3 >= 4,3 5,4<-- 0
99 * | / / \ /
100 * 0 | -->0,0 3,3 4,4 -1
101 * | \ / /
102 * -1 | 0,1 1,2 3,4 -2
103 * | \ /
104 * -2 | 0,2 -3
105 * | \
106 * | 0,3
107 * | forward-> <-backward
109 * x,y pairs here are the coordinates in the Myers graph:
110 * x = atom index in left-side source, y = atom index in the right-side source.
112 * Only one forward column and one backward column are kept in mem, each need at most left.len + 1 + right.len items.
113 * Note that each d step occupies either the even or the odd items of a column: if e.g. the previous column is in the
114 * odd items, the next column is formed in the even items, without overwriting the previous column's results.
116 * Also note that from the diagonal index k and the x coordinate, the y coordinate can be derived:
117 * y = x - k
118 * Hence the state array only needs to keep the x coordinate, i.e. the position in the left-hand file, and the y
119 * coordinate, i.e. position in the right-hand file, is derived from the index in the state array.
121 * The two traces meet at 4,3, the first step (here found in the forward traversal) where a forward position is on or
122 * past a backward traced position on the same diagonal.
124 * This divides the problem space into:
126 * 0 1 2 3 4 5
127 * A B C D E
128 * 0 o-o-o-o-o
129 * X | | | | |
130 * 1 o-o-o-o-o
131 * B | |\| | |
132 * 2 o-o-o-o-o
133 * C | | |\| |
134 * 3 o-o-o-o-*-o *: forward and backward meet here
135 * Y | |
136 * 4 o-o
138 * Doing the same on each section lead to:
140 * 0 1 2 3 4 5
141 * A B C D E
142 * 0 o-o
143 * X | |
144 * 1 o-b b: backward d=1 first reaches here (sliding up the snake)
145 * B \ f: then forward d=2 reaches here (sliding down the snake)
146 * 2 o As result, the box from b to f is found to be identical;
147 * C \ leaving a top box from 0,0 to 1,1 and a bottom trivial tail 3,3 to 4,3.
148 * 3 f-o
150 * 3 o-*
151 * Y |
152 * 4 o *: forward and backward meet here
154 * and solving the last top left box gives:
156 * 0 1 2 3 4 5
157 * A B C D E -A
158 * 0 o-o +X
159 * X | B
160 * 1 o C
161 * B \ -D
162 * 2 o -E
163 * C \ +Y
164 * 3 o-o-o
165 * Y |
166 * 4 o
168 */
170 #define xk_to_y(X, K) ((X) - (K))
171 #define xc_to_y(X, C, DELTA) ((X) - (C) + (DELTA))
172 #define k_to_c(K, DELTA) ((K) + (DELTA))
173 #define c_to_k(C, DELTA) ((C) - (DELTA))
175 /* Do one forwards step in the "divide and conquer" graph traversal.
176 * left: the left side to diff.
177 * right: the right side to diff against.
178 * kd_forward: the traversal state for forwards traversal, modified by this function.
179 * This is carried over between invocations with increasing d.
180 * kd_forward points at the center of the state array, allowing negative indexes.
181 * kd_backward: the traversal state for backwards traversal, to find a meeting point.
182 * Since forwards is done first, kd_backward will be valid for d - 1, not d.
183 * kd_backward points at the center of the state array, allowing negative indexes.
184 * d: Step or distance counter, indicating for what value of d the kd_forward should be populated.
185 * For d == 0, kd_forward[0] is initialized, i.e. the first invocation should be for d == 0.
186 * meeting_snake: resulting meeting point, if any.
187 */
188 static void diff_divide_myers_forward(struct diff_data *left, struct diff_data *right,
189 int *kd_forward, int *kd_backward, int d,
190 struct diff_box *meeting_snake)
192 int delta = (int)right->atoms.len - (int)left->atoms.len;
193 int prev_x;
194 int prev_y;
195 int k;
196 int x;
198 debug("-- %s d=%d\n", __func__, d);
199 debug_dump_myers_graph(left, right, NULL);
201 for (k = d; k >= -d; k -= 2) {
202 if (k < -(int)right->atoms.len || k > (int)left->atoms.len) {
203 /* This diagonal is completely outside of the Myers graph, don't calculate it. */
204 if (k < -(int)right->atoms.len)
205 debug(" %d k < -(int)right->atoms.len %d\n", k, -(int)right->atoms.len);
206 else
207 debug(" %d k > left->atoms.len %d\n", k, left->atoms.len);
208 if (k < 0) {
209 /* We are traversing negatively, and already below the entire graph, nothing will come
210 * of this. */
211 debug(" break");
212 break;
214 debug(" continue");
215 continue;
217 debug("- k = %d\n", k);
218 if (d == 0) {
219 /* This is the initializing step. There is no prev_k yet, get the initial x from the top left of
220 * the Myers graph. */
221 x = 0;
223 /* Favoring "-" lines first means favoring moving rightwards in the Myers graph.
224 * For this, all k should derive from k - 1, only the bottom most k derive from k + 1:
226 * | d= 0 1 2
227 * ----+----------------
228 * k= |
229 * 2 | 2,0 <-- from prev_k = 2 - 1 = 1
230 * | /
231 * 1 | 1,0
232 * | /
233 * 0 | -->0,0 3,3
234 * | \\ /
235 * -1 | 0,1 <-- bottom most for d=1 from prev_k = -1 + 1 = 0
236 * | \\
237 * -2 | 0,2 <-- bottom most for d=2 from prev_k = -2 + 1 = -1
239 * Except when a k + 1 from a previous run already means a further advancement in the graph.
240 * If k == d, there is no k + 1 and k - 1 is the only option.
241 * If k < d, use k + 1 in case that yields a larger x. Also use k + 1 if k - 1 is outside the graph.
242 */
243 else if (k > -d && (k == d
244 || (k - 1 >= -(int)right->atoms.len
245 && kd_forward[k - 1] >= kd_forward[k + 1]))) {
246 /* Advance from k - 1.
247 * From position prev_k, step to the right in the Myers graph: x += 1.
248 */
249 int prev_k = k - 1;
250 prev_x = kd_forward[prev_k];
251 prev_y = xk_to_y(prev_x, prev_k);
252 x = prev_x + 1;
253 } else {
254 /* The bottom most one.
255 * From position prev_k, step to the bottom in the Myers graph: y += 1.
256 * Incrementing y is achieved by decrementing k while keeping the same x.
257 * (since we're deriving y from y = x - k).
258 */
259 int prev_k = k + 1;
260 prev_x = kd_forward[prev_k];
261 prev_y = xk_to_y(prev_x, prev_k);
262 x = prev_x;
265 /* Slide down any snake that we might find here. */
266 while (x < left->atoms.len && xk_to_y(x, k) < right->atoms.len
267 && diff_atom_same(&left->atoms.head[x], &right->atoms.head[xk_to_y(x, k)]))
268 x++;
269 kd_forward[k] = x;
271 if (DEBUG) {
272 int fi;
273 for (fi = d; fi >= k; fi--) {
274 debug("kd_forward[%d] = (%d, %d)\n", fi, kd_forward[fi], kd_forward[fi] - fi);
275 /*
276 if (kd_forward[fi] >= 0 && kd_forward[fi] < left->atoms.len)
277 debug_dump_atom(left, right, &left->atoms.head[kd_forward[fi]]);
278 else
279 debug("\n");
280 if (kd_forward[fi]-fi >= 0 && kd_forward[fi]-fi < right->atoms.len)
281 debug_dump_atom(right, left, &right->atoms.head[kd_forward[fi]-fi]);
282 else
283 debug("\n");
284 */
288 if (x < 0 || x > left->atoms.len
289 || xk_to_y(x, k) < 0 || xk_to_y(x, k) > right->atoms.len)
290 continue;
292 /* Figured out a new forwards traversal, see if this has gone onto or even past a preceding backwards
293 * traversal.
295 * If the delta in length is odd, then d and backwards_d hit the same state indexes:
296 * | d= 0 1 2 1 0
297 * ----+---------------- ----------------
298 * k= | c=
299 * 4 | 3
300 * |
301 * 3 | 2
302 * | same
303 * 2 | 2,0====5,3 1
304 * | / \
305 * 1 | 1,0 5,4<-- 0
306 * | / /
307 * 0 | -->0,0 3,3====4,4 -1
308 * | \ /
309 * -1 | 0,1 -2
310 * | \
311 * -2 | 0,2 -3
312 * |
314 * If the delta is even, they end up off-by-one, i.e. on different diagonals:
316 * | d= 0 1 2 1 0
317 * ----+---------------- ----------------
318 * | c=
319 * 3 | 3
320 * |
321 * 2 | 2,0 off 2
322 * | / \\
323 * 1 | 1,0 4,3 1
324 * | / // \
325 * 0 | -->0,0 3,3 4,4<-- 0
326 * | \ / /
327 * -1 | 0,1 3,4 -1
328 * | \ //
329 * -2 | 0,2 -2
330 * |
332 * So in the forward path, we can only match up diagonals when the delta is odd.
333 */
334 if ((delta & 1) == 0)
335 continue;
336 /* Forwards is done first, so the backwards one was still at d - 1. Can't do this for d == 0. */
337 int backwards_d = d - 1;
338 if (backwards_d < 0)
339 continue;
341 debug("backwards_d = %d\n", backwards_d);
343 /* If both sides have the same length, forward and backward start on the same diagonal, meaning the
344 * backwards state index c == k.
345 * As soon as the lengths are not the same, the backwards traversal starts on a different diagonal, and
346 * c = k shifted by the difference in length.
347 */
348 int c = k_to_c(k, delta);
350 /* When the file sizes are very different, the traversal trees start on far distant diagonals.
351 * They don't necessarily meet straight on. See whether this forward value is on a diagonal that
352 * is also valid in kd_backward[], and match them if so. */
353 if (c >= -backwards_d && c <= backwards_d) {
354 /* Current k is on a diagonal that exists in kd_backward[]. If the two x positions have
355 * met or passed (forward walked onto or past backward), then we've found a midpoint / a
356 * mid-box.
358 * But we need to avoid matching a situation like this:
359 * 0 1
360 * x y
361 * 0 o-o-o
362 * x |\| |
363 * 1 o-o-o
364 * y | |\|
365 * 2 (B)o-o <--(B) backwards traversal reached here
366 * a | | |
367 * 3 o-o-o<-- prev_x, prev_y
368 * b | | |
369 * 4 o-o(F) <--(F) forwards traversal reached here
370 * x |\| | Now both are on the same diagonal and look like they passed,
371 * 5 o-o-o but actually they have sneaked past each other and have not met.
372 * y | |\|
373 * 6 o-o-o
375 * The solution is to notice that prev_x,prev_y were also already past (B).
376 */
377 int backward_x = kd_backward[c];
378 int backward_y = xc_to_y(backward_x, c, delta);
379 debug(" prev_x,y = (%d,%d) c%d:backward_x,y = (%d,%d) k%d:x,y = (%d,%d)\n",
380 prev_x, prev_y, c, backward_x, backward_y, k, x, xk_to_y(x, k));
381 if (prev_x <= backward_x && prev_y <= backward_y
382 && x >= backward_x) {
383 *meeting_snake = (struct diff_box){
384 .left_start = backward_x,
385 .left_end = x,
386 .right_start = xc_to_y(backward_x, c, delta),
387 .right_end = xk_to_y(x, k),
388 };
389 debug("HIT x=(%u,%u) - y=(%u,%u)\n",
390 meeting_snake->left_start,
391 meeting_snake->right_start,
392 meeting_snake->left_end,
393 meeting_snake->right_end);
394 return;
400 /* Do one backwards step in the "divide and conquer" graph traversal.
401 * left: the left side to diff.
402 * right: the right side to diff against.
403 * kd_forward: the traversal state for forwards traversal, to find a meeting point.
404 * Since forwards is done first, after this, both kd_forward and kd_backward will be valid for d.
405 * kd_forward points at the center of the state array, allowing negative indexes.
406 * kd_backward: the traversal state for backwards traversal, to find a meeting point.
407 * This is carried over between invocations with increasing d.
408 * kd_backward points at the center of the state array, allowing negative indexes.
409 * d: Step or distance counter, indicating for what value of d the kd_backward should be populated.
410 * Before the first invocation, kd_backward[0] shall point at the bottom right of the Myers graph
411 * (left.len, right.len).
412 * The first invocation will be for d == 1.
413 * meeting_snake: resulting meeting point, if any.
414 */
415 static void diff_divide_myers_backward(struct diff_data *left, struct diff_data *right,
416 int *kd_forward, int *kd_backward, int d,
417 struct diff_box *meeting_snake)
419 int delta = (int)right->atoms.len - (int)left->atoms.len;
420 int prev_x;
421 int prev_y;
422 int c;
423 int x;
425 debug("-- %s d=%d\n", __func__, d);
426 debug_dump_myers_graph(left, right, NULL);
428 for (c = d; c >= -d; c -= 2) {
429 if (c < -(int)left->atoms.len || c > (int)right->atoms.len) {
430 /* This diagonal is completely outside of the Myers graph, don't calculate it. */
431 if (c < -(int)left->atoms.len)
432 debug(" %d c < -(int)left->atoms.len %d\n", c, -(int)left->atoms.len);
433 else
434 debug(" %d c > right->atoms.len %d\n", c, right->atoms.len);
435 if (c < 0) {
436 /* We are traversing negatively, and already below the entire graph, nothing will come
437 * of this. */
438 debug(" break");
439 break;
441 debug(" continue");
442 continue;
444 debug("- c = %d\n", c);
445 if (d == 0) {
446 /* This is the initializing step. There is no prev_c yet, get the initial x from the bottom
447 * right of the Myers graph. */
448 x = left->atoms.len;
450 /* Favoring "-" lines first means favoring moving rightwards in the Myers graph.
451 * For this, all c should derive from c - 1, only the bottom most c derive from c + 1:
453 * 2 1 0
454 * ---------------------------------------------------
455 * c=
456 * 3
458 * from prev_c = c - 1 --> 5,2 2
459 * \
460 * 5,3 1
461 * \
462 * 4,3 5,4<-- 0
463 * \ /
464 * bottom most for d=1 from c + 1 --> 4,4 -1
465 * /
466 * bottom most for d=2 --> 3,4 -2
468 * Except when a c + 1 from a previous run already means a further advancement in the graph.
469 * If c == d, there is no c + 1 and c - 1 is the only option.
470 * If c < d, use c + 1 in case that yields a larger x. Also use c + 1 if c - 1 is outside the graph.
471 */
472 else if (c > -d && (c == d
473 || (c - 1 >= -(int)right->atoms.len
474 && kd_backward[c - 1] <= kd_backward[c + 1]))) {
475 /* A top one.
476 * From position prev_c, step upwards in the Myers graph: y -= 1.
477 * Decrementing y is achieved by incrementing c while keeping the same x.
478 * (since we're deriving y from y = x - c + delta).
479 */
480 int prev_c = c - 1;
481 prev_x = kd_backward[prev_c];
482 prev_y = xc_to_y(prev_x, prev_c, delta);
483 x = prev_x;
484 } else {
485 /* The bottom most one.
486 * From position prev_c, step to the left in the Myers graph: x -= 1.
487 */
488 int prev_c = c + 1;
489 prev_x = kd_backward[prev_c];
490 prev_y = xc_to_y(prev_x, prev_c, delta);
491 x = prev_x - 1;
494 /* Slide up any snake that we might find here. */
495 debug("c=%d x-1=%d Yb-1=%d-1=%d\n", c, x-1, xc_to_y(x, c, delta), xc_to_y(x, c, delta)-1);
496 if (x > 0) {
497 debug(" l="); debug_dump_atom(left, right, &left->atoms.head[x-1]);
499 if (xc_to_y(x, c, delta) > 0) {
500 debug(" r="); debug_dump_atom(right, left, &right->atoms.head[xc_to_y(x, c, delta)-1]);
502 while (x > 0 && xc_to_y(x, c, delta) > 0
503 && diff_atom_same(&left->atoms.head[x-1], &right->atoms.head[xc_to_y(x, c, delta)-1]))
504 x--;
505 kd_backward[c] = x;
507 if (DEBUG) {
508 int fi;
509 for (fi = d; fi >= c; fi--) {
510 debug("kd_backward[%d] = (%d, %d)\n", fi, kd_backward[fi],
511 kd_backward[fi] - fi + delta);
512 /*
513 if (kd_backward[fi] >= 0 && kd_backward[fi] < left->atoms.len)
514 debug_dump_atom(left, right, &left->atoms.head[kd_backward[fi]]);
515 else
516 debug("\n");
517 if (kd_backward[fi]-fi+delta >= 0 && kd_backward[fi]-fi+delta < right->atoms.len)
518 debug_dump_atom(right, left, &right->atoms.head[kd_backward[fi]-fi+delta]);
519 else
520 debug("\n");
521 */
525 if (x < 0 || x > left->atoms.len
526 || xc_to_y(x, c, delta) < 0 || xc_to_y(x, c, delta) > right->atoms.len)
527 continue;
529 /* Figured out a new backwards traversal, see if this has gone onto or even past a preceding forwards
530 * traversal.
532 * If the delta in length is even, then d and backwards_d hit the same state indexes -- note how this is
533 * different from in the forwards traversal, because now both d are the same:
535 * | d= 0 1 2 2 1 0
536 * ----+---------------- --------------------
537 * k= | c=
538 * 4 |
539 * |
540 * 3 | 3
541 * | same
542 * 2 | 2,0====5,2 2
543 * | / \
544 * 1 | 1,0 5,3 1
545 * | / / \
546 * 0 | -->0,0 3,3====4,3 5,4<-- 0
547 * | \ / /
548 * -1 | 0,1 4,4 -1
549 * | \
550 * -2 | 0,2 -2
551 * |
552 * -3
553 * If the delta is odd, they end up off-by-one, i.e. on different diagonals.
554 * So in the backward path, we can only match up diagonals when the delta is even.
555 */
556 if ((delta & 1) == 0) {
557 /* Forwards was done first, now both d are the same. */
558 int forwards_d = d;
560 /* As soon as the lengths are not the same, the backwards traversal starts on a different diagonal, and
561 * c = k shifted by the difference in length.
562 */
563 int k = c_to_k(c, delta);
565 /* When the file sizes are very different, the traversal trees start on far distant diagonals.
566 * They don't necessarily meet straight on. See whether this backward value is also on a valid
567 * diagonal in kd_forward[], and match them if so. */
568 if (k >= -forwards_d && k <= forwards_d) {
569 /* Current c is on a diagonal that exists in kd_forward[]. If the two x positions have
570 * met or passed (backward walked onto or past forward), then we've found a midpoint / a
571 * mid-box. */
572 int forward_x = kd_forward[k];
573 int forward_y = xk_to_y(forward_x, k);
574 debug("Compare %d to %d k=%d (x=%d,y=%d) to (x=%d,y=%d)\n",
575 forward_x, x, k,
576 forward_x, xk_to_y(forward_x, k), x, xc_to_y(x, c, delta));
577 if (forward_x <= prev_x && forward_y <= prev_y
578 && forward_x >= x) {
579 *meeting_snake = (struct diff_box){
580 .left_start = x,
581 .left_end = forward_x,
582 .right_start = xc_to_y(x, c, delta),
583 .right_end = xk_to_y(forward_x, k),
584 };
585 debug("HIT x=%u,%u - y=%u,%u\n",
586 meeting_snake->left_start,
587 meeting_snake->right_start,
588 meeting_snake->left_end,
589 meeting_snake->right_end);
590 return;
597 /* Myers "Divide et Impera": tracing forwards from the start and backwards from the end to find a midpoint that divides
598 * the problem into smaller chunks. Requires only linear amounts of memory. */
599 enum diff_rc diff_algo_myers_divide(const struct diff_algo_config *algo_config, struct diff_state *state)
601 enum diff_rc rc = DIFF_RC_ENOMEM;
602 struct diff_data *left = &state->left;
603 struct diff_data *right = &state->right;
605 debug("\n** %s\n", __func__);
606 debug("left:\n");
607 debug_dump(left);
608 debug("right:\n");
609 debug_dump(right);
610 debug_dump_myers_graph(left, right, NULL);
612 /* Allocate two columns of a Myers graph, one for the forward and one for the backward traversal. */
613 unsigned int max = left->atoms.len + right->atoms.len;
614 size_t kd_len = max + 1;
615 size_t kd_buf_size = kd_len << 1;
616 int *kd_buf = reallocarray(NULL, kd_buf_size, sizeof(int));
617 if (!kd_buf)
618 return DIFF_RC_ENOMEM;
619 int i;
620 for (i = 0; i < kd_buf_size; i++)
621 kd_buf[i] = -1;
622 int *kd_forward = kd_buf;
623 int *kd_backward = kd_buf + kd_len;
625 /* The 'k' axis in Myers spans positive and negative indexes, so point the kd to the middle.
626 * It is then possible to index from -max/2 .. max/2. */
627 kd_forward += max/2;
628 kd_backward += max/2;
630 int d;
631 struct diff_box mid_snake = {};
632 for (d = 0; d <= (max/2); d++) {
633 debug("-- d=%d\n", d);
634 diff_divide_myers_forward(left, right, kd_forward, kd_backward, d, &mid_snake);
635 if (!diff_box_empty(&mid_snake))
636 break;
637 diff_divide_myers_backward(left, right, kd_forward, kd_backward, d, &mid_snake);
638 if (!diff_box_empty(&mid_snake))
639 break;
642 if (diff_box_empty(&mid_snake)) {
643 /* Divide and conquer failed to find a meeting point. Use the fallback_algo defined in the algo_config
644 * (leave this to the caller). This is just paranoia/sanity, we normally should always find a midpoint.
645 */
646 debug(" no midpoint \n");
647 rc = DIFF_RC_USE_DIFF_ALGO_FALLBACK;
648 goto return_rc;
649 } else {
650 debug(" mid snake L: %u to %u of %u R: %u to %u of %u\n",
651 mid_snake.left_start, mid_snake.left_end, left->atoms.len,
652 mid_snake.right_start, mid_snake.right_end, right->atoms.len);
654 /* Section before the mid-snake. */
655 debug("Section before the mid-snake\n");
657 struct diff_atom *left_atom = &left->atoms.head[0];
658 unsigned int left_section_len = mid_snake.left_start;
659 struct diff_atom *right_atom = &right->atoms.head[0];
660 unsigned int right_section_len = mid_snake.right_start;
662 if (left_section_len && right_section_len) {
663 /* Record an unsolved chunk, the caller will apply inner_algo() on this chunk. */
664 if (!diff_state_add_chunk(state, false,
665 left_atom, left_section_len,
666 right_atom, right_section_len))
667 goto return_rc;
668 } else if (left_section_len && !right_section_len) {
669 /* Only left atoms and none on the right, they form a "minus" chunk, then. */
670 if (!diff_state_add_chunk(state, true,
671 left_atom, left_section_len,
672 right_atom, 0))
673 goto return_rc;
674 } else if (!left_section_len && right_section_len) {
675 /* No left atoms, only atoms on the right, they form a "plus" chunk, then. */
676 if (!diff_state_add_chunk(state, true,
677 left_atom, 0,
678 right_atom, right_section_len))
679 goto return_rc;
681 /* else: left_section_len == 0 and right_section_len == 0, i.e. nothing before the mid-snake. */
683 /* the mid-snake, identical data on both sides: */
684 debug("the mid-snake\n");
685 if (!diff_state_add_chunk(state, true,
686 &left->atoms.head[mid_snake.left_start],
687 mid_snake.left_end - mid_snake.left_start,
688 &right->atoms.head[mid_snake.right_start],
689 mid_snake.right_end - mid_snake.right_start))
690 goto return_rc;
692 /* Section after the mid-snake. */
693 debug("Section after the mid-snake\n");
694 debug(" left_end %u right_end %u\n", mid_snake.left_end, mid_snake.right_end);
695 debug(" left_count %u right_count %u\n", left->atoms.len, right->atoms.len);
696 left_atom = &left->atoms.head[mid_snake.left_end];
697 left_section_len = left->atoms.len - mid_snake.left_end;
698 right_atom = &right->atoms.head[mid_snake.right_end];
699 right_section_len = right->atoms.len - mid_snake.right_end;
701 if (left_section_len && right_section_len) {
702 /* Record an unsolved chunk, the caller will apply inner_algo() on this chunk. */
703 if (!diff_state_add_chunk(state, false,
704 left_atom, left_section_len,
705 right_atom, right_section_len))
706 goto return_rc;
707 } else if (left_section_len && !right_section_len) {
708 /* Only left atoms and none on the right, they form a "minus" chunk, then. */
709 if (!diff_state_add_chunk(state, true,
710 left_atom, left_section_len,
711 right_atom, 0))
712 goto return_rc;
713 } else if (!left_section_len && right_section_len) {
714 /* No left atoms, only atoms on the right, they form a "plus" chunk, then. */
715 if (!diff_state_add_chunk(state, true,
716 left_atom, 0,
717 right_atom, right_section_len))
718 goto return_rc;
720 /* else: left_section_len == 0 and right_section_len == 0, i.e. nothing after the mid-snake. */
723 rc = DIFF_RC_OK;
725 return_rc:
726 free(kd_buf);
727 debug("** END %s\n", __func__);
728 return rc;
731 /* Myers Diff tracing from the start all the way through to the end, requiring quadratic amounts of memory. This can
732 * fail if the required space surpasses algo_config->permitted_state_size. */
733 enum diff_rc diff_algo_myers(const struct diff_algo_config *algo_config, struct diff_state *state)
735 /* do a diff_divide_myers_forward() without a _backward(), so that it walks forward across the entire
736 * files to reach the end. Keep each run's state, and do a final backtrace. */
737 enum diff_rc rc = DIFF_RC_ENOMEM;
738 struct diff_data *left = &state->left;
739 struct diff_data *right = &state->right;
741 debug("\n** %s\n", __func__);
742 debug("left:\n");
743 debug_dump(left);
744 debug("right:\n");
745 debug_dump(right);
746 debug_dump_myers_graph(left, right, NULL);
748 /* Allocate two columns of a Myers graph, one for the forward and one for the backward traversal. */
749 unsigned int max = left->atoms.len + right->atoms.len;
750 size_t kd_len = max + 1 + max;
751 size_t kd_buf_size = kd_len * kd_len;
752 debug("state size: %zu\n", kd_buf_size);
753 if (kd_buf_size < kd_len /* overflow? */
754 || kd_buf_size * sizeof(int) > algo_config->permitted_state_size) {
755 debug("state size %zu > permitted_state_size %zu, use fallback_algo\n",
756 kd_buf_size, algo_config->permitted_state_size);
757 return DIFF_RC_USE_DIFF_ALGO_FALLBACK;
760 int *kd_buf = reallocarray(NULL, kd_buf_size, sizeof(int));
761 if (!kd_buf)
762 return DIFF_RC_ENOMEM;
763 int i;
764 for (i = 0; i < kd_buf_size; i++)
765 kd_buf[i] = -1;
767 /* The 'k' axis in Myers spans positive and negative indexes, so point the kd to the middle.
768 * It is then possible to index from -max .. max. */
769 int *kd_origin = kd_buf + max;
770 int *kd_column = kd_origin;
772 int d;
773 int backtrack_d = -1;
774 int backtrack_k = 0;
775 int k;
776 int x, y;
777 for (d = 0; d <= max; d++, kd_column += kd_len) {
778 debug("-- d=%d\n", d);
780 debug("-- %s d=%d\n", __func__, d);
782 for (k = d; k >= -d; k -= 2) {
783 if (k < -(int)right->atoms.len || k > (int)left->atoms.len) {
784 /* This diagonal is completely outside of the Myers graph, don't calculate it. */
785 if (k < -(int)right->atoms.len)
786 debug(" %d k < -(int)right->atoms.len %d\n", k, -(int)right->atoms.len);
787 else
788 debug(" %d k > left->atoms.len %d\n", k, left->atoms.len);
789 if (k < 0) {
790 /* We are traversing negatively, and already below the entire graph, nothing will come
791 * of this. */
792 debug(" break");
793 break;
795 debug(" continue");
796 continue;
799 debug("- k = %d\n", k);
800 if (d == 0) {
801 /* This is the initializing step. There is no prev_k yet, get the initial x from the top left of
802 * the Myers graph. */
803 x = 0;
804 } else {
805 int *kd_prev_column = kd_column - kd_len;
807 /* Favoring "-" lines first means favoring moving rightwards in the Myers graph.
808 * For this, all k should derive from k - 1, only the bottom most k derive from k + 1:
810 * | d= 0 1 2
811 * ----+----------------
812 * k= |
813 * 2 | 2,0 <-- from prev_k = 2 - 1 = 1
814 * | /
815 * 1 | 1,0
816 * | /
817 * 0 | -->0,0 3,3
818 * | \\ /
819 * -1 | 0,1 <-- bottom most for d=1 from prev_k = -1 + 1 = 0
820 * | \\
821 * -2 | 0,2 <-- bottom most for d=2 from prev_k = -2 + 1 = -1
823 * Except when a k + 1 from a previous run already means a further advancement in the graph.
824 * If k == d, there is no k + 1 and k - 1 is the only option.
825 * If k < d, use k + 1 in case that yields a larger x. Also use k + 1 if k - 1 is outside the graph.
826 */
827 if (k > -d && (k == d
828 || (k - 1 >= -(int)right->atoms.len
829 && kd_prev_column[k - 1] >= kd_prev_column[k + 1]))) {
830 /* Advance from k - 1.
831 * From position prev_k, step to the right in the Myers graph: x += 1.
832 */
833 int prev_k = k - 1;
834 int prev_x = kd_prev_column[prev_k];
835 x = prev_x + 1;
836 } else {
837 /* The bottom most one.
838 * From position prev_k, step to the bottom in the Myers graph: y += 1.
839 * Incrementing y is achieved by decrementing k while keeping the same x.
840 * (since we're deriving y from y = x - k).
841 */
842 int prev_k = k + 1;
843 int prev_x = kd_prev_column[prev_k];
844 x = prev_x;
848 /* Slide down any snake that we might find here. */
849 while (x < left->atoms.len && xk_to_y(x, k) < right->atoms.len
850 && diff_atom_same(&left->atoms.head[x], &right->atoms.head[xk_to_y(x, k)]))
851 x++;
852 kd_column[k] = x;
854 if (DEBUG) {
855 int fi;
856 for (fi = d; fi >= k; fi-=2) {
857 debug("kd_column[%d] = (%d, %d)\n", fi, kd_column[fi], kd_column[fi] - fi);
858 #if 0
859 if (kd_column[fi] >= 0 && kd_column[fi] < left->atoms.len)
860 debug_dump_atom(left, right, &left->atoms.head[kd_column[fi]]);
861 else
862 debug("\n");
863 if (kd_column[fi]-fi >= 0 && kd_column[fi]-fi < right->atoms.len)
864 debug_dump_atom(right, left, &right->atoms.head[kd_column[fi]-fi]);
865 else
866 debug("\n");
867 #endif
871 if (x == left->atoms.len && xk_to_y(x, k) == right->atoms.len) {
872 /* Found a path */
873 backtrack_d = d;
874 backtrack_k = k;
875 debug("Reached the end at d = %d, k = %d\n",
876 backtrack_d, backtrack_k);
877 break;
881 if (backtrack_d >= 0)
882 break;
885 debug_dump_myers_graph(left, right, kd_origin);
887 /* backtrack. A matrix spanning from start to end of the file is ready:
889 * | d= 0 1 2 3 4
890 * ----+---------------------------------
891 * k= |
892 * 3 |
893 * |
894 * 2 | 2,0
895 * | /
896 * 1 | 1,0 4,3
897 * | / / \
898 * 0 | -->0,0 3,3 4,4 --> backtrack_d = 4, backtrack_k = 0
899 * | \ / \
900 * -1 | 0,1 3,4
901 * | \
902 * -2 | 0,2
903 * |
905 * From (4,4) backwards, find the previous position that is the largest, and remember it.
907 */
908 for (d = backtrack_d, k = backtrack_k; d >= 0; d--) {
909 x = kd_column[k];
910 y = xk_to_y(x, k);
912 /* When the best position is identified, remember it for that kd_column.
913 * That kd_column is no longer needed otherwise, so just re-purpose kd_column[0] = x and kd_column[1] = y,
914 * so that there is no need to allocate more memory.
915 */
916 kd_column[0] = x;
917 kd_column[1] = y;
918 debug("Backtrack d=%d: xy=(%d, %d)\n",
919 d, kd_column[0], kd_column[1]);
921 /* Don't access memory before kd_buf */
922 if (d == 0)
923 break;
924 int *kd_prev_column = kd_column - kd_len;
926 /* When y == 0, backtracking downwards (k-1) is the only way.
927 * When x == 0, backtracking upwards (k+1) is the only way.
929 * | d= 0 1 2 3 4
930 * ----+---------------------------------
931 * k= |
932 * 3 |
933 * | ..y == 0
934 * 2 | 2,0
935 * | /
936 * 1 | 1,0 4,3
937 * | / / \
938 * 0 | -->0,0 3,3 4,4 --> backtrack_d = 4, backtrack_k = 0
939 * | \ / \
940 * -1 | 0,1 3,4
941 * | \
942 * -2 | 0,2__
943 * | x == 0
944 */
945 debug("prev[k-1] = %d,%d prev[k+1] = %d,%d\n",
946 kd_prev_column[k-1], xk_to_y(kd_prev_column[k-1],k-1),
947 kd_prev_column[k+1], xk_to_y(kd_prev_column[k+1],k+1));
948 if (y == 0
949 || (x > 0 && kd_prev_column[k - 1] >= kd_prev_column[k + 1])) {
950 k = k - 1;
951 debug("prev k=k-1=%d x=%d y=%d\n",
952 k, kd_prev_column[k], xk_to_y(kd_prev_column[k], k));
953 } else {
954 k = k + 1;
955 debug("prev k=k+1=%d x=%d y=%d\n",
956 k, kd_prev_column[k], xk_to_y(kd_prev_column[k], k));
958 kd_column = kd_prev_column;
961 /* Forwards again, this time recording the diff chunks.
962 * Definitely start from 0,0. kd_column[0] may actually point to the bottom of a snake starting at 0,0 */
963 x = 0;
964 y = 0;
966 kd_column = kd_origin;
967 for (d = 0; d <= backtrack_d; d++, kd_column += kd_len) {
968 int next_x = kd_column[0];
969 int next_y = kd_column[1];
970 debug("Forward track from xy(%d,%d) to xy(%d,%d)\n",
971 x, y, next_x, next_y);
973 struct diff_atom *left_atom = &left->atoms.head[x];
974 int left_section_len = next_x - x;
975 struct diff_atom *right_atom = &right->atoms.head[y];
976 int right_section_len = next_y - y;
978 rc = DIFF_RC_ENOMEM;
979 if (left_section_len && right_section_len) {
980 /* This must be a snake slide.
981 * Snake slides have a straight line leading into them (except when starting at (0,0)). Find
982 * out whether the lead-in is horizontal or vertical:
984 * left
985 * ---------->
986 * |
987 * r| o-o o
988 * i| \ |
989 * g| o o
990 * h| \ \
991 * t| o o
992 * v
994 * If left_section_len > right_section_len, the lead-in is horizontal, meaning first
995 * remove one atom from the left before sliding down the snake.
996 * If right_section_len > left_section_len, the lead-in is vetical, so add one atom from
997 * the right before sliding down the snake. */
998 if (left_section_len == right_section_len + 1) {
999 if (!diff_state_add_chunk(state, true,
1000 left_atom, 1,
1001 right_atom, 0))
1002 goto return_rc;
1003 left_atom++;
1004 left_section_len--;
1005 } else if (right_section_len == left_section_len + 1) {
1006 if (!diff_state_add_chunk(state, true,
1007 left_atom, 0,
1008 right_atom, 1))
1009 goto return_rc;
1010 right_atom++;
1011 right_section_len--;
1012 } else if (left_section_len != right_section_len) {
1013 /* The numbers are making no sense. Should never happen. */
1014 rc = DIFF_RC_USE_DIFF_ALGO_FALLBACK;
1015 goto return_rc;
1018 if (!diff_state_add_chunk(state, true,
1019 left_atom, left_section_len,
1020 right_atom, right_section_len))
1021 goto return_rc;
1022 } else if (left_section_len && !right_section_len) {
1023 /* Only left atoms and none on the right, they form a "minus" chunk, then. */
1024 if (!diff_state_add_chunk(state, true,
1025 left_atom, left_section_len,
1026 right_atom, 0))
1027 goto return_rc;
1028 } else if (!left_section_len && right_section_len) {
1029 /* No left atoms, only atoms on the right, they form a "plus" chunk, then. */
1030 if (!diff_state_add_chunk(state, true,
1031 left_atom, 0,
1032 right_atom, right_section_len))
1033 goto return_rc;
1036 x = next_x;
1037 y = next_y;
1040 rc = DIFF_RC_OK;
1042 return_rc:
1043 free(kd_buf);
1044 debug("** END %s rc=%d\n", __func__, rc);
1045 return rc;