12:38 p.m.
In August 2016, Feng Wang posted a patch that allowed the generation of
interface statistics files to be disabled at compile-time. It was never merged,
but I rediscovered it recently and realised it'd be useful to have a way to stop
those files from being generated on embedded systems, where file systems are
often on flash storage (putting writes at a premium) and the interface stats
themselves might not even be needed.
This is Feng's patch from 2016, cleaned up and updated for the current master
branch.
Chris Novakovic (1):
build: Add --disable-stats option
Makefile.am | 4 ++++
configure.ac | 5 +++++
src/stats.c | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+)
--
2.14.1
12:38 p.m.
New subject: [PATCH 1/1] build: Add --disable-stats option
Generation of interface statistics files can now be controlled at
compile-time using the --{enable,disable}-stats configure options.
Statistics files remain enabled by default.
---
Makefile.am | 4 ++++
configure.ac | 5 +++++
src/stats.c | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 97f1c87d..030b5b8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -244,6 +244,10 @@ else
AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
endif
+if STATS
+AM_CPPFLAGS += -DCONNMAN_WITH_STATS
+endif
+
src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
@GNUTLS_CFLAGS@ $(builtin_cflags) \
-DCONNMAN_PLUGIN_BUILTIN \
diff --git a/configure.ac b/configure.ac
index 3cdf4b29..cb6512f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -380,6 +380,11 @@ AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
[enable_tools=${enableval}])
AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
+AC_ARG_ENABLE(stats, AC_HELP_STRING([--disable-stats],
+ [disable statistics round robin file generation]),
+ [enable_stats=${enableval}])
+AM_CONDITIONAL(STATS, test "${enable_stats}" != "no")
+
if (test "${enable_tools}" != "no"); then
AC_PATH_PROGS(IPTABLES_SAVE, [iptables-save], [],
$PATH:/sbin:/usr/sbin)
diff --git a/src/stats.c b/src/stats.c
index 663bc382..70fd085d 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -37,6 +37,7 @@
#include "connman.h"
+#ifdef CONNMAN_WITH_STATS
#define MODE (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | \
S_IXGRP | S_IROTH | S_IXOTH)
@@ -825,3 +826,38 @@ void __connman_stats_cleanup(void)
g_hash_table_destroy(stats_hash);
stats_hash = NULL;
}
+
+#else
+
+int __connman_stats_service_register(struct connman_service *service)
+{
+ return -ENOTSUP;
+}
+
+void __connman_stats_service_unregister(struct connman_service *service)
+{
+}
+
+int __connman_stats_update(struct connman_service *service,
+ bool roaming,
+ struct connman_stats_data *data)
+{
+ return 0;
+}
+
+int __connman_stats_get(struct connman_service *service,
+ bool roaming,
+ struct connman_stats_data *data)
+{
+ return 0;
+}
+
+int __connman_stats_init(void)
+{
+ return 0;
+}
+
+void __connman_stats_cleanup(void)
+{
+}
+#endif /* CONNMAN_WITH_STATS */
--
2.14.1
1:15 p.m.
New subject: [PATCH 1/1] build: Add --disable-stats option
On 02/16/2018 01:38 PM, Chris Novakovic wrote:
Generation of interface statistics files can now be controlled at
compile-time using the --{enable,disable}-stats configure options.
Statistics files remain enabled by default.
If this is Feng Wang's patch, then you should have him as the patch
author... if you've massaged it into something unrecognizable, just
mention him as your source of inspiration in the patch comment.
---
Makefile.am | 4 ++++
configure.ac | 5 +++++
src/stats.c | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 97f1c87d..030b5b8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -244,6 +244,10 @@ else
AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
endif
+if STATS
+AM_CPPFLAGS += -DCONNMAN_WITH_STATS
+endif
+
src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
@GNUTLS_CFLAGS@ $(builtin_cflags) \
-DCONNMAN_PLUGIN_BUILTIN \
diff --git a/configure.ac b/configure.ac
index 3cdf4b29..cb6512f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -380,6 +380,11 @@ AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
[enable_tools=${enableval}])
AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
+AC_ARG_ENABLE(stats, AC_HELP_STRING([--disable-stats],
+ [disable statistics round robin file generation]),
+ [enable_stats=${enableval}])
+AM_CONDITIONAL(STATS, test "${enable_stats}" != "no")
Here you are setting a makefile variable in order to have your makefile
pass a definition to the preprocessor. This might be better done with
AC_DEFINE(...) and making sure to #include "config.h" in src/stats.c.
/Jonas
7:35 a.m.
New subject: [PATCH 1/1] build: Add --disable-stats option
On 02/16/2018 02:15 PM, Jonas Bonn wrote:
On 02/16/2018 01:38 PM, Chris Novakovic wrote:
> Generation of interface statistics files can now be controlled at
> compile-time using the --{enable,disable}-stats configure options.
> Statistics files remain enabled by default.
If this is Feng Wang's patch, then you should have him as the patch
author... if you've massaged it into something unrecognizable, just
mention him as your source of inspiration in the patch comment.
Yes, please mention in the commit message this is based on Feng's work.
This is the only salary we can pay here :)
Thanks,
Daniel
9:24 p.m.
New subject: [PATCH 1/1] build: Add --disable-stats option
On 16/02/18 13:15, Jonas Bonn wrote:
On 02/16/2018 01:38 PM, Chris Novakovic wrote:
> Generation of interface statistics files can now be controlled at
> compile-time using the --{enable,disable}-stats configure options.
> Statistics files remain enabled by default.
If this is Feng Wang's patch, then you should have him as the patch
author... if you've massaged it into something unrecognizable, just
mention him as your source of inspiration in the patch comment.
Sorry, that wasn't intentional: this is the first time I've submitted a
patch anywhere using "git format-patch" and when I wrote it my
impression was that the content of the cover letter (and therefore the
credit to Feng) would end up in the log. The patch is now substantially
different to Feng's original (see below), so I've credited him at the
end of the commit message.
> ---
> Makefile.am | 4 ++++
> configure.ac | 5 +++++
> src/stats.c | 36 ++++++++++++++++++++++++++++++++++++
> 3 files changed, 45 insertions(+)
>
> diff --git a/Makefile.am b/Makefile.am
> index 97f1c87d..030b5b8f 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -244,6 +244,10 @@ else
> AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
> endif
> +if STATS
> +AM_CPPFLAGS += -DCONNMAN_WITH_STATS
> +endif
> +
> src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
> @GNUTLS_CFLAGS@ $(builtin_cflags) \
> -DCONNMAN_PLUGIN_BUILTIN \
> diff --git a/configure.ac b/configure.ac
> index 3cdf4b29..cb6512f5 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -380,6 +380,11 @@ AC_ARG_ENABLE(tools,
> AC_HELP_STRING([--disable-tools],
> [enable_tools=${enableval}])
> AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
> +AC_ARG_ENABLE(stats, AC_HELP_STRING([--disable-stats],
> + [disable statistics round robin file generation]),
> + [enable_stats=${enableval}])
> +AM_CONDITIONAL(STATS, test "${enable_stats}" != "no")
Here you are setting a makefile variable in order to have your makefile
pass a definition to the preprocessor. This might be better done with
AC_DEFINE(...) and making sure to #include "config.h" in src/stats.c.
I'm now instead using AC_DEFINE to define STATS, whose existence is
checked inside each relevant function in stats.c rather than defining a
whole new group of function stubs (which might become difficult to
maintain if more functions are added further down the line).
9:38 p.m.
New subject: [PATCH v2] build: Add --disable-stats option
Generation of interface statistics files can now be controlled at
compile-time using the --{enable,disable}-stats configure options.
Statistics files remain enabled by default.
Based on an idea by Feng Wang <wangfe(a)nestlabs.com>.
---
configure.ac | 6 ++++++
src/stats.c | 14 ++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/configure.ac b/configure.ac
index 3cdf4b29..33c494c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -380,6 +380,12 @@ AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
[enable_tools=${enableval}])
AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
+AC_ARG_ENABLE(stats, AC_HELP_STRING([--disable-stats],
+ [disable statistics round robin file generation]),
+ [if test "${enableval}" != "no"; then
+ AC_DEFINE([STATS], [1], [Statistics round robin file support.]) fi],
+ [AC_DEFINE([STATS], [1], [Statistics round robin file support.])])
+
if (test "${enable_tools}" != "no"); then
AC_PATH_PROGS(IPTABLES_SAVE, [iptables-save], [],
$PATH:/sbin:/usr/sbin)
diff --git a/src/stats.c b/src/stats.c
index 663bc382..94f2ec6f 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -671,6 +671,7 @@ static int stats_file_history_update(struct stats_file *data_file)
int __connman_stats_service_register(struct connman_service *service)
{
+#ifdef STATS
struct stats_file *file;
char *name, *dir;
int err;
@@ -729,19 +730,25 @@ err:
g_hash_table_remove(stats_hash, service);
return err;
+#else
+ return -ENOTSUP;
+#endif /* ifdef STATS */
}
void __connman_stats_service_unregister(struct connman_service *service)
{
+#ifdef STATS
DBG("service %p", service);
g_hash_table_remove(stats_hash, service);
+#endif /* ifdef STATS */
}
int __connman_stats_update(struct connman_service *service,
bool roaming,
struct connman_stats_data *data)
{
+#ifdef STATS
struct stats_file *file;
struct stats_record *next;
int err;
@@ -780,6 +787,7 @@ int __connman_stats_update(struct connman_service *service,
set_roaming(file, next);
set_end(file, next);
+#endif /* ifdef STATS */
return 0;
}
@@ -788,6 +796,7 @@ int __connman_stats_get(struct connman_service *service,
bool roaming,
struct connman_stats_data *data)
{
+#ifdef STATS
struct stats_file *file;
struct stats_record *rec;
@@ -804,24 +813,29 @@ int __connman_stats_get(struct connman_service *service,
memcpy(data, &rec->data,
sizeof(struct connman_stats_data));
}
+#endif /* ifdef STATS */
return 0;
}
int __connman_stats_init(void)
{
+#ifdef STATS
DBG("");
stats_hash = g_hash_table_new_full(g_direct_hash, g_direct_equal,
NULL, stats_free);
+#endif /* ifdef STATS */
return 0;
}
void __connman_stats_cleanup(void)
{
+#ifdef STATS
DBG("");
g_hash_table_destroy(stats_hash);
stats_hash = NULL;
+#endif /* ifdef STATS */
}
--
2.14.1
8:07 a.m.
New subject: [PATCH v2] build: Add --disable-stats option
Hi Chris,
On 02/26/2018 10:38 PM, Chris Novakovic wrote:
Generation of interface statistics files can now be controlled at
compile-time using the --{enable,disable}-stats configure options.
Statistics files remain enabled by default.
Based on an idea by Feng Wang <wangfe(a)nestlabs.com>.
Thanks for updating the commit message
Though these in-file ifdefs are not okay. Create a new file, e.g.
nostats.c, which contains the empty implementation of the functions. And
then include according the configuration either the stats.c or nostats.c
into the build.
See how this has been done for WISPR.
if WISPR
gweb_sources += gweb/giognutls.h gweb/giognutls.c
else
gweb_sources += gweb/giognutls.h gweb/gionotls.c
endif
Thanks,
Daniel
5:57 p.m.
New subject: [PATCH v2] build: Add --disable-stats option
On 28/02/18 08:07, Daniel Wagner wrote:
Though these in-file ifdefs are not okay. Create a new file, e.g.
nostats.c, which contains the empty implementation of the functions. And
then include according the configuration either the stats.c or nostats.c
into the build.
See how this has been done for WISPR.
if WISPR
gweb_sources += gweb/giognutls.h gweb/giognutls.c
else
gweb_sources += gweb/giognutls.h gweb/gionotls.c
endif
Okay, updated patch coming up.
5:59 p.m.
New subject: [PATCH v3] build: Add --disable-stats option
Generation of interface statistics files can now be controlled at
compile-time using the --{enable,disable}-stats configure options.
Statistics files remain enabled by default.
Based on an idea by Feng Wang <wangfe(a)nestlabs.com>.
---
Makefile.am | 17 +++++++++++------
configure.ac | 5 +++++
src/nostats.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 73 insertions(+), 6 deletions(-)
create mode 100644 src/nostats.c
diff --git a/Makefile.am b/Makefile.am
index 97f1c87d..c94164f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,12 @@ else
gweb_sources += gweb/giognutls.h gweb/gionotls.c
endif
+if STATS
+stats_sources = src/stats.c
+else
+stats_sources = src/nostats.c
+endif
+
if BACKTRACE
backtrace_sources = src/backtrace.c
endif
@@ -106,9 +112,9 @@ MANUAL_PAGES =
sbin_PROGRAMS = src/connmand src/connmand-wait-online
-src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) $(backtrace_sources) \
- $(builtin_sources) $(shared_sources) src/connman.ver \
- src/main.c src/connman.h src/log.c \
+src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) $(stats_sources) \
+ $(backtrace_sources) $(builtin_sources) $(shared_sources) \
+ src/connman.ver src/main.c src/connman.h src/log.c \
src/error.c src/plugin.c src/task.c \
src/device.c src/network.c src/connection.c \
src/manager.c src/service.c \
@@ -120,9 +126,8 @@ src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources)
$(backtrace_sources) \
src/storage.c src/dbus.c src/config.c \
src/technology.c src/counter.c src/ntp.c \
src/session.c src/tethering.c src/wpad.c src/wispr.c \
- src/stats.c src/6to4.c \
- src/ippool.c src/bridge.c src/nat.c src/ipaddress.c \
- src/inotify.c src/ipv6pd.c src/peer.c \
+ src/6to4.c src/ippool.c src/bridge.c src/nat.c \
+ src/ipaddress.c src/inotify.c src/ipv6pd.c src/peer.c \
src/peer_service.c src/machine.c src/util.c
if INTERNAL_DNS_BACKEND
diff --git a/configure.ac b/configure.ac
index 3cdf4b29..c1f037dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -380,6 +380,11 @@ AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
[enable_tools=${enableval}])
AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
+AC_ARG_ENABLE(stats, AC_HELP_STRING([--disable-stats],
+ [disable statistics round robin file generation]),
+ [enable_stats=${enableval}])
+AM_CONDITIONAL(STATS, test "${enable_stats}" != "no")
+
if (test "${enable_tools}" != "no"); then
AC_PATH_PROGS(IPTABLES_SAVE, [iptables-save], [],
$PATH:/sbin:/usr/sbin)
diff --git a/src/nostats.c b/src/nostats.c
new file mode 100644
index 00000000..3d0dc793
--- /dev/null
+++ b/src/nostats.c
@@ -0,0 +1,57 @@
+/*
+ *
+ * Connection Manager
+ *
+ * Copyright (C) 2018 Chris Novakovic
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#define _GNU_SOURCE
+#include <errno.h>
+
+#include "connman.h"
+
+int __connman_stats_service_register(struct connman_service *service)
+{
+ return -ENOTSUP;
+}
+
+void __connman_stats_service_unregister(struct connman_service *service)
+{
+}
+
+int __connman_stats_update(struct connman_service *service,
+ bool roaming,
+ struct connman_stats_data *data)
+{
+ return 0;
+}
+
+int __connman_stats_get(struct connman_service *service,
+ bool roaming,
+ struct connman_stats_data *data)
+{
+ return 0;
+}
+
+int __connman_stats_init(void)
+{
+ return 0;
+}
+
+void __connman_stats_cleanup(void)
+{
+}
--
2.14.1
5:56 a.m.
New subject: [PATCH v3] build: Add --disable-stats option
Hi Chris,
On 03/04/2018 06:59 PM, Chris Novakovic wrote:
Generation of interface statistics files can now be controlled at
compile-time using the --{enable,disable}-stats configure options.
Statistics files remain enabled by default.
Based on an idea by Feng Wang <wangfe(a)nestlabs.com>.
Patch applied.
Thanks,
Daniel
1572
days inactive
1592
days old
9 comments
3 participants
participants (3)
-
Chris Novakovic -
Daniel Wagner -
Jonas Bonn