From a4a85e03c1e30fd4edd76467e3607b6e4fd1e388 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sun, 15 Jan 2006 13:33:29 +0000 Subject: [PATCH] ITS#3950 delete gratuitous yield()s --- servers/slapd/back-bdb/add.c | 2 -- servers/slapd/back-bdb/delete.c | 2 -- servers/slapd/back-bdb/modify.c | 2 -- servers/slapd/back-bdb/modrdn.c | 2 -- servers/slapd/back-bdb/operational.c | 1 - servers/slapd/back-bdb/search.c | 2 -- 6 files changed, 11 deletions(-) diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c index bb9cd4cb2e..ef2c6dfc29 100644 --- a/servers/slapd/back-bdb/add.c +++ b/servers/slapd/back-bdb/add.c @@ -99,7 +99,6 @@ retry: /* transaction retry */ rs->sr_err = SLAPD_ABANDON; goto return_results; } - ldap_pvt_thread_yield(); bdb_trans_backoff( ++num_retries ); } @@ -425,7 +424,6 @@ return_results: } if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) { - ldap_pvt_thread_yield(); TXN_CHECKPOINT( bdb->bi_dbenv, bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 ); } diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c index a8d144b631..3c5e7e9ba5 100644 --- a/servers/slapd/back-bdb/delete.c +++ b/servers/slapd/back-bdb/delete.c @@ -95,7 +95,6 @@ retry: /* transaction retry */ } parent_is_glue = 0; parent_is_leaf = 0; - ldap_pvt_thread_yield(); bdb_trans_backoff( ++num_retries ); } @@ -537,7 +536,6 @@ return_results: } if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) { - ldap_pvt_thread_yield(); TXN_CHECKPOINT( bdb->bi_dbenv, bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 ); } diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c index 29cb7ba9e8..317a1797d1 100644 --- a/servers/slapd/back-bdb/modify.c +++ b/servers/slapd/back-bdb/modify.c @@ -327,7 +327,6 @@ retry: /* transaction retry */ rs->sr_err = SLAPD_ABANDON; goto return_results; } - ldap_pvt_thread_yield(); bdb_trans_backoff( ++num_retries ); } @@ -595,7 +594,6 @@ return_results: slap_graduate_commit_csn( op ); if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) { - ldap_pvt_thread_yield(); TXN_CHECKPOINT( bdb->bi_dbenv, bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 ); } diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c index 36a6081273..21d06d728b 100644 --- a/servers/slapd/back-bdb/modrdn.c +++ b/servers/slapd/back-bdb/modrdn.c @@ -106,7 +106,6 @@ retry: /* transaction retry */ } parent_is_glue = 0; parent_is_leaf = 0; - ldap_pvt_thread_yield(); bdb_trans_backoff( ++num_retries ); } @@ -736,7 +735,6 @@ return_results: send_ldap_result( op, rs ); if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) { - ldap_pvt_thread_yield(); TXN_CHECKPOINT( bdb->bi_dbenv, bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 ); } diff --git a/servers/slapd/back-bdb/operational.c b/servers/slapd/back-bdb/operational.c index aa75b5f207..ad23046d62 100644 --- a/servers/slapd/back-bdb/operational.c +++ b/servers/slapd/back-bdb/operational.c @@ -56,7 +56,6 @@ retry: switch( rc ) { case DB_LOCK_DEADLOCK: case DB_LOCK_NOTGRANTED: - ldap_pvt_thread_yield(); goto retry; case 0: diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c index e1e5be5840..59f81ff920 100644 --- a/servers/slapd/back-bdb/search.c +++ b/servers/slapd/back-bdb/search.c @@ -921,8 +921,6 @@ loop_continue: e = NULL; rs->sr_entry = NULL; } - - ldap_pvt_thread_yield(); } nochange: -- 2.39.5