diff --git a/deps/ccommon/CMakeLists.txt b/deps/ccommon/CMakeLists.txt index a0d880715..1e5cc5854 100644 --- a/deps/ccommon/CMakeLists.txt +++ b/deps/ccommon/CMakeLists.txt @@ -172,6 +172,17 @@ if (HAVE_ITT_INSTRUMENTATION) link_libraries(${ITTNOTIFY_LIBRARIES}) endif(HAVE_ITT_INSTRUMENTATION) +if (HAVE_ITT_INSTRUMENTATION) + if(PKG_CONFIG_FOUND) + pkg_check_modules(ITTNOTIFY REQUIRED ittnotify>=1.0) + else() + find_package(ITTNOTIFY REQUIRED 1.0) + endif() + include_directories(${ITTNOTIFY_INCLUDE_DIRS}) + link_directories(${ITTNOTIFY_LIBRARY_DIRS}) + link_libraries(${ITTNOTIFY_LIBRARIES}) +endif(HAVE_ITT_INSTRUMENTATION) + find_package(Threads) diff --git a/deps/ccommon/src/channel/cc_tcp.c b/deps/ccommon/src/channel/cc_tcp.c index bbd685d2f..0cb1fcc46 100644 --- a/deps/ccommon/src/channel/cc_tcp.c +++ b/deps/ccommon/src/channel/cc_tcp.c @@ -340,7 +340,7 @@ _tcp_accept(struct tcp_conn *sc) log_error("accept on sd %d failed: %s", sc->sd, strerror(errno)); INCR(tcp_metrics, tcp_accept_ex); - return -1; + continue; } break;