# HG changeset patch # User Giulio Moro # Date 1466555095 -3600 # Node ID b6eb94378ca9e191e968fe7b60bedee318b953a7 # Parent 04212032c7796fd87d5689f1a38cbe162f66d172 update_board diff -r 04212032c779 -r b6eb94378ca9 core/default_libpd_render.cpp --- a/core/default_libpd_render.cpp Wed Jun 22 01:17:57 2016 +0100 +++ b/core/default_libpd_render.cpp Wed Jun 22 01:24:55 2016 +0100 @@ -35,6 +35,7 @@ //TODO: remove this function void libpdReadFilesLoop(){ + return; while(!gShouldStop){ // check for modified sockets/file descriptors // (libpd would normally do this every block WITHIN the audio thread) diff -r 04212032c779 -r b6eb94378ca9 scripts/hvresources/HvUtils.h --- a/scripts/hvresources/HvUtils.h Wed Jun 22 01:17:57 2016 +0100 +++ b/scripts/hvresources/HvUtils.h Wed Jun 22 01:24:55 2016 +0100 @@ -42,6 +42,7 @@ #include #include #define hv_size_t size_t +#define hv_uint64_t uint64_t #define hv_uint32_t uint32_t #define hv_int32_t int32_t #define hv_uint16_t uint16_t @@ -172,8 +173,7 @@ #define hv_malloc(_n) memalign(16, _n) #define hv_free(x) free(x) #else - //#define hv_malloc(_n) aligned_alloc(16, _n) - #define hv_malloc(_n) memalign(16, _n) + #define hv_malloc(_n) aligned_alloc(16, _n) #define hv_free(x) free(x) #endif #else // HV_SIMD_NONE @@ -261,9 +261,10 @@ #define HV_SPINLOCK_ACQUIRE(_x) \ while (InterlockedCompareExchange(&_x, true, false)) { } #define HV_SPINLOCK_RELEASE(_x) (_x = false) -#elif defined(__has_include) -#if __has_include() +#elif __cplusplus || __has_include() +#if !__cplusplus #include +#endif #define hv_atomic_bool volatile atomic_bool #define HV_SPINLOCK_ACQUIRE(_x) \ bool expected = false; \ @@ -274,11 +275,5 @@ #define HV_SPINLOCK_ACQUIRE(_x) _x = true; #define HV_SPINLOCK_RELEASE(_x) _x = false; #endif -#else -#define hv_atomic_bool volatile bool -#define HV_SPINLOCK_ACQUIRE(_x) _x = true; -#define HV_SPINLOCK_RELEASE(_x) _x = false; -#endif - #endif // _HEAVY_UTILS_H_ diff -r 04212032c779 -r b6eb94378ca9 scripts/hvresources/uploader.py --- a/scripts/hvresources/uploader.py Wed Jun 22 01:17:57 2016 +0100 +++ b/scripts/hvresources/uploader.py Wed Jun 22 01:24:55 2016 +0100 @@ -7,6 +7,7 @@ import requests import shutil import stat +import sys import tempfile import time import urlparse @@ -149,7 +150,7 @@ except Exception as e: print "{0}Error:{1} {2}".format(Colours.red, Colours.end, e) shutil.rmtree(temp_dir) # clean up the temporary directory - return + sys.exit(1) post_data["name"] = args.name @@ -271,7 +272,7 @@ for i,x in enumerate(r_json["errors"]): print "{3}) {0}Error:{1} {2}".format( Colours.red, Colours.end, x["detail"], i+1) - return + sys.exit(2) # retrieve all requested files for i,g in enumerate(args.gen): @@ -315,6 +316,7 @@ print "Job URL:", reply_json["data"]["links"]["self"] print "Total request time: {0}ms".format(int(1000.0*(time.time()-tick))) print "Heavy version:", reply_json["meta"]["version"] + sys.exit(0) # success! def __get_file_url_for_generator(json_api, g): """Returns the file link for a specific generator. diff -r 04212032c779 -r b6eb94378ca9 scripts/update_board --- a/scripts/update_board Wed Jun 22 01:17:57 2016 +0100 +++ b/scripts/update_board Wed Jun 22 01:24:55 2016 +0100 @@ -188,12 +188,12 @@ if [ $UPDATE_IDE -eq 1 ] then [ $ALWAYS_YES -eq 0 ] && ALWAYS_YES_FLAG= || ALWAYS_YES_FLAG="-y" - [ $FULL -eq 1 ] && NO_FRILLS_FLAG= || NO_FRILLS_FLAG="--no-frills" ls $IDE_FOLDER/scripts/update_IDE >/dev/null 2>/dev/null if [ $? -eq 0 ] then export BBB_ADDRESS BBB_BELA_HOME - cd $IDE_FOLDER/scripts && ./update_IDE $ALWAYS_YES_FLAG $NO_FRILLS_FLAG + cd $IDE_FOLDER/scripts && ./update_IDE $ALWAYS_YES_FLAG --no-frills + # The IDE is restarted by the update_IDE script else # run the IDE @@ -207,7 +207,7 @@ fi [ $FULL -eq 1 ] && ssh $BBB_ADDRESS make -C $BBB_BELA_HOME --no-print-directory idestartup nostartup && printf "The board will now run the IDE at startup, but startup of the Bela program has been disabled.\nTo enable it, use the set_startup.sh script.\nTo control the ide use the ide.sh script\n" -[ $ALWAYS_YES -eq 1 ] && printf "\nSetup complete.\n\n" || { +[ $ALWAYS_YES -eq 1 ] && printf "\nCore setup complete.\n\n" || { printf '\nSetup complete, press any key to continue . . .\n\n' read }