diff --git a/src/utils_complain.h b/src/utils_complain.h
index b51a81c677a10d8777ca2d22b2ff7503093e0704..028dda6fc236b10d01913624df76cc3d75820dbe 100644 (file)
--- a/src/utils_complain.h
+++ b/src/utils_complain.h
/**
* collectd - src/utils_complain.h
- * Copyright (C) 2006-2007 Florian octo Forster
+ * Copyright (C) 2006-2013 Florian octo Forster
* Copyright (C) 2008 Sebastian tokkee Harl
*
* This program is free software; you can redistribute it and/or modify it
#ifndef UTILS_COMPLAIN_H
#define UTILS_COMPLAIN_H 1
-#include <time.h>
+#include "utils_time.h"
typedef struct
{
/* time of the last report */
- time_t last;
+ cdtime_t last;
- /* how long to wait until reporting again
- * 0 indicates that the complaint is no longer valid
- * < 0 indicates that the complaint has been reported once
- * => c_complain_once will not report again
- * => c_complain uses the absolute value to reset the old value */
- int interval;
+ /* How long to wait until reporting again.
+ * 0 indicates that the complaint is no longer valid. */
+ cdtime_t interval;
+
+ _Bool complained_once;
} c_complain_t;
-#define C_COMPLAIN_INIT_STATIC { 0, 0 }
-#define C_COMPLAIN_INIT(c) do { (c)->last = 0; (c)->interval = 0; } while (0)
+#define C_COMPLAIN_INIT_STATIC { 0, 0, 0 }
+#define C_COMPLAIN_INIT(c) do { \
+ (c)->last = 0; \
+ (c)->interval = 0; \
+ (c)->complained_once = 0; \
+} while (0)
/*
* NAME
*/
void c_complain_once (int level, c_complain_t *c, const char *format, ...);
+/*
+ * NAME
+ * c_would_release
+ *
+ * DESCRIPTION
+ * Returns true if the specified complaint would be released, false else.
+ */
+#define c_would_release(c) ((c)->interval != 0)
+
/*
* NAME
* c_release
void c_do_release (int level, c_complain_t *c, const char *format, ...);
#define c_release(level, c, ...) \
do { \
- if ((c)->interval != 0) \
+ if (c_would_release (c)) \
c_do_release(level, c, __VA_ARGS__); \
} while (0)