upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-29 02:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More ITS#6104: mutex-protected check of o_cancel value from other thread

Browse source
This commit is contained in:
Hallvard Furuseth 2009-06-05 23:26:09 +00:00
parent f2a9d8b9ab
commit 41fa4f03b6
2 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servers/slapd/cancel.c
View file

@ -134,9 +134,16 @@ int cancel_extop( Operation *op, SlapReply *rs )
}
}
while ( (rc = o->o_cancel) == SLAP_CANCEL_REQ ) {
ldap_pvt_thread_yield();
}
do {
/* Fake a cond_wait with thread_yield, then
* verify the result properly mutex-protected.
*/
while ( o->o_cancel == SLAP_CANCEL_REQ )
ldap_pvt_thread_yield();
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
rc = o->o_cancel;
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
} while ( rc == SLAP_CANCEL_REQ );
if ( rc == SLAP_CANCEL_ACK ) {
rc = LDAP_SUCCESS;

37
servers/slapd/connection.c
View file

@ -1021,7 +1021,7 @@ conn_counter_init( Operation *op, void *ctx )
static void *
connection_operation( void *ctx, void *arg_v )
{
int rc = LDAP_OTHER;
int rc = LDAP_OTHER, cancel;
Operation *op = arg_v;
SlapReply rs = {REP_RESULT};
ber_tag_t tag = op->o_tag;
@ -1125,22 +1125,29 @@ operations_error:
INCR_OP_COMPLETED( opidx );
}
if ( op->o_cancel == SLAP_CANCEL_REQ ) {
if ( rc == SLAPD_ABANDON ) {
op->o_cancel = SLAP_CANCEL_ACK;
} else {
op->o_cancel = LDAP_TOO_LATE;
}
}
while ( op->o_cancel != SLAP_CANCEL_NONE &&
op->o_cancel != SLAP_CANCEL_DONE )
{
ldap_pvt_thread_yield();
}
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
cancel = op->o_cancel;
if ( cancel != SLAP_CANCEL_NONE && cancel != SLAP_CANCEL_DONE ) {
if ( cancel == SLAP_CANCEL_REQ ) {
op->o_cancel = rc == SLAPD_ABANDON
? SLAP_CANCEL_ACK : LDAP_TOO_LATE;
}
do {
/* Fake a cond_wait with thread_yield, then
* verify the result properly mutex-protected.
*/
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
do {
ldap_pvt_thread_yield();
} while ( (cancel = op->o_cancel) != SLAP_CANCEL_NONE
&& cancel != SLAP_CANCEL_DONE );
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
} while ( (cancel = op->o_cancel) != SLAP_CANCEL_NONE
&& cancel != SLAP_CANCEL_DONE );
}
ber_set_option( op->o_ber, LBER_OPT_BER_MEMCTX, &memctx_null );
LDAP_STAILQ_REMOVE( &conn->c_ops, op, Operation, o_next);