ITS#3950 delete gratuitous yield()s

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index bb9cd4cb2e4874053e050e0beebfd07211a2348e..ef2c6dfc296a6f2c20ae0cffbc71386a37fe7516 100644 (file)
--- 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 a8d144b6312dd27544e9b22800fcab57249984ee..3c5e7e9ba5e0e340e3d340faa48f72e1f2ae213a 100644 (file)
--- 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 29cb7ba9e80c0eb97e42832a693a87f0c28adc4b..317a1797d10ed85ab4897658b76f7fa932e28a6c 100644 (file)
--- 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 36a60812730fa8e96a5bb836a5a74c3eecb85f17..21d06d728b5eb63ef509ae6af9133744161f9309 100644 (file)
--- 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 aa75b5f207b99b38a2894b3942f965e6498a778f..ad23046d62a60fa89f7fd59b1f5418051f1a6ceb 100644 (file)
--- 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 e1e5be58400909ee1c43b634b9595ac51654a007..59f81ff9207b5035d1d8cdebfd2edad00309a651 100644 (file)
--- 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: