diff options
Diffstat (limited to 'src/ccapi/server/ccs_client.c')
| -rw-r--r-- | src/ccapi/server/ccs_client.c | 81 |
1 files changed, 75 insertions, 6 deletions
diff --git a/src/ccapi/server/ccs_client.c b/src/ccapi/server/ccs_client.c index 5ec5de33d..31ed14ff4 100644 --- a/src/ccapi/server/ccs_client.c +++ b/src/ccapi/server/ccs_client.c @@ -28,10 +28,13 @@ struct ccs_client_d { ccs_pipe_t client_pipe; - ccs_callbackref_array_t callbacks; /* references, not owner */ + + /* The following arrays do not own their contents */ + ccs_callbackref_array_t callbacks; + ccs_iteratorref_array_t iterators; }; -struct ccs_client_d ccs_client_initializer = { CCS_PIPE_NULL, NULL }; +struct ccs_client_d ccs_client_initializer = { CCS_PIPE_NULL, NULL, NULL }; /* ------------------------------------------------------------------------ */ @@ -58,6 +61,10 @@ cc_int32 ccs_client_new (ccs_client_t *out_client, } if (!err) { + err = ccs_iteratorref_array_new (&client->iterators); + } + + if (!err) { err = ccs_pipe_copy (&client->client_pipe, in_client_pipe); } @@ -79,16 +86,27 @@ cc_int32 ccs_client_release (ccs_client_t io_client) if (!err && io_client) { cc_uint64 i; - cc_uint64 lock_count = ccs_callbackref_array_count (io_client->callbacks); + cc_uint64 callback_count = ccs_callbackref_array_count (io_client->callbacks); + cc_uint64 iterator_count = ccs_iteratorref_array_count (io_client->iterators); - for (i = 0; !err && i < lock_count; i++) { + for (i = 0; !err && i < callback_count; i++) { ccs_callback_t callback = ccs_callbackref_array_object_at_index (io_client->callbacks, i); - cci_debug_printf ("%s: Invalidating callback reference %p.", __FUNCTION__, callback); + cci_debug_printf ("%s: Invalidating callback reference %p.", + __FUNCTION__, callback); ccs_callback_invalidate (callback); } + for (i = 0; !err && i < iterator_count; i++) { + ccs_generic_list_iterator_t iterator = ccs_iteratorref_array_object_at_index (io_client->iterators, i); + + cci_debug_printf ("%s: Invalidating iterator reference %p.", + __FUNCTION__, iterator); + ccs_generic_list_iterator_invalidate (iterator); + } + ccs_callbackref_array_release (io_client->callbacks); + ccs_iteratorref_array_release (io_client->iterators); ccs_pipe_release (io_client->client_pipe); free (io_client); } @@ -108,7 +126,7 @@ cc_int32 ccs_client_add_callback (ccs_client_t io_client, if (!err) { err = ccs_callbackref_array_insert (io_client->callbacks, in_callback, - ccs_callback_array_count (io_client->callbacks)); + ccs_callbackref_array_count (io_client->callbacks)); } return cci_check_error (err); @@ -150,6 +168,57 @@ cc_int32 ccs_client_remove_callback (ccs_client_t io_client, /* ------------------------------------------------------------------------ */ +cc_int32 ccs_client_add_iterator (ccs_client_t io_client, + ccs_generic_list_iterator_t in_iterator) +{ + cc_int32 err = ccNoError; + + if (!io_client ) { err = cci_check_error (ccErrBadParam); } + if (!in_iterator) { err = cci_check_error (ccErrBadParam); } + + if (!err) { + err = ccs_iteratorref_array_insert (io_client->iterators, in_iterator, + ccs_iteratorref_array_count (io_client->iterators)); + } + + return cci_check_error (err); +} + +/* ------------------------------------------------------------------------ */ + +cc_int32 ccs_client_remove_iterator (ccs_client_t io_client, + ccs_generic_list_iterator_t in_iterator) +{ + cc_int32 err = ccNoError; + cc_uint32 found_iterator = 0; + + if (!io_client) { err = cci_check_error (ccErrBadParam); } + + if (!err) { + cc_uint64 i; + cc_uint64 lock_count = ccs_iteratorref_array_count (io_client->iterators); + + for (i = 0; !err && i < lock_count; i++) { + ccs_generic_list_iterator_t iterator = ccs_iteratorref_array_object_at_index (io_client->iterators, i); + + if (iterator == in_iterator) { + cci_debug_printf ("%s: Removing iterator reference %p.", __FUNCTION__, iterator); + found_iterator = 1; + err = ccs_iteratorref_array_remove (io_client->iterators, i); + break; + } + } + } + + if (!err && !found_iterator) { + cci_debug_printf ("%s: WARNING! iterator not found.", __FUNCTION__); + } + + return cci_check_error (err); +} + +/* ------------------------------------------------------------------------ */ + cc_int32 ccs_client_uses_pipe (ccs_client_t in_client, ccs_pipe_t in_pipe, cc_uint32 *out_uses_pipe) |