X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=genbindings.sh;h=533ee7c1722f13fe405f53790a45203bab22b471;hp=fd797d7978e08e3702f98fb1a70d5d44de9463b9;hb=HEAD;hpb=c14513fd07359c39e2e27c2e7d475ca522f03db5 diff --git a/genbindings.sh b/genbindings.sh index fd797d7..bc2e073 100755 --- a/genbindings.sh +++ b/genbindings.sh @@ -9,6 +9,18 @@ if [ ! -d "$1/lightning" -o "$2" != "true" -a "$2" != "false" ]; then exit 1 fi +SKIP_TESTS_ARGUMENT=$3 +RUN_CPP_TESTS=true + +if [ ! -z "$SKIP_TESTS_ARGUMENT" ]; then + if [ "$SKIP_TESTS_ARGUMENT" != "skip-tests" ]; then + echo "To skip tests, usage must be: $0 path-to-rust-lightning allow-std skip-tests" + exit 1 + else + RUN_CPP_TESTS=false + fi +fi + export LC_ALL=C # On reasonable systems, we can use realpath here, but OSX is a diva with 20-year-old software. @@ -317,58 +329,77 @@ export IFS="$OLD_IFS" set -x mv include/lightningpp_new.hpp include/lightningpp.hpp -# Finally, sanity-check the generated C and C++ bindings with demo apps: -# Naively run the C demo app: -gcc $LOCAL_CFLAGS -Wall -g -pthread demo.c target/debug/libldk.a -ldl -lm -./a.out - -# And run the C++ demo app -if [ "$2" = "true" ]; then - g++ $LOCAL_CFLAGS -std=c++11 -Wall -g -pthread demo.cpp -Ltarget/debug/ -lldk -ldl - LD_LIBRARY_PATH=target/debug/ ./a.out > /dev/null -fi - -# Finally, run the C++ demo app with our native networking library -# in valgrind to test memory model correctness and lack of leaks. -gcc $LOCAL_CFLAGS -fPIC -std=c99 -Wall -g -pthread -I../ldk-net ../ldk-net/ldk_net.c -c -o ldk_net.o -if [ "$2" = "true" ]; then - g++ $LOCAL_CFLAGS -std=c++11 -Wall -g -pthread -DREAL_NET -I../ldk-net ldk_net.o demo.cpp target/debug/libldk.a -ldl -lm - if [ -x "`which valgrind`" -a "$(uname -m)" != "ppc64le" ]; then - valgrind --error-exitcode=4 --memcheck:leak-check=full --show-leak-kinds=all ./a.out - echo - else - echo "WARNING: Please install valgrind for more testing" - ./a.out - fi -fi - +if $RUN_CPP_TESTS; then + # Finally, sanity-check the generated C and C++ bindings with demo apps: + # Naively run the C demo app: + gcc $LOCAL_CFLAGS -Wall -g -pthread demo.c target/debug/libldk.a -ldl -lm + ./a.out + + # And run the C++ demo app + if [ "$2" = "true" ]; then + g++ $LOCAL_CFLAGS -std=c++11 -Wall -g -pthread demo.cpp -Ltarget/debug/ -lldk -ldl + LD_LIBRARY_PATH=target/debug/ ./a.out > /dev/null + fi + + # Finally, run the C++ demo app with our native networking library + # in valgrind to test memory model correctness and lack of leaks. + gcc $LOCAL_CFLAGS -fPIC -std=c99 -Wall -g -pthread -I../ldk-net ../ldk-net/ldk_net.c -c -o ldk_net.o + if [ "$2" = "true" ]; then + g++ $LOCAL_CFLAGS -std=c++11 -Wall -g -pthread -DREAL_NET -I../ldk-net ldk_net.o demo.cpp target/debug/libldk.a -ldl -lm + if [ -x "`which valgrind`" -a "$(uname -m)" != "ppc64le" ]; then + valgrind --error-exitcode=4 --memcheck:leak-check=full --show-leak-kinds=all ./a.out + echo + else + echo "WARNING: Please install valgrind for more testing" + ./a.out + fi + fi + + + # Test a statically-linked C++ version, tracking the resulting binary size and runtime + # across debug, LTO, and cross-language LTO builds (using the same compiler each time). + if [ "$2" = "true" ]; then + clang++ $LOCAL_CFLAGS -std=c++11 demo.cpp target/debug/libldk.a -ldl + strip ./a.out + time ./a.out + echo " C++ Bin size and runtime w/o optimization:" + ls -lha a.out + fi -# Test a statically-linked C++ version, tracking the resulting binary size and runtime -# across debug, LTO, and cross-language LTO builds (using the same compiler each time). -if [ "$2" = "true" ]; then - clang++ $LOCAL_CFLAGS -std=c++11 demo.cpp target/debug/libldk.a -ldl - strip ./a.out - time ./a.out - echo " C++ Bin size and runtime w/o optimization:" - ls -lha a.out +else + echo "Skipping tests!" fi function REALLY_PIN_CC { # -Zbuild-std fails if we have any dependencies of build-deps, which # cc added in 1.0.80, thus we pin back to 1.0.79 to avoid that. cargo update -p cc --precise "1.0.79" --verbose - ( cargo build --features=std -v --release -Zbuild-std=std,panic_abort > /dev/null 2>&1 ) || echo -n - ( cargo build --features=std -v --release --target aarch64-apple-darwin -Zbuild-std=std,panic_abort > /dev/null 2>&1 ) || echo -n + ( RUSTC_BOOTSTRAP=1 cargo build --features=std -v --release --target x86_64-apple-darwin -Zbuild-std=std,panic_abort > /dev/null 2>&1 ) || echo -n + ( RUSTC_BOOTSTRAP=1 cargo build --features=std -v --release --target aarch64-apple-darwin -Zbuild-std=std,panic_abort > /dev/null 2>&1 ) || echo -n + pushd ../deterministic-build-wrappers/compiler-builtins-dummy + cargo build > /dev/null 2>&1 || echo -n + popd # Sadly, std also depends on cc, and we can't pin it in that tree # directly. Instead, we have to delete the file out of the cargo # registry and build --offline to avoid it using the latest version. NEW_CC_DEP="$CARGO_HOME" [ "$NEW_CC_DEP" = "" ] && NEW_CC_DEP="$HOME" - if [ -f "$NEW_CC_DEP/.cargo/registry/cache/github.com-"*/cc-1.0.79.crate ]; then - mv "$NEW_CC_DEP/.cargo/registry/cache/github.com-"*/cc-1.0.79.crate ./ + [ -d "$NEW_CC_DEP/.cargo/registry/cache/"github.com-* ] && CARGO_REGISTRY_CACHE="$(echo "$NEW_CC_DEP/.cargo/registry/cache/"github.com-*)" + [ -d "$NEW_CC_DEP/.cargo/registry/cache/"index.crates.io-* ] && CARGO_REGISTRY_CACHE="$(echo "$NEW_CC_DEP/.cargo/registry/cache/"index.crates.io-*)" + if [ -d "$CARGO_REGISTRY_CACHE" ]; then + if [ -f "$CARGO_REGISTRY_CACHE/compiler_builtins-0.1.109.crate" ]; then + mv "$CARGO_REGISTRY_CACHE/compiler_builtins-0.1.109.crate" ./ + fi + if [ -f "$CARGO_REGISTRY_CACHE/cc-1.0.79.crate" ]; then + mv "$CARGO_REGISTRY_CACHE/cc-1.0.79.crate" ./ + fi + rm -f "$CARGO_REGISTRY_CACHE/"cc-*.crate + [ -f ./cc-1.0.79.crate ] && mv ./cc-1.0.79.crate "$CARGO_REGISTRY_CACHE/" + rm -f "$CARGO_REGISTRY_CACHE/"compiler_builtins-0.1.11*.crate + [ -f ./compiler_builtins-0.1.109.crate ] && mv ./compiler_builtins-0.1.109.crate "$CARGO_REGISTRY_CACHE/" + else + echo "Couldn't find cargo cache, build-std builds are likely to fail!" fi - rm -f "$NEW_CC_DEP/.cargo/registry/cache/github.com-"*/cc-*.crate - [ -f ./cc-1.0.79.crate ] && mv ./cc-1.0.79.crate "$NEW_CC_DEP/.cargo/registry/cache/github.com-"*/ } # Then, check with memory sanitizer, if we're on Linux and have rustc nightly @@ -491,20 +522,23 @@ if [ "$HOST_PLATFORM" = "x86_64-unknown-linux-gnu" ]; then RUSTFLAGS="$RUSTFLAGS --cfg=test_mod_pointers" RUSTC_BOOTSTRAP=1 cargo rustc $CARGO_BUILD_ARGS -v -- -Zsanitizer=address -Cforce-frame-pointers=yes || ( mv Cargo.toml.bk Cargo.toml; exit 1) mv Cargo.toml.bk Cargo.toml - # First the C demo app... - $CLANG $LOCAL_CFLAGS -fsanitize=address -g demo.c target/debug/libldk.a -ldl - ASAN_OPTIONS='detect_leaks=1 detect_invalid_pointer_pairs=1 detect_stack_use_after_return=1' ./a.out + # Sadly, address sanitizer appears to have had some regression on Debian and now fails to + # get past its init stage, so we disable it for now. - if [ "$2" = "true" ]; then - # ...then the C++ demo app - $CLANGPP $LOCAL_CFLAGS -std=c++11 -fsanitize=address -g demo.cpp target/debug/libldk.a -ldl - ASAN_OPTIONS='detect_leaks=1 detect_invalid_pointer_pairs=1 detect_stack_use_after_return=1' ./a.out >/dev/null - - # ...then the C++ demo app with the ldk_net network implementation - $CLANG $LOCAL_CFLAGS -fPIC -fsanitize=address -g -I../ldk-net ../ldk-net/ldk_net.c -c -o ldk_net.o - $CLANGPP $LOCAL_CFLAGS -std=c++11 -fsanitize=address -g -DREAL_NET -I../ldk-net ldk_net.o demo.cpp target/debug/libldk.a -ldl - ASAN_OPTIONS='detect_leaks=1 detect_invalid_pointer_pairs=1 detect_stack_use_after_return=1' ./a.out >/dev/null - fi + # First the C demo app... + #$CLANG $LOCAL_CFLAGS -fsanitize=address -g demo.c target/debug/libldk.a -ldl + #ASAN_OPTIONS='detect_leaks=1 detect_invalid_pointer_pairs=1 detect_stack_use_after_return=1' ./a.out + + #if [ "$2" = "true" ]; then + # # ...then the C++ demo app + # $CLANGPP $LOCAL_CFLAGS -std=c++11 -fsanitize=address -g demo.cpp target/debug/libldk.a -ldl + # ASAN_OPTIONS='detect_leaks=1 detect_invalid_pointer_pairs=1 detect_stack_use_after_return=1' ./a.out >/dev/null + + # # ...then the C++ demo app with the ldk_net network implementation + # $CLANG $LOCAL_CFLAGS -fPIC -fsanitize=address -g -I../ldk-net ../ldk-net/ldk_net.c -c -o ldk_net.o + # $CLANGPP $LOCAL_CFLAGS -std=c++11 -fsanitize=address -g -DREAL_NET -I../ldk-net ldk_net.o demo.cpp target/debug/libldk.a -ldl + # ASAN_OPTIONS='detect_leaks=1 detect_invalid_pointer_pairs=1 detect_stack_use_after_return=1' ./a.out >/dev/null + #fi else echo "WARNING: Please install clang-$RUSTC_LLVM_V and clang++-$RUSTC_LLVM_V to build with address sanitizer" fi @@ -552,6 +586,7 @@ fi EXTRA_TARGETS=( $LDK_C_BINDINGS_EXTRA_TARGETS ) EXTRA_CCS=( $LDK_C_BINDINGS_EXTRA_TARGET_CCS ) +EXTRA_LINK_LTO=( $LDK_C_BINDINGS_EXTRA_TARGET_LINK_LTO ) if [ ${#EXTRA_TARGETS[@]} != ${#EXTRA_CCS[@]} ]; then echo "LDK_C_BINDINGS_EXTRA_TARGETS and LDK_C_BINDINGS_EXTRA_TARGET_CCS didn't have the same number of elements!" @@ -562,7 +597,15 @@ for IDX in ${!EXTRA_TARGETS[@]}; do EXTRA_ENV_TARGET=$(echo "${EXTRA_TARGETS[$IDX]}" | sed 's/-/_/g') export CFLAGS_$EXTRA_ENV_TARGET="$BASE_CFLAGS" export CC_$EXTRA_ENV_TARGET=${EXTRA_CCS[$IDX]} - RUSTFLAGS="$BASE_RUSTFLAGS -C embed-bitcode=yes -C lto -C linker=${EXTRA_CCS[$IDX]}" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target "${EXTRA_TARGETS[$IDX]}" + EXTRA_RUSTFLAGS="" + case "$EXTRA_ENV_TARGET" in + "x86_64"*) + export CFLAGS_$EXTRA_ENV_TARGET="$BASE_CFLAGS -march=sandybridge -mtune=sandybridge" + EXTRA_RUSTFLAGS="-C target-cpu=sandybridge" + ;; + esac + [ "${EXTRA_LINK_LTO[$IDX]}" != "" ] && EXTRA_RUSTFLAGS="-C linker-plugin-lto" + RUSTFLAGS="$BASE_RUSTFLAGS -C embed-bitcode=yes -C lto -C linker=${EXTRA_CCS[$IDX]} $EXTRA_RUSTFLAGS" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target "${EXTRA_TARGETS[$IDX]}" done if [ "$CLANGPP" != "" -a "$LLD" != "" ]; then