X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcancel.c;h=84d5deb9d93f0f8a86e8d624ef88a5a683491566;hb=ef7f5f5e32e6e0f129aee7fa1626017a7dadcb48;hp=12dfabb3fead793675b53e96dac05d4eb0a6b457;hpb=dc0eacd40b625258355eea866d62188e5aa7ce3b;p=openldap
diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 12dfabb3fe..84d5deb9d9 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-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2011 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 );
@@ -57,73 +56,101 @@ int cancel_extop( Operation *op, SlapReply *rs )
(void) ber_free( ber, 1 );
+ Statslog( LDAP_DEBUG_STATS, "%s CANCEL msg=%d\n",
+ op->o_log_prefix, opid, 0, 0, 0 );
+
if ( opid < 0 ) {
rs->sr_text = "message ID invalid";
return LDAP_PROTOCOL_ERROR;
}
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
+
+ if ( op->o_abandon ) {
+ /* FIXME: Should instead reject the cancel/abandon of this op, but
+ * it seems unsafe to reset op->o_abandon once it is set. ITS#6138.
+ */
+ rc = LDAP_OPERATIONS_ERROR;
+ rs->sr_text = "tried to abandon or cancel this operation";
+ goto out;
+ }
+
LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
if ( o->o_msgid == opid ) {
- LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, slap_op, o_next );
- LDAP_STAILQ_NEXT(o, o_next) = NULL;
- op->o_conn->c_n_ops_pending--;
- slap_op_free( o );
- found = 1;
- break;
+ /* TODO: We could instead remove the cancelled operation
+ * from c_pending_ops like Abandon does, and send its
+ * response here. Not if it is pending because of a
+ * congested connection though.
+ */
+ rc = LDAP_CANNOT_CANCEL;
+ rs->sr_text = "too busy for Cancel, try Abandon instead";
+ goto out;
}
}
- 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;
break;
}
}
- if ( !found ) {
- for ( i = 0; i < nbackends; i++ ) {
- op->o_bd = &backends[i];
- if( !op->o_bd->be_cancel ) continue;
+ if ( o == NULL ) {
+ rc = LDAP_NO_SUCH_OPERATION;
+ rs->sr_text = "message ID not found";
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+ } else if ( o->o_tag == LDAP_REQ_BIND
+ || o->o_tag == LDAP_REQ_UNBIND
+ || o->o_tag == LDAP_REQ_ABANDON ) {
+ rc = LDAP_CANNOT_CANCEL;
+
+ } else if ( o->o_cancel != SLAP_CANCEL_NONE ) {
+ rc = LDAP_OPERATIONS_ERROR;
+ rs->sr_text = "message ID already being cancelled";
+
+#if 0
+ } else if ( o->o_abandon ) {
+ /* TODO: Would this break something when
+ * o_abandon="suppress response"? (ITS#6138)
+ */
+ rc = LDAP_TOO_LATE;
+#endif
+
+ } else {
+ rc = LDAP_SUCCESS;
+ o->o_cancel = SLAP_CANCEL_REQ;
+ o->o_abandon = 1;
+ }
+
+ out:
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+
+ if ( rc == LDAP_SUCCESS ) {
+ 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 );
+ 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 );
- while ( op->o_cancel == SLAP_CANCEL_REQ ) {
- ldap_pvt_thread_yield();
- }
+ if ( rc == SLAP_CANCEL_ACK ) {
+ rc = LDAP_SUCCESS;
+ }
- if ( op->o_cancel == SLAP_CANCEL_ACK ) {
- rc = LDAP_SUCCESS;
- } else {
- rc = op->o_cancel;
+ o->o_cancel = SLAP_CANCEL_DONE;
}
- op->o_cancel = SLAP_CANCEL_DONE;
-
return rc;
}