tgraf · Rhack0703 · Aug 24, 2014 · Aug 24, 2014 · Aug 24, 2014 · Aug 24, 2014
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,40 @@
 language: c
+
+os:
+  - linux
+  - osx
+
+env:
+  global:
+    - secure: "C87Pgf5AVDoyQfm9MIv81g"
+
 compiler:
   - gcc
   - clang
-before_install:
-  - sudo apt-get install libconfuse-dev
-  - sudo apt-get install libnl-3-dev libnl-route-3-dev
-  - sudo apt-get install libncurses-dev
-# Change this to your needs
-script: ./autogen.sh && ./configure && make
+
+# container-based builds
+sudo: false
+addons:
+  apt:
+    packages:
+    # packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
+    - libconfuse-dev
+    - libncurses5-dev
+    - libnl-3-dev
+    - libnl-route-3-dev
+  coverity_scan:
+    project:
+      name: "tgraf/bmon"
+      description: "bandwidth monitor"
+    notification_email: [email protected]
+    build_command_prepend: "./autogen.sh && ./configure"
+    build_command: "make -j2"
+    branch_pattern: coverity_scan
+
+
+install:
+  - if [ "$TRAVIS_BRANCH" = "coverity_scan" ] && ! [ "$TRAVIS_OS_NAME" = "linux" -a "$CC" = "gcc" ]; then exit ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null && brew install confuse ; fi
+
+script:
+  - ./.travis/run.sh
diff --git a/.travis/run.sh b/.travis/run.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+FLAGS="-Werror"
+
+if [ $CC = "clang" ]; then
+	FLAGS="$FLAGS -Wno-error=unused-command-line-argument"
+fi
+
+./autogen.sh && ./configure && make CFLAGS="$FLAGS" && make distcheck
diff --git a/Makefile.am b/Makefile.am
@@ -4,4 +4,4 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src man include examples
 
-EXTRA_DIST = ChangeLog LICENSE.BSD LICENSE.MIT NEWS README.adoc
+EXTRA_DIST = ChangeLog LICENSE.BSD LICENSE.MIT NEWS README.md
diff --git a/NEWS b/NEWS
@@ -1,12 +1,46 @@
+HEAD
+
+v4.0 - Dec 13, 2016
+ * Use monotonic clock instead of realtime clock
+ * Pick default selected interface based on policy
+ * Collect RX NoHandler statistics if available (Linux)
+ * CentOS installation instructions
+ * Proper stdout flush in ASCII mode
+ * Bugfixes
+
+v3.9 - Jul 19, 2016
+ * Color support
+ * Add ability to reset statistics from curses UI
+ * NetBSD compile fix
+ * Option to enable info display by default
+ * Additional IPv6 statistics
+ * Various fixes
+
+v3.8 - July 25, 2015
+ * Don't disable Netlink if TC stats are unavailable
+
+v3.7 - November 22, 2014
+ * Bugfixes
+ * Documentation updates
+ * Provide minimal interface information on BSD
+
+v3.6 - November 22, 2014
+ * Build fix for uclinux
+ * Fix LICENSE links
+
+v3.5 - August 30, 2014
+ * Fixes for all defects identified by coverity
+ * Fix accuracy issue on total rate calculation
+ * Travis-CI support
+ * Various other small bugfixes
+
 v3.4 - August 24, 2014
-----------------------
  * Bugfixes
    * blank screen with config file
    * quick-help toggle with '?' in curses
  * Better bmon.conf example
 
 v3.3 - July 6, 2014
--------------------
  * MacOS X port
  * Only initialize curses module if actually used
  * Assorted bug and spelling fixes

diff --git a/README.md b/README.md
@@ -8,20 +8,86 @@ statistics and prepare them visually in a human friendly way. It
 features various output methods including an interactive curses user
 interface and a programmable text output for scripting.
 
-## Changes
-
-### New in 3.4
+## Download
+
+ * [Latest Release](https://github.com/tgraf/bmon/releases/latest)
+ * [Older Releases](https://github.com/tgraf/bmon/releases)
+
+## Debian/Ubuntu Installation
+
+```
+git clone https://github.com/tgraf/bmon.git
+cd bmon
+apt-get install build-essential make libconfuse-dev libnl-3-dev libnl-route-3-dev libncurses-dev pkg-config dh-autoreconf
+./autogen.sh
+./configure
+make
+make install
+bmon
+```
+## CentOS 6 Installation
+
+```
+git clone https://github.com/tgraf/bmon.git
+cd bmon
+yum install make libconfuse-devel libnl3-devel libnl-route3-devel ncurses-devel
+./autogen.sh
+./configure
+make
+make install
+bmon
+```
+
+## CentOS 7 Installation
+
+```
+yum install bmon
+```
+
+## Fedora Installation
+
+```
+dnf install bmon
+```
+
+## OSX Installation
+
+### Brew
+```
+brew install bmon
+```
+
+### Compile yourself
+Install libconfuse
+```
+wget https://github.com/martinh/libconfuse/releases/download/v2.8/confuse-2.8.zip
+unzip confuse-2.8.zip && cd confuse-2.8
+PATH=/usr/local/opt/gettext/bin:$PATH ./configure
+make
+make install
+```
+
+Install bmon
+```
+git clone https://github.com/tgraf/bmon.git
+cd bmon
+./autogen.sh
+./configure
+make
+make install
+bmon
+```
+
+-------------
+## New in 4.0
+ * Use monotonic clock instead of realtime clock
+ * Pick default selected interface based on policy
+ * Collect RX NoHandler statistics if available (Linux)
+ * CentOS installation instructions
+ * Proper stdout flush in ASCII mode
  * Bugfixes
-   * blank screen with config file
-   * quick-help toggle with '?' in curses
- * Better bmon.conf example
-
-## New in 3.3
- * MacOS X port
- * Only initialize curses module if actually used
- * Assorted bug and spelling fixes
- * Various build fixes
 
+-------------
 ### Usage
 
 To run bmon in the default curses mode:
@@ -35,14 +101,18 @@ provided via:
 
 ## Screenshots
 
-![Screenshot 1](https://github.com/tgraf/bmon/raw/gh-pages/images/shot1.png)
-![Screenshot 2](https://github.com/tgraf/bmon/raw/gh-pages/images/shot2.png)
+![Screenshot 1](https://github.com/tgraf/bmon/raw/gh-pages/images/shot3.png)
+![Screenshot 2](https://github.com/tgraf/bmon/raw/gh-pages/images/shot1.png)
+![Screenshot 3](https://github.com/tgraf/bmon/raw/gh-pages/images/shot2.png)
 
 ## Copyright
 
-> *Copyright (c) 2001-2014 Thomas Graf <[email protected]>
-> Copyright (c) 2013 Red Hat, Inc.*
+Various authors, see git commit log.
+
+> *Copyright (c) 2001-2016 Thomas Graf <[email protected]>*
+> *Copyright (c) 2013 Red Hat, Inc.*
 
-Please see the [LICENSE](https://github.com/tgraf/bmon/blob/master/LICENSE)
-file for additional details.
+Please see the [LICENSE.BSD](https://github.com/tgraf/bmon/blob/master/LICENSE.BSD)
+and [LICENSE.MIT](https://github.com/tgraf/bmon/blob/master/LICENSE.MIT) files for
+additional details.
 
diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 #
 # configure.in      Configure Script
 #
-# Copyright (c) 2001-2013 Thomas Graf <[email protected]>
+# Copyright (c) 2001-2016 Thomas Graf <[email protected]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-AC_INIT(bmon, 3.4, [], [], [http://www.infradead.org/~tgr/bmon/])
+AC_INIT(bmon, 4.0, [], [], [https://github.com/tgraf/bmon])
 AC_CONFIG_HEADERS(include/bmon/defs.h)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -58,10 +58,18 @@ AC_CHECK_HEADERS(sys/param.h sys/socket.h)
 
 AC_CHECK_TYPES(suseconds_t)
 
-AC_CHECK_FUNCS(atexit gettimeofday memset pow socket strcasecmp)
+AC_CHECK_FUNCS(atexit clock_gettime memset pow socket strcasecmp)
 AC_CHECK_FUNCS(strchr strdup strerror strncasecmp strstr strtol)
 AC_CHECK_FUNCS(uname getdate)
 
+AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
+AS_IF([test "x$PKG_CONFIG" = "xno"],[
+   AC_MSG_ERROR([
+      *** The pkg-config script could not be found. Make sure it is
+      *** in your path, or set the PKG_CONFIG environment variable
+      *** to the full path to pkg-config.])
+   ])
+
 AX_WITH_CURSES
 if test "x$ax_cv_curses" != xyes || test "x$ax_cv_curses_color" != xyes; then
         AC_MSG_ERROR([requires an X/Open-compatible Curses library with color])
@@ -70,14 +78,17 @@ fi
 PKG_CHECK_MODULES([CONFUSE], [libconfuse], [], AC_MSG_ERROR([requires libconfuse]))
 
 case ${target_os} in
-    linux*)
+    linux*|uclinux*)
         PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [], AC_MSG_ERROR([requires libnl3-dev]))
         PKG_CHECK_MODULES([LIBNL_ROUTE], [libnl-route-3.0], [], AC_MSG_ERROR([requires libnl3-route]))
     ;;
 esac
 
 AC_CHECK_LIB(m, pow, [], AC_MSG_ERROR([requires libm]))
 
+# Don't fail if not found (for instance, OS X does not have clock_gettime)
+AC_CHECK_LIB(rt, clock_gettime, [], [])
+
 BMON_LIB=""
 
 #####################################################################
@@ -164,7 +175,7 @@ case ${target_os} in
 	AC_DEFINE_UNQUOTED(SYS_SUNOS, "1", [operating system])
     ;;
 
-    *bsd*)
+    *bsd*|dragonfly*)
 	AC_DEFINE_UNQUOTED(SYS_BSD, "1", [operating system])
     ;;
 

diff --git a/examples/bmon.conf b/examples/bmon.conf
@@ -11,10 +11,10 @@
 
 /* 
  * element eth0 {
- * 	description	= { "My description" }
- * 	rxmax		= { 10000 }
- * 	txmax		= { 10000 }
- * 	max		= { 12500000 }
+ * 	description	= "My description"
+ * 	rxmax		= 10000
+ * 	txmax		= 10000
+ * 	max		= 12500000
  * }
  */
 
@@ -86,3 +86,27 @@ history day {
 	interval	= 86400.
 	size		= 60
 }
+
+layout colors {
+    color default {
+       color_pair  = {"white", "black"}
+    }
+    color statusbar {
+        color_pair = {"blue", "white", "reverse"}
+    }
+    color header {
+        color_pair = {"yellow", "black"}
+    }
+    color list {
+        color_pair = {"white", "black"}
+    }
+    color selected {
+        color_pair = {"white", "black", "reverse"}
+    }
+    color RX_graph {
+        color_pair = {"green", "black"}
+    }
+    color TX_graph {
+        color_pair = {"red", "black"}
+    }
+}
diff --git a/include/Makefile.am b/include/Makefile.am
@@ -16,4 +16,5 @@ noinst_HEADERS = \
 	bmon/module.h \
 	bmon/output.h \
 	bmon/unit.h \
+	bmon/layout.h \
 	bmon/utils.h
diff --git a/include/bmon/attr.h b/include/bmon/attr.h
@@ -42,13 +42,18 @@ struct rate
 	/* Value of r_current at last read */
 	uint64_t		r_prev;
 
+	/* Reset value to substract to emulate statistics reset */
+	uint64_t		r_reset;
+
 	/* Rate per second calculated every `rate_interval' */
 	float			r_rate;
 
 	/* Time of last calculation */
 	timestamp_t		r_last_calc;
 };
 
+extern uint64_t			rate_get_total(struct rate *);
+
 enum {
 	ATTR_TYPE_UNSPEC,
 	ATTR_TYPE_COUNTER,
@@ -134,5 +139,6 @@ extern struct attr *		attr_select_prev(void);
 extern struct attr *		attr_current(void);
 
 extern void			attr_start_collecting_history(struct attr *);
+extern void			attr_reset_counter(struct attr *a);
 
 #endif
diff --git a/include/bmon/bmon.h b/include/bmon/bmon.h
@@ -60,9 +60,11 @@ enum {
 #if defined __GNUC__
 #define __init __attribute__ ((constructor))
 #define __exit __attribute__ ((destructor))
+#define __unused__ __attribute__ ((unused))
 #else
 #define __init
 #define __exit
+#define __unused__
 #endif
 
 #ifdef DEBUG

diff --git a/include/bmon/conf.h b/include/bmon/conf.h
@@ -74,6 +74,8 @@ enum {
 	LAYOUT_HEADER,
 	LAYOUT_LIST,
 	LAYOUT_SELECTED,
+    LAYOUT_RX_GRAPH,
+    LAYOUT_TX_GRAPH,
 	__LAYOUT_MAX
 };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ ACLOCAL_AMFLAGS = -I m4

		SUBDIRS = src man include examples

		EXTRA_DIST = ChangeLog LICENSE.BSD LICENSE.MIT NEWS README.adoc
		EXTRA_DIST = ChangeLog LICENSE.BSD LICENSE.MIT NEWS README.md