![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 412b079)
raw | patch | inline | side by side (parent: 412b079)
| author | Sebastian Harl <sh@tokkee.org> | |
| Fri, 30 May 2008 15:33:03 +0000 (17:33 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Fri, 30 May 2008 15:33:03 +0000 (17:33 +0200) |
103 files changed:
index 3e0cbc793bb64ffebc159ac9ecac6e511c990108..d18c59fea54b9564cf51dd0b49555c121997d16b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
+2008-05-26 08:56 oetiker
+
+ * bindings/perl-piped/RRDp.pm, bindings/perl-shared/RRDs.pm,
+ configure.ac, doc/rrdbuild.pod, rrdtool.spec, src/pngsize.c,
+ src/rrd.h, src/rrd_cgi.c, src/rrd_create.c, src/rrd_datalang.c,
+ src/rrd_diff.c, src/rrd_dump.c, src/rrd_error.c, src/rrd_fetch.c,
+ src/rrd_first.c, src/rrd_format.c, src/rrd_format.h,
+ src/rrd_gfx.c, src/rrd_graph.c, src/rrd_graph_helper.c,
+ src/rrd_hw.c, src/rrd_hw.h, src/rrd_i18n.h, src/rrd_info.c,
+ src/rrd_is_thread_safe.h, src/rrd_last.c, src/rrd_lastupdate.c,
+ src/rrd_not_thread_safe.c, src/rrd_open.c, src/rrd_resize.c,
+ src/rrd_restore.c, src/rrd_rpncalc.c, src/rrd_rpncalc.h,
+ src/rrd_thread_safe.c, src/rrd_thread_safe_nt.c, src/rrd_tool.c,
+ src/rrd_tool.h, src/rrd_tune.c, src/rrd_update.c,
+ src/rrd_version.c, src/rrd_xport.c, src/rrd_xport.h,
+ src/rrdupdate.c: prepare for the release of rrdtool-1.3rc6
+
+2008-05-26 07:46 oetiker
+
+ * NEWS: added notes about new grid lines
+
+2008-05-26 07:45 oetiker
+
+ * src/rrd_graph.c: * make y-axis labels NOT run into each other
+ (classic and alt) * space horizontal grid lines and lables a bit
+ further apart for tight layouts. * let horizontal lines and y axis
+ labels run a little closer for classic grid
+
+2008-05-25 21:17 oetiker
+
+ * src/rrd_graph.c: fixed calculation of space at the bottom of the
+ graph
+
+2008-05-25 20:02 oetiker
+
+ * bindings/perl-piped/RRDp.pm, bindings/perl-shared/RRDs.pm,
+ configure.ac, doc/rrdbuild.pod, rrdtool.spec, src/pngsize.c,
+ src/rrd.h, src/rrd_cgi.c, src/rrd_create.c, src/rrd_datalang.c,
+ src/rrd_diff.c, src/rrd_dump.c, src/rrd_error.c, src/rrd_fetch.c,
+ src/rrd_first.c, src/rrd_format.c, src/rrd_format.h,
+ src/rrd_gfx.c, src/rrd_graph.c, src/rrd_graph_helper.c,
+ src/rrd_hw.c, src/rrd_hw.h, src/rrd_i18n.h, src/rrd_info.c,
+ src/rrd_is_thread_safe.h, src/rrd_last.c, src/rrd_lastupdate.c,
+ src/rrd_not_thread_safe.c, src/rrd_open.c, src/rrd_resize.c,
+ src/rrd_restore.c, src/rrd_rpncalc.c, src/rrd_rpncalc.h,
+ src/rrd_thread_safe.c, src/rrd_thread_safe_nt.c, src/rrd_tool.c,
+ src/rrd_tool.h, src/rrd_tune.c, src/rrd_update.c,
+ src/rrd_version.c, src/rrd_xport.c, src/rrd_xport.h,
+ src/rrdupdate.c: prepare for the release of rrdtool-1.3rc5
+
+2008-05-25 20:00 oetiker
+
+ * src/rrd_format.h, src/rrd_open.c, src/rrd_update.c: fix update
+ compatibility with rrd-1.0.x files
+
+2008-05-20 22:22 oetiker
+
+ * bindings/Makefile.am: droped rrd_extra.h from the distro with the
+ python update ... must remove it from the Makefile too
+
+2008-05-19 21:14 oetiker
+
+ * NEWS, bindings/python/README, bindings/python/rrd_extra.h,
+ bindings/python/rrdtoolmodule.c, doc/rrdpython.pod: fixed python
+ bindings: * info call isnnow aequivalent to rrdtool info (the same
+ as in the perl and ruby bindings) * graphv and updatev calls added
+
+2008-05-18 22:11 oetiker
+
+ * src/rrd_gfx.c, src/rrd_graph.c, src/rrd_tool.c: * document
+ tabwidth option * fix \t -> tab expansion
+
+2008-05-18 15:39 oetiker
+
+ * src/rrd_graph.c: ytr boundery checking ... this is from the GD
+ days ... we don't need this anymore
+
+2008-05-18 15:11 oetiker
+
+ * src/rrd_dump.c, src/rrd_tool.c: fix indenting
+
+2008-05-18 15:11 oetiker
+
+ * src/rrd_graph.c: pdf, svg and ps formats were not being created
+
2008-05-18 13:06 oetiker
* bindings/perl-piped/RRDp.pm, bindings/perl-shared/RRDs.pm,
index 2d2abf789e59bb12c268f2dacf9fe3f8911bb480..b7c5e47245eba4973a7aae70b26b79133b77563c 100644 (file)
--- a/NEWS
+++ b/NEWS
RRDTOOL NEWS
============
+
+#####################################
Major Changes between 1.2.x and 1.3.x
+-------------------------------------
RRdtool dump / restore Incompatibilities
----------------------------------------
* draw dashed lines in graphs (Thomas Gutzler)
* new interface graphv which returns inforamation using the rrd_info
interface (Tobi Oetiker and Mark Plaksin)
+* improved horizontal grid. Have a bit more grid lines and y-axis labels
+ while keeping them fahr enough apart to not run into each other.
NEW Forecasting (Evan Miller)
-----------
available on your system. Use the configure option --disable-libintl if
you want to disable this feature
-Misc
-----
+Language Bindings
+-----------------
* ruby rrd_fetch will return step as a last property -- Mike Perham
+* python rrdtool.info does now conform with the data structure returned
+ by the other language bindings. This is incompatible with the
+ previous (broken) version --tobi
+
+* python bindings got updatev support --tobi
+
+* ruby, perl, python bindings support the new graphv interface --tobi
+
Locale Independent Numeric Input
--------------------------------
* Regardles of locale you are in, rrdtool always expects input to be numbers
(LC_NUMERIC) in C or POSIX locale for numbers. (not 1,1 but 1.1) this is
necessary to make things like RPN work as it uses , as a separator.
-RRDTOOL NEWS
-============
+######################################################################################
Major Changes between 1.0.x and 1.2.x
-
+======================================================================================
Graphing
--------
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index a0e0907b82d04f8100046474bac9cb718a9ea4f5..cd5cd217daa3b785814582ecda7167efac541e55 100644 (file)
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL perl-piped/RRDp.pm perl-piped/t/base.t \
perl-shared/ntmake.pl perl-shared/MANIFEST perl-shared/README perl-shared/Makefile.PL perl-shared/RRDs.pm perl-shared/RRDs.xs perl-shared/t/base.t \
ruby/CHANGES ruby/README ruby/extconf.rb ruby/main.c ruby/test.rb \
- python/ACKNOWLEDGEMENT python/AUTHORS python/COPYING python/README python/rrd_extra.h python/rrdtoolmodule.c python/setup.py
+ python/ACKNOWLEDGEMENT python/AUTHORS python/COPYING python/README python/rrdtoolmodule.c python/setup.py
# add the following to the all target
diff --git a/bindings/Makefile.in b/bindings/Makefile.in
index 968822c4689af71bbded23fd45cee21c783ec1de..94245b8044613694be052c592cd252344b9e5dce 100644 (file)
--- a/bindings/Makefile.in
+++ b/bindings/Makefile.in
EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL perl-piped/RRDp.pm perl-piped/t/base.t \
perl-shared/ntmake.pl perl-shared/MANIFEST perl-shared/README perl-shared/Makefile.PL perl-shared/RRDs.pm perl-shared/RRDs.xs perl-shared/t/base.t \
ruby/CHANGES ruby/README ruby/extconf.rb ruby/main.c ruby/test.rb \
- python/ACKNOWLEDGEMENT python/AUTHORS python/COPYING python/README python/rrd_extra.h python/rrdtoolmodule.c python/setup.py
+ python/ACKNOWLEDGEMENT python/AUTHORS python/COPYING python/README python/rrdtoolmodule.c python/setup.py
all: all-recursive
index e37104bd78f88fb351a9a06919122b2d724a760a..b016e88da0aee4ae7a7558dad695d892f40fab9f 100644 (file)
sub end ();
sub read ();
-$VERSION=1.299908051800;
+$VERSION=1.299908052600;
sub start ($){
croak "rrdtool is already running"
index b75c9f0a9268f6ca49c1f6f33edf79e78b8c0345..1246003e078d2d976fd6fda0b4fbb9f930b4b505 100644 (file)
require DynaLoader;
-$VERSION=1.299908051800;
+$VERSION=1.299908052600;
bootstrap RRDs $VERSION;
diff --git a/bindings/python/README b/bindings/python/README
index 265244f9a2fc7d652d16f1f05abf4633e8cd3e06..c234a6bbd88288e42fdc7a8b597e9bbe2e61de63 100644 (file)
--- a/bindings/python/README
+++ b/bindings/python/README
-Python-RRDtool 0.2.1
---------------------
+Based on Python-RRDtool 0.2.1
+-----------------------------
The python-rrdtool provides a interface to rrdtool, the wonderful
graphing and logging utility. This wrapper implementation has
Users & Hackers py-rrdtool-users@nongnu.org
-Author
-------
+Original Author
+---------------
Hye-Shik Chang <perky@FreeBSD.org>
Any comments, suggestions, and/or patches are very welcome.
Thank you for using py-rrdtool!
+
+
+CHANGES
+-------
+2008-05-19 - tobi
+* rewrote the info method to conform to rrdtool info standard
diff --git a/bindings/python/rrd_extra.h b/bindings/python/rrd_extra.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * This file is part of RRDtool.
- *
- * RRDtool is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * RRDtool 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 Foobar; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*****************************************************************************
- * RRDtool 1.0.37 Copyright Tobias Oetiker, 1997 - 2000
- *****************************************************************************
- * rrd_tool.h Common Header File
- *****************************************************************************
- * Id: rrd_tool.h,v 1.1.1.1 2002/02/26 10:21:37 oetiker Exp
- * Log: rrd_tool.h,v
- * Revision 1.1.1.1 2002/02/26 10:21:37 oetiker
- * Intial Import
- *
- *****************************************************************************/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _RRD_EXTRA_H
-#define _RRD_EXTRA_H
-
-#include "rrd_format.h"
-
-#ifndef WIN32
-#ifndef isnan /* POSIX */
- int isnan(
- double value);
-#endif
-#else /* Windows only */
-#include <float.h>
-#define isnan _isnan
-#endif
-
- void rrd_free(
- rrd_t *rrd);
- void rrd_init(
- rrd_t *rrd);
-
- int rrd_open(
- char *file_name,
- rrd_t *rrd,
- int rdwr);
- int readfile(
- char *file,
- char **buffer,
- int skipfirst);
-
-#define RRD_READONLY 0
-#define RRD_READWRITE 1
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
index f82973436a8c23063567247d845d36832243d2e7..37810f7c08fc47edb560ba9cd08c19d74d6a490e 100644 (file)
static const char *__version__ = "$Revision: 1.14 $";
#include "Python.h"
-#include "rrd.h"
-#include "rrd_extra.h"
+#include "../../src/rrd_tool.h"
+//#include "rrd.h"
+//#include "rrd_extra.h"
static PyObject *ErrorObject;
extern int optind;
return r;
}
+static PyObject *PyDict_FromInfo(
+ info_t *data)
+{
+ PyObject *r;
+ r = PyDict_New();
+ while (data){
+ PyObject *val = NULL;
+ switch (data->type) {
+ case RD_I_VAL:
+ val = isnan(data->value.u_val)
+ ? (Py_INCREF(Py_None), Py_None)
+ : PyFloat_FromDouble(data->value.u_val);
+ break;
+ case RD_I_CNT:
+ val = PyLong_FromUnsignedLong(data->value.u_cnt);
+ break;
+ case RD_I_INT:
+ val = PyLong_FromLong(data->value.u_int);
+ break;
+ case RD_I_STR:
+ val = PyString_FromString(data->value.u_str);
+ break;
+ case RD_I_BLO:
+ val = PyString_FromStringAndSize((char*)data->value.u_blo.ptr, data->value.u_blo.size);
+ break;
+ }
+ if (val){
+ PyDict_SetItemString(r,data->key,val);
+ }
+ data = data->next;
+ }
+ return r;
+}
+
static char PyRRD_info__doc__[] =
"info(filename): extract header information from an rrd";
PyObject UNUSED(*self),
PyObject * args)
{
- PyObject *r, *t, *ds;
- rrd_t rrd;
- char *filename;
- unsigned long i, j;
+ PyObject *r;
+ int argc;
+ char **argv;
+ info_t *data;
- if (!PyArg_ParseTuple(args, "s:info", &filename))
+ if (create_args("info", args, &argc, &argv) < 0)
return NULL;
-
- if (!rrd_open(filename, &rrd, RRD_READONLY) == -1) {
+
+ if ((data = rrd_info(argc, argv)) == NULL) {
PyErr_SetString(ErrorObject, rrd_get_error());
rrd_clear_error();
return NULL;
}
-#define DICTSET_STR(dict, name, value) \
- t = PyString_FromString(value); \
- PyDict_SetItemString(dict, name, t); \
- Py_DECREF(t);
-
-#define DICTSET_CNT(dict, name, value) \
- t = PyInt_FromLong((long)value); \
- PyDict_SetItemString(dict, name, t); \
- Py_DECREF(t);
-
-#define DICTSET_VAL(dict, name, value) \
- t = isnan(value) ? (Py_INCREF(Py_None), Py_None) : \
- PyFloat_FromDouble((double)value); \
- PyDict_SetItemString(dict, name, t); \
- Py_DECREF(t);
-
- r = PyDict_New();
-
- DICTSET_STR(r, "filename", filename);
- DICTSET_STR(r, "rrd_version", rrd.stat_head->version);
- DICTSET_CNT(r, "step", rrd.stat_head->pdp_step);
- DICTSET_CNT(r, "last_update", rrd.live_head->last_up);
-
- ds = PyDict_New();
- PyDict_SetItemString(r, "ds", ds);
- Py_DECREF(ds);
-
- for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
- PyObject *d;
-
- d = PyDict_New();
- PyDict_SetItemString(ds, rrd.ds_def[i].ds_nam, d);
- Py_DECREF(d);
-
- DICTSET_STR(d, "ds_name", rrd.ds_def[i].ds_nam);
- DICTSET_STR(d, "type", rrd.ds_def[i].dst);
- DICTSET_CNT(d, "minimal_heartbeat",
- rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt);
- DICTSET_VAL(d, "min", rrd.ds_def[i].par[DS_min_val].u_val);
- DICTSET_VAL(d, "max", rrd.ds_def[i].par[DS_max_val].u_val);
- DICTSET_STR(d, "last_ds", rrd.pdp_prep[i].last_ds);
- DICTSET_VAL(d, "value", rrd.pdp_prep[i].scratch[PDP_val].u_val);
- DICTSET_CNT(d, "unknown_sec",
- rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt);
- }
-
- ds = PyList_New(rrd.stat_head->rra_cnt);
- PyDict_SetItemString(r, "rra", ds);
- Py_DECREF(ds);
-
- for (i = 0; i < rrd.stat_head->rra_cnt; i++) {
- PyObject *d, *cdp;
+ r = PyDict_FromInfo(data);
+ info_free(data);
+ return r;
+}
- d = PyDict_New();
- PyList_SET_ITEM(ds, i, d);
+static char PyRRD_graphv__doc__[] =
+ "graphv is called in the same manner as graph";
- DICTSET_STR(d, "cf", rrd.rra_def[i].cf_nam);
- DICTSET_CNT(d, "rows", rrd.rra_def[i].row_cnt);
- DICTSET_CNT(d, "pdp_per_row", rrd.rra_def[i].pdp_cnt);
- DICTSET_VAL(d, "xff", rrd.rra_def[i].par[RRA_cdp_xff_val].u_val);
+static PyObject *PyRRD_graphv(
+ PyObject UNUSED(*self),
+ PyObject * args)
+{
+ PyObject *r;
+ int argc;
+ char **argv;
+ info_t *data;
- cdp = PyList_New(rrd.stat_head->ds_cnt);
- PyDict_SetItemString(d, "cdp_prep", cdp);
- Py_DECREF(cdp);
+ if (create_args("graphv", args, &argc, &argv) < 0)
+ return NULL;
+
+ if ((data = rrd_graph_v(argc, argv)) == NULL) {
+ PyErr_SetString(ErrorObject, rrd_get_error());
+ rrd_clear_error();
+ return NULL;
+ }
+ r = PyDict_FromInfo(data);
+ info_free(data);
+ return r;
+}
- for (j = 0; j < rrd.stat_head->ds_cnt; j++) {
- PyObject *cdd;
+static char PyRRD_updatev__doc__[] =
+ "updatev is called in the same manner as update";
- cdd = PyDict_New();
- PyList_SET_ITEM(cdp, j, cdd);
+static PyObject *PyRRD_updatev(
+ PyObject UNUSED(*self),
+ PyObject * args)
+{
+ PyObject *r;
+ int argc;
+ char **argv;
+ info_t *data;
- DICTSET_VAL(cdd, "value",
- rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
- j].scratch[CDP_val].u_val);
- DICTSET_CNT(cdd, "unknown_datapoints",
- rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
- j].scratch[CDP_unkn_pdp_cnt].u_cnt);
- }
+ if (create_args("updatev", args, &argc, &argv) < 0)
+ return NULL;
+
+ if ((data = rrd_update_v(argc, argv)) == NULL) {
+ PyErr_SetString(ErrorObject, rrd_get_error());
+ rrd_clear_error();
+ return NULL;
}
-
- rrd_free(&rrd);
-
+ r = PyDict_FromInfo(data);
+ info_free(data);
return r;
}
meth("last", PyRRD_last, PyRRD_last__doc__),
meth("resize", PyRRD_resize, PyRRD_resize__doc__),
meth("info", PyRRD_info, PyRRD_info__doc__),
+ meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__),
+ meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__),
{NULL, NULL, 0, NULL}
};
diff --git a/configure b/configure
index acfddca7a306f305741b712d7d26a60a1e1861fb..1cd40d3e895e5673c6f3342a26b3f47f250bba1d 100755 (executable)
--- a/configure
+++ b/configure
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for rrdtool 1.3rc4.
+# Generated by GNU Autoconf 2.61 for rrdtool 1.3rc6.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# Identity of this package.
PACKAGE_NAME='rrdtool'
PACKAGE_TARNAME='rrdtool'
-PACKAGE_VERSION='1.3rc4'
-PACKAGE_STRING='rrdtool 1.3rc4'
+PACKAGE_VERSION='1.3rc6'
+PACKAGE_STRING='rrdtool 1.3rc6'
PACKAGE_BUGREPORT=''
ac_default_prefix=/usr/local/rrdtool-$PACKAGE_VERSION
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures rrdtool 1.3rc4 to adapt to many kinds of systems.
+\`configure' configures rrdtool 1.3rc6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rrdtool 1.3rc4:";;
+ short | recursive ) echo "Configuration of rrdtool 1.3rc6:";;
esac
cat <<\_ACEOF
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rrdtool configure 1.3rc4
+rrdtool configure 1.3rc6
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rrdtool $as_me 1.3rc4, which was
+It was created by rrdtool $as_me 1.3rc6, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-NUMVERS=1.299908051800
+NUMVERS=1.299908052600
-LIBVERS=3:2:1
+LIBVERS=3:4:1
ac_aux_dir=
# Define the identity of the package.
PACKAGE='rrdtool'
- VERSION='1.3rc4'
+ VERSION='1.3rc6'
cat >>confdefs.h <<_ACEOF
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rrdtool $as_me 1.3rc4, which was
+This file was extended by rrdtool $as_me 1.3rc6, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-rrdtool config.status 1.3rc4
+rrdtool config.status 1.3rc6
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 5a73316f234a0032dcb60281d5c9c793569967a9..cbbce923a001620991c8a57130dc7b29df57e066 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl the official version number is
dnl a.b.c
-AC_INIT([rrdtool],[1.3rc4])
+AC_INIT([rrdtool],[1.3rc6])
dnl for testing a numberical version number comes handy
dnl the released version are
dnl a.bccc
dnl the devel versions will be something like
dnl a.b999yymmddhh
-NUMVERS=1.299908051800
+NUMVERS=1.299908052600
AC_SUBST(NUMVERS)
dnl for the linker to understand which version the library is compatible with
dnl
dnl see http://sourceware.org/autobook/autobook/autobook_91.html
dnl
-LIBVERS=3:2:1
+LIBVERS=3:4:1
AC_SUBST(LIBVERS)
AC_CANONICAL_TARGET
diff --git a/doc/bin_dec_hex.1 b/doc/bin_dec_hex.1
index a9b770ce52dbfcf56af14d76b7eb22e404c6477f..31a93a856c0b593bc7afc933117b613f77e8ec8c 100644 (file)
--- a/doc/bin_dec_hex.1
+++ b/doc/bin_dec_hex.1
.\" ========================================================================
.\"
.IX Title "BIN_DEC_HEX 1"
-.TH BIN_DEC_HEX 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH BIN_DEC_HEX 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
bin_dec_hex \- How to use binary, decimal, and hexadecimal notation.
.SH "DESCRIPTION"
diff --git a/doc/bin_dec_hex.txt b/doc/bin_dec_hex.txt
index d6c85193d759e86a1c2abc80222506758149b0d5..a253d8a1017437598e61f5364330929f7e6be0a7 100644 (file)
--- a/doc/bin_dec_hex.txt
+++ b/doc/bin_dec_hex.txt
-1.3rc4 2008-03-15 BIN_DEC_HEX(1)
+1.3rc6 2008-03-15 BIN_DEC_HEX(1)
diff --git a/doc/cdeftutorial.1 b/doc/cdeftutorial.1
index 90599b94814c778b11e9ed9eb0b0b0750a36b11e..7e2f4ac0a59b7381a8fd80a2f8db84d7420d5aea 100644 (file)
--- a/doc/cdeftutorial.1
+++ b/doc/cdeftutorial.1
.\" ========================================================================
.\"
.IX Title "CDEFTUTORIAL 1"
-.TH CDEFTUTORIAL 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH CDEFTUTORIAL 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
cdeftutorial \- Alex van den Bogaerdt's CDEF tutorial
.SH "DESCRIPTION"
diff --git a/doc/cdeftutorial.txt b/doc/cdeftutorial.txt
index 2a572d916e5b113536b69a037ffa71120f4def12..6d984812c70c77d6ae90b3851676339b2053a9e9 100644 (file)
--- a/doc/cdeftutorial.txt
+++ b/doc/cdeftutorial.txt
-1.3rc4 2008-03-15 CDEFTUTORIAL(1)
+1.3rc6 2008-03-15 CDEFTUTORIAL(1)
diff --git a/doc/rpntutorial.1 b/doc/rpntutorial.1
index ab56b0a741efb04d6bde5cd4e3e4f728b9ad364c..fd0411b0ffa851d813f23c271be179b0b7e33194 100644 (file)
--- a/doc/rpntutorial.1
+++ b/doc/rpntutorial.1
.\" ========================================================================
.\"
.IX Title "RPNTUTORIAL 1"
-.TH RPNTUTORIAL 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RPNTUTORIAL 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rpntutorial \- Reading RRDtool RPN Expressions by Steve Rader
.SH "DESCRIPTION"
diff --git a/doc/rpntutorial.txt b/doc/rpntutorial.txt
index 75f39cd5043aa32c0ebbd73e5675696912d680ad..b19819c3d8672429c6a528e5b9b6e9d505b25d77 100644 (file)
--- a/doc/rpntutorial.txt
+++ b/doc/rpntutorial.txt
-1.3rc4 2008-03-15 RPNTUTORIAL(1)
+1.3rc6 2008-03-15 RPNTUTORIAL(1)
diff --git a/doc/rrd-beginners.1 b/doc/rrd-beginners.1
index d554a2aa97d229f6e33faa6bdb1f7994570f1628..634b20b47f7b0a05898e9fbabf7486fb2fed1cce 100644 (file)
--- a/doc/rrd-beginners.1
+++ b/doc/rrd-beginners.1
.\" ========================================================================
.\"
.IX Title "RRD-BEGINNERS 1"
-.TH RRD-BEGINNERS 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRD-BEGINNERS 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrd\-beginners \- RRDtool Beginners' Guide
.SH "SYNOPSIS"
diff --git a/doc/rrd-beginners.txt b/doc/rrd-beginners.txt
index 39f76fcb10cd2ab825f50ee664201eccf04ba044..363431b8fc36a400d3341a240a5fe727e560a5f2 100644 (file)
--- a/doc/rrd-beginners.txt
+++ b/doc/rrd-beginners.txt
-1.3rc4 2008-03-15 RRD-BEGINNERS(1)
+1.3rc6 2008-03-15 RRD-BEGINNERS(1)
diff --git a/doc/rrdbuild.1 b/doc/rrdbuild.1
index 25457ae5e9520f465b4d8370d507949a3f363696..4ec1554c69fbaa4e296e13f33e1117cc859e9efc 100644 (file)
--- a/doc/rrdbuild.1
+++ b/doc/rrdbuild.1
.\" ========================================================================
.\"
.IX Title "RRDBUILD 1"
-.TH RRDBUILD 1 "2008-05-18" "1.3rc4" "rrdtool"
+.TH RRDBUILD 1 "2008-05-26" "1.3rc6" "rrdtool"
.SH "NAME"
rrdbuild \- Instructions for building RRDtool
.SH "OVERVIEW"
.PP
.Vb 2
\& BUILD_DIR=/tmp/rrdbuild
-\& INSTALL_DIR=/usr/local/rrdtool\-1.3rc4
+\& INSTALL_DIR=/usr/local/rrdtool\-1.3rc6
.Ve
.PP
If your \fI/tmp\fR is mounted with the option noexec (\s-1RHEL\s0 seems todo that) you have to choose
pre\-installed.
.PP
.Vb 4
-\& wget http://oss.oetiker.ch/rrdtool/pub/rrdtool\-1.3rc4.tar.gz
-\& gunzip \-c rrdtool\-1.3rc4.tar.gz | tar xf \-
-\& cd rrdtool\-1.3rc4
+\& wget http://oss.oetiker.ch/rrdtool/pub/rrdtool\-1.3rc6.tar.gz
+\& gunzip \-c rrdtool\-1.3rc6.tar.gz | tar xf \-
+\& cd rrdtool\-1.3rc6
\& ./configure \-\-prefix=$INSTALL_DIR && make && make install
.Ve
.PP
their current state.
.PP
.Vb 5
-\& cd $BUILD_DIR/rrdtool\-1.3rc4
+\& cd $BUILD_DIR/rrdtool\-1.3rc6
\& ./configure \-\-prefix=$INSTALL_DIR \-\-disable\-tcl \-\-disable\-python
\& $MAKE clean
\& $MAKE
diff --git a/doc/rrdbuild.html b/doc/rrdbuild.html
index e91a572fb7e3ec344eb599c208f345946f961c96..90fdc4cedddfb762f6cfd6de548ecbe4a9788c79 100644 (file)
--- a/doc/rrdbuild.html
+++ b/doc/rrdbuild.html
<p>Once you have decided. Save the two locations into environment variables.</p>
<pre>
BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/usr/local/rrdtool-1.3rc4</pre>
+ INSTALL_DIR=/usr/local/rrdtool-1.3rc6</pre>
<p>If your <em>/tmp</em> is mounted with the option noexec (RHEL seems todo that) you have to choose
a different directory!</p>
<p>Now make sure the BUILD_DIR exists and go there:</p>
<p>Lets first assume you already have all the necessary libraries
pre-installed.</p>
<pre>
- wget <a href="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc4.tar.gz">http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc4.tar.gz</a>
- gunzip -c rrdtool-1.3rc4.tar.gz | tar xf -
- cd rrdtool-1.3rc4
+ wget <a href="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc6.tar.gz">http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc6.tar.gz</a>
+ gunzip -c rrdtool-1.3rc6.tar.gz | tar xf -
+ cd rrdtool-1.3rc6
./configure --prefix=$INSTALL_DIR && make && make install</pre>
<p>Ok, this was very optimistic. This try will probably have ended with
<strong>configure</strong> complaining about several missing libraries.</p>
tcl setups that would prevent rrdtool from building if they are included in
their current state.</p>
<pre>
- cd $BUILD_DIR/rrdtool-1.3rc4
+ cd $BUILD_DIR/rrdtool-1.3rc6
./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
$MAKE clean
$MAKE
diff --git a/doc/rrdbuild.pod b/doc/rrdbuild.pod
index e02ac421ac16a8d0d8e14badb3c05d467ff1ba10..b2f6f896e7931a67a04847cf97b77b3c146e76e2 100644 (file)
--- a/doc/rrdbuild.pod
+++ b/doc/rrdbuild.pod
Once you have decided. Save the two locations into environment variables.
BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/usr/local/rrdtool-1.3rc4
+ INSTALL_DIR=/usr/local/rrdtool-1.3rc6
If your F</tmp> is mounted with the option noexec (RHEL seems todo that) you have to choose
Lets first assume you already have all the necessary libraries
pre-installed.
- wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc4.tar.gz
- gunzip -c rrdtool-1.3rc4.tar.gz | tar xf -
- cd rrdtool-1.3rc4
+ wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc6.tar.gz
+ gunzip -c rrdtool-1.3rc6.tar.gz | tar xf -
+ cd rrdtool-1.3rc6
./configure --prefix=$INSTALL_DIR && make && make install
Ok, this was very optimistic. This try will probably have ended with
tcl setups that would prevent rrdtool from building if they are included in
their current state.
- cd $BUILD_DIR/rrdtool-1.3rc4
+ cd $BUILD_DIR/rrdtool-1.3rc6
./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
$MAKE clean
$MAKE
diff --git a/doc/rrdbuild.txt b/doc/rrdbuild.txt
index e825521189917fc368ee17841b964ef1139e935e..11b83c142d588a0b6d14aec570c0d6e5278c2f07 100644 (file)
--- a/doc/rrdbuild.txt
+++ b/doc/rrdbuild.txt
ables.
BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/usr/local/rrdtool-1.3rc4
+ INSTALL_DIR=/usr/local/rrdtool-1.3rc6
If your _\b/_\bt_\bm_\bp is mounted with the option noexec (RHEL seems todo that)
you have to choose a different directory!
Lets first assume you already have all the necessary libraries
pre-installed.
- wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc4.tar.gz
- gunzip -c rrdtool-1.3rc4.tar.gz | tar xf -
- cd rrdtool-1.3rc4
+ wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3rc6.tar.gz
+ gunzip -c rrdtool-1.3rc6.tar.gz | tar xf -
+ cd rrdtool-1.3rc6
./configure --prefix=$INSTALL_DIR && make && make install
Ok, this was very optimistic. This try will probably have ended with
@@ -268,7 +268,7 @@ B\bBU\bUI\bIL\bLD\bDI\bIN\bNG\bG D\bDE\bEP\bPE\bEN\bND\bDE\bEN\bNC\bCI\bIE\bES\bS
python and tcl setups that would prevent rrdtool from building if they
are included in their current state.
- cd $BUILD_DIR/rrdtool-1.3rc4
+ cd $BUILD_DIR/rrdtool-1.3rc6
./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
$MAKE clean
$MAKE
-1.3rc4 2008-05-18 RRDBUILD(1)
+1.3rc6 2008-05-26 RRDBUILD(1)
diff --git a/doc/rrdcgi.1 b/doc/rrdcgi.1
index 45feb621b35afff1a88176ba185be33358937c03..458670ea3d70c5a1792449f4366ee393e0ceba2a 100644 (file)
--- a/doc/rrdcgi.1
+++ b/doc/rrdcgi.1
.\" ========================================================================
.\"
.IX Title "RRDCGI 1"
-.TH RRDCGI 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDCGI 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdcgi \- Create web pages containing RRD graphs based on templates
.SH "SYNOPSIS"
diff --git a/doc/rrdcgi.txt b/doc/rrdcgi.txt
index 5ffc399fd42d0294cc651d6084732e6704d142f5..60a83352b7b3f1b1945b8b3243640233cea59b31 100644 (file)
--- a/doc/rrdcgi.txt
+++ b/doc/rrdcgi.txt
-1.3rc4 2008-03-15 RRDCGI(1)
+1.3rc6 2008-03-15 RRDCGI(1)
diff --git a/doc/rrdcreate.1 b/doc/rrdcreate.1
index 8ceba9b227dee4ce38b3f938090b527f8fe2c86f..1eeb565da2e1ab1a2b846faa1513e593ab5f72ea 100644 (file)
--- a/doc/rrdcreate.1
+++ b/doc/rrdcreate.1
.\" ========================================================================
.\"
.IX Title "RRDCREATE 1"
-.TH RRDCREATE 1 "2008-05-12" "1.3rc4" "rrdtool"
+.TH RRDCREATE 1 "2008-05-12" "1.3rc6" "rrdtool"
.SH "NAME"
rrdcreate \- Set up a new Round Robin Database
.SH "SYNOPSIS"
diff --git a/doc/rrdcreate.txt b/doc/rrdcreate.txt
index 197959d5335442217aa8d2cc56ec6582bbc41ff0..170ddffe09c8a1a327c6721a7daf575106855ea4 100644 (file)
--- a/doc/rrdcreate.txt
+++ b/doc/rrdcreate.txt
-1.3rc4 2008-05-12 RRDCREATE(1)
+1.3rc6 2008-05-12 RRDCREATE(1)
diff --git a/doc/rrddump.1 b/doc/rrddump.1
index a3c8799931c5545a65ea0c6f44754f279c7a9ead..252eab862c677a0dde7e9128aad0c60ed4f0d4ae 100644 (file)
--- a/doc/rrddump.1
+++ b/doc/rrddump.1
.\" ========================================================================
.\"
.IX Title "RRDDUMP 1"
-.TH RRDDUMP 1 "2008-05-16" "1.3rc4" "rrdtool"
+.TH RRDDUMP 1 "2008-05-16" "1.3rc6" "rrdtool"
.SH "NAME"
rrddump \- dump the contents of an RRD to XML format
.SH "SYNOPSIS"
diff --git a/doc/rrddump.txt b/doc/rrddump.txt
index 163b0d6bb776c617fe62082bfbb184a66120c9bc..8a322804c672b6344ff5481fca07175a2114b56d 100644 (file)
--- a/doc/rrddump.txt
+++ b/doc/rrddump.txt
-1.3rc4 2008-05-16 RRDDUMP(1)
+1.3rc6 2008-05-16 RRDDUMP(1)
diff --git a/doc/rrdfetch.1 b/doc/rrdfetch.1
index 95912e630c5e2217f96e8100be18af33b77ee6a4..9539bae2bbde57c0d540bf49d864f9bae803b9be 100644 (file)
--- a/doc/rrdfetch.1
+++ b/doc/rrdfetch.1
.\" ========================================================================
.\"
.IX Title "RRDFETCH 1"
-.TH RRDFETCH 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDFETCH 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdfetch \- Fetch data from an RRD.
.SH "SYNOPSIS"
diff --git a/doc/rrdfetch.txt b/doc/rrdfetch.txt
index 70f24db5f7348db4ccea70ca8dd9c946ac7d72cb..3adfff96fb7888024a446451ec28cee1b881742d 100644 (file)
--- a/doc/rrdfetch.txt
+++ b/doc/rrdfetch.txt
-1.3rc4 2008-03-15 RRDFETCH(1)
+1.3rc6 2008-03-15 RRDFETCH(1)
diff --git a/doc/rrdfirst.1 b/doc/rrdfirst.1
index 344193303a40af58d4b5a5dbf543b74242f356c2..feb57ca9883a1b34bf710909223e786f987be424 100644 (file)
--- a/doc/rrdfirst.1
+++ b/doc/rrdfirst.1
.\" ========================================================================
.\"
.IX Title "RRDFIRST 1"
-.TH RRDFIRST 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDFIRST 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdfirst \- Return the date of the first data sample in an RRA within an RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdfirst.txt b/doc/rrdfirst.txt
index a469ff791be614a7b50a8bd24367e4f270ff1b1a..9c8f4a3dc5e74dfa3cbd4901d9da2bedb4fd2379 100644 (file)
--- a/doc/rrdfirst.txt
+++ b/doc/rrdfirst.txt
-1.3rc4 2008-03-15 RRDFIRST(1)
+1.3rc6 2008-03-15 RRDFIRST(1)
diff --git a/doc/rrdgraph.1 b/doc/rrdgraph.1
index ff44df3514d335416e24b0b0100ae9878dbd01da..ca72245b7d8d70c475b65eceb78daefbe2ebe650 100644 (file)
--- a/doc/rrdgraph.1
+++ b/doc/rrdgraph.1
.\" ========================================================================
.\"
.IX Title "RRDGRAPH 1"
-.TH RRDGRAPH 1 "2008-04-21" "1.3rc4" "rrdtool"
+.TH RRDGRAPH 1 "2008-04-21" "1.3rc6" "rrdtool"
.SH "NAME"
rrdgraph \- Round Robin Database tool grapher functions
.SH "SYNOPSIS"
diff --git a/doc/rrdgraph.txt b/doc/rrdgraph.txt
index 51a0b5ffa3379e6184d7091399039f8e4d4d0b07..d18c746ad38cf83cfe54e5920505bc775c725b35 100644 (file)
--- a/doc/rrdgraph.txt
+++ b/doc/rrdgraph.txt
-1.3rc4 2008-04-21 RRDGRAPH(1)
+1.3rc6 2008-04-21 RRDGRAPH(1)
diff --git a/doc/rrdgraph_data.1 b/doc/rrdgraph_data.1
index 5c05adc1fea10ea19548d40d1a21184a3065bcda..5406238e20a43b8f1161f0b6f23e744d98c0b0a3 100644 (file)
--- a/doc/rrdgraph_data.1
+++ b/doc/rrdgraph_data.1
.\" ========================================================================
.\"
.IX Title "RRDGRAPH_DATA 1"
-.TH RRDGRAPH_DATA 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDGRAPH_DATA 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdgraph_data \- preparing data for graphing in rrdtool graph
.SH "SYNOPSIS"
diff --git a/doc/rrdgraph_data.txt b/doc/rrdgraph_data.txt
index b29191ecd8739667293648cc199a65c302712ff5..2a2268203ef2b811299a486ad210a3bee0ca1061 100644 (file)
--- a/doc/rrdgraph_data.txt
+++ b/doc/rrdgraph_data.txt
-1.3rc4 2008-03-15 RRDGRAPH_DATA(1)
+1.3rc6 2008-03-15 RRDGRAPH_DATA(1)
index 23ffb5c655cd7a7c5d79e29509cc2ddccc7dc62a..0642673d9c5387d4a6d01c2e8b8e85bb99c07b23 100644 (file)
--- a/doc/rrdgraph_examples.1
+++ b/doc/rrdgraph_examples.1
.\" ========================================================================
.\"
.IX Title "RRDGRAPH_EXAMPLES 1"
-.TH RRDGRAPH_EXAMPLES 1 "2008-03-25" "1.3rc4" "rrdtool"
+.TH RRDGRAPH_EXAMPLES 1 "2008-03-25" "1.3rc6" "rrdtool"
.SH "NAME"
rrdgraph_examples \- Examples for rrdtool graph
.SH "SYNOPSIS"
index 8dc2e6e72c08dff91d30e68451fecff4fe095007..92dd941fc01a4961bbba81c5081f6c228c663680 100644 (file)
-1.3rc4 2008-03-25 RRDGRAPH_EXAMPLES(1)
+1.3rc6 2008-03-25 RRDGRAPH_EXAMPLES(1)
diff --git a/doc/rrdgraph_graph.1 b/doc/rrdgraph_graph.1
index ce55b98fafd593bf03898b00a24174ed04e37813..62ca614f82bb6aaa83c0c63f88f47688c437472d 100644 (file)
--- a/doc/rrdgraph_graph.1
+++ b/doc/rrdgraph_graph.1
.\" ========================================================================
.\"
.IX Title "RRDGRAPH_GRAPH 1"
-.TH RRDGRAPH_GRAPH 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDGRAPH_GRAPH 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdgraph_graph \- rrdtool graph command reference
.SH "SYNOPSIS"
diff --git a/doc/rrdgraph_graph.txt b/doc/rrdgraph_graph.txt
index 2d5cd1e857ec65fac7065876ccdfef17ffeb2b4c..03050eade4f0c79c8da4b64471d48f9e35ee38b2 100644 (file)
--- a/doc/rrdgraph_graph.txt
+++ b/doc/rrdgraph_graph.txt
-1.3rc4 2008-03-15 RRDGRAPH_GRAPH(1)
+1.3rc6 2008-03-15 RRDGRAPH_GRAPH(1)
diff --git a/doc/rrdgraph_rpn.1 b/doc/rrdgraph_rpn.1
index 91daee45d14367fb8c4eb1170c16e94ccef7cc5a..3dbc9e223aef0f16486bd95b2d8340a10002d952 100644 (file)
--- a/doc/rrdgraph_rpn.1
+++ b/doc/rrdgraph_rpn.1
.\" ========================================================================
.\"
.IX Title "RRDGRAPH_RPN 1"
-.TH RRDGRAPH_RPN 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDGRAPH_RPN 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdgraph_rpn \- About RPN Math in rrdtool graph
.SH "SYNOPSIS"
diff --git a/doc/rrdgraph_rpn.txt b/doc/rrdgraph_rpn.txt
index 8be61de7ca0d739256e2c19bc5bcefa3ecde40ae..f4d1b27be943a7b711a07ff8ec1498c0fb7811e8 100644 (file)
--- a/doc/rrdgraph_rpn.txt
+++ b/doc/rrdgraph_rpn.txt
-1.3rc4 2008-03-15 RRDGRAPH_RPN(1)
+1.3rc6 2008-03-15 RRDGRAPH_RPN(1)
diff --git a/doc/rrdinfo.1 b/doc/rrdinfo.1
index d4f8573dad8e16a57cf8931cbf7f9728549050e4..109bee9a5ab3b94dcb7d44550dad07fdc06b9521 100644 (file)
--- a/doc/rrdinfo.1
+++ b/doc/rrdinfo.1
.\" ========================================================================
.\"
.IX Title "RRDINFO 1"
-.TH RRDINFO 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDINFO 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdinfo \- extract header information from an RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdinfo.txt b/doc/rrdinfo.txt
index 4f733f1cd9c552faead80452c6520d29a3d320ae..9a0ce524d0a730ca89744adc5fac4ce192d0af0e 100644 (file)
--- a/doc/rrdinfo.txt
+++ b/doc/rrdinfo.txt
-1.3rc4 2008-03-15 RRDINFO(1)
+1.3rc6 2008-03-15 RRDINFO(1)
diff --git a/doc/rrdlast.1 b/doc/rrdlast.1
index e62dde7bf0f72ee1bbf51cf90541f4626bdc8510..b73b2ff2ec1e4b2d9fe579c2b69dd5807266998b 100644 (file)
--- a/doc/rrdlast.1
+++ b/doc/rrdlast.1
.\" ========================================================================
.\"
.IX Title "RRDLAST 1"
-.TH RRDLAST 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDLAST 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdlast \- Return the date of the last data sample in an RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdlast.txt b/doc/rrdlast.txt
index 202d82dd8a62bd77eaf9a3d4ae045192d9671728..ecc62ddba111e2df201baf1885d1cf323ac5159c 100644 (file)
--- a/doc/rrdlast.txt
+++ b/doc/rrdlast.txt
-1.3rc4 2008-03-15 RRDLAST(1)
+1.3rc6 2008-03-15 RRDLAST(1)
diff --git a/doc/rrdlastupdate.1 b/doc/rrdlastupdate.1
index 39f49f00075a386b7334a7552cc7c854cc6dd42d..6d62db9b0b0a711cf19e2b661334bdf39bbe289d 100644 (file)
--- a/doc/rrdlastupdate.1
+++ b/doc/rrdlastupdate.1
.\" ========================================================================
.\"
.IX Title "RRDLASTUPDATE 1"
-.TH RRDLASTUPDATE 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDLASTUPDATE 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdlastupdate \- Return the most recent update to an RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdlastupdate.txt b/doc/rrdlastupdate.txt
index c5332234aae2b26bfb28fe9e85dec7cec130bcc6..7020b83e71961a643bc2279244fbd0b5b90f6f46 100644 (file)
--- a/doc/rrdlastupdate.txt
+++ b/doc/rrdlastupdate.txt
-1.3rc4 2008-03-15 RRDLASTUPDATE(1)
+1.3rc6 2008-03-15 RRDLASTUPDATE(1)
diff --git a/doc/rrdresize.1 b/doc/rrdresize.1
index 101dd5d612475c7e21b86a0c019d3ffdc9efdf73..db15b8d7512fa222f24a66be8672489f83e62dfc 100644 (file)
--- a/doc/rrdresize.1
+++ b/doc/rrdresize.1
.\" ========================================================================
.\"
.IX Title "RRDRESIZE 1"
-.TH RRDRESIZE 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDRESIZE 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdresize \- alters the size of an RRA and creates a new .rrd file
.SH "SYNOPSIS"
diff --git a/doc/rrdresize.txt b/doc/rrdresize.txt
index e9f7a8be1d6a0c339f3d746cd09368c14438b5d3..443abf1fd36dfeaa587bfcc2864cd91a10f447be 100644 (file)
--- a/doc/rrdresize.txt
+++ b/doc/rrdresize.txt
-1.3rc4 2008-03-15 RRDRESIZE(1)
+1.3rc6 2008-03-15 RRDRESIZE(1)
diff --git a/doc/rrdrestore.1 b/doc/rrdrestore.1
index 379de767d5a16643b98e4ce7d2b664f7e587ce2d..07c6b7e071d3132d9d44df737829250adaacf3eb 100644 (file)
--- a/doc/rrdrestore.1
+++ b/doc/rrdrestore.1
.\" ========================================================================
.\"
.IX Title "RRDRESTORE 1"
-.TH RRDRESTORE 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDRESTORE 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdrestore \- Restore the contents of an RRD from its XML dump format
.SH "SYNOPSIS"
diff --git a/doc/rrdrestore.txt b/doc/rrdrestore.txt
index ba1d3bf8f225a02c437f5410f2ea34eac2dc5f1e..2f21b0ceff4c635384358cbc819df89d185be1ca 100644 (file)
--- a/doc/rrdrestore.txt
+++ b/doc/rrdrestore.txt
-1.3rc4 2008-03-15 RRDRESTORE(1)
+1.3rc6 2008-03-15 RRDRESTORE(1)
diff --git a/doc/rrdthreads.1 b/doc/rrdthreads.1
index f9baa9ad2e78eec75d96730f2cfadaa053093d7c..dd1a5ff692c603082ab9471fc3c255833b647aa5 100644 (file)
--- a/doc/rrdthreads.1
+++ b/doc/rrdthreads.1
.\" ========================================================================
.\"
.IX Title "RRDTHREADS 1"
-.TH RRDTHREADS 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDTHREADS 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdthreads \- Provisions for linking the RRD library to use in multi\-threaded programs
.SH "SYNOPSIS"
diff --git a/doc/rrdthreads.txt b/doc/rrdthreads.txt
index b15343b2ae9a2b2c03c342077cc94973733a0a9d..89ff34a59ec2f1a56a31873900388181fa6a8b3a 100644 (file)
--- a/doc/rrdthreads.txt
+++ b/doc/rrdthreads.txt
-1.3rc4 2008-03-15 RRDTHREADS(1)
+1.3rc6 2008-03-15 RRDTHREADS(1)
diff --git a/doc/rrdtool.1 b/doc/rrdtool.1
index d19a2e9e10cd8930d28fc7994b80942cfcd01947..eb7a463483c78e91f132ea78de06ec5b004319ff 100644 (file)
--- a/doc/rrdtool.1
+++ b/doc/rrdtool.1
.\" ========================================================================
.\"
.IX Title "RRDTOOL 1"
-.TH RRDTOOL 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDTOOL 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdtool \- Round Robin Database Tool
.SH "SYNOPSIS"
diff --git a/doc/rrdtool.txt b/doc/rrdtool.txt
index 72999a0fcfa628094acad6ae638a7be7d0d1b250..81c851df780bfcab9029232ab6c1ab349f2401d0 100644 (file)
--- a/doc/rrdtool.txt
+++ b/doc/rrdtool.txt
-1.3rc4 2008-03-15 RRDTOOL(1)
+1.3rc6 2008-03-15 RRDTOOL(1)
diff --git a/doc/rrdtune.1 b/doc/rrdtune.1
index c3a3fd86febf17afe97353b343b7200876235553..115eb920901ac9c97b79316c217a16bfea27c718 100644 (file)
--- a/doc/rrdtune.1
+++ b/doc/rrdtune.1
.\" ========================================================================
.\"
.IX Title "RRDTUNE 1"
-.TH RRDTUNE 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDTUNE 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdtune \- Modify some basic properties of a Round Robin Database
.SH "SYNOPSIS"
diff --git a/doc/rrdtune.txt b/doc/rrdtune.txt
index 2d6d9e94a04626050abc019218562c045bdf7eed..edfd39ec11a9d106dd2dcde9841eab23b2cd6b60 100644 (file)
--- a/doc/rrdtune.txt
+++ b/doc/rrdtune.txt
-1.3rc4 2008-03-15 RRDTUNE(1)
+1.3rc6 2008-03-15 RRDTUNE(1)
diff --git a/doc/rrdtutorial.1 b/doc/rrdtutorial.1
index 5a22139f28450629d3fe32313306ae87bd5d6dda..1a03402490b8519ed3b4dd5eb90d926114d1c6bc 100644 (file)
--- a/doc/rrdtutorial.1
+++ b/doc/rrdtutorial.1
.\" ========================================================================
.\"
.IX Title "RRDTUTORIAL 1"
-.TH RRDTUTORIAL 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDTUTORIAL 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdtutorial \- Alex van den Bogaerdt's RRDtool tutorial
.SH "DESCRIPTION"
diff --git a/doc/rrdtutorial.txt b/doc/rrdtutorial.txt
index ac6d83b9eca5074ad2d25763dd68ff6677bd67d2..78792988dae9555def3f50c877362606be223dac 100644 (file)
--- a/doc/rrdtutorial.txt
+++ b/doc/rrdtutorial.txt
-1.3rc4 2008-03-15 RRDTUTORIAL(1)
+1.3rc6 2008-03-15 RRDTUTORIAL(1)
diff --git a/doc/rrdupdate.1 b/doc/rrdupdate.1
index d3ef44b879eaaab4106b28f06fe6972ed0dc1998..1b2827e5b2a01671d019963cabe944913e363ef9 100644 (file)
--- a/doc/rrdupdate.1
+++ b/doc/rrdupdate.1
.\" ========================================================================
.\"
.IX Title "RRDUPDATE 1"
-.TH RRDUPDATE 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDUPDATE 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdupdate \- Store a new set of values into the RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdupdate.txt b/doc/rrdupdate.txt
index 80e58d8fb800b4ce84852f05d0cb20bd006723ee..17928bb9aa44b415bb1ec1e8ff180d26045e35a1 100644 (file)
--- a/doc/rrdupdate.txt
+++ b/doc/rrdupdate.txt
-1.3rc4 2008-03-15 RRDUPDATE(1)
+1.3rc6 2008-03-15 RRDUPDATE(1)
diff --git a/doc/rrdxport.1 b/doc/rrdxport.1
index db4c7cd1e575b0b9a29a2d28101d6870b665066e..2907110816bbf4bac1cfa4c7a9eb961cc0fe9938 100644 (file)
--- a/doc/rrdxport.1
+++ b/doc/rrdxport.1
.\" ========================================================================
.\"
.IX Title "RRDXPORT 1"
-.TH RRDXPORT 1 "2008-03-15" "1.3rc4" "rrdtool"
+.TH RRDXPORT 1 "2008-03-15" "1.3rc6" "rrdtool"
.SH "NAME"
rrdxport \- Export data in XML format based on data from one or several RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdxport.txt b/doc/rrdxport.txt
index 7c23b20a93958bcf4ea75b58e2dcf9468f41d674..77f029bd320249fb408c4e2c25cdfcad57e13997 100644 (file)
--- a/doc/rrdxport.txt
+++ b/doc/rrdxport.txt
-1.3rc4 2008-03-15 RRDXPORT(1)
+1.3rc6 2008-03-15 RRDXPORT(1)
diff --git a/rrdtool.spec b/rrdtool.spec
index 09f22b30156dafef954cc77390e37d000d0bc82e..ec585c577cc2b14079cb523e6d96b2a2055308a7 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
-Version: 1.3rc4
+Version: 1.3rc6
Release: 0.1%{?dist}
License: GPL
Group: Applications/Databases
diff --git a/src/pngsize.c b/src/pngsize.c
index 1c695350625ab354c1289770123e14337331d8a1..dc2cc368c4d040d716cec906b5393c759fdd4cb7 100644 (file)
--- a/src/pngsize.c
+++ b/src/pngsize.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* pngsize.c determine the size of a PNG image
*****************************************************************************/
diff --git a/src/rrd.h b/src/rrd.h
index 6b475d88095c512df76386ec86aa6302854fbcee..ede0c8e69b4a1ee6cc51cb32962298865ea6b3d4 100644 (file)
--- a/src/rrd.h
+++ b/src/rrd.h
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrdlib.h Public header file for librrd
*****************************************************************************
- * $Id: rrd.h 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd.h 1380 2008-05-26 08:56:58Z oetiker $
* $Log$
* Revision 1.9 2005/02/13 16:13:33 oetiker
* let rrd_graph return the actual value range it picked ...
diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index 0355dfcf4e5e5b56cb082619b1f4d856f2ad7fa1..e3ac8aa95c7b61990a00de582e3c0741e20048ba 100644 (file)
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_cgi.c RRD Web Page Generator
*****************************************************************************/
diff --git a/src/rrd_create.c b/src/rrd_create.c
index 25c1133acaedcdb12c7017d50ad42fd64ecee474..92fe3b03ab504aaa7fa916b8006a658646d0eb3d 100644 (file)
--- a/src/rrd_create.c
+++ b/src/rrd_create.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_create.c creates new rrds
*****************************************************************************/
diff --git a/src/rrd_diff.c b/src/rrd_diff.c
index 23d8a0d445242bd9ac8be0eb3f27559c58376393..bc3edbbc1224e0bae05f9b1d137f7ce2d1e3015c 100644 (file)
--- a/src/rrd_diff.c
+++ b/src/rrd_diff.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
* This code is stolen from rateup (mrtg-2.x) by Dave Rand
*****************************************************************************
* diff calculate the difference between two very long integers available as
* strings
*****************************************************************************
- * $Id: rrd_diff.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_diff.c 1380 2008-05-26 08:56:58Z oetiker $
* $Log$
* Revision 1.4 2003/03/10 00:30:34 oetiker
* handle cases with two negative numbers
diff --git a/src/rrd_dump.c b/src/rrd_dump.c
index 69893e08ed7d74791202746683f255f5f162d1cd..bf438cc0b26c8f08424445d90a351a6eea89fc87 100644 (file)
--- a/src/rrd_dump.c
+++ b/src/rrd_dump.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_dump Display a RRD
*****************************************************************************
- * $Id: rrd_dump.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_dump.c 1380 2008-05-26 08:56:58Z oetiker $
* $Log$
* Revision 1.7 2004/05/25 20:53:21 oetiker
* prevent small leak when resources are exhausted -- Mike Slifcak
int rrd_dump_opt_r(
const char *filename,
char *outname,
- int opt_noheader
-)
+ int opt_noheader)
{
unsigned int i, ii, ix, iii = 0;
time_t now;
out_file = stdout;
}
- if (!opt_noheader){
- fputs("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n", out_file);
- fputs
- ("<!DOCTYPE rrd SYSTEM \"http://oss.oetiker.ch/rrdtool/rrdtool.dtd\">\n",
- out_file);
+ if (!opt_noheader) {
+ fputs("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n", out_file);
+ fputs
+ ("<!DOCTYPE rrd SYSTEM \"http://oss.oetiker.ch/rrdtool/rrdtool.dtd\">\n",
+ out_file);
}
fputs("<!-- Round Robin Database Dump -->", out_file);
fputs("<rrd>", out_file);
const char *filename,
char *outname)
{
- return rrd_dump_opt_r(filename,outname,0);
+ return rrd_dump_opt_r(filename, outname, 0);
}
int rrd_dump(
{
int rc;
int opt_noheader = 0;
+
/* init rrd clean */
optind = 0;
opterr = 0; /* initialize getopt */
-
+
while (42) {
- int opt;
+ int opt;
int option_index = 0;
static struct option long_options[] = {
{"no-header", no_argument, 0, 'n'},
opt_noheader = 1;
break;
- default:
+ default:
rrd_set_error("usage rrdtool %s [--no-header|-n] "
- "file.rrd [file.xml]", argv[0]);
+ "file.rrd [file.xml]", argv[0]);
return (-1);
break;
}
}
if ((argc - optind) == 2) {
- rc = rrd_dump_opt_r(argv[optind], argv[optind+1],opt_noheader);
+ rc = rrd_dump_opt_r(argv[optind], argv[optind + 1], opt_noheader);
} else {
- rc = rrd_dump_opt_r(argv[optind], NULL,opt_noheader);
+ rc = rrd_dump_opt_r(argv[optind], NULL, opt_noheader);
}
return rc;
}
-
diff --git a/src/rrd_error.c b/src/rrd_error.c
index bd8f4e7bc4affc7556c57367eeca7f70fef84992..992730ca50f08797c5bea18547cd2a403324df4a 100644 (file)
--- a/src/rrd_error.c
+++ b/src/rrd_error.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_error.c Common Header File
*****************************************************************************
- * $Id: rrd_error.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_error.c 1380 2008-05-26 08:56:58Z oetiker $
* $Log$
* Revision 1.4 2003/02/22 21:57:03 oetiker
* a patch to avoid a memory leak and a Makefile.am patch to
diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 4fe64cbc3031ef90a9b8eda84981d02027071dad..ad3bdb3821c7f8949e4f7b09420058092a904997 100644 (file)
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_fetch.c read date from an rrd to use for further processing
*****************************************************************************
- * $Id: rrd_fetch.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_fetch.c 1380 2008-05-26 08:56:58Z oetiker $
* $Log$
* Revision 1.8 2004/05/18 18:53:03 oetiker
* big spell checking patch -- slif@bellsouth.net
diff --git a/src/rrd_first.c b/src/rrd_first.c
index 34692e74ec38e011eae3bbf6be71088ff0f5b4b3..aad5bbea2cb4fc8fbd82bf7ff79870ef80ffefce 100644 (file)
--- a/src/rrd_first.c
+++ b/src/rrd_first.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_first Return
*****************************************************************************
diff --git a/src/rrd_format.c b/src/rrd_format.c
index 02abef43e761a3ada52c5a6b4ab070c9962b38e3..3274830412dbc1edcc58fa15a64f05d3840b9755 100644 (file)
--- a/src/rrd_format.c
+++ b/src/rrd_format.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_format.c RRD Database Format helper functions
*****************************************************************************
- * $Id: rrd_format.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_format.c 1380 2008-05-26 08:56:58Z oetiker $
* $Log$
* Revision 1.5 2004/05/18 18:53:03 oetiker
* big spell checking patch -- slif@bellsouth.net
diff --git a/src/rrd_format.h b/src/rrd_format.h
index 9deb5abf1f862f632505af1389047f6f5e46ba7d..32e047c523f8573c13dccf00d28f01b86917d945 100644 (file)
--- a/src/rrd_format.h
+++ b/src/rrd_format.h
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_format.h RRD Database Format header
*****************************************************************************/
stat_head_t *stat_head; /* the static header */
ds_def_t *ds_def; /* list of data source definitions */
rra_def_t *rra_def; /* list of round robin archive def */
- live_head_t *live_head;
+ live_head_t *live_head; /* rrd v >= 3 last_up with us */
+ time_t *legacy_last_up; /* rrd v < 3 last_up time */
pdp_prep_t *pdp_prep; /* pdp data prep area */
cdp_prep_t *cdp_prep; /* cdp prep area */
rra_ptr_t *rra_ptr; /* list of rra pointers */
diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index 7ba93ca79400a4211e7c97aee9c843dfe47ee57f..eb733b70e073349166ff5339926688b80b42ef4e 100644 (file)
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
/****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_gfx.c graphics wrapper for rrdtool
**************************************************************************/
long i;
long tab_count = strlen(text);
long tab_shift = fmod(x, tabwidth);
+ int border = im->text_prop[TEXT_PROP_LEGEND].size * 2.0;
PangoTabArray *tab_array;
PangoContext *pango_context;
tab_array = pango_tab_array_new(tab_count, (gboolean) (1));
for (i = 1; i <= tab_count; i++) {
pango_tab_array_set_tab(tab_array,
- i, PANGO_TAB_LEFT, tabwidth * i - tab_shift);
+ i, PANGO_TAB_LEFT, tabwidth * i - tab_shift+border);
}
cairo_new_path(cr);
cairo_set_source_rgba(cr, color.red, color.green, color.blue,
PangoLayout *layout;
PangoRectangle log_rect;
gfx_color_t color = { 0, 0, 0, 0 };
- char *tab;
-
- /* turn \\t into tab */
- while ((tab = strstr(text, "\\t"))) {
- memmove(tab + 1, tab + 2, strlen(tab + 2));
- tab[0] = (char) 9;
- }
layout = gfx_prep_text(im, start, color, font, size, tabwidth, text);
pango_layout_get_pixel_extents(layout, NULL, &log_rect);
pango_tab_array_free(pango_layout_get_tabs(layout));
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index abebde707c94040e0571518e91631dfd8e4d300c..480041f9f8d89a117a5c8f65831ddfcfd39fb82b 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
/****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd__graph.c produce graphs from data in rrdfiles
****************************************************************************/
yval = im->yorigin - pixie * (log10(value) - log10(im->minval));
}
}
- /* make sure we don't return anything too unreasonable. GD lib can
- get terribly slow when drawing lines outside its scope. This is
- especially problematic in connection with the rigid option */
- if (!im->rigid) {
- /* keep yval as-is */
- } else if (yval > im->yorigin) {
- yval = im->yorigin + 0.00001;
- } else if (yval < im->yorigin - im->ysize) {
- yval = im->yorigin - im->ysize - 0.00001;
- }
return yval;
}
return 0;
}
+/* from http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm */
+/* yes we are loosing precision by doing tos with floats instead of doubles
+ but it seems more stable this way. */
+
static int AlmostEqual2sComplement(
float A,
float B,
if (im->logarithmic) {
if (isnan(minval) || isnan(maxval) || maxval <= 0) {
- minval = 0.0; /* catching this right away below */
+ minval = 0.0; /* catching this right away below */
maxval = 5.1;
}
/* in logarithm mode, where minval is smaller or equal
}
}
- /* adjust min and max values given by the user*/
+ /* adjust min and max values given by the user */
/* for logscale we add something on top */
if (isnan(im->minval)
|| ((!im->rigid) && im->minval > minval)
int border = im->text_prop[TEXT_PROP_LEGEND].size * 2.0;
int fill = 0, fill_last;
int leg_c = 0;
- int leg_x = border, leg_y = im->yimg;
+ int leg_x = border;
+ int leg_y = im->yimg;
int leg_y_prev = im->yimg;
int leg_cc;
int glue = 0;
char prt_fctn; /*special printfunctions */
char default_txtalign = TXA_JUSTIFIED; /*default line orientation */
int *legspace;
+ char *tab;
if (!(im->extra_flags & NOLEGEND) & !(im->extra_flags & ONLY_GRAPH)) {
if ((legspace = malloc(im->gdes_c * sizeof(int))) == NULL) {
im->gdes[i].legend[0] = '\0';
}
+ /* turn \\t into tab */
+ while ((tab = strstr(im->gdes[i].legend, "\\t"))) {
+ memmove(tab, tab + 1, strlen(tab));
+ tab[0] = (char) 9;
+ }
leg_cc = strlen(im->gdes[i].legend);
/* is there a controle code ant the end of the legend string ? */
- /* and it is not a tab \\t */
if (leg_cc >= 2
&& im->gdes[i].legend[leg_cc -
- 2] == '\\'
- && im->gdes[i].legend[leg_cc - 1] != 't') {
+ 2] == '\\' ) {
prt_fctn = im->gdes[i].legend[leg_cc - 1];
leg_cc -= 2;
im->gdes[i].legend[leg_cc] = '\0';
prt_fctn != 'j' &&
prt_fctn != 'c' &&
prt_fctn != 's' &&
- prt_fctn != 't' && prt_fctn != '\0' && prt_fctn != 'g') {
+ prt_fctn != '\0' && prt_fctn != 'g') {
free(legspace);
rrd_set_error
("Unknown control code at the end of '%s\\%c'",
leg_y - im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
}
} else {
- im->yimg = leg_y_prev;
- /* if we did place some legends we have to add vertical space */
- if (leg_y != im->yimg)
- im->yimg += im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
+ im->yimg = leg_y - im->text_prop[TEXT_PROP_LEGEND].size * 1.8 + border * 0.6;
}
free(legspace);
}
/* the xaxis labels are determined from the number of seconds per pixel
in the requested graph */
-
-
int calc_horizontal_grid(
image_desc_t
*im)
if (im->ygrid_scale.gridstep == 0) /* range is one -> 0.1 is reasonable scale */
im->ygrid_scale.gridstep = 0.1;
/* should have at least 5 lines but no more then 15 */
- if (range / im->ygrid_scale.gridstep < 5)
+ if (range / im->ygrid_scale.gridstep < 5 && im->ygrid_scale.gridstep >= 30 )
im->ygrid_scale.gridstep /= 10;
if (range / im->ygrid_scale.gridstep > 15)
im->ygrid_scale.gridstep *= 10;
- if (range / im->ygrid_scale.gridstep > 5) {
+ if (range / im->ygrid_scale.gridstep > 5 ) {
im->ygrid_scale.labfact = 1;
- if (range / im->ygrid_scale.gridstep > 8)
+ if (range / im->ygrid_scale.gridstep > 8 || im->ygrid_scale.gridstep < 1.8 * im->text_prop[TEXT_PROP_AXIS].size )
im->ygrid_scale.labfact = 2;
} else {
im->ygrid_scale.gridstep /= 5;
sprintf(im->ygrid_scale.labfmt,
"%%%d.0f%s", len, (im->symbol != ' ' ? " %c" : ""));
}
- } else {
+ } else { /* classic rrd grid */
for (i = 0; ylab[i].grid > 0; i++) {
pixel = im->ysize / (scaledrange / ylab[i].grid);
gridind = i;
- if (pixel > 7)
+ if (pixel >= 5)
break;
}
for (i = 0; i < 4; i++) {
if (pixel * ylab[gridind].lfac[i] >=
- 2.5 * im->text_prop[TEXT_PROP_AXIS].size) {
+ 1.8 * im->text_prop[TEXT_PROP_AXIS].size) {
im->ygrid_scale.labfact = ylab[gridind].lfac[i];
break;
}
return mnt;
}
-/* from http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm */
-/* yes we are loosing precision by doing tos with floats instead of doubles
- but it seems more stable this way. */
-
/* logaritmic horizontal grid */
int horizontal_log_grid(
case IF_PDF:
im->gridfit = 0;
im->surface = strlen(im->graphfile)
- ?
- cairo_pdf_surface_create_for_stream
- (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom)
- : cairo_pdf_surface_create(im->graphfile, im->ximg * im->zoom,
- im->yimg * im->zoom);
+ ? cairo_pdf_surface_create(im->graphfile, im->ximg * im->zoom,
+ im->yimg * im->zoom)
+ : cairo_pdf_surface_create_for_stream
+ (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom);
break;
case IF_EPS:
im->gridfit = 0;
im->surface = strlen(im->graphfile)
?
- cairo_ps_surface_create_for_stream
- (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom)
- : cairo_ps_surface_create(im->graphfile, im->ximg * im->zoom,
- im->yimg * im->zoom);
+ cairo_ps_surface_create(im->graphfile, im->ximg * im->zoom,
+ im->yimg * im->zoom)
+ : cairo_ps_surface_create_for_stream
+ (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom);
break;
case IF_SVG:
im->gridfit = 0;
im->surface = strlen(im->graphfile)
?
- cairo_svg_surface_create_for_stream
- (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom)
- : cairo_svg_surface_create(im->
- graphfile,
- im->
- ximg * im->zoom, im->yimg * im->zoom);
+ cairo_svg_surface_create(im->
+ graphfile,
+ im->ximg * im->zoom, im->yimg * im->zoom)
+ : cairo_svg_surface_create_for_stream
+ (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom);
cairo_svg_surface_restrict_to_version
(im->surface, CAIRO_SVG_VERSION_1_1);
break;
im->xsize,
im->yorigin - im->ysize, im->graph_col[GRC_CANVAS]);
gfx_add_point(im, im->xorigin, im->yorigin - im->ysize);
- gfx_close_path(im);
+ gfx_close_path(im);
+ cairo_rectangle(im->cr, im->xorigin, im->yorigin-im->ysize-1.0, im->xsize,im->ysize+2.0);
+ cairo_clip(im->cr);
if (im->minval > 0.0)
areazero = im->minval;
if (im->maxval < 0.0)
break;
} /* switch */
}
+ cairo_reset_clip(im->cr);
/* grid_paint also does the text */
if (!(im->extra_flags & ONLY_GRAPH))
rrd_set_error("Could not save png to '%s'", im->graphfile);
return 1;
}
- }
break;
+ }
default:
if (strlen(im->graphfile)) {
cairo_show_page(im->cr);
diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index f9c01871b514afa665da4baa8ba81a6cf5b6a76e..c9990f7e89566fcbcedb4620a181434a38663673 100644 (file)
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
/****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_graph_helper.c commandline parser functions
* this code initially written by Alex van den Bogaerdt
diff --git a/src/rrd_hw.c b/src/rrd_hw.c
index 6522949d10d6f970ddd7afb7d5d388d7acf011a3..5010d9e3f0f838ab913e90f8ee840e43fd6c8d32 100644 (file)
--- a/src/rrd_hw.c
+++ b/src/rrd_hw.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_hw.c : Support for Holt-Winters Smoothing/ Aberrant Behavior Detection
*****************************************************************************
diff --git a/src/rrd_hw.h b/src/rrd_hw.h
index 1ac24b74bdbdd12e2edfb3b8f0956befd51b2a1e..fb984d95a7f8f8deb99c542bb2b86bdd05cf608d 100644 (file)
--- a/src/rrd_hw.h
+++ b/src/rrd_hw.h
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_hw.h : Support for Holt-Winters Smoothing/ Aberrant Behavior Detection
*****************************************************************************/
diff --git a/src/rrd_i18n.h b/src/rrd_i18n.h
index a75a83618df1f2094d340b823c698a820b6ba04f..96fe9c747e363f21265f18bd5dab41c6b120e08a 100644 (file)
--- a/src/rrd_i18n.h
+++ b/src/rrd_i18n.h
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Takao Fujiwara, 2008
+ * RRDtool 1.3rc6 Copyright by Takao Fujiwara, 2008
*****************************************************************************
* rrd_i18n.h Common Header File
*****************************************************************************/
diff --git a/src/rrd_info.c b/src/rrd_info.c
index 389607d2c091edcb1604b2c964f14f1beee7a71c..cf90e0e2b8cbe1115f0589f0029b95cb65c0b9fc 100644 (file)
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
index 800c538a4691ceeae4aac8a594d665e694696609..d313074e0f85e9196ad69426096ecb8ec93fd23f 100644 (file)
--- a/src/rrd_is_thread_safe.h
+++ b/src/rrd_is_thread_safe.h
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
*****************************************************************************
* rrd_is_thread_safe.c Poisons some nasty function calls using GNU cpp
*****************************************************************************
- * $Id: rrd_is_thread_safe.h 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_is_thread_safe.h 1380 2008-05-26 08:56:58Z oetiker $
*************************************************************************** */
#ifndef _RRD_IS_THREAD_SAFE_H
diff --git a/src/rrd_last.c b/src/rrd_last.c
index c38b9db8f6f075b21c18d9a5686634dc800f7da7..240364b0a78035bf48d4587383b8917d49162496 100644 (file)
--- a/src/rrd_last.c
+++ b/src/rrd_last.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_last.c
*****************************************************************************
diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c
index b42194cc1b0e60d6d9e3313733124f857b322260..e34089343f2a161a3cacb50d904e30fda22a4791 100644 (file)
--- a/src/rrd_lastupdate.c
+++ b/src/rrd_lastupdate.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_lastupdate Get the last datum entered for each DS
*****************************************************************************/
index efbd0027b1475bfedde6fcd61f9795003c0bf3b8..9616b6ab40fefd99aee2f8c171a4c87c95734f8e 100644 (file)
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
* rrd_not_thread_safe.c Contains routines used when thread safety is not
* an issue
*****************************************************************************
- * $Id: rrd_not_thread_safe.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_not_thread_safe.c 1380 2008-05-26 08:56:58Z oetiker $
*************************************************************************** */
#include "rrd.h"
#include "rrd_tool.h"
diff --git a/src/rrd_open.c b/src/rrd_open.c
index 1f3f4394d2e7445657d4f411256093e937231f1a..a03e5d3e6049d2f9dd16de1b19c7bc776c8e96b2 100644 (file)
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_open.c Open an RRD File
*****************************************************************************
- * $Id: rrd_open.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_open.c 1380 2008-05-26 08:56:58Z oetiker $
*****************************************************************************/
#include "rrd_tool.h"
rrd_set_error("live_head_t malloc");
goto out_close;
}
-#ifdef HAVE_MMAP
- memmove(&rrd->live_head->last_up, data + offset, sizeof(long));
- offset += sizeof(long);
-#else
- offset += read(rrd_file->fd, &rrd->live_head->last_up, sizeof(long));
-#endif
+
+#if defined USE_MADVISE
+ /* the live_head will be needed soonish, so hint accordingly */
+ madvise(data + PAGE_START(offset),
+ sizeof(time_t), MADV_WILLNEED);
+#endif
+ __rrd_read(rrd->legacy_last_up,time_t,1);
+ rrd->live_head->last_up = *rrd->legacy_last_up;
rrd->live_head->last_up_usec = 0;
} else {
#if defined USE_MADVISE
rrd->ds_def = NULL;
rrd->rra_def = NULL;
rrd->live_head = NULL;
+ rrd->legacy_last_up = NULL;
rrd->rra_ptr = NULL;
rrd->pdp_prep = NULL;
rrd->cdp_prep = NULL;
/* free RRD header data. */
#ifdef HAVE_MMAP
-inline void rrd_free(
- rrd_t UNUSED(*rrd))
+void rrd_free(
+ rrd_t *rrd)
{
+ if (rrd->legacy_last_up){ /* this gets set for version < 3 only */
+ free(rrd->live_head);
+ }
}
#else
void rrd_free(
diff --git a/src/rrd_resize.c b/src/rrd_resize.c
index f113e69f58811732e64a8ec78312d45c33c825e6..e20f6bf0c3c2e0204884f8ed1465f2ec50b7bf2f 100644 (file)
--- a/src/rrd_resize.c
+++ b/src/rrd_resize.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_resize.c Alters size of an RRA
*****************************************************************************
diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index fd9f813e137f7eb1568977aaed290a97c49ac57d..37fa55eb0f7801dfd3adf11d4069f5bc3648465d 100644 (file)
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2008 Florian octo Forster
* Distributed under the GPL
*****************************************************************************
* rrd_restore.c Contains logic to parse XML input and create an RRD file
*****************************************************************************
- * $Id: rrd_restore.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_restore.c 1380 2008-05-26 08:56:58Z oetiker $
*************************************************************************** */
/*
diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index b19c7dab61dfbee5345eab3fd6ce65059b3efa5a..aec519f9a7ac46fc43603c51db43ec5e7f2e776b 100644 (file)
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
/****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_rpncalc.c RPN calculator functions
****************************************************************************/
diff --git a/src/rrd_rpncalc.h b/src/rrd_rpncalc.h
index 1930e92cad7a0cd67acfbb511e9aaa7a65b39d52..853715dcdec72b6f19796da3e7e93979318c2f6b 100644 (file)
--- a/src/rrd_rpncalc.h
+++ b/src/rrd_rpncalc.h
/****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_rpncalc.h RPN calculator functions
****************************************************************************/
diff --git a/src/rrd_thread_safe.c b/src/rrd_thread_safe.c
index 3eed4a8c51e2946c5d35d183e05100243592e527..3ad3bead3ec8cc088562a8df3d850a0e789d1e42 100644 (file)
--- a/src/rrd_thread_safe.c
+++ b/src/rrd_thread_safe.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
*****************************************************************************
* rrd_thread_safe.c Contains routines used when thread safety is required
*****************************************************************************
- * $Id: rrd_thread_safe.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_thread_safe.c 1380 2008-05-26 08:56:58Z oetiker $
*************************************************************************** */
#include <pthread.h>
index fa55cf515cfb2b43798ce448d918e5ea4a1f9822..b05acd9ff4be45c3300eb295f28120347bfe8610 100644 (file)
--- a/src/rrd_thread_safe_nt.c
+++ b/src/rrd_thread_safe_nt.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
* rrd_thread_safe.c Contains routines used when thread safety is required
* for win32
*****************************************************************************
- * $Id: rrd_thread_safe_nt.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_thread_safe_nt.c 1380 2008-05-26 08:56:58Z oetiker $
*************************************************************************** */
#include <windows.h>
diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index c981e4a7397258de2709b80972a9a925ae00755f..088c1955e21c2771d937558585cff6331626386a 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
"\t\t[-M|--alt-autoscale-max]\n"
"\t\t[-R|--font-render-mode {normal,light,mono}]\n"
"\t\t[-B|--font-smoothing-threshold size]\n"
+ "\t\t[-T|--tabwidth width]\n"
"\t\t[-E|--slope-mode]\n"
"\t\t[-N|--no-gridfit]\n"
"\t\t[-X|--units-exponent value]\n"
} else if (strcmp("graphv", argv[1]) == 0) {
info_t *grinfo = NULL; /* 1 to distinguish it from the NULL that rrd_graph sends in */
+
grinfo = rrd_graph_v(argc - 1, &argv[1]);
if (grinfo) {
info_print(grinfo);
diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 5182898ef7f3ee4c443a6c0c0a8b21b41d36ecd2..7928392d83135cb60ac971db4cee66d0d4aa91b5 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
diff --git a/src/rrd_tune.c b/src/rrd_tune.c
index ed0f0baf57ba87c9161f153a91013608a8b70b26..ca132f6027fbb4bde14b2b76572ed191214bce78 100644 (file)
--- a/src/rrd_tune.c
+++ b/src/rrd_tune.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* change header parameters of an rrd
*****************************************************************************
- * $Id: rrd_tune.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_tune.c 1380 2008-05-26 08:56:58Z oetiker $
* $Log$
* Revision 1.6 2004/05/26 22:11:12 oetiker
* reduce compiler warnings. Many small fixes. -- Mike Slifcak <slif@bellsouth.net>
diff --git a/src/rrd_update.c b/src/rrd_update.c
index c830c6afabd19cde9cf2adde624eeb8c01d9fa02..dc5240dfef5c34b040f5e9e51947a5937dca01fb 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_update.c RRD Update Function
*****************************************************************************
- * $Id: rrd_update.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrd_update.c 1380 2008-05-26 08:56:58Z oetiker $
*****************************************************************************/
#include "rrd_tool.h"
rrd->live_head->last_up = *current_time;
rrd->live_head->last_up_usec = *current_time_usec;
+ if ( version < 3 ){
+ *rrd->legacy_last_up = rrd->live_head->last_up;
+ }
free(seasonal_coef);
free(last_seasonal_coef);
return 0;
return -1;
}
} else {
- if (rrd_write(rrd_file, &rrd->live_head->last_up,
+ if (rrd_write(rrd_file, rrd->legacy_last_up,
sizeof(time_t) * 1) != sizeof(time_t) * 1) {
rrd_set_error("rrd_write live_head to rrd");
return -1;
diff --git a/src/rrd_version.c b/src/rrd_version.c
index ed1098c362f7331a089533dec73c78f55514b7ab..252a997e3223598f3a0714173b510e5bd09dd41b 100644 (file)
--- a/src/rrd_version.c
+++ b/src/rrd_version.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_version Return
*****************************************************************************
diff --git a/src/rrd_xport.c b/src/rrd_xport.c
index a439b4a514b66998881c7206b0d694b54018c672..a54df183562b751f191ec8dd6de66c1cb54b8389 100644 (file)
--- a/src/rrd_xport.c
+++ b/src/rrd_xport.c
/****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_xport.c export RRD data
****************************************************************************/
diff --git a/src/rrd_xport.h b/src/rrd_xport.h
index b38d551cf721fb782ed4a0358811a46310862a85..75bca6c82029f6e7feb09e6783dc07a9f30c15a5 100644 (file)
--- a/src/rrd_xport.h
+++ b/src/rrd_xport.h
/****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_xport.h contains XML related constants
****************************************************************************/
diff --git a/src/rrdupdate.c b/src/rrdupdate.c
index e0ff72f707c2a0af579957ce2bd14704d73d6594..48994a5311337bc1ed92ab9a0512ce374e393a17 100644 (file)
--- a/src/rrdupdate.c
+++ b/src/rrdupdate.c
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc6 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrdupdate.c Main program for the (standalone) rrdupdate utility
*****************************************************************************
- * $Id: rrdupdate.c 1366 2008-05-18 13:06:44Z oetiker $
+ * $Id: rrdupdate.c 1380 2008-05-26 08:56:58Z oetiker $
*****************************************************************************/
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)