Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use C EventPipe implementation by default #47665

Merged
merged 4 commits into from
Feb 1, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/coreclr/clrdefinitions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@ add_definitions(-DFEATURE_DEFAULT_INTERFACES)
if(FEATURE_EVENT_TRACE)
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_EVENT_TRACE>)
add_definitions(-DFEATURE_PERFTRACING)
if(FEATURE_PERFTRACING_C_LIB)
add_definitions(-DFEATURE_PERFTRACING_C_LIB)
endif(FEATURE_PERFTRACING_C_LIB)
add_definitions(-DFEATURE_PERFTRACING_C_LIB)
josalem marked this conversation as resolved.
Show resolved Hide resolved
else(FEATURE_EVENT_TRACE)
add_custom_target(eventing_headers) # add a dummy target to avoid checking for FEATURE_EVENT_TRACE in multiple places
endif(FEATURE_EVENT_TRACE)
Expand Down
29 changes: 10 additions & 19 deletions src/coreclr/debug/debug-pal/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,21 @@ include_directories(../../pal/inc)

add_definitions(-DPAL_STDCPP_COMPAT)

if(FEATURE_PERFTRACING_C_LIB)
set(SHARED_EVENTPIPE_DIR ${CLR_SRC_NATIVE_DIR}/eventpipe)
include_directories(${SHARED_EVENTPIPE_DIR})
add_definitions(-DFEATURE_CORECLR)
add_definitions(-DFEATURE_PERFTRACING)
add_definitions(-DFEATURE_PERFTRACING_C_LIB)
add_definitions(-DFEATURE_PERFTRACING_C_LIB_STANDALONE_PAL)
endif(FEATURE_PERFTRACING_C_LIB)

set(SHARED_EVENTPIPE_DIR ${CLR_SRC_NATIVE_DIR}/eventpipe)
include_directories(${SHARED_EVENTPIPE_DIR})
add_definitions(-DFEATURE_CORECLR)
add_definitions(-DFEATURE_PERFTRACING)
add_definitions(-DFEATURE_PERFTRACING_C_LIB)
add_definitions(-DFEATURE_PERFTRACING_C_LIB_STANDALONE_PAL)

if(CLR_CMAKE_HOST_WIN32)
add_definitions(-DWIN32_LEAN_AND_MEAN)
include_directories(../../inc) #needed for warning control

if(CLR_CMAKE_TARGET_WIN32)
if(FEATURE_PERFTRACING_C_LIB)
set (EVENTPIPE_PAL_SOURCES "${SHARED_EVENTPIPE_DIR}/ds-ipc-win32.c")
set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES LANGUAGE CXX)
else(FEATURE_PERFTRACING_C_LIB)
set (EVENTPIPE_PAL_SOURCES "win/diagnosticsipc.cpp")
endif(FEATURE_PERFTRACING_C_LIB)

set(TWO_WAY_PIPE_SOURCES
${EVENTPIPE_PAL_SOURCES}
Expand All @@ -42,13 +37,9 @@ if(CLR_CMAKE_HOST_UNIX)
add_definitions(-DPAL_IMPLEMENTATION)
add_definitions(-D_POSIX_C_SOURCE=200809L)

if(FEATURE_PERFTRACING_C_LIB)
set (EVENTPIPE_PAL_SOURCES "${SHARED_EVENTPIPE_DIR}/ds-ipc-posix.c")
set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES LANGUAGE CXX)
set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
else(FEATURE_PERFTRACING_C_LIB)
set (EVENTPIPE_PAL_SOURCES "unix/diagnosticsipc.cpp")
endif(FEATURE_PERFTRACING_C_LIB)
set (EVENTPIPE_PAL_SOURCES "${SHARED_EVENTPIPE_DIR}/ds-ipc-posix.c")
set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES LANGUAGE CXX)
set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)

set(TWO_WAY_PIPE_SOURCES
${EVENTPIPE_PAL_SOURCES}
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/vm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,13 @@ if(FEATURE_JIT_PITCHING)
endif(FEATURE_JIT_PITCHING)

if(FEATURE_PERFTRACING)
if(FEATURE_PERFTRACING_C_LIB)
set(SHARED_EVENTPIPE_DIR ${CLR_SRC_NATIVE_DIR}/eventpipe)
set(CORECLR_EVENTPIPE_SHIM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/eventing/eventpipe)
else(FEATURE_PERFTRACING_C_LIB)
set(SHARED_EVENTPIPE_DIR ${VM_DIR})
endif(FEATURE_PERFTRACING_C_LIB)
endif(FEATURE_PERFTRACING)

if(FEATURE_PERFTRACING)
if(FEATURE_PERFTRACING_C_LIB)
include_directories(${SHARED_EVENTPIPE_DIR})
include_directories(${CORECLR_EVENTPIPE_SHIM_DIR})
endif(FEATURE_PERFTRACING_C_LIB)
endif(FEATURE_PERFTRACING)

set(VM_SOURCES_DAC_AND_WKS_COMMON
Expand Down
290 changes: 0 additions & 290 deletions src/coreclr/vm/diagnosticserver.cpp

This file was deleted.

Loading