use float for time in perf data

[nagiosplug.git] / plugins / utils.c

diff --git a/plugins/utils.c b/plugins/utils.c
index aed03c4e49402e2b0dd3c2dc53a4835e791dc0b8..bb380301a639aa899c228725cbe3cf425b7aae42 100644 (file)
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -13,7 +13,6 @@
 
 #define LOCAL_TIMEOUT_ALARM_HANDLER
 
-#include "config.h"
 #include "common.h"
 #include "utils.h"
 #include <stdarg.h>
@@ -52,14 +51,14 @@ max_state (int a, int b)
                return max (a, b);
 }
 
-void usage (char *msg)
+void usage (const char *msg)
 {
-       printf (msg);
+       printf ("%s", msg);
        print_usage ();
        exit (STATE_UNKNOWN);
 }
 
-void usage2(char *msg, char *arg)
+void usage2(const char *msg, const char *arg)
 {
        printf ("%s: %s - %s\n",progname,msg,arg);
        print_usage ();
@@ -67,7 +66,7 @@ void usage2(char *msg, char *arg)
 }
 
 void
-usage3 (char *msg, int arg)
+usage3 (const char *msg, int arg)
 {
        printf ("%s: %s - %c\n", progname, msg, arg);
        print_usage();
@@ -287,6 +286,16 @@ delta_time (struct timeval tv)
 
 
 
+long
+deltime (struct timeval tv)
+{
+       struct timeval now;
+       gettimeofday (&now, NULL);
+       return (now.tv_sec - tv.tv_sec)*1000000 + now.tv_usec - tv.tv_usec;
+}
+
+
+
 
 void
 strip (char *buffer)
@@ -488,3 +497,94 @@ strpcat (char *dest, const char *src, const char *str)
 
        return dest;
 }
+
+
+
+
+/******************************************************************************
+ *
+ * Print perfdata in a standard format
+ *
+ ******************************************************************************/
+
+char *perfdata (const char *label,
+ long int val,
+ const char *uom,
+ int warnp,
+ long int warn,
+ int critp,
+ long int crit,
+ int minp,
+ long int minv,
+ int maxp,
+ long int maxv)
+{
+       char *data = NULL;
+
+       if (strpbrk (label, "'= "))
+               asprintf (&data, "'%s'=%ld%s;", label, val, uom);
+       else
+               asprintf (&data, "%s=%ld%s;", label, val, uom);
+
+       if (warnp)
+               asprintf (&data, "%s%ld;", data, warn);
+       else
+               asprintf (&data, "%s;", data);
+
+       if (critp)
+               asprintf (&data, "%s%ld;", data, crit);
+       else
+               asprintf (&data, "%s;", data);
+
+       if (minp)
+               asprintf (&data, "%s%ld", data, minv);
+
+       if (maxp)
+               asprintf (&data, "%s;%ld", data, maxv);
+
+       return data;
+}
+
+
+char *fperfdata (const char *label,
+ double val,
+ const char *uom,
+ int warnp,
+ double warn,
+ int critp,
+ double crit,
+ int minp,
+ double minv,
+ int maxp,
+ double maxv)
+{
+       char *data = NULL;
+
+       if (strpbrk (label, "'= "))
+               asprintf (&data, "'%s'=", label);
+       else
+               asprintf (&data, "%s=", label);
+
+       asprintf (&data, "%s%f", data, val);
+       asprintf (&data, "%s%s;", data, uom);
+
+       if (warnp)
+               asprintf (&data, "%s%f", data, warn);
+
+       asprintf (&data, "%s;", data);
+
+       if (critp)
+               asprintf (&data, "%s%f", data, crit);
+
+       asprintf (&data, "%s;", data);
+
+       if (minp)
+               asprintf (&data, "%s%f", data, minv);
+
+       if (maxp) {
+               asprintf (&data, "%s;", data);
+               asprintf (&data, "%s%f", data, maxv);
+       }
+
+       return data;
+}