brayniac
diff --git a/‎.gitignore
+9 b/‎.gitignore
+9
diff --git a/‎.travis.yml
+23-85 b/‎.travis.yml
+23-85
diff --git a/‎CMakeLists.txt
+61-24 b/‎CMakeLists.txt
+61-24
diff --git a/‎LICENSE
+1-1 b/‎LICENSE
+1-1
diff --git a/‎NOTICE
+2 b/‎NOTICE
+2
diff --git a/‎ci/before-install.sh
-15 b/‎ci/before-install.sh
-15
@@ -44,3 +44,12 @@ cscope.*
 lcov
 
 CMAKE_BINARY_DIR
+
+# Generated Rust Bindings
+bindings.rs
+
+# Cargo lock file
+Cargo.lock
+
+# Cargo build path
+target
@@ -1,14 +1,12 @@
 sudo: false
 language: c
+dist: xenial
 
 # 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
@@ -18,115 +16,55 @@ env:
 # 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:
   include:
-    # gcc 4.8 on linux
-    - env:
-        - C_COMPILER=gcc-4.8
+    - name: "gcc-5 on Linux"
+      compiler: gcc
       addons:
         apt:
           <<: *apt
           packages:
-            - gcc-4.8
             - libsubunit-dev
 
-
-    # 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-5 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
+    - os: osx
+      osx_image: xcode10.1
+      compiler: clang
 
-    # clang 3.7 on linux
-    - env:
-        - C_COMPILER=clang-3.7
+    - name: "cargo build"
+      language: rust
       addons:
         apt:
           <<: *apt
           packages:
-            - clang-3.7
             - libsubunit-dev
+      script:
+        - ./ci/cargo.sh
 
-    ## 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
-
-    # 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 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: xcode10.1
+      language: rust
+      script:
+        - ./ci/cargo.sh
 
   allow_failures:
     - os: osx
-      osx_image: xcode9.4
-      env:
-        - C_COMPILER=clang
-        - ALLOWED_TO_FAIL=1
-
+      osx_image: xcode10.1
+      compiler: clang
     - os: osx
-      osx_image: xcode9.2
-      env:
-        - C_COMPILER=clang
-        - ALLOWED_TO_FAIL=1
+      osx_image: xcode10.1
+      language: rust
+      script:
+        - ./ci/cargo.sh
 
 before_install:
   - ./ci/before-install.sh
 
@@ -1,6 +1,9 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 project(ccommon C)
 
+# Uncomment the following to output dependency graph debugging messages
+# set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_DEBUG_MODE 1)
+
 enable_testing()
 
 ###################
@@ -36,8 +39,8 @@ endif()
 # config.h.in has to include entries set/tested here for them to have effect
 
 # version info
-set(${PROJECT_NAME}_VERSION_MAJOR 1)
-set(${PROJECT_NAME}_VERSION_MINOR 2)
+set(${PROJECT_NAME}_VERSION_MAJOR 2)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
 set(${PROJECT_NAME}_VERSION_PATCH 0)
 set(${PROJECT_NAME}_VERSION
    ${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}
@@ -54,6 +57,7 @@ option(HAVE_STATS "stats enabled by default" ON)
 option(HAVE_DEBUG_MM "debugging oriented memory management disabled by default" OFF)
 option(COVERAGE "code coverage" OFF)
 option(HAVE_RUST "rust bindings not built by default" OFF)
+option(HAVE_ITT_INSTRUMENTATION "instrument code with ITT API" OFF)
 
 if(HAVE_RUST)
     option(RUST_VERBOSE_BUILD "pass -vv to cargo compilation" OFF)
@@ -78,7 +82,6 @@ if(BUILD_AND_INSTALL_CHECK)
 
     set(CHECK_ROOT_DIR "${LIBCHECK_PREFIX}")
     set(CMAKE_REQUIRED_INCLUDES "${CHECK_ROOT_DIR}/include")    # these make check link correctly in ccommon and pelikan
-    set(CMAKE_REQUIRED_LIBRARIES "${CHECK_ROOT_DIR}/lib")
 endif()
 
 include(CheckIncludeFiles)
@@ -96,9 +99,7 @@ check_symbol_exists(sys_signame signal.h HAVE_SIGNAME)
 
 include(CheckFunctionExists)
 check_function_exists(backtrace HAVE_BACKTRACE)
-
-include(TestBigEndian)
-test_big_endian(HAVE_BIG_ENDIAN)
+check_function_exists(accept4 HAVE_ACCEPT4)
 
 # how to use config.h.in to generate config.h
 # this has to be set _after_ the above checks
@@ -114,12 +115,23 @@ configure_file(
 # set compiler flags
 # string concat is easier in 3.0, but older versions don't have the concat subcommand
 # so we are using list as input until we move to new version
-# TODO add build types
 add_definitions(-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64)
+# Set a default build type (Release) if none was specified
+
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0")
+else()
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
+endif()
+
 set(CMAKE_MACOSX_RPATH 1)
 set(CFLAGS_LIST
     "-std=c11 "
-    "-ggdb3 -O2 "
+    "-ggdb3 "
     "-Wall "
     "-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls "
     "-Wunused-function -Wunused-value -Wunused-variable "
@@ -132,13 +144,15 @@ if(CMAKE_COMPILER_IS_GNUCC)
 endif()
 
 if (COVERAGE)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -Wall -W -fprofile-arcs -ftest-coverage")
+    if(NOT ${CMAKE_BUILD_TYPE} MATCHES Debug)
+        message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading" )
+    endif()
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
 endif(COVERAGE)
 
 # test dependencies
 include(FindPackageHandleStandardArgs)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
-
 find_package(Check)
 if(NOT CHECK_FOUND)
     message(WARNING "Check is required to build and run tests")
@@ -150,6 +164,17 @@ if(CHECK_FOUND)
     endif(NOT CHECK_WORKING)
 endif(CHECK_FOUND)
 
+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)
 
 
@@ -159,28 +184,41 @@ include_directories(
     "${PROJECT_BINARY_DIR}"
     "include")
 
-if(HAVE_RUST)
-    enable_language(Rust)
-    include(CMakeCargo)
-    add_subdirectory(rust)
-    set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DHAVE_RUST=1")
-endif()
-
-
 ###################
 # things to build #
 ###################
 
 add_subdirectory(src)
-if(CHECK_WORKING)
-    include_directories(${include_directories} "${CHECK_INCLUDES}")
+
+if(CHECK_FOUND)
+    include_directories(${include_directories} ${CHECK_INCLUDES})
     add_subdirectory(test)
-endif(CHECK_WORKING)
+endif(CHECK_FOUND)
+
+if(HAVE_RUST)
+    include(CMakeCargo)
+    add_subdirectory(rust)
+    set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DHAVE_RUST=1")
+
+    if (${CMAKE_VERSION} VERSION_LESS "3.13.0")
+        # CMakeCargo requires the use of some newer features of cmake
+        # for changes to dependant libraries to cause a rebuild. This
+        # will never break the build, it is just annoying for development.
+        # Leave a warning here, but don't break the build for older cmake
+        # versions.
+        message(
+            WARNING
+            "Rust targets don't properly pick up changes to dependencies in cmake version <= 3.13"
+        )
+    endif()
+endif()
 
 ###################
 # print a summary #
 ###################
 
+message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE})
+
 message(STATUS "PLATFORM: " ${OS_PLATFORM})
 
 message(STATUS "CPPFLAGS: " ${CMAKE_CPP_FLAGS})
@@ -189,6 +227,5 @@ message(STATUS "CFLAGS: " ${CMAKE_C_FLAGS})
 message(STATUS "HAVE_SIGNAME: " ${HAVE_SIGNAME})
 
 message(STATUS "HAVE_BACKTRACE: " ${HAVE_BACKTRACE})
-message(STATUS "HAVE_BIG_ENDIAN: " ${HAVE_BIG_ENDIAN})
 
-message(STATUS "CHECK_WORKING: " ${CHECK_WORKING})
+message(STATUS "CHECK_FOUND: " ${CHECK_FOUND})
@@ -1,4 +1,4 @@
-Copyright 2013-2015 Twitter, Inc
+Copyright 2013-2018 Twitter, Inc
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 
@@ -22,3 +22,5 @@
  * Boston, MA 02111-1307, USA.
  */
 
+We use the CMakeRust project (https://github.com/Devolutions/CMakeRust) under
+the Apache 2.0 License.
@@ -11,21 +11,6 @@ trap cleanup EXIT
 
 TOPLEVEL="$(git -C "$(cd "$(dirname "$0")" >/dev/null || exit 1; pwd)" rev-parse --show-toplevel)" || die 'failed to find TOPLEVEL'
 
-# for osx: 0. update brew; 1. install cmake if missing; 2. (gcc) unlink pre-installed gcc; 3. (gcc) install desired version of gcc
-
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-  brew update &>/dev/null
-  brew install cmake || true            # xcode 8.1 is missing cmake
-
-  if [[ "$C_COMPILER" =~ ^gcc && -n "${FORMULA:-}" ]]; then
-    brew unlink gcc || true
-    brew unlink "$FORMULA" || true
-    brew install "$FORMULA"
-  fi
-fi
-
-export CC="$C_COMPILER"
-
 if [[ -n "${RUST_ENABLED:-}" ]]; then
   curl https://sh.rustup.rs -sSf | sh -s -- -y
 fi
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright 2013-2015 Twitter, Inc`
	`1`	`+Copyright 2013-2018 Twitter, Inc`
`2`	`2`
`3`	`3`	`Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`you may not use this file except in compliance with the License.`