Blame


1 fe621944 2020-11-10 stsp /* Generic infrastructure to implement various diff algorithms. */
2 fe621944 2020-11-10 stsp /*
3 fe621944 2020-11-10 stsp * Copyright (c) 2020 Neels Hofmeyr <neels@hofmeyr.de>
4 fe621944 2020-11-10 stsp *
5 fe621944 2020-11-10 stsp * Permission to use, copy, modify, and distribute this software for any
6 fe621944 2020-11-10 stsp * purpose with or without fee is hereby granted, provided that the above
7 fe621944 2020-11-10 stsp * copyright notice and this permission notice appear in all copies.
8 fe621944 2020-11-10 stsp *
9 fe621944 2020-11-10 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 fe621944 2020-11-10 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 fe621944 2020-11-10 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 fe621944 2020-11-10 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 fe621944 2020-11-10 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 fe621944 2020-11-10 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 fe621944 2020-11-10 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 fe621944 2020-11-10 stsp */
17 fe621944 2020-11-10 stsp
18 fe621944 2020-11-10 stsp struct diff_range {
19 fe621944 2020-11-10 stsp int start;
20 fe621944 2020-11-10 stsp int end;
21 fe621944 2020-11-10 stsp };
22 fe621944 2020-11-10 stsp
23 fe621944 2020-11-10 stsp /* List of all possible return codes of a diff invocation. */
24 fe621944 2020-11-10 stsp #define DIFF_RC_USE_DIFF_ALGO_FALLBACK -1
25 fe621944 2020-11-10 stsp #define DIFF_RC_OK 0
26 fe621944 2020-11-10 stsp /* Any positive return values are errno values from sys/errno.h */
27 fe621944 2020-11-10 stsp
28 dea26038 2020-11-18 stsp struct diff_atom {
29 dea26038 2020-11-18 stsp struct diff_data *root; /* back pointer to root diff data */
30 fe621944 2020-11-10 stsp
31 dea26038 2020-11-18 stsp off_t pos; /* if not memory-mapped */
32 dea26038 2020-11-18 stsp const uint8_t *at; /* if memory-mapped */
33 dea26038 2020-11-18 stsp off_t len;
34 dea26038 2020-11-18 stsp
35 dea26038 2020-11-18 stsp /* This hash is just a very cheap speed up for finding *mismatching*
36 dea26038 2020-11-18 stsp * atoms. When hashes match, we still need to compare entire atoms to
37 dea26038 2020-11-18 stsp * find out whether they are indeed identical or not.
38 dea26038 2020-11-18 stsp * Calculated over all atom bytes with diff_atom_hash_update(). */
39 dea26038 2020-11-18 stsp unsigned int hash;
40 dea26038 2020-11-18 stsp };
41 dea26038 2020-11-18 stsp
42 dea26038 2020-11-18 stsp /* Compare two atoms for equality. Return 0 on success, or errno on failure.
43 dea26038 2020-11-18 stsp * Set cmp to -1, 0, or 1, just like strcmp(). */
44 dea26038 2020-11-18 stsp int
45 dea26038 2020-11-18 stsp diff_atom_cmp(int *cmp,
46 dea26038 2020-11-18 stsp const struct diff_atom *left,
47 dea26038 2020-11-18 stsp const struct diff_atom *right);
48 dea26038 2020-11-18 stsp
49 dea26038 2020-11-18 stsp
50 dea26038 2020-11-18 stsp /* The atom's index in the entire file. For atoms divided by lines of text, this
51 dea26038 2020-11-18 stsp * yields the line number (starting with 0). Also works for diff_data that
52 dea26038 2020-11-18 stsp * reference only a subsection of a file, always reflecting the global position
53 dea26038 2020-11-18 stsp * in the file (and not the relative position within the subsection). */
54 dea26038 2020-11-18 stsp #define diff_atom_root_idx(DIFF_DATA, ATOM) \
55 dea26038 2020-11-18 stsp ((ATOM) && ((ATOM) >= (DIFF_DATA)->root->atoms.head) \
56 dea26038 2020-11-18 stsp ? (unsigned int)((ATOM) - ((DIFF_DATA)->root->atoms.head)) \
57 dea26038 2020-11-18 stsp : (DIFF_DATA)->root->atoms.len)
58 dea26038 2020-11-18 stsp
59 dea26038 2020-11-18 stsp /* The atom's index within DIFF_DATA. For atoms divided by lines of text, this
60 dea26038 2020-11-18 stsp * yields the line number (starting with 0). */
61 dea26038 2020-11-18 stsp #define diff_atom_idx(DIFF_DATA, ATOM) \
62 dea26038 2020-11-18 stsp ((ATOM) && ((ATOM) >= (DIFF_DATA)->atoms.head) \
63 dea26038 2020-11-18 stsp ? (unsigned int)((ATOM) - ((DIFF_DATA)->atoms.head)) \
64 dea26038 2020-11-18 stsp : (DIFF_DATA)->atoms.len)
65 dea26038 2020-11-18 stsp
66 dea26038 2020-11-18 stsp #define foreach_diff_atom(ATOM, FIRST_ATOM, COUNT) \
67 dea26038 2020-11-18 stsp for ((ATOM) = (FIRST_ATOM); \
68 dea26038 2020-11-18 stsp (ATOM) \
69 dea26038 2020-11-18 stsp && ((ATOM) >= (FIRST_ATOM)) \
70 dea26038 2020-11-18 stsp && ((ATOM) - (FIRST_ATOM) < (COUNT)); \
71 dea26038 2020-11-18 stsp (ATOM)++)
72 dea26038 2020-11-18 stsp
73 dea26038 2020-11-18 stsp #define diff_data_foreach_atom(ATOM, DIFF_DATA) \
74 dea26038 2020-11-18 stsp foreach_diff_atom(ATOM, (DIFF_DATA)->atoms.head, (DIFF_DATA)->atoms.len)
75 dea26038 2020-11-18 stsp
76 dea26038 2020-11-18 stsp #define diff_data_foreach_atom_from(FROM, ATOM, DIFF_DATA) \
77 dea26038 2020-11-18 stsp for ((ATOM) = (FROM); \
78 dea26038 2020-11-18 stsp (ATOM) \
79 dea26038 2020-11-18 stsp && ((ATOM) >= (DIFF_DATA)->atoms.head) \
80 dea26038 2020-11-18 stsp && ((ATOM) - (DIFF_DATA)->atoms.head < (DIFF_DATA)->atoms.len); \
81 dea26038 2020-11-18 stsp (ATOM)++)
82 dea26038 2020-11-18 stsp
83 dea26038 2020-11-18 stsp #define diff_data_foreach_atom_backwards_from(FROM, ATOM, DIFF_DATA) \
84 dea26038 2020-11-18 stsp for ((ATOM) = (FROM); \
85 dea26038 2020-11-18 stsp (ATOM) \
86 dea26038 2020-11-18 stsp && ((ATOM) >= (DIFF_DATA)->atoms.head) \
87 dea26038 2020-11-18 stsp && ((ATOM) - (DIFF_DATA)->atoms.head >= 0); \
88 dea26038 2020-11-18 stsp (ATOM)--)
89 dea26038 2020-11-18 stsp
90 fe621944 2020-11-10 stsp /* For each file, there is a "root" struct diff_data referencing the entire
91 fe621944 2020-11-10 stsp * file, which the atoms are parsed from. In recursion of diff algorithm, there
92 fe621944 2020-11-10 stsp * may be "child" struct diff_data only referencing a subsection of the file,
93 fe621944 2020-11-10 stsp * re-using the atoms parsing. For "root" structs, atoms_allocated will be
94 fe621944 2020-11-10 stsp * nonzero, indicating that the array of atoms is owned by that struct. For
95 fe621944 2020-11-10 stsp * "child" structs, atoms_allocated == 0, to indicate that the struct is
96 fe621944 2020-11-10 stsp * referencing a subset of atoms. */
97 fe621944 2020-11-10 stsp struct diff_data {
98 fe621944 2020-11-10 stsp FILE *f; /* if root diff_data and not memory-mapped */
99 fe621944 2020-11-10 stsp off_t pos; /* if not memory-mapped */
100 fe621944 2020-11-10 stsp const uint8_t *data; /* if memory-mapped */
101 fe621944 2020-11-10 stsp off_t len;
102 fe621944 2020-11-10 stsp
103 b67f3bcb 2020-11-21 stsp int atomizer_flags;
104 fe621944 2020-11-10 stsp ARRAYLIST(struct diff_atom) atoms;
105 fe621944 2020-11-10 stsp struct diff_data *root;
106 fe621944 2020-11-10 stsp struct diff_data *current;
107 fe621944 2020-11-10 stsp void *algo_data;
108 fe621944 2020-11-10 stsp
109 fe621944 2020-11-10 stsp int diff_flags;
110 fe621944 2020-11-10 stsp
111 fe621944 2020-11-10 stsp int err;
112 fe621944 2020-11-10 stsp };
113 fe621944 2020-11-10 stsp
114 b67f3bcb 2020-11-21 stsp /* Flags set by file atomizer. */
115 b67f3bcb 2020-11-21 stsp #define DIFF_ATOMIZER_FOUND_BINARY_DATA 0x00000001
116 b67f3bcb 2020-11-21 stsp
117 b67f3bcb 2020-11-21 stsp /* Flags set by caller of diff_main(). */
118 fe621944 2020-11-10 stsp #define DIFF_FLAG_IGNORE_WHITESPACE 0x00000001
119 fe621944 2020-11-10 stsp #define DIFF_FLAG_SHOW_PROTOTYPES 0x00000002
120 b67f3bcb 2020-11-21 stsp #define DIFF_FLAG_FORCE_TEXT_DATA 0x00000004
121 fe621944 2020-11-10 stsp
122 fe621944 2020-11-10 stsp void diff_data_free(struct diff_data *diff_data);
123 fe621944 2020-11-10 stsp
124 fe621944 2020-11-10 stsp struct diff_chunk;
125 fe621944 2020-11-10 stsp typedef ARRAYLIST(struct diff_chunk) diff_chunk_arraylist_t;
126 fe621944 2020-11-10 stsp
127 fe621944 2020-11-10 stsp struct diff_result {
128 fe621944 2020-11-10 stsp int rc;
129 fe621944 2020-11-10 stsp
130 fe621944 2020-11-10 stsp /*
131 fe621944 2020-11-10 stsp * Pointers to diff data passed in via diff_main.
132 fe621944 2020-11-10 stsp * Do not free these diff_data before freeing the diff_result struct.
133 fe621944 2020-11-10 stsp */
134 fe621944 2020-11-10 stsp struct diff_data *left;
135 fe621944 2020-11-10 stsp struct diff_data *right;
136 fe621944 2020-11-10 stsp
137 fe621944 2020-11-10 stsp diff_chunk_arraylist_t chunks;
138 fe621944 2020-11-10 stsp };
139 fe621944 2020-11-10 stsp
140 fe621944 2020-11-10 stsp struct diff_state;
141 fe621944 2020-11-10 stsp
142 fe621944 2020-11-10 stsp /* Signature of a utility function to divide a file into diff atoms.
143 fe621944 2020-11-10 stsp * An example is diff_atomize_text_by_line() in diff_atomize_text.c.
144 fe621944 2020-11-10 stsp *
145 fe621944 2020-11-10 stsp * func_data: context pointer (free to be used by implementation).
146 fe621944 2020-11-10 stsp * d: struct diff_data with d->data and d->len already set up, and
147 b67f3bcb 2020-11-21 stsp * d->atoms to be created and d->atomizer_flags to be set up.
148 fe621944 2020-11-10 stsp */
149 fe621944 2020-11-10 stsp typedef int (*diff_atomize_func_t)(void *func_data, struct diff_data *d);
150 fe621944 2020-11-10 stsp
151 fe621944 2020-11-10 stsp extern int diff_atomize_text_by_line(void *func_data, struct diff_data *d);
152 fe621944 2020-11-10 stsp
153 fe621944 2020-11-10 stsp struct diff_algo_config;
154 fe621944 2020-11-10 stsp typedef int (*diff_algo_impl_t)(
155 fe621944 2020-11-10 stsp const struct diff_algo_config *algo_config, struct diff_state *state);
156 fe621944 2020-11-10 stsp
157 fe621944 2020-11-10 stsp /* Form a result with all left-side removed and all right-side added, i.e. no
158 fe621944 2020-11-10 stsp * actual diff algorithm involved. */
159 fe621944 2020-11-10 stsp int diff_algo_none(const struct diff_algo_config *algo_config,
160 fe621944 2020-11-10 stsp struct diff_state *state);
161 fe621944 2020-11-10 stsp
162 fe621944 2020-11-10 stsp /* Myers Diff tracing from the start all the way through to the end, requiring
163 fe621944 2020-11-10 stsp * quadratic amounts of memory. This can fail if the required space surpasses
164 fe621944 2020-11-10 stsp * algo_config->permitted_state_size. */
165 fe621944 2020-11-10 stsp extern int diff_algo_myers(const struct diff_algo_config *algo_config,
166 fe621944 2020-11-10 stsp struct diff_state *state);
167 fe621944 2020-11-10 stsp
168 fe621944 2020-11-10 stsp /* Myers "Divide et Impera": tracing forwards from the start and backwards from
169 fe621944 2020-11-10 stsp * the end to find a midpoint that divides the problem into smaller chunks.
170 fe621944 2020-11-10 stsp * Requires only linear amounts of memory. */
171 fe621944 2020-11-10 stsp extern int diff_algo_myers_divide(
172 fe621944 2020-11-10 stsp const struct diff_algo_config *algo_config, struct diff_state *state);
173 fe621944 2020-11-10 stsp
174 fe621944 2020-11-10 stsp /* Patience Diff algorithm, which divides a larger diff into smaller chunks. For
175 fe621944 2020-11-10 stsp * very specific scenarios, it may lead to a complete diff result by itself, but
176 fe621944 2020-11-10 stsp * needs a fallback algo to solve chunks that don't have common-unique atoms. */
177 fe621944 2020-11-10 stsp extern int diff_algo_patience(
178 fe621944 2020-11-10 stsp const struct diff_algo_config *algo_config, struct diff_state *state);
179 fe621944 2020-11-10 stsp
180 fe621944 2020-11-10 stsp /* Diff algorithms to use, possibly nested. For example:
181 fe621944 2020-11-10 stsp *
182 fe621944 2020-11-10 stsp * struct diff_algo_config myers, patience, myers_divide;
183 fe621944 2020-11-10 stsp *
184 fe621944 2020-11-10 stsp * myers = (struct diff_algo_config){
185 fe621944 2020-11-10 stsp * .impl = diff_algo_myers,
186 fe621944 2020-11-10 stsp * .permitted_state_size = 32 * 1024 * 1024,
187 fe621944 2020-11-10 stsp * // When too large, do diff_algo_patience:
188 fe621944 2020-11-10 stsp * .fallback_algo = &patience,
189 fe621944 2020-11-10 stsp * };
190 fe621944 2020-11-10 stsp *
191 fe621944 2020-11-10 stsp * const struct diff_algo_config patience = (struct diff_algo_config){
192 fe621944 2020-11-10 stsp * .impl = diff_algo_patience,
193 fe621944 2020-11-10 stsp * // After subdivision, do Patience again:
194 fe621944 2020-11-10 stsp * .inner_algo = &patience,
195 fe621944 2020-11-10 stsp * // If subdivision failed, do Myers Divide et Impera:
196 fe621944 2020-11-10 stsp * .fallback_algo = &myers_then_myers_divide,
197 fe621944 2020-11-10 stsp * };
198 fe621944 2020-11-10 stsp *
199 fe621944 2020-11-10 stsp * const struct diff_algo_config myers_divide = (struct diff_algo_config){
200 fe621944 2020-11-10 stsp * .impl = diff_algo_myers_divide,
201 fe621944 2020-11-10 stsp * // When division succeeded, start from the top:
202 fe621944 2020-11-10 stsp * .inner_algo = &myers_then_myers_divide,
203 fe621944 2020-11-10 stsp * // (fallback_algo = NULL implies diff_algo_none).
204 fe621944 2020-11-10 stsp * };
205 fe621944 2020-11-10 stsp * struct diff_config config = {
206 fe621944 2020-11-10 stsp * .algo = &myers,
207 fe621944 2020-11-10 stsp * ...
208 fe621944 2020-11-10 stsp * };
209 fe621944 2020-11-10 stsp * diff_main(&config, ...);
210 fe621944 2020-11-10 stsp */
211 fe621944 2020-11-10 stsp struct diff_algo_config {
212 fe621944 2020-11-10 stsp diff_algo_impl_t impl;
213 fe621944 2020-11-10 stsp
214 fe621944 2020-11-10 stsp /* Fail this algo if it would use more than this amount of memory, and
215 fe621944 2020-11-10 stsp * instead use fallback_algo (diff_algo_myers). permitted_state_size ==
216 fe621944 2020-11-10 stsp * 0 means no limitation. */
217 fe621944 2020-11-10 stsp size_t permitted_state_size;
218 fe621944 2020-11-10 stsp
219 fe621944 2020-11-10 stsp /* For algorithms that divide into smaller chunks, use this algorithm to
220 fe621944 2020-11-10 stsp * solve the divided chunks. */
221 fe621944 2020-11-10 stsp const struct diff_algo_config *inner_algo;
222 fe621944 2020-11-10 stsp
223 fe621944 2020-11-10 stsp /* If the algorithm fails (e.g. diff_algo_myers_if_small needs too large
224 fe621944 2020-11-10 stsp * state, or diff_algo_patience can't find any common-unique atoms),
225 fe621944 2020-11-10 stsp * then use this algorithm instead. */
226 fe621944 2020-11-10 stsp const struct diff_algo_config *fallback_algo;
227 fe621944 2020-11-10 stsp };
228 fe621944 2020-11-10 stsp
229 fe621944 2020-11-10 stsp struct diff_config {
230 fe621944 2020-11-10 stsp diff_atomize_func_t atomize_func;
231 fe621944 2020-11-10 stsp void *atomize_func_data;
232 fe621944 2020-11-10 stsp
233 fe621944 2020-11-10 stsp const struct diff_algo_config *algo;
234 fe621944 2020-11-10 stsp
235 fe621944 2020-11-10 stsp /* How deep to step into subdivisions of a source file, a paranoia /
236 fe621944 2020-11-10 stsp * safety measure to guard against infinite loops through diff
237 fe621944 2020-11-10 stsp * algorithms. When the maximum recursion is reached, employ
238 fe621944 2020-11-10 stsp * diff_algo_none (i.e. remove all left atoms and add all right atoms).
239 fe621944 2020-11-10 stsp */
240 fe621944 2020-11-10 stsp unsigned int max_recursion_depth;
241 fe621944 2020-11-10 stsp };
242 fe621944 2020-11-10 stsp
243 fe621944 2020-11-10 stsp int diff_atomize_file(struct diff_data *d, const struct diff_config *config,
244 fe621944 2020-11-10 stsp FILE *f, const uint8_t *data, off_t len, int diff_flags);
245 fe621944 2020-11-10 stsp struct diff_result *diff_main(const struct diff_config *config,
246 fe621944 2020-11-10 stsp struct diff_data *left,
247 fe621944 2020-11-10 stsp struct diff_data *right);
248 fe621944 2020-11-10 stsp void diff_result_free(struct diff_result *result);