X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fio.c;h=979ecef03865870b1a1d6bebc9b4daf717e23aa5;hp=71238afea9aeed1e5ee10b23a038670d2aeab436;hb=1ad66fedf81fdaf0f07a2b00d6787614c58a23ef;hpb=7d6312518bd3a8e4cbad69b1f6b1800f7bcdf68c

diff --git a/ccan/tdb2/io.c b/ccan/tdb2/io.c
index 71238afe..979ecef0 100644
--- a/ccan/tdb2/io.c
+++ b/ccan/tdb2/io.c
@@ -49,7 +49,7 @@ void tdb_mmap(struct tdb_context *tdb)
 		return;
 
 	tdb->map_ptr = mmap(NULL, tdb->map_size, tdb->mmap_flags,
-			    MAP_SHARED, tdb->fd, 0);
+			    MAP_SHARED, tdb->file->fd, 0);
 
 	/*
 	 * NB. When mmap fails it returns MAP_FAILED *NOT* NULL !!!!
@@ -96,7 +96,7 @@ static enum TDB_ERROR tdb_oob(struct tdb_context *tdb, tdb_off_t len,
 		return ecode;
 	}
 
-	if (fstat(tdb->fd, &st) != 0) {
+	if (fstat(tdb->file->fd, &st) != 0) {
 		tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
 			   "Failed to fstat file: %s", strerror(errno));
 		tdb_unlock_expand(tdb, F_RDLCK);
@@ -133,6 +133,7 @@ void *tdb_convert(const struct tdb_context *tdb, void *buf, tdb_len_t size)
 	return buf;
 }
 
+/* Return first non-zero offset in offset array, or end, or -ve error. */
 /* FIXME: Return the off? */
 uint64_t tdb_find_nonzero_off(struct tdb_context *tdb,
 			      tdb_off_t base, uint64_t start, uint64_t end)
@@ -143,8 +144,9 @@ uint64_t tdb_find_nonzero_off(struct tdb_context *tdb,
 	/* Zero vs non-zero is the same unconverted: minor optimization. */
 	val = tdb_access_read(tdb, base + start * sizeof(tdb_off_t),
 			      (end - start) * sizeof(tdb_off_t), false);
-	if (!val)
-		return end;
+	if (TDB_PTR_IS_ERR(val)) {
+		return TDB_PTR_ERR(val);
+	}
 
 	for (i = 0; i < (end - start); i++) {
 		if (val[i])
@@ -154,7 +156,7 @@ uint64_t tdb_find_nonzero_off(struct tdb_context *tdb,
 	return start + i;
 }
 
-/* Return first zero offset in num offset array, or num. */
+/* Return first zero offset in num offset array, or num, or -ve error. */
 uint64_t tdb_find_zero_off(struct tdb_context *tdb, tdb_off_t off,
 			   uint64_t num)
 {
@@ -163,8 +165,9 @@ uint64_t tdb_find_zero_off(struct tdb_context *tdb, tdb_off_t off,
 
 	/* Zero vs non-zero is the same unconverted: minor optimization. */
 	val = tdb_access_read(tdb, off, num * sizeof(tdb_off_t), false);
-	if (!val)
-		return num;
+	if (TDB_PTR_IS_ERR(val)) {
+		return TDB_PTR_ERR(val);
+	}
 
 	for (i = 0; i < num; i++) {
 		if (!val[i])
@@ -181,6 +184,9 @@ enum TDB_ERROR zero_out(struct tdb_context *tdb, tdb_off_t off, tdb_len_t len)
 	enum TDB_ERROR ecode = TDB_SUCCESS;
 
 	assert(!tdb->read_only);
+	if (TDB_PTR_IS_ERR(p)) {
+		return TDB_PTR_ERR(p);
+	}
 	if (p) {
 		memset(p, 0, len);
 		return ecode;
@@ -205,14 +211,16 @@ tdb_off_t tdb_read_off(struct tdb_context *tdb, tdb_off_t off)
 	if (likely(!(tdb->flags & TDB_CONVERT))) {
 		tdb_off_t *p = tdb->methods->direct(tdb, off, sizeof(*p),
 						    false);
+		if (TDB_PTR_IS_ERR(p)) {
+			return TDB_PTR_ERR(p);
+		}
 		if (p)
 			return *p;
 	}
 
 	ecode = tdb_read_convert(tdb, off, &ret, sizeof(ret));
 	if (ecode != TDB_SUCCESS) {
-		tdb->ecode = ecode;
-		return TDB_OFF_ERR;
+		return ecode;
 	}
 	return ret;
 }
@@ -228,11 +236,6 @@ static enum TDB_ERROR tdb_write(struct tdb_context *tdb, tdb_off_t off,
 				  "Write to read-only database");
 	}
 
-	/* FIXME: Bogus optimization? */
-	if (len == 0) {
-		return TDB_SUCCESS;
-	}
-
 	ecode = tdb->methods->oob(tdb, off + len, 0);
 	if (ecode != TDB_SUCCESS) {
 		return ecode;
@@ -242,8 +245,8 @@ static enum TDB_ERROR tdb_write(struct tdb_context *tdb, tdb_off_t off,
 		memcpy(off + (char *)tdb->map_ptr, buf, len);
 	} else {
 		ssize_t ret;
-		ret = pwrite(tdb->fd, buf, len, off);
-		if (ret < len) {
+		ret = pwrite(tdb->file->fd, buf, len, off);
+		if (ret != len) {
 			/* This shouldn't happen: we avoid sparse files. */
 			if (ret >= 0)
 				errno = ENOSPC;
@@ -271,7 +274,7 @@ static enum TDB_ERROR tdb_read(struct tdb_context *tdb, tdb_off_t off,
 	if (tdb->map_ptr) {
 		memcpy(buf, off + (char *)tdb->map_ptr, len);
 	} else {
-		ssize_t r = pread(tdb->fd, buf, len, off);
+		ssize_t r = pread(tdb->file->fd, buf, len, off);
 		if (r != len) {
 			return tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
 					  "tdb_read failed with %zi at %zu "
@@ -325,6 +328,9 @@ enum TDB_ERROR tdb_write_off(struct tdb_context *tdb,
 	if (likely(!(tdb->flags & TDB_CONVERT))) {
 		tdb_off_t *p = tdb->methods->direct(tdb, off, sizeof(*p),
 						    true);
+		if (TDB_PTR_IS_ERR(p)) {
+			return TDB_PTR_ERR(p);
+		}
 		if (p) {
 			*p = val;
 			return TDB_SUCCESS;
@@ -345,12 +351,12 @@ static void *_tdb_alloc_read(struct tdb_context *tdb, tdb_off_t offset,
 		tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_USE_ERROR,
 			   "tdb_alloc_read malloc failed len=%zu",
 			   (size_t)(prefix + len));
+		return TDB_ERR_PTR(TDB_ERR_OOM);
 	} else {
 		ecode = tdb->methods->tread(tdb, offset, buf+prefix, len);
 		if (unlikely(ecode != TDB_SUCCESS)) {
-			tdb->ecode = ecode;
 			free(buf);
-			buf = NULL;
+			return TDB_ERR_PTR(ecode);
 		}
 	}
 	return buf;
@@ -368,8 +374,8 @@ static enum TDB_ERROR fill(struct tdb_context *tdb,
 {
 	while (len) {
 		size_t n = len > size ? size : len;
-		ssize_t ret = pwrite(tdb->fd, buf, n, off);
-		if (ret < n) {
+		ssize_t ret = pwrite(tdb->file->fd, buf, n, off);
+		if (ret != n) {
 			if (ret >= 0)
 				errno = ENOSPC;
 
@@ -412,7 +418,7 @@ static enum TDB_ERROR tdb_expand_file(struct tdb_context *tdb,
 		tdb_munmap(tdb);
 
 		/* If this fails, we try to fill anyway. */
-		if (ftruncate(tdb->fd, tdb->map_size + addition))
+		if (ftruncate(tdb->file->fd, tdb->map_size + addition))
 			;
 
 		/* now fill the file with something. This ensures that the
@@ -433,18 +439,24 @@ const void *tdb_access_read(struct tdb_context *tdb,
 {
 	const void *ret = NULL;
 
-	if (likely(!(tdb->flags & TDB_CONVERT)))
+	if (likely(!(tdb->flags & TDB_CONVERT))) {
 		ret = tdb->methods->direct(tdb, off, len, false);
 
+		if (TDB_PTR_IS_ERR(ret)) {
+			return ret;
+		}
+	}
 	if (!ret) {
 		struct tdb_access_hdr *hdr;
 		hdr = _tdb_alloc_read(tdb, off, len, sizeof(*hdr));
-		if (hdr) {
-			hdr->next = tdb->access;
-			tdb->access = hdr;
-			ret = hdr + 1;
-			if (convert)
-				tdb_convert(tdb, (void *)ret, len);
+		if (TDB_PTR_IS_ERR(hdr)) {
+			return hdr;
+		}
+		hdr->next = tdb->access;
+		tdb->access = hdr;
+		ret = hdr + 1;
+		if (convert) {
+			tdb_convert(tdb, (void *)ret, len);
 		}
 	} else
 		tdb->direct_access++;
@@ -460,25 +472,31 @@ void *tdb_access_write(struct tdb_context *tdb,
 	if (tdb->read_only) {
 		tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
 			   "Write to read-only database");
-		return NULL;
+		return TDB_ERR_PTR(TDB_ERR_RDONLY);
 	}
 
-	if (likely(!(tdb->flags & TDB_CONVERT)))
+	if (likely(!(tdb->flags & TDB_CONVERT))) {
 		ret = tdb->methods->direct(tdb, off, len, true);
 
+		if (TDB_PTR_IS_ERR(ret)) {
+			return ret;
+		}
+	}
+
 	if (!ret) {
 		struct tdb_access_hdr *hdr;
 		hdr = _tdb_alloc_read(tdb, off, len, sizeof(*hdr));
-		if (hdr) {
-			hdr->next = tdb->access;
-			tdb->access = hdr;
-			hdr->off = off;
-			hdr->len = len;
-			hdr->convert = convert;
-			ret = hdr + 1;
-			if (convert)
-				tdb_convert(tdb, (void *)ret, len);
+		if (TDB_PTR_IS_ERR(hdr)) {
+			return hdr;
 		}
+		hdr->next = tdb->access;
+		tdb->access = hdr;
+		hdr->off = off;
+		hdr->len = len;
+		hdr->convert = convert;
+		ret = hdr + 1;
+		if (convert)
+			tdb_convert(tdb, (void *)ret, len);
 	} else
 		tdb->direct_access++;
 
@@ -532,11 +550,14 @@ enum TDB_ERROR tdb_access_commit(struct tdb_context *tdb, void *p)
 static void *tdb_direct(struct tdb_context *tdb, tdb_off_t off, size_t len,
 			bool write_mode)
 {
+	enum TDB_ERROR ecode;
+
 	if (unlikely(!tdb->map_ptr))
 		return NULL;
 
-	if (unlikely(tdb_oob(tdb, off + len, true) != TDB_SUCCESS))
-		return NULL;
+	ecode = tdb_oob(tdb, off + len, true);
+	if (unlikely(ecode != TDB_SUCCESS))
+		return TDB_ERR_PTR(ecode);
 	return (char *)tdb->map_ptr + off;
 }