Changeset b09464ce1fe8fb09f4ad58414507f5b965735967

Timestamp:

08/09/11 02:26:56 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1312856816 -0400

git-parent:

[d5ead0cf4d18db940685ff9a33847629bc796330]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1312856816 -0400

Message:

add metric dtrace logging

Files:

• src/dtrace_probes.d (modified) (1 diff)
• src/dtrace_probes.h (modified) (3 diffs)
• src/noit_check_log.c (modified) (3 diffs)

src/dtrace_probes.d

@@ -18 +18 @@
-  probe dispatch(char *, char *, char *, char *);
-  probe status(char *, char *, char *, char *, int, int, char *);
+  probe metric(char *, char *, char *, char *, char *, int, char *);
-};

src/dtrace_probes.h

@@ -250 +250 @@
-                __asm__ volatile(""); \
-                _r; })
+#define NOIT_CHECK_METRIC(arg0, arg1, arg2, arg3, arg4, arg5, arg6) \
+do { \
+        __asm__ volatile(".reference " NOIT_CHECK_TYPEDEFS); \
+        __dtrace_probe$noit_check$metric$v1$63686172202a$63686172202a$63686172202a$63686172202a$63686172202a$696e74$63686172202a(arg0, arg1, arg2, arg3, arg4, arg5, arg6); \
+        __asm__ volatile(".reference " NOIT_CHECK_STABILITY); \
+} while (0)
+#define NOIT_CHECK_METRIC_ENABLED() \
+        ({ int _r = __dtrace_isenabled$noit_check$metric$v1(); \
+                __asm__ volatile(""); \
+                _r; })
-#define NOIT_CHECK_STATUS(arg0, arg1, arg2, arg3, arg4, arg5, arg6) \
-do { \
@@ -264 +274 @@
-extern void __dtrace_probe$noit_check$dispatch$v1$63686172202a$63686172202a$63686172202a$63686172202a(const char *, const char *, const char *, const char *);
-extern int __dtrace_isenabled$noit_check$dispatch$v1(void);
+extern void __dtrace_probe$noit_check$metric$v1$63686172202a$63686172202a$63686172202a$63686172202a$63686172202a$696e74$63686172202a(const char *, const char *, const char *, const char *, const char *, int, const char *);
+extern int __dtrace_isenabled$noit_check$metric$v1(void);
-extern void __dtrace_probe$noit_check$status$v1$63686172202a$63686172202a$63686172202a$63686172202a$696e74$696e74$63686172202a(const char *, const char *, const char *, const char *, int, int, const char *);
-extern int __dtrace_isenabled$noit_check$status$v1(void);
@@ -273 +285 @@
-        } while (0)
-#define NOIT_CHECK_DISPATCH_ENABLED() (0)
+#define NOIT_CHECK_METRIC(arg0, arg1, arg2, arg3, arg4, arg5, arg6) \
+do { \
+        } while (0)
+#define NOIT_CHECK_METRIC_ENABLED() (0)
-#define NOIT_CHECK_STATUS(arg0, arg1, arg2, arg3, arg4, arg5, arg6) \
-do { \

src/noit_check_log.c

@@ -32 +32 @@
-
-#include "noit_defines.h"
+#include "dtrace_probes.h"
-
-#include <uuid/uuid.h>
@@ -360 +361 @@
-      metric__init(bundle.metrics[i]);
-      _noit_check_log_bundle_metric(ls, bundle.metrics[i], m);
+      if(NOIT_CHECK_METRIC_ENABLED()) {
+        char buff[256];
+        noit_stats_snprint_metric(buff, sizeof(buff), m);
+        NOIT_CHECK_METRIC(uuid_str, check->module, check->name, check->target,
+                          m->metric_name, m->metric_type, buff);
+      }
-      i++;
-    }
@@ -421 +428 @@
-    SETUP_LOG(metrics, return);
-    _noit_check_log_metric(metrics_log, check, uuid_str, whence, m);
+    if(NOIT_CHECK_METRIC_ENABLED()) {
+      char buff[256];
+      noit_stats_snprint_metric(buff, sizeof(buff), m);
+      NOIT_CHECK_METRIC(uuid_str, check->module, check->name, check->target,
+                        m->metric_name, m->metric_type, buff);
+    }
-  }
-}