Skip to content

Commit 42e7c9d

Browse files
bnoordhuisMyles Borins
authored and
Myles Borins
committed
src: lint node_lttng_tp.h
PR-URL: #7462 Reviewed-By: Trevor Norris <[email protected]>
1 parent 27c2d25 commit 42e7c9d

File tree

2 files changed

+25
-41
lines changed

2 files changed

+25
-41
lines changed

Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -635,9 +635,7 @@ jslint:
635635
tools/eslint-rules --rulesdir tools/eslint-rules
636636

637637
CPPLINT_EXCLUDE ?=
638-
CPPLINT_EXCLUDE += src/node_lttng.cc
639638
CPPLINT_EXCLUDE += src/node_root_certs.h
640-
CPPLINT_EXCLUDE += src/node_lttng_tp.h
641639
CPPLINT_EXCLUDE += src/queue.h
642640
CPPLINT_EXCLUDE += src/tree.h
643641
CPPLINT_EXCLUDE += src/v8abbr.h

src/node_lttng_tp.h

+25-39
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#ifndef SRC_NODE_LTTNG_TP_H_
2+
#define SRC_NODE_LTTNG_TP_H_
3+
4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
16
#undef TRACEPOINT_PROVIDER
27
#define TRACEPOINT_PROVIDER node
38

@@ -15,57 +20,45 @@ TRACEPOINT_EVENT(
1520
TP_ARGS(
1621
const char*, url,
1722
const char*, method,
18-
const char*, forwardedFor
19-
),
23+
const char*, forwardedFor),
2024
TP_FIELDS(
2125
ctf_string(url, url)
2226
ctf_string(method, method)
23-
ctf_string(forwardedFor, forwardedFor)
24-
)
25-
)
27+
ctf_string(forwardedFor, forwardedFor))
2628

2729
TRACEPOINT_EVENT(
2830
node,
2931
http_server_response,
3032
TP_ARGS(
3133
int, port,
3234
const char*, remote,
33-
int, fd
34-
),
35+
int, fd),
3536
TP_FIELDS(
3637
ctf_integer(int, port, port)
3738
ctf_string(remote, remote)
38-
ctf_integer(int, fd, fd)
39-
)
40-
)
39+
ctf_integer(int, fd, fd))
4140

4241
TRACEPOINT_EVENT(
4342
node,
4443
http_client_request,
4544
TP_ARGS(
4645
const char*, url,
47-
const char*, method
48-
),
46+
const char*, method),
4947
TP_FIELDS(
5048
ctf_string(url, url)
51-
ctf_string(method, method)
52-
)
53-
)
49+
ctf_string(method, method))
5450

5551
TRACEPOINT_EVENT(
5652
node,
5753
http_client_response,
5854
TP_ARGS(
5955
int, port,
6056
const char*, remote,
61-
int, fd
62-
),
57+
int, fd),
6358
TP_FIELDS(
6459
ctf_integer(int, port, port)
6560
ctf_string(remote, remote)
66-
ctf_integer(int, fd, fd)
67-
)
68-
)
61+
ctf_integer(int, fd, fd))
6962

7063
TRACEPOINT_EVENT(
7164
node,
@@ -74,57 +67,50 @@ TRACEPOINT_EVENT(
7467
const char*, remote,
7568
int, port,
7669
int, fd,
77-
int, buffered
78-
),
70+
int, buffered),
7971
TP_FIELDS(
8072
ctf_string(remote, remote)
8173
ctf_integer(int, port, port)
8274
ctf_integer(int, fd, fd)
83-
ctf_integer(int, buffered, buffered)
84-
)
85-
)
75+
ctf_integer(int, buffered, buffered))
8676

8777
TRACEPOINT_EVENT(
8878
node,
8979
net_stream_end,
9080
TP_ARGS(
9181
const char*, remote,
9282
int, port,
93-
int, fd
94-
),
83+
int, fd),
9584
TP_FIELDS(
9685
ctf_string(remote, remote)
9786
ctf_integer(int, port, port)
98-
ctf_integer(int, fd, fd)
99-
)
100-
)
87+
ctf_integer(int, fd, fd))
10188

10289
TRACEPOINT_EVENT(
10390
node,
10491
gc_start,
10592
TP_ARGS(
10693
const char*, gctype,
107-
const char*, gcflags
108-
),
94+
const char*, gcflags),
10995
TP_FIELDS(
11096
ctf_string(gctype, gctype)
111-
ctf_string(gcflags, gcflags)
112-
)
97+
ctf_string(gcflags, gcflags))
11398
)
11499

115100
TRACEPOINT_EVENT(
116101
node,
117102
gc_done,
118103
TP_ARGS(
119104
const char*, gctype,
120-
const char*, gcflags
121-
),
105+
const char*, gcflags),
122106
TP_FIELDS(
123107
ctf_string(gctype, gctype)
124-
ctf_string(gcflags, gcflags)
125-
)
126-
)
108+
ctf_string(gcflags, gcflags))
127109

128110
#endif /* __NODE_LTTNG_TP_H */
129111

130112
#include <lttng/tracepoint-event.h>
113+
114+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
115+
116+
#endif // SRC_NODE_LTTNG_TP_H_

0 commit comments

Comments
 (0)