diff options
| -rw-r--r-- | rpmdb/db3.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/rpmdb/db3.c b/rpmdb/db3.c index 6f0ef2efe..e58aabcde 100644 --- a/rpmdb/db3.c +++ b/rpmdb/db3.c @@ -249,6 +249,26 @@ static int db3_pthread_nptl(void) #endif #endif +/* + * dbenv->failchk() callback method for determining is the given pid/tid + * is alive. We only care about pid's though. + */ +static int db3isalive(DB_ENV *dbenv, pid_t pid, db_threadid_t tid, u_int32_t flags) +{ + int alive = 0; + + if (pid == getpid()) { + alive = 1; + } else if (kill(pid, 0) == 0) { + alive = 1; + /* only existing processes can fail with EPERM */ + } else if (errno == EPERM) { + alive = 1; + } + + return alive; +} + static int db_init(dbiIndex dbi, const char * dbhome, const char * dbfile, const char * dbsubfile, @@ -307,6 +327,15 @@ static int db_init(dbiIndex dbi, const char * dbhome, /* dbenv->set_paniccall(???) */ +#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 5) + /* + * These enable automatic stale lock removal. + * thread_count 8 is some kind of "magic minimum" value... + */ + dbenv->set_thread_count(dbenv, 8); + dbenv->set_isalive(dbenv, db3isalive); +#endif + if ((dbi->dbi_ecflags & DB_CLIENT) && dbi->dbi_host) { const char * home; int retry = 0; @@ -407,6 +436,11 @@ static int db_init(dbiIndex dbi, const char * dbhome, if (rc) goto errxit; +#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 5) + /* stale lock removal */ + rc = dbenv->failchk(dbenv, 0); +#endif + *dbenvp = dbenv; return 0; |