about summary refs log tree commit diff
path: root/db2/db
diff options
context:
space:
mode:
Diffstat (limited to 'db2/db')
-rw-r--r--db2/db/db.c24
-rw-r--r--db2/db/db_conv.c6
-rw-r--r--db2/db/db_dup.c16
-rw-r--r--db2/db/db_pr.c40
-rw-r--r--db2/db/db_ret.c4
5 files changed, 46 insertions, 44 deletions
diff --git a/db2/db/db.c b/db2/db/db.c
index df3a9d2d21..8dad5febe8 100644
--- a/db2/db/db.c
+++ b/db2/db/db.c
@@ -44,7 +44,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)db.c	10.37 (Sleepycat) 8/23/97";
+static const char sccsid[] = "@(#)db.c	10.38 (Sleepycat) 9/2/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -248,9 +248,6 @@ db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp)
 		 * that fail, we simply retry without the O_CREAT flag, which
 		 * will require that the meta-data page exist.
 		 */
-#undef	OKFLAGS
-#define	OKFLAGS \
-    DB_CREATE | DB_NOMMAP | DB_RDONLY | DB_THREAD | DB_TRUNCATE
 		retry_cnt = 0;
 open_retry:	if (LF_ISSET(DB_CREATE)) {
 			if ((ret = __db_fdopen(real_name, flags | DB_EXCL,
@@ -308,13 +305,20 @@ open_retry:	if (LF_ISSET(DB_CREATE)) {
 			}
 			/*
 			 * The only way we can reach here with the DB_CREATE
-			 * flag set is if we created the file.  If we didn't
-			 * create the file, there's a chance that someone else
-			 * is busily doing so.  Sleep and give them a chance,
-			 * because we need the metadata page their going to
-			 * write.
+			 * flag set is if we created the file.  If that's not
+			 * the case, then a) someone else created the file
+			 * but has not yet written out the meta-data page, or
+			 * b) we truncated the file (DB_TRUNCATE) leaving it
+			 * zero-length.  In the case of a), we want to sleep
+			 * and give the file creator some time to write the
+			 * metadata page.  In the case of b), charge forward.
+			 * Note, there is a race in the case of two processes
+			 * opening the file with the DB_TRUNCATE flag set at
+			 * roughly the same time, and they could theoretically
+			 * hurt each other, although it's pretty unlikely.
 			 */
-			if (!LF_ISSET(DB_CREATE) && retry_cnt++ < 3) {
+			if (retry_cnt++ < 3 &&
+			    !LF_ISSET(DB_CREATE | DB_TRUNCATE)) {
 				__db_sleep(1, 0);
 				goto open_retry;
 			}
diff --git a/db2/db/db_conv.c b/db2/db/db_conv.c
index 39527c6804..6608005b66 100644
--- a/db2/db/db_conv.c
+++ b/db2/db/db_conv.c
@@ -44,7 +44,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)db_conv.c	10.4 (Sleepycat) 8/15/97";
+static const char sccsid[] = "@(#)db_conv.c	10.5 (Sleepycat) 9/3/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -145,7 +145,7 @@ __db_convert(pg, pp, pgin)
 				M_16_SWAP(h->inp[i]);
 
 			bk = GET_BKEYDATA(h, i);
-			switch (bk->type) {
+			switch (B_TYPE(bk->type)) {
 			case B_KEYDATA:
 				M_16_SWAP(bk->len);
 				break;
@@ -167,7 +167,7 @@ __db_convert(pg, pp, pgin)
 				M_16_SWAP(h->inp[i]);
 
 			bi = GET_BINTERNAL(h, i);
-			switch (bi->type) {
+			switch (B_TYPE(bi->type)) {
 			case B_KEYDATA:
 				M_16_SWAP(bi->len);
 				M_32_SWAP(bi->pgno);
diff --git a/db2/db/db_dup.c b/db2/db/db_dup.c
index 8d364d518e..66c6c2616a 100644
--- a/db2/db/db_dup.c
+++ b/db2/db/db_dup.c
@@ -8,7 +8,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)db_dup.c	10.8 (Sleepycat) 7/20/97";
+static const char sccsid[] = "@(#)db_dup.c	10.9 (Sleepycat) 9/3/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -65,8 +65,7 @@ __db_dput(dbp, dbt, pp, indxp, newfunc)
 	if (dbt->size > 0.25 * dbp->pgsize) {
 		if ((ret = __db_poff(dbp, dbt, &pgno, newfunc)) != 0)
 			return (ret);
-		bo.deleted = 0;
-		bo.type = B_OVERFLOW;
+		B_TSET(bo.type, B_OVERFLOW, 0);
 		bo.tlen = dbt->size;
 		bo.pgno = pgno;
 		hdr_dbt.data = &bo;
@@ -125,7 +124,7 @@ __db_drem(dbp, pp, indx, freefunc)
 	pagep = *pp;
 
 	/* Check if we are freeing a big item. */
-	if (GET_BKEYDATA(pagep, indx)->type == B_OVERFLOW) {
+	if (B_TYPE(GET_BKEYDATA(pagep, indx)->type) == B_OVERFLOW) {
 		if ((ret = __db_doff(dbp,
 		    GET_BOVERFLOW(pagep, indx)->pgno, freefunc)) != 0)
 			return (ret);
@@ -255,7 +254,7 @@ __db_dsplit(dbp, hp, indxp, size, newfunc)
 			lastsum = sum;
 			did_indx = 1;
 		}
-		if (GET_BKEYDATA(h, i)->type == B_KEYDATA)
+		if (B_TYPE(GET_BKEYDATA(h, i)->type) == B_KEYDATA)
 			sum += BKEYDATA_SIZE(GET_BKEYDATA(h, i)->len);
 		else
 			sum += BOVERFLOW_SIZE;
@@ -300,7 +299,7 @@ __db_dsplit(dbp, hp, indxp, size, newfunc)
 
 	for (nindex = 0, oindex = i + 1; oindex < NUM_ENT(h); oindex++) {
 		bk = GET_BKEYDATA(h, oindex);
-		if (bk->type == B_KEYDATA)
+		if (B_TYPE(bk->type) == B_KEYDATA)
 			s = BKEYDATA_SIZE(bk->len);
 		else
 			s = BOVERFLOW_SIZE;
@@ -316,7 +315,7 @@ __db_dsplit(dbp, hp, indxp, size, newfunc)
 	 */
 	for (nindex = 0, oindex = 0; oindex <= i; oindex++) {
 		bk = GET_BKEYDATA(h, oindex);
-		if (bk->type == B_KEYDATA)
+		if (B_TYPE(bk->type) == B_KEYDATA)
 			s = BKEYDATA_SIZE(bk->len);
 		else
 			s = BOVERFLOW_SIZE;
@@ -474,8 +473,7 @@ __db_pitem(dbp, pagep, indx, nbytes, hdr, data)
 			return (ret);
 
 	if (hdr == NULL) {
-		bk.deleted = 0;
-		bk.type = B_KEYDATA;
+		B_TSET(bk.type, B_KEYDATA, 0);
 		bk.len = data == NULL ? 0 : data->size;
 
 		thdr.data = &bk;
diff --git a/db2/db/db_pr.c b/db2/db/db_pr.c
index c103b10e4f..f86fd6770a 100644
--- a/db2/db/db_pr.c
+++ b/db2/db/db_pr.c
@@ -8,7 +8,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)db_pr.c	10.14 (Sleepycat) 8/17/97";
+static const char sccsid[] = "@(#)db_pr.c	10.16 (Sleepycat) 9/3/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -461,12 +461,12 @@ __db_prpage(h, all)
 		case P_LBTREE:
 			bk = GET_BKEYDATA(h, i);
 			deleted = i % 2 == 0 &&
-			    GET_BKEYDATA(h, i + O_INDX)->deleted;
+			    B_DISSET(GET_BKEYDATA(h, i + O_INDX)->type);
 			break;
 		case P_LRECNO:
 		case P_DUPLICATE:
 			bk = GET_BKEYDATA(h, i);
-			deleted = GET_BKEYDATA(h, i)->deleted;
+			deleted = B_DISSET(GET_BKEYDATA(h, i)->type);
 			break;
 		default:
 			fprintf(fp,
@@ -525,7 +525,7 @@ __db_prpage(h, all)
 		case P_IBTREE:
 			fprintf(fp, "count: %4lu pgno: %4lu ",
 			    (u_long)bi->nrecs, (u_long)bi->pgno);
-			switch (bi->type) {
+			switch (B_TYPE(bi->type)) {
 			case B_KEYDATA:
 				__db_pr(bi->data, bi->len);
 				break;
@@ -535,7 +535,7 @@ __db_prpage(h, all)
 				break;
 			default:
 				fprintf(fp, "ILLEGAL BINTERNAL TYPE: %lu\n",
-				    (u_long)bi->type);
+				    (u_long)B_TYPE(bi->type));
 				ret = EINVAL;
 				break;
 			}
@@ -547,7 +547,7 @@ __db_prpage(h, all)
 		case P_LBTREE:
 		case P_LRECNO:
 		case P_DUPLICATE:
-			switch (bk->type) {
+			switch (B_TYPE(bk->type)) {
 			case B_KEYDATA:
 				__db_pr(bk->data, bk->len);
 				break;
@@ -558,7 +558,7 @@ __db_prpage(h, all)
 			default:
 				fprintf(fp,
 			    "ILLEGAL DUPLICATE/LBTREE/LRECNO TYPE: %lu\n",
-				    (u_long)bk->type);
+				    (u_long)B_TYPE(bk->type));
 				ret = EINVAL;
 				break;
 			}
@@ -630,11 +630,11 @@ __db_isbad(h, die)
 			break;
 		case P_IBTREE:
 			bi = GET_BINTERNAL(h, i);
-			if (bi->type != B_KEYDATA &&
-			    bi->type != B_DUPLICATE &&
-			    bi->type != B_OVERFLOW) {
+			if (B_TYPE(bi->type) != B_KEYDATA &&
+			    B_TYPE(bi->type) != B_DUPLICATE &&
+			    B_TYPE(bi->type) != B_OVERFLOW) {
 				fprintf(fp, "ILLEGAL BINTERNAL TYPE: %lu\n",
-				    (u_long)bi->type);
+				    (u_long)B_TYPE(bi->type));
 				goto bad;
 			}
 			break;
@@ -644,12 +644,12 @@ __db_isbad(h, die)
 			break;
 		case P_DUPLICATE:
 			bk = GET_BKEYDATA(h, i);
-			if (bk->type != B_KEYDATA &&
-			    bk->type != B_DUPLICATE &&
-			    bk->type != B_OVERFLOW) {
+			if (B_TYPE(bk->type) != B_KEYDATA &&
+			    B_TYPE(bk->type) != B_DUPLICATE &&
+			    B_TYPE(bk->type) != B_OVERFLOW) {
 				fprintf(fp,
 			    "ILLEGAL DUPLICATE/LBTREE/LRECNO TYPE: %lu\n",
-				    (u_long)bk->type);
+				    (u_long)B_TYPE(bk->type));
 				goto bad;
 			}
 			break;
@@ -713,18 +713,18 @@ __db_proff(vp)
 	void *vp;
 {
 	FILE *fp;
-	BOVERFLOW *p;
+	BOVERFLOW *bo;
 
 	fp = __db_prinit(NULL);
 
-	p = vp;
-	switch (p->type) {
+	bo = vp;
+	switch (B_TYPE(bo->type)) {
 	case B_OVERFLOW:
 		fprintf(fp, "overflow: total len: %4lu page: %4lu\n",
-		    (u_long)p->tlen, (u_long)p->pgno);
+		    (u_long)bo->tlen, (u_long)bo->pgno);
 		break;
 	case B_DUPLICATE:
-		fprintf(fp, "duplicate: page: %4lu\n", (u_long)p->pgno);
+		fprintf(fp, "duplicate: page: %4lu\n", (u_long)bo->pgno);
 		break;
 	}
 }
diff --git a/db2/db/db_ret.c b/db2/db/db_ret.c
index ddeb26eb94..baf0665446 100644
--- a/db2/db/db_ret.c
+++ b/db2/db/db_ret.c
@@ -8,7 +8,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)db_ret.c	10.5 (Sleepycat) 7/12/97";
+static const char sccsid[] = "@(#)db_ret.c	10.6 (Sleepycat) 9/3/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -63,7 +63,7 @@ __db_ret(dbp, h, indx, dbt, memp, memsize)
 	case P_LBTREE:
 	case P_LRECNO:
 		bk = GET_BKEYDATA(h, indx);
-		if (bk->type == B_OVERFLOW) {
+		if (B_TYPE(bk->type) == B_OVERFLOW) {
 			bo = (BOVERFLOW *)bk;
 			return (__db_goff(dbp, dbt,
 			    bo->tlen, bo->pgno, memp, memsize));