Merging upstream version 1.46.3.

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

1 files changed, 0 insertions, 129 deletions

diff --git a/fluent-bit/plugins/in_cpu/cpu.h b/fluent-bit/plugins/in_cpu/cpu.h
deleted file mode 100644
index 93cbd88c1..000000000
--- a/fluent-bit/plugins/in_cpu/cpu.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
-/*  Fluent Bit
- *  ==========
- *  Copyright (C) 2015-2022 The Fluent Bit Authors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#ifndef FLB_IN_CPU_H
-#define FLB_IN_CPU_H
-
-#include <fluent-bit/flb_config.h>
-#include <fluent-bit/flb_input.h>
-#include <fluent-bit/flb_utils.h>
-#include <fluent-bit/flb_log_event_encoder.h>
-
-/* Default collection time: every 1 second (0 nanoseconds) */
-#define DEFAULT_INTERVAL_SEC    "1"
-#define DEFAULT_INTERVAL_NSEC   "0"
-#define IN_CPU_KEY_LEN       16
-
-struct cpu_key {
-    uint8_t length;
-    char name[IN_CPU_KEY_LEN];
-};
-
-struct cpu_snapshot {
-    /* data snapshots */
-    char          v_cpuid[8];
-    unsigned long v_user;
-    unsigned long v_nice;
-    unsigned long v_system;
-    unsigned long v_idle;
-    unsigned long v_iowait;
-
-    /* percent values */
-    double p_cpu;           /* Overall CPU usage        */
-    double p_user;          /* user space (user + nice) */
-    double p_system;        /* kernel space percent     */
-
-    /* necessary... */
-    struct cpu_key k_cpu;
-    struct cpu_key k_user;
-    struct cpu_key k_system;
-};
-
-#define CPU_SNAP_ACTIVE_A    0
-#define CPU_SNAP_ACTIVE_B    1
-
-struct cpu_stats {
-    uint8_t snap_active;
-
-    /* CPU snapshots, we always keep two snapshots */
-    struct cpu_snapshot *snap_a;
-    struct cpu_snapshot *snap_b;
-};
-
-/* CPU Input configuration & context */
-struct flb_cpu {
-    /* setup */
-    pid_t pid;          /* optional PID */
-    int n_processors;   /* number of core processors  */
-    int cpu_ticks;      /* CPU ticks (Kernel setting) */
-    int coll_fd;        /* collector id/fd            */
-    int interval_sec;   /* interval collection time (Second) */
-    int interval_nsec;  /* interval collection time (Nanosecond) */
-    struct cpu_stats cstats;
-    struct flb_input_instance *ins;
-    struct flb_log_event_encoder log_encoder;
-};
-
-#define CPU_KEY_FORMAT(s, key, i)                                   \
-    s->k_##key.length = snprintf(s->k_##key.name,                   \
-                                 IN_CPU_KEY_LEN,                    \
-                                 "cpu%i.p_%s", i - 1, #key)
-
-#define ULL_ABS(a, b)  (a > b) ? a - b : b - a
-
-/*
- * This routine calculate the average CPU utilization of the system, it
- * takes in consideration the number CPU cores, so it return a value
- * between 0 and 100 based on 'capacity'.
- */
-static inline double CPU_METRIC_SYS_AVERAGE(unsigned long pre,
-                                            unsigned long now,
-                                            struct flb_cpu *ctx)
-{
-    double diff;
-    double total = 0;
-
-    if (pre == now) {
-        return 0.0;
-    }
-
-    diff = ULL_ABS(now, pre);
-    total = (((diff / ctx->cpu_ticks) * 100) / ctx->n_processors) / (ctx->interval_sec + 1e-9*ctx->interval_nsec);
-
-    return total;
-}
-
-/* Returns the CPU % utilization of a given CPU core */
-static inline double CPU_METRIC_USAGE(unsigned long pre, unsigned long now,
-                                      struct flb_cpu *ctx)
-{
-    double diff;
-    double total = 0;
-
-    if (pre == now) {
-        return 0.0;
-    }
-
-    diff = ULL_ABS(now, pre);
-
-    total = ((diff * 100) / ctx->cpu_ticks) / (ctx->interval_sec + 1e-9*ctx->interval_nsec);
-    return total;
-}
-
-#endif