Thomas Vincent [Sat, 21 Mar 2026 16:06:31 +0000 (09:06 -0700)]
fix: export ABS_TOP_BUILDDIR to env for ruby extconf.rb
extconf.rb checks ENV['ABS_TOP_BUILDDIR'] to decide between
in-tree and system-installed librrd paths. The ruby target
passed these as make variables to the subsequent $(MAKE) call
but not as environment variables to $(RUBY) extconf.rb, so
the in-tree build path was never taken.
Add env before the $(RUBY) call, matching the pattern used by
the python, perl-piped, and perl-shared targets.
Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
Thomas Vincent [Wed, 11 Mar 2026 03:48:20 +0000 (20:48 -0700)]
fix: add pkg-config fallback for Perl and Ruby bindings
The Perl and Ruby bindings require ABS_TOP_BUILDDIR from autotools
for in-tree builds. When building standalone (CPAN, gem install),
these vars are absent and the build fails silently.
Add a three-way branch: Windows (unchanged), in-tree (autotools vars
present), standalone (pkg-config lookup). The standalone path uses
die/abort instead of exit 0 so missing librrd is a hard error.
Fixes: https://github.com/oetiker/rrdtool-1.x/issues/1295 Fixes: https://github.com/oetiker/rrdtool-1.x/issues/1124 Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
Thomas Vincent [Wed, 11 Mar 2026 05:31:39 +0000 (22:31 -0700)]
fix: escape control characters in JSON xport output (RFC 7159)
escapeJSON() only escaped '"' and '\'. RFC 7159 section 7 requires all
control characters U+0000 through U+001F to be escaped. Add the
mandatory two-character sequences (\b, \f, \n, \r, \t) and \uXXXX
for the remaining control codes.
Allocation changed from len+2 to l*6+1 (worst case: every byte
becomes \uXXXX). Truncation uses forward-tracked safe boundaries
instead of post-hoc backward scanning to avoid splitting escape
sequences mid-output.
Thomas Vincent [Wed, 11 Mar 2026 03:48:42 +0000 (20:48 -0700)]
fix: add -S short option for --step in rrdtool xport
rrdtool xport accepts --step but lacks a short form that other
rrdtool subcommands provide. Add -S as a short alias, consistent
with rrdtool graph which uses -S/--step and -s/--start.
-s is already taken by --start in xport, so -S (uppercase) is
the correct short form, matching rrd_graph_options() in rrd_graph.c.
Fixes #1103
Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
Wolfgang Stöggl [Wed, 7 Jan 2026 21:33:45 +0000 (22:33 +0100)]
Update GitHub Actions
- Switch from ubuntu-20.04, which is not available anymore,
to ubuntu-latest (currently Ubuntu 24.04)
- Update GitHub Actions:
* actions/checkout from v4 to v6
* codecov/codecov-action from v4 to v5
* github/codeql-action/init from v3 to v4
* github/codeql-action/analyze from v3 to v4
- Add workflow_dispatch to allow manual triggering, which simplifies
testing of the following GitHub Actions:
build-test-linux.yml, code-coverage.yml and codeql-analysis.yml.
- Update tests/functions for Python3 to avoid failing tests using
`make check TESTS_STYLE="rrdcached-tcp"`
Python3 uses socketserver, all lowercase. Python2 uses SocketServer.
https://stackoverflow.com/a/66913346/5067752
- Update list of tests using valgrind-logfile
Exclude currently failing tests (Ubuntu 24.04):
graph1, graph2, rpn1, create-with-source-4, vformatter1
Wolfgang Stöggl [Mon, 29 Dec 2025 20:52:22 +0000 (21:52 +0100)]
Update vcpkg GitHub Action
- Update vcpkg to current 2025.12.12 Release, commit 84bab45
- Current versions of libraries are e.g.:
cairo 1.18.4, expat 2.7.3, fontconfig 2.17.1, freetype 2.13.3,
gettext 0.22.5, glib 2.86.2, libpng 1.6.53, pango 1.56.4,
pcre2 10.47, libxml2 2.15.1 and zlib 1.3.1
- Github actions:
* Switch from `lukka/run-vcpkg` to `johnwason/vcpkg-action`
* Update `actions/checkout` from v4 to v6
* Update `actions/upload-artifact` from v4 to v6
- `win32/collect_rrdtool_vcpkg_files.bat`:
Remove `liblzma.dll`, as deprecated feature lzma has been removed
from libxml2 in vcpkg.
See: https://github.com/microsoft/vcpkg/pull/47380
Rein Fernhout [Fri, 4 Apr 2025 06:21:49 +0000 (08:21 +0200)]
Mark ruby bindings as ractor safe (#1283)
Ruby has a new method for concurrency called Ractors.
For C bindings to be used inside a Ractor they need to be marked
Ractor-safe [1]:
If an extension desires to be marked as Ractor-safe the extension
should call rb_ext_ractor_safe(true) at the Init_ function for the
extension, and all defined methods will be marked as Ractor-safe.
By marking them Ractor-safe ruby programs can generate graphs concurrently.
See also ruby/ruby#3824 for more information concerning this method.
TheWitness [Fri, 15 Nov 2024 13:20:32 +0000 (08:20 -0500)]
Fix #1268 - Segmentation Fault with Constant Lines
* This issue occurs with the --add-jsontime for lines that are a constant value. In this case, the variable `im->gdes[vidx].step` is always 0, which results in a division by zero segmentation fault.
Wolfgang Stöggl [Sat, 3 Aug 2024 14:54:02 +0000 (16:54 +0200)]
Update GitHub Actions
- The following GitHub Actions are deprecated:
actions/checkout@v2, actions/checkout@v3,
actions/upload-artifact@v3,
codecov/codecov-action@v3,
github/codeql-action/init@v1, github/codeql-action/analyze@v1
- Update GitHub Actions to current versions:
actions/checkout@v4
actions/upload-artifact@v4,
codecov/codecov-action@v4,
github/codeql-action/init@v3, github/codeql-action/analyze@v3
AC_CHECK_DECLS() always defines the related HAVE_DECL_xxx symbol (either
as '1' or as '0').
Fix the related #if blocks to check additionally for value beside the
existence of this symbol. Checking for existence is required for
e.g. Windows builds.
Martin Jambor [Mon, 29 Jul 2024 06:59:04 +0000 (08:59 +0200)]
Fix extra reference of parameters of rrd_fetch_dbi_{long,double} (#1255)
Functions rrd_fetch_dbi_long and rrd_fetch_dbi_double currently take
the first parameter of type "bi_result result *" even though that is
already a pointer and the use of that parameter suggests the extra
indirection is not wanted. What is more, the caller passes just
"bi_result result" to the corresponding actual arguments which results
in compile errors with GCC 14 because it now does not accept
incompatible pointer types by default.
Michal Suchánek [Mon, 8 Jan 2024 12:59:56 +0000 (13:59 +0100)]
Fix string truncation warnings related to PATH_MAX (#1244)
There are a number of places where rrdtool combines multiple PATH_MAX
sized strings into one.
PATH_MAX is a constant that tends to work in practice a lot of the time
but may not reflect the real capabilities of the system in real time.
In place of on-stack buffers of PATH_MAX size allocate memory
dynamically. Initialize the pointers to NULL so they can be all freed
unconditionally on exit.
Fixes: #1223 Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Wolfgang Stöggl [Sat, 6 Jan 2024 17:00:45 +0000 (18:00 +0100)]
Fix failing test pdp-calc1
The number of decimal places or the format can be different in the
output depending on the platform.
- The failing test has appeared under msys2 (MINGW32 and MINGW64),
where the exponential notation has changed:
E.g. e+000 instead of e+00
- Use DIFF9 also in test pdp-calc1, which reduces the number of
decimal places to 7 using "%0.7e". See DIFF9 in tests/functions.
- Update the pdp-calc1 output files accordingly
- Fixes failing test pdp-calc1 under msys2
Michal Suchánek [Fri, 5 Jan 2024 14:31:48 +0000 (15:31 +0100)]
Constify argv, fix warnings. (#1242)
* Fix perl warnings
- cast POPs to void to avoid unused value warning
- declare functions that don't set RETVAL as returning void
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
* Constify argv
rrd has no business modifying the string pointed to by passed agrv, and
as far as gcc can see it does indeed not modify them because it compiles
with const argv.
This fixes warnings when passing const strings into rrd, and avoids the
need to duplicate all strings in the tcl bindings.
This fixes warnings like these:
[ 3s] prog/sensord/rrd.c: In function 'rrdInit':
[ 3s] prog/sensord/rrd.c:302:40: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
[ 3s] 302 | ret = rrd_create(argc, (char**) argv);
[ 3s] | ^
[ 3s] prog/sensord/rrd.c: In function 'rrdUpdate':
[ 3s] prog/sensord/rrd.c:458:42: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
[ 3s] 458 | if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
[ 3s] | ^
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
* tcl: Do not duplicate const strings
---------
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Tobias Hintze [Fri, 20 Oct 2023 21:03:19 +0000 (23:03 +0200)]
rrdcached dump support (#1235)
* add missing newlines (\n) for TUNE
Help strings for TUNE command were lacking the trailing newline
character. This causes the FLUSH syntax printed in the same line as
TUNE's.
* fix sendall edge cases
The `sendall` func is implemented as a loop over multiple send() calls until all bytes are sent. Previously on subsequent calls the incorrect buffer was used for sending.
This change also forbids `allow_retry` when at least one byte was successfully sent already. This would otherwise mess up the protocol, when retrying from the start.
* rrcached: implement DUMP
* update tests for remote dump support
Previously, tests replaced the daemon-based dump use with a local use.
This is changed in this commit as dump is now supported via daemon.
Wolfgang Stöggl [Wed, 19 Apr 2023 06:23:27 +0000 (08:23 +0200)]
Update vcpkg GitHub Action (#1225)
- Update vcpkg to current release 2023.04.15, commit 501db0f
- Current versions of libraries are e.g.:
cairo 1.17.8, expat 2.5.0, fontconfig 2.14.2, freetype 2.12.1,
gettext 0.21.1, glib 2.76.1, libpng 1.6.39, pango 1.50.12,
pcre2 10.40, libxml2 2.10.3 and zlib 1.2.13
- Switch from windows-2019 to windows-2022, which includes
Visual Studio Enterprise 2022
To build the project on a (lean) Debian Bookworm system, there are
several more build dependencies which need to be installed in order for
the `make` command to succeed.
Also add the build dependencies for python bindings.
Wolfgang Stöggl [Tue, 7 Mar 2023 09:40:50 +0000 (10:40 +0100)]
Update msys2 GitHub Action (#1214)
- Add groff to required msys2 packages. It has been removed from group
base-devel: msys2/MSYS2-packages@66a18d1
- Fixes configure error:
I need a copy of *nroff to format the documentation
- `ci-build_MSYS2.sh`:
Add `set -e` to the bash script.
Otherwise CI seems OK despite a build error.
Enrico Scholz [Thu, 2 Mar 2023 16:00:25 +0000 (17:00 +0100)]
Allow to select locking mechanism (#1207)
* rrd: add _rrd_lock_xxx() helper functions and constants
This adds two sets of constants: these used in 'extra_flags' in various
parts of the extended api (e.g. rrd_updatex_r()), and these used within
rrd_open().
There are implemented some helper functions which help to parse command
line strings and environment variables, and to convert these two sets
of constants.
* rrd_update: pass custom RRD_LOCK_xxx flags to rrd_open()
* rrd_update: add '--locking' cli option
* rrd_open: handle RRD_LOCK_DEFAULT
When rrd_open() was called with RRD_LOCK_DEFAULT, read the locking
setup from $RRD_LOCKING environment.
* rrd_open: implement other locking methods
Allow locking to wait and make it possible to bypass locking
completely.
Wolfgang Stöggl [Thu, 2 Mar 2023 07:31:55 +0000 (08:31 +0100)]
Update vcpkg GitHub Action (#1212)
- Update vcpkg to current release 2023.02.24, commit a7b6122
- Use actions/checkout@v3 and actions/upload-artifact@v3 in order to
avoid the following warning:
Node.js 12 actions are deprecated.
- win32/collect_rrdtool_vcpkg_files.bat:
Add required pcre2-8.dll and pixman-1-0.dll
Remove pcre.dll, which is not required anymore
Enrico Scholz [Fri, 6 Jan 2023 11:02:12 +0000 (12:02 +0100)]
Set CLOEXEC flag when opening files and sockets (#1206)
* configure: check for O_CLOEXEC
* configure: check for SOCK_CLOEXEC
* configure: check whether fopen() supports the "e" flag
Although the "e" fopen() flag (atomic FD_CLOEXEC support) is scheduled
for being added to the next POSIX version, it is not supported by all
platforms.
Check whether it is accepted and working.
Because this flag can be tested at runtime only, configure.ac uses
AC_RUN_IFELSE. Cross compiling fallback assumes that "e" is supported.
* compat-cloexec: initial checkin
* compat-cloexec: implement missing HAVE_DECL_O_CLOEXEC case
Just define 'O_CLOEXEC' as 0; it is used always like in
| f = open(..., flags | O_CLOEXEC);
* compat-cloexec: implement missing HAVE_DECL_SOCK_CLOEXEC case
* compat-cloexec: implement missing RD_HAVE_WORKING_FOPEN_E case
When fopen() does not support the "e" flag, parse the mode string and
run an 'open(..., O_CLOEXEC) + fdopen()' sequence when it is set.
* rrd_open: open file with O_CLOEXEC
Avoid leaking file descriptors by set the O_CLOEXEC flag. This flag is
part of POSIX.1-2008 and there is implemented a fallback for systems
without it.
* open sockets with SOCK_CLOEXEC
* set "e" flag with fopen()
* tests: add test for _rrd_fopen()
projects / thirdparty / rrdtool-1.x.git / log
