mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

trace: Only build probes if instrumentation is enabled

Browse source 
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>
This commit is contained in:
David Goulet 2020-02-13 10:44:00 -05:00
parent 79d6127a47
commit 24a5983d84
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/or/include.am
View file

@ -34,7 +34,6 @@ LIBTOR_APP_A_SOURCES += \
src/core/or/scheduler_vanilla.c \ src/core/or/scheduler_vanilla.c \
src/core/or/sendme.c \ src/core/or/sendme.c \
src/core/or/status.c \ src/core/or/status.c \
src/core/or/trace_probes_circuit.c \
src/core/or/versions.c src/core/or/versions.c
# ADD_C_FILE: INSERT HEADERS HERE. # ADD_C_FILE: INSERT HEADERS HERE.
@ -95,6 +94,12 @@ noinst_HEADERS += \
src/core/or/socks_request_st.h \ src/core/or/socks_request_st.h \
src/core/or/status.h \ src/core/or/status.h \
src/core/or/tor_version_st.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/var_cell_st.h \
src/core/or/versions.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

7
src/core/or/trace_probes_circuit.h
View file

@ -7,6 +7,8 @@
* LTTng-UST probes are available. * LTTng-UST probes are available.
**/ **/
#ifndef COCCI
#include "orconfig.h" #include "orconfig.h"
/* We only build the following if LTTng instrumentation has been enabled. */ /* We only build the following if LTTng instrumentation has been enabled. */
@ -19,7 +21,8 @@
#undef TRACEPOINT_INCLUDE #undef TRACEPOINT_INCLUDE
#define TRACEPOINT_INCLUDE "./src/core/or/trace_probes_circuit.h" #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 #define TOR_TRACE_PROBES_CIRCUIT_H
#include <lttng/tracepoint.h> #include <lttng/tracepoint.h>
@ -319,3 +322,5 @@ TRACEPOINT_EVENT(tor_circuit, change_state,
#include <lttng/tracepoint-event.h> #include <lttng/tracepoint-event.h>
#endif /* USE_TRACING_INSTRUMENTATION_LTTNG */ #endif /* USE_TRACING_INSTRUMENTATION_LTTNG */
#endif /* COCCI */