|
The hardest part of upgrading your application from a 2.X code base to the 3.0 release is translating the Berkeley DB environment open, close and remove calls.
There were two logical changes in this part of the Berkeley DB interface. First, in Berkeley DB 3.0, there are no longer separate structures that represent each subsystem (e.g., DB_LOCKTAB or DB_TXNMGR) and an overall DB_ENV environment structure. Instead there is only the DB_ENV structure. This means that DB_ENV references should be passed around by your application instead of passing around DB_LOCKTAB or DB_TXNMGR references. This is likely to be a simple change for most applications as few applications use the lock_XXX, log_XXX, memp_XXX or txn_XXX interfaces to create Berkeley DB environments.
The second change is that there are no longer separate open, close, and unlink interfaces to the Berkeley DB subsystems, e.g., in previous releases, it was possible to open a lock subsystem either using db_appinit or using the lock_open call. In the 3.0 release the XXX_open interfaces to the subsystems have been removed, and subsystems must now be opened using the 3.0 replacement for the db_appinit call.
To upgrade your application, first find each place your application opens, closes and/or removes a Berkeley DB environment. This will be code of the form:
db_appinit, db_appexit lock_open, lock_close, lock_unlink log_open, log_close, log_unlink memp_open, memp_close, memp_unlink txn_open, txn_close, txn_unlink
Each of these groups of calls should be replaced with calls to:
db_env_create, DBENV->open, DBENV->close, DBENV->remove
The db_env_create call and the call to the DBENV->open method replace the db_appinit, lock_open, log_open, memp_open and txn_open calls. The DBENV->close method replaces the db_appexit, lock_close, log_close, memp_close and txn_close calls. The DBENV->remove call replaces the lock_unlink, log_unlink, memp_unlink and txn_unlink calls.
Here's an example creating a Berkeley DB environment using the 2.X interface:
/* * db_init -- * Initialize the environment. */ DB_ENV * db_init(home) char *home; { DB_ENV *dbenv;if ((dbenv = (DB_ENV *)calloc(sizeof(DB_ENV), 1)) == NULL) return (errno);
if ((errno = db_appinit(home, NULL, dbenv, DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON)) == 0) return (dbenv);
free(dbenv); return (NULL); }
In the Berkeley DB 3.0 release, this code would be written as:
/* * db_init -- * Initialize the environment. */ int db_init(home, dbenvp) char *home; DB_ENV **dbenvp; { int ret; DB_ENV *dbenv;if ((ret = db_env_create(&dbenv, 0)) != 0) return (ret);
if ((ret = dbenv->open(dbenv, home, NULL, DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON, 0)) == 0) { *dbenvp = dbenv; return (0); }
(void)dbenv->close(dbenv, 0); return (ret); }
As you can see, the arguments to db_appinit and to DBENV->open are largely the same. There is some minor re-organization: the mapping is that arguments #1, 2, 3, and 4 to db_appinit become arguments #2, 3, 1 and 4 to DBENV->open. There is one additional argument to DBENV->open, argument #5. For backward compatibility with the 2.X Berkeley DB releases, simply set that argument to 0.
It is only slightly more complex to translate calls to XXX_open to the DBENV->open method. Here's an example of creating a lock region using the 2.X interface:
lock_open(dir, DB_CREATE, 0664, dbenv, ®ionp);
In the Berkeley DB 3.0 release, this code would be written as:
if ((ret = db_env_create(&dbenv, 0)) != 0) return (ret);if ((ret = dbenv->open(dbenv, dir, NULL, DB_CREATE | DB_INIT_LOCK, 0664)) == 0) { *dbenvp = dbenv; return (0); }
Note that in this example, you no longer need the DB_LOCKTAB structure reference that was required in Berkeley DB 2.X releases.
The final issue with upgrading the db_appinit call is the DB_MPOOL_PRIVATE option previously provided for the db_appinit interface. If your application is using this flag, it should almost certainly use the new DB_PRIVATE flag to the DBENV->open interface. Regardless, you should carefully consider this change before converting to use the DB_PRIVATE flag.
Translating db_appexit or XXX_close calls to DBENV->close is equally simple. Instead of taking a reference to a per-subsystem structure such as DB_LOCKTAB or DB_TXNMGR, all calls take a reference to a DB_ENV structure. The calling sequence is otherwise unchanged. Note that as the application no longer allocates the memory for the DB_ENV structure, application code to discard it after the call to db_appexit() is no longer needed.
Translating XXX_unlink calls to DBENV->remove is slightly more complex. As with DBENV->close, the call takes a reference to a DB_ENV structure instead of a per-subsystem structure. The calling sequence is slightly different, however. Here is an example of removing a lock region using the 2.X interface:
DB_ENV *dbenv;ret = lock_unlink(dir, 1, dbenv);
In the Berkeley DB 3.0 release, this code fragment would be written as:
DB_ENV *dbenv;ret = dbenv->remove(dbenv, dir, NULL, DB_FORCE);
The additional argument to the DBENV->remove function is a configuration argument similar to that previously taken by db_appinit and now taken by the DBENV->open method. For backward compatibility this new argument should simply be set to NULL. The force argument to XXX_unlink is now a flag value that is set by bitwise inclusively OR'ing it the DBENV->remove flag argument.