Merging upstream version 1.46.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 145 deletions

diff --git a/fluent-bit/lib/librdkafka-2.1.0/tests/sockem_ctrl.c b/fluent-bit/lib/librdkafka-2.1.0/tests/sockem_ctrl.c
deleted file mode 100644
index c3e8ce92e..000000000
--- a/fluent-bit/lib/librdkafka-2.1.0/tests/sockem_ctrl.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * librdkafka - Apache Kafka C library
- *
- * Copyright (c) 2018, Magnus Edenhill
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-/**
- * @name Thin abstraction on top of sockem to provide scheduled delays,
- *       e.g.; set delay to 500ms in 2000ms
- */
-
-#include "test.h"
-#include "sockem.h"
-#include "sockem_ctrl.h"
-
-static int sockem_ctrl_thrd_main(void *arg) {
-        sockem_ctrl_t *ctrl = (sockem_ctrl_t *)arg;
-        int64_t next_wakeup = 0;
-        mtx_lock(&ctrl->lock);
-
-        test_curr = ctrl->test;
-
-        while (!ctrl->term) {
-                int64_t now;
-                struct sockem_cmd *cmd;
-                int wait_time = 1000;
-
-                if (next_wakeup)
-                        wait_time = (int)(next_wakeup - test_clock()) / 1000;
-
-                if (wait_time > 0)
-                        cnd_timedwait_ms(&ctrl->cnd, &ctrl->lock, wait_time);
-
-                /* Ack last command */
-                if (ctrl->cmd_ack != ctrl->cmd_seq) {
-                        ctrl->cmd_ack = ctrl->cmd_seq;
-                        cnd_signal(&ctrl->cnd); /* signal back to caller */
-                }
-
-                /* Serve expired commands */
-                next_wakeup = 0;
-                now         = test_clock();
-                while ((cmd = TAILQ_FIRST(&ctrl->cmds))) {
-                        if (!ctrl->term) {
-                                if (cmd->ts_at > now) {
-                                        next_wakeup = cmd->ts_at;
-                                        break;
-                                }
-
-                                printf(_C_CYA
-                                       "## %s: "
-                                       "sockem: setting socket delay to "
-                                       "%d\n" _C_CLR,
-                                       __FILE__, cmd->delay);
-                                test_socket_sockem_set_all("delay", cmd->delay);
-                        }
-                        TAILQ_REMOVE(&ctrl->cmds, cmd, link);
-                        free(cmd);
-                }
-        }
-        mtx_unlock(&ctrl->lock);
-
-        return 0;
-}
-
-
-
-/**
- * @brief Set socket delay to kick in after \p after ms
- */
-void sockem_ctrl_set_delay(sockem_ctrl_t *ctrl, int after, int delay) {
-        struct sockem_cmd *cmd;
-        int wait_seq;
-
-        TEST_SAY("Set delay to %dms (after %dms)\n", delay, after);
-
-        cmd        = calloc(1, sizeof(*cmd));
-        cmd->ts_at = test_clock() + (after * 1000);
-        cmd->delay = delay;
-
-        mtx_lock(&ctrl->lock);
-        wait_seq = ++ctrl->cmd_seq;
-        TAILQ_INSERT_TAIL(&ctrl->cmds, cmd, link);
-        cnd_broadcast(&ctrl->cnd);
-
-        /* Wait for ack from sockem thread */
-        while (ctrl->cmd_ack < wait_seq) {
-                TEST_SAY("Waiting for sockem control ack\n");
-                cnd_timedwait_ms(&ctrl->cnd, &ctrl->lock, 1000);
-        }
-        mtx_unlock(&ctrl->lock);
-}
-
-
-void sockem_ctrl_init(sockem_ctrl_t *ctrl) {
-        memset(ctrl, 0, sizeof(*ctrl));
-        mtx_init(&ctrl->lock, mtx_plain);
-        cnd_init(&ctrl->cnd);
-        TAILQ_INIT(&ctrl->cmds);
-        ctrl->test = test_curr;
-
-        mtx_lock(&ctrl->lock);
-        if (thrd_create(&ctrl->thrd, sockem_ctrl_thrd_main, ctrl) !=
-            thrd_success)
-                TEST_FAIL("Failed to create sockem ctrl thread");
-        mtx_unlock(&ctrl->lock);
-}
-
-void sockem_ctrl_term(sockem_ctrl_t *ctrl) {
-        int res;
-
-        /* Join controller thread */
-        mtx_lock(&ctrl->lock);
-        ctrl->term = 1;
-        cnd_broadcast(&ctrl->cnd);
-        mtx_unlock(&ctrl->lock);
-
-        thrd_join(ctrl->thrd, &res);
-
-        cnd_destroy(&ctrl->cnd);
-        mtx_destroy(&ctrl->lock);
-}