RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-31 17:12:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: tcp_sample: extend support for get_tcp_info to macOs.

Browse Source 
MacOS can feed fc_rtt, fc_rttvar, fc_sacked, fc_lost and fc_retrans
so let's expose them on this platform.

Note that at the tcp(7) level, the API is slightly different, as
struct tcp_info is called tcp_connection_info and TCP_INFO is
called TCP_CONNECTION_INFO, so for convenience these ones were
defined to point to their equivalent. However there is a small
difference now in that tcpi_rtt is called tcpi_rttcur on this
platform, which forces us to make a special case for it before
other platforms.
This commit is contained in:
David CARLIER 2022-04-11 12:53:11 +01:00 committed by Willy Tarreau
parent 5c83e3a156
commit 7747d465d5
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/compat.h
View File

@ -284,6 +284,8 @@ typedef struct { } empty_t;
#include <malloc/malloc.h> #include <malloc/malloc.h>
#define malloc_usable_size malloc_size #define malloc_usable_size malloc_size
#define HA_HAVE_MALLOC_ZONE #define HA_HAVE_MALLOC_ZONE
#define TCP_INFO TCP_CONNECTION_INFO
#define tcp_info tcp_connection_info
#endif #endif
/* Max number of file descriptors we send in one sendmsg(). Linux seems to be /* Max number of file descriptors we send in one sendmsg(). Linux seems to be

31
src/tcp_sample.c
View File

@ -339,9 +339,17 @@ static inline int get_tcp_info(const struct arg *args, struct sample *smp,
/* extract the value. */ /* extract the value. */
smp->data.type = SMP_T_SINT; smp->data.type = SMP_T_SINT;
switch (val) { switch (val) {
#if defined(__APPLE__)
case 0: smp->data.u.sint = info.tcpi_rttcur; break;
case 1: smp->data.u.sint = info.tcpi_rttvar; break;
case 2: smp->data.u.sint = info.tcpi_tfo_syn_data_acked; break;
case 4: smp->data.u.sint = info.tcpi_tfo_syn_loss; break;
case 5: smp->data.u.sint = info.tcpi_rto; break;
#else
/* all other platforms supporting TCP_INFO have these ones */
case 0: smp->data.u.sint = info.tcpi_rtt; break; case 0: smp->data.u.sint = info.tcpi_rtt; break;
case 1: smp->data.u.sint = info.tcpi_rttvar; break; case 1: smp->data.u.sint = info.tcpi_rttvar; break;
#if defined(__linux__) # if defined(__linux__)
/* these ones are common to all Linux versions */ /* these ones are common to all Linux versions */
case 2: smp->data.u.sint = info.tcpi_unacked; break; case 2: smp->data.u.sint = info.tcpi_unacked; break;
case 3: smp->data.u.sint = info.tcpi_sacked; break; case 3: smp->data.u.sint = info.tcpi_sacked; break;
@ -349,7 +357,7 @@ static inline int get_tcp_info(const struct arg *args, struct sample *smp,
case 5: smp->data.u.sint = info.tcpi_retrans; break; case 5: smp->data.u.sint = info.tcpi_retrans; break;
case 6: smp->data.u.sint = info.tcpi_fackets; break; case 6: smp->data.u.sint = info.tcpi_fackets; break;
case 7: smp->data.u.sint = info.tcpi_reordering; break; case 7: smp->data.u.sint = info.tcpi_reordering; break;
#elif defined(__FreeBSD__) || defined(__NetBSD__) # elif defined(__FreeBSD__) || defined(__NetBSD__)
/* the ones are found on FreeBSD and NetBSD featuring TCP_INFO */ /* the ones are found on FreeBSD and NetBSD featuring TCP_INFO */
case 2: smp->data.u.sint = info.__tcpi_unacked; break; case 2: smp->data.u.sint = info.__tcpi_unacked; break;
case 3: smp->data.u.sint = info.__tcpi_sacked; break; case 3: smp->data.u.sint = info.__tcpi_sacked; break;
@ -357,14 +365,15 @@ static inline int get_tcp_info(const struct arg *args, struct sample *smp,
case 5: smp->data.u.sint = info.__tcpi_retrans; break; case 5: smp->data.u.sint = info.__tcpi_retrans; break;
case 6: smp->data.u.sint = info.__tcpi_fackets; break; case 6: smp->data.u.sint = info.__tcpi_fackets; break;
case 7: smp->data.u.sint = info.__tcpi_reordering; break; case 7: smp->data.u.sint = info.__tcpi_reordering; break;
#endif # endif
#endif // apple
default: return 0; default: return 0;
} }
return 1; return 1;
} }
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
/* get the mean rtt of a client connection */ /* get the mean rtt of a client connection */
static int static int
smp_fetch_fc_rtt(const struct arg *args, struct sample *smp, const char *kw, void *private) smp_fetch_fc_rtt(const struct arg *args, struct sample *smp, const char *kw, void *private)
@ -380,7 +389,7 @@ smp_fetch_fc_rtt(const struct arg *args, struct sample *smp, const char *kw, voi
} }
#endif #endif
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
/* get the variance of the mean rtt of a client connection */ /* get the variance of the mean rtt of a client connection */
static int static int
smp_fetch_fc_rttvar(const struct arg *args, struct sample *smp, const char *kw, void *private) smp_fetch_fc_rttvar(const struct arg *args, struct sample *smp, const char *kw, void *private)
@ -397,7 +406,7 @@ smp_fetch_fc_rttvar(const struct arg *args, struct sample *smp, const char *kw,
#endif #endif
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
/* get the unacked counter on a client connection */ /* get the unacked counter on a client connection */
static int static int
smp_fetch_fc_unacked(const struct arg *args, struct sample *smp, const char *kw, void *private) smp_fetch_fc_unacked(const struct arg *args, struct sample *smp, const char *kw, void *private)
@ -419,7 +428,7 @@ smp_fetch_fc_sacked(const struct arg *args, struct sample *smp, const char *kw,
} }
#endif #endif
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
/* get the lost counter on a client connection */ /* get the lost counter on a client connection */
static int static int
smp_fetch_fc_lost(const struct arg *args, struct sample *smp, const char *kw, void *private) smp_fetch_fc_lost(const struct arg *args, struct sample *smp, const char *kw, void *private)
@ -430,7 +439,7 @@ smp_fetch_fc_lost(const struct arg *args, struct sample *smp, const char *kw, vo
} }
#endif #endif
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
/* get the retrans counter on a client connection */ /* get the retrans counter on a client connection */
static int static int
smp_fetch_fc_retrans(const struct arg *args, struct sample *smp, const char *kw, void *private) smp_fetch_fc_retrans(const struct arg *args, struct sample *smp, const char *kw, void *private)
@ -493,19 +502,19 @@ static struct sample_fetch_kw_list sample_fetch_keywords = {ILH, {
#ifdef TCP_INFO #ifdef TCP_INFO
{ "fc_rtt", smp_fetch_fc_rtt, ARG1(0,STR), val_fc_time_value, SMP_T_SINT, SMP_USE_L4CLI }, { "fc_rtt", smp_fetch_fc_rtt, ARG1(0,STR), val_fc_time_value, SMP_T_SINT, SMP_USE_L4CLI },
{ "fc_rttvar", smp_fetch_fc_rttvar, ARG1(0,STR), val_fc_time_value, SMP_T_SINT, SMP_USE_L4CLI }, { "fc_rttvar", smp_fetch_fc_rttvar, ARG1(0,STR), val_fc_time_value, SMP_T_SINT, SMP_USE_L4CLI },
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
{ "fc_unacked", smp_fetch_fc_unacked, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI }, { "fc_unacked", smp_fetch_fc_unacked, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
#endif #endif
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
{ "fc_sacked", smp_fetch_fc_sacked, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI }, { "fc_sacked", smp_fetch_fc_sacked, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
#endif #endif
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
{ "fc_retrans", smp_fetch_fc_retrans, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI }, { "fc_retrans", smp_fetch_fc_retrans, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
#endif #endif
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
{ "fc_fackets", smp_fetch_fc_fackets, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI }, { "fc_fackets", smp_fetch_fc_fackets, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
#endif #endif
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
{ "fc_lost", smp_fetch_fc_lost, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI }, { "fc_lost", smp_fetch_fc_lost, ARG1(0,STR), var_fc_counter, SMP_T_SINT, SMP_USE_L4CLI },
#endif #endif
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)