fix(tvix): Partially revert "eliminate exposed global variable"

This reverts part of commit 976a36c2e4,
which was causing scanForReferences to hang indefinitely. I'm not sure
what the original intent of the commit was since there's not really much
of a commit message on it, but with this I am able to fully realise
derivations.

Change-Id: I620e892e2fe2244f066512286b086b3dd8f8f6c0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1635
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
This commit is contained in:
Griffin Smith 2020-08-03 22:13:40 -04:00 committed by glittershark
parent 94387dbc25
commit e634e27577
3 changed files with 39 additions and 21 deletions

View file

@ -13,21 +13,38 @@ namespace nix {
static unsigned int refLength = 32; /* characters */
static void search(const char* s, size_t len, StringSet& hashes,
static void search(const unsigned char* s, size_t len, StringSet& hashes,
StringSet& seen) {
static bool initialised = false;
static bool isBase32[256];
if (!initialised) {
for (bool& i : isBase32) {
i = false;
}
for (char base32Char : base32Chars) {
isBase32[static_cast<unsigned char>(base32Char)] = true;
}
initialised = true;
}
for (size_t i = 0; i + refLength <= len;) {
absl::string_view ref(s + i, refLength);
bool match = Hash::IsValidBase32(ref);
int j = 0;
bool match = true;
for (j = refLength - 1; j >= 0; --j) {
if (!isBase32[s[i + j]]) {
i += j + 1;
match = false;
break;
}
}
if (!match) {
continue;
}
// TODO(kanepyork): convert StringSet to flat_hash_set, delay owned string
// conversion into the 'if'
std::string sref(ref);
if (hashes.find(sref) != hashes.end()) {
std::string ref(reinterpret_cast<const char*>(s) + i, refLength);
if (hashes.find(ref) != hashes.end()) {
DLOG(INFO) << "found reference to '" << ref << "' at offset " << i;
seen.insert(sref);
hashes.erase(sref);
seen.insert(ref);
hashes.erase(ref);
}
++i;
}
@ -48,21 +65,22 @@ struct RefScanSink : Sink {
void RefScanSink::operator()(const unsigned char* data, size_t len) {
hashSink(data, len);
const char* data_ = reinterpret_cast<const char*>(data);
/* It's possible that a reference spans the previous and current
fragment, so search in the concatenation of the tail of the
previous fragment and the start of the current fragment. */
std::string s = tail + std::string(data_, len > refLength ? refLength : len);
search(s.data(), s.size(), hashes, seen);
std::string s = tail + std::string(reinterpret_cast<const char*>(data),
len > refLength ? refLength : len);
search(reinterpret_cast<const unsigned char*>(s.data()), s.size(), hashes,
seen);
search(data_, len, hashes, seen);
search(data, len, hashes, seen);
size_t tailLen = len <= refLength ? len : refLength;
tail = std::string(tail, tail.size() < refLength - tailLen
? 0
: tail.size() - (refLength - tailLen)) +
std::string(data_ + len - tailLen, tailLen);
tail =
std::string(tail, tail.size() < refLength - tailLen
? 0
: tail.size() - (refLength - tailLen)) +
std::string(reinterpret_cast<const char*>(data) + len - tailLen, tailLen);
}
PathSet scanForReferences(const std::string& path, const PathSet& refs,

View file

@ -104,9 +104,6 @@ bool Hash::IsValidBase16(absl::string_view s) {
return true;
}
// omitted: E O U T
constexpr char base32Chars[] = "0123456789abcdfghijklmnpqrsvwxyz";
constexpr signed char kUnBase32[] = {
-1, -1, -1, -1, -1, -1, -1, -1, /* unprintables */
-1, -1, -1, -1, -1, -1, -1, -1, /* unprintables */

View file

@ -21,6 +21,9 @@ const int sha1HashSize = 20;
const int sha256HashSize = 32;
const int sha512HashSize = 64;
// omitted: E O U T
constexpr char base32Chars[] = "0123456789abcdfghijklmnpqrsvwxyz";
enum Base : int { Base64, Base32, Base16, SRI };
struct Hash {