lib-dict: test-dict-client - Handle shutdown cleanly with ctrl-c

diff --git a/src/lib-dict/test-dict-client.c b/src/lib-dict/test-dict-client.c
index 9b3b80bbd6fea0aaeed467d342f193a6a8fd0b4c..a70f4a41d011265b01c00fa9a2c73a88d6722ac6 100644 (file)
--- a/src/lib-dict/test-dict-client.c
+++ b/src/lib-dict/test-dict-client.c
@@ -1,12 +1,19 @@
 /* Copyright (c) 2016-2018 Dovecot authors, see the included COPYING file */
 
 #include "lib.h"
+#include "lib-signals.h"
 #include "ioloop.h"
 #include "dict-private.h"
 
 #include <stdio.h>
 
 static int pending = 0;
+static volatile bool stop = FALSE;
+
+static void sig_die(const siginfo_t *si ATTR_UNUSED, void *context ATTR_UNUSED)
+{
+       stop = TRUE;
+}
 
 static void lookup_callback(const struct dict_lookup_result *result,
                            void *context ATTR_UNUSED)
@@ -40,7 +47,9 @@ int main(int argc, char *argv[])
        char key[1000], value[100];
 
        lib_init();
+       lib_signals_init();
        ioloop = io_loop_create();
+       lib_signals_set_handler(SIGINT, LIBSIG_FLAG_RESTART, sig_die, NULL);
        dict_driver_register(&dict_driver_client);
 
        if (argc < 3)
@@ -56,14 +65,14 @@ int main(int argc, char *argv[])
        if (dict_init(uri, &set, &dict, &error) < 0)
                i_fatal("dict_init(%s) failed: %s", argv[1], error);
 
-       for (i = 0;; i++) {
+       for (i = 0; !stop; i++) {
                i_snprintf(key, sizeof(key), "%s/%02x", prefix,
                           i_rand_limit(0xff));
                i_snprintf(value, sizeof(value), "%04x", i_rand_limit(0xffff));
                switch (i_rand_limit(4)) {
                case 0:
                        pending++;
-                       dict_lookup_async(dict, NULL, key, lookup_callback, NULL);
+                       dict_lookup_async(dict, &opset, key, lookup_callback, NULL);
                        break;
                case 1: {
                        struct dict_transaction_context *trans;
@@ -99,8 +108,11 @@ int main(int argc, char *argv[])
                        printf("%d\n", pending); fflush(stdout);
                }
        }
+       dict_wait(dict);
        dict_deinit(&dict);
+       dict_driver_unregister(&dict_driver_client);
 
        io_loop_destroy(&ioloop);
+       lib_signals_deinit();
        lib_deinit();
 }