fixup: Use function instead of macro to set an async event engine

Signed-off-by: Björn Svensson <[email protected]>
valkey-io · Dec 13, 2024 · 8c31a25 · 8c31a25
1 parent 425af3f
commit 8c31a25
Show file tree

Hide file tree

Showing 23 changed files with 70 additions and 138 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
+    options->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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);