Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

by Marcel Arentz

Module: check_mk Branch: master Commit: ac46b8698c37f38f71ea83fa74d0d85cb1b8c4e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac46b8698c37f3… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jul 13 12:00:16 2017 +0200 updated werk #5008 Change-Id: I56d2464bce953e61806a680310a668f98ffb2882 --- checks/cups_queues | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/cups_queues b/checks/cups_queues index ff251fd..7d0fbfe 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -130,6 +130,8 @@ def check_cups_queues(item, params, parsed): if state: yield state, "Oldest job is from %s" % oldest_readable + else: + yield 3, "Queue not found" check_info["cups_queues"] = {

6 years, 11 months

4973 FIX zpool: Fixed missing include statement which causes undefined ' df_inventory' error if using Nagios core

by Simon Betz

Module: check_mk Branch: master Commit: 25e3e3b9c9946d9ba460d90a8f033566452ea8f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25e3e3b9c9946d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 13 11:40:54 2017 +0200 4973 FIX zpool: Fixed missing include statement which causes undefined 'df_inventory' error if using Nagios core Change-Id: Ia528eb21dd2e0d751ee052f62ada6ef84273e9bd --- .werks/4973 | 11 +++++++++++ checks/zpool | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/4973 b/.werks/4973 new file mode 100644 index 0000000..80a37be --- /dev/null +++ b/.werks/4973 @@ -0,0 +1,11 @@ +Title: zpool: Fixed missing include statement which causes undefined 'df_inventory' error if using Nagios core +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499938768 + + diff --git a/checks/zpool b/checks/zpool index 2188f68..8d18b61 100644 --- a/checks/zpool +++ b/checks/zpool @@ -86,5 +86,6 @@ check_info['zpool'] = { "service_description" : "Storage Pool %s", "has_perfdata" : True, "group" : "filesystem", + "includes" : ["df.include"], }

6 years, 11 months

5008 FIX cups_queues: Fixed crash if previously discovered printer is not available anymore

by Marcel Arentz

Module: check_mk Branch: master Commit: d7e1edefed583da732bad3aaa0447d7c2ab2efe7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7e1edefed583d… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jul 13 11:31:20 2017 +0200 5008 FIX cups_queues: Fixed crash if previously discovered printer is not available anymore The code for this checkplugin has been refactored recently. Since then the Services will crash if mentioned conditions are the case because the check function assumes all discovered printer to be in the parsed output. Change-Id: Iea4a9d03d0ef89b3fd9073f981ad66a86b76e07e --- .werks/5008 | 12 +++++++++++ checks/cups_queues | 61 +++++++++++++++++++++++++++--------------------------- 2 files changed, 43 insertions(+), 30 deletions(-) diff --git a/.werks/5008 b/.werks/5008 new file mode 100644 index 0000000..7022e9d --- /dev/null +++ b/.werks/5008 @@ -0,0 +1,12 @@ +Title: cups_queues: Fixed crash if previously discovered printer is not available anymore +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499937834 +Class: fix + +The code for this checkplugin has been refactored recently. Since then the +Services will crash if mentioned conditions are the case because the check +function assumes all discovered printer to be in the parsed output. diff --git a/checks/cups_queues b/checks/cups_queues index 972abcb..ff251fd 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -96,39 +96,40 @@ def inventory_cups_queues(parsed): yield item, {} def check_cups_queues(item, params, parsed): - data = parsed[item] - if type(params) == tuple and len(params) == 4: - params = {"job_count" : (params[0], params[1]), - "job_age" : (params[2], params[3]), - } - - if data["status_readable"] in params: - state = params[data["status_readable"]] - yield state, data["output"] - else: - yield 3, "Undefinded status output in \"lpr -p\"" - - now = time.time() - jobs_count = len(data["jobs"]) - if jobs_count > 0: - warn_num, crit_num = params["job_count"] - yield 0, "Jobs: %d" % jobs_count, \ - [ ("jobs", jobs_count, warn_num, crit_num, 0) ] - - warn_age, crit_age = params["job_age"] - now = time.time() - oldest = min(data["jobs"]) - oldest_readable = time.strftime("%c", time.localtime(oldest)) + if item in parsed: + data = parsed[item] + if type(params) == tuple and len(params) == 4: + params = {"job_count" : (params[0], params[1]), + "job_age" : (params[2], params[3]), + } - if oldest < now - crit_age or jobs_count > crit_num: - state = 2 - elif oldest < now - warn_age or jobs_count > warn_num: - state = 1 + if data["status_readable"] in params: + state = params[data["status_readable"]] + yield state, data["output"] else: - state = 0 + yield 3, "Undefinded status output in \"lpr -p\"" - if state: - yield state, "Oldest job is from %s" % oldest_readable + now = time.time() + jobs_count = len(data["jobs"]) + if jobs_count > 0: + warn_num, crit_num = params["job_count"] + yield 0, "Jobs: %d" % jobs_count, \ + [ ("jobs", jobs_count, warn_num, crit_num, 0) ] + + warn_age, crit_age = params["job_age"] + now = time.time() + oldest = min(data["jobs"]) + oldest_readable = time.strftime("%c", time.localtime(oldest)) + + if oldest < now - crit_age or jobs_count > crit_num: + state = 2 + elif oldest < now - warn_age or jobs_count > warn_num: + state = 1 + else: + state = 0 + + if state: + yield state, "Oldest job is from %s" % oldest_readable check_info["cups_queues"] = {

6 years, 11 months

4972 FIX mk_inventory.aix: Use MK_VARDIR instead of MK_CONFDIR for the state file

by Simon Betz

Module: check_mk Branch: master Commit: 09daf76e21b9fc85ef7f0051940fbf826443dcc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09daf76e21b9fc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 13 11:19:28 2017 +0200 4972 FIX mk_inventory.aix: Use MK_VARDIR instead of MK_CONFDIR for the state file Change-Id: Id89c0ea5ca1bdaa08706bd440fb3541ad145977e --- .werks/4972 | 11 +++++++++++ agents/plugins/mk_inventory.aix | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4972 b/.werks/4972 new file mode 100644 index 0000000..cd4f054 --- /dev/null +++ b/.werks/4972 @@ -0,0 +1,11 @@ +Title: mk_inventory.aix: Use MK_VARDIR instead of MK_CONFDIR for the state file +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499937340 + + diff --git a/agents/plugins/mk_inventory.aix b/agents/plugins/mk_inventory.aix index 4852d4c..fb79884 100755 --- a/agents/plugins/mk_inventory.aix +++ b/agents/plugins/mk_inventory.aix @@ -26,7 +26,7 @@ # Run and *send* only once every 4 hours INTERVAL=14400 -FLAGFILE=$MK_CONFDIR/mk_inventory.last.$REMOTE +FLAGFILE=$MK_VARDIR/mk_inventory.last.$REMOTE NOW=$(date +%s) UNTIL=$((NOW + INTERVAL + 600))

6 years, 11 months

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: eaa83eedab1463eaa791b2ed0a9a7ef07864439b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaa83eedab1463… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jul 13 11:22:18 2017 +0200 Reserved 10 Werk IDS Change-Id: I4a2e114a15b2e1bf58dfc6ac8ad9466f8f5e0408 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index dddb880..b72271c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5008 +5018

6 years, 11 months

Encapsulate select() calls, part 10

by Sven Panne

Module: check_mk Branch: master Commit: d5494fdc6f8dffec235c509906341bf4c8b0893a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5494fdc6f8dff… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 11 16:17:33 2017 +0200 Encapsulate select() calls, part 10 Move maximum file descriptor calculation into Poller class, simplifying the call sites quite a bit. Note that we include the implementation detail <sys/select.h> only in Poller.h now. Change-Id: I249124fe9f07aaa9b54a381d860e172e99d31d30 --- livestatus/src/InputBuffer.cc | 2 +- livestatus/src/OutputBuffer.cc | 2 +- livestatus/src/Poller.h | 16 ++++++++++++---- livestatus/src/module.cc | 4 ++-- livestatus/src/unixcat.cc | 6 +----- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 889205b..ee04621 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -206,7 +206,7 @@ InputBuffer::Result InputBuffer::readData() { Poller poller; poller.addReadFD(_fd); - int retval = poller.poll(_fd + 1, milliseconds(200)); + int retval = poller.poll(milliseconds(200)); if (retval > 0 && poller.isReadFDSet(_fd)) { ssize_t r = read(_fd, &_readahead_buffer[_write_index], _readahead_buffer.capacity() - _write_index); diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 83471a2..cbe565b 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -79,7 +79,7 @@ void OutputBuffer::writeData(ostringstream &os) { while (!_termination_flag && bytes_to_write > 0) { Poller poller; poller.addWriteFD(_fd); - int retval = poller.poll(_fd + 1, milliseconds(100)); + int retval = poller.poll(milliseconds(100)); if (retval > 0 && poller.isWriteFDSet(_fd)) { ssize_t bytes_written = write(_fd, buffer, bytes_to_write); if (bytes_written == -1) { diff --git a/livestatus/src/Poller.h b/livestatus/src/Poller.h index f80a867..976acf5 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -27,6 +27,7 @@ #include "config.h" // IWYU pragma: keep #include <sys/select.h> +#include <algorithm> #include <cerrno> #include "ChronoUtils.h" @@ -35,10 +36,11 @@ public: Poller() { FD_ZERO(&_readfds); FD_ZERO(&_writefds); + _maxfd = -1; } template <typename Rep, typename Period> - int poll(int nfds, std::chrono::duration<Rep, Period> timeout) { + int poll(std::chrono::duration<Rep, Period> timeout) { int retval; timeval tv = to_timeval(timeout); // I/O primitives can fail when interrupted by a signal, so we should @@ -46,13 +48,13 @@ public: // encapsulated in e.g. glibc's TEMP_FAILURE_RETRY macro, see: // https://www.gnu.org/software/libc/manual/html_node/Interrupted-Primitives.h… do { - retval = select(nfds, &_readfds, &_writefds, nullptr, &tv); + retval = select(_maxfd + 1, &_readfds, &_writefds, nullptr, &tv); } while (retval == -1 && errno == EINTR); return retval; } - void addReadFD(int fd) { FD_SET(fd, &_readfds); } - void addWriteFD(int fd) { FD_SET(fd, &_writefds); } + void addReadFD(int fd) { addFD(fd, _readfds); } + void addWriteFD(int fd) { addFD(fd, _writefds); } bool isReadFDSet(int fd) const { return FD_ISSET(fd, &_readfds); } bool isWriteFDSet(int fd) const { return FD_ISSET(fd, &_writefds); } @@ -60,6 +62,12 @@ public: private: fd_set _readfds; fd_set _writefds; + int _maxfd; + + void addFD(int fd, fd_set &fds) { + FD_SET(fd, &fds); + _maxfd = std::max(_maxfd, fd); + } }; #endif // Poller_h diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 22d75af..3e7907b 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -30,9 +30,9 @@ #include "config.h" #include <fcntl.h> #include <pthread.h> -#include <sys/time.h> #include <sys/socket.h> #include <sys/stat.h> +#include <sys/time.h> #include <sys/un.h> #include <unistd.h> #include <chrono> @@ -203,7 +203,7 @@ void *main_thread(void *data) { Poller poller; poller.addReadFD(g_unix_socket); - int retval = poller.poll(g_unix_socket + 1, milliseconds(2500)); + int retval = poller.poll(milliseconds(2500)); if (retval > 0 && poller.isReadFDSet(g_unix_socket)) { int cc = accept(g_unix_socket, nullptr, nullptr); if (cc > g_max_fd_ever) { diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc index 8c48d15..eb58200 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -61,11 +61,7 @@ ssize_t read_with_timeout(int from, char *buffer, int size, microseconds timeout) { Poller poller; poller.addReadFD(from); - int retval = poller.poll(from + 1, timeout); - if (retval > 0) { - return read(from, buffer, size); - } - return -2; + return poller.poll(timeout) > 0 ? read(from, buffer, size) : -2; } void *copy_thread(void *info) {

6 years, 11 months

Encapsulate select() calls, part 11

by Sven Panne

Module: check_mk Branch: master Commit: c7cc64523f573cbfcb7df852f8d9715ce01d0185 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7cc64523f573c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 12 14:52:04 2017 +0200 Encapsulate select() calls, part 11 Generalize the interface a bit: Instead of setting/testing a single kind of event at a time, use a set of polling events. The former interface was OK for the underlying select()-based implementation, but it was inadequate for a future poll()-based implementation. To use the involved bit masks in a type-safe way, a separate header containing templated operators is introduced. This seems to be overkill for the task at hand, but we can nicely use this at other places later. Alas, this commit contains some tiny fixes to make cppcheck and clang-tidy happy again. There seem to be some heuristics which have been triggered accidentally, so let's just fix them now. Change-Id: I29e788d8fb763778d1125f1a1a5543a4e97090aa --- livestatus/src/BitMask.h | 99 ++++++++++++++++++++++++++++++++++++++ livestatus/src/InputBuffer.cc | 4 +- livestatus/src/OutputBuffer.cc | 4 +- livestatus/src/Poller.h | 35 +++++++++++--- livestatus/src/TableEventConsole.h | 2 +- livestatus/src/module.cc | 5 +- livestatus/src/unixcat.cc | 2 +- 7 files changed, 136 insertions(+), 15 deletions(-) diff --git a/livestatus/src/BitMask.h b/livestatus/src/BitMask.h new file mode 100644 index 0000000..3e4fcb0 --- /dev/null +++ b/livestatus/src/BitMask.h @@ -0,0 +1,99 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk 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 in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// tails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#ifndef BitMask_h +#define BitMask_h + +#include "config.h" // IWYU pragma: keep +#include <type_traits> + +namespace mk { +// Return the enumerator's value as a compile-time constant, see Scott Meyer's +// "Effective Modern C++", item 10. +template <typename Enum> +constexpr auto toUType(Enum e) noexcept { + return static_cast<std::underlying_type_t<Enum>>(e); +} + +// A marker trait which enables the bit mask operators +template <typename Enum> +struct is_bit_mask { + static const bool value = false; +}; + +// A helper macro to make the use sites of the marker trait less verbose +#define IS_BIT_MASK(ENUM) \ + namespace mk { \ + template <> \ + struct is_bit_mask<ENUM> { \ + static const bool value = true; \ + }; \ + } + +// A helper template to make template definitions a bit shorter +template <typename T> +constexpr bool is_bit_mask_v = is_bit_mask<T>::value; +} // namespace + +template <typename Enum, typename = std::enable_if_t<mk::is_bit_mask_v<Enum>>> +inline constexpr Enum operator&(Enum x, Enum y) { + return x &= y; +} + +template <typename Enum, typename = std::enable_if_t<mk::is_bit_mask_v<Enum>>> +inline constexpr Enum operator|(Enum x, Enum y) { + return x |= y; +} + +template <typename Enum, typename = std::enable_if_t<mk::is_bit_mask_v<Enum>>> +inline constexpr Enum operator^(Enum x, Enum y) { + return x ^= y; +} + +template <typename Enum, typename = std::enable_if_t<mk::is_bit_mask_v<Enum>>> +inline constexpr Enum operator~(Enum x) { + return Enum(~mk::toUType(x)); +} + +template <typename Enum, typename = std::enable_if_t<mk::is_bit_mask_v<Enum>>> +inline Enum &operator|=(Enum &x, Enum y) { + return x = Enum(mk::toUType(x) | mk::toUType(y)); +} + +template <typename Enum, typename = std::enable_if_t<mk::is_bit_mask_v<Enum>>> +inline const Enum &operator&=(Enum &x, Enum y) { + return x = Enum(mk::toUType(x) & mk::toUType(y)); +} + +template <typename Enum, typename = std::enable_if_t<mk::is_bit_mask_v<Enum>>> +inline Enum &operator^=(Enum &x, Enum y) { + return x = Enum(mk::toUType(x) ^ mk::toUType(y)); +} + +template <typename Enum, typename = std::enable_if_t<mk::is_bit_mask_v<Enum>>> +inline bool is_empty_bit_mask(Enum x) { + return x == Enum(0); +} + +#endif // BitMask_h diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index ee04621..ecc3a13 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -205,9 +205,9 @@ InputBuffer::Result InputBuffer::readData() { } Poller poller; - poller.addReadFD(_fd); + poller.addFileDescriptor(_fd, PollEvents::in); int retval = poller.poll(milliseconds(200)); - if (retval > 0 && poller.isReadFDSet(_fd)) { + if (retval > 0 && poller.isFileDescriptorSet(_fd, PollEvents::in)) { ssize_t r = read(_fd, &_readahead_buffer[_write_index], _readahead_buffer.capacity() - _write_index); if (r < 0) { diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index cbe565b..9417b46 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -78,9 +78,9 @@ void OutputBuffer::writeData(ostringstream &os) { size_t bytes_to_write = os.tellp(); while (!_termination_flag && bytes_to_write > 0) { Poller poller; - poller.addWriteFD(_fd); + poller.addFileDescriptor(_fd, PollEvents::out); int retval = poller.poll(milliseconds(100)); - if (retval > 0 && poller.isWriteFDSet(_fd)) { + if (retval > 0 && poller.isFileDescriptorSet(_fd, PollEvents::out)) { ssize_t bytes_written = write(_fd, buffer, bytes_to_write); if (bytes_written == -1) { generic_error ge("could not write " + diff --git a/livestatus/src/Poller.h b/livestatus/src/Poller.h index 976acf5..27dd99f 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -29,8 +29,12 @@ #include <sys/select.h> #include <algorithm> #include <cerrno> +#include "BitMask.h" #include "ChronoUtils.h" +enum class PollEvents { in = 1 << 0, out = 1 << 1 }; +IS_BIT_MASK(PollEvents); + class Poller { public: Poller() { @@ -53,20 +57,37 @@ public: return retval; } - void addReadFD(int fd) { addFD(fd, _readfds); } - void addWriteFD(int fd) { addFD(fd, _writefds); } + void addFileDescriptor(int fd, PollEvents e) { + addFileDescriptor(fd, e, PollEvents::in, _readfds); + addFileDescriptor(fd, e, PollEvents::out, _writefds); + } - bool isReadFDSet(int fd) const { return FD_ISSET(fd, &_readfds); } - bool isWriteFDSet(int fd) const { return FD_ISSET(fd, &_writefds); } + bool isFileDescriptorSet(int fd, PollEvents e) const { + return isFileDescriptorSet(fd, e, PollEvents::in, _readfds) || + isFileDescriptorSet(fd, e, PollEvents::out, _writefds); + } private: +#ifdef __clang_analyzer__ + // Workaround for https://llvm.org/bugs/show_bug.cgi?id=8920 + fd_set _readfds{}; + fd_set _writefds{}; +#else fd_set _readfds; fd_set _writefds; +#endif int _maxfd; - void addFD(int fd, fd_set &fds) { - FD_SET(fd, &fds); - _maxfd = std::max(_maxfd, fd); + void addFileDescriptor(int fd, PollEvents e, PollEvents mask, fd_set &fds) { + if (!is_empty_bit_mask(e & mask)) { + FD_SET(fd, &fds); + _maxfd = std::max(_maxfd, fd); + } + } + + bool isFileDescriptorSet(int fd, PollEvents e, PollEvents mask, + const fd_set &fds) const { + return !is_empty_bit_mask(e & mask) && FD_ISSET(fd, &fds); } }; diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index 7745898..7357d03 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -69,7 +69,7 @@ protected: public: EventConsoleColumn(Column &column, T default_value, - std::function<T(std::string)> f) + const std::function<T(std::string)> &f) : _column(column), _default_value(default_value), _f(f) {} std::string getRaw(ECRow *row) const { diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 3e7907b..638de13 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -202,9 +202,10 @@ void *main_thread(void *data) { do_statistics(); Poller poller; - poller.addReadFD(g_unix_socket); + poller.addFileDescriptor(g_unix_socket, PollEvents::in); int retval = poller.poll(milliseconds(2500)); - if (retval > 0 && poller.isReadFDSet(g_unix_socket)) { + if (retval > 0 && + poller.isFileDescriptorSet(g_unix_socket, PollEvents::in)) { int cc = accept(g_unix_socket, nullptr, nullptr); if (cc > g_max_fd_ever) { g_max_fd_ever = cc; diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc index eb58200..ff510f6 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -60,7 +60,7 @@ void printErrno(const string &msg) { ssize_t read_with_timeout(int from, char *buffer, int size, microseconds timeout) { Poller poller; - poller.addReadFD(from); + poller.addFileDescriptor(from, PollEvents::in); return poller.poll(timeout) > 0 ? read(from, buffer, size) : -2; }

6 years, 11 months

Encapsulate select() calls, part 1

by Sven Panne

Module: check_mk Branch: master Commit: 0898286ba44d44da9a389c2fb3384f61c382a81f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0898286ba44d44… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 11 09:16:39 2017 +0200 Encapsulate select() calls, part 1 The problem: select() can only handle a fixed number of file descriptors, 1024 on most systems, and it has a very awkward low-level interface. We will remove this restriction and clean up the related code in a series of commits. Each commit will intentionally be small, but self-contained, easy to understand, and most of the time mechanical. The whole series is intended to be an example for improving an aspect of out SW in a structured simple way, without the need for huge commits or great display of ingenuity. This commit at hand only does something extremely simple and is a totally mechanical refactoring: Put the select() call into a class, providing a 1:1 interface for now. Doesn't do very much in itself, but it is a starting point for things to come... Change-Id: I048ca6e7e2bbde7c3c4e2951baaef29874ed72c6 --- livestatus/src/InputBuffer.cc | 4 +++- livestatus/src/OutputBuffer.cc | 4 +++- livestatus/src/Poller.h | 41 +++++++++++++++++++++++++++++++++++++++++ livestatus/src/module.cc | 5 ++++- livestatus/src/unixcat.cc | 4 +++- 5 files changed, 54 insertions(+), 4 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index d76c94d..e2ecae8 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -31,6 +31,7 @@ #include <ratio> #include "ChronoUtils.h" #include "Logger.h" +#include "Poller.h" using std::chrono::milliseconds; using std::chrono::system_clock; @@ -205,12 +206,13 @@ InputBuffer::Result InputBuffer::readData() { return Result::timeout; } + Poller poller; fd_set fds; FD_ZERO(&fds); FD_SET(_fd, &fds); timeval tv = to_timeval(milliseconds(200)); - int retval = select(_fd + 1, &fds, nullptr, nullptr, &tv); + int retval = poller.poll(_fd + 1, &fds, nullptr, nullptr, &tv); if (retval > 0 && FD_ISSET(_fd, &fds)) { ssize_t r = read(_fd, &_readahead_buffer[_write_index], _readahead_buffer.capacity() - _write_index); diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 8cda43d..e44d46b 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -31,6 +31,7 @@ #include <ratio> #include "ChronoUtils.h" #include "Logger.h" +#include "Poller.h" using std::chrono::milliseconds; using std::ostringstream; @@ -78,12 +79,13 @@ void OutputBuffer::writeData(ostringstream &os) { const char *buffer = static_cast<Hack *>(os.rdbuf())->base(); size_t bytes_to_write = os.tellp(); while (!_termination_flag && bytes_to_write > 0) { + Poller poller; fd_set fds; FD_ZERO(&fds); FD_SET(_fd, &fds); timeval tv = to_timeval(milliseconds(100)); - int retval = select(_fd + 1, nullptr, &fds, nullptr, &tv); + int retval = poller.poll(_fd + 1, nullptr, &fds, nullptr, &tv); if (retval > 0 && FD_ISSET(_fd, &fds)) { ssize_t bytes_written = write(_fd, buffer, bytes_to_write); if (bytes_written == -1) { diff --git a/livestatus/src/Poller.h b/livestatus/src/Poller.h new file mode 100644 index 0000000..71e2090 --- /dev/null +++ b/livestatus/src/Poller.h @@ -0,0 +1,41 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk 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 in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// tails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#ifndef Poller_h +#define Poller_h + +#include "config.h" // IWYU pragma: keep +#include <sys/select.h> + +class Poller { +public: + Poller() {} + + int poll(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, + struct timeval *timeout) { + return select(nfds, readfds, writefds, exceptfds, timeout); + } +}; + +#endif // Poller_h diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 9070545..8f0ca4e 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -54,6 +54,7 @@ #include "Logger.h" #include "MonitoringCore.h" #include "OutputBuffer.h" +#include "Poller.h" #include "Store.h" #include "StringUtils.h" #include "TimeperiodsCache.h" @@ -202,10 +203,12 @@ void *main_thread(void *data) { tv.tv_sec = 2; tv.tv_usec = 500 * 1000; + Poller poller; fd_set fds; FD_ZERO(&fds); FD_SET(g_unix_socket, &fds); - int retval = select(g_unix_socket + 1, &fds, nullptr, nullptr, &tv); + int retval = + poller.poll(g_unix_socket + 1, &fds, nullptr, nullptr, &tv); if (retval > 0 && FD_ISSET(g_unix_socket, &fds)) { int cc = accept(g_unix_socket, nullptr, nullptr); if (cc > g_max_fd_ever) { diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc index 6a0555c..f381129 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -34,6 +34,7 @@ #include <cstring> #include <iostream> #include <string> +#include "Poller.h" using std::cerr; using std::endl; @@ -55,13 +56,14 @@ void printErrno(const string &msg) { } ssize_t read_with_timeout(int from, char *buffer, int size, int us) { + Poller poller; fd_set fds; FD_ZERO(&fds); FD_SET(from, &fds); struct timeval tv; tv.tv_sec = us / 1000000; tv.tv_usec = us % 1000000; - int retval = select(from + 1, &fds, nullptr, nullptr, &tv); + int retval = poller.poll(from + 1, &fds, nullptr, nullptr, &tv); if (retval > 0) { return read(from, buffer, size); }

6 years, 11 months

Encapsulate select() calls, part 2

by Sven Panne

Module: check_mk Branch: master Commit: 0de3da2951546eed3c50dcf1751c40c612f8c495 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0de3da2951546e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 11 10:08:29 2017 +0200 Encapsulate select() calls, part 2 Mechanical refactoring: Remove unused exception file descriptor set parameter, see https://refactoring.com/catalog/removeParameter.html. Change-Id: I16d3a4f861a3f78aa5d39678926081b1f3818296 --- livestatus/src/InputBuffer.cc | 2 +- livestatus/src/OutputBuffer.cc | 2 +- livestatus/src/Poller.h | 4 ++-- livestatus/src/module.cc | 3 +-- livestatus/src/unixcat.cc | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index e2ecae8..1bfd98b 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -212,7 +212,7 @@ InputBuffer::Result InputBuffer::readData() { FD_SET(_fd, &fds); timeval tv = to_timeval(milliseconds(200)); - int retval = poller.poll(_fd + 1, &fds, nullptr, nullptr, &tv); + int retval = poller.poll(_fd + 1, &fds, nullptr, &tv); if (retval > 0 && FD_ISSET(_fd, &fds)) { ssize_t r = read(_fd, &_readahead_buffer[_write_index], _readahead_buffer.capacity() - _write_index); diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index e44d46b..bf54168 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -85,7 +85,7 @@ void OutputBuffer::writeData(ostringstream &os) { FD_SET(_fd, &fds); timeval tv = to_timeval(milliseconds(100)); - int retval = poller.poll(_fd + 1, nullptr, &fds, nullptr, &tv); + int retval = poller.poll(_fd + 1, nullptr, &fds, &tv); if (retval > 0 && FD_ISSET(_fd, &fds)) { ssize_t bytes_written = write(_fd, buffer, bytes_to_write); if (bytes_written == -1) { diff --git a/livestatus/src/Poller.h b/livestatus/src/Poller.h index 71e2090..7a71451 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -32,9 +32,9 @@ class Poller { public: Poller() {} - int poll(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, + int poll(int nfds, fd_set *readfds, fd_set *writefds, struct timeval *timeout) { - return select(nfds, readfds, writefds, exceptfds, timeout); + return select(nfds, readfds, writefds, nullptr, timeout); } }; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 8f0ca4e..05980f7 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -207,8 +207,7 @@ void *main_thread(void *data) { fd_set fds; FD_ZERO(&fds); FD_SET(g_unix_socket, &fds); - int retval = - poller.poll(g_unix_socket + 1, &fds, nullptr, nullptr, &tv); + int retval = poller.poll(g_unix_socket + 1, &fds, nullptr, &tv); if (retval > 0 && FD_ISSET(g_unix_socket, &fds)) { int cc = accept(g_unix_socket, nullptr, nullptr); if (cc > g_max_fd_ever) { diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc index f381129..2b4362b 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -63,7 +63,7 @@ ssize_t read_with_timeout(int from, char *buffer, int size, int us) { struct timeval tv; tv.tv_sec = us / 1000000; tv.tv_usec = us % 1000000; - int retval = poller.poll(from + 1, &fds, nullptr, nullptr, &tv); + int retval = poller.poll(from + 1, &fds, nullptr, &tv); if (retval > 0) { return read(from, buffer, size); }

6 years, 11 months

Encapsulate select() calls, part 5

by Sven Panne

Module: check_mk Branch: master Commit: 87b75247651c8f17ad3e6cd5e6793be9d8af58a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87b75247651c8f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 11 13:18:05 2017 +0200 Encapsulate select() calls, part 5 Handle interrupted select() system call correctly. Previously we did this only in one place by hand, but now that select() is centralized, we can fix this easily. Change-Id: I6cf5e1285679af0794a0563b36bb7a51597ef8ae --- livestatus/src/Poller.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/livestatus/src/Poller.h b/livestatus/src/Poller.h index e4328c2..9484ce1 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -27,6 +27,7 @@ #include "config.h" // IWYU pragma: keep #include <sys/select.h> +#include <cerrno> #include "ChronoUtils.h" class Poller { @@ -36,8 +37,16 @@ public: template <typename Rep, typename Period> int poll(int nfds, fd_set *readfds, fd_set *writefds, std::chrono::duration<Rep, Period> timeout) { + int retval; timeval tv = to_timeval(timeout); - return select(nfds, readfds, writefds, nullptr, &tv); + // I/O primitives can fail when interrupted by a signal, so we should + // retry the operation. In the plain C world, this is already + // encapsulated in e.g. glibc's TEMP_FAILURE_RETRY macro, see: + // https://www.gnu.org/software/libc/manual/html_node/Interrupted-Primitives.h… + do { + retval = select(nfds, readfds, writefds, nullptr, &tv); + } while (retval == -1 && errno == EINTR); + return retval; } };

6 years, 11 months

← Newer
1
...
14
15
16
17
18
19
20
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017