commons.h (goaccess-1.7) | : | commons.h (goaccess-1.7.1) | ||
---|---|---|---|---|
/** | /** | |||
* ______ ___ | * ______ ___ | |||
* / ____/___ / | _____________ __________ | * / ____/___ / | _____________ __________ | |||
* / / __/ __ \/ /| |/ ___/ ___/ _ \/ ___/ ___/ | * / / __/ __ \/ /| |/ ___/ ___/ _ \/ ___/ ___/ | |||
* / /_/ / /_/ / ___ / /__/ /__/ __(__ |__ ) | * / /_/ / /_/ / ___ / /__/ /__/ __(__ |__ ) | |||
* \____/\____/_/ |_\___/\___/\___/____/____/ | * \____/\____/_/ |_\___/\___/\___/____/____/ | |||
* | * | |||
* The MIT License (MIT) | * The MIT License (MIT) | |||
* Copyright (c) 2009-2022 Gerardo Orellana <hello @ goaccess.io> | * Copyright (c) 2009-2023 Gerardo Orellana <hello @ goaccess.io> | |||
* | * | |||
* Permission is hereby granted, free of charge, to any person obtaining a copy | * Permission is hereby granted, free of charge, to any person obtaining a copy | |||
* of this software and associated documentation files (the "Software"), to deal | * of this software and associated documentation files (the "Software"), to deal | |||
* in the Software without restriction, including without limitation the rights | * in the Software without restriction, including without limitation the rights | |||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |||
* copies of the Software, and to permit persons to whom the Software is | * copies of the Software, and to permit persons to whom the Software is | |||
* furnished to do so, subject to the following conditions: | * furnished to do so, subject to the following conditions: | |||
* | * | |||
* The above copyright notice and this permission notice shall be included in al l | * The above copyright notice and this permission notice shall be included in al l | |||
* copies or substantial portions of the Software. | * copies or substantial portions of the Software. | |||
skipping to change at line 46 | skipping to change at line 46 | |||
#include <time.h> | #include <time.h> | |||
#include <stdint.h> | #include <stdint.h> | |||
#include "gslist.h" | #include "gslist.h" | |||
/* Remove the __attribute__ stuff when the compiler is not GCC. */ | /* Remove the __attribute__ stuff when the compiler is not GCC. */ | |||
#if !__GNUC__ | #if !__GNUC__ | |||
#define __attribute__(x) /**/ | #define __attribute__(x) /**/ | |||
#endif | #endif | |||
#define GO_UNUSED __attribute__((unused)) | #define GO_UNUSED __attribute__((unused)) | |||
#define GO_VERSION "1.7" | #define GO_VERSION "1.7.1" | |||
#define GO_WEBSITE "https://goaccess.io/" | #define GO_WEBSITE "https://goaccess.io/" | |||
extern struct tm now_tm; | extern struct tm now_tm; | |||
/* common char array buffer size */ | /* common char array buffer size */ | |||
#define INIT_BUF_SIZE 1024 | #define INIT_BUF_SIZE 1024 | |||
/* total number of modules */ | /* total number of modules */ | |||
#ifdef HAVE_GEOLOCATION | #ifdef HAVE_GEOLOCATION | |||
#define TOTAL_MODULES 19 | #define TOTAL_MODULES 19 | |||
#else | #else | |||
skipping to change at line 118 | skipping to change at line 118 | |||
REMOTE_USER, | REMOTE_USER, | |||
CACHE_STATUS, | CACHE_STATUS, | |||
#ifdef HAVE_GEOLOCATION | #ifdef HAVE_GEOLOCATION | |||
GEO_LOCATION, | GEO_LOCATION, | |||
ASN, | ASN, | |||
#endif | #endif | |||
MIME_TYPE, | MIME_TYPE, | |||
TLS_TYPE, | TLS_TYPE, | |||
} GModule; | } GModule; | |||
/* Total number of storage metrics (GSMetric) */ | ||||
#define GSMTRC_TOTAL 19 | ||||
/* Enumerated Storage Metrics */ | ||||
typedef enum GSMetric_ { | ||||
MTRC_KEYMAP, | ||||
MTRC_ROOTMAP, | ||||
MTRC_DATAMAP, | ||||
MTRC_UNIQMAP, | ||||
MTRC_ROOT, | ||||
MTRC_HITS, | ||||
MTRC_VISITORS, | ||||
MTRC_BW, | ||||
MTRC_CUMTS, | ||||
MTRC_MAXTS, | ||||
MTRC_METHODS, | ||||
MTRC_PROTOCOLS, | ||||
MTRC_AGENTS, | ||||
MTRC_METADATA, | ||||
MTRC_UNIQUE_KEYS, | ||||
MTRC_AGENT_KEYS, | ||||
MTRC_AGENT_VALS, | ||||
MTRC_CNT_VALID, | ||||
MTRC_CNT_BW, | ||||
} GSMetric; | ||||
/* Metric totals. These are metrics that have a percent value and are | /* Metric totals. These are metrics that have a percent value and are | |||
* calculated values. */ | * calculated values. */ | |||
typedef struct GPercTotals_ { | typedef struct GPercTotals_ { | |||
uint32_t hits; /* total valid hits */ | uint32_t hits; /* total valid hits */ | |||
uint32_t visitors; /* total visitors */ | uint32_t visitors; /* total visitors */ | |||
uint64_t bw; /* total bandwidth */ | uint64_t bw; /* total bandwidth */ | |||
} GPercTotals; | } GPercTotals; | |||
/* Metrics within GHolder or GDashData */ | /* Metrics within GHolder or GDashData */ | |||
typedef struct GMetrics { | typedef struct GMetrics { | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 28 lines changed or added |