From 2c3d7019042a3bee86d973fb97e10e4cc3ff528e Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 23 Jun 2008 23:22:28 +0200 Subject: [PATCH] build system: Rename `rrdd' to `rrdcached'. --- CONTRIBUTORS | 2 +- doc/Makefile.am | 2 +- doc/{rrdd.pod => rrdcached.pod} | 22 ++++++++++------------ src/Makefile.am | 10 +++++----- src/rrd_daemon.c | 6 +++--- 5 files changed, 20 insertions(+), 22 deletions(-) rename doc/{rrdd.pod => rrdcached.pod} (63%) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 847c1d1..a2dc232 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -21,7 +21,7 @@ David Grimes SQRT/SORT/REV/SHIFT/TREND David L. Barker xport function bug fixes Evan Miller Multiplicative HW Enhancements Frank Strauss TCL bindings -Florian octo Forster rrd_restore libxml2 rewrite deprecated function export +Florian octo Forster rrd_restore libxml2 rewrite, deprecated function export, rrdcached Henrik Storner functions for min/max values of data in graph Hermann Hueni (SunOS porting) Jakob Ilves HPUX 11 diff --git a/doc/Makefile.am b/doc/Makefile.am index dd898ce..05d637d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,7 +10,7 @@ CLEANFILES = *.1 *.html *.txt *-dircache RRD?.pod *.pdf *~ core *itemcache *.rej POD = bin_dec_hex.pod rrddump.pod rrdgraph_examples.pod rrdrestore.pod rrdupdate.pod \ cdeftutorial.pod rrdfetch.pod rrdgraph_graph.pod rrdthreads.pod rrdxport.pod \ - rpntutorial.pod rrdfirst.pod rrdgraph_rpn.pod rrdtool.pod rrdd.pod \ + rpntutorial.pod rrdfirst.pod rrdgraph_rpn.pod rrdtool.pod rrdcached.pod \ rrd-beginners.pod rrdinfo.pod rrdtune.pod rrdbuild.pod \ rrdcgi.pod rrdgraph.pod rrdlast.pod rrdlastupdate.pod \ rrdcreate.pod rrdgraph_data.pod rrdresize.pod rrdtutorial.pod diff --git a/doc/rrdd.pod b/doc/rrdcached.pod similarity index 63% rename from doc/rrdd.pod rename to doc/rrdcached.pod index e0c322a..92c65cc 100644 --- a/doc/rrdd.pod +++ b/doc/rrdcached.pod @@ -2,19 +2,19 @@ =head1 NAME -RRDd - Data caching daemon for rrdtool +rrdcached - Data caching daemon for rrdtool =head1 SYNOPSIS -B [B<-l> I
] [B<-w> I] [B<-f> I] +B [B<-l> I
] [B<-w> I] [B<-f> I] =head1 DESCRIPTION -RRDd is a daemon that receives updates to existing RRD files, accumulates them -and, if enough have been received or a defined time has passed, writes the -updates to the RRD file. A I command may be used to force writing of -values to disk, so that graphing facilities and similar can work with -up-to-date data. +B is a daemon that receives updates to existing RRD files, +accumulates them and, if enough have been received or a defined time has +passed, writes the updates to the RRD file. A I command may be used to +force writing of values to disk, so that graphing facilities and similar can +work with up-to-date data. =head1 OPTIONS @@ -38,14 +38,12 @@ written to disk. This only concerns files to which updates have stopped, so setting this to a high value, such as 3600 seconds, is acceptable in most cases. +=back + =head1 BUGS =over 4 -=item - -Uses way too much CPU time after running for a while. - =item Base directory is currently hard coded. The daemon will chdir to C. @@ -58,5 +56,5 @@ L, L =head1 AUHOR -RRDd and this manual page have been written by Florian Forster +B and this manual page have been written by Florian Forster EoctoEatEverplant.orgE. diff --git a/src/Makefile.am b/src/Makefile.am index d7f82ec..371ebf5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -82,7 +82,7 @@ librrd_th_la_LIBADD = $(ALL_LIBS) include_HEADERS = rrd.h rrd_format.h -bin_PROGRAMS = rrdtool rrdupdate rrdd +bin_PROGRAMS = rrdtool rrdupdate rrdcached if BUILD_RRDCGI bin_PROGRAMS += rrdcgi @@ -98,10 +98,10 @@ rrdtool_SOURCES = rrd_tool.c rrdtool_DEPENDENCIES = librrd.la rrdtool_LDADD = librrd.la -rrdd_SOURCES = rrd_daemon.c -rrdd_DEPENDENCIES = librrd.la -rrdd_CPPFLAGS = -DVERSION='"$(VERSION)"' -rrdd_LDADD = librrd.la +rrdcached_SOURCES = rrd_daemon.c +rrdcached_DEPENDENCIES = librrd.la +rrdcached_CPPFLAGS = -DVERSION='"$(VERSION)"' +rrdcached_LDADD = librrd.la # strftime is here because we do not usually need it. unices have propper # iso date support diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c index df31d51..d738c73 100644 --- a/src/rrd_daemon.c +++ b/src/rrd_daemon.c @@ -949,7 +949,7 @@ static int daemonize (void) /* {{{ */ sigaction (SIGPIPE, &sa, NULL); } - openlog ("rrdd", LOG_PID, LOG_DAEMON); + openlog ("rrdcached", LOG_PID, LOG_DAEMON); cache_tree = g_tree_new ((GCompareFunc) strcmp); if (cache_tree == NULL) @@ -1052,7 +1052,7 @@ static int read_options (int argc, char **argv) /* {{{ */ case '?': printf ("RRDd %s Copyright (C) 2008 Florian octo Forster\n" "\n" - "Usage: rrdd [options]\n" + "Usage: rrdcached [options]\n" "\n" "Valid options are:\n" " -l
Socket address to listen to.\n" @@ -1061,7 +1061,7 @@ static int read_options (int argc, char **argv) /* {{{ */ "\n" "For more information and a detailed description of all options " "please refer\n" - "to the rrdd(1) manual page.\n", + "to the rrdcached(1) manual page.\n", VERSION); status = -1; break; -- 2.11.0