while ( (o = LDAP_STAILQ_FIRST( &slap_free_ops )) != NULL) {
LDAP_STAILQ_REMOVE_HEAD( &slap_free_ops, o_next );
LDAP_STAILQ_NEXT(o, o_next) = NULL;
- ch_free( o->o_controls );
ch_free( o );
}
ldap_pvt_thread_mutex_destroy( &slap_op_mutex );
slap_op_free( Operation *op )
{
struct berval slap_empty_bv_dup;
- void **controls;
assert( LDAP_STAILQ_NEXT(op, o_next) == NULL );
}
#endif
- slap_sync_cookie_free( &op->o_sync_state, 0 );
-
{
GroupAssertion *g, *n;
for (g = op->o_groups; g; g=n) {
}
#endif /* defined( LDAP_SLAPI ) */
+
+ memset( op, 0, sizeof(Operation) + sizeof(Opheader) + SLAP_MAX_CIDS * sizeof(void *) );
+ op->o_hdr = (Opheader *)(op+1);
+ op->o_controls = (void **)(op->o_hdr+1);
+
+#if 0 /* DELETE ME */
+ slap_sync_cookie_free( &op->o_sync_state, 0 );
if ( op->o_sync_csn.bv_val != NULL ) {
ch_free( op->o_sync_csn.bv_val );
}
-
- controls = op->o_controls;
- memset( controls, 0, sizeof(void *) * SLAP_MAX_CIDS );
- memset( op, 0, sizeof(Operation) );
- op->o_controls = controls;
-
op->o_sync_state.sid = -1;
op->o_sync_slog_size = -1;
op->o_sync_state.rid = -1;
+#endif
+
ldap_pvt_thread_mutex_lock( &slap_op_mutex );
LDAP_STAILQ_INSERT_HEAD( &slap_free_ops, op, o_next );
ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
if (!op) {
- op = (Operation *) ch_calloc( 1, sizeof(Operation) );
- op->o_controls = (void **) ch_calloc( SLAP_MAX_CIDS, sizeof( void *));
+ op = (Operation *) ch_calloc( 1, sizeof(Operation)
+ + sizeof(Opheader) + SLAP_MAX_CIDS * sizeof(void *) );
+ op->o_hdr = (Opheader *)(op + 1);
+ op->o_controls = (void **)(op->o_hdr+1);
}
op->o_ber = ber;
op->o_opid = id;
op->o_res_ber = NULL;
+#if 0 /* DELETE ME */
op->o_sync_state.sid = -1;
op->o_sync_slog_size = -1;
op->o_sync_state.rid = -1;
LDAP_STAILQ_FIRST( &op->o_sync_slog_list ) = NULL;
op->o_sync_slog_list.stqh_last = &LDAP_STAILQ_FIRST( &op->o_sync_slog_list );
+#endif
#if defined( LDAP_SLAPI )
if ( slapi_plugins_used ) {