diff options
Diffstat (limited to 'db2/mp')
| -rw-r--r-- | db2/mp/mp_bh.c | 32 | ||||
| -rw-r--r-- | db2/mp/mp_fget.c | 10 | ||||
| -rw-r--r-- | db2/mp/mp_fopen.c | 78 | ||||
| -rw-r--r-- | db2/mp/mp_fput.c | 8 | ||||
| -rw-r--r-- | db2/mp/mp_fset.c | 4 | ||||
| -rw-r--r-- | db2/mp/mp_open.c | 41 |
6 files changed, 110 insertions, 63 deletions
diff --git a/db2/mp/mp_bh.c b/db2/mp/mp_bh.c index 3d0d053b5f..fb6bc96ae7 100644 --- a/db2/mp/mp_bh.c +++ b/db2/mp/mp_bh.c @@ -7,7 +7,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)mp_bh.c 10.15 (Sleepycat) 8/29/97"; +static const char sccsid[] = "@(#)mp_bh.c 10.16 (Sleepycat) 9/23/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -55,7 +55,7 @@ __memp_bhwrite(dbmp, mfp, bhp, restartp, wrotep) * If we find a descriptor on the file that's not open for writing, we * try and upgrade it to make it writeable. */ - LOCKHANDLE(dbmp, &dbmp->mutex); + LOCKHANDLE(dbmp, dbmp->mutexp); for (dbmfp = TAILQ_FIRST(&dbmp->dbmfq); dbmfp != NULL; dbmfp = TAILQ_NEXT(dbmfp, q)) if (dbmfp->mfp == mfp) { @@ -64,7 +64,7 @@ __memp_bhwrite(dbmp, mfp, bhp, restartp, wrotep) return (0); break; } - UNLOCKHANDLE(dbmp, &dbmp->mutex); + UNLOCKHANDLE(dbmp, dbmp->mutexp); if (dbmfp != NULL) goto found; @@ -75,12 +75,12 @@ __memp_bhwrite(dbmp, mfp, bhp, restartp, wrotep) * nothing we can do. */ if (mfp->ftype != 0) { - LOCKHANDLE(dbmp, &dbmp->mutex); + LOCKHANDLE(dbmp, dbmp->mutexp); for (mpreg = LIST_FIRST(&dbmp->dbregq); mpreg != NULL; mpreg = LIST_NEXT(mpreg, q)) if (mpreg->ftype == mfp->ftype) break; - UNLOCKHANDLE(dbmp, &dbmp->mutex); + UNLOCKHANDLE(dbmp, dbmp->mutexp); if (mpreg == NULL) return (0); } @@ -135,19 +135,19 @@ __memp_pgread(dbmfp, bhp, can_create) * Seek to the page location. */ ret = 0; - LOCKHANDLE(dbmp, &dbmfp->mutex); + LOCKHANDLE(dbmp, dbmfp->mutexp); if (dbmfp->fd == -1 || (ret = __db_lseek(dbmfp->fd, pagesize, bhp->pgno, 0, SEEK_SET)) != 0) { if (!can_create) { if (dbmfp->fd == -1) ret = EINVAL; - UNLOCKHANDLE(dbmp, &dbmfp->mutex); + UNLOCKHANDLE(dbmp, dbmfp->mutexp); __db_err(dbmp->dbenv, "%s: page %lu doesn't exist, create flag not set", dbmfp->path, (u_long)bhp->pgno); goto err; } - UNLOCKHANDLE(dbmp, &dbmfp->mutex); + UNLOCKHANDLE(dbmp, dbmfp->mutexp); /* Clear any uninitialized data. */ memset(bhp->buf, 0, pagesize); @@ -159,7 +159,7 @@ __memp_pgread(dbmfp, bhp, can_create) * any valid data is preserved. */ ret = __db_read(dbmfp->fd, bhp->buf, pagesize, &nr); - UNLOCKHANDLE(dbmp, &dbmfp->mutex); + UNLOCKHANDLE(dbmp, dbmfp->mutexp); if (ret != 0) goto err; @@ -268,10 +268,10 @@ __memp_pgwrite(dbmfp, bhp, restartp, wrotep) } /* Temporary files may not yet have been created. */ - LOCKHANDLE(dbmp, &dbmfp->mutex); + LOCKHANDLE(dbmp, dbmfp->mutexp); if (dbmfp->fd == -1 && ((ret = __db_appname(dbenv, DB_APP_TMP, NULL, NULL, &dbmfp->fd, NULL)) != 0 || dbmfp->fd == -1)) { - UNLOCKHANDLE(dbmp, &dbmfp->mutex); + UNLOCKHANDLE(dbmp, dbmfp->mutexp); __db_err(dbenv, "unable to create temporary backing file"); goto err; } @@ -282,7 +282,7 @@ __memp_pgwrite(dbmfp, bhp, restartp, wrotep) fail = "seek"; else if ((ret = __db_write(dbmfp->fd, bhp->buf, pagesize, &nw)) != 0) fail = "write"; - UNLOCKHANDLE(dbmp, &dbmfp->mutex); + UNLOCKHANDLE(dbmp, dbmfp->mutexp); if (ret != 0) { /* * XXX @@ -380,7 +380,7 @@ __memp_pg(dbmfp, bhp, is_pgin) dbmp = dbmfp->dbmp; mfp = dbmfp->mfp; - LOCKHANDLE(dbmp, &dbmp->mutex); + LOCKHANDLE(dbmp, dbmp->mutexp); ftype = mfp->ftype; for (mpreg = LIST_FIRST(&dbmp->dbregq); @@ -394,7 +394,7 @@ __memp_pg(dbmfp, bhp, is_pgin) dbt.data = ADDR(dbmp, mfp->pgcookie_off); dbtp = &dbt; } - UNLOCKHANDLE(dbmp, &dbmp->mutex); + UNLOCKHANDLE(dbmp, dbmp->mutexp); if (is_pgin) { if (mpreg->pgin != NULL && (ret = @@ -408,11 +408,11 @@ __memp_pg(dbmfp, bhp, is_pgin) } if (mpreg == NULL) - UNLOCKHANDLE(dbmp, &dbmp->mutex); + UNLOCKHANDLE(dbmp, dbmp->mutexp); return (0); -err: UNLOCKHANDLE(dbmp, &dbmp->mutex); +err: UNLOCKHANDLE(dbmp, dbmp->mutexp); __db_err(dbmp->dbenv, "%s: %s failed for page %lu", dbmfp->path, is_pgin ? "pgin" : "pgout", (u_long)bhp->pgno); return (ret); diff --git a/db2/mp/mp_fget.c b/db2/mp/mp_fget.c index 418802a3b9..a0364e92c3 100644 --- a/db2/mp/mp_fget.c +++ b/db2/mp/mp_fget.c @@ -7,7 +7,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)mp_fget.c 10.22 (Sleepycat) 8/19/97"; +static const char sccsid[] = "@(#)mp_fget.c 10.25 (Sleepycat) 9/23/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -35,7 +35,7 @@ int memp_fget(dbmfp, pgnoaddr, flags, addrp) DB_MPOOLFILE *dbmfp; db_pgno_t *pgnoaddr; - u_long flags; + int flags; void *addrp; { BH *bhp, *tbhp; @@ -293,7 +293,7 @@ found: /* Increment the reference count. */ __db_err(dbmp->dbenv, "%s: too many references to page %lu", dbmfp->path, bhp->pgno); - ret = EAGAIN; + ret = EINVAL; goto err; } ++bhp->ref; @@ -337,9 +337,9 @@ found: /* Increment the reference count. */ ++mfp->stat.st_cache_hit; } -mapret: LOCKHANDLE(dbmp, &dbmfp->mutex); +mapret: LOCKHANDLE(dbmp, dbmfp->mutexp); ++dbmfp->pinref; - UNLOCKHANDLE(dbmp, &dbmfp->mutex); + UNLOCKHANDLE(dbmp, dbmfp->mutexp); if (0) { err: /* diff --git a/db2/mp/mp_fopen.c b/db2/mp/mp_fopen.c index 1a770bfdf0..5ab807701c 100644 --- a/db2/mp/mp_fopen.c +++ b/db2/mp/mp_fopen.c @@ -7,7 +7,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)mp_fopen.c 10.25 (Sleepycat) 8/27/97"; +static const char sccsid[] = "@(#)mp_fopen.c 10.27 (Sleepycat) 9/23/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -28,8 +28,8 @@ static const char sccsid[] = "@(#)mp_fopen.c 10.25 (Sleepycat) 8/27/97"; #include "common_ext.h" static int __memp_mf_close __P((DB_MPOOL *, DB_MPOOLFILE *)); -static int __memp_mf_open __P((DB_MPOOL *, DB_MPOOLFILE *, - int, int, size_t, int, DBT *, u_int8_t *, int, MPOOLFILE **)); +static int __memp_mf_open __P((DB_MPOOL *, + DB_MPOOLFILE *, int, size_t, int, DBT *, u_int8_t *, int, MPOOLFILE **)); /* * memp_fopen -- @@ -97,7 +97,6 @@ __memp_fopen(dbmp, path, path == NULL ? TEMPORARY : path, strerror(ENOMEM)); return (ENOMEM); } - LOCKINIT(dbmp, &dbmfp->mutex); dbmfp->dbmp = dbmp; dbmfp->fd = -1; if (LF_ISSET(DB_RDONLY)) @@ -141,14 +140,21 @@ __memp_fopen(dbmp, path, } } - /* Find/allocate the shared file object. */ + /* + * Find/allocate the shared file objects. This includes allocating + * space for the per-process thread lock. + */ if (needlock) LOCKREGION(dbmp); - ret = __memp_mf_open(dbmp, dbmfp, ftype, - F_ISSET(dbmfp, MP_READONLY), pagesize, + ret = __memp_mf_open(dbmp, dbmfp, ftype, pagesize, lsn_offset, pgcookie, fileid, F_ISSET(dbmfp, MP_PATH_TEMP), &mfp); + if (ret == 0 && + F_ISSET(dbmp, MP_LOCKHANDLE) && (ret = + __memp_ralloc(dbmp, sizeof(db_mutex_t), NULL, &dbmfp->mutexp)) == 0) + LOCKINIT(dbmp, dbmfp->mutexp); if (needlock) UNLOCKREGION(dbmp); + if (ret != 0) goto err; @@ -156,11 +162,11 @@ __memp_fopen(dbmp, path, /* * If a file: - * * + is read-only + * + isn't temporary * + doesn't require any pgin/pgout support - * + is less than mp_mmapsize bytes in size. - * + and the DB_NOMMAP flag wasn't set + * + the DB_NOMMAP flag wasn't set + * + and is less than mp_mmapsize bytes in size * * we can mmap it instead of reading/writing buffers. Don't do error * checking based on the mmap call failure. We want to do normal I/O @@ -176,11 +182,20 @@ __memp_fopen(dbmp, path, * flatly impossible. Hope that mmap fails if the file is too large. */ #define DB_MAXMMAPSIZE (10 * 1024 * 1024) /* 10 Mb. */ + if (mfp->can_mmap) { + if (!F_ISSET(dbmfp, MP_READONLY)) + mfp->can_mmap = 0; + if (path == NULL) + mfp->can_mmap = 0; + if (ftype != 0) + mfp->can_mmap = 0; + if (LF_ISSET(DB_NOMMAP)) + mfp->can_mmap = 0; + if (size > (dbenv == NULL || dbenv->mp_mmapsize == 0 ? + DB_MAXMMAPSIZE : (off_t)dbenv->mp_mmapsize)) + mfp->can_mmap = 0; + } dbmfp->addr = NULL; - mfp->can_mmap = F_ISSET(dbmfp, MP_READONLY) && - ftype == 0 && !LF_ISSET(DB_NOMMAP) && path != NULL && - size <= (dbenv == NULL || dbenv->mp_mmapsize == 0 ? - DB_MAXMMAPSIZE : (off_t)dbenv->mp_mmapsize); if (mfp->can_mmap) { dbmfp->len = size; if (__db_mmap(dbmfp->fd, dbmfp->len, 1, 1, &dbmfp->addr) != 0) { @@ -189,14 +204,18 @@ __memp_fopen(dbmp, path, } } - LOCKHANDLE(dbmp, &dbmp->mutex); + LOCKHANDLE(dbmp, dbmp->mutexp); TAILQ_INSERT_TAIL(&dbmp->dbmfq, dbmfp, q); - UNLOCKHANDLE(dbmp, &dbmp->mutex); + UNLOCKHANDLE(dbmp, dbmp->mutexp); *retp = dbmfp; return (0); -err: if (F_ISSET(dbmfp, MP_PATH_ALLOC)) +err: /* + * Note that we do not have to free the thread mutex, because we + * never get to here after we have successfully allocated it. + */ + if (F_ISSET(dbmfp, MP_PATH_ALLOC)) FREES(dbmfp->path); if (dbmfp->fd != -1) (void)__db_close(dbmfp->fd); @@ -211,10 +230,10 @@ err: if (F_ISSET(dbmfp, MP_PATH_ALLOC)) */ static int __memp_mf_open(dbmp, dbmfp, - ftype, readonly, pagesize, lsn_offset, pgcookie, fileid, istemp, retp) + ftype, pagesize, lsn_offset, pgcookie, fileid, istemp, retp) DB_MPOOL *dbmp; DB_MPOOLFILE *dbmfp; - int ftype, readonly, lsn_offset, istemp; + int ftype, lsn_offset, istemp; size_t pagesize; DBT *pgcookie; u_int8_t *fileid; @@ -255,13 +274,8 @@ __memp_mf_open(dbmp, dbmfp, mfp = NULL; goto ret1; } - /* - * Found it: increment the reference count and update - * the mmap-able status. - */ + /* Found it: increment the reference count. */ ++mfp->ref; - if (!readonly) - mfp->can_mmap = 0; goto ret1; } @@ -273,6 +287,7 @@ alloc: if ((ret = __memp_ralloc(dbmp, sizeof(MPOOLFILE), NULL, &mfp)) != 0) memset(mfp, 0, sizeof(MPOOLFILE)); mfp->ref = 1; mfp->ftype = ftype; + mfp->can_mmap = 1; mfp->lsn_off = lsn_offset; mfp->stat.st_pagesize = pagesize; @@ -343,9 +358,9 @@ memp_fclose(dbmfp) dbmfp->path, (u_long)dbmfp->pinref); /* Remove the DB_MPOOLFILE structure from the list. */ - LOCKHANDLE(dbmp, &dbmp->mutex); + LOCKHANDLE(dbmp, dbmp->mutexp); TAILQ_REMOVE(&dbmp->dbmfq, dbmfp, q); - UNLOCKHANDLE(dbmp, &dbmp->mutex); + UNLOCKHANDLE(dbmp, dbmp->mutexp); /* Close the underlying MPOOLFILE. */ (void)__memp_mf_close(dbmp, dbmfp); @@ -362,11 +377,16 @@ memp_fclose(dbmfp) t_ret = ret; } - /* Potentially allocated path. */ + /* Free memory. */ if (F_ISSET(dbmfp, MP_PATH_ALLOC)) FREES(dbmfp->path); + if (dbmfp->mutexp != NULL) { + LOCKREGION(dbmp); + __db_shalloc_free(dbmp->addr, dbmfp->mutexp); + UNLOCKREGION(dbmp); + } - /* Free the DB_MPOOLFILE structure. */ + /* Discard the DB_MPOOLFILE structure. */ FREE(dbmfp, sizeof(DB_MPOOLFILE)); return (ret); diff --git a/db2/mp/mp_fput.c b/db2/mp/mp_fput.c index 5fac8ae76b..9ea7cd9d0d 100644 --- a/db2/mp/mp_fput.c +++ b/db2/mp/mp_fput.c @@ -7,7 +7,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)mp_fput.c 10.10 (Sleepycat) 7/20/97"; +static const char sccsid[] = "@(#)mp_fput.c 10.12 (Sleepycat) 9/23/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -31,7 +31,7 @@ int memp_fput(dbmfp, pgaddr, flags) DB_MPOOLFILE *dbmfp; void *pgaddr; - u_long flags; + int flags; { BH *bhp; DB_MPOOL *dbmp; @@ -58,14 +58,14 @@ memp_fput(dbmfp, pgaddr, flags) } /* Decrement the pinned reference count. */ - LOCKHANDLE(dbmp, &dbmfp->mutex); + LOCKHANDLE(dbmp, dbmfp->mutexp); if (dbmfp->pinref == 0) __db_err(dbmp->dbenv, "%s: put: more blocks returned than retrieved", dbmfp->path); else --dbmfp->pinref; - UNLOCKHANDLE(dbmp, &dbmfp->mutex); + UNLOCKHANDLE(dbmp, dbmfp->mutexp); /* * If we're mapping the file, there's nothing to do. Because we can diff --git a/db2/mp/mp_fset.c b/db2/mp/mp_fset.c index 588085a358..a3a3dcef9c 100644 --- a/db2/mp/mp_fset.c +++ b/db2/mp/mp_fset.c @@ -7,7 +7,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)mp_fset.c 10.8 (Sleepycat) 8/19/97"; +static const char sccsid[] = "@(#)mp_fset.c 10.9 (Sleepycat) 9/20/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -30,7 +30,7 @@ int memp_fset(dbmfp, pgaddr, flags) DB_MPOOLFILE *dbmfp; void *pgaddr; - u_long flags; + int flags; { BH *bhp; DB_MPOOL *dbmp; diff --git a/db2/mp/mp_open.c b/db2/mp/mp_open.c index 257ce1b9e9..f622b1ed26 100644 --- a/db2/mp/mp_open.c +++ b/db2/mp/mp_open.c @@ -7,7 +7,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)mp_open.c 10.12 (Sleepycat) 7/6/97"; +static const char sccsid[] = "@(#)mp_open.c 10.13 (Sleepycat) 9/23/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -56,7 +56,6 @@ memp_open(path, flags, mode, dbenv, retp) /* Create and initialize the DB_MPOOL structure. */ if ((dbmp = (DB_MPOOL *)calloc(1, sizeof(DB_MPOOL))) == NULL) return (ENOMEM); - LOCKINIT(dbmp, &dbmp->mutex); LIST_INIT(&dbmp->dbregq); TAILQ_INIT(&dbmp->dbmfq); @@ -68,6 +67,17 @@ memp_open(path, flags, mode, dbenv, retp) F_SET(dbmp, MP_ISPRIVATE); /* + * XXX + * HP-UX won't permit mutexes to live in anything but shared memory. + * So, we have to instantiate the shared mpool region file on that + * architecture, regardless. If this turns out to be a performance + * problem, we could probably use anonymous memory instead. + */ +#if defined(__hppa) + F_CLR(dbmp, MP_ISPRIVATE); +#endif + + /* * Map in the region. We do locking regardless, as portions of it are * implemented in common code (if we put the region in a file, that is). */ @@ -79,12 +89,22 @@ memp_open(path, flags, mode, dbenv, retp) /* * If there's concurrent access, then we have to lock the region. * If it's threaded, then we have to lock both the handles and the - * region. + * region, and we need to allocate a mutex for that purpose. */ if (!F_ISSET(dbmp, MP_ISPRIVATE)) F_SET(dbmp, MP_LOCKREGION); - if (LF_ISSET(DB_THREAD)) + if (LF_ISSET(DB_THREAD)) { F_SET(dbmp, MP_LOCKHANDLE | MP_LOCKREGION); + LOCKREGION(dbmp); + ret = __memp_ralloc(dbmp, + sizeof(db_mutex_t), NULL, &dbmp->mutexp); + UNLOCKREGION(dbmp); + if (ret != 0) { + (void)memp_close(dbmp); + goto err; + } + LOCKINIT(dbmp, dbmp->mutexp); + } *retp = dbmp; return (0); @@ -119,11 +139,18 @@ memp_close(dbmp) if ((t_ret = memp_fclose(dbmfp)) != 0 && ret == 0) ret = t_ret; + /* Discard thread mutex. */ + if (F_ISSET(dbmp, MP_LOCKHANDLE)) { + LOCKREGION(dbmp); + __db_shalloc_free(dbmp->addr, dbmp->mutexp); + UNLOCKREGION(dbmp); + } + /* Close the region. */ if ((t_ret = __memp_rclose(dbmp)) && ret == 0) ret = t_ret; - /* Free the structure. */ + /* Discard the structure. */ FREE(dbmp, sizeof(DB_MPOOL)); return (ret); @@ -168,9 +195,9 @@ memp_register(dbmp, ftype, pgin, pgout) * the most recent registry in the case of multiple entries, so * we don't have to check for multiple registries. */ - LOCKHANDLE(dbmp, &dbmp->mutex); + LOCKHANDLE(dbmp, dbmp->mutexp); LIST_INSERT_HEAD(&dbmp->dbregq, mpr, q); - UNLOCKHANDLE(dbmp, &dbmp->mutex); + UNLOCKHANDLE(dbmp, dbmp->mutexp); return (0); } |