Skip to content
This repository was archived by the owner on Feb 25, 2023. It is now read-only.

Commit 8aa2f3d

Browse files
author
Yao Yue
committed
Squashed 'deps/ccommon/' changes from f5efe29..6af1821
6af1821 Pthread name (twitter#251) e77471e cmake: gen config.h into include to support make install (twitter#249) 0094e2a add convenience array api (twitter#239) 6024ef7 add pipe config to rust ccommon-channel (twitter#247) eaf7f07 remove ccommon-time (twitter#248) 45b7bac add new libraries to contain config structs (twitter#245) 0db032a tuning cmake / ci further (twitter#243) 49dcaff improve cargo build script (twitter#244) 5e64de2 WIP: add fluxcapacitor support for linux build (twitter#242) 55769cc restore cmake for rust libraries (twitter#241) 6b1d8d5 Improve the Rust build story (twitter#240) 5955d6b move nodelay setting to the server socket, and accepted connections will inherit that (twitter#238) aafd20f formatting (twitter#237) 3b5c069 Update ccommon_rs to use bytes v5.0 (twitter#235) df74087 Address clippy lints in rust code (twitter#234) 7c5bbd1 Make metrics and options Send + Sync (twitter#233) c2e617e Ensure that manually implemented C options use the correct name (twitter#232) 6e76741 Add some docs b5b4c5a Change check_pipe to use nanosleep instead of usleep (twitter#231) eb0a389 Use name of field instead of description for C metrics (twitter#230) 16ddc76 Fix broken buf impls (twitter#229) eefcdcb Avoid redundant rebuilds of rust packages in CI (twitter#228) 33f62a8 Update bindgen to also generate bindings recursively (twitter#227) 27ffc7c Implement bytes::Buf and Bytes::ButMut on Buf and OwnedBuf (twitter#226) f873930 Various small bugfixes and usability improvements for rust code (twitter#225) 37a1ecd Port option parsing module to Rust (twitter#224) 38f7556 Fix failed test detection (twitter#215) 0ab1604 Conditionally use std::any::type_name if it's supported (twitter#223) 98176d3 Backport changes from twitter#265 (twitter#222) ba54096 Remove test for removed rust logging functionality (twitter#221) 519118d Rewrite cmake cargo build wrapper (twitter#220) 5d23b3a Fix some small typos found in twitter#263 (twitter#219) 475dda7 Clean up logging shim (twitter#218) 1d28dd2 Expand rust bindings to add options, metrics, and ccbox (twitter#217) 88b5400 Upstream changes from twitter#261 (twitter#216) 4e99e63 fix a bug and change how check is found (twitter#214) 54067ef slightly simplify accept error-handling logic (twitter#210) e9fe980 Fix synchronize ccommon with pelikan deps/ccommon (twitter#212) 7eb6424 Cleanup libcheck related code (twitter#211) 683bc1a cc_bstring simplify and fix (twitter#207) 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: 6af182198babff2db218d0149e64ee2fe840dc72
1 parent b93c69d commit 8aa2f3d

File tree

161 files changed

+13622
-2277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+13622
-2277
lines changed

.gitignore

+10
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
# Automatically generated files
2626
COPYING
2727
INSTALL
28+
include/config.h
2829

2930
# Temporary
3031
*.swp
@@ -44,3 +45,12 @@ cscope.*
4445
lcov
4546

4647
CMAKE_BINARY_DIR
48+
49+
# Generated Rust Bindings
50+
bindings.rs
51+
52+
# Cargo lock file
53+
Cargo.lock
54+
55+
# Cargo build path
56+
target

.travis.yml

+26-101
Original file line numberDiff line numberDiff line change
@@ -1,132 +1,57 @@
11
sudo: false
22
language: c
3+
dist: bionic
34

45
# using anchor to import sources into linux builds
56
addons:
67
apt: &apt
78
sources:
89
- ubuntu-toolchain-r-test
9-
- llvm-toolchain-precise-3.6
10-
- llvm-toolchain-precise-3.7
11-
- llvm-toolchain-precise
1210

1311
# important for allowed-to-fail matching
1412
# see https://docs.travis-ci.com/user/customizing-the-build#Rows-that-are-Allowed-to-Fail
1513
env:
16-
- ALLOWED_TO_FAIL=0
14+
global:
15+
- MAKEFLAGS="-j 2"
1716

1817
# travis currently does not support directly setting gcc/clang with versions
1918
# (e.g. gcc-4.8) as value for the compiler key. So we will have to manually
2019
# request these packages and use environment varibles to create the matrix.
21-
#
22-
# In the case of osx, use brew to install the paritcular versions, instead of
23-
# specifying with packages.
24-
matrix:
20+
jobs:
21+
fast_finish: true
2522
include:
26-
# gcc 4.8 on linux
27-
- env:
28-
- C_COMPILER=gcc-4.8
29-
addons:
30-
apt:
31-
<<: *apt
32-
packages:
33-
- gcc-4.8
34-
- libsubunit-dev
23+
- name: "gcc-7 on Linux"
24+
compiler: gcc
3525

36-
37-
# gcc 4.9 on linux
38-
- env:
39-
- C_COMPILER=gcc-4.9
40-
addons:
41-
apt:
42-
<<: *apt
43-
packages:
44-
- gcc-4.9
45-
- libsubunit-dev
46-
47-
# gcc 5 on linux
48-
- env:
49-
- C_COMPILER=gcc-5
50-
addons:
51-
apt:
52-
<<: *apt
53-
packages:
54-
- gcc-5
55-
- libsubunit-dev
56-
57-
# gcc 5 on linux
58-
- env:
59-
- C_COMPILER=gcc-5
26+
- name: "gcc-7 on Linux, Rust enabled"
27+
compiler: gcc
28+
env:
6029
- RUST_ENABLED=1
61-
addons:
62-
apt:
63-
<<: *apt
64-
packages:
65-
- gcc-5
66-
- libsubunit-dev
67-
68-
# clang 3.6 on linux
69-
- env:
70-
- C_COMPILER=clang-3.6
71-
addons:
72-
apt:
73-
<<: *apt
74-
packages:
75-
- clang-3.6
76-
- libsubunit-dev
77-
78-
# clang 3.7 on linux
79-
- env:
80-
- C_COMPILER=clang-3.7
81-
addons:
82-
apt:
83-
<<: *apt
84-
packages:
85-
- clang-3.7
86-
- libsubunit-dev
8730

88-
## gcc 4.8 on osx
89-
#- os: osx
90-
# env: FORMULA=gcc48 COMPILER=gcc C_COMPILER=gcc-4.8
91-
#
92-
## gcc 4.9 on osx
93-
#- os: osx
94-
# env: FORMULA=gcc49 COMPILER=gcc C_COMPILER=gcc-4.9
95-
#
96-
## gcc 5 on osx
97-
#- os: osx
98-
# env: FORMULA=gcc5 COMPILER=gcc C_COMPILER=gcc-5
31+
- name: "cargo build"
32+
language: rust
33+
script:
34+
- ./ci/cargo.sh
9935

100-
# OSX 10.13
101-
# Apple LLVM version 9.1.0 (clang-902.0.39.2)
102-
# Target: x86_64-apple-darwin17.6.0
10336
- os: osx
104-
osx_image: xcode9.4
105-
env:
106-
- C_COMPILER=clang
107-
- ALLOWED_TO_FAIL=1
37+
osx_image: xcode11.4
38+
compiler: clang
10839

109-
# OSX 10.12
110-
# Apple LLVM version 9.0.0 (clang-900.0.39.2)
111-
# Target: x86_64-apple-darwin16.7.0
11240
- os: osx
113-
osx_image: xcode9.2
114-
env:
115-
- C_COMPILER=clang
116-
- ALLOWED_TO_FAIL=1
41+
osx_image: xcode11.4
42+
language: rust
43+
script:
44+
- ./ci/cargo.sh
11745

11846
allow_failures:
11947
- os: osx
120-
osx_image: xcode9.4
121-
env:
122-
- C_COMPILER=clang
123-
- ALLOWED_TO_FAIL=1
124-
48+
osx_image: xcode11.4
49+
compiler: clang
12550
- os: osx
126-
osx_image: xcode9.2
127-
env:
128-
- C_COMPILER=clang
129-
- ALLOWED_TO_FAIL=1
51+
osx_image: xcode11.4
52+
language: rust
53+
script:
54+
- ./ci/cargo.sh
13055

13156
before_install:
13257
- ./ci/before-install.sh

0 commit comments

Comments
 (0)