refactor: Use cmp instead of msgpack-c for events packing.

This library is better in every way.
TokTok · Mar 26, 2022 · ee154da · ee154da
1 parent 6749974
commit ee154da
Show file tree

Hide file tree

Showing 73 changed files with 1,330 additions and 806 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,19 +28,20 @@ jobs:
           apt-get update &&
           DEBIAN_FRONTEND=noninteractive
           apt-get install -y --no-install-recommends
+            ca-certificates
             clang
             cmake
             git
             libconfig-dev
             libgtest-dev
-            libmsgpack-dev
             libopus-dev
             libsodium-dev
             libvpx-dev
             llvm-dev
             ninja-build
             pkg-config
       - checkout
+      - run: git submodule update --init --recursive
       - run: CC=clang .circleci/cmake-asan
 
   tsan:
@@ -51,6 +52,7 @@ jobs:
     steps:
       - run: *apt_install
       - checkout
+      - run: git submodule update --init --recursive
       - run: CC=clang .circleci/cmake-tsan
 
   ubsan:
@@ -61,6 +63,7 @@ jobs:
     steps:
       - run: *apt_install
       - checkout
+      - run: git submodule update --init --recursive
       - run: CC=clang .circleci/cmake-ubsan
 
   msan:
@@ -70,6 +73,7 @@ jobs:
 
     steps:
       - checkout
+      - run: git submodule update --init --recursive
       - run: rm -rf /src/workspace/c-toxcore/* && mv * /src/workspace/c-toxcore/
       - run: cd /src/workspace && bazel test //c-toxcore/auto_tests:lossless_packet_test
 
@@ -81,6 +85,7 @@ jobs:
     steps:
       - run: *apt_install
       - checkout
+      - run: git submodule update --init --recursive
       - run: infer --no-progress-bar -- cc
           auto_tests/auto_test_support.c
           auto_tests/lossless_packet_test.c
@@ -89,8 +94,9 @@ jobs:
           toxcore/*.c
           toxcore/*/*.c
           toxencryptsave/*.c
+          third_party/cmp/*.c
           -lpthread
-          $(pkg-config --cflags --libs libsodium msgpack opus vpx)
+          $(pkg-config --cflags --libs libsodium opus vpx)
 
   static-analysis:
     working_directory: ~/work
@@ -99,8 +105,14 @@ jobs:
 
     steps:
       - run: *apt_install
-      - run: apt-get install -y --no-install-recommends cppcheck g++ llvm-dev
+      - run:
+          apt-get install -y --no-install-recommends
+            ca-certificates
+            cppcheck
+            g++
+            llvm-dev
       - checkout
+      - run: git submodule update --init --recursive
       - run: other/analysis/check_includes
       - run: other/analysis/check_logger_levels
       - run: other/analysis/run-check-recursion
@@ -116,6 +128,7 @@ jobs:
     steps:
       - run: *apt_install
       - checkout
+      - run: git submodule update --init --recursive
       - run: other/analysis/run-clang-analyze
 
   clang-tidy:
@@ -125,8 +138,12 @@ jobs:
 
     steps:
       - run: *apt_install
-      - run: apt-get install -y --no-install-recommends clang-tidy-12
+      - run:
+          apt-get install -y --no-install-recommends
+            ca-certificates
+            clang-tidy-12
       - checkout
+      - run: git submodule update --init --recursive
       - run: cmake . -B_build -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
       - run:
           other/analysis/run-clang-tidy ||
@@ -140,7 +157,11 @@ jobs:
 
     steps:
       - run: *apt_install
-      - run: apt-get install -y --no-install-recommends python3-pip
+      - run:
+          apt-get install -y --no-install-recommends
+            ca-certificates
+            python3-pip
       - checkout
+      - run: git submodule update --init --recursive
       - run: pip install cpplint
       - run: other/analysis/run-cpplint
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -5,6 +5,7 @@ bazel-opt_task:
     cpu: 2
     memory: 2G
   configure_script:
+    - git submodule update --init --recursive
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
     - cd /src/workspace && bazel test -k
@@ -22,6 +23,7 @@ bazel-dbg_task:
     cpu: 2
     memory: 2G
   configure_script:
+    - git submodule update --init --recursive
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
     - cd /src/workspace && bazel test -k
@@ -39,6 +41,7 @@ bazel-asan_task:
     cpu: 2
     memory: 4G
   configure_script:
+    - git submodule update --init --recursive
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
     - cd /src/workspace && bazel test -k
@@ -57,6 +60,7 @@ bazel-asan_task:
 #    cpu: 2
 #    memory: 4G
 #  configure_script:
+#    - git submodule update --init --recursive
 #    - /src/workspace/tools/inject-repo c-toxcore
 #  test_all_script:
 #    - cd /src/workspace && bazel test -k
@@ -75,6 +79,7 @@ bazel-tsan_task:
     cpu: 2
     memory: 4G
   configure_script:
+    - git submodule update --init --recursive
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
     - cd /src/workspace && bazel test -k
@@ -98,6 +103,7 @@ bazel-valgrind_task:
     cpu: 2
     memory: 4G
   configure_script:
+    - git submodule update --init --recursive
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
     - cd /src/workspace && bazel test -k
@@ -123,6 +129,7 @@ cimple_task:
     cpu: 2
     memory: 4G
   configure_script:
+    - git submodule update --init --recursive
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
     - cd /src/workspace && bazel test -k

diff --git a/.clusterfuzzlite/Dockerfile b/.clusterfuzzlite/Dockerfile
@@ -17,11 +17,6 @@ WORKDIR $SRC/libsodium
 RUN ./autogen.sh && ./configure --enable-shared=no && make install
 WORKDIR $SRC
 
-# msgpack-c
-RUN git clone --depth 1 --branch c_master https://github.com/msgpack/msgpack-c.git msgpack
-WORKDIR $SRC/msgpack
-RUN cmake -DBUILD_SHARED_LIBS=OFF . && make && make install
-
 # Copy your project's source code.
 COPY . $SRC/c-toxcore
 # Working directory for build.sh.

diff --git a/.github/scripts/cmake-android b/.github/scripts/cmake-android
@@ -51,22 +51,6 @@ autoreconf -fi
 make -j"$(nproc)" install
 cd ..
 
-# Build msgpack
-if [ ! -d msgpack-c ]; then
-  git clone --branch=c-4.0.0 https://github.com/msgpack/msgpack-c.git
-fi
-rm -rf msgpack-c/build
-mkdir -p msgpack-c/build
-cd msgpack-c/build
-cmake .. \
-  -DMSGPACK_BUILD_EXAMPLES=OFF \
-  -DCMAKE_TOOLCHAIN_FILE="$NDK/build/cmake/android.toolchain.cmake" \
-  -DANDROID_ABI="$ABI" \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DCMAKE_PREFIX_PATH="$PREFIX"
-cmake --build . --target install
-cd ../..
-
 # Build c-toxcore
 rm -rf _build
 mkdir -p _build

diff --git a/.github/scripts/cmake-osx b/.github/scripts/cmake-osx
@@ -11,7 +11,6 @@ brew install \
   libconfig \
   libsodium \
   libvpx \
-  msgpack \
   opus
 
 . ".github/scripts/flags-clang.sh"

diff --git a/.github/scripts/coverage-linux b/.github/scripts/coverage-linux
@@ -6,7 +6,6 @@ NPROC=$(nproc)
 
 sudo apt-get install -y --no-install-recommends \
   libgtest-dev \
-  libmsgpack-dev \
   libopus-dev \
   libsodium-dev \
   libvpx-dev \

diff --git a/.github/scripts/sonar-prepare b/.github/scripts/sonar-prepare
@@ -4,7 +4,6 @@ set -eu
 
 sudo apt-get install -y --no-install-recommends \
   libconfig-dev \
-  libmsgpack-dev \
   libopus-dev \
   libsodium-dev \
   libvpx-dev \

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Set up Python 3.9
         uses: actions/setup-python@v1
         with:
@@ -52,6 +54,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Run cimplefmt
         run: other/docker/cimplefmt/run -u $(find tox* -name "*.[ch]")
 
@@ -69,13 +73,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Cross compilation
         run: .github/scripts/cmake-win32 script
 
   build-win64:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Cross compilation
         run: .github/scripts/cmake-win64 script
 
@@ -84,33 +92,40 @@ jobs:
     container: toxchat/freebsd
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Build on FreeBSD
         run: .github/scripts/cmake-freebsd-stage2
 
   build-macos:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Build and test
         run: .github/scripts/cmake-osx
 
   coverage-linux:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Build, test, and upload coverage
         run: .github/scripts/coverage-linux
 
   build-tcc:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Install dependencies
         run:
           sudo apt-get install -y --no-install-recommends
             tcc
             libconfig-dev
-            libmsgpack-dev
             libopus-dev
             libsodium-dev
             libvpx-dev
@@ -128,7 +143,8 @@ jobs:
             toxcore/*.c
             toxcore/*/*.c
             toxencryptsave/*.c
-            $(pkg-config --cflags --libs libsodium msgpack opus vpx)
+            third_party/cmp/*.c
+            $(pkg-config --cflags --libs libsodium opus vpx)
       - name: Run the test
         run: "./send_message_test | grep 'tox clients connected'"
       - name: Build amalgamation file with TCC
@@ -141,7 +157,7 @@ jobs:
             -o send_message_test
             -Wall -Werror
             -bench -g
-            $(pkg-config --cflags --libs libsodium msgpack opus vpx)
+            $(pkg-config --cflags --libs libsodium opus vpx)
       - name: Run the test again
         run: "./send_message_test | grep 'tox clients connected'"
 
@@ -150,6 +166,8 @@ jobs:
     container: toxchat/compcert
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Build with CompCert
         run:
           ccomp
@@ -166,15 +184,18 @@ jobs:
             toxcore/*.c
             toxcore/*/*.c
             toxencryptsave/*.c
+            third_party/cmp/*.c
             -D__COMPCERT__ -DDISABLE_VLA -Dinline=
-            -lpthread $(pkg-config --cflags --libs libsodium msgpack opus vpx)
+            -lpthread $(pkg-config --cflags --libs libsodium opus vpx)
       - name: Run the test
         run: "./send_message_test | grep 'tox clients connected'"
 
   build-android:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - run: .github/scripts/cmake-android armeabi-v7a
       - run: .github/scripts/cmake-android arm64-v8a
       - run: .github/scripts/cmake-android x86

diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
@@ -9,11 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Install libraries
         run:
           sudo apt-get update &&
           sudo apt-get install -y --no-install-recommends
-            libmsgpack-dev
             libopus-dev
             libsodium-dev
             libvpx-dev

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -17,6 +17,8 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Docker Build
         run: .github/scripts/tox-bootstrapd-docker local
       - name: Push latest image to DockerHub

diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml
@@ -17,6 +17,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+          submodules: recursive
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "third_party/cmp"]
+	path = third_party/cmp
+	url = https://github.com/TokTok/cmp