Skip to content

Commit

Permalink
Squashed 'deps/ccommon/' changes from f5efe29..8737d99 (twitter#255)
Browse files Browse the repository at this point in the history
8737d99 continue on server socket on non-blocking errors (twitter#209)
2a62281 add atoi64 to bstring (twitter#206)
f71c657 cc_option simplify _allowed_in_name (twitter#205)
24e3131 Add ITT instrumentation option (twitter#204)
236c98d Fix docs (twitter#200)
e58f6a8 cc_array and cc_ring_array NULL fixes (twitter#201)
1c8df42 Add basic support of build type (twitter#199)
7107988 Fix now_ns() (twitter#198)
da240e5 cc: extend cc_util module (twitter#196)
4846b15 Fix TAILQ_REINIT (twitter#195)
4f5dbb0 Update Cmake version to 2.8 (twitter#197)
2e6f78a cc_mm use OS_DARWIN macro to detect OS (twitter#194)
57acaf6 cc: extend queue module (twitter#193)
a64ada2 cc: extend duration module (twitter#192)
b117632 reverting CMake file changes (twitter#191)
dea5bee backport changes made to ccommon in pelikan (twitter#190)
a4c0334 add linebreak to stats_log() (twitter#188)
05eb03e fix inconsistent naming and bump version (twitter#187)
4acc53a Stats to file (twitter#186)
2168fec minimize osx build config (twitter#185)
42b24de Simplify rust options, specify fewer output targets (twitter#183)
c9fa905 update CMakeRust used to latest version, tweaks to make build work (twitter#184)
2ef0163 Reorder dependency includes in cmake, don't parallel build (twitter#182)
a6a54d9 remove endian-specific logic from str*cmp (twitter#177)
4c0668b epoll_create* ignores size hint in newer kernels, switch to new API (twitter#179)
c9c5ee5 improve cc_bstring string literal and cstring names (twitter#176)
0184d73 Add unit tests for buffer, fix buf/dbuf bugs and refactor (twitter#174)
d7dab43 create a .cargo/config so intellij uses the same target dir as cmake (twitter#173)
e710712 use accept4 for tcp_accept when available (twitter#171)
21ba10e Remove cargo lock for shared lib, closes twitter#169 (twitter#172)
24660f1 update style guide (twitter#170)
17baf1e Per thread logging (twitter#168)

git-subtree-dir: deps/ccommon
git-subtree-split: 8737d99
  • Loading branch information
Yao Yue authored and michalbiesek committed Sep 10, 2019
1 parent 8e0828b commit 13492e3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
11 changes: 11 additions & 0 deletions deps/ccommon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion deps/ccommon/src/channel/cc_tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 13492e3

Please sign in to comment.