Attachment 147925 Details for Bug 228334 – diffs

[patch] diffs

bug228334.diffs (text/plain), 7.45 KB, created by Rich Megginson on 2007-02-12 19:12:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-02-12 19:12:08 UTC

Size: 7.45 KB

patch

obsolete

>Index: ldapserver/ldap/servers/plugins/replication/cl5_api.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v
>retrieving revision 1.12
>diff -u -8 -r1.12 cl5_api.c
>--- ldapserver/ldap/servers/plugins/replication/cl5_api.c	15 Nov 2006 17:47:58 -0000	1.12
>+++ ldapserver/ldap/servers/plugins/replication/cl5_api.c	12 Feb 2007 19:10:30 -0000
>@@ -107,33 +107,38 @@
> #else /* older then db 41 */
> #define DEFAULT_DB_OP_FLAGS 0
> #define DB_OPEN(oflags, db, txnid, file, database, type, flags, mode, rval)    \
> 	(rval) = (db)->open((db), (file), (database), (type), (flags), (mode))
> #endif
> 
> #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4000
> #define DB_ENV_SET_REGION_INIT(env) (env)->set_flags((env), DB_REGION_INIT, 1)
>-#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
>-	(env)->set_tas_spins((env), (tas_spins))
> #define TXN_BEGIN(env, parent_txn, tid, flags) \
>     (env)->txn_begin((env), (parent_txn), (tid), (flags))
> #define TXN_COMMIT(txn, flags) (txn)->commit((txn), (flags))
> #define TXN_ABORT(txn) (txn)->abort(txn)
> #define TXN_CHECKPOINT(env, kbyte, min, flags) \
>     (env)->txn_checkpoint((env), (kbyte), (min), (flags))
> #define MEMP_STAT(env, gsp, fsp, flags, malloc) \
> 	(env)->memp_stat((env), (gsp), (fsp), (flags))
> #define MEMP_TRICKLE(env, pct, nwrotep) \
>     (env)->memp_trickle((env), (pct), (nwrotep))
> #define LOG_ARCHIVE(env, listp, flags, malloc) \
>     (env)->log_archive((env), (listp), (flags))
> #define LOG_FLUSH(env, lsn) (env)->log_flush((env), (lsn))
> #define LOCK_DETECT(env, flags, atype, aborted) \
> 	(env)->lock_detect((env), (flags), (atype), (aborted))
>+#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
>+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
>+    (env)->mutex_set_tas_spins((env), (tas_spins))
>+#else /* < 4.4 */
>+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
>+    (env)->set_tas_spins((env), (tas_spins))
>+#endif /* 4.4 or later */
> 
> #else	/* older than db 4.0 */
> #define DB_ENV_SET_REGION_INIT(env) db_env_set_region_init(1)
> #define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
> 	db_env_set_tas_spins((tas_spins))
> #define TXN_BEGIN(env, parent_txn, tid, flags) \
>     txn_begin((env), (parent_txn), (tid), (flags))
> #define TXN_COMMIT(txn, flags) txn_commit((txn), (flags))
>Index: ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v
>retrieving revision 1.16
>diff -u -8 -r1.16 dblayer.c
>--- ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c	2 Dec 2006 00:14:25 -0000	1.16
>+++ ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c	12 Feb 2007 19:10:35 -0000
>@@ -117,34 +117,38 @@
> #define DB_OPEN(oflags, db, txnid, file, database, type, flags, mode, rval)    \
>     (rval) = (db)->open((db), (file), (database), (type), (flags), (mode))
> #define DB_CHECKPOINT_LOCK(use_lock, lock) if(use_lock) PR_RWLock_Wlock(lock);
> #define DB_CHECKPOINT_UNLOCK(use_lock, lock) if(use_lock) PR_RWLock_Unlock(lock);
> #endif
> 
> #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4000
> #define DB_ENV_SET_REGION_INIT(env) (env)->set_flags((env), DB_REGION_INIT, 1)
>-#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
>-    (env)->set_tas_spins((env), (tas_spins))
> #define TXN_BEGIN(env, parent_txn, tid, flags) \
>     (env)->txn_begin((env), (parent_txn), (tid), (flags))
> #define TXN_COMMIT(txn, flags) (txn)->commit((txn), (flags))
> #define TXN_ABORT(txn) (txn)->abort(txn)
> #define TXN_CHECKPOINT(env, kbyte, min, flags) \
>     (env)->txn_checkpoint((env), (kbyte), (min), (flags))
> #define MEMP_STAT(env, gsp, fsp, flags, malloc) \
>     (env)->memp_stat((env), (gsp), (fsp), (flags))
> #define MEMP_TRICKLE(env, pct, nwrotep) \
>     (env)->memp_trickle((env), (pct), (nwrotep))
> #define LOG_ARCHIVE(env, listp, flags, malloc) \
>     (env)->log_archive((env), (listp), (flags))
> #define LOG_FLUSH(env, lsn) (env)->log_flush((env), (lsn))
> #define LOCK_DETECT(env, flags, atype, aborted) \
>     (env)->lock_detect((env), (flags), (atype), (aborted))
>-
>+#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
>+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
>+    (env)->mutex_set_tas_spins((env), (tas_spins))
>+#else /* < 4.4 */
>+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
>+    (env)->set_tas_spins((env), (tas_spins))
>+#endif /* 4.4 or later */
> #else    /* older than db 4.0 */
> #define DB_ENV_SET_REGION_INIT(env) db_env_set_region_init(1)
> #define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
>     db_env_set_tas_spins((tas_spins))
> #define TXN_BEGIN(env, parent_txn, tid, flags) \
>     txn_begin((env), (parent_txn), (tid), (flags))
> #define TXN_COMMIT(txn, flags) txn_commit((txn), (flags))
> #define TXN_ABORT(txn) txn_abort((txn))
>Index: ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.c,v
>retrieving revision 1.5
>diff -u -8 -r1.5 perfctrs.c
>--- ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.c	10 Nov 2006 23:45:39 -0000	1.5
>+++ ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.c	12 Feb 2007 19:10:35 -0000
>@@ -48,30 +48,36 @@
> #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4000
> #define TXN_STAT(env, statp, flags, malloc) \
> 	(env)->txn_stat((env), (statp), (flags))
> #define MEMP_STAT(env, gsp, fsp, flags, malloc) \
> 	(env)->memp_stat((env), (gsp), (fsp), (flags))
> #define LOG_STAT(env, spp, flags, malloc) (env)->log_stat((env), (spp), (flags))
> #define LOCK_STAT(env, statp, flags, malloc) \
> 	(env)->lock_stat((env), (statp), (flags))
>+#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
>+#define GET_N_LOCK_WAITS(lockstat)   lockstat->st_lock_wait
>+#else
>+#define GET_N_LOCK_WAITS(lockstat)   lockstat->st_nconflicts
>+#endif
> 
> #else	/* older than db 4.0 */
> #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 3300
> #define TXN_STAT(env, statp, flags, malloc) txn_stat((env), (statp))
> #define MEMP_STAT(env, gsp, fsp, flags, malloc) memp_stat((env), (gsp), (fsp))
> #define LOG_STAT(env, spp, flags, malloc) log_stat((env), (spp))
> #define LOCK_STAT(env, statp, flags, malloc) lock_stat((env), (statp))
>-
>+#define GET_N_LOCK_WAITS(lockstat)   lockstat->st_nconflicts
> #else	/* older than db 3.3 */
> #define TXN_STAT(env, statp, flags, malloc) txn_stat((env), (statp), (malloc))
> #define MEMP_STAT(env, gsp, fsp, flags, malloc) 
> 	memp_stat((env), (gsp), (fsp), (malloc))
> #define LOG_STAT(env, spp, flags, malloc) log_stat((env), (spp), (malloc))
> #define LOCK_STAT(env, statp, flags, malloc) lock_stat((env), (statp), (malloc))
>+#define GET_N_LOCK_WAITS(lockstat)   lockstat->st_nconflicts
> #endif
> #endif
> 
> static void perfctrs_update(perfctrs_private *priv, DB_ENV *db_env);
> static void perfctr_add_to_entry( Slapi_Entry *e, char *type,
> 	PRUint32 countervalue );
> 
> /*
>@@ -307,17 +313,17 @@
> 		ret = LOCK_STAT(db_env,&lockstat,0,malloc);
> 		if (0 == ret) {
> 			perf->lock_region_wait_rate = lockstat->st_region_wait;	
> 			perf->deadlock_rate = lockstat->st_ndeadlocks;
> 			perf->configured_locks = lockstat->st_maxlocks;
> 			perf->current_locks = lockstat->st_nlocks;
> 			perf->max_locks = lockstat->st_maxnlocks;
> 			perf->lockers = lockstat->st_nlockers;
>-			perf->lock_conflicts = lockstat->st_nconflicts;
>+			perf->lock_conflicts = GET_N_LOCK_WAITS(lockstat);
> 			perf->lock_request_rate = lockstat->st_nrequests;			
> 			perf->current_lock_objects = lockstat->st_nobjects;
> 			perf->max_lock_objects = lockstat->st_maxnobjects;
> 		}
> 		free(lockstat);
> 	}
> 	if (NULL != db_env->mp_handle)
> 	{

Actions: View | Diff

Attachments on bug 228334: 147925