rpms/fedora-ds-base/devel bug463991-bdb47.patch, 1.2, 1.3 fedora-ds-base.spec, 1.22, 1.23
Richard Allen Megginson
rmeggins at fedoraproject.org
Thu Oct 9 17:22:34 UTC 2008
Author: rmeggins
Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8884
Modified Files:
bug463991-bdb47.patch fedora-ds-base.spec
Log Message:
refix bug463991-bdb47.patch
bug463991-bdb47.patch:
Index: bug463991-bdb47.patch
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/bug463991-bdb47.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bug463991-bdb47.patch 9 Oct 2008 16:07:34 -0000 1.2
+++ bug463991-bdb47.patch 9 Oct 2008 17:22:03 -0000 1.3
@@ -1,6 +1,95 @@
---- ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c 8 Oct 2008 17:29:03 -0000 1.28
-+++ ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c 9 Oct 2008 15:29:33 -0000
-@@ -272,16 +272,41 @@
+--- ldap/servers/slapd/back-ldbm/perfctrs.c 26 Sep 2007 17:32:41 -0000 1.9
++++ ldap/servers/slapd/back-ldbm/perfctrs.c 9 Oct 2008 16:58:26 -0000
+@@ -291,41 +291,41 @@
+ if (NULL == db_env) {
+ return;
+ }
+ perf = (performance_counters*)priv->memory;
+ if (NULL == perf) {
+ return;
+ }
+ /* Call libdb to get the various stats */
+- if (NULL != db_env->lg_handle)
++ if (dblayer_db_uses_logging(db_env))
+ {
+ DB_LOG_STAT *logstat = NULL;
+ ret = LOG_STAT(db_env,&logstat,0,malloc);
+ if (0 == ret) {
+ perf->log_region_wait_rate = logstat->st_region_wait;
+ perf->log_write_rate = 1024*1024*logstat->st_w_mbytes + logstat->st_w_bytes;
+ perf->log_bytes_since_checkpoint = 1024*1024*logstat->st_wc_mbytes + logstat->st_wc_bytes;
+ }
+ free(logstat);
+ }
+- if (NULL != db_env->tx_handle)
++ if (dblayer_db_uses_transactions(db_env))
+ {
+ DB_TXN_STAT *txnstat = NULL;
+ ret = TXN_STAT(db_env, &txnstat, 0, malloc);
+ if (0 == ret) {
+ perf->active_txns = txnstat->st_nactive;
+ perf->commit_rate = txnstat->st_ncommits;
+ perf->abort_rate = txnstat->st_naborts;
+ perf->txn_region_wait_rate = txnstat->st_region_wait;
+ }
+ if (txnstat)
+ free(txnstat);
+ }
+- if (NULL != db_env->lk_handle)
++ if (dblayer_db_uses_locking(db_env))
+ {
+ DB_LOCK_STAT *lockstat = NULL;
+ 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;
+@@ -333,17 +333,17 @@
+ perf->lockers = lockstat->st_nlockers;
+ 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)
++ if (dblayer_db_uses_mpool(db_env))
+ {
+ DB_MPOOL_STAT *mpstat = NULL;
+ ret = MEMP_STAT(db_env,&mpstat,NULL,0,malloc);
+ if (0 == ret) {
+ #define ONEG 1073741824
+ perf->cache_size_bytes = mpstat->st_gbytes * ONEG + mpstat->st_bytes;
+ perf->page_access_rate = mpstat->st_cache_hit + mpstat->st_cache_miss;
+ perf->cache_hit = mpstat->st_cache_hit;
+--- ldap/servers/slapd/back-ldbm/proto-back-ldbm.h 2 Oct 2007 18:39:51 -0000 1.14
++++ ldap/servers/slapd/back-ldbm/proto-back-ldbm.h 9 Oct 2008 16:58:26 -0000
+@@ -161,16 +161,20 @@
+ int dblayer_update_db_ext(ldbm_instance *inst, char *oldext, char *newext);
+ void dblayer_set_recovery_required(struct ldbminfo *li);
+
+ char *dblayer_get_home_dir(struct ldbminfo *li, int *dbhome);
+ char *dblayer_get_full_inst_dir(struct ldbminfo *li, ldbm_instance *inst,
+ char *buf, int buflen);
+ void autosize_import_cache(struct ldbminfo *li);
+
++int dblayer_db_uses_locking(DB_ENV *db_env);
++int dblayer_db_uses_transactions(DB_ENV *db_env);
++int dblayer_db_uses_mpool(DB_ENV *db_env);
++int dblayer_db_uses_logging(DB_ENV *db_env);
+
+ /*
+ * dn2entry.c
+ */
+ struct backentry *dn2entry(Slapi_Backend *be, const Slapi_DN *sdn, back_txn *txn, int *err);
+ struct backentry *dn2entry_or_ancestor(Slapi_Backend *be, const Slapi_DN *sdn, Slapi_DN *ancestor, back_txn *txn, int *err);
+ struct backentry *dn2ancestor(Slapi_Backend *be,const Slapi_DN *sdn,Slapi_DN *ancestordn,back_txn *txn,int *err);
+ int get_copy_of_entry(Slapi_PBlock *pb, const entry_address *addr, back_txn *txn, int plock_parameter, int must_exist);
+--- ldap/servers/slapd/back-ldbm/dblayer.c 2008-04-03 10:52:47.000000000 -0600
++++ ldap/servers/slapd/back-ldbm/dblayer.c.new 2008-10-09 11:07:52.000000000 -0600
+@@ -265,16 +265,41 @@
bv1.bv_len = (ber_len_t)dbt1->size;
bv2.bv_val = (char *)dbt2->data;
@@ -42,7 +131,7 @@
1. value = 0 turns batching off
2. value = 1 makes behavior be like 5.0 but leaves batching on
3. value > 1 changes batch value
-@@ -3451,17 +3476,17 @@
+@@ -3444,17 +3469,17 @@
INCR_THREAD_COUNT(priv);
@@ -51,7 +140,7 @@
{
if (priv->dblayer_enable_transactions)
{
-- if (DB_USES_LOCKING(priv->dblayer_env->dblayer_DB_ENV)) {
+- if (NULL != priv->dblayer_env->dblayer_DB_ENV->lk_handle) {
+ if (dblayer_db_uses_locking(priv->dblayer_env->dblayer_DB_ENV)) {
int aborted;
if ((rval = LOCK_DETECT(priv->dblayer_env->dblayer_DB_ENV,
@@ -61,7 +150,7 @@
!= 0) {
LDAPDebug(LDAP_DEBUG_ANY,
"Serious Error---Failed in deadlock detect (aborted at 0x%x), err=%d (%s)\n",
-@@ -3621,17 +3646,17 @@
+@@ -3614,17 +3639,17 @@
checkpoint_interval = priv->dblayer_checkpoint_interval;
PR_Unlock(li->li_config_mutex);
@@ -70,7 +159,7 @@
checkpoint_interval)
continue;
-- if (!DB_USES_TRANSACTIONS(priv->dblayer_env->dblayer_DB_ENV))
+- if (NULL == priv->dblayer_env->dblayer_DB_ENV->tx_handle)
+ if (!dblayer_db_uses_transactions(priv->dblayer_env->dblayer_DB_ENV))
continue;
@@ -80,7 +169,7 @@
rval = dblayer_txn_checkpoint(li, priv->dblayer_env, PR_TRUE, PR_TRUE);
#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR < 4100
if (DB_INCOMPLETE == rval)
-@@ -3779,17 +3804,17 @@
+@@ -3772,17 +3797,17 @@
interval = PR_MillisecondsToInterval(DBLAYER_SLEEP_INTERVAL);
debug_checkpointing = priv->db_debug_checkpointing;
@@ -89,7 +178,7 @@
DS_Sleep(interval); /* 622855: wait for other threads fully started */
if (priv->dblayer_enable_transactions)
{
-- if ( DB_USES_MPOOL(priv->dblayer_env->dblayer_DB_ENV) &&
+- if ( (NULL != priv->dblayer_env->dblayer_DB_ENV->mp_handle) &&
+ if ( dblayer_db_uses_mpool(priv->dblayer_env->dblayer_DB_ENV) &&
(0 != priv->dblayer_trickle_percentage) )
{
@@ -99,92 +188,3 @@
priv->dblayer_trickle_percentage,
&pages_written)) != 0)
{
---- ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.c 8 Oct 2008 17:29:04 -0000 1.10
-+++ ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.c 9 Oct 2008 15:29:33 -0000
-@@ -291,41 +291,41 @@
- if (NULL == db_env) {
- return;
- }
- perf = (performance_counters*)priv->memory;
- if (NULL == perf) {
- return;
- }
- /* Call libdb to get the various stats */
-- if (DB_USES_LOGGING(db_env))
-+ if (dblayer_db_uses_logging(db_env))
- {
- DB_LOG_STAT *logstat = NULL;
- ret = LOG_STAT(db_env,&logstat,0,malloc);
- if (0 == ret) {
- perf->log_region_wait_rate = logstat->st_region_wait;
- perf->log_write_rate = 1024*1024*logstat->st_w_mbytes + logstat->st_w_bytes;
- perf->log_bytes_since_checkpoint = 1024*1024*logstat->st_wc_mbytes + logstat->st_wc_bytes;
- }
- free(logstat);
- }
-- if (DB_USES_TRANSACTIONS(db_env))
-+ if (dblayer_db_uses_transactions(db_env))
- {
- DB_TXN_STAT *txnstat = NULL;
- ret = TXN_STAT(db_env, &txnstat, 0, malloc);
- if (0 == ret) {
- perf->active_txns = txnstat->st_nactive;
- perf->commit_rate = txnstat->st_ncommits;
- perf->abort_rate = txnstat->st_naborts;
- perf->txn_region_wait_rate = txnstat->st_region_wait;
- }
- if (txnstat)
- free(txnstat);
- }
-- if (DB_USES_LOCKING(db_env))
-+ if (dblayer_db_uses_locking(db_env))
- {
- DB_LOCK_STAT *lockstat = NULL;
- 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;
-@@ -333,17 +333,17 @@
- perf->lockers = lockstat->st_nlockers;
- 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 (DB_USES_MPOOL(db_env))
-+ if (dblayer_db_uses_mpool(db_env))
- {
- DB_MPOOL_STAT *mpstat = NULL;
- ret = MEMP_STAT(db_env,&mpstat,NULL,0,malloc);
- if (0 == ret) {
- #define ONEG 1073741824
- perf->cache_size_bytes = mpstat->st_gbytes * ONEG + mpstat->st_bytes;
- perf->page_access_rate = mpstat->st_cache_hit + mpstat->st_cache_miss;
- perf->cache_hit = mpstat->st_cache_hit;
---- ldapserver/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h 2 Oct 2007 18:39:51 -0000 1.14
-+++ ldapserver/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h 9 Oct 2008 15:29:34 -0000
-@@ -161,16 +161,20 @@
- int dblayer_update_db_ext(ldbm_instance *inst, char *oldext, char *newext);
- void dblayer_set_recovery_required(struct ldbminfo *li);
-
- char *dblayer_get_home_dir(struct ldbminfo *li, int *dbhome);
- char *dblayer_get_full_inst_dir(struct ldbminfo *li, ldbm_instance *inst,
- char *buf, int buflen);
- void autosize_import_cache(struct ldbminfo *li);
-
-+int dblayer_db_uses_locking(DB_ENV *db_env);
-+int dblayer_db_uses_transactions(DB_ENV *db_env);
-+int dblayer_db_uses_mpool(DB_ENV *db_env);
-+int dblayer_db_uses_logging(DB_ENV *db_env);
-
- /*
- * dn2entry.c
- */
- struct backentry *dn2entry(Slapi_Backend *be, const Slapi_DN *sdn, back_txn *txn, int *err);
- struct backentry *dn2entry_or_ancestor(Slapi_Backend *be, const Slapi_DN *sdn, Slapi_DN *ancestor, back_txn *txn, int *err);
- struct backentry *dn2ancestor(Slapi_Backend *be,const Slapi_DN *sdn,Slapi_DN *ancestordn,back_txn *txn,int *err);
- int get_copy_of_entry(Slapi_PBlock *pb, const entry_address *addr, back_txn *txn, int plock_parameter, int must_exist);
Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fedora-ds-base.spec 9 Oct 2008 16:07:34 -0000 1.22
+++ fedora-ds-base.spec 9 Oct 2008 17:22:03 -0000 1.23
@@ -5,7 +5,7 @@
Summary: Fedora Directory Server (base)
Name: fedora-ds-base
Version: 1.1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2 with exceptions
URL: http://directory.fedoraproject.org/
Group: System Environment/Daemons
@@ -158,6 +158,9 @@
%{_libdir}/%{pkgname}/*.so
%changelog
+* Thu Oct 9 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-5
+- updated update to patch bug463991-bdb47.patch
+
* Thu Oct 9 2008 Rich Megginson <rmeggins at redhat.com> - 1.1.3-4
- updated patch bug463991-bdb47.patch
More information about the fedora-extras-commits
mailing list