diff options
Diffstat (limited to 'bdb/log/log_method.c')
| -rw-r--r-- | bdb/log/log_method.c | 113 |
1 files changed, 90 insertions, 23 deletions
diff --git a/bdb/log/log_method.c b/bdb/log/log_method.c index 883f485d891..42adaf11c6c 100644 --- a/bdb/log/log_method.c +++ b/bdb/log/log_method.c @@ -1,38 +1,39 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1999, 2000 + * Copyright (c) 1999-2002 * Sleepycat Software. All rights reserved. */ #include "db_config.h" #ifndef lint -static const char revid[] = "$Id: log_method.c,v 11.14 2000/11/30 00:58:40 ubell Exp $"; +static const char revid[] = "$Id: log_method.c,v 11.32 2002/05/30 22:16:47 bostic Exp $"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES #include <sys/types.h> +#ifdef HAVE_RPC +#include <rpc/rpc.h> +#endif + #include <stdlib.h> #include <string.h> #include <unistd.h> #endif -#ifdef HAVE_RPC -#include "db_server.h" -#endif - #include "db_int.h" -#include "log.h" +#include "dbinc/log.h" #ifdef HAVE_RPC -#include "gen_client_ext.h" -#include "rpc_client_ext.h" +#include "dbinc_auto/db_server.h" +#include "dbinc_auto/rpc_client_ext.h" #endif -static int __log_set_lg_max __P((DB_ENV *, u_int32_t)); static int __log_set_lg_bsize __P((DB_ENV *, u_int32_t)); static int __log_set_lg_dir __P((DB_ENV *, const char *)); +static int __log_set_lg_max __P((DB_ENV *, u_int32_t)); +static int __log_set_lg_regionmax __P((DB_ENV *, u_int32_t)); /* * __log_dbenv_create -- @@ -44,13 +45,16 @@ void __log_dbenv_create(dbenv) DB_ENV *dbenv; { - dbenv->lg_bsize = LG_BSIZE_DEFAULT; - dbenv->set_lg_bsize = __log_set_lg_bsize; + /* + * !!! + * Our caller has not yet had the opportunity to reset the panic + * state or turn off mutex locking, and so we can neither check + * the panic state or acquire a mutex in the DB_ENV create path. + */ - dbenv->lg_max = LG_MAX_DEFAULT; - dbenv->set_lg_max = __log_set_lg_max; + dbenv->lg_bsize = LG_BSIZE_DEFAULT; + dbenv->lg_regionmax = LG_BASE_REGION_SIZE; - dbenv->set_lg_dir = __log_set_lg_dir; #ifdef HAVE_RPC /* * If we have a client, overwrite what we just setup to @@ -58,10 +62,29 @@ __log_dbenv_create(dbenv) */ if (F_ISSET(dbenv, DB_ENV_RPCCLIENT)) { dbenv->set_lg_bsize = __dbcl_set_lg_bsize; - dbenv->set_lg_max = __dbcl_set_lg_max; dbenv->set_lg_dir = __dbcl_set_lg_dir; - } + dbenv->set_lg_max = __dbcl_set_lg_max; + dbenv->set_lg_regionmax = __dbcl_set_lg_regionmax; + dbenv->log_archive = __dbcl_log_archive; + dbenv->log_cursor = __dbcl_log_cursor; + dbenv->log_file = __dbcl_log_file; + dbenv->log_flush = __dbcl_log_flush; + dbenv->log_put = __dbcl_log_put; + dbenv->log_stat = __dbcl_log_stat; + } else #endif + { + dbenv->set_lg_bsize = __log_set_lg_bsize; + dbenv->set_lg_dir = __log_set_lg_dir; + dbenv->set_lg_max = __log_set_lg_max; + dbenv->set_lg_regionmax = __log_set_lg_regionmax; + dbenv->log_archive = __log_archive; + dbenv->log_cursor = __log_cursor; + dbenv->log_file = __log_file; + dbenv->log_flush = __log_flush; + dbenv->log_put = __log_put; + dbenv->log_stat = __log_stat; + } } /* @@ -73,10 +96,16 @@ __log_set_lg_bsize(dbenv, lg_bsize) DB_ENV *dbenv; u_int32_t lg_bsize; { + u_int32_t lg_max; + ENV_ILLEGAL_AFTER_OPEN(dbenv, "set_lg_bsize"); + if (lg_bsize == 0) + lg_bsize = LG_BSIZE_DEFAULT; + /* Let's not be silly. */ - if (lg_bsize > dbenv->lg_max / 4) { + lg_max = dbenv->lg_size == 0 ? LG_MAX_DEFAULT : dbenv->lg_size; + if (lg_bsize > lg_max / 4) { __db_err(dbenv, "log buffer size must be <= log file size / 4"); return (EINVAL); } @@ -94,15 +123,53 @@ __log_set_lg_max(dbenv, lg_max) DB_ENV *dbenv; u_int32_t lg_max; { - ENV_ILLEGAL_AFTER_OPEN(dbenv, "set_lg_max"); + LOG *region; + + if (lg_max == 0) + lg_max = LG_MAX_DEFAULT; + + if (F_ISSET(dbenv, DB_ENV_OPEN_CALLED)) { + if (!LOGGING_ON(dbenv)) + return (__db_env_config( + dbenv, "set_lg_max", DB_INIT_LOG)); + region = ((DB_LOG *)dbenv->lg_handle)->reginfo.primary; + + /* Let's not be silly. */ + if (lg_max < region->buffer_size * 4) + goto err; + region->log_nsize = lg_max; + } else { + /* Let's not be silly. */ + if (lg_max < dbenv->lg_bsize * 4) + goto err; + dbenv->lg_size = lg_max; + } + + return (0); + +err: __db_err(dbenv, "log file size must be >= log buffer size * 4"); + return (EINVAL); +} + +/* + * __log_set_lg_regionmax -- + * Set the region size. + */ +static int +__log_set_lg_regionmax(dbenv, lg_regionmax) + DB_ENV *dbenv; + u_int32_t lg_regionmax; +{ + ENV_ILLEGAL_AFTER_OPEN(dbenv, "set_lg_regionmax"); /* Let's not be silly. */ - if (lg_max < dbenv->lg_bsize * 4) { - __db_err(dbenv, "log file size must be >= log buffer size * 4"); + if (lg_regionmax != 0 && lg_regionmax < LG_BASE_REGION_SIZE) { + __db_err(dbenv, + "log file size must be >= %d", LG_BASE_REGION_SIZE); return (EINVAL); } - dbenv->lg_max = lg_max; + dbenv->lg_regionmax = lg_regionmax; return (0); } @@ -116,6 +183,6 @@ __log_set_lg_dir(dbenv, dir) const char *dir; { if (dbenv->db_log_dir != NULL) - __os_freestr(dbenv->db_log_dir); + __os_free(dbenv, dbenv->db_log_dir); return (__os_strdup(dbenv, dir, &dbenv->db_log_dir)); } |