From 42e7c9d266571c0992cdc72667b12d0aa452e86a Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 28 Jun 2016 21:21:21 +0200 Subject: [PATCH] src: lint node_lttng_tp.h PR-URL: https://github.com/nodejs/node/pull/7462 Reviewed-By: Trevor Norris --- Makefile | 2 -- src/node_lttng_tp.h | 64 ++++++++++++++++++--------------------------- 2 files changed, 25 insertions(+), 41 deletions(-) diff --git a/Makefile b/Makefile index f2186ce77d36b7..2a671b43b0af54 100644 --- a/Makefile +++ b/Makefile @@ -635,9 +635,7 @@ jslint: tools/eslint-rules --rulesdir tools/eslint-rules CPPLINT_EXCLUDE ?= -CPPLINT_EXCLUDE += src/node_lttng.cc CPPLINT_EXCLUDE += src/node_root_certs.h -CPPLINT_EXCLUDE += src/node_lttng_tp.h CPPLINT_EXCLUDE += src/queue.h CPPLINT_EXCLUDE += src/tree.h CPPLINT_EXCLUDE += src/v8abbr.h diff --git a/src/node_lttng_tp.h b/src/node_lttng_tp.h index 53d04f47a80e5a..b529bfad5e4b58 100644 --- a/src/node_lttng_tp.h +++ b/src/node_lttng_tp.h @@ -1,3 +1,8 @@ +#ifndef SRC_NODE_LTTNG_TP_H_ +#define SRC_NODE_LTTNG_TP_H_ + +#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS + #undef TRACEPOINT_PROVIDER #define TRACEPOINT_PROVIDER node @@ -15,14 +20,11 @@ TRACEPOINT_EVENT( TP_ARGS( const char*, url, const char*, method, - const char*, forwardedFor - ), + const char*, forwardedFor), TP_FIELDS( ctf_string(url, url) ctf_string(method, method) - ctf_string(forwardedFor, forwardedFor) - ) -) + ctf_string(forwardedFor, forwardedFor)) TRACEPOINT_EVENT( node, @@ -30,27 +32,21 @@ TRACEPOINT_EVENT( TP_ARGS( int, port, const char*, remote, - int, fd - ), + int, fd), TP_FIELDS( ctf_integer(int, port, port) ctf_string(remote, remote) - ctf_integer(int, fd, fd) - ) -) + ctf_integer(int, fd, fd)) TRACEPOINT_EVENT( node, http_client_request, TP_ARGS( const char*, url, - const char*, method - ), + const char*, method), TP_FIELDS( ctf_string(url, url) - ctf_string(method, method) - ) -) + ctf_string(method, method)) TRACEPOINT_EVENT( node, @@ -58,14 +54,11 @@ TRACEPOINT_EVENT( TP_ARGS( int, port, const char*, remote, - int, fd - ), + int, fd), TP_FIELDS( ctf_integer(int, port, port) ctf_string(remote, remote) - ctf_integer(int, fd, fd) - ) -) + ctf_integer(int, fd, fd)) TRACEPOINT_EVENT( node, @@ -74,15 +67,12 @@ TRACEPOINT_EVENT( const char*, remote, int, port, int, fd, - int, buffered - ), + int, buffered), TP_FIELDS( ctf_string(remote, remote) ctf_integer(int, port, port) ctf_integer(int, fd, fd) - ctf_integer(int, buffered, buffered) - ) -) + ctf_integer(int, buffered, buffered)) TRACEPOINT_EVENT( node, @@ -90,26 +80,21 @@ TRACEPOINT_EVENT( TP_ARGS( const char*, remote, int, port, - int, fd - ), + int, fd), TP_FIELDS( ctf_string(remote, remote) ctf_integer(int, port, port) - ctf_integer(int, fd, fd) - ) -) + ctf_integer(int, fd, fd)) TRACEPOINT_EVENT( node, gc_start, TP_ARGS( const char*, gctype, - const char*, gcflags - ), + const char*, gcflags), TP_FIELDS( ctf_string(gctype, gctype) - ctf_string(gcflags, gcflags) - ) + ctf_string(gcflags, gcflags)) ) TRACEPOINT_EVENT( @@ -117,14 +102,15 @@ TRACEPOINT_EVENT( gc_done, TP_ARGS( const char*, gctype, - const char*, gcflags - ), + const char*, gcflags), TP_FIELDS( ctf_string(gctype, gctype) - ctf_string(gcflags, gcflags) - ) -) + ctf_string(gcflags, gcflags)) #endif /* __NODE_LTTNG_TP_H */ #include + +#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS + +#endif // SRC_NODE_LTTNG_TP_H_