Skip to content

Commit

Permalink
Fix the cache stallness in CHECK_DEPENDENCIES function
Browse files Browse the repository at this point in the history
- The current implementation of the above function may suffer from stallness.
- Required changes are made to avoid this.
- Some minor typos are also fixed.

Signed-off-by: akulkarni <[email protected]>
  • Loading branch information
ParthShitole authored and akulkarni committed Oct 27, 2024
1 parent 038dd22 commit e7d46a0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion backends/ebpf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ if(TEST_DEPENDENCY_PRESENT)
# We do not have support for dynamic addition of tables in the test framework
p4c_add_test_with_args("ebpf" ${EBPF_DRIVER_TEST} TRUE "testdata/p4_16_samples/ebpf_conntrack_extern.p4" "testdata/p4_16_samples/ebpf_conntrack_extern.p4" "--extern-file ${P4C_SOURCE_DIR}/testdata/extern_modules/extern-conntrack-ebpf.c" "")
else()
message(WARNING "Skipped adding Tests due to missing dependencies" " Please install the dependencies and try again")
message(WARNING "Skipped adding Tests due to missing dependencies." " Please install the dependencies and try again")
endif()

message(STATUS "Done with configuring BPF back end")
14 changes: 7 additions & 7 deletions cmake/P4CUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -430,30 +430,30 @@ function(CHECK_DEPENDENCIES OUT_VAR TEST_DEPENDENCY_PROGRAMS TEST_DEPENDENCY_LIB
set(ALL_FOUND TRUE)

foreach(PROG ${TEST_DEPENDENCY_PROGRAMS})
find_program(PROG_PATH ${PROG})
if (NOT PROG_PATH)
find_program(${PROG}_PROG_PATH ${PROG} NO_CACHE)
if (NOT ${PROG}_PROG_PATH)
message(WARNING "Missing program ${PROG}."
" Please install ${PROG} and ensure it is in your PATH.")
set(ALL_FOUND FALSE)
else()
message(STATUS "Found program ${PROG} at ${PROG_PATH}")
message(STATUS "Found program ${PROG}")
endif()
endforeach()

foreach(LIB ${TEST_DEPENDENCY_LIBRARIES})
if (ARGC GREATER 3)
set(HINTS_DIRS_ARG ${ARGV4})
find_library(LIB_PATH ${LIB} HINTS ${HINTS_DIRS})
find_library(${LIB}_LIB_PATH NAMES ${LIB} NO_CACHE HINTS ${HINTS_DIRS})
else()
find_library(LIB_PATH ${LIB})
find_library(${LIB}_LIB_PATH NAMES ${LIB} NO_CACHE)
endif()

if (NOT LIB_PATH)
if (NOT ${LIB}_LIB_PATH)
message(WARNING "Missing library ${LIB}."
" Please install ${LIB}.")
set(ALL_FOUND FALSE)
else()
message(STATUS "Found library ${LIB} at ${LIB_PATH}")
message(STATUS "Found library ${LIB}")
endif()
endforeach()

Expand Down

0 comments on commit e7d46a0

Please sign in to comment.