Merge pull request IntelRealSense#7983 from ev-mp/K5_PR

Kernel 5 performance improvements
isl-org · Dec 14, 2020 · 9ac1dd4 · 9ac1dd4
2 parents 9f075b4 + cf8f93c
commit 9ac1dd4
Show file tree

Hide file tree

Showing 17 changed files with 1,315 additions and 231 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -58,7 +58,7 @@ matrix:
       env: RS_CPP_TEST=true
       script:
         - cmake .. -DBUILD_UNIT_TESTS=true -DBUILD_EXAMPLES=false -DBUILD_WITH_TM2=false -DCHECK_FOR_UPDATES=true
-        - cmake --build . --config $LRS_RUN_CONFIG -- -j4
+        - cmake --build . --config $LRS_RUN_CONFIG -- -j$(($(nproc)-1))
         - ./unit-tests/live-test -d yes -i [software-device]
         - for i in ./records/single_cam/*; do ./unit-tests/live-test -d yes -i ~[multicam] from "$i"; done
         - for i in ./records/multi_cam/*; do ./unit-tests/live-test -d yes -i [multicam] from "$i"; done
@@ -71,7 +71,7 @@ matrix:
       script:
         - cd ../scripts && ./pr_check.sh && cd ../build
         - cmake .. -DBUILD_UNIT_TESTS=true -DBUILD_EXAMPLES=true -DBUILD_WITH_TM2=true -DBUILD_SHARED_LIBS=false -DCHECK_FOR_UPDATES=true -DBUILD_PYTHON_BINDINGS=true -DPYBIND11_PYTHON_VERSION=3.5
-        - cmake --build . --config $LRS_BUILD_CONFIG -- -j4
+        - cmake --build . --config $LRS_BUILD_CONFIG -- -j$(($(nproc)-1))
         - python3 ../unit-tests/run-unit-tests.py --verbose .
 
     - name: "Linux - python & nodejs"
@@ -85,7 +85,7 @@ matrix:
       script:
         - python ../wrappers/nodejs/tools/enums.py -i ../include/librealsense2 -a ../wrappers/nodejs/src -v
         - cmake .. -DBUILD_PYTHON_BINDINGS=true -DBUILD_NODEJS_BINDINGS=true -DPYBIND11_PYTHON_VERSION=2.7 -DCHECK_FOR_UPDATES=true
-        - cmake --build . --config $LRS_BUILD_CONFIG -- -j4
+        - cmake --build . --config $LRS_BUILD_CONFIG -- -j$(($(nproc)-1))
         - cd ../wrappers/nodejs/
         - npm install
         - cd test
@@ -98,7 +98,7 @@ matrix:
       osx_image: xcode7
       script:
         - cmake .. -DBUILD_EXAMPLES=true -DBUILD_WITH_OPENMP=false -DHWM_OVER_XU=false -DCHECK_FOR_UPDATES=true
-        - cmake --build . --config $LRS_BUILD_CONFIG -- -j4
+        - cmake --build . --config $LRS_BUILD_CONFIG -- -j$(($(nproc)-1))
         - ls
 
     - name: "Android - cpp"
@@ -108,8 +108,8 @@ matrix:
       dist: xenial
       env: LRS_BUILD_ANDROID=true
       script:
-        - cmake .. -DCMAKE_TOOLCHAIN_FILE=../android-ndk-r16b/build/cmake/android.toolchain.cmake  -DCHECK_FOR_UPDATES=true
-        - cmake --build . --config $LRS_BUILD_CONFIG -- -j4
+        - cmake .. -DCMAKE_TOOLCHAIN_FILE=../android-ndk-r20b/build/cmake/android.toolchain.cmake  -DCHECK_FOR_UPDATES=true
+        - cmake --build . --config $LRS_BUILD_CONFIG -- -j$(($(nproc)-1))
         - ls
 
 before_install:
@@ -126,8 +126,8 @@ before_install:
       export PATH=$OLDPATH && unset OLDPATH && cd ../../;
     fi
   - if [[ "$LRS_BUILD_ANDROID" == "true" ]]; then
-      wget https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip;
-      unzip -q android-ndk-r16b-linux-x86_64.zip -d ./;
+      wget https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip;
+      unzip -q android-ndk-r20b-linux-x86_64.zip -d ./;
     fi
   - mkdir build && cd build
   - if [[ "$RS_CPP_TEST" == "true" ]]; then

diff --git a/common/calibration-model.cpp b/common/calibration-model.cpp
@@ -123,7 +123,7 @@ namespace helpers
             oldcrc32 = UPDC32(*buf, oldcrc32);
         return ~oldcrc32;
     }
-};
+}
 
 void calibration_model::update(ux_window& window, std::string& error_message)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,7 +123,7 @@ namespace helpers @@
                 oldcrc32 = UPDC32(*buf, oldcrc32);
             return ~oldcrc32;
         }
-    };
+    }
     void calibration_model::update(ux_window& window, std::string& error_message)
     {
@@ Expand Down @@