From 29de378b5aae3c380ef97be50aa70f240854797a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Fri, 13 Dec 2024 14:33:22 +0100 Subject: [PATCH] fixup: Use function instead of macro to set an async event engine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- examples/cluster-async-tls.c | 2 +- examples/cluster-async.c | 2 +- examples/cluster-clientside-caching-async.c | 2 +- include/valkey/adapters/ae.h | 17 +++++------------ include/valkey/adapters/glib.h | 17 +++++------------ include/valkey/adapters/ivykis.h | 12 +++--------- include/valkey/adapters/libev.h | 17 +++++------------ include/valkey/adapters/libevent.h | 17 +++++------------ include/valkey/adapters/libhv.h | 17 +++++------------ include/valkey/adapters/libsdevent.h | 17 +++++------------ include/valkey/adapters/libuv.h | 17 +++++------------ include/valkey/adapters/macosx.h | 17 +++++------------ include/valkey/adapters/poll.h | 12 +++--------- tests/clusterclient_async.c | 2 +- tests/clusterclient_reconnect_async.c | 2 +- tests/ct_async.c | 2 +- tests/ct_async_glib.c | 2 +- tests/ct_async_libev.c | 2 +- tests/ct_async_libuv.c | 2 +- tests/ct_connection.c | 16 ++++++++-------- tests/ct_out_of_memory_handling.c | 2 +- tests/ct_pipeline.c | 2 +- tests/ct_specific_nodes.c | 10 +++++----- 23 files changed, 70 insertions(+), 138 deletions(-) diff --git a/examples/cluster-async-tls.c b/examples/cluster-async-tls.c index baded8c5..23c7fe1d 100644 --- a/examples/cluster-async-tls.c +++ b/examples/cluster-async-tls.c @@ -74,7 +74,7 @@ int main(int argc, char **argv) { valkeyClusterSetOptionEnableTLS(&options, tls); struct event_base *base = event_base_new(); - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); if (acc == NULL || acc->err != 0) { diff --git a/examples/cluster-async.c b/examples/cluster-async.c index e2aa822d..77e6610f 100644 --- a/examples/cluster-async.c +++ b/examples/cluster-async.c @@ -55,7 +55,7 @@ int main(int argc, char **argv) { options.initial_nodes = "127.0.0.1:7000"; options.onConnect = connectCallback; options.onDisconnect = disconnectCallback; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); printf("Connecting...\n"); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); diff --git a/examples/cluster-clientside-caching-async.c b/examples/cluster-clientside-caching-async.c index 8973ccec..c17cd3a2 100644 --- a/examples/cluster-clientside-caching-async.c +++ b/examples/cluster-clientside-caching-async.c @@ -146,7 +146,7 @@ int main(int argc, char **argv) { options.initial_nodes = CLUSTER_NODE; options.onConnectNC = connectCallbackNC; options.onDisconnect = disconnectCallback; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncContextInit(&options); assert(acc); diff --git a/include/valkey/adapters/ae.h b/include/valkey/adapters/ae.h index 42fbf9f5..143680e2 100644 --- a/include/valkey/adapters/ae.h +++ b/include/valkey/adapters/ae.h @@ -140,22 +140,15 @@ static int valkeyAeAttachAdapter(valkeyAsyncContext *ac, void *loop) { } VALKEY_UNUSED -static int valkeyClusterAeAttach(valkeyClusterAsyncContext *acc, - aeEventLoop *loop) { - if (acc == NULL || loop == NULL) { +static int valkeyClusterSetOptionUseAe(valkeyClusterOptions *options, + aeEventLoop *loop) { + if (options == NULL || loop == NULL) { return VALKEY_ERR; } - acc->attach_fn = valkeyAeAttachAdapter; - acc->attach_data = loop; + options->attach_fn = valkeyAeAttachAdapter; + options->attach_data = loop; return VALKEY_OK; } -/* Helper macro to initialize options. */ -#define VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_AE(opts, loop) \ - do { \ - (opts)->attach_fn = valkeyAeAttachAdapter; \ - (opts)->attach_data = loop; \ - } while (0) - #endif /* VALKEY_ADAPTERS_AE_H */ diff --git a/include/valkey/adapters/glib.h b/include/valkey/adapters/glib.h index 78afb67c..23d52b0f 100644 --- a/include/valkey/adapters/glib.h +++ b/include/valkey/adapters/glib.h @@ -153,22 +153,15 @@ static int valkeyGlibAttachAdapter(valkeyAsyncContext *ac, void *context) { } VALKEY_UNUSED -static int valkeyClusterGlibAttach(valkeyClusterAsyncContext *acc, - GMainContext *context) { - if (acc == NULL) { // A NULL context is accepted. +static int valkeyClusterSetOptionUseGlib(valkeyClusterOptions *options, + GMainContext *context) { + if (options == NULL) { // A NULL context is accepted. return VALKEY_ERR; } - acc->attach_fn = valkeyGlibAttachAdapter; - acc->attach_data = context; + options->attach_fn = valkeyGlibAttachAdapter; + options->attach_data = context; return VALKEY_OK; } -/* Helper macro to initialize options. */ -#define VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_GLIB(opts, context) \ - do { \ - (opts)->attach_fn = valkeyGlibAttachAdapter; \ - (opts)->attach_data = context; \ - } while (0) - #endif /* VALKEY_ADAPTERS_GLIB_H */ diff --git a/include/valkey/adapters/ivykis.h b/include/valkey/adapters/ivykis.h index 594910b1..bbd16295 100644 --- a/include/valkey/adapters/ivykis.h +++ b/include/valkey/adapters/ivykis.h @@ -90,19 +90,13 @@ static int valkeyIvykisAttachAdapter(valkeyAsyncContext *ac, VALKEY_UNUSED void } VALKEY_UNUSED -static int valkeyClusterIvykisAttach(valkeyClusterAsyncContext *acc) { - if (acc == NULL) { +static int valkeyClusterSetOptionUseIvykis(valkeyClusterOptions *options) { + if (options == NULL) { return VALKEY_ERR; } - acc->attach_fn = valkeyIvykisAttachAdapter; + options->attach_fn = valkeyIvykisAttachAdapter; return VALKEY_OK; } -/* Helper macro to initialize options. */ -#define VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_IVYKIS(opts) \ - do { \ - (opts)->attach_fn = valkeyAeAttachAdapter; \ - } while (0) - #endif /* VALKEY_ADAPTERS_IVYKIS_H */ diff --git a/include/valkey/adapters/libev.h b/include/valkey/adapters/libev.h index 457f0674..5c86d3c4 100644 --- a/include/valkey/adapters/libev.h +++ b/include/valkey/adapters/libev.h @@ -193,22 +193,15 @@ static int valkeyLibevAttachAdapter(valkeyAsyncContext *ac, void *loop) { } VALKEY_UNUSED -static int valkeyClusterLibevAttach(valkeyClusterAsyncContext *acc, - struct ev_loop *loop) { - if (acc == NULL || loop == NULL) { +static int valkeyClusterSetOptionUseLibev(valkeyClusterOptions *options, + struct ev_loop *loop) { + if (options == NULL || loop == NULL) { return VALKEY_ERR; } - acc->attach_fn = valkeyLibevAttachAdapter; - acc->attach_data = loop; + options->attach_fn = valkeyLibevAttachAdapter; + options->attach_data = loop; return VALKEY_OK; } -/* Helper macro to initialize options. */ -#define VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEV(opts, loop) \ - do { \ - (opts)->attach_fn = valkeyLibevAttachAdapter; \ - (opts)->attach_data = loop; \ - } while (0) - #endif /* VALKEY_ADAPTERS_LIBEV_H */ diff --git a/include/valkey/adapters/libevent.h b/include/valkey/adapters/libevent.h index d0f3b8d8..9496ae43 100644 --- a/include/valkey/adapters/libevent.h +++ b/include/valkey/adapters/libevent.h @@ -182,22 +182,15 @@ static int valkeyLibeventAttachAdapter(valkeyAsyncContext *ac, void *base) { } VALKEY_UNUSED -static int valkeyClusterLibeventAttach(valkeyClusterAsyncContext *acc, - struct event_base *base) { - if (acc == NULL || base == NULL) { +static int valkeyClusterSetOptionUseLibevent(valkeyClusterOptions *options, + struct event_base *base) { + if (options == NULL || base == NULL) { return VALKEY_ERR; } - acc->attach_fn = valkeyLibeventAttachAdapter; - acc->attach_data = base; + options->attach_fn = valkeyLibeventAttachAdapter; + options->attach_data = base; return VALKEY_OK; } -/* Helper macro to initialize options. */ -#define VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(opts, event_base) \ - do { \ - (opts)->attach_fn = valkeyLibeventAttachAdapter; \ - (opts)->attach_data = event_base; \ - } while (0) - #endif /* VALKEY_ADAPTERS_LIBEVENT_H */ diff --git a/include/valkey/adapters/libhv.h b/include/valkey/adapters/libhv.h index 75c409c0..027f80cc 100644 --- a/include/valkey/adapters/libhv.h +++ b/include/valkey/adapters/libhv.h @@ -129,22 +129,15 @@ static int valkeyLibhvAttachAdapter(valkeyAsyncContext *ac, void *loop) { } VALKEY_UNUSED -static int valkeyClusterLibhvAttach(valkeyClusterAsyncContext *acc, - hloop_t *loop) { - if (acc == NULL || loop == NULL) { +static int valkeyClusterSetOptionUseLibhv(valkeyClusterOptions *options, + hloop_t *loop) { + if (options == NULL || loop == NULL) { return VALKEY_ERR; } - acc->attach_fn = valkeyLibhvAttachAdapter; - acc->attach_data = loop; + options->attach_fn = valkeyLibhvAttachAdapter; + options->attach_data = loop; return VALKEY_OK; } -/* Helper macro to initialize options. */ -#define VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBHV(opts, loop) \ - do { \ - (opts)->attach_fn = valkeyLibhvAttachAdapter; \ - (opts)->attach_data = loop; \ - } while (0) - #endif /* VALKEY_ADAPTERS_LIBHV_H */ diff --git a/include/valkey/adapters/libsdevent.h b/include/valkey/adapters/libsdevent.h index 48158702..bc676b1d 100644 --- a/include/valkey/adapters/libsdevent.h +++ b/include/valkey/adapters/libsdevent.h @@ -184,22 +184,15 @@ static int valkeyLibsdeventAttachAdapter(valkeyAsyncContext *ac, void *event) { } VALKEY_UNUSED -static int valkeyClusterLibsdeventAttach(valkeyClusterAsyncContext *acc, - struct sd_event *event) { - if (acc == NULL || event == NULL) { +static int valkeyClusterSetOptionUseLibsdevent(valkeyClusterOptions *options, + struct sd_event *event) { + if (options == NULL || event == NULL) { return VALKEY_ERR; } - acc->attach_fn = valkeyLibsdeventAttachAdapter; - acc->attach_data = event; + options->attach_fn = valkeyLibsdeventAttachAdapter; + options->attach_data = event; return VALKEY_OK; } -/* Helper macro to initialize options. */ -#define VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBSDEVENT(opts, event) \ - do { \ - (opts)->attach_fn = valkeyLibsdeventAttachAdapter; \ - (opts)->attach_data = event; \ - } while (0) - #endif /* VALKEY_ADAPTERS_LIBSDEVENT_H */ diff --git a/include/valkey/adapters/libuv.h b/include/valkey/adapters/libuv.h index 51b3518d..d94a33b0 100644 --- a/include/valkey/adapters/libuv.h +++ b/include/valkey/adapters/libuv.h @@ -203,22 +203,15 @@ static int valkeyLibuvAttachAdapter(valkeyAsyncContext *ac, void *loop) { } VALKEY_UNUSED -static int valkeyClusterLibuvAttach(valkeyClusterAsyncContext *acc, - uv_loop_t *loop) { - if (acc == NULL || loop == NULL) { +static int valkeyClusterSetOptionUseLibuv(valkeyClusterOptions *options, + uv_loop_t *loop) { + if (options == NULL || loop == NULL) { return VALKEY_ERR; } - acc->attach_fn = valkeyLibuvAttachAdapter; - acc->attach_data = loop; + options->attach_fn = valkeyLibuvAttachAdapter; + options->attach_data = loop; return VALKEY_OK; } -/* Helper macro to initialize options. */ -#define VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBUV(opts, loop) \ - do { \ - (opts)->attach_fn = valkeyLibuvAttachAdapter; \ - (opts)->attach_data = loop; \ - } while (0) - #endif /* VALKEY_ADAPTERS_LIBUV_H */ diff --git a/include/valkey/adapters/macosx.h b/include/valkey/adapters/macosx.h index c0f607fb..7b2ca49f 100644 --- a/include/valkey/adapters/macosx.h +++ b/include/valkey/adapters/macosx.h @@ -149,22 +149,15 @@ static int valkeyMacOSAttachAdapter(valkeyAsyncContext *ac, void *loop) { } VALKEY_UNUSED -static int valkeyClusterMacOSAttach(valkeyClusterAsyncContext *acc, - CFRunLoopRef loop) { - if (acc == NULL || loop == NULL) { +static int valkeyClusterSetOptionUseMacOS(valkeyClusterOptions *options, + CFRunLoopRef loop) { + if (options == NULL || loop == NULL) { return VALKEY_ERR; } - acc->attach_fn = valkeyMacOSAttachAdapter; - acc->attach_data = loop; + options->attach_fn = valkeyMacOSAttachAdapter; + optoins->attach_data = loop; return VALKEY_OK; } -/* Helper macro to initialize options. */ -#define VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_MACOSX(opts, loop) \ - do { \ - (opts)->attach_fn = valkeyMacOSAttachAdapter; \ - (opts)->attach_data = loop; \ - } while (0) - #endif /* VALKEY_ADAPTERS_MACOSX_H */ diff --git a/include/valkey/adapters/poll.h b/include/valkey/adapters/poll.h index 84e45b16..cf32a3a7 100644 --- a/include/valkey/adapters/poll.h +++ b/include/valkey/adapters/poll.h @@ -202,19 +202,13 @@ static int valkeyPollAttachAdapter(valkeyAsyncContext *ac, VALKEY_UNUSED void *u } VALKEY_UNUSED -static int valkeyClusterPollAttach(valkeyClusterAsyncContext *acc) { - if (acc == NULL) { +static int valkeyClusterSetOptionUsePoll(valkeyClusterOptions *options) { + if (options == NULL) { return VALKEY_ERR; } - acc->attach_fn = valkeyPollAttachAdapter; + options->attach_fn = valkeyPollAttachAdapter; return VALKEY_OK; } -/* Helper macro to initialize options. */ -#define VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_POLL(opts) \ - do { \ - (opts)->attach_fn = valkeyPollAttachAdapter; \ - } while (0) - #endif /* VALKEY_ADAPTERS_POLL_H */ diff --git a/tests/clusterclient_async.c b/tests/clusterclient_async.c index 6b5d68fb..51b38fb4 100644 --- a/tests/clusterclient_async.c +++ b/tests/clusterclient_async.c @@ -265,7 +265,7 @@ int main(int argc, char **argv) { options.onConnect = connectCallback; options.onDisconnect = disconnectCallback; } - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); if (acc == NULL || acc->err != 0) { diff --git a/tests/clusterclient_reconnect_async.c b/tests/clusterclient_reconnect_async.c index 4ceda21e..1ed43869 100644 --- a/tests/clusterclient_reconnect_async.c +++ b/tests/clusterclient_reconnect_async.c @@ -100,7 +100,7 @@ int main(int argc, char **argv) { options.initial_nodes = initnode; options.options = VALKEY_OPT_USE_CLUSTER_SLOTS | VALKEY_OPT_BLOCKING_INITIAL_UPDATE; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncContextInit(&options); assert(acc); diff --git a/tests/ct_async.c b/tests/ct_async.c index c11a865c..ff838dff 100644 --- a/tests/ct_async.c +++ b/tests/ct_async.c @@ -74,7 +74,7 @@ int main(void) { options.initial_nodes = CLUSTER_NODE; options.onConnect = connectCallback; options.onDisconnect = disconnectCallback; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncContextInit(&options); assert(acc); diff --git a/tests/ct_async_glib.c b/tests/ct_async_glib.c index 8ae8b326..7e646224 100644 --- a/tests/ct_async_glib.c +++ b/tests/ct_async_glib.c @@ -46,7 +46,7 @@ int main(int argc, char **argv) { options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.onConnect = connectCallback; options.onDisconnect = disconnectCallback; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_GLIB(&options, context); + valkeyClusterSetOptionUseGlib(&options, context); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); assert(acc); diff --git a/tests/ct_async_libev.c b/tests/ct_async_libev.c index 2747afe2..5a94a6a5 100644 --- a/tests/ct_async_libev.c +++ b/tests/ct_async_libev.c @@ -40,7 +40,7 @@ int main(int argc, char **argv) { options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.onConnect = connectCallback; options.onDisconnect = disconnectCallback; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEV(&options, EV_DEFAULT); + valkeyClusterSetOptionUseLibev(&options, EV_DEFAULT); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); assert(acc); diff --git a/tests/ct_async_libuv.c b/tests/ct_async_libuv.c index fdce2d2a..89fbcabb 100644 --- a/tests/ct_async_libuv.c +++ b/tests/ct_async_libuv.c @@ -43,7 +43,7 @@ int main(int argc, char **argv) { options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.onConnect = connectCallback; options.onDisconnect = disconnectCallback; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBUV(&options, loop); + valkeyClusterSetOptionUseLibuv(&options, loop); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); assert(acc); diff --git a/tests/ct_connection.c b/tests/ct_connection.c index 2841038f..d25f91e8 100644 --- a/tests/ct_connection.c +++ b/tests/ct_connection.c @@ -297,7 +297,7 @@ void test_async_password_ok(void) { options.password = CLUSTER_PASSWORD; options.onConnect = callbackExpectOk; options.onDisconnect = callbackExpectOk; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); ASSERT_MSG(acc && acc->err == 0, acc ? acc->errstr : "OOM"); @@ -323,7 +323,7 @@ void test_async_password_wrong(void) { options.initial_nodes = CLUSTER_NODE_WITH_PASSWORD; options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.password = "faultypass"; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); assert(acc); @@ -354,7 +354,7 @@ void test_async_password_missing(void) { options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.onConnect = callbackExpectOk; options.onDisconnect = callbackExpectOk; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); // Password not configured valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); @@ -387,7 +387,7 @@ void test_async_username_ok(void) { options.onDisconnect = callbackExpectOk; options.username = "missing-user"; options.password = CLUSTER_PASSWORD; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); // Connect using wrong username should fail valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); @@ -426,7 +426,7 @@ void test_async_multicluster(void) { options1.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options1.onConnect = callbackExpectOk; options1.onDisconnect = callbackExpectOk; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options1, base); + valkeyClusterSetOptionUseLibevent(&options1, base); // Connect to first cluster valkeyClusterAsyncContext *acc1 = valkeyClusterAsyncConnectWithOptions(&options1); @@ -438,7 +438,7 @@ void test_async_multicluster(void) { options2.password = CLUSTER_PASSWORD; options2.onConnect = callbackExpectOk; options2.onDisconnect = callbackExpectOk; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options2, base); + valkeyClusterSetOptionUseLibevent(&options2, base); // Connect to second cluster valkeyClusterAsyncContext *acc2 = valkeyClusterAsyncConnectWithOptions(&options2); @@ -487,7 +487,7 @@ void test_async_connect_timeout(void) { options.initial_nodes = "192.168.0.0:7000"; options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.connect_timeout = &timeout; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); assert(acc); @@ -509,7 +509,7 @@ void test_async_command_timeout(void) { options.initial_nodes = CLUSTER_NODE; options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.command_timeout = &timeout; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); ASSERT_MSG(acc && acc->err == 0, acc ? acc->errstr : "OOM"); diff --git a/tests/ct_out_of_memory_handling.c b/tests/ct_out_of_memory_handling.c index 7470998a..f7d762f0 100644 --- a/tests/ct_out_of_memory_handling.c +++ b/tests/ct_out_of_memory_handling.c @@ -452,7 +452,7 @@ void test_alloc_failure_handling_async(void) { options.onDisconnect = callbackExpectOk; options.options = VALKEY_OPT_USE_REPLICAS | VALKEY_OPT_BLOCKING_INITIAL_UPDATE; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); // Connect valkeyClusterAsyncContext *acc; diff --git a/tests/ct_pipeline.c b/tests/ct_pipeline.c index d908b989..e0381779 100644 --- a/tests/ct_pipeline.c +++ b/tests/ct_pipeline.c @@ -95,7 +95,7 @@ void test_async_pipeline(void) { options.options = VALKEY_OPT_BLOCKING_INITIAL_UPDATE; options.onConnect = callbackExpectOk; options.onDisconnect = callbackExpectOk; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); ASSERT_MSG(acc && acc->err == 0, acc ? acc->errstr : "OOM"); diff --git a/tests/ct_specific_nodes.c b/tests/ct_specific_nodes.c index f58d4d70..d61a0a5c 100644 --- a/tests/ct_specific_nodes.c +++ b/tests/ct_specific_nodes.c @@ -323,7 +323,7 @@ void test_async_to_single_node(void) { options.max_retry_count = 1; options.onConnect = callbackExpectOk; options.onDisconnect = callbackExpectOk; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); ASSERT_MSG(acc && acc->err == 0, acc ? acc->errstr : "OOM"); @@ -354,7 +354,7 @@ void test_async_formatted_to_single_node(void) { options.max_retry_count = 1; options.onConnect = callbackExpectOk; options.onDisconnect = callbackExpectOk; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); ASSERT_MSG(acc && acc->err == 0, acc ? acc->errstr : "OOM"); @@ -386,7 +386,7 @@ void test_async_command_argv_to_single_node(void) { options.max_retry_count = 1; options.onConnect = callbackExpectOk; options.onDisconnect = callbackExpectOk; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); ASSERT_MSG(acc && acc->err == 0, acc ? acc->errstr : "OOM"); @@ -418,7 +418,7 @@ void test_async_to_all_nodes(void) { options.max_retry_count = 1; options.onConnect = callbackExpectOk; options.onDisconnect = callbackExpectOk; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); ASSERT_MSG(acc && acc->err == 0, acc ? acc->errstr : "OOM"); @@ -459,7 +459,7 @@ void test_async_transaction(void) { options.max_retry_count = 1; options.onConnect = callbackExpectOk; options.onDisconnect = callbackExpectOk; - VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base); + valkeyClusterSetOptionUseLibevent(&options, base); valkeyClusterAsyncContext *acc = valkeyClusterAsyncConnectWithOptions(&options); ASSERT_MSG(acc && acc->err == 0, acc ? acc->errstr : "OOM");