Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

Commit

Permalink
Squashed 'deps/ccommon/' changes from f5efe29..45b7bac
Browse files Browse the repository at this point in the history
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: 45b7bac29f7bddfbb7441d93f11f1d81c0dcb4e8
  • Loading branch information
brayniac committed May 27, 2020
1 parent b93c69d commit 686fd02
Show file tree
Hide file tree
Showing 160 changed files with 8,806 additions and 2,264 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,12 @@ cscope.*
lcov

CMAKE_BINARY_DIR

# Generated Rust Bindings
bindings.rs

# Cargo lock file
Cargo.lock

# Cargo build path
target
127 changes: 26 additions & 101 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,132 +1,57 @@
sudo: false
language: c
dist: bionic

# using anchor to import sources into linux builds
addons:
apt: &apt
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6
- llvm-toolchain-precise-3.7
- llvm-toolchain-precise

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

# travis currently does not support directly setting gcc/clang with versions
# (e.g. gcc-4.8) as value for the compiler key. So we will have to manually
# request these packages and use environment varibles to create the matrix.
#
# In the case of osx, use brew to install the paritcular versions, instead of
# specifying with packages.
matrix:
jobs:
fast_finish: true
include:
# gcc 4.8 on linux
- env:
- C_COMPILER=gcc-4.8
addons:
apt:
<<: *apt
packages:
- gcc-4.8
- libsubunit-dev
- name: "gcc-7 on Linux"
compiler: gcc


# gcc 4.9 on linux
- env:
- C_COMPILER=gcc-4.9
addons:
apt:
<<: *apt
packages:
- gcc-4.9
- libsubunit-dev

# gcc 5 on linux
- env:
- C_COMPILER=gcc-5
addons:
apt:
<<: *apt
packages:
- gcc-5
- libsubunit-dev

# gcc 5 on linux
- env:
- C_COMPILER=gcc-5
- name: "gcc-7 on Linux, Rust enabled"
compiler: gcc
env:
- RUST_ENABLED=1
addons:
apt:
<<: *apt
packages:
- gcc-5
- libsubunit-dev

# clang 3.6 on linux
- env:
- C_COMPILER=clang-3.6
addons:
apt:
<<: *apt
packages:
- clang-3.6
- libsubunit-dev

# clang 3.7 on linux
- env:
- C_COMPILER=clang-3.7
addons:
apt:
<<: *apt
packages:
- clang-3.7
- libsubunit-dev

## gcc 4.8 on osx
#- os: osx
# env: FORMULA=gcc48 COMPILER=gcc C_COMPILER=gcc-4.8
#
## gcc 4.9 on osx
#- os: osx
# env: FORMULA=gcc49 COMPILER=gcc C_COMPILER=gcc-4.9
#
## gcc 5 on osx
#- os: osx
# env: FORMULA=gcc5 COMPILER=gcc C_COMPILER=gcc-5
- name: "cargo build"
language: rust
script:
- ./ci/cargo.sh

# OSX 10.13
# Apple LLVM version 9.1.0 (clang-902.0.39.2)
# Target: x86_64-apple-darwin17.6.0
- os: osx
osx_image: xcode9.4
env:
- C_COMPILER=clang
- ALLOWED_TO_FAIL=1
osx_image: xcode11.4
compiler: clang

# OSX 10.12
# Apple LLVM version 9.0.0 (clang-900.0.39.2)
# Target: x86_64-apple-darwin16.7.0
- os: osx
osx_image: xcode9.2
env:
- C_COMPILER=clang
- ALLOWED_TO_FAIL=1
osx_image: xcode11.4
language: rust
script:
- ./ci/cargo.sh

allow_failures:
- os: osx
osx_image: xcode9.4
env:
- C_COMPILER=clang
- ALLOWED_TO_FAIL=1

osx_image: xcode11.4
compiler: clang
- os: osx
osx_image: xcode9.2
env:
- C_COMPILER=clang
- ALLOWED_TO_FAIL=1
osx_image: xcode11.4
language: rust
script:
- ./ci/cargo.sh

before_install:
- ./ci/before-install.sh
Expand Down
Loading

0 comments on commit 686fd02

Please sign in to comment.