Merged changes in configure.in and Makefile.am to the `quota' branch

diff --git a/configure.in b/configure.in
index 2613926e1da27e1b8e0c88385f69aae5de55198c..ad4e77eadc88eff593bd2b1a6af97072a005603c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE(collectd, 3.4.0-quota)
 AM_CONFIG_HEADER(src/config.h src/libping/config.h)
 AC_LANG(C)
 
-#AC_PREFIX_DEFAULT("/opt/collectd-3.4.0")
+AC_PREFIX_DEFAULT("/opt/collectd")
 
 dnl Checks for programs.
 AC_PROG_CC

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..3198d15
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,118 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+PLUGINS = cpu cpufreq disk hddtemp load memory nfs ping processes sensors serial swap traffic
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -O0
+else
+       CFLAGS += -O2
+endif
+
+config.status: configure
+       dh_testdir
+       # Add here commands to configure the package.
+       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --localstatedir=/var
+
+
+build: build-stamp
+
+build-stamp:  config.status
+       dh_testdir
+
+       # Add here commands to compile the package.
+       $(MAKE)
+       #docbook-to-man debian/collectd.sgml > collectd.1
+
+       touch build-stamp
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp 
+
+       # Add here commands to clean up after the build process.
+       -$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+       cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+       cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+       dh_clean 
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k 
+       dh_installdirs
+
+       for PLUGIN in $(PLUGINS); do \
+               mkdir -p $(CURDIR)/debian/collectd-$${PLUGIN}/usr/lib/collectd; \
+       done
+
+       # Add here commands to install the package into debian/collectd.
+       $(MAKE) DESTDIR=$(CURDIR)/debian/collectd install
+       rm $(CURDIR)/debian/collectd/usr/lib/collectd/*.a  || true
+       rm $(CURDIR)/debian/collectd/usr/lib/collectd/*.la || true
+
+       for PLUGIN in $(PLUGINS); do \
+               mv $(CURDIR)/debian/collectd/usr/lib/collectd/$${PLUGIN}.* $(CURDIR)/debian/collectd-$${PLUGIN}/usr/lib/collectd; \
+       done
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs ChangeLog
+       dh_installdocs
+       dh_installexamples
+#      dh_install
+#      dh_installmenu
+#      dh_installdebconf       
+#      dh_installlogrotate
+#      dh_installemacsen
+#      dh_installpam
+#      dh_installmime
+       dh_installinit
+#      dh_installcron
+#      dh_installinfo
+       dh_installman
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+#      dh_perl
+#      dh_python
+#      dh_makeshlibs
+       dh_installdeb
+#      dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 

diff --git a/src/Makefile.am b/src/Makefile.am
index d2fd0b3d6786f0735fe018e5429a9418d6944e55..49f40f8f47d65720685df91ae8e9f8e244f2a887 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,8 @@ collectd_SOURCES = collectd.c collectd.h \
                   common.c common.h \
                   multicast.c multicast.h \
                   plugin.c plugin.h
-collectd_CFLAGS = -DPLUGINDIR='"$(pkglibdir)"'
+#collectd_CFLAGS = -DPLUGINDIR='"$(pkglibdir)"'
+collectd_CPPFLAGS = -DLOCALSTATEDIR='"$(localstatedir)"' -DPLUGINDIR='"$(pkglibdir)"'
 collectd_LDFLAGS = -dlopen self
 if BUILD_WITH_RRDTOOL
 collectd_LDFLAGS += -lrrd

diff --git a/src/collectd.c b/src/collectd.c
new file mode 100644 (file)
index 0000000..dabc346
--- /dev/null
+++ b/src/collectd.c
@@ -0,0 +1,383 @@
+#include "collectd.h"
+
+#include "multicast.h"
+#include "plugin.h"
+
+#include "ping.h"
+
+static int loop = 0;
+
+#ifdef HAVE_LIBKSTAT
+kstat_ctl_t *kc;
+#endif /* HAVE_LIBKSTAT */
+
+#if COLLECT_PING
+char *pinghosts[MAX_PINGHOSTS];
+int   num_pinghosts = 0;
+#endif
+
+/*
+ * exported variables
+ */
+time_t curtime;
+
+#ifdef HAVE_LIBRRD
+int operating_mode;
+#endif
+
+void sigIntHandler (int signal)
+{
+       loop++;
+}
+
+int change_basedir (char *dir)
+{
+       int dirlen = strlen (dir);
+       
+       while ((dirlen > 0) && (dir[dirlen - 1] == '/'))
+               dir[--dirlen] = '\0';
+
+       if (dirlen <= 0)
+               return (-1);
+
+       if (chdir (dir) == -1)
+       {
+               if (errno == ENOENT)
+               {
+                       if (mkdir (dir, 0755) == -1)
+                       {
+                               syslog (LOG_ERR, "mkdir: %s", strerror (errno));
+                               return (-1);
+                       }
+                       else if (chdir (dir) == -1)
+                       {
+                               syslog (LOG_ERR, "chdir: %s", strerror (errno));
+                               return (-1);
+                       }
+               }
+               else
+               {
+                       syslog (LOG_ERR, "chdir: %s", strerror (errno));
+                       return (-1);
+               }
+       }
+
+       return (0);
+}
+
+#ifdef HAVE_LIBKSTAT
+void update_kstat (void)
+{
+       if (kc == NULL)
+       {
+               if ((kc = kstat_open ()) == NULL)
+                       syslog (LOG_ERR, "Unable to open kstat control structure");
+       }
+       else
+       {
+               kid_t kid;
+               kid = kstat_chain_update (kc);
+               if (kid > 0)
+               {
+                       syslog (LOG_INFO, "kstat chain has been updated");
+                       plugin_init_all ();
+               }
+               else if (kid < 0)
+                       syslog (LOG_ERR, "kstat chain update failed");
+               /* else: everything works as expected */
+       }
+
+       return;
+}
+#endif /* HAVE_LIBKSTAT */
+
+void exit_usage (char *name)
+{
+       printf ("Usage: %s [OPTIONS]\n\n"
+                       
+                       "Available options:\n"
+                       "  General:\n"
+                       "    -d <dir>        Base directory to use.\n"
+                       "                    Default: %s\n"
+                       "    -P <dir>        Set the plugin-directory\n"
+                       "                    Default: %s\n"
+                       "    -f              Don't fork to the background\n"
+#ifdef HAVE_LIBRRD
+                       "    -l              Start in local mode (no network)\n"
+                       "    -c              Start in client (sender) mode\n"
+                       "    -s              Start in server (listener) mode\n"
+#endif /* HAVE_LIBRRD */
+#if COLLECT_PING
+                       "  Ping:\n"
+                       "    -p <host>       Host to ping periodically, may be repeated to ping\n"
+                       "                    more than one host.\n"
+#endif /* COLLECT_PING */
+                       "\n%s %s, http://verplant.org/collectd/\n"
+                       "by Florian octo Forster <octo@verplant.org>\n"
+                       "for contributions see `AUTHORS'\n",
+                       PACKAGE, DATADIR, PLUGINDIR, PACKAGE, VERSION);
+       exit (0);
+}
+
+int start_client (void)
+{
+       int sleepingtime;
+
+#ifdef HAVE_LIBKSTAT
+       kc = NULL;
+       update_kstat ();
+#endif
+
+#ifdef HAVE_LIBSTATGRAB
+       if (sg_init ())
+       {
+               syslog (LOG_ERR, "sg_init: %s", sg_str_error (sg_get_error ()));
+               return (-1);
+       }
+
+       if (sg_drop_privileges ())
+       {
+               syslog (LOG_ERR, "sg_drop_privileges: %s", sg_str_error (sg_get_error ()));
+               return (-1);
+       }
+#endif
+
+       plugin_init_all ();
+
+       while (loop == 0)
+       {
+               curtime = time (NULL);
+#ifdef HAVE_LIBKSTAT
+               update_kstat ();
+#endif
+               plugin_read_all ();
+
+               sleepingtime = 10;
+               while (sleepingtime != 0)
+               {
+                       if (loop != 0)
+                               break;
+                       sleepingtime = sleep (sleepingtime);
+               }
+       }
+
+       return (0);
+}
+
+#ifdef HAVE_LIBRRD
+int start_server (void)
+{
+       char *host;
+       char *type;
+       char *instance;
+       char *values;
+
+       while (loop == 0)
+       {
+               if (multicast_receive (&host, &type, &instance, &values) == 0)
+                       plugin_write (host, type, instance, values);
+
+               if (host     != NULL) free (host);     host     = NULL;
+               if (type     != NULL) free (type);     type     = NULL;
+               if (instance != NULL) free (instance); instance = NULL;
+               if (values   != NULL) free (values);   values   = NULL;
+       }
+       
+       return (0);
+}
+#endif /* HAVE_LIBRRD */
+
+int pidfile_create (void)
+{
+       FILE *fh;
+
+       if ((fh = fopen (PIDFILE, "w")) == NULL)
+       {
+               syslog (LOG_ERR, "fopen (pidfile): %s", strerror (errno));
+               return (1);
+       }
+
+       fprintf (fh, "%d\n", getpid());
+       fclose(fh);
+
+       return (0);
+}
+
+int pidfile_remove (void)
+{
+      return (unlink (PIDFILE));
+}
+
+int main (int argc, char **argv)
+{
+       struct sigaction sigIntAction, sigChldAction;
+       pid_t pid;
+
+       char *plugindir = NULL;
+       char *basedir = DATADIR;
+
+       int daemonize = 1;
+
+#ifdef HAVE_LIBRRD
+       operating_mode = MODE_LOCAL;
+#endif
+       
+       /*
+        * open syslog
+        */
+       openlog (PACKAGE, LOG_CONS | LOG_PID, LOG_DAEMON);
+
+       /*
+        * read options
+        */
+       while (1)
+       {
+               int c;
+
+               c = getopt (argc, argv, "d:fP:h"
+#if HAVE_LIBRRD
+                               "csl"
+#endif /* HAVE_LIBRRD */
+#if COLLECT_PING
+                               "p:"
+#endif /* COLLECT_PING */
+               );
+
+               if (c == -1)
+                       break;
+
+               switch (c)
+               {
+#ifdef HAVE_LIBRRD
+                       case 'c':
+                               operating_mode = MODE_CLIENT;
+                               break;
+
+                       case 's':
+                               operating_mode = MODE_SERVER;
+                               break;
+
+                       case 'l':
+                               operating_mode = MODE_LOCAL;
+                               break;
+#endif /* HAVE_LIBRRD */
+                       case 'd':
+                               basedir = optarg;
+                               break;
+                       case 'f':
+                               daemonize = 0;
+                               break;
+#if COLLECT_PING
+                       case 'p':
+                               if (num_pinghosts < MAX_PINGHOSTS)
+                                       pinghosts[num_pinghosts++] = optarg;
+                               else
+                                       fprintf (stderr, "Maximum of %i ping hosts reached.\n", MAX_PINGHOSTS);
+                               break;
+#endif /* COLLECT_PING */
+                       case 'P':
+                               plugindir = optarg;
+                               break;
+
+                       case 'h':
+                       default:
+                               exit_usage (argv[0]);
+               }
+                               
+       }
+
+       /*
+        * Load plugins and change to output directory
+        * Loading plugins is done first so relative paths work as expected..
+        */
+       if (plugin_load_all (plugindir) < 1)
+       {
+               fprintf (stderr, "Error: No plugins found.\n");
+               return (1);
+       }
+
+       if (change_basedir (basedir))
+       {
+               fprintf (stderr, "Error: Unable to change to directory `%s'.\n", basedir);
+               return (1);
+       }
+
+       /*
+        * install signal handlers
+        */
+       sigIntAction.sa_handler = sigIntHandler;
+       sigaction (SIGINT, &sigIntAction, NULL);
+
+       sigChldAction.sa_handler = SIG_IGN;
+       sigaction (SIGCHLD, &sigChldAction, NULL);
+
+       /*
+        * fork off child
+        */
+#if DEBUG == 0
+       if (daemonize)
+       {
+               if ((pid = fork ()) == -1)
+               {
+                       /* error */
+                       fprintf (stderr, "fork: %s", strerror (errno));
+                       return (1);
+               }
+               else if (pid != 0)
+               {
+                       /* parent */
+                       /* printf ("Running (PID %i)\n", pid); */
+                       return (0);
+               }
+
+               /* Detach from session */
+               setsid ();
+
+               /* Write pidfile */
+               if (pidfile_create ())
+                       exit (2);
+
+               /* close standard descriptors */
+               close (2);
+               close (1);
+               close (0);
+
+               if (open ("/dev/null", O_RDWR) != 0)
+               {
+                       syslog (LOG_ERR, "Error: Could not connect `STDIN' to `/dev/null'");
+                       return (1);
+               }
+               if (dup (0) != 1)
+               {
+                       syslog (LOG_ERR, "Error: Could not connect `STDOUT' to `/dev/null'");
+                       return (1);
+               }
+               if (dup (0) != 2)
+               {
+                       syslog (LOG_ERR, "Error: Could not connect `STDERR' to `/dev/null'");
+                       return (1);
+               }
+       } /* if (daemonize) */
+#endif
+
+       /*
+        * run the actual loops
+        */
+#ifdef HAVE_LIBRRD
+       if (operating_mode == MODE_SERVER)
+               start_server ();
+       else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL) */
+#endif
+               start_client ();
+
+       /*
+        * close syslog
+        */
+       syslog (LOG_INFO, "Exiting normally");
+       closelog ();
+
+       if (daemonize)
+               pidfile_remove();
+
+       return (0);
+}

diff --git a/src/collectd.h b/src/collectd.h
index 31395a5494c9ffa78f50566043a510b57ec89782..b9d7d2230b652a9eabd2d2aeba14d8567f3b70ac 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -77,8 +77,20 @@
 #define DEBUG 0
 #endif
 
+#ifndef LOCALSTATEDIR
+#define LOCALSTATEDIR "/opt/collectd/var"
+#endif
+
+#ifndef DATADIR
+#define DATADIR LOCALSTATEDIR"/lib/collectd"
+#endif
+
 #ifndef PLUGINDIR
-#define PLUGINDIR "/usr/lib/collectd"
+#define PLUGINDIR "/opt/collectd/lib/collectd"
+#endif
+
+#ifndef PIDFILE
+#define PIDFILE LOCALSTATEDIR"/run/collectd.pid"
 #endif
 
 #define MODE_SERVER 0x01