diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/ewah | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/ewah')
-rw-r--r-- | third_party/git/ewah/bitmap.c | 193 | ||||
-rw-r--r-- | third_party/git/ewah/ewah_bitmap.c | 484 | ||||
-rw-r--r-- | third_party/git/ewah/ewah_io.c | 134 | ||||
-rw-r--r-- | third_party/git/ewah/ewah_rlw.c | 106 | ||||
-rw-r--r-- | third_party/git/ewah/ewok.h | 193 | ||||
-rw-r--r-- | third_party/git/ewah/ewok_rlw.h | 114 |
6 files changed, 0 insertions, 1224 deletions
diff --git a/third_party/git/ewah/bitmap.c b/third_party/git/ewah/bitmap.c deleted file mode 100644 index d8cec585af97..000000000000 --- a/third_party/git/ewah/bitmap.c +++ /dev/null @@ -1,193 +0,0 @@ -/** - * Copyright 2013, GitHub, Inc - * Copyright 2009-2013, Daniel Lemire, Cliff Moon, - * David McIntosh, Robert Becho, Google Inc. and Veronika Zenz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - */ -#include "cache.h" -#include "ewok.h" - -#define EWAH_MASK(x) ((eword_t)1 << (x % BITS_IN_EWORD)) -#define EWAH_BLOCK(x) (x / BITS_IN_EWORD) - -struct bitmap *bitmap_word_alloc(size_t word_alloc) -{ - struct bitmap *bitmap = xmalloc(sizeof(struct bitmap)); - bitmap->words = xcalloc(word_alloc, sizeof(eword_t)); - bitmap->word_alloc = word_alloc; - return bitmap; -} - -struct bitmap *bitmap_new(void) -{ - return bitmap_word_alloc(32); -} - -void bitmap_set(struct bitmap *self, size_t pos) -{ - size_t block = EWAH_BLOCK(pos); - - if (block >= self->word_alloc) { - size_t old_size = self->word_alloc; - self->word_alloc = block ? block * 2 : 1; - REALLOC_ARRAY(self->words, self->word_alloc); - memset(self->words + old_size, 0x0, - (self->word_alloc - old_size) * sizeof(eword_t)); - } - - self->words[block] |= EWAH_MASK(pos); -} - -void bitmap_unset(struct bitmap *self, size_t pos) -{ - size_t block = EWAH_BLOCK(pos); - - if (block < self->word_alloc) - self->words[block] &= ~EWAH_MASK(pos); -} - -int bitmap_get(struct bitmap *self, size_t pos) -{ - size_t block = EWAH_BLOCK(pos); - return block < self->word_alloc && - (self->words[block] & EWAH_MASK(pos)) != 0; -} - -struct ewah_bitmap *bitmap_to_ewah(struct bitmap *bitmap) -{ - struct ewah_bitmap *ewah = ewah_new(); - size_t i, running_empty_words = 0; - eword_t last_word = 0; - - for (i = 0; i < bitmap->word_alloc; ++i) { - if (bitmap->words[i] == 0) { - running_empty_words++; - continue; - } - - if (last_word != 0) - ewah_add(ewah, last_word); - - if (running_empty_words > 0) { - ewah_add_empty_words(ewah, 0, running_empty_words); - running_empty_words = 0; - } - - last_word = bitmap->words[i]; - } - - ewah_add(ewah, last_word); - return ewah; -} - -struct bitmap *ewah_to_bitmap(struct ewah_bitmap *ewah) -{ - struct bitmap *bitmap = bitmap_new(); - struct ewah_iterator it; - eword_t blowup; - size_t i = 0; - - ewah_iterator_init(&it, ewah); - - while (ewah_iterator_next(&blowup, &it)) { - ALLOC_GROW(bitmap->words, i + 1, bitmap->word_alloc); - bitmap->words[i++] = blowup; - } - - bitmap->word_alloc = i; - return bitmap; -} - -void bitmap_and_not(struct bitmap *self, struct bitmap *other) -{ - const size_t count = (self->word_alloc < other->word_alloc) ? - self->word_alloc : other->word_alloc; - - size_t i; - - for (i = 0; i < count; ++i) - self->words[i] &= ~other->words[i]; -} - -void bitmap_or_ewah(struct bitmap *self, struct ewah_bitmap *other) -{ - size_t original_size = self->word_alloc; - size_t other_final = (other->bit_size / BITS_IN_EWORD) + 1; - size_t i = 0; - struct ewah_iterator it; - eword_t word; - - if (self->word_alloc < other_final) { - self->word_alloc = other_final; - REALLOC_ARRAY(self->words, self->word_alloc); - memset(self->words + original_size, 0x0, - (self->word_alloc - original_size) * sizeof(eword_t)); - } - - ewah_iterator_init(&it, other); - - while (ewah_iterator_next(&word, &it)) - self->words[i++] |= word; -} - -size_t bitmap_popcount(struct bitmap *self) -{ - size_t i, count = 0; - - for (i = 0; i < self->word_alloc; ++i) - count += ewah_bit_popcount64(self->words[i]); - - return count; -} - -int bitmap_equals(struct bitmap *self, struct bitmap *other) -{ - struct bitmap *big, *small; - size_t i; - - if (self->word_alloc < other->word_alloc) { - small = self; - big = other; - } else { - small = other; - big = self; - } - - for (i = 0; i < small->word_alloc; ++i) { - if (small->words[i] != big->words[i]) - return 0; - } - - for (; i < big->word_alloc; ++i) { - if (big->words[i] != 0) - return 0; - } - - return 1; -} - -void bitmap_reset(struct bitmap *bitmap) -{ - memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t)); -} - -void bitmap_free(struct bitmap *bitmap) -{ - if (bitmap == NULL) - return; - - free(bitmap->words); - free(bitmap); -} diff --git a/third_party/git/ewah/ewah_bitmap.c b/third_party/git/ewah/ewah_bitmap.c deleted file mode 100644 index d59b1afe3d6a..000000000000 --- a/third_party/git/ewah/ewah_bitmap.c +++ /dev/null @@ -1,484 +0,0 @@ -/** - * Copyright 2013, GitHub, Inc - * Copyright 2009-2013, Daniel Lemire, Cliff Moon, - * David McIntosh, Robert Becho, Google Inc. and Veronika Zenz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - */ -#include "git-compat-util.h" -#include "ewok.h" -#include "ewok_rlw.h" - -static inline size_t min_size(size_t a, size_t b) -{ - return a < b ? a : b; -} - -static inline size_t max_size(size_t a, size_t b) -{ - return a > b ? a : b; -} - -static inline void buffer_grow(struct ewah_bitmap *self, size_t new_size) -{ - size_t rlw_offset = (uint8_t *)self->rlw - (uint8_t *)self->buffer; - - if (self->alloc_size >= new_size) - return; - - self->alloc_size = new_size; - REALLOC_ARRAY(self->buffer, self->alloc_size); - self->rlw = self->buffer + (rlw_offset / sizeof(eword_t)); -} - -static inline void buffer_push(struct ewah_bitmap *self, eword_t value) -{ - if (self->buffer_size + 1 >= self->alloc_size) - buffer_grow(self, self->buffer_size * 3 / 2); - - self->buffer[self->buffer_size++] = value; -} - -static void buffer_push_rlw(struct ewah_bitmap *self, eword_t value) -{ - buffer_push(self, value); - self->rlw = self->buffer + self->buffer_size - 1; -} - -static size_t add_empty_words(struct ewah_bitmap *self, int v, size_t number) -{ - size_t added = 0; - eword_t runlen, can_add; - - if (rlw_get_run_bit(self->rlw) != v && rlw_size(self->rlw) == 0) { - rlw_set_run_bit(self->rlw, v); - } else if (rlw_get_literal_words(self->rlw) != 0 || - rlw_get_run_bit(self->rlw) != v) { - buffer_push_rlw(self, 0); - if (v) rlw_set_run_bit(self->rlw, v); - added++; - } - - runlen = rlw_get_running_len(self->rlw); - can_add = min_size(number, RLW_LARGEST_RUNNING_COUNT - runlen); - - rlw_set_running_len(self->rlw, runlen + can_add); - number -= can_add; - - while (number >= RLW_LARGEST_RUNNING_COUNT) { - buffer_push_rlw(self, 0); - added++; - if (v) rlw_set_run_bit(self->rlw, v); - rlw_set_running_len(self->rlw, RLW_LARGEST_RUNNING_COUNT); - number -= RLW_LARGEST_RUNNING_COUNT; - } - - if (number > 0) { - buffer_push_rlw(self, 0); - added++; - - if (v) rlw_set_run_bit(self->rlw, v); - rlw_set_running_len(self->rlw, number); - } - - return added; -} - -size_t ewah_add_empty_words(struct ewah_bitmap *self, int v, size_t number) -{ - if (number == 0) - return 0; - - self->bit_size += number * BITS_IN_EWORD; - return add_empty_words(self, v, number); -} - -static size_t add_literal(struct ewah_bitmap *self, eword_t new_data) -{ - eword_t current_num = rlw_get_literal_words(self->rlw); - - if (current_num >= RLW_LARGEST_LITERAL_COUNT) { - buffer_push_rlw(self, 0); - - rlw_set_literal_words(self->rlw, 1); - buffer_push(self, new_data); - return 2; - } - - rlw_set_literal_words(self->rlw, current_num + 1); - - /* sanity check */ - assert(rlw_get_literal_words(self->rlw) == current_num + 1); - - buffer_push(self, new_data); - return 1; -} - -void ewah_add_dirty_words( - struct ewah_bitmap *self, const eword_t *buffer, - size_t number, int negate) -{ - size_t literals, can_add; - - while (1) { - literals = rlw_get_literal_words(self->rlw); - can_add = min_size(number, RLW_LARGEST_LITERAL_COUNT - literals); - - rlw_set_literal_words(self->rlw, literals + can_add); - - if (self->buffer_size + can_add >= self->alloc_size) - buffer_grow(self, (self->buffer_size + can_add) * 3 / 2); - - if (negate) { - size_t i; - for (i = 0; i < can_add; ++i) - self->buffer[self->buffer_size++] = ~buffer[i]; - } else { - memcpy(self->buffer + self->buffer_size, - buffer, can_add * sizeof(eword_t)); - self->buffer_size += can_add; - } - - self->bit_size += can_add * BITS_IN_EWORD; - - if (number - can_add == 0) - break; - - buffer_push_rlw(self, 0); - buffer += can_add; - number -= can_add; - } -} - -static size_t add_empty_word(struct ewah_bitmap *self, int v) -{ - int no_literal = (rlw_get_literal_words(self->rlw) == 0); - eword_t run_len = rlw_get_running_len(self->rlw); - - if (no_literal && run_len == 0) { - rlw_set_run_bit(self->rlw, v); - assert(rlw_get_run_bit(self->rlw) == v); - } - - if (no_literal && rlw_get_run_bit(self->rlw) == v && - run_len < RLW_LARGEST_RUNNING_COUNT) { - rlw_set_running_len(self->rlw, run_len + 1); - assert(rlw_get_running_len(self->rlw) == run_len + 1); - return 0; - } else { - buffer_push_rlw(self, 0); - - assert(rlw_get_running_len(self->rlw) == 0); - assert(rlw_get_run_bit(self->rlw) == 0); - assert(rlw_get_literal_words(self->rlw) == 0); - - rlw_set_run_bit(self->rlw, v); - assert(rlw_get_run_bit(self->rlw) == v); - - rlw_set_running_len(self->rlw, 1); - assert(rlw_get_running_len(self->rlw) == 1); - assert(rlw_get_literal_words(self->rlw) == 0); - return 1; - } -} - -size_t ewah_add(struct ewah_bitmap *self, eword_t word) -{ - self->bit_size += BITS_IN_EWORD; - - if (word == 0) - return add_empty_word(self, 0); - - if (word == (eword_t)(~0)) - return add_empty_word(self, 1); - - return add_literal(self, word); -} - -void ewah_set(struct ewah_bitmap *self, size_t i) -{ - const size_t dist = - DIV_ROUND_UP(i + 1, BITS_IN_EWORD) - - DIV_ROUND_UP(self->bit_size, BITS_IN_EWORD); - - assert(i >= self->bit_size); - - self->bit_size = i + 1; - - if (dist > 0) { - if (dist > 1) - add_empty_words(self, 0, dist - 1); - - add_literal(self, (eword_t)1 << (i % BITS_IN_EWORD)); - return; - } - - if (rlw_get_literal_words(self->rlw) == 0) { - rlw_set_running_len(self->rlw, - rlw_get_running_len(self->rlw) - 1); - add_literal(self, (eword_t)1 << (i % BITS_IN_EWORD)); - return; - } - - self->buffer[self->buffer_size - 1] |= - ((eword_t)1 << (i % BITS_IN_EWORD)); - - /* check if we just completed a stream of 1s */ - if (self->buffer[self->buffer_size - 1] == (eword_t)(~0)) { - self->buffer[--self->buffer_size] = 0; - rlw_set_literal_words(self->rlw, - rlw_get_literal_words(self->rlw) - 1); - add_empty_word(self, 1); - } -} - -void ewah_each_bit(struct ewah_bitmap *self, void (*callback)(size_t, void*), void *payload) -{ - size_t pos = 0; - size_t pointer = 0; - size_t k; - - while (pointer < self->buffer_size) { - eword_t *word = &self->buffer[pointer]; - - if (rlw_get_run_bit(word)) { - size_t len = rlw_get_running_len(word) * BITS_IN_EWORD; - for (k = 0; k < len; ++k, ++pos) - callback(pos, payload); - } else { - pos += rlw_get_running_len(word) * BITS_IN_EWORD; - } - - ++pointer; - - for (k = 0; k < rlw_get_literal_words(word); ++k) { - int c; - - /* todo: zero count optimization */ - for (c = 0; c < BITS_IN_EWORD; ++c, ++pos) { - if ((self->buffer[pointer] & ((eword_t)1 << c)) != 0) - callback(pos, payload); - } - - ++pointer; - } - } -} - -/** - * Clear all the bits in the bitmap. Does not free or resize - * memory. - */ -static void ewah_clear(struct ewah_bitmap *self) -{ - self->buffer_size = 1; - self->buffer[0] = 0; - self->bit_size = 0; - self->rlw = self->buffer; -} - -struct ewah_bitmap *ewah_new(void) -{ - struct ewah_bitmap *self; - - self = xmalloc(sizeof(struct ewah_bitmap)); - self->alloc_size = 32; - ALLOC_ARRAY(self->buffer, self->alloc_size); - - ewah_clear(self); - return self; -} - -void ewah_free(struct ewah_bitmap *self) -{ - if (!self) - return; - - if (self->alloc_size) - free(self->buffer); - - free(self); -} - -static void read_new_rlw(struct ewah_iterator *it) -{ - const eword_t *word = NULL; - - it->literals = 0; - it->compressed = 0; - - while (1) { - word = &it->buffer[it->pointer]; - - it->rl = rlw_get_running_len(word); - it->lw = rlw_get_literal_words(word); - it->b = rlw_get_run_bit(word); - - if (it->rl || it->lw) - return; - - if (it->pointer < it->buffer_size - 1) { - it->pointer++; - } else { - it->pointer = it->buffer_size; - return; - } - } -} - -int ewah_iterator_next(eword_t *next, struct ewah_iterator *it) -{ - if (it->pointer >= it->buffer_size) - return 0; - - if (it->compressed < it->rl) { - it->compressed++; - *next = it->b ? (eword_t)(~0) : 0; - } else { - assert(it->literals < it->lw); - - it->literals++; - it->pointer++; - - assert(it->pointer < it->buffer_size); - - *next = it->buffer[it->pointer]; - } - - if (it->compressed == it->rl && it->literals == it->lw) { - if (++it->pointer < it->buffer_size) - read_new_rlw(it); - } - - return 1; -} - -void ewah_iterator_init(struct ewah_iterator *it, struct ewah_bitmap *parent) -{ - it->buffer = parent->buffer; - it->buffer_size = parent->buffer_size; - it->pointer = 0; - - it->lw = 0; - it->rl = 0; - it->compressed = 0; - it->literals = 0; - it->b = 0; - - if (it->pointer < it->buffer_size) - read_new_rlw(it); -} - -void ewah_xor( - struct ewah_bitmap *ewah_i, - struct ewah_bitmap *ewah_j, - struct ewah_bitmap *out) -{ - struct rlw_iterator rlw_i; - struct rlw_iterator rlw_j; - size_t literals; - - rlwit_init(&rlw_i, ewah_i); - rlwit_init(&rlw_j, ewah_j); - - while (rlwit_word_size(&rlw_i) > 0 && rlwit_word_size(&rlw_j) > 0) { - while (rlw_i.rlw.running_len > 0 || rlw_j.rlw.running_len > 0) { - struct rlw_iterator *prey, *predator; - size_t index; - int negate_words; - - if (rlw_i.rlw.running_len < rlw_j.rlw.running_len) { - prey = &rlw_i; - predator = &rlw_j; - } else { - prey = &rlw_j; - predator = &rlw_i; - } - - negate_words = !!predator->rlw.running_bit; - index = rlwit_discharge(prey, out, - predator->rlw.running_len, negate_words); - - ewah_add_empty_words(out, negate_words, - predator->rlw.running_len - index); - - rlwit_discard_first_words(predator, - predator->rlw.running_len); - } - - literals = min_size( - rlw_i.rlw.literal_words, - rlw_j.rlw.literal_words); - - if (literals) { - size_t k; - - for (k = 0; k < literals; ++k) { - ewah_add(out, - rlw_i.buffer[rlw_i.literal_word_start + k] ^ - rlw_j.buffer[rlw_j.literal_word_start + k] - ); - } - - rlwit_discard_first_words(&rlw_i, literals); - rlwit_discard_first_words(&rlw_j, literals); - } - } - - if (rlwit_word_size(&rlw_i) > 0) - rlwit_discharge(&rlw_i, out, ~0, 0); - else - rlwit_discharge(&rlw_j, out, ~0, 0); - - out->bit_size = max_size(ewah_i->bit_size, ewah_j->bit_size); -} - -#define BITMAP_POOL_MAX 16 -static struct ewah_bitmap *bitmap_pool[BITMAP_POOL_MAX]; -static size_t bitmap_pool_size; - -struct ewah_bitmap *ewah_pool_new(void) -{ - if (bitmap_pool_size) - return bitmap_pool[--bitmap_pool_size]; - - return ewah_new(); -} - -void ewah_pool_free(struct ewah_bitmap *self) -{ - if (self == NULL) - return; - - if (bitmap_pool_size == BITMAP_POOL_MAX || - self->alloc_size == 0) { - ewah_free(self); - return; - } - - ewah_clear(self); - bitmap_pool[bitmap_pool_size++] = self; -} - -uint32_t ewah_checksum(struct ewah_bitmap *self) -{ - const uint8_t *p = (uint8_t *)self->buffer; - uint32_t crc = (uint32_t)self->bit_size; - size_t size = self->buffer_size * sizeof(eword_t); - - while (size--) - crc = (crc << 5) - crc + (uint32_t)*p++; - - return crc; -} diff --git a/third_party/git/ewah/ewah_io.c b/third_party/git/ewah/ewah_io.c deleted file mode 100644 index 9035ee65ea8d..000000000000 --- a/third_party/git/ewah/ewah_io.c +++ /dev/null @@ -1,134 +0,0 @@ -/** - * Copyright 2013, GitHub, Inc - * Copyright 2009-2013, Daniel Lemire, Cliff Moon, - * David McIntosh, Robert Becho, Google Inc. and Veronika Zenz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - */ -#include "git-compat-util.h" -#include "ewok.h" -#include "strbuf.h" - -int ewah_serialize_to(struct ewah_bitmap *self, - int (*write_fun)(void *, const void *, size_t), - void *data) -{ - size_t i; - eword_t dump[2048]; - const size_t words_per_dump = sizeof(dump) / sizeof(eword_t); - uint32_t bitsize, word_count, rlw_pos; - - const eword_t *buffer; - size_t words_left; - - /* 32 bit -- bit size for the map */ - bitsize = htonl((uint32_t)self->bit_size); - if (write_fun(data, &bitsize, 4) != 4) - return -1; - - /** 32 bit -- number of compressed 64-bit words */ - word_count = htonl((uint32_t)self->buffer_size); - if (write_fun(data, &word_count, 4) != 4) - return -1; - - /** 64 bit x N -- compressed words */ - buffer = self->buffer; - words_left = self->buffer_size; - - while (words_left >= words_per_dump) { - for (i = 0; i < words_per_dump; ++i, ++buffer) - dump[i] = htonll(*buffer); - - if (write_fun(data, dump, sizeof(dump)) != sizeof(dump)) - return -1; - - words_left -= words_per_dump; - } - - if (words_left) { - for (i = 0; i < words_left; ++i, ++buffer) - dump[i] = htonll(*buffer); - - if (write_fun(data, dump, words_left * 8) != words_left * 8) - return -1; - } - - /** 32 bit -- position for the RLW */ - rlw_pos = (uint8_t*)self->rlw - (uint8_t *)self->buffer; - rlw_pos = htonl(rlw_pos / sizeof(eword_t)); - - if (write_fun(data, &rlw_pos, 4) != 4) - return -1; - - return (3 * 4) + (self->buffer_size * 8); -} - -static int write_strbuf(void *user_data, const void *data, size_t len) -{ - struct strbuf *sb = user_data; - strbuf_add(sb, data, len); - return len; -} - -int ewah_serialize_strbuf(struct ewah_bitmap *self, struct strbuf *sb) -{ - return ewah_serialize_to(self, write_strbuf, sb); -} - -ssize_t ewah_read_mmap(struct ewah_bitmap *self, const void *map, size_t len) -{ - const uint8_t *ptr = map; - size_t data_len; - size_t i; - - if (len < sizeof(uint32_t)) - return error("corrupt ewah bitmap: eof before bit size"); - self->bit_size = get_be32(ptr); - ptr += sizeof(uint32_t); - len -= sizeof(uint32_t); - - if (len < sizeof(uint32_t)) - return error("corrupt ewah bitmap: eof before length"); - self->buffer_size = self->alloc_size = get_be32(ptr); - ptr += sizeof(uint32_t); - len -= sizeof(uint32_t); - - REALLOC_ARRAY(self->buffer, self->alloc_size); - - /* - * Copy the raw data for the bitmap as a whole chunk; - * if we're in a little-endian platform, we'll perform - * the endianness conversion in a separate pass to ensure - * we're loading 8-byte aligned words. - */ - data_len = st_mult(self->buffer_size, sizeof(eword_t)); - if (len < data_len) - return error("corrupt ewah bitmap: eof in data " - "(%"PRIuMAX" bytes short)", - (uintmax_t)(data_len - len)); - memcpy(self->buffer, ptr, data_len); - ptr += data_len; - len -= data_len; - - for (i = 0; i < self->buffer_size; ++i) - self->buffer[i] = ntohll(self->buffer[i]); - - if (len < sizeof(uint32_t)) - return error("corrupt ewah bitmap: eof before rlw"); - self->rlw = self->buffer + get_be32(ptr); - ptr += sizeof(uint32_t); - len -= sizeof(uint32_t); - - return ptr - (const uint8_t *)map; -} diff --git a/third_party/git/ewah/ewah_rlw.c b/third_party/git/ewah/ewah_rlw.c deleted file mode 100644 index 5093d43e2f00..000000000000 --- a/third_party/git/ewah/ewah_rlw.c +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2013, GitHub, Inc - * Copyright 2009-2013, Daniel Lemire, Cliff Moon, - * David McIntosh, Robert Becho, Google Inc. and Veronika Zenz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - */ -#include "git-compat-util.h" -#include "ewok.h" -#include "ewok_rlw.h" - -static inline int next_word(struct rlw_iterator *it) -{ - if (it->pointer >= it->size) - return 0; - - it->rlw.word = &it->buffer[it->pointer]; - it->pointer += rlw_get_literal_words(it->rlw.word) + 1; - - it->rlw.literal_words = rlw_get_literal_words(it->rlw.word); - it->rlw.running_len = rlw_get_running_len(it->rlw.word); - it->rlw.running_bit = rlw_get_run_bit(it->rlw.word); - it->rlw.literal_word_offset = 0; - - return 1; -} - -void rlwit_init(struct rlw_iterator *it, struct ewah_bitmap *from_ewah) -{ - it->buffer = from_ewah->buffer; - it->size = from_ewah->buffer_size; - it->pointer = 0; - - next_word(it); - - it->literal_word_start = rlwit_literal_words(it) + - it->rlw.literal_word_offset; -} - -void rlwit_discard_first_words(struct rlw_iterator *it, size_t x) -{ - while (x > 0) { - size_t discard; - - if (it->rlw.running_len > x) { - it->rlw.running_len -= x; - return; - } - - x -= it->rlw.running_len; - it->rlw.running_len = 0; - - discard = (x > it->rlw.literal_words) ? it->rlw.literal_words : x; - - it->literal_word_start += discard; - it->rlw.literal_words -= discard; - x -= discard; - - if (x > 0 || rlwit_word_size(it) == 0) { - if (!next_word(it)) - break; - - it->literal_word_start = - rlwit_literal_words(it) + it->rlw.literal_word_offset; - } - } -} - -size_t rlwit_discharge( - struct rlw_iterator *it, struct ewah_bitmap *out, size_t max, int negate) -{ - size_t index = 0; - - while (index < max && rlwit_word_size(it) > 0) { - size_t pd, pl = it->rlw.running_len; - - if (index + pl > max) - pl = max - index; - - ewah_add_empty_words(out, it->rlw.running_bit ^ negate, pl); - index += pl; - - pd = it->rlw.literal_words; - if (pd + index > max) - pd = max - index; - - ewah_add_dirty_words(out, - it->buffer + it->literal_word_start, pd, negate); - - rlwit_discard_first_words(it, pd + pl); - index += pd; - } - - return index; -} diff --git a/third_party/git/ewah/ewok.h b/third_party/git/ewah/ewok.h deleted file mode 100644 index 011852bef179..000000000000 --- a/third_party/git/ewah/ewok.h +++ /dev/null @@ -1,193 +0,0 @@ -/** - * Copyright 2013, GitHub, Inc - * Copyright 2009-2013, Daniel Lemire, Cliff Moon, - * David McIntosh, Robert Becho, Google Inc. and Veronika Zenz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - */ -#ifndef __EWOK_BITMAP_H__ -#define __EWOK_BITMAP_H__ - -struct strbuf; -typedef uint64_t eword_t; -#define BITS_IN_EWORD (sizeof(eword_t) * 8) - -/** - * Do not use __builtin_popcountll. The GCC implementation - * is notoriously slow on all platforms. - * - * See: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36041 - */ -static inline uint32_t ewah_bit_popcount64(uint64_t x) -{ - x = (x & 0x5555555555555555ULL) + ((x >> 1) & 0x5555555555555555ULL); - x = (x & 0x3333333333333333ULL) + ((x >> 2) & 0x3333333333333333ULL); - x = (x & 0x0F0F0F0F0F0F0F0FULL) + ((x >> 4) & 0x0F0F0F0F0F0F0F0FULL); - return (x * 0x0101010101010101ULL) >> 56; -} - -/* __builtin_ctzll was not available until 3.4.0 */ -#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR > 3)) -#define ewah_bit_ctz64(x) __builtin_ctzll(x) -#else -static inline int ewah_bit_ctz64(uint64_t x) -{ - int n = 0; - if ((x & 0xffffffff) == 0) { x >>= 32; n += 32; } - if ((x & 0xffff) == 0) { x >>= 16; n += 16; } - if ((x & 0xff) == 0) { x >>= 8; n += 8; } - if ((x & 0xf) == 0) { x >>= 4; n += 4; } - if ((x & 0x3) == 0) { x >>= 2; n += 2; } - if ((x & 0x1) == 0) { x >>= 1; n += 1; } - return n + !x; -} -#endif - -struct ewah_bitmap { - eword_t *buffer; - size_t buffer_size; - size_t alloc_size; - size_t bit_size; - eword_t *rlw; -}; - -typedef void (*ewah_callback)(size_t pos, void *); - -struct ewah_bitmap *ewah_pool_new(void); -void ewah_pool_free(struct ewah_bitmap *self); - -/** - * Allocate a new EWAH Compressed bitmap - */ -struct ewah_bitmap *ewah_new(void); - -/** - * Free all the memory of the bitmap - */ -void ewah_free(struct ewah_bitmap *self); - -int ewah_serialize_to(struct ewah_bitmap *self, - int (*write_fun)(void *out, const void *buf, size_t len), - void *out); -int ewah_serialize_strbuf(struct ewah_bitmap *self, struct strbuf *); - -ssize_t ewah_read_mmap(struct ewah_bitmap *self, const void *map, size_t len); - -uint32_t ewah_checksum(struct ewah_bitmap *self); - -/** - * Call the given callback with the position of every single bit - * that has been set on the bitmap. - * - * This is an efficient operation that does not fully decompress - * the bitmap. - */ -void ewah_each_bit(struct ewah_bitmap *self, ewah_callback callback, void *payload); - -/** - * Set a given bit on the bitmap. - * - * The bit at position `pos` will be set to true. Because of the - * way that the bitmap is compressed, a set bit cannot be unset - * later on. - * - * Furthermore, since the bitmap uses streaming compression, bits - * can only set incrementally. - * - * E.g. - * ewah_set(bitmap, 1); // ok - * ewah_set(bitmap, 76); // ok - * ewah_set(bitmap, 77); // ok - * ewah_set(bitmap, 8712800127); // ok - * ewah_set(bitmap, 25); // failed, assert raised - */ -void ewah_set(struct ewah_bitmap *self, size_t i); - -struct ewah_iterator { - const eword_t *buffer; - size_t buffer_size; - - size_t pointer; - eword_t compressed, literals; - eword_t rl, lw; - int b; -}; - -/** - * Initialize a new iterator to run through the bitmap in uncompressed form. - * - * The iterator can be stack allocated. The underlying bitmap must not be freed - * before the iteration is over. - * - * E.g. - * - * struct ewah_bitmap *bitmap = ewah_new(); - * struct ewah_iterator it; - * - * ewah_iterator_init(&it, bitmap); - */ -void ewah_iterator_init(struct ewah_iterator *it, struct ewah_bitmap *parent); - -/** - * Yield every single word in the bitmap in uncompressed form. This is: - * yield single words (32-64 bits) where each bit represents an actual - * bit from the bitmap. - * - * Return: true if a word was yield, false if there are no words left - */ -int ewah_iterator_next(eword_t *next, struct ewah_iterator *it); - -void ewah_xor( - struct ewah_bitmap *ewah_i, - struct ewah_bitmap *ewah_j, - struct ewah_bitmap *out); - -/** - * Direct word access - */ -size_t ewah_add_empty_words(struct ewah_bitmap *self, int v, size_t number); -void ewah_add_dirty_words( - struct ewah_bitmap *self, const eword_t *buffer, size_t number, int negate); -size_t ewah_add(struct ewah_bitmap *self, eword_t word); - - -/** - * Uncompressed, old-school bitmap that can be efficiently compressed - * into an `ewah_bitmap`. - */ -struct bitmap { - eword_t *words; - size_t word_alloc; -}; - -struct bitmap *bitmap_new(void); -struct bitmap *bitmap_word_alloc(size_t word_alloc); -void bitmap_set(struct bitmap *self, size_t pos); -void bitmap_unset(struct bitmap *self, size_t pos); -int bitmap_get(struct bitmap *self, size_t pos); -void bitmap_reset(struct bitmap *self); -void bitmap_free(struct bitmap *self); -int bitmap_equals(struct bitmap *self, struct bitmap *other); -int bitmap_is_subset(struct bitmap *self, struct bitmap *super); - -struct ewah_bitmap * bitmap_to_ewah(struct bitmap *bitmap); -struct bitmap *ewah_to_bitmap(struct ewah_bitmap *ewah); - -void bitmap_and_not(struct bitmap *self, struct bitmap *other); -void bitmap_or_ewah(struct bitmap *self, struct ewah_bitmap *other); -void bitmap_or(struct bitmap *self, const struct bitmap *other); - -size_t bitmap_popcount(struct bitmap *self); - -#endif diff --git a/third_party/git/ewah/ewok_rlw.h b/third_party/git/ewah/ewok_rlw.h deleted file mode 100644 index bafa24f4c3a0..000000000000 --- a/third_party/git/ewah/ewok_rlw.h +++ /dev/null @@ -1,114 +0,0 @@ -/** - * Copyright 2013, GitHub, Inc - * Copyright 2009-2013, Daniel Lemire, Cliff Moon, - * David McIntosh, Robert Becho, Google Inc. and Veronika Zenz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - */ -#ifndef __EWOK_RLW_H__ -#define __EWOK_RLW_H__ - -#include "ewok.h" - -#define RLW_RUNNING_BITS (sizeof(eword_t) * 4) -#define RLW_LITERAL_BITS (sizeof(eword_t) * 8 - 1 - RLW_RUNNING_BITS) - -#define RLW_LARGEST_RUNNING_COUNT (((eword_t)1 << RLW_RUNNING_BITS) - 1) -#define RLW_LARGEST_LITERAL_COUNT (((eword_t)1 << RLW_LITERAL_BITS) - 1) - -#define RLW_LARGEST_RUNNING_COUNT_SHIFT (RLW_LARGEST_RUNNING_COUNT << 1) - -#define RLW_RUNNING_LEN_PLUS_BIT (((eword_t)1 << (RLW_RUNNING_BITS + 1)) - 1) - -static inline int rlw_get_run_bit(const eword_t *word) -{ - return *word & (eword_t)1; -} - -static inline void rlw_set_run_bit(eword_t *word, int b) -{ - if (b) { - *word |= (eword_t)1; - } else { - *word &= (eword_t)(~1); - } -} - -static inline void rlw_xor_run_bit(eword_t *word) -{ - if (*word & 1) { - *word &= (eword_t)(~1); - } else { - *word |= (eword_t)1; - } -} - -static inline void rlw_set_running_len(eword_t *word, eword_t l) -{ - *word |= RLW_LARGEST_RUNNING_COUNT_SHIFT; - *word &= (l << 1) | (~RLW_LARGEST_RUNNING_COUNT_SHIFT); -} - -static inline eword_t rlw_get_running_len(const eword_t *word) -{ - return (*word >> 1) & RLW_LARGEST_RUNNING_COUNT; -} - -static inline eword_t rlw_get_literal_words(const eword_t *word) -{ - return *word >> (1 + RLW_RUNNING_BITS); -} - -static inline void rlw_set_literal_words(eword_t *word, eword_t l) -{ - *word |= ~RLW_RUNNING_LEN_PLUS_BIT; - *word &= (l << (RLW_RUNNING_BITS + 1)) | RLW_RUNNING_LEN_PLUS_BIT; -} - -static inline eword_t rlw_size(const eword_t *self) -{ - return rlw_get_running_len(self) + rlw_get_literal_words(self); -} - -struct rlw_iterator { - const eword_t *buffer; - size_t size; - size_t pointer; - size_t literal_word_start; - - struct { - const eword_t *word; - int literal_words; - int running_len; - int literal_word_offset; - int running_bit; - } rlw; -}; - -void rlwit_init(struct rlw_iterator *it, struct ewah_bitmap *bitmap); -void rlwit_discard_first_words(struct rlw_iterator *it, size_t x); -size_t rlwit_discharge( - struct rlw_iterator *it, struct ewah_bitmap *out, size_t max, int negate); - -static inline size_t rlwit_word_size(struct rlw_iterator *it) -{ - return it->rlw.running_len + it->rlw.literal_words; -} - -static inline size_t rlwit_literal_words(struct rlw_iterator *it) -{ - return it->pointer - it->rlw.literal_words; -} - -#endif |