BSD 4_4_Lite1 release

[unix-history] / usr / src / lib / libc / db / btree / bt_get.c

diff --git a/usr/src/lib/libc/db/btree/bt_get.c b/usr/src/lib/libc/db/btree/bt_get.c
index 1da53b1..28b2d60 100644 (file)
--- a/usr/src/lib/libc/db/btree/bt_get.c
+++ b/usr/src/lib/libc/db/btree/bt_get.c
@@ -1,15 +1,41 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bt_get.c   5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)bt_get.c   8.2 (Berkeley) 9/7/93";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>


@@ -44,11 +70,20 @@ __bt_get(dbp, key, data, flags)
        EPG *e;
        int exact, status;
 
        EPG *e;
        int exact, status;
 

+       t = dbp->internal;
+
+       /* Toss any page pinned across calls. */
+       if (t->bt_pinned != NULL) {
+               mpool_put(t->bt_mp, t->bt_pinned, 0);
+               t->bt_pinned = NULL;
+       }
+
+       /* Get currently doesn't take any flags. */

        if (flags) {
                errno = EINVAL;
                return (RET_ERROR);
        }
        if (flags) {
                errno = EINVAL;
                return (RET_ERROR);
        }

-       t = dbp->internal;
+

        if ((e = __bt_search(t, key, &exact)) == NULL)
                return (RET_ERROR);
        if (!exact) {
        if ((e = __bt_search(t, key, &exact)) == NULL)
                return (RET_ERROR);
        if (!exact) {


@@ -73,7 +108,14 @@ __bt_get(dbp, key, data, flags)
        }
 
        status = __bt_ret(t, e, NULL, data);
        }
 
        status = __bt_ret(t, e, NULL, data);

-       mpool_put(t->bt_mp, e->page, 0);
+       /*
+        * If the user is doing concurrent access, we copied the
+        * key/data, toss the page.
+        */
+       if (ISSET(t, B_DB_LOCK))
+               mpool_put(t->bt_mp, e->page, 0);
+       else
+               t->bt_pinned = e->page;

        return (status);
 }
 
        return (status);
 }