2017 11 mkind malloc or die

.ci/after_success.sh

@@ -4,5 +4,5 @@ set -e
 set -o pipefail
 
 if [[ -n "${GCOV}" ]]; then
-  coveralls -e test -e out/CMakeFiles/CompilerIdC/CMakeCCompilerId.c -e out/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp --gcov "$(which "${GCOV}")" --encoding iso-8859-1 -b out || echo 'coveralls upload failed.'
+  coveralls -e test -e build/CMakeFiles/CompilerIdC/CMakeCCompilerId.c -e build/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp --gcov "$(which "${GCOV}")" --encoding iso-8859-1 -b build || echo 'coveralls upload failed.'
 fi

.ci/before_install.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+if [[ -n "${CI_TARGET}" ]]; then
+  exit
+fi
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  brew update
+fi
+
+echo "Upgrade Python 2's pip."
+pip2.7 -q install --user --upgrade pip
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  echo "Install Python 3."
+  brew install python3
+  echo "Upgrade Python 3's pip."
+  pip3 -q install --user --upgrade pip
+else
+  # TODO: Replace with upgrade when Travis gets python3-pip package.
+  echo "Install pip for Python 3."
+  curl -sSL https://bootstrap.pypa.io/get-pip.py -o "${HOME}/get-pip.py"
+  # After this, pip in PATH will refer to Python 3's pip.
+  python3.3 "${HOME}/get-pip.py" --user --upgrade
+fi

.ci/install.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+if [[ -n "${CI_TARGET}" ]]; then
+  exit
+fi
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  brew install gettext
+  brew reinstall -s libtool
+fi
+
+# Use default CC to avoid compilation problems when installing Python modules.
+echo "Install coveralls for Python 2."
+CC=cc pip2.7 -q install --user --upgrade cpp-coveralls

.travis.yml

@@ -7,7 +7,7 @@ matrix:
       env: EXTRA_FLAGS="-DCLANG_ADDRESS_SANITIZER=ON"
     - os: linux
       compiler: gcc-5
-      env: GCOV=gcov-5 EXTRA_FLAGS="-DUSE_COVERAGE=ON"
+      env: GCOV=gcov-5 CMAKE_FLAGS="-DUSE_COVERAGE=ON"
 
 before_install:
   # cmocka
@@ -17,16 +17,9 @@ before_install:
   - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .. && make -j2 && sudo make install
   - cd ../..
   - rm -rf cmocka-1.0.1
-  # libuv
-  - curl -L https://github.com/libuv/libuv/archive/v1.8.0.tar.gz | tar xzf -
-  - (cd libuv-1.8.0 && ./autogen.sh && ./configure --prefix=/usr && make && sudo make install)
-  - rm -rf libuv-1.8.0
-  # msgpack-c
-  - curl -L https://github.com/msgpack/msgpack-c/archive/cpp-1.4.1.tar.gz | tar xzf -
-  - (cd msgpack-c-cpp-1.4.1 && ./bootstrap && ./configure --prefix=/usr && make && sudo make install)
-  - rm -rf msgpack-c-cpp-1.4.1
-  # coveralls
-  - pip install --user cpp-coveralls
+  - .ci/before_install.sh
+
+install: .ci/install.sh
 
 addons:
   apt:
@@ -49,9 +42,10 @@ addons:
       - llvm-3.4-dev
       - ninja-build
       - pkg-config
+      - python3.3-dev
       - libbsd-dev
       - libhiredis-dev
 
 before_script: redis-server redis-test.conf
-script: make sb && make test && make sb-makekey && ./out/bin/sb-makekey && ./out/bin/sb-test
+script: make sb && make test && make sb-makekey && ./build/bin/sb-makekey && ./build/bin/sb-test
 after_success: .ci/after_success.sh

CMakeLists.txt

@@ -7,6 +7,16 @@ option(CLANG_MEMORY_SANITIZER "Enable clang memory sanitizer." OFF)
 option(CLANG_THREAD_SANITIZER "Enable clang thread sanitizer." OFF)
 option(CLANG_ANALYZER "Enable clang static analyzer." OFF)
 
+# Prefer our bundled versions of dependencies.
+set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/usr" CACHE PATH "Path prefix for finding dependencies")
+if(CMAKE_CROSSCOMPILING AND NOT UNIX)
+  list(INSERT CMAKE_FIND_ROOT_PATH 0 ${DEPS_PREFIX})
+  list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX}/../host/bin)
+else()
+  list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX})
+  set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
+endif()
+
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 if(NOT CMAKE_BUILD_TYPE)
@@ -97,8 +107,10 @@ file(GLOB MANPAGES
 # splonebox target sources
 set(SPLONEBOX-SOURCES
   src/main.c
+  src/main.h
   src/sb-common.h
   src/khash.h
+  src/klist.h
   src/kvec.h
   src/queue.h
   src/string.c
@@ -123,13 +135,21 @@ set(SPLONEBOX-SOURCES
   src/address.c
   src/address.h
   src/sbmemzero.c
+  src/mem.c
+  src/mem.h
   src/api/sb-api.h
   src/api/register.c
   src/api/result.c
   src/api/run.c
+  src/api/broadcast.c
+  src/api/subscribe.c
+  src/api/unsubscribe.c
+  src/api/helpers.c
+  src/api/helpers.h
   src/rpc/sb-rpc.h
   src/rpc/connection/event.c
   src/rpc/connection/event.h
+  src/rpc/connection/event-defs.h
   src/rpc/connection/streamhandle.c
   src/rpc/connection/streamhandle.h
   src/rpc/connection/inputstream.c
@@ -144,10 +164,9 @@ set(SPLONEBOX-SOURCES
   src/rpc/connection/crypto.c
   src/rpc/connection/crypto.h
   src/rpc/connection/loop.c
-  src/rpc/msgpack/sb-msgpack-rpc.h
-  src/rpc/msgpack/message.c
-  src/rpc/msgpack/pack.c
-  src/rpc/msgpack/unpack.c
+  src/rpc/connection/loop.h
+  src/rpc/msgpack/helpers.c
+  src/rpc/msgpack/helpers.h
   src/rpc/db/sb-db.h
   src/rpc/db/connect.c
   src/rpc/db/plugin.c
@@ -159,6 +178,8 @@ set(SPLONEBOX-SOURCES
 set(SB-PLUGINKEY-SOURCES
   src/sb-pluginkey.c
   src/sb-common.h
+  src/mem.c
+  src/mem.h
   src/rpc/sb-rpc.h
   src/util.c
   src/confparse.c
@@ -170,6 +191,8 @@ set(SB-PLUGINKEY-SOURCES
 # sb-makekey target sources
 set(SB-MAKEKEY-SOURCES
   src/sb-common.h
+  src/mem.c
+  src/mem.h
   src/reallocarray.c
   src/tweetnacl.c
   src/tweetnacl.h
@@ -180,8 +203,10 @@ set(SB-MAKEKEY-SOURCES
 
 # splonebox test(s) sources
 set(TEST-SOURCES
+  src/main.h
   src/sb-common.h
   src/khash.h
+  src/klist.h
   src/queue.h
   src/string.c
   src/reallocarray.c
@@ -202,16 +227,24 @@ set(TEST-SOURCES
   src/parse.h
   src/util.c
   src/util.h
+  src/mem.c
+  src/mem.h
   src/address.c
   src/address.h
   src/sbmemzero.c
   src/api/sb-api.h
   src/api/register.c
   src/api/run.c
   src/api/result.c
+  src/api/broadcast.c
+  src/api/subscribe.c
+  src/api/unsubscribe.c
+  src/api/helpers.c
+  src/api/helpers.h
   src/rpc/sb-rpc.h
   src/rpc/connection/event.c
   src/rpc/connection/event.h
+  src/rpc/connection/event-defs.h
   src/rpc/connection/streamhandle.c
   src/rpc/connection/streamhandle.h
   src/rpc/connection/inputstream.c
@@ -226,10 +259,9 @@ set(TEST-SOURCES
   src/rpc/connection/crypto.c
   src/rpc/connection/crypto.h
   src/rpc/connection/loop.c
-  src/rpc/msgpack/sb-msgpack-rpc.h
-  src/rpc/msgpack/message.c
-  src/rpc/msgpack/pack.c
-  src/rpc/msgpack/unpack.c
+  src/rpc/connection/loop.h
+  src/rpc/msgpack/helpers.c
+  src/rpc/msgpack/helpers.h
   src/rpc/db/sb-db.h
   src/rpc/db/connect.c
   src/rpc/db/plugin.c
@@ -245,28 +277,7 @@ set(TEST-SOURCES
   test/helper-validate.h
   test/unit/server-start.c
   test/unit/server-stop.c
-  test/unit/pack-string.c
-  test/unit/pack-int.c
-  test/unit/pack-uint.c
-  test/unit/pack-array.c
-  test/unit/pack-nil.c
-  test/unit/pack-float.c
-  test/unit/pack-bool.c
-  test/unit/regression-issue-60.c
-  test/unit/unpack-string.c
-  test/unit/unpack-uint.c
-  test/unit/unpack-array.c
   test/unit/dispatch-table-get.c
-  test/unit/event-queue-put.c
-  test/unit/event-queue-get.c
-  test/unit/message-deserialize-request.c
-  test/unit/message-deserialize-response.c
-  test/unit/message-deserialize-error-response.c
-  test/unit/message-serialize-request.c
-  test/unit/message-serialize-response.c
-  test/unit/message-serialize-error-response.c
-  test/unit/message-is-request.c
-  test/unit/message-is-response.c
   test/functional/db-connect.c
   test/functional/db-plugin-add.c
   test/functional/db-pluginkey-verify.c
@@ -278,9 +289,12 @@ set(TEST-SOURCES
   test/functional/dispatch-handle-register.c
   test/functional/dispatch-handle-run.c
   test/functional/dispatch-handle-result.c
+  test/functional/dispatch-handle-subscribe.c
+  test/functional/dispatch-handle-broadcast.c
   test/functional/crypto.c
   test/functional/confparse.c
   test/functional/db-whitelist.c
+  test/functional/msgpack-rpc-helper.c
 )
 
 if(CLANG_ADDRESS_SANITIZER OR CLANG_MEMORY_SANITIZER OR CLANG_TSAN)
@@ -289,7 +303,11 @@ endif()
 
 include_directories(${PROJECT_SOURCE_DIR}/src)
 include_directories(${PROJECT_SOURCE_DIR}/test)
-include_directories(${BSD_INCLUDE_DIRS} ${LIBUV_INCLUDE_DIRS} ${MSGPACK_INCLUDE_DIRS} ${HIREDIS_INCLUDE_DIRS} ${CMOCKA_INCLUDE_DIRS})
+include_directories(SYSTEM ${BSD_INCLUDE_DIRS})
+include_directories(SYSTEM ${LIBUV_INCLUDE_DIRS})
+include_directories(SYSTEM ${MSGPACK_INCLUDE_DIRS})
+include_directories(SYSTEM ${HIREDIS_INCLUDE_DIRS})
+include_directories(SYSTEM ${CMOCKA_INCLUDE_DIRS})
 
 # sb target
 add_executable(sb ${SPLONEBOX-SOURCES})
@@ -311,7 +329,7 @@ add_executable(sb-test ${TEST-SOURCES})
 add_executable(sb-pluginkey ${SB-PLUGINKEY-SOURCES})
 
 # wrap some functions for testing
-set_property(TARGET sb-test APPEND_STRING PROPERTY LINK_FLAGS "-Wl,--wrap=outputstream_write,--wrap=loop_wait_for_response,--wrap=crypto_write ")
+set_property(TARGET sb-test APPEND_STRING PROPERTY LINK_FLAGS "-Wl,--wrap=outputstream_write,--wrap=loop_process_events_until,--wrap=crypto_write ")
 set_property(TARGET sb-test APPEND_STRING PROPERTY COMPILE_FLAGS "-DBOX_UNIT_TESTS ")
 
 target_link_libraries(sb-test

Makefile

@@ -1,6 +1,6 @@
 BUILD_DIR := out
 CMAKE_BUILD_TYPE ?= Debug
-FLAGS := -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE)
+CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE)
 EXTRA_FLAGS ?=
 
 BUILD_TYPE ?= $(shell (type ninja > /dev/null 2>&1 && echo "Ninja") || echo "Unix Makefiles")
@@ -26,35 +26,59 @@ endif
 
 BUILD_CMD = $(BUILD_TOOL) $(VERBOSE_FLAG)
 
+# Extra CMake flags which extend the default set
+CMAKE_EXTRA_FLAGS ?=
+USE_BUNDLED_DEPS ?=
+DEPS_CMAKE_FLAGS ?=
+
+ifneq (,$(USE_BUNDLED_DEPS))
+  BUNDLED_CMAKE_FLAG := -DUSE_BUNDLED=$(USE_BUNDLED_DEPS)
+endif
+
 all: sb test sb-makekey sb-pluginkey
 
-sb:
-	test -d $(BUILD_DIR) || mkdir $(BUILD_DIR)
-	cd out && cmake -G '$(BUILD_TYPE)' $(FLAGS) $(EXTRA_FLAGS) ..
-	$(BUILD_CMD) -C out sb
+sb: build/.ran-cmake deps
+	+$(BUILD_CMD) -C build sb
+
+cmake:
+	touch CMakeLists.txt
+	$(MAKE) build/.ran-cmake
+
+build/.ran-cmake: | deps
+	cd build && cmake -G '$(BUILD_TYPE)' $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) ..
+	touch $@
+
+deps: | build/.ran-third-party-cmake
+ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),)
+	+$(BUILD_CMD) -C .deps
+endif
+
+build/.ran-third-party-cmake:
+ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),)
+		mkdir -p .deps
+		cd .deps && \
+			cmake -G '$(BUILD_TYPE)' $(BUNDLED_CMAKE_FLAG) $(BUNDLED_LUA_CMAKE_FLAG) \
+			$(DEPS_CMAKE_FLAGS) ../third-party
+endif
+		mkdir -p build
+		touch $@
 
-test:
-	test -d $(BUILD_DIR) || mkdir $(BUILD_DIR)
-	cd out && cmake -G '$(BUILD_TYPE)' $(FLAGS) $(EXTRA_FLAGS) ..
-	$(BUILD_CMD) -C out sb-test
+test: build/.ran-cmake deps
+	+$(BUILD_CMD) -C build sb-test
 
-sb-makekey:
-	test -d $(BUILD_DIR) || mkdir $(BUILD_DIR)
-	cd out && cmake -G '$(BUILD_TYPE)' $(FLAGS) $(EXTRA_FLAGS) ..
-	$(BUILD_CMD) -C out sb-makekey
+sb-makekey: build/.ran-cmake deps
+	+$(BUILD_CMD) -C build sb-makekey
 
-sb-pluginkey:
-	test -d $(BUILD_DIR) || mkdir $(BUILD_DIR)
-	cd out && cmake -G '$(BUILD_TYPE)' $(FLAGS) $(EXTRA_FLAGS) ..
-	$(BUILD_CMD) -C out sb-pluginkey
+sb-pluginkey: build/.ran-cmake deps
+	+$(BUILD_CMD) -C build sb-pluginkey
 
 clean:
-	+test -d out && $(BUILD_CMD) -C out clean || true
+	+test -d build && $(BUILD_CMD) -C build clean || true
 
 distclean: clean
-	rm -rf out
+	rm -rf .deps build
 
 install: | sb
 	+$(BUILD_CMD) -C out install
 
-.PHONY: test clean distclean sb install sb-makekey
+.PHONY: test clean distclean sb install sb-makekey deps cmake