Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 2a295cb76b4bb02c7bea1caed1895f0c6b420934 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a295cb76b4bb0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 11 13:48:13 2017 +0200 Encapsulate select() calls, part 6 Move file descriptor sets into Poller class, which is a purely mechanical change. Note that Poller::readFDs() and Poller::writeFDs() return pointers to internal fields, which is an anti-pattern. This is OK for now, those methods will die soon, anyway... Change-Id: If27905c11abd326ab3d28793ce3f208c454902e0 --- livestatus/src/InputBuffer.cc | 9 ++++----- livestatus/src/OutputBuffer.cc | 9 ++++----- livestatus/src/Poller.h | 12 +++++++++--- livestatus/src/module.cc | 9 ++++----- livestatus/src/unixcat.cc | 7 +++---- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 4134ba1..058797a 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -206,12 +206,11 @@ InputBuffer::Result InputBuffer::readData() { } Poller poller; - fd_set fds; - FD_ZERO(&fds); - FD_SET(_fd, &fds); + FD_ZERO(poller.readFDs()); + FD_SET(_fd, poller.readFDs()); - int retval = poller.poll(_fd + 1, &fds, nullptr, milliseconds(200)); - if (retval > 0 && FD_ISSET(_fd, &fds)) { + int retval = poller.poll(_fd + 1, milliseconds(200)); + if (retval > 0 && FD_ISSET(_fd, poller.readFDs())) { 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 5189729..5af8f4e 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -79,12 +79,11 @@ void OutputBuffer::writeData(ostringstream &os) { 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); + FD_ZERO(poller.writeFDs()); + FD_SET(_fd, poller.writeFDs()); - int retval = poller.poll(_fd + 1, nullptr, &fds, milliseconds(100)); - if (retval > 0 && FD_ISSET(_fd, &fds)) { + int retval = poller.poll(_fd + 1, milliseconds(100)); + if (retval > 0 && FD_ISSET(_fd, poller.writeFDs())) { 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 9484ce1..6c5dd50 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -35,8 +35,7 @@ public: Poller() {} template <typename Rep, typename Period> - int poll(int nfds, fd_set *readfds, fd_set *writefds, - std::chrono::duration<Rep, Period> timeout) { + int poll(int nfds, 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 @@ -44,10 +43,17 @@ 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(nfds, &_readfds, &_writefds, nullptr, &tv); } while (retval == -1 && errno == EINTR); return retval; } + + fd_set *readFDs() { return &_readfds; } + fd_set *writeFDs() { return &_writefds; } + +private: + fd_set _readfds; + fd_set _writefds; }; #endif // Poller_h diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 3632e52..599cc43 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -202,12 +202,11 @@ void *main_thread(void *data) { do_statistics(); Poller poller; - fd_set fds; - FD_ZERO(&fds); - FD_SET(g_unix_socket, &fds); + FD_ZERO(poller.readFDs()); + FD_SET(g_unix_socket, poller.readFDs()); int retval = - poller.poll(g_unix_socket + 1, &fds, nullptr, milliseconds(2500)); - if (retval > 0 && FD_ISSET(g_unix_socket, &fds)) { + poller.poll(g_unix_socket + 1, milliseconds(2500)); + if (retval > 0 && FD_ISSET(g_unix_socket, poller.readFDs())) { 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 62c1b7a..7fefd98 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -61,10 +61,9 @@ void printErrno(const string &msg) { ssize_t read_with_timeout(int from, char *buffer, int size, microseconds timeout) { Poller poller; - fd_set fds; - FD_ZERO(&fds); - FD_SET(from, &fds); - int retval = poller.poll(from + 1, &fds, nullptr, timeout); + FD_ZERO(poller.readFDs()); + FD_SET(from, poller.readFDs()); + int retval = poller.poll(from + 1, timeout); if (retval > 0) { return read(from, buffer, size); }

6 years, 11 months

Encapsulate select() calls, part 4

by Sven Panne

Module: check_mk Branch: master Commit: b1c05fad5668213939b807d685e9a3e77e4c5ad2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1c05fad566821… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 11 12:03:34 2017 +0200 Encapsulate select() calls, part 4 Now that we use std::chrono, we can improve the call sites, too: Instead of using plain C data types like 'int' and relying on naming ("identifiers with 'us' in their name contain microseconds" etc.), we have all the needed information in the types and can't mix things up anymore. Related code smell: https://sourcemaking.com/refactoring/smells/primitive-obsession Change-Id: Ib195891e2fb8e0e27c92d3b547c8a0401a4d4776 --- livestatus/src/unixcat.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc index 529e013..62c1b7a 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -58,12 +58,13 @@ void printErrno(const string &msg) { cerr << msg + ": " + strerror(errno) << endl; } -ssize_t read_with_timeout(int from, char *buffer, int size, int us) { +ssize_t read_with_timeout(int from, char *buffer, int size, + microseconds timeout) { Poller poller; fd_set fds; FD_ZERO(&fds); FD_SET(from, &fds); - int retval = poller.poll(from + 1, &fds, nullptr, microseconds(us)); + int retval = poller.poll(from + 1, &fds, nullptr, timeout); if (retval > 0) { return read(from, buffer, size); } @@ -80,8 +81,8 @@ void *copy_thread(void *info) { char read_buffer[65536]; while (true) { - ssize_t r = - read_with_timeout(from, read_buffer, sizeof(read_buffer), 1000000); + ssize_t r = read_with_timeout(from, read_buffer, sizeof(read_buffer), + microseconds(1000000)); if (r == -1) { printErrno("Error reading from " + to_string(from)); break;

6 years, 11 months

Encapsulate select() calls, part 8

by Sven Panne

Module: check_mk Branch: master Commit: 39efbbef6c09645e0309052fa8c8ae13ad2f23dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39efbbef6c0964… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 11 14:54:23 2017 +0200 Encapsulate select() calls, part 8 Move FD_SET calls into Poller class. Change-Id: I60290e7f59bd58ed3895e6ab4cfca5d5f2f8eb95 --- livestatus/src/InputBuffer.cc | 2 +- livestatus/src/OutputBuffer.cc | 2 +- livestatus/src/Poller.h | 3 +++ livestatus/src/module.cc | 2 +- livestatus/src/unixcat.cc | 3 +-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index ef34ff9..15025bb 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -206,7 +206,7 @@ InputBuffer::Result InputBuffer::readData() { } Poller poller; - FD_SET(_fd, poller.readFDs()); + poller.addReadFD(_fd); int retval = poller.poll(_fd + 1, milliseconds(200)); if (retval > 0 && FD_ISSET(_fd, poller.readFDs())) { ssize_t r = read(_fd, &_readahead_buffer[_write_index], diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 2d8a2f7..354aa3b 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -79,7 +79,7 @@ void OutputBuffer::writeData(ostringstream &os) { size_t bytes_to_write = os.tellp(); while (!_termination_flag && bytes_to_write > 0) { Poller poller; - FD_SET(_fd, poller.writeFDs()); + poller.addWriteFD(_fd); int retval = poller.poll(_fd + 1, milliseconds(100)); if (retval > 0 && FD_ISSET(_fd, poller.writeFDs())) { ssize_t bytes_written = write(_fd, buffer, bytes_to_write); diff --git a/livestatus/src/Poller.h b/livestatus/src/Poller.h index 72721fc..819ef43 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -51,6 +51,9 @@ public: return retval; } + void addReadFD(int fd) { FD_SET(fd, &_readfds); } + void addWriteFD(int fd) { FD_SET(fd, &_writefds); } + fd_set *readFDs() { return &_readfds; } fd_set *writeFDs() { return &_writefds; } diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index d72a6e9..fda1ba9 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -202,7 +202,7 @@ void *main_thread(void *data) { do_statistics(); Poller poller; - FD_SET(g_unix_socket, poller.readFDs()); + poller.addReadFD(g_unix_socket); int retval = poller.poll(g_unix_socket + 1, milliseconds(2500)); if (retval > 0 && FD_ISSET(g_unix_socket, poller.readFDs())) { int cc = accept(g_unix_socket, nullptr, nullptr); diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc index 43483d9..8c48d15 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include <pthread.h> -#include <sys/select.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/un.h> @@ -61,7 +60,7 @@ void printErrno(const string &msg) { ssize_t read_with_timeout(int from, char *buffer, int size, microseconds timeout) { Poller poller; - FD_SET(from, poller.readFDs()); + poller.addReadFD(from); int retval = poller.poll(from + 1, timeout); if (retval > 0) { return read(from, buffer, size);

6 years, 11 months

Encapsulate select() calls, part 7

by Sven Panne

Module: check_mk Branch: master Commit: 76d67beda553b4b1c163cf0dc121bc22335ccf11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76d67beda553b4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 11 14:17:38 2017 +0200 Encapsulate select() calls, part 7 Mechanically move all FD_ZERO calls into Poller's constructor. This reduces code size and partially initialized entities are an anti-pattern, anyway, they lead to temporal coupling, see e.g. http://blog.ploeh.dk/2011/05/24/DesignSmellTemporalCoupling/ Change-Id: Ie9f04a86746fe7b234288c89a32f8f2b785de0f3 --- livestatus/src/InputBuffer.cc | 2 -- livestatus/src/OutputBuffer.cc | 2 -- livestatus/src/Poller.h | 5 ++++- livestatus/src/module.cc | 4 +--- livestatus/src/unixcat.cc | 1 - 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 058797a..ef34ff9 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -206,9 +206,7 @@ InputBuffer::Result InputBuffer::readData() { } Poller poller; - FD_ZERO(poller.readFDs()); FD_SET(_fd, poller.readFDs()); - int retval = poller.poll(_fd + 1, milliseconds(200)); if (retval > 0 && FD_ISSET(_fd, poller.readFDs())) { ssize_t r = read(_fd, &_readahead_buffer[_write_index], diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 5af8f4e..2d8a2f7 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -79,9 +79,7 @@ void OutputBuffer::writeData(ostringstream &os) { size_t bytes_to_write = os.tellp(); while (!_termination_flag && bytes_to_write > 0) { Poller poller; - FD_ZERO(poller.writeFDs()); FD_SET(_fd, poller.writeFDs()); - int retval = poller.poll(_fd + 1, milliseconds(100)); if (retval > 0 && FD_ISSET(_fd, poller.writeFDs())) { ssize_t bytes_written = write(_fd, buffer, bytes_to_write); diff --git a/livestatus/src/Poller.h b/livestatus/src/Poller.h index 6c5dd50..72721fc 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -32,7 +32,10 @@ class Poller { public: - Poller() {} + Poller() { + FD_ZERO(&_readfds); + FD_ZERO(&_writefds); + } template <typename Rep, typename Period> int poll(int nfds, std::chrono::duration<Rep, Period> timeout) { diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 599cc43..d72a6e9 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -202,10 +202,8 @@ void *main_thread(void *data) { do_statistics(); Poller poller; - FD_ZERO(poller.readFDs()); FD_SET(g_unix_socket, poller.readFDs()); - int retval = - poller.poll(g_unix_socket + 1, milliseconds(2500)); + int retval = poller.poll(g_unix_socket + 1, milliseconds(2500)); if (retval > 0 && FD_ISSET(g_unix_socket, poller.readFDs())) { 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 7fefd98..43483d9 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -61,7 +61,6 @@ void printErrno(const string &msg) { ssize_t read_with_timeout(int from, char *buffer, int size, microseconds timeout) { Poller poller; - FD_ZERO(poller.readFDs()); FD_SET(from, poller.readFDs()); int retval = poller.poll(from + 1, timeout); if (retval > 0) {

6 years, 11 months

Encapsulate select() calls, part 9

by Sven Panne

Module: check_mk Branch: master Commit: 07c03928f2be59ab41649706871f667d8f3e06cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07c03928f2be59… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 11 15:23:31 2017 +0200 Encapsulate select() calls, part 9 Move FD_ISSET calls into Poller class. This removes the last call sites of Poller::readFDs() and Poller::writeFDs(), so those temporary anti-patterns are gone now. Furthermore, we get rid of quite a few <sys/select.h> includes, which is a good thing. Change-Id: Id83b4b749df1bbdbf71ed9d9d9fbb4c2b4ae8388 --- livestatus/src/InputBuffer.cc | 3 +-- livestatus/src/OutputBuffer.cc | 3 +-- livestatus/src/Poller.h | 4 ++-- livestatus/src/module.cc | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 15025bb..889205b 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "InputBuffer.h" -#include <sys/select.h> #include <unistd.h> #include <cctype> #include <cstring> @@ -208,7 +207,7 @@ InputBuffer::Result InputBuffer::readData() { Poller poller; poller.addReadFD(_fd); int retval = poller.poll(_fd + 1, milliseconds(200)); - if (retval > 0 && FD_ISSET(_fd, poller.readFDs())) { + if (retval > 0 && poller.isReadFDSet(_fd)) { 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 354aa3b..83471a2 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "OutputBuffer.h" -#include <sys/select.h> #include <unistd.h> #include <chrono> #include <cstddef> @@ -81,7 +80,7 @@ void OutputBuffer::writeData(ostringstream &os) { Poller poller; poller.addWriteFD(_fd); int retval = poller.poll(_fd + 1, milliseconds(100)); - if (retval > 0 && FD_ISSET(_fd, poller.writeFDs())) { + if (retval > 0 && poller.isWriteFDSet(_fd)) { 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 819ef43..f80a867 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -54,8 +54,8 @@ public: void addReadFD(int fd) { FD_SET(fd, &_readfds); } void addWriteFD(int fd) { FD_SET(fd, &_writefds); } - fd_set *readFDs() { return &_readfds; } - fd_set *writeFDs() { return &_writefds; } + bool isReadFDSet(int fd) const { return FD_ISSET(fd, &_readfds); } + bool isWriteFDSet(int fd) const { return FD_ISSET(fd, &_writefds); } private: fd_set _readfds; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index fda1ba9..22d75af 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -30,7 +30,7 @@ #include "config.h" #include <fcntl.h> #include <pthread.h> -#include <sys/select.h> +#include <sys/time.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/un.h> @@ -204,7 +204,7 @@ void *main_thread(void *data) { Poller poller; poller.addReadFD(g_unix_socket); int retval = poller.poll(g_unix_socket + 1, milliseconds(2500)); - if (retval > 0 && FD_ISSET(g_unix_socket, poller.readFDs())) { + if (retval > 0 && poller.isReadFDSet(g_unix_socket)) { int cc = accept(g_unix_socket, nullptr, nullptr); if (cc > g_max_fd_ever) { g_max_fd_ever = cc;

6 years, 11 months

Encapsulate select() calls, part 3

by Sven Panne

Module: check_mk Branch: master Commit: 5845fa71c240861649cca37f34ae367acf3fb5ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5845fa71c24086… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 11 10:39:03 2017 +0200 Encapsulate select() calls, part 3 Use C++'s standard std::chrono facilities instead of fiddling around with the low-level timeval struct. This is a mostly mechanic change, with the exception of icmpsender's main_loop: This relied on select() modifying the timeout, so we had to measure the duration for ourselves. This way we can keep Poller::poll()'s interface simple, and main_loop() needs some massaging in the future, anyway. Note that we can reduce our dependency on ChronoUtils.h quite a bit now, which is a nice side-effect of this change. Change-Id: I7ca388dd8cef4507d1f18df6a858bd84cbaaa790 --- livestatus/src/InputBuffer.cc | 4 +--- livestatus/src/OutputBuffer.cc | 4 +--- livestatus/src/Poller.h | 7 +++++-- livestatus/src/module.cc | 7 +++---- livestatus/src/unixcat.cc | 8 ++++---- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 1bfd98b..4134ba1 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -29,7 +29,6 @@ #include <cstring> #include <ostream> #include <ratio> -#include "ChronoUtils.h" #include "Logger.h" #include "Poller.h" @@ -211,8 +210,7 @@ InputBuffer::Result InputBuffer::readData() { FD_ZERO(&fds); FD_SET(_fd, &fds); - timeval tv = to_timeval(milliseconds(200)); - int retval = poller.poll(_fd + 1, &fds, nullptr, &tv); + int retval = poller.poll(_fd + 1, &fds, nullptr, milliseconds(200)); 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 bf54168..5189729 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -29,7 +29,6 @@ #include <cstddef> #include <iomanip> #include <ratio> -#include "ChronoUtils.h" #include "Logger.h" #include "Poller.h" @@ -84,8 +83,7 @@ void OutputBuffer::writeData(ostringstream &os) { FD_ZERO(&fds); FD_SET(_fd, &fds); - timeval tv = to_timeval(milliseconds(100)); - int retval = poller.poll(_fd + 1, nullptr, &fds, &tv); + int retval = poller.poll(_fd + 1, nullptr, &fds, milliseconds(100)); 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 7a71451..e4328c2 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -27,14 +27,17 @@ #include "config.h" // IWYU pragma: keep #include <sys/select.h> +#include "ChronoUtils.h" class Poller { public: Poller() {} + template <typename Rep, typename Period> int poll(int nfds, fd_set *readfds, fd_set *writefds, - struct timeval *timeout) { - return select(nfds, readfds, writefds, nullptr, timeout); + std::chrono::duration<Rep, Period> timeout) { + timeval tv = to_timeval(timeout); + return select(nfds, readfds, writefds, nullptr, &tv); } }; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 05980f7..3632e52 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -43,6 +43,7 @@ #include <ctime> #include <memory> #include <ostream> +#include <ratio> #include <string> #include <unordered_map> #include <utility> @@ -199,15 +200,13 @@ void *main_thread(void *data) { tl_info = static_cast<ThreadInfo *>(data); while (!fl_should_terminate) { do_statistics(); - struct timeval tv; - 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 = poller.poll(g_unix_socket + 1, &fds, nullptr, &tv); + int retval = + poller.poll(g_unix_socket + 1, &fds, nullptr, milliseconds(2500)); 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 2b4362b..529e013 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -29,14 +29,17 @@ #include <sys/un.h> #include <unistd.h> #include <cerrno> +#include <chrono> #include <csignal> #include <cstdlib> #include <cstring> #include <iostream> +#include <ratio> #include <string> #include "Poller.h" using std::cerr; +using std::chrono::microseconds; using std::endl; using std::string; using std::to_string; @@ -60,10 +63,7 @@ ssize_t read_with_timeout(int from, char *buffer, int size, int us) { 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 = poller.poll(from + 1, &fds, nullptr, &tv); + int retval = poller.poll(from + 1, &fds, nullptr, microseconds(us)); if (retval > 0) { return read(from, buffer, size); }

6 years, 11 months

Revert "4971 FIX cups_queues: Fixed crash if agent output is empty or item not found"

by Simon Betz

Module: check_mk Branch: master Commit: b34a252fddbb787751968df795cca4483f5a56ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b34a252fddbb78… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 13 10:57:41 2017 +0200 Revert "4971 FIX cups_queues: Fixed crash if agent output is empty or item not found" This reverts commit a9575c5505e48d9bec40df8d874677f1a50b19a3. --- .werks/4971 | 10 ---------- checks/cups_queues | 4 ---- 2 files changed, 14 deletions(-) diff --git a/.werks/4971 b/.werks/4971 deleted file mode 100644 index 42353d3..0000000 --- a/.werks/4971 +++ /dev/null @@ -1,10 +0,0 @@ -Title: cups_queues: Fixed crash if agent output is empty or item not found -Level: 1 -Component: checks -Compatible: compat -Edition: cre -Version: 1.5.0i1 -Date: 1499933436 -Class: fix - - diff --git a/checks/cups_queues b/checks/cups_queues index 795844d..972abcb 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -96,10 +96,6 @@ def inventory_cups_queues(parsed): yield item, {} def check_cups_queues(item, params, parsed): - if item not in parsed: - yield 3, "Item not found in agent data" - return - data = parsed[item] if type(params) == tuple and len(params) == 4: params = {"job_count" : (params[0], params[1]),

6 years, 11 months

4971 FIX cups_queues: Fixed crash if agent output is empty or item not found

by Simon Betz

Module: check_mk Branch: master Commit: a9575c5505e48d9bec40df8d874677f1a50b19a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9575c5505e48d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 13 10:11:14 2017 +0200 4971 FIX cups_queues: Fixed crash if agent output is empty or item not found Change-Id: Ic376f1cac673cd286b393f8d33751c5ca07e9c3f --- .werks/4971 | 10 ++++++++++ checks/cups_queues | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/.werks/4971 b/.werks/4971 new file mode 100644 index 0000000..42353d3 --- /dev/null +++ b/.werks/4971 @@ -0,0 +1,10 @@ +Title: cups_queues: Fixed crash if agent output is empty or item not found +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499933436 +Class: fix + + diff --git a/checks/cups_queues b/checks/cups_queues index 972abcb..795844d 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -96,6 +96,10 @@ def inventory_cups_queues(parsed): yield item, {} def check_cups_queues(item, params, parsed): + if item not in parsed: + yield 3, "Item not found in agent data" + return + data = parsed[item] if type(params) == tuple and len(params) == 4: params = {"job_count" : (params[0], params[1]),

6 years, 11 months

Fixed two recently introduced issues in virtual host tree snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a6d8443e313fb1e9008f27d1cbc1815136da35b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a6d8443e313fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 13 09:51:24 2017 +0200 Fixed two recently introduced issues in virtual host tree snapin Change-Id: I882312590ad8bb0a65273486b99331b6ba1b0cc0 --- web/plugins/sidebar/shipped.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 9a281fa..6c30764 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1951,7 +1951,7 @@ class VirtualHostTree(SidebarSnapin): if "_children" not in subtree: if self._is_tag_subdir(path, cwd): - html.write(self._tag_tree_bullet(subtree["_state"], subpath, True)) + html.write(self._tag_tree_bullet(subtree.get("_state", 0), subpath, True)) if subtree.get("_svc_problems"): url = self._tag_tree_url(tree_spec, subpath, "svcproblems") html.icon_button(url, _("Show the service problems contained in this branch"), @@ -2185,13 +2185,12 @@ function virtual_host_tree_enter(path) # Add the numbers/state of this host to the last level the host is invovled with for tree_entry in this_level_branches: - if not tree_entry: - tree_entry.update({ - "_num_hosts" : 0, - "_state" : 0, - }) + tree_entry.setdefault("_num_hosts", 0) + tree_entry.setdefault("_state", 0) + tree_entry["_num_hosts"] += 1 tree_entry["_svc_problems"] = tree_entry.get("_svc_problems", False) or have_svc_problems + if state == 2 or tree_entry["_state"] == 2: tree_entry["_state"] = 2 else:

6 years, 11 months

Tests: do not deploy other editions when using VERSION=git

by Lars Michelsen

Module: check_mk Branch: master Commit: 050ac0d890232312a88d8e8980e2a08b913bdf99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=050ac0d8902323… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 12 16:18:44 2017 +0200 Tests: do not deploy other editions when using VERSION=git Change-Id: Ic203f455ba0d3e96b6c6cd7519e8c936aa2a34c8 --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d32fd7b..d077f30 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -455,7 +455,7 @@ class Site(object): print("Executing .f12 in \"%s\"..." % path) sys.stdout.flush() assert os.system("cd \"%s\" ; " - "sudo PATH=$PATH ONLY_COPY=1 SITE=%s bash -x .f12" % + "sudo PATH=$PATH ONLY_COPY=1 ALL_EDITIONS=0 SITE=%s bash -x .f12" % (path, self.id)) >> 8 == 0 print("Executing .f12 in \"%s\" DONE" % path) sys.stdout.flush()

6 years, 12 months

← Newer
1
...
15
16
17
18
19
20
21
...
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