diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-02-13 10:44:00 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-07-08 09:12:37 -0400 |
| commit | 24a5983d84a99dc10c0b8fe961af03135960085b (patch) | |
| tree | d35cd31da037f9f29a34f5cb38ec234a63aec552 /src | |
| parent | 79d6127a4733cd01cece0c7bdf07d277fe8a08e3 (diff) | |
| download | tor-24a5983d84a99dc10c0b8fe961af03135960085b.tar.gz tor-24a5983d84a99dc10c0b8fe961af03135960085b.zip | |
trace: Only build probes if instrumentation is enabled
For now, trace_probes_circuit.c only contains LTTng probes so build it only if
enabled within in the build system _and_ the code.
Also, ignore trace_probes_circuit.h for coccinelle parsing.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/or/include.am | 9 | ||||
| -rw-r--r-- | src/core/or/trace_probes_circuit.h | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/core/or/include.am b/src/core/or/include.am index 819b8ab605..9ff92adbde 100644 --- a/src/core/or/include.am +++ b/src/core/or/include.am @@ -34,7 +34,6 @@ LIBTOR_APP_A_SOURCES += \ src/core/or/scheduler_vanilla.c \ src/core/or/sendme.c \ src/core/or/status.c \ - src/core/or/trace_probes_circuit.c \ src/core/or/versions.c # ADD_C_FILE: INSERT HEADERS HERE. @@ -95,6 +94,12 @@ noinst_HEADERS += \ src/core/or/socks_request_st.h \ src/core/or/status.h \ src/core/or/tor_version_st.h \ - src/core/or/trace_probes_circuit.h \ src/core/or/var_cell_st.h \ src/core/or/versions.h + +if USE_TRACING_INSTRUMENTATION_LTTNG +LIBTOR_APP_A_SOURCES += \ + src/core/or/trace_probes_circuit.c +noinst_HEADERS += \ + src/core/or/trace_probes_circuit.h +endif diff --git a/src/core/or/trace_probes_circuit.h b/src/core/or/trace_probes_circuit.h index 44842efb0e..a85ed089ad 100644 --- a/src/core/or/trace_probes_circuit.h +++ b/src/core/or/trace_probes_circuit.h @@ -7,6 +7,8 @@ * LTTng-UST probes are available. **/ +#ifndef COCCI + #include "orconfig.h" /* We only build the following if LTTng instrumentation has been enabled. */ @@ -19,7 +21,8 @@ #undef TRACEPOINT_INCLUDE #define TRACEPOINT_INCLUDE "./src/core/or/trace_probes_circuit.h" -#if !defined(TOR_TRACE_PROBES_CIRCUIT_H) || defined(TRACEPOINT_HEADER_MULTI_READ) +#if !defined(TOR_TRACE_PROBES_CIRCUIT_H) || \ + defined(TRACEPOINT_HEADER_MULTI_READ) #define TOR_TRACE_PROBES_CIRCUIT_H #include <lttng/tracepoint.h> @@ -319,3 +322,5 @@ TRACEPOINT_EVENT(tor_circuit, change_state, #include <lttng/tracepoint-event.h> #endif /* USE_TRACING_INSTRUMENTATION_LTTNG */ + +#endif /* COCCI */ |