add support for timeval columns (#138)

Author: sni

src/Makefile.am

@@ -18,6 +18,7 @@ livestatus_la_SOURCES = \
 	ListColumn.cc ListColumnFilter.cc OffsetDoubleColumn.cc OffsetIntColumn.cc \
 	OffsetStringColumn.cc OffsetTimeperiodColumn.cc OringFilter.cc OutputBuffer.cc \
 	OffsetTimeColumn.cc TimeColumn.cc TimeColumnFilter.cc PerfdataAggregator.cc \
+	OffsetTimeValColumn.cc TimeValColumn.cc TimeValColumnFilter.cc \
 	Query.cc ServiceContactsColumn.cc ServicegroupsColumn.cc ServicelistColumn.cc \
 	ServicelistColumnFilter.cc ServicelistStateColumn.cc store.cc Store.cc \
 	StringColumn.cc StringColumnFilter.cc strutil.cc Table.cc TableColumns.cc \

src/OffsetTimeValColumn.cc

@@ -0,0 +1,19 @@
+// Copyright (c) 2026 Naemon team - license: GPL-2.0
+// This file is part of the naemon project: https://www.naemon.io
+// See LICENSE file in the project root for details.
+
+#include "nagios.h"
+#include <stdint.h>
+#include "OffsetTimeValColumn.h"
+
+struct timeval OffsetTimeValColumn::getValue(void *data, Query *)
+{
+    if (!data)
+        return {0, 0};
+
+    char *p = (char *)shiftPointer(data);
+    if (p)
+        return *(struct timeval *)(p + _offset);
+    else
+        return {0, 0};
+}

src/OffsetTimeValColumn.h

@@ -0,0 +1,29 @@
+// Copyright (c) 2026 Naemon team - license: GPL-2.0
+// This file is part of the naemon project: https://www.naemon.io
+// See LICENSE file in the project root for details.
+
+#ifndef OffsetTimeValColumn_h
+#define OffsetTimeValColumn_h
+
+#include "config.h"
+
+#include <stdlib.h>
+#include "TimeValColumn.h"
+
+
+/* This does almost the same as the time column,
+   but applies a timezone offset stored in the Query. */
+
+class OffsetTimeValColumn : public TimeValColumn
+{
+    int _offset;
+public:
+    OffsetTimeValColumn(string name, string description, int offset, int indirect_offset = -1)
+        : TimeValColumn(name, description, indirect_offset), _offset(offset) {}
+    struct timeval getValue(void *data, Query *);
+protected:
+    int offset() { return _offset; }
+};
+
+
+#endif // OffsetTimeValColumn_h

src/Query.cc

@@ -1182,6 +1182,12 @@ void Query::outputTime(time_t value)
     outputInteger64((int64_t)value);
 }
 
+void Query::outputTimeVal(timeval value)
+{
+    char buf[64];
+    int l = snprintf(buf, sizeof(buf), "%lu.%06lu", value.tv_sec + _timezone_offset, value.tv_usec);
+    _output->addBuffer(buf, l);
+}
 
 void Query::outputUnsignedLong(unsigned long value)
 {

src/Query.h

@@ -100,6 +100,7 @@ class Query
     void outputInteger(int32_t);
     void outputInteger64(int64_t);
     void outputTime(time_t);
+    void outputTimeVal(timeval);
     void outputUnsignedLong(unsigned long);
     void outputCounter(counter_t);
     void outputDouble(double);

src/TableHosts.cc

@@ -12,6 +12,7 @@
 #include "OffsetStringColumn.h"
 #include "OffsetIntColumn.h"
 #include "OffsetTimeColumn.h"
+#include "OffsetTimeValColumn.h"
 #include "OffsetDoubleColumn.h"
 #include "OffsetTimeperiodColumn.h"
 #include "OffsetStringHostMacroColumn.h"
@@ -140,8 +141,8 @@ void TableHosts::addColumns(Table *table, string prefix, int indirect_offset)
                 "Scheduled time for the next check (Unix timestamp)", (char *)(&hst.next_check) - ref, indirect_offset));
     table->addColumn(new OffsetTimeColumn(prefix + "last_hard_state_change",
                 "Time of the last hard state change (Unix timestamp)", (char *)(&hst.last_hard_state_change) - ref, indirect_offset));
-    table->addColumn(new OffsetTimeColumn(prefix + "last_update",
-                "Time of the last update of this host (Unix timestamp)", (char *)(&hst.last_update) - ref, indirect_offset));
+    table->addColumn(new OffsetTimeValColumn(prefix + "last_update",
+                "Time of the last update of this host (Unix timestamp Microsecond Precision)", (char *)(&hst.last_update) - ref, indirect_offset));
     table->addColumn(new OffsetIntColumn(prefix + "has_been_checked",
                 "Whether the host has already been checked (0/1)", (char *)(&hst.has_been_checked) - ref, indirect_offset));
     /* FIXME: hourly_value is an unsigned int... */

src/TableServices.cc

@@ -12,6 +12,7 @@
 #include "OffsetStringColumn.h"
 #include "OffsetIntColumn.h"
 #include "OffsetTimeColumn.h"
+#include "OffsetTimeValColumn.h"
 #include "OffsetDoubleColumn.h"
 #include "OffsetTimeperiodColumn.h"
 #include "OffsetStringServiceMacroColumn.h"
@@ -295,8 +296,8 @@ void TableServices::addColumns(Table *table, string prefix, int indirect_offset,
                 "The time of the last state change - soft or hard (Unix timestamp)", (char *)&svc.last_state_change - ref, indirect_offset));
     table->addColumn(new OffsetTimeColumn(prefix + "last_hard_state_change",
                 "The time of the last hard state change (Unix timestamp)", (char *)&svc.last_hard_state_change - ref, indirect_offset));
-    table->addColumn(new OffsetTimeColumn(prefix + "last_update",
-                "Time of the last update of this service (Unix timestamp)", (char *)(&svc.last_update) - ref, indirect_offset));
+    table->addColumn(new OffsetTimeValColumn(prefix + "last_update",
+                "Time of the last update of this service (Unix timestamp Microsecond Precision)", (char *)(&svc.last_update) - ref, indirect_offset));
     table->addColumn(new OffsetIntColumn(prefix + "scheduled_downtime_depth",
                 "The number of scheduled downtimes the service is currently in", (char *)(&svc.scheduled_downtime_depth) - ref, indirect_offset));
     table->addColumn(new OffsetIntColumn(prefix + "is_flapping",

src/TimeColumnFilter.cc

@@ -9,18 +9,18 @@
 #include "logger.h"
 #include "opids.h"
 
-    TimeColumnFilter::TimeColumnFilter(TimeColumn *column, int opid, char *value)
+TimeColumnFilter::TimeColumnFilter(TimeColumn *column, int opid, char *value)
     : _column(column)
     , _opid(abs(opid))
     , _negate(opid < 0)
-      , _ref_string(value)
+    , _ref_value(convertRefValue(value))
 {
 }
 
 // offset from Localtime: header
-time_t TimeColumnFilter::convertRefValue()
+time_t TimeColumnFilter::convertRefValue(const char *value)
 {
-    time_t ref_remote = atoi(_ref_string.c_str());
+    time_t ref_remote = atoi(value);
     if (_query) {
         time_t timezone_offset = _query->timezoneOffset();
         return ref_remote - timezone_offset;
@@ -33,14 +33,13 @@ bool TimeColumnFilter::accepts(void *data)
 {
     bool pass = true;
     time_t act_value = _column->getValue(data, _query);
-    time_t ref_value = convertRefValue();
     switch (_opid) {
         case OP_EQUAL:
-            pass = act_value == ref_value; break;
+            pass = act_value == _ref_value; break;
         case OP_GREATER:
-            pass = act_value > ref_value; break;
+            pass = act_value > _ref_value; break;
         case OP_LESS:
-            pass = act_value < ref_value; break;
+            pass = act_value < _ref_value; break;
         default:
             logger(LG_INFO, "Sorry. Operator %s for time_t not implemented.", op_names_plus_8[_opid]);
             break;
@@ -57,49 +56,47 @@ void TimeColumnFilter::findTimeLimits(const char *columnname, time_t *lower, tim
         return; // already empty interval
     }
 
-    time_t ref_value = convertRefValue();
-
     /* [lower, upper[ is some interval. This filter might restrict
        that interval to a smaller interval.
      */
     int opref = _opid * (_negate != false ? -1 : 1);
     switch (opref) {
         case OP_EQUAL:
-            if (ref_value >= *lower && ref_value < *upper) {
-                *lower = ref_value;
-                *upper = ref_value + 1;
+            if (_ref_value >= *lower && _ref_value < *upper) {
+                *lower = _ref_value;
+                *upper = _ref_value + 1;
             }
             else
                 *lower = *upper;
             return;
 
         case -OP_EQUAL:
-            if (ref_value == *lower)
+            if (_ref_value == *lower)
                 *lower = *lower + 1;
-            else if (ref_value == *upper - 1)
+            else if (_ref_value == *upper - 1)
                 *upper = *upper - 1;
             return;
 
         case OP_GREATER:
-            if (ref_value >= *lower) {
-                *lower = ref_value + 1;
+            if (_ref_value >= *lower) {
+                *lower = _ref_value + 1;
             }
 
             return;
 
         case OP_LESS:
-            if (ref_value < *upper)
-                *upper = ref_value;
+            if (_ref_value < *upper)
+                *upper = _ref_value;
             return;
 
         case -OP_GREATER: // LESS OR EQUAL
-            if (ref_value < *upper - 1)
-                *upper = ref_value + 1;
+            if (_ref_value < *upper - 1)
+                *upper = _ref_value + 1;
             return;
 
         case -OP_LESS: // GREATER OR EQUAL
-            if (ref_value > *lower)
-                *lower = ref_value;
+            if (_ref_value > *lower)
+                *lower = _ref_value;
             return;
     }
 }

src/TimeColumnFilter.h

@@ -13,10 +13,10 @@ class TimeColumnFilter : public Filter
     TimeColumn *_column;
     int _opid;
     bool _negate;
-    string _ref_string;
+    time_t _ref_value;
 public:
     TimeColumnFilter(TimeColumn *column, int opid, char *value);
-    time_t convertRefValue();
+    time_t convertRefValue(const char *value);
     bool accepts(void *data);
     void findTimeLimits(const char *columnname, time_t *lower, time_t *upper);
 };

src/TimeValColumn.cc

@@ -0,0 +1,33 @@
+// Copyright (c) 2025 Naemon team - license: GPL-2.0
+// This file is part of the naemon project: https://www.naemon.io
+// See LICENSE file in the project root for details.
+
+#include "TimeValColumn.h"
+#include "TimeValColumnFilter.h"
+#include "Query.h"
+
+void TimeValColumn::output(void *data, Query *query)
+{
+    query->outputTimeVal(getValue(data, query));
+}
+
+Filter *TimeValColumn::createFilter(int operator_id, char *value)
+{
+    return new TimeValColumnFilter(this, operator_id, value);
+}
+
+
+string TimeValColumn::valueAsString(void *data, Query *query)
+{
+    char i[64];
+    struct timeval value = (struct timeval)getValue(data, query);
+    snprintf(i, sizeof(i), "%lu.%06lu", value.tv_sec, value.tv_usec);
+    return i;
+}
+
+int TimeValColumn::compare(void *dataa, void*datab, Query *query) {
+    struct timeval a = getValue(dataa, query);
+    struct timeval b = getValue(datab, query);
+    if( a.tv_sec==b.tv_sec && a.tv_usec==b.tv_usec ) return 0;
+    return (a.tv_sec > b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_usec > b.tv_usec)) ? 1 : -1;
+}