This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHarald Welte has submitted this change and it was merged. Change subject: stats: Disable stats*.c on embedded targets ...................................................................... stats: Disable stats*.c on embedded targets Change-Id: I6beb4fcc394ed7d3f8dd7a097b6e998245ecf401 --- M include/osmocom/core/stats.h M src/stats.c M src/stats_statsd.c 3 files changed, 28 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/stats.h b/include/osmocom/core/stats.h index f754e41..09b836a 100644 --- a/include/osmocom/core/stats.h +++ b/include/osmocom/core/stats.h @@ -19,7 +19,15 @@ */ #pragma once +/* a bit of a crude way to disable building/using this on (bare iron) + * embedded systems. We cannot use the autoconf-defined HAVE_... macros + * here, as that only works at library compile time, not at application + * compile time */ +#ifdef unix + #include <sys/socket.h> +#include <arpa/inet.h> + #include <osmocom/core/linuxlist.h> #include <stdint.h> @@ -119,3 +127,5 @@ int osmo_stats_reporter_send_buffer(struct osmo_stats_reporter *srep); int osmo_stats_reporter_udp_open(struct osmo_stats_reporter *srep); int osmo_stats_reporter_udp_close(struct osmo_stats_reporter *srep); + +#endif /* unix */ diff --git a/src/stats.c b/src/stats.c index 9c826cc..a523259 100644 --- a/src/stats.c +++ b/src/stats.c @@ -21,6 +21,9 @@ * */ +#include "config.h" +#if !defined(EMBEDDED) + #include <osmocom/core/byteswap.h> #include <osmocom/core/stats.h> @@ -30,9 +33,12 @@ #include <errno.h> #include <stdio.h> #include <sys/types.h> + +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> +#endif #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> @@ -163,6 +169,8 @@ return NULL; } +#ifdef HAVE_SYS_SOCKET_H + int osmo_stats_reporter_set_remote_addr(struct osmo_stats_reporter *srep, const char *addr) { int rc; @@ -240,6 +248,7 @@ return update_srep_config(srep); } +#endif /* HAVE_SYS_SOCKETS_H */ int osmo_stats_reporter_set_max_class(struct osmo_stats_reporter *srep, enum osmo_stats_class class_id) @@ -288,6 +297,8 @@ } /*** i/o helper functions ***/ + +#ifdef HAVE_SYS_SOCKET_H int osmo_stats_reporter_udp_open(struct osmo_stats_reporter *srep) { @@ -381,6 +392,7 @@ return rc; } +#endif /* HAVE_SYS_SOCKET_H */ /*** log reporter ***/ @@ -611,3 +623,5 @@ return 0; } + +#endif /* !EMBEDDED */ diff --git a/src/stats_statsd.c b/src/stats_statsd.c index 8b53881..342bb88 100644 --- a/src/stats_statsd.c +++ b/src/stats_statsd.c @@ -21,6 +21,9 @@ * */ +#include "config.h" +#if !defined(EMBEDDED) + #include <osmocom/core/stats.h> #include <string.h> @@ -167,3 +170,4 @@ statg->idx, desc->name, value, unit); } +#endif /* !EMBEDDED */ -- To view, visit https://gerrit.osmocom.org/1607 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6beb4fcc394ed7d3f8dd7a097b6e998245ecf401 Gerrit-PatchSet: 6 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Holger Freyther <holger at freyther.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max <msuraev at sysmocom.de>