hash_test = TDB_HASH_MAGIC;
hash_test = tdb_hash(tdb, &hash_test, sizeof(hash_test));
if (hdr.hash_test != hash_test) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "check: hash test %llu should be %llu\n",
- (long long)hdr.hash_test,
- (long long)hash_test);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "check: hash test %llu should be %llu",
+ (long long)hdr.hash_test,
+ (long long)hash_test);
return false;
}
if (strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "check: bad magic '%.*s'\n",
- (unsigned)sizeof(hdr.magic_food), hdr.magic_food);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "check: bad magic '%.*s'",
+ (unsigned)sizeof(hdr.magic_food), hdr.magic_food);
return false;
}
*recovery = hdr.recovery;
if (*recovery) {
if (*recovery < sizeof(hdr) || *recovery > tdb->map_size) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: invalid recovery offset %zu\n",
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: invalid recovery offset %zu",
(size_t)*recovery);
return false;
}
if (rec_data_length(&rec)
!= sizeof(tdb_off_t) << TDB_SUBLEVEL_HASH_BITS) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: Bad hash table length %llu vs %llu\n",
- (long long)rec_data_length(&rec),
- (long long)sizeof(tdb_off_t)<<TDB_SUBLEVEL_HASH_BITS);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: Bad hash table length %llu vs %llu",
+ (long long)rec_data_length(&rec),
+ (long long)sizeof(tdb_off_t)
+ << TDB_SUBLEVEL_HASH_BITS);
return false;
}
if (rec_key_length(&rec) != 0) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: Bad hash table key length %llu\n",
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: Bad hash table key length %llu",
(long long)rec_key_length(&rec));
return false;
}
if (rec_hash(&rec) != 0) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: Bad hash table hash value %llu\n",
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: Bad hash table hash value %llu",
(long long)rec_hash(&rec));
return false;
}
off = group[b] & TDB_OFF_MASK;
p = asearch(&off, used, num_used, off_cmp);
if (!p) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: Invalid offset %llu "
- "in hash\n",
- (long long)off);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: Invalid offset %llu "
+ "in hash", (long long)off);
goto fail;
}
/* Mark it invalid. */
used_bits = 0;
if (get_bits(h, hprefix_bits, &used_bits) != hprefix
&& hprefix_bits) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "check: bad hash placement"
- " 0x%llx vs 0x%llx\n",
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "check: bad hash placement"
+ " 0x%llx vs 0x%llx",
(long long)h, (long long)hprefix);
goto fail;
}
/* Does it belong in this group? */
if (get_bits(h, group_bits, &used_bits) != g) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "check: bad group %llu vs %u\n",
- (long long)h, g);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "check: bad group %llu vs %u",
+ (long long)h, g);
goto fail;
}
if (get_bits(h, TDB_HASH_GROUP_BITS, &used_bits)
!= bucket) {
used_bits -= TDB_HASH_GROUP_BITS;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "check: bad bucket %u vs %u\n",
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "check: bad bucket %u vs %u",
(unsigned)get_bits(h,
- TDB_HASH_GROUP_BITS,
- &used_bits),
+ TDB_HASH_GROUP_BITS,
+ &used_bits),
bucket);
goto fail;
}
i != b;
i = (i + 1) % (1 << TDB_HASH_GROUP_BITS)) {
if (group[i] == 0) {
- tdb->log(tdb, TDB_DEBUG_ERROR,
- tdb->log_priv,
- "check: bad group placement"
- " %u vs %u\n",
- b, bucket);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "check: bad group placement"
+ " %u vs %u",
+ b, bucket);
goto fail;
}
}
- if (tdb_read_convert(tdb, off, &rec, sizeof(rec)) == -1)
+ if (tdb_read_convert(tdb, off, &rec, sizeof(rec)))
goto fail;
/* Bottom bits must match header. */
if ((h & ((1 << 11)-1)) != rec_hash(&rec)) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: Bad hash magic at"
- " offset %llu (0x%llx vs 0x%llx)\n",
- (long long)off,
- (long long)h,
- (long long)rec_hash(&rec));
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: Bad hash magic at"
+ " offset %llu (0x%llx vs 0x%llx)",
+ (long long)off,
+ (long long)h,
+ (long long)rec_hash(&rec));
goto fail;
}
return false;
if (num_found != num_used) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: Not all entries are in hash\n");
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: Not all entries are in hash");
return false;
}
return true;
tdb_off_t prev, unsigned int flist, unsigned int bucket)
{
if (frec_magic(frec) != TDB_FREE_MAGIC) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: offset %llu bad magic 0x%llx\n",
- (long long)off, (long long)frec->magic_and_prev);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: offset %llu bad magic 0x%llx",
+ (long long)off, (long long)frec->magic_and_prev);
return false;
}
if (frec_flist(frec) != flist) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: offset %llu bad freelist %u\n",
- (long long)off, frec_flist(frec));
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: offset %llu bad freelist %u",
+ (long long)off, frec_flist(frec));
return false;
}
false))
return false;
if (size_to_bucket(frec_len(frec)) != bucket) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: offset %llu in wrong bucket %u vs %u\n",
- (long long)off,
- bucket, size_to_bucket(frec_len(frec)));
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: offset %llu in wrong bucket %u vs %u",
+ (long long)off,
+ bucket, size_to_bucket(frec_len(frec)));
return false;
}
if (prev != frec_prev(frec)) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: offset %llu bad prev %llu vs %llu\n",
- (long long)off,
- (long long)prev, (long long)frec_len(frec));
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: offset %llu bad prev %llu vs %llu",
+ (long long)off,
+ (long long)prev, (long long)frec_len(frec));
return false;
}
return true;
|| rec_key_length(&flist.hdr) != 0
|| rec_data_length(&flist.hdr) != sizeof(flist) - sizeof(flist.hdr)
|| rec_hash(&flist.hdr) != 1) {
- tdb->log(tdb, TDB_DEBUG_ERROR,
- tdb->log_priv,
- "tdb_check: Invalid header on free list\n");
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: Invalid header on free list");
return false;
}
/* FIXME: Check hash bits */
p = asearch(&off, free, num_free, off_cmp);
if (!p) {
- tdb->log(tdb, TDB_DEBUG_ERROR,
- tdb->log_priv,
- "tdb_check: Invalid offset"
- " %llu in free table\n",
- (long long)off);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: Invalid offset"
+ " %llu in free table",
+ (long long)off);
return false;
}
/* Mark it invalid. */
struct tdb_used_record u;
struct tdb_free_record f;
struct tdb_recovery_record r;
- } pad, *p;
+ } rec;
/* r is larger: only get that if we need to. */
- p = tdb_get(tdb, off, &pad, sizeof(pad.f));
- if (!p)
+ if (tdb_read_convert(tdb, off, &rec, sizeof(rec.f)) == -1)
return false;
/* If we crash after ftruncate, we can get zeroes or fill. */
- if (p->r.magic == TDB_RECOVERY_INVALID_MAGIC
- || p->r.magic == 0x4343434343434343ULL) {
- p = tdb_get(tdb, off, &pad, sizeof(pad.r));
- if (!p)
+ if (rec.r.magic == TDB_RECOVERY_INVALID_MAGIC
+ || rec.r.magic == 0x4343434343434343ULL) {
+ if (tdb_read_convert(tdb, off, &rec, sizeof(rec.r)))
return false;
+
if (recovery == off) {
found_recovery = true;
- len = sizeof(p->r) + p->r.max_len;
+ len = sizeof(rec.r) + rec.r.max_len;
} else {
len = dead_space(tdb, off);
- if (len < sizeof(p->r)) {
- tdb->log(tdb, TDB_DEBUG_ERROR,
- tdb->log_priv,
- "tdb_check: invalid dead space"
- " at %zu\n", (size_t)off);
+ if (len < sizeof(rec.r)) {
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: invalid dead"
+ " space at %zu",
+ (size_t)off);
return false;
}
- tdb->log(tdb, TDB_DEBUG_WARNING, tdb->log_priv,
- "Dead space at %zu-%zu (of %zu)\n",
- (size_t)off, (size_t)(off + len),
- (size_t)tdb->map_size);
+ tdb_logerr(tdb, TDB_SUCCESS, TDB_DEBUG_WARNING,
+ "Dead space at %zu-%zu (of %zu)",
+ (size_t)off, (size_t)(off + len),
+ (size_t)tdb->map_size);
}
- } else if (p->r.magic == TDB_RECOVERY_MAGIC) {
- p = tdb_get(tdb, off, &pad, sizeof(pad.r));
- if (!p)
+ } else if (rec.r.magic == TDB_RECOVERY_MAGIC) {
+ if (tdb_read_convert(tdb, off, &rec, sizeof(rec.r)))
return false;
if (recovery != off) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: unexpected recovery"
- " record at offset %zu\n",
- (size_t)off);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: unexpected recovery"
+ " record at offset %zu",
+ (size_t)off);
return false;
}
- if (p->r.len > p->r.max_len) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: invalid recovery length"
- " %zu\n", (size_t)p->r.len);
+ if (rec.r.len > rec.r.max_len) {
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: invalid recovery length"
+ " %zu", (size_t)rec.r.len);
return false;
}
- if (p->r.eof > tdb->map_size) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: invalid old EOF"
- " %zu\n", (size_t)p->r.eof);
+ if (rec.r.eof > tdb->map_size) {
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: invalid old EOF"
+ " %zu", (size_t)rec.r.eof);
return false;
}
found_recovery = true;
- len = sizeof(p->r) + p->r.max_len;
- } else if (frec_magic(&p->f) == TDB_FREE_MAGIC
- || frec_magic(&p->f) == TDB_COALESCING_MAGIC) {
- len = sizeof(p->u) + frec_len(&p->f);
+ len = sizeof(rec.r) + rec.r.max_len;
+ } else if (frec_magic(&rec.f) == TDB_FREE_MAGIC) {
+ len = sizeof(rec.u) + frec_len(&rec.f);
if (off + len > tdb->map_size) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: free overlength %llu"
- " at offset %llu\n",
- (long long)len, (long long)off);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: free overlength %llu"
+ " at offset %llu",
+ (long long)len, (long long)off);
return false;
}
- /* This record is free! */
- if (frec_magic(&p->f) == TDB_FREE_MAGIC
+ /* This record should be in free lists. */
+ if (frec_flist(&rec.f) != TDB_FLIST_NONE
&& !append(free, num_free, off))
return false;
} else {
uint64_t klen, dlen, extra;
/* This record is used! */
- if (rec_magic(&p->u) != TDB_MAGIC) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: Bad magic 0x%llx"
- " at offset %llu\n",
- (long long)rec_magic(&p->u),
- (long long)off);
+ if (rec_magic(&rec.u) != TDB_MAGIC) {
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: Bad magic 0x%llx"
+ " at offset %zu",
+ (long long)rec_magic(&rec.u),
+ (size_t)off);
return false;
}
if (!append(used, num_used, off))
return false;
- klen = rec_key_length(&p->u);
- dlen = rec_data_length(&p->u);
- extra = rec_extra_padding(&p->u);
+ klen = rec_key_length(&rec.u);
+ dlen = rec_data_length(&rec.u);
+ extra = rec_extra_padding(&rec.u);
- len = sizeof(p->u) + klen + dlen + extra;
+ len = sizeof(rec.u) + klen + dlen + extra;
if (off + len > tdb->map_size) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: used overlength %llu"
- " at offset %llu\n",
- (long long)len, (long long)off);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: used overlength %llu"
+ " at offset %llu",
+ (long long)len, (long long)off);
return false;
}
- if (len < sizeof(p->f)) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: too short record %llu at"
- " %llu\n",
- (long long)len, (long long)off);
+ if (len < sizeof(rec.f)) {
+ tdb_logerr(tdb, TDB_ERR_CORRUPT,
+ TDB_DEBUG_ERROR,
+ "tdb_check: too short record %llu"
+ " at %llu",
+ (long long)len, (long long)off);
return false;
}
}
/* We must have found recovery area if there was one. */
if (recovery != 0 && !found_recovery) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: expected a recovery area at %zu\n",
- (size_t)recovery);
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: expected a recovery area at %zu",
+ (size_t)recovery);
return false;
}
goto fail;
if (num_found != num_free) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_check: Not all entries are in free table\n");
+ tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR,
+ "tdb_check: Not all entries are in free table");
return -1;
}