profiling: update build script to cross compiling 32 bit on 64 bit linux

Author: taegyunkim

build-profiling-ffi.sh

@@ -19,16 +19,17 @@ ARG_FEATURES=""
 run_tests=true
 
 usage() {
-    echo "Usage: `basename "$0"` [-h] [-f FEATURES] [-T] dest-dir"
+    echo "Usage: `basename "$0"` [-h] [-f FEATURES] [-t TRIPLET] [-T] dest-dir"
     echo
     echo "Options:"
     echo "  -h          This help text"
     echo "  -f FEATURES Enable specified features (comma separated if more than one)"
+    echo "  -t TRIPLET  Target triplet to build for, defaults to host triplet"
     echo "  -T          Skip checks after building"
     exit $1
 }
 
-while getopts f:hT flag
+while getopts f:ht:T flag
 do
     case "${flag}" in
         f)
@@ -39,6 +40,11 @@ do
         h)
             usage 0
             ;;
+        t)
+            target=${OPTARG}
+            shift
+            shift
+            ;;
         T)
             run_tests=false
             shift
@@ -59,7 +65,9 @@ fi
 mkdir -v -p "$destdir/include/datadog" "$destdir/lib/pkgconfig" "$destdir/cmake"
 
 version=$(awk -F\" '$1 ~ /^version/ { print $2 }' < profiling-ffi/Cargo.toml)
-target="$(rustc -vV | awk '/^host:/ { print $2 }')"
+if [ -z ${target+x} ]; then
+    target="$(rustc -vV | awk '/^host:/ { print $2 }')"
+fi
 shared_library_suffix=".so"
 static_library_suffix=".a"
 library_prefix="lib"
@@ -77,7 +85,7 @@ symbolizer=0
 # provided. At least on Alpine, libgcc_s may not even exist in the users'
 # images, so -static-libgcc is recommended there.
 case "$target" in
-    "x86_64-alpine-linux-musl"|"aarch64-alpine-linux-musl")
+  "x86_64-alpine-linux-musl"|"aarch64-alpine-linux-musl"|"i686-alpine-linux-musl")
         expected_native_static_libs=" -lssp_nonshared -lgcc_s -lc"
         native_static_libs=" -lssp_nonshared -lc"
         # on alpine musl, Rust adds some weird runpath to cdylibs
@@ -94,7 +102,7 @@ case "$target" in
         fix_macos_rpath=1
         ;;
 
-    "x86_64-unknown-linux-gnu"|"aarch64-unknown-linux-gnu")
+    "x86_64-unknown-linux-gnu"|"aarch64-unknown-linux-gnu"|"i686-unknown-linux-gnu")
         expected_native_static_libs=" -ldl -lrt -lpthread -lgcc_s -lc -lm -lrt -lpthread -lutil -ldl -lutil"
         native_static_libs=" -ldl -lrt -lpthread -lc -lm -lrt -lpthread -lutil -ldl -lutil"
         symbolizer=1
@@ -246,7 +254,7 @@ if [[ "$symbolizer" -eq 1 ]]; then
     # Copy the blazesym header separately because The blazesym header isn't auto-generated by cbindgen
     # so we don't need to remove definitions that are already present in `common.h` using dedup_headers
     cp "$CARGO_TARGET_DIR/include/datadog/blazesym.h" "$destdir/include/datadog/blazesym.h"
-fi 
+fi
 
 
 # Don't build the crashtracker on windows
@@ -260,7 +268,13 @@ if [[ "$target" != "x86_64-pc-windows-msvc" ]]; then
     [ -d $CRASHTRACKER_BUILD_DIR ] && rm -r $CRASHTRACKER_BUILD_DIR
     mkdir -p $CRASHTRACKER_BUILD_DIR
     cd $CRASHTRACKER_BUILD_DIR
-    cmake -S $CRASHTRACKER_SRC_DIR -DDatadog_ROOT=$ABS_DESTDIR
+
+    if [[ "$target" =~ ^i686 ]]; then
+        CFLAGS=-m32 CXXFLAGS=-m32 cmake -S $CRASHTRACKER_SRC_DIR -DDatadog_ROOT=$ABS_DESTDIR
+    else
+        cmake -S $CRASHTRACKER_SRC_DIR -DDatadog_ROOT=$ABS_DESTDIR
+    fi
+
     cmake --build .
     mkdir -p $ABS_DESTDIR/bin
     cp libdatadog-crashtracking-receiver $ABS_DESTDIR/bin

ddcommon/src/rate_limiter.rs

@@ -54,7 +54,7 @@ fn now() -> u64 {
             tv_nsec: 0,
         };
         unsafe { libc::clock_gettime(libc::CLOCK_MONOTONIC, &mut ts) };
-        (ts.tv_sec * TIME_PER_SECOND + ts.tv_nsec) as u64
+        (ts.tv_sec as i64 * TIME_PER_SECOND + ts.tv_nsec as i64) as u64
     };
     now
 }