X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=38124582d125625766922e4dab802ca22de2ce82;hp=dfa68451e51a878d4be75f5431121ff1f012b9d4;hb=74c15d72a2ddc484c771bc226134673409e9a40f;hpb=51a56b52627e635566253a3fae081c3f466b6bb6

diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index dfa68451..38124582 100644
--- a/ccan/tdb2/tdb.c
+++ b/ccan/tdb2/tdb.c
@@ -22,6 +22,24 @@ static bool tdb_already_open(dev_t device, ino_t ino)
 	return false;
 }
 
+static bool read_all(int fd, void *buf, size_t len)
+{
+	while (len) {
+		ssize_t ret;
+		ret = read(fd, buf, len);
+		if (ret < 0)
+			return false;
+		if (ret == 0) {
+			/* ETOOSHORT? */
+			errno = EWOULDBLOCK;
+			return false;
+		}
+		buf = (char *)buf + ret;
+		len -= ret;
+	}
+	return true;
+}
+
 static uint64_t random_number(struct tdb_context *tdb)
 {
 	int fd;
@@ -30,9 +48,7 @@ static uint64_t random_number(struct tdb_context *tdb)
 
 	fd = open("/dev/urandom", O_RDONLY);
 	if (fd >= 0) {
-		if (tdb_read_all(fd, &ret, sizeof(ret))) {
-			tdb_logerr(tdb, TDB_SUCCESS, TDB_DEBUG_TRACE,
-				 "tdb_open: random from /dev/urandom");
+		if (read_all(fd, &ret, sizeof(ret))) {
 			close(fd);
 			return ret;
 		}
@@ -47,9 +63,6 @@ static uint64_t random_number(struct tdb_context *tdb)
 			char reply[1 + sizeof(uint64_t)];
 			int r = read(fd, reply, sizeof(reply));
 			if (r > 1) {
-				tdb_logerr(tdb, TDB_SUCCESS, TDB_DEBUG_TRACE,
-					   "tdb_open: %u random bytes from"
-					   " /dev/egd-pool", r-1);
 				/* Copy at least some bytes. */
 				memcpy(&ret, reply+1, r - 1);
 				if (reply[0] == sizeof(uint64_t)
@@ -65,7 +78,7 @@ static uint64_t random_number(struct tdb_context *tdb)
 	/* Fallback: pid and time. */
 	gettimeofday(&now, NULL);
 	ret = getpid() * 100132289ULL + now.tv_sec * 1000000ULL + now.tv_usec;
-	tdb_logerr(tdb, TDB_SUCCESS, TDB_DEBUG_TRACE,
+	tdb_logerr(tdb, TDB_SUCCESS, TDB_LOG_WARNING,
 		   "tdb_open: random from getpid and time");
 	return ret;
 }
@@ -83,6 +96,7 @@ static int tdb_new_database(struct tdb_context *tdb,
 	/* We make it up in memory, then write it out if not internal */
 	struct new_database newdb;
 	unsigned int magic_len;
+	ssize_t rlen;
 
 	/* Fill in the header */
 	newdb.hdr.version = TDB_VERSION;
@@ -122,7 +136,7 @@ static int tdb_new_database(struct tdb_context *tdb,
 		tdb->map_size = sizeof(newdb);
 		tdb->map_ptr = malloc(tdb->map_size);
 		if (!tdb->map_ptr) {
-			tdb_logerr(tdb, TDB_ERR_OOM, TDB_DEBUG_FATAL,
+			tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
 				   "tdb_new_database: failed to allocate");
 			return -1;
 		}
@@ -135,10 +149,13 @@ static int tdb_new_database(struct tdb_context *tdb,
 	if (ftruncate(tdb->fd, 0) == -1)
 		return -1;
 
-	if (!tdb_pwrite_all(tdb->fd, &newdb, sizeof(newdb), 0)) {
-		tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
-			   "tdb_new_database: failed to write: %s",
-			   strerror(errno));
+	rlen = write(tdb->fd, &newdb, sizeof(newdb));
+	if (rlen != sizeof(newdb)) {
+		if (rlen >= 0)
+			errno = ENOSPC;
+		tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+			   "tdb_new_database: %zi writing header: %s",
+			   rlen, strerror(errno));
 		return -1;
 	}
 	return 0;
@@ -153,6 +170,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 	int saved_errno = 0;
 	uint64_t hash_test;
 	unsigned v;
+	ssize_t rlen;
 	struct tdb_header hdr;
 	struct tdb_attribute_seed *seed = NULL;
 
@@ -197,7 +215,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 				tdb->stats->size = sizeof(attr->stats);
 			break;
 		default:
-			tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_DEBUG_ERROR,
+			tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
 				   "tdb_open: unknown attribute type %u",
 				   attr->base.attr);
 			goto fail;
@@ -206,7 +224,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 	}
 
 	if ((open_flags & O_ACCMODE) == O_WRONLY) {
-		tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_DEBUG_ERROR,
+		tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
 			   "tdb_open: can't open tdb %s write-only", name);
 		goto fail;
 	}
@@ -236,7 +254,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 	if ((tdb->fd = open(name, open_flags, mode)) == -1) {
 		/* errno set by open(2) */
 		saved_errno = errno;
-		tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_ERROR,
+		tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
 			   "tdb_open: could not open file %s: %s",
 			   name, strerror(errno));
 		goto fail;
@@ -253,22 +271,30 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 		goto fail;
 	}
 
-	if (!tdb_pread_all(tdb->fd, &hdr, sizeof(hdr), 0)
-	    || strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0) {
-		if (!(open_flags & O_CREAT)) {
-			tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_ERROR,
-				   "tdb_open: %s is not a tdb file", name);
-			goto fail;
-		}
+	/* If they used O_TRUNC, read will return 0. */
+	rlen = read(tdb->fd, &hdr, sizeof(hdr));
+	if (rlen == 0 && (open_flags & O_CREAT)) {
 		if (tdb_new_database(tdb, seed, &hdr) == -1) {
 			goto fail;
 		}
-	} else if (hdr.version != TDB_VERSION) {
+	} else if (rlen < 0) {
+		tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+			   "tdb_open: error %s reading %s",
+			   strerror(errno), name);
+		goto fail;
+	} else if (rlen < sizeof(hdr)
+		   || strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0) {
+		tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+			   "tdb_open: %s is not a tdb file", name);
+		goto fail;
+	}
+
+	if (hdr.version != TDB_VERSION) {
 		if (hdr.version == bswap_64(TDB_VERSION))
 			tdb->flags |= TDB_CONVERT;
 		else {
 			/* wrong version */
-			tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_ERROR,
+			tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
 				   "tdb_open: %s is unknown version 0x%llx",
 				   name, (long long)hdr.version);
 			goto fail;
@@ -281,7 +307,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 	hash_test = tdb_hash(tdb, &hash_test, sizeof(hash_test));
 	if (hdr.hash_test != hash_test) {
 		/* wrong hash variant */
-		tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_ERROR,
+		tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
 			   "tdb_open: %s uses a different hash function",
 			   name);
 		goto fail;
@@ -289,7 +315,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 
 	if (fstat(tdb->fd, &st) == -1) {
 		saved_errno = errno;
-		tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_ERROR,
+		tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
 			   "tdb_open: could not stat open %s: %s",
 			   name, strerror(errno));
 		goto fail;
@@ -298,7 +324,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 	/* Is it already in the open list?  If so, fail. */
 	if (tdb_already_open(st.st_dev, st.st_ino)) {
 		/* FIXME */
-		tdb_logerr(tdb, TDB_ERR_NESTING, TDB_DEBUG_ERROR,
+		tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_USE_ERROR,
 			   "tdb_open: %s (%d,%d) is already open in this"
 			   " process",
 			   name, (int)st.st_dev, (int)st.st_ino);
@@ -307,7 +333,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 
 	tdb->name = strdup(name);
 	if (!tdb->name) {
-		tdb_logerr(tdb, TDB_ERR_OOM, TDB_DEBUG_ERROR,
+		tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
 			   "tdb_open: failed to allocate name");
 		goto fail;
 	}
@@ -348,9 +374,6 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 		case TDB_ERR_EINVAL:
 			saved_errno = EINVAL;
 			break;
-		case TDB_ERR_NESTING:
-			saved_errno = EBUSY;
-			break;
 		default:
 			saved_errno = EINVAL;
 			break;
@@ -366,12 +389,13 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 		} else
 			tdb_munmap(tdb);
 	}
+	free(tdb->lockrecs);
 	free((char *)tdb->name);
 	if (tdb->fd != -1)
 		if (close(tdb->fd) != 0)
-			tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_ERROR,
+			tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
 				   "tdb_open: failed to close tdb->fd"
-				   " on error!");
+				   " on error: %s", strerror(errno));
 	free(tdb);
 	errno = saved_errno;
 	return NULL;
@@ -422,11 +446,11 @@ static int replace_data(struct tdb_context *tdb,
 	}
 
 	new_off += sizeof(struct tdb_used_record);
-	if (tdb->methods->write(tdb, new_off, key.dptr, key.dsize) == -1)
+	if (tdb->methods->twrite(tdb, new_off, key.dptr, key.dsize) == -1)
 		return -1;
 
 	new_off += key.dsize;
-	if (tdb->methods->write(tdb, new_off, dbuf.dptr, dbuf.dsize) == -1)
+	if (tdb->methods->twrite(tdb, new_off, dbuf.dptr, dbuf.dsize) == -1)
 		return -1;
 
 	/* FIXME: tdb_increment_seqnum(tdb); */
@@ -462,9 +486,9 @@ int tdb_store(struct tdb_context *tdb,
 						   key.dsize, dbuf.dsize,
 						   &rec, h.h))
 					goto fail;
-				if (tdb->methods->write(tdb, off + sizeof(rec)
-							+ key.dsize,
-							dbuf.dptr, dbuf.dsize))
+				if (tdb->methods->twrite(tdb, off + sizeof(rec)
+							 + key.dsize,
+							 dbuf.dptr, dbuf.dsize))
 					goto fail;
 				tdb_unlock_hashes(tdb, h.hlock_start,
 						  h.hlock_range, F_WRLCK);
@@ -517,8 +541,8 @@ int tdb_append(struct tdb_context *tdb,
 				goto fail;
 
 			off += sizeof(rec) + key.dsize + old_dlen;
-			if (tdb->methods->write(tdb, off, dbuf.dptr,
-						dbuf.dsize) == -1)
+			if (tdb->methods->twrite(tdb, off, dbuf.dptr,
+						 dbuf.dsize) == -1)
 				goto fail;
 
 			/* FIXME: tdb_increment_seqnum(tdb); */
@@ -530,13 +554,13 @@ int tdb_append(struct tdb_context *tdb,
 		/* Slow path. */
 		newdata = malloc(key.dsize + old_dlen + dbuf.dsize);
 		if (!newdata) {
-			tdb_logerr(tdb, TDB_ERR_OOM, TDB_DEBUG_FATAL,
+			tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
 				   "tdb_append: failed to allocate %zu bytes",
 				   (size_t)(key.dsize+old_dlen+dbuf.dsize));
 			goto fail;
 		}
-		if (tdb->methods->read(tdb, off + sizeof(rec) + key.dsize,
-				       newdata, old_dlen) != 0) {
+		if (tdb->methods->tread(tdb, off + sizeof(rec) + key.dsize,
+					newdata, old_dlen) != 0) {
 			free(newdata);
 			goto fail;
 		}
@@ -675,7 +699,6 @@ const char *tdb_errorstr(const struct tdb_context *tdb)
 	case TDB_ERR_LOCK: return "Locking error";
 	case TDB_ERR_OOM: return "Out of memory";
 	case TDB_ERR_EXISTS: return "Record exists";
-	case TDB_ERR_NESTING: return "Transaction already started";
 	case TDB_ERR_EINVAL: return "Invalid parameter";
 	case TDB_ERR_NOEXIST: return "Record does not exist";
 	case TDB_ERR_RDONLY: return "write not permitted";
@@ -685,7 +708,7 @@ const char *tdb_errorstr(const struct tdb_context *tdb)
 
 void COLD tdb_logerr(struct tdb_context *tdb,
 		     enum TDB_ERROR ecode,
-		     enum tdb_debug_level level,
+		     enum tdb_log_level level,
 		     const char *fmt, ...)
 {
 	char *message;
@@ -706,8 +729,9 @@ void COLD tdb_logerr(struct tdb_context *tdb,
 
 	message = malloc(len + 1);
 	if (!message) {
-		tdb->logfn(tdb, level, tdb->log_private,
-			   "out of memory formatting message");
+		tdb->logfn(tdb, TDB_LOG_ERROR, tdb->log_private,
+			   "out of memory formatting message:");
+		tdb->logfn(tdb, level, tdb->log_private, fmt);
 		return;
 	}
 	va_start(ap, fmt);