void
slap_op_free( Operation *op )
{
- if ( op->o_ber != NULL )
+ ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
+
+ if ( op->o_ber != NULL ) {
ber_free( op->o_ber, 1 );
+ }
if ( op->o_dn != NULL ) {
free( op->o_dn );
}
if ( op->o_ndn != NULL ) {
free( op->o_ndn );
}
- /* pthread_mutex_destroy( &op->o_abandonmutex ); */
+
+ ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
+ ldap_pvt_thread_mutex_destroy( &op->o_abandonmutex );
free( (char *) op );
}
for ( tmp = olist; *tmp != NULL; tmp = &(*tmp)->o_next )
; /* NULL */
- *tmp = (Operation *) calloc( 1, sizeof(Operation) );
- pthread_mutex_init( &(*tmp)->o_abandonmutex,
- pthread_mutexattr_default );
+ *tmp = (Operation *) ch_calloc( 1, sizeof(Operation) );
+
+ ldap_pvt_thread_mutex_init( &(*tmp)->o_abandonmutex );
(*tmp)->o_ber = ber;
(*tmp)->o_msgid = msgid;
(*tmp)->o_tag = tag;
(*tmp)->o_dn = ch_strdup( dn != NULL ? dn : "" );
(*tmp)->o_ndn = dn_normalize_case( ch_strdup( (*tmp)->o_dn ) );
- pthread_mutex_lock( ¤ttime_mutex );
+ ldap_pvt_thread_mutex_lock( ¤ttime_mutex );
(*tmp)->o_time = currenttime;
- pthread_mutex_unlock( ¤ttime_mutex );
+ ldap_pvt_thread_mutex_unlock( ¤ttime_mutex );
(*tmp)->o_opid = id;
(*tmp)->o_connid = connid;
(*tmp)->o_next = NULL;
if ( *tmp == NULL ) {
Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %ld\n",
op->o_msgid, 0, 0 );
+ slap_op_free( op );
return;
}