X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcancel.c;h=08115f45eda2bdc5b78fd1664db12c8eb2011e28;hb=5ed0fc37494b835aeeb39bd55ee6d71cedad8143;hp=b1d8023e823feb4fcbd9a1879738bf428cdcb8a0;hpb=3286e13a2c2ce0eece83f8049d96236af574fda4;p=openldap
diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index b1d8023e82..08115f45ed 100644
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,6 @@
#include
-#include
#include
#include
#include
@@ -28,14 +27,14 @@
#include
#include
+const struct berval slap_EXOP_CANCEL = BER_BVC(LDAP_EXOP_CANCEL);
+
int cancel_extop( Operation *op, SlapReply *rs )
{
Operation *o;
int rc;
- int found = 0;
int opid;
BerElement *ber;
- int i;
assert( ber_bvcmp( &slap_EXOP_CANCEL, &op->ore_reqoid ) == 0 );
@@ -62,6 +61,9 @@ int cancel_extop( Operation *op, SlapReply *rs )
return LDAP_PROTOCOL_ERROR;
}
+ Statslog( LDAP_DEBUG_STATS, "%s CANCEL msg=%d\n",
+ op->o_log_prefix, opid, 0, 0, 0 );
+
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
if ( o->o_msgid == opid ) {
@@ -69,61 +71,52 @@ int cancel_extop( Operation *op, SlapReply *rs )
LDAP_STAILQ_NEXT(o, o_next) = NULL;
op->o_conn->c_n_ops_pending--;
slap_op_free( o );
- found = 1;
- break;
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+ return LDAP_SUCCESS;
}
}
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-
- if ( found ) return LDAP_SUCCESS;
- found = 0;
- ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
if ( o->o_msgid == opid ) {
- found = 1;
+ o->o_abandon = 1;
break;
}
}
- if ( !found ) {
- for ( i = 0; i < nbackends; i++ ) {
- op->o_bd = &backends[i];
- if( !op->o_bd->be_cancel ) continue;
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+ if ( o ) {
+ if ( o->o_cancel != SLAP_CANCEL_NONE ) {
+ rs->sr_text = "message ID already being cancelled";
+ return LDAP_PROTOCOL_ERROR;
+ }
+
+ o->o_cancel = SLAP_CANCEL_REQ;
+
+ LDAP_STAILQ_FOREACH( op->o_bd, &backendDB, be_next ) {
+ if( !op->o_bd->be_cancel ) continue;
op->oq_cancel.rs_msgid = opid;
if ( op->o_bd->be_cancel( op, rs ) == LDAP_SUCCESS ) {
return LDAP_SUCCESS;
}
- ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
}
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
- rs->sr_text = "message ID not found";
- return LDAP_NO_SUCH_OPERATION;
- }
-
- if ( op->o_cancel != SLAP_CANCEL_NONE ) {
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
- rs->sr_text = "message ID already being cancelled";
- return LDAP_PROTOCOL_ERROR;
- }
- op->o_cancel = SLAP_CANCEL_REQ;
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+ while ( o->o_cancel == SLAP_CANCEL_REQ ) {
+ ldap_pvt_thread_yield();
+ }
- while ( op->o_cancel == SLAP_CANCEL_REQ ) {
- ldap_pvt_thread_yield();
- }
+ if ( o->o_cancel == SLAP_CANCEL_ACK ) {
+ rc = LDAP_SUCCESS;
+ } else {
+ rc = o->o_cancel;
+ }
- if ( op->o_cancel == SLAP_CANCEL_ACK ) {
- rc = LDAP_SUCCESS;
+ o->o_cancel = SLAP_CANCEL_DONE;
} else {
- rc = op->o_cancel;
+ rs->sr_text = "message ID not found";
+ rc = LDAP_NO_SUCH_OPERATION;
}
- op->o_cancel = SLAP_CANCEL_DONE;
-
return rc;
}