message
stringlengths
6
474
diff
stringlengths
8
5.22k
"set development target to xxxx" in line 45 should be commented out That is not executable code :)
@@ -42,7 +42,7 @@ make HOST_CC="gcc -std=c99" CROSS="$ISDKP" TARGET_FLAGS="$ISDKF" TARGET=arm64 TA # add simulator support ISDK=$IXCODE/Platforms/iPhoneSimulator.platform/Developer ISDKVER=iPhoneSimulator.sdk -set development target to 8.0 +# set development target to 9.0 DEVTAR=9.0 ISDKP=/usr/bin/
qp calculation for frame
@@ -266,7 +266,7 @@ static INLINE double calculate_weights(encoder_state_t* const state, const int l return total_weight; } -// TODO: Missing QP calculation + void estimatePicLambda(encoder_state_t * const state) { double bits = pic_allocate_bits(state); const int layer = state->frame->gop_offset - (state->frame->is_irap ? 1 : 0); @@ -341,6 +341,7 @@ void estimatePicLambda(encoder_state_t * const state) { } state->frame->lambda = estLambda; + state->frame->QP = lambda_to_qp(estLambda); }
build: adding deprecation message alongside compile-time warnings
@@ -148,13 +148,13 @@ const char * liquid_error_info(liquid_error_code _code); LIQUID_DEFINE_COMPLEX(float, liquid_float_complex); LIQUID_DEFINE_COMPLEX(double, liquid_double_complex); -// external compile-time deprecation warnings +// external compile-time deprecation warnings with messages #ifdef __GNUC__ -# define DEPRECATED(X) X __attribute__((deprecated)) +# define DEPRECATED(MSG,X) X __attribute__((deprecated (MSG))) #elif defined(_MSC_VER) -# define DEPRECATED(X) __declspec(deprecated) X +# define DEPRECATED(MSG,X) __declspec(deprecated) X #else -# define DEPRECATED(X) X +# define DEPRECATED(MSG,X) X #endif // @@ -963,7 +963,7 @@ int EQLMS(_copy_coefficients)(EQLMS() _q, \ /* Get equalizer's internal coefficients */ \ /* _q : filter object */ \ /* _w : pointer to output coefficients array [size: _n x 1] */ \ -DEPRECATED( \ +DEPRECATED("use eqlms_xxxt_copy_coefficients(...) instead", \ void EQLMS(_get_weights)(EQLMS() _q, \ T * _w) \ ); \ @@ -1032,7 +1032,7 @@ int EQLMS(_step_blind)(EQLMS() _q, \ /* _x : received sample vector,[size: _n x 1] */ \ /* _d : desired output vector, [size: _n x 1] */ \ /* _n : input, output vector length */ \ -DEPRECATED( \ +DEPRECATED("method provides complexity with little benefit", \ int EQLMS(_train)(EQLMS() _q, \ T * _w, \ T * _x, \ @@ -5446,7 +5446,7 @@ int gmskframegen_write(gmskframegen _q, // write samples of assembled frame // _q : frame generator object // _buf : output buffer [size: k x 1] -DEPRECATED( +DEPRECATED("use gmskframegen_write(...) instead", int gmskframegen_write_samples(gmskframegen _q, liquid_float_complex * _buf) ); @@ -5487,9 +5487,12 @@ int gmskframesync_reset_framedatastats(gmskframesync _q); framedatastats_s gmskframesync_get_framedatastats (gmskframesync _q); // debug methods -DEPRECATED( int gmskframesync_debug_enable(gmskframesync _q) ); -DEPRECATED( int gmskframesync_debug_disable(gmskframesync _q) ); -DEPRECATED( int gmskframesync_debug_print(gmskframesync _q, const char * _filename) ); +DEPRECATED("debug methods add complexity and provide little value", + int gmskframesync_debug_enable(gmskframesync _q) ); +DEPRECATED("debug methods add complexity and provide little value", + int gmskframesync_debug_disable(gmskframesync _q) ); +DEPRECATED("debug methods add complexity and provide little value", + int gmskframesync_debug_print(gmskframesync _q, const char * _filename) ); //
fixed len of MAC vendor
@@ -45,7 +45,7 @@ cbhdr->total_length = CB_SIZE; memcpy(cbhdr->pen, &hcxmagic, 4); memcpy(cbhdr->hcxm, &hcxmagic, 32); -cblen += addoption(cb +cblen, OPTIONCODE_MACMYORIG, 3, (char*)macorig); +cblen += addoption(cb +cblen, OPTIONCODE_MACMYORIG, 6, (char*)macorig); cblen += addoption(cb +cblen, OPTIONCODE_MACMYAP, 6, (char*)macap); of = (optionfield64_t*)(cb +cblen); of->option_code = OPTIONCODE_RC;
OcDevicePathLib: Fix potential OOB access
@@ -160,7 +160,7 @@ TrailedBooterDevicePath ( && IsDevicePathEnd (NextDevicePathNode (DevicePathWalker))) { FilePath = (FILEPATH_DEVICE_PATH *) DevicePathWalker; Length = OcFileDevicePathNameLen (FilePath); - + if (Length > 0) { if (FilePath->PathName[Length - 1] == L'\\') { // // Already appended, good. It should never be true with Apple entries though. @@ -196,6 +196,7 @@ TrailedBooterDevicePath ( return NewDevicePath; } } + } DevicePathWalker = NextDevicePathNode (DevicePathWalker); }
dma: change of ioat device init functions signature
@@ -41,8 +41,7 @@ static inline struct ioat_dma_device *dma_device_to_ioat(struct dma_device *dev) * errval on error */ errval_t ioat_dma_device_init(struct capref mmio, - struct pci_addr *pci_addr, - bool iommu_present, + struct iommu_client *cl, struct ioat_dma_device **dev); /**
[python] fix bug when creation of temp directory on windows returns lowercase path (sync with upstream) DEVTOOLS-4496https://bugs.python.org/issue14255https://hg.python.org/cpython/rev/d5a9a1ba47ee
@@ -188,7 +188,7 @@ def _get_default_tempdir(): for dir in dirlist: if dir != _os.curdir: - dir = _os.path.normcase(_os.path.abspath(dir)) + dir = _os.path.abspath(dir) # Try only a few names per directory. for seq in xrange(100): name = namer.next()
Changelog for 4.2.2RC1
+CARTO Mobile SDK 4.2.2RC1 +------------------- + +### Changes/fixes: + +* Additional synchronization for iOS events to prevent potential GL calls while app is paused +* Fixed wrong rendering of vector tile labels using 'point-placement' mode +* Fixed vector tile label transformation handling +* Speed and memory usage optimizations for vector tile labels +* Minor improvements to CartoCSS error reporting + + CARTO Mobile SDK 4.2.1 -------------------
CMakeLists: bump version to v9.1.0 Added more ERC20 tokens
@@ -89,9 +89,9 @@ endif() # # Versions MUST contain three parts and start with lowercase 'v'. # Example 'v1.0.0'. They MUST not contain a pre-release label such as '-beta'. -set(FIRMWARE_VERSION "v9.0.0") -set(FIRMWARE_BTC_ONLY_VERSION "v9.0.0") -set(FIRMWARE_BITBOXBASE_VERSION "v9.0.0") +set(FIRMWARE_VERSION "v9.1.0") +set(FIRMWARE_BTC_ONLY_VERSION "v9.1.0") +set(FIRMWARE_BITBOXBASE_VERSION "v9.1.0") set(BOOTLOADER_VERSION "v1.0.2") find_package(PythonInterp 3.6 REQUIRED)
Update IoT Esp32 sample readme with latest versions verified
@@ -30,7 +30,7 @@ This is a "to-the-point" guide outlining how to run an Azure SDK for Embedded C - Configuration instructions for the Arduino IDE to compile a sample using the [Azure SDK for Embedded C](https://github.com/Azure/azure-sdk-for-c). - Configuration, build, and run instructions for the IoT Hub telemetry sample. -_The following was run on Windows 10 and Ubuntu Desktop 20.04 environments, with Arduino IDE 1.8.12 and ESP32 module x.y.z._ +_The following was run on Windows 10 and Ubuntu Desktop 20.04 environments, with Arduino IDE 1.8.15 and ESP32 board library version 1.0.6._ ## Prerequisites
interface: share profile banner washedGray to lightGray
@@ -60,7 +60,7 @@ export const ShareProfile = (props) => { alignItems="center" justifyContent="space-between" borderBottom={1} - borderColor="washedGray" + borderColor="lightGray" > <Row pl={3} alignItems="center"> {image}
pbdrv/nxtcolor: simplify analog compensation Also, scale reflection values to be somewhat closer to the EV3. That is, close to a white or reflective surface, the sensor should return 100%.
#define IN (0) #define OUT (1) +#define min(a, b) ((a) < (b) ? (a) : (b)) +#define max(a, b) ((a) > (b) ? (a) : (b)) + typedef struct { const int digi0; // GPIO on wire 5 const int digi1; // GPIO on wire 6 @@ -50,6 +53,8 @@ typedef struct _pbdrv_nxtcolor_t { pbio_light_color_t lamp; uint32_t calibration[3][4]; uint16_t threshold[2]; + uint32_t raw_min; + uint32_t raw_max; uint16_t crc; uint32_t wait_start; const pbdrv_nxtcolor_pininfo_t *pins; @@ -372,6 +377,10 @@ static pbio_error_t nxtcolor_init(pbdrv_nxtcolor_t *nxtcolor, pbio_port_t port) nxtcolor->threshold[0] = (buf[start+1] << 8) + buf[start+0]; nxtcolor->threshold[1] = (buf[start+3] << 8) + buf[start+2]; + // Other analog calibration values from NXT firmware / experiments + nxtcolor->raw_max = 750; + nxtcolor->raw_min = 50; + // The sensor is now in the full-color-ambient state nxtcolor->state = PBIO_LIGHT_COLOR_NONE; @@ -482,16 +491,16 @@ pbio_error_t nxtcolor_get_values_at_mode(pbio_port_t port, uint8_t mode, void *v } else { // Otherwise, scale by calibration multiplier - rgba_pct[i] = ( ( (uint32_t) (rgba[i] - rgba[3])) * nxtcolor->calibration[row][i] ) / 167116; + rgba_pct[i] = ( ( (uint32_t) (rgba[i] - rgba[3])) * nxtcolor->calibration[row][i] ) / 111410; + rgba_pct[i] = rgba_pct[i] > 100 ? 100 : rgba_pct[i]; } } - // Adjust ambient to percentage - rgba[3] -= 50; - rgba[3] = rgba[3] < 0 ? 0: rgba[3]; - rgba[3] = rgba[3] > 700 ? 700 : rgba[3]; - rgba[3] = (rgba[3]*100)/700; - rgba_pct[3] = rgba[3]; + // Clamp ambient between estimated max and min raw value + int32_t amb = max(nxtcolor->raw_min, min(rgba[3], nxtcolor->raw_max)); + + // Scale ambient to percentage + rgba_pct[3] = ((amb-nxtcolor->raw_min)*100)/(nxtcolor->raw_max-nxtcolor->raw_min); // TODO: Calculate color index pbio_light_color_t calculated_color = PBIO_LIGHT_COLOR_BLACK;
Fix error: unknown attribute 'long_call' ignored [-Werror,-Wunknown-attributes]
* (even though -mlong-calls does not appear in the compilation options) */ +# if defined(__clang__) +# define farcall_function +# else # define farcall_function __attribute__ ((long_call)) +# endif /* Code locate */
Update ntexapi.h with undocumented SYSDBG types
@@ -3152,6 +3152,51 @@ typedef struct _SYSDBG_TRIAGE_DUMP PHANDLE Handles; } SYSDBG_TRIAGE_DUMP, *PSYSDBG_TRIAGE_DUMP; +// private +typedef struct _SYSDBG_LIVEDUMP_CONTROL_FLAGS +{ + union + { + struct + { + ULONG UseDumpStorageStack : 1; + ULONG CompressMemoryPagesData : 1; + ULONG IncludeUserSpaceMemoryPages : 1; + ULONG Reserved : 28; + }; + ULONG AsUlong; + }; +} SYSDBG_LIVEDUMP_CONTROL_FLAGS, *PSYSDBG_LIVEDUMP_CONTROL_FLAGS; + +// private +typedef struct _SYSDBG_LIVEDUMP_CONTROL_ADDPAGES +{ + union + { + struct + { + ULONG HypervisorPages : 1; + ULONG Reserved : 31; + }; + ULONG AsUlong; + }; +} SYSDBG_LIVEDUMP_CONTROL_ADDPAGES, *PSYSDBG_LIVEDUMP_CONTROL_ADDPAGES; + +// private +typedef struct _SYSDBG_LIVEDUMP_CONTROL +{ + ULONG Version; + ULONG BugCheckCode; + ULONG_PTR BugCheckParam1; + ULONG_PTR BugCheckParam2; + ULONG_PTR BugCheckParam3; + ULONG_PTR BugCheckParam4; + HANDLE DumpFileHandle; + HANDLE CancelEventHandle; + SYSDBG_LIVEDUMP_CONTROL_FLAGS Flags; + SYSDBG_LIVEDUMP_CONTROL_ADDPAGES AddPagesControl; +} SYSDBG_LIVEDUMP_CONTROL, *PSYSDBG_LIVEDUMP_CONTROL; + NTSYSCALLAPI NTSTATUS NTAPI
Experimental: setting MISSING as a valid value (for now disabled)
@@ -295,7 +295,16 @@ static int compare(grib_accessor* a, grib_accessor* b) static int pack_string(grib_accessor* a, const char* val, size_t* len) { char* theEnd = NULL; - long v = strtol(val, &theEnd, 10); + long v = 0; + +#if 0 + /* Requires more work e.g. filter */ + if (strcmp_nocase(val, "missing")==0) { + return pack_missing(a); + } +#endif + + v = strtol(val, &theEnd, 10); if (theEnd) { grib_context_log(a->context, GRIB_LOG_ERROR, "trying to pack \"%s\" as long", val); return GRIB_WRONG_TYPE;
Fix multi-event commit.
@@ -104,10 +104,10 @@ _pier_db_commit_complete(c3_o success, #ifdef VERBOSE_EVENTS if (event_count_d != 1) { - u3l_log("pier: (%" PRIu64 "-%" PRIu64 "): db commit completed\r\n", - first_event_d, first_event_d + count_d - 1ULL); + u3l_log("pier: (%" PRIu64 "-%" PRIu64 "): db commit: complete\r\n", + first_event_d, first_event_d + event_count_d - 1ULL); } else { - u3l_log("pier: (%" PRIu64 "): db commit completed\r\n", first_event_d); + u3l_log("pier: (%" PRIu64 "): db commit: complete\r\n", first_event_d); } #endif @@ -116,7 +116,7 @@ _pier_db_commit_complete(c3_o success, { c3_assert((first_event_d + event_count_d - 1ULL) == log_u->moc_d); c3_assert(first_event_d == (1ULL + log_u->com_d)); - log_u->com_d += 1ULL; + log_u->com_d += event_count_d; } _pier_loop_resume(pir_u); @@ -134,10 +134,10 @@ _pier_db_commit_request(u3_pier* pir_u, #ifdef VERBOSE_EVENTS if (count_d != 1) { - u3l_log("pier: (%" PRIu64 "-%" PRIu64 "): commit: request\r\n", + u3l_log("pier: (%" PRIu64 "-%" PRIu64 "): db commit: request\r\n", first_event_d, first_event_d + count_d - 1ULL); } else { - u3l_log("pier: (%" PRIu64 "): commit: request\r\n", first_event_d); + u3l_log("pier: (%" PRIu64 "): db commit: request\r\n", first_event_d); } #endif @@ -1648,6 +1648,11 @@ _pier_apply(u3_pier* pir_u) u3_writ* wit_u; c3_o act_o = c3n; + // Warning: This entire event queuing system is way too clever; it tries to + // maintain a single linked list with multiple index based integer iterators + // over it instead of just using separate lists for the different stages of + // event handling. + start: /* iterate from queue exit, advancing any writs that can advance
cloud: retry register on connection error
@@ -231,11 +231,17 @@ check_expires_in(int64_t expires_in) return expires_in > UINT16_MAX ? UINT16_MAX : (uint16_t)expires_in; } +static bool +is_connection_error_code(oc_status_t code) +{ + return code == OC_STATUS_SERVICE_UNAVAILABLE || + code == OC_STATUS_GATEWAY_TIMEOUT; +} + static oc_cloud_error_t _register_handler_check_data_error(oc_client_response_t *data) { - if (data->code == OC_STATUS_SERVICE_UNAVAILABLE || - data->code == OC_STATUS_GATEWAY_TIMEOUT) { + if (is_connection_error_code(data->code)) { return CLOUD_ERROR_CONNECT; } if (data->code >= OC_STATUS_BAD_REQUEST) { @@ -361,7 +367,8 @@ cloud_register_handler(oc_client_response_t *data) goto finish; } - if (ctx->store.status == OC_CLOUD_INITIALIZED) { + if (((ctx->store.status & ~OC_CLOUD_FAILURE) == OC_CLOUD_INITIALIZED) && + is_connection_error_code(data->code) && !is_retry_over(ctx)) { oc_set_delayed_callback(ctx, cloud_register, g_retry_timeout[ctx->retry_count]); }
Unify artifact installation
@@ -187,22 +187,22 @@ target_link_libraries(bro ${BROTLI_LIBRARIES}) # Installation if(NOT BROTLI_BUNDLED_MODE) - install (TARGETS bro RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + install( + TARGETS bro + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) - if(WIN32) install( TARGETS ${BROTLI_LIBRARIES_CORE} - LIBRARY DESTINATION "${CMAKE_INSTALL_BINDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) - else() - install(TARGETS ${BROTLI_LIBRARIES_CORE} - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ) - install(DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - endif() + install( + DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) endif() # Tests
libcupsfilters: Added info about source of human-readable option strings The files cupsfilters/catalog.c and cupsfilters/catalog.h contain an API to obtain human-readable and translated strings for printer options and choices. Document where the actual strings are taken from.
// USA. // +// +// Human-readable strings for printer or scanner option/attribute +// names and also the names for the possible choices for each option +// are essentially important for user-friendly print dialogs and other +// user interfaces. Also translations into the user-chosen user +// interface language should be used. +// +// To allow for human-readable names and translations/localizations we +// use the standard set of human-readable strings from the PWG: +// +// https://ftp.pwg.org/pub/pwg/ipp/examples/ipp.pot +// https://ftp.pwg.org/pub/pwg/ipp/examples/ipp.strings +// +// Translations are supposed to go here (but none are available yet): +// +// https://github.com/istopwg/ippregistry/tree/master/localizations +// +// These standard strings are also part of CUPS' translation files: +// +// https://github.com/OpenPrinting/cups/tree/master/locale +// +// Here translations take actually place as part of the translations +// of CUPS itself. +// +// We take the files from the CUPS installed into the system. It is +// not complicated to check the user language in the printer's IPP +// response via the attributes-natural-language attribute and then +// request an appropriate language version of the files if +// available. The printer-specific strings are downloaded from the +// printer following the URI in the printer-strings-uri attribute and +// are in the selected language. +// +// See also: +// +// https://lists.linuxfoundation.org/pipermail/printing-architecture/2021/003992.html +// https://lists.linuxfoundation.org/pipermail/printing-architecture/2021/003995.html +// + + #ifndef _CUPS_FILTERS_CATALOG_H_ # define _CUPS_FILTERS_CATALOG_H_
add 5.2 to sollve runs
@@ -97,6 +97,8 @@ else export MY_SOLLVE_FLAGS="$MY_SOLLVE_FLAGS -fopenmp-version=50" elif [ $this_omp_version == "5.1" ] ; then export MY_SOLLVE_FLAGS="$MY_SOLLVE_FLAGS -fopenmp-version=51" + elif [ $this_omp_version == "5.2" ] ; then + export MY_SOLLVE_FLAGS="$MY_SOLLVE_FLAGS -fopenmp-version=52" elif [ $this_omp_version == "4.5" ] ; then export MY_SOLLVE_FLAGS="$MY_SOLLVE_FLAGS -fopenmp-version=45" fi @@ -156,6 +158,21 @@ make report_summary | tail -5 >> abrev.combined-results.txt mv results_report results_report51 fi +if [ "$ROCMASTER" != "1" ] && [ "$EPSDB" != "1" ] && [ "$SKIP_SOLLVE52" != 1 ]; then +echo "--------------------------- START OMP 5.2 TESTING ---------------------" +# Run OpenMP 5.2 Tests +export MY_SOLLVE_FLAGS="$MY_SOLLVE_FLAGS -fopenmp-version=52" +make tidy +make CC=$AOMP/bin/clang CXX=$AOMP/bin/clang++ FC=$AOMP/bin/flang CFLAGS="-lm $MY_SOLLVE_FLAGS" CXXFLAGS="$MY_SOLLVE_FLAGS" FFLAGS="$MY_SOLLVE_FLAGS" OMP_VERSION=5.2 LOG=1 LOG_ALL=1 VERBOSE_TESTS=1 VERBOSE=1 all +echo +echo "--------------------------- OMP 5.2 Detailed Results ---------------------------" >> combined-results.txt +echo "--------------------------- OMP 5.2 Results ---------------------------" >> abrev.combined-results.txt +make report_html +make report_summary >> combined-results.txt +make report_summary | tail -5 >> abrev.combined-results.txt +mv results_report results_report52 +fi + echo "========================= ALL TESTING COMPLETE ! =====================" echo
Add show -performance command to UEFI cli
@@ -767,6 +767,13 @@ RegisterCommands( if (EFI_ERROR(Rc)) { goto done; } +#ifndef __MFG__ + // Mfg has a low latency version of this command in RegisterMfgCommands() + Rc = RegisterShowPerformanceCommand(); + if (EFI_ERROR(Rc)) { + goto done; + } +#endif // !__MFG__ #ifdef OS_BUILD #ifdef __MFG__ @@ -774,11 +781,6 @@ RegisterCommands( if (EFI_ERROR(Rc)) { goto done; } -#else - Rc = RegisterShowPerformanceCommand(); - if (EFI_ERROR(Rc)) { - goto done; - } #endif // __MFG__ #endif // OS_BUILD
Print debug and change delay for WIN32 LL implementation
@@ -132,6 +132,8 @@ uart_thread(void* param) { while (comPort == NULL); esp_sys_sem_create(&sem, 1); /* Create semaphore for delay functions */ + esp_sys_sem_wait(&sem, 0); + fopen_s(&file, "log_file.txt", "w+"); /* Open debug file in write mode */ while (1) { /* @@ -143,7 +145,7 @@ uart_thread(void* param) { if (bytes_read > 0) { DWORD i; for (i = 0; i < bytes_read; i++) { - //printf("%c", data_buffer[i]); + printf("%c", data_buffer[i]); } /* * Send received data to input processing module @@ -161,9 +163,7 @@ uart_thread(void* param) { } while (bytes_read == (DWORD)sizeof(data_buffer)); /* Implement delay to allow other tasks processing */ - esp_sys_sem_wait(&sem, 0); esp_sys_sem_wait(&sem, 1); - esp_sys_sem_release(&sem); } }
fix selftest declaration in luos lib
"-I Profiles/Motor", "-I Profiles/Servo_motor", "-I Profiles/Voltage", - "-I Bootloader" + "-I Bootloader", + "-I SelfTest" ], "srcFilter": [ "+<*.c>", "+<../Profiles/Motor/*.c>", "+<../Profiles/Servo_motor/*.c>", "+<../Profiles/Voltage/*.c>", - "+<../Bootloader/*.c>" + "+<../Bootloader/*.c>", + "+<../SelfTest/*.c>" ] }, "repository": {
Change order of loading folders for node port.
@@ -8,18 +8,18 @@ const addon = (() => { const LIBRARY_PATH = process.env.LOADER_LIBRARY_PATH || ''; const paths = [ - LIBRARY_PATH, - __dirname, Path.join(__dirname, 'build'), + __dirname, process.cwd(), + LIBRARY_PATH, Path.join(LIBRARY_PATH, 'build'), Path.join(LIBRARY_PATH, 'node_modules', 'metacall'), Path.join(LIBRARY_PATH, 'node_modules', 'metacall', 'build'), ]; const names = [ - 'node_port', 'node_portd', + 'node_port', ]; /* Set NODE_PATH for finding metacall lib */
Add missing sceKernelTryLockLwMutex
@@ -1115,6 +1115,7 @@ typedef struct SceKernelLwMutexOptParam { int sceKernelCreateLwMutex(SceKernelLwMutexWork *pWork,const char *pName, unsigned int attr, int initCount, const SceKernelLwMutexOptParam *pOptParam); int sceKernelDeleteLwMutex(SceKernelLwMutexWork *pWork); int sceKernelLockLwMutex(SceKernelLwMutexWork *pWork, int lockCount, unsigned int *pTimeout); +int sceKernelTryLockLwMutex(SceKernelLwMutexWork *pWork, int lockCount); int sceKernelUnlockLwMutex(SceKernelLwMutexWork *pWork, int unlockCount); typedef struct SceKernelLwCondWork {
allocate fd: Added missing memset
@@ -214,6 +214,7 @@ static int _posix_allocateFd(process_info_t *p, int *fd) return -ENFILE; hal_memcpy(newfds, p->fds, p->maxfd * sizeof(p->fds[0])); + hal_memset(&newfds[p->maxfd], NULL, p->maxfd * sizeof(p->fds[0])); vm_kfree(p->fds); p->fds = newfds;
fix:fix ethereum test case(test_001CreateWallet_0011CreateSevenWallet)
@@ -309,6 +309,7 @@ END_TEST START_TEST(test_001CreateWallet_0011CreateSevenWallet) { BSINT32 rtnVal; + BoatIotSdkInit(); BoatEthWalletConfig wallet = get_ethereum_wallet_settings(); extern BoatIotSdkContext g_boat_iot_sdk_context; wallet.prikeyCtx_config.prikey_genMode = BOAT_WALLET_PRIKEY_GENMODE_INTERNAL_GENERATION;
review comment... tweak errno handling in readdir
@@ -1727,7 +1727,9 @@ readdir(DIR *dirp) doRead(fd, initialTime, (errno != 0), NULL, sizeof(struct dirent), "readdir", BUF, 0); - errno = errsave; + // If readdir modified errno, leave the errno value alone. + // Otherwise, restore the saved errno value (before we set it to zero.) + errno = (errno) ? errno : errsave; return dep; }
Use aligned buffer size with vkMapMemory too
@@ -1117,9 +1117,9 @@ static struct overlay_draw *render_swapchain_display(struct swapchain_data *data ImDrawVert* vtx_dst = NULL; ImDrawIdx* idx_dst = NULL; VK_CHECK(device_data->vtable.MapMemory(device_data->device, draw->vertex_buffer_mem, - 0, vertex_size, 0, (void**)(&vtx_dst))); + 0, draw->vertex_buffer_size, 0, (void**)(&vtx_dst))); VK_CHECK(device_data->vtable.MapMemory(device_data->device, draw->index_buffer_mem, - 0, index_size, 0, (void**)(&idx_dst))); + 0, draw->index_buffer_size, 0, (void**)(&idx_dst))); for (int n = 0; n < draw_data->CmdListsCount; n++) { const ImDrawList* cmd_list = draw_data->CmdLists[n];
bcc_syms.cc: bug fix; identify VDSO using 'name' vs. 'path' (use of path incorrectly compares /proc/<pid>/root[vdso] with [vdso]).
@@ -238,7 +238,7 @@ ProcSyms::Module::Module(const char *name, const char *path, // Other symbol files if (bcc_is_valid_perf_map(path_.c_str()) == 1) type_ = ModuleType::PERF_MAP; - else if (bcc_elf_is_vdso(path_.c_str()) == 1) + else if (bcc_elf_is_vdso(name_.c_str()) == 1) type_ = ModuleType::VDSO; // Will be stored later
Fixed issue with the OBJDIR value not being escaped
--------------------------------------------------------------------------- function make.objdir(cfg) - _x(' OBJDIR = %s', project.getrelative(cfg.project, cfg.objdir)) + _x(' OBJDIR = %s', premake.esc(project.getrelative(cfg.project, cfg.objdir))) end
BUFR decode: Check error code before asserting
@@ -646,6 +646,10 @@ static void dump_string(grib_dumper* d, grib_accessor* a, const char* comment) self->empty = 0; err = grib_unpack_string(a, value, &size); + if (err) { + fprintf(self->dumper.out, " *** ERR=%d (%s) [dump_string on '%s']", err, grib_get_error_message(err), acc_name); + return; + } Assert(size < MAX_STRING_SIZE); p = value; r = compute_bufr_key_rank(h, self->keys, acc_name);
Drop the redundant ast.Node.list3 field
@@ -187,7 +187,6 @@ type Node struct { list0 []*Node list1 []*Node list2 []*Node - list3 []*Node } func (n *Node) Kind() Kind { return n.kind } @@ -254,7 +253,7 @@ func (n *Raw) Node() *Node { return (*Node)(n) } func (n *Raw) Flags() Flags { return n.flags } func (n *Raw) FilenameLine() (string, uint32) { return n.filename, n.line } func (n *Raw) SubNodes() [3]*Node { return [3]*Node{n.lhs, n.mhs, n.rhs} } -func (n *Raw) SubLists() [4][]*Node { return [4][]*Node{n.list0, n.list1, n.list2, n.list3} } +func (n *Raw) SubLists() [3][]*Node { return [3][]*Node{n.list0, n.list1, n.list2} } func (n *Raw) SetFilenameLine(f string, l uint32) { n.filename, n.line = f, l } @@ -582,26 +581,26 @@ func NewWhile(label t.ID, condition *Expr, asserts []*Node, body []*Node) *While } } -// If is "if MHS { List2 } else RHS" or "if MHS { List2 } else { List3 }": +// If is "if MHS { List2 } else RHS" or "if MHS { List2 } else { List1 }": // - MHS: <Expr> // - RHS: <nil|If> +// - List1: <Statement> if-false body // - List2: <Statement> if-true body -// - List3: <Statement> if-false body type If Node func (n *If) Node() *Node { return (*Node)(n) } func (n *If) Condition() *Expr { return n.mhs.Expr() } func (n *If) ElseIf() *If { return n.rhs.If() } func (n *If) BodyIfTrue() []*Node { return n.list2 } -func (n *If) BodyIfFalse() []*Node { return n.list3 } +func (n *If) BodyIfFalse() []*Node { return n.list1 } func NewIf(condition *Expr, elseIf *If, bodyIfTrue []*Node, bodyIfFalse []*Node) *If { return &If{ kind: KIf, mhs: condition.Node(), rhs: elseIf.Node(), + list1: bodyIfFalse, list2: bodyIfTrue, - list3: bodyIfFalse, } }
Remove unneeded config line
@l3 hugemb=256 ctr=l3fwd ctrcfg+=examples/tables/l3fwd.txt @smgw hugemb=512 ctr=smgw ctrcfg+=examples/tables/smgw.txt @portfwd ctr=portfwd ctrcfg+=examples/tables/old/portfwd_table.txt -;@portfwd ctr=l2fwd ctrcfg+=examples/tables/portfwd.txt @nonic arch=dpdk hugemb=64 cores=2 ports=0 noeal @nic arch=dpdk hugemb=4096
Disallow SSL2_VERSION record version in an SSLv3 record header When validate_record_header() gets called it should be able to rely on the fact that an SSLv2 record version means that the record was received in SSLv2 format.
@@ -517,6 +517,18 @@ static int tls_get_more_records(OSSL_RECORD_LAYER *rl, thisrr->type = type; thisrr->rec_version = version; + /* + * When we call validate_record_header() only records actually + * received in SSLv2 format should have the record version set + * to SSL2_VERSION. This way validate_record_header() can know + * what format the record was in based on the version. + */ + if (thisrr->rec_version == SSL2_VERSION) { + RLAYERfatal(rl, SSL_AD_PROTOCOL_VERSION, + SSL_R_WRONG_VERSION_NUMBER); + return OSSL_RECORD_RETURN_FATAL; + } + if (s->msg_callback) s->msg_callback(0, version, SSL3_RT_HEADER, p, 5, ssl, s->msg_callback_arg);
Anohter tweak to BIND_ANIMATION_FRAME_REMOVE. Frame checking was off by 1.
@@ -21999,7 +21999,7 @@ void adjust_bind(entity *e) { // If we don't have the frame and frame kill flag is // set, kill ourselves. - if (e->animation->numframes < frame) + if ((e->animation->numframes -1) < frame) { if (e->binding.match & BIND_ANIMATION_FRAME_REMOVE)
serial-libs/gsl: dropping optimization level down to -O2 to avoid failure observed with rng test
@@ -55,7 +55,7 @@ lends itself to being used in very high level languages (VHLLs). export CFLAGS="-fp-model strict $CFLAGS" %endif -./configure --prefix=%{install_path} \ +./configure CFLAGS="-O2" --prefix=%{install_path} \ --libdir=%{install_path}/lib \ --disable-static || { cat config.log && exit 1; } make %{?_smp_mflags}
show the parm attributes in the channel box
@@ -413,6 +413,7 @@ CreateAttrOperation::createNumericAttr(const HAPI_ParmInfo &parm) { result = nAttr.createColor(attrName, attrName); nAttr.setNiceNameOverride(niceName); + nAttr.setChannelBox(true); return result; } @@ -430,6 +431,7 @@ CreateAttrOperation::createNumericAttr(const HAPI_ParmInfo &parm) type ); nAttr.setNiceNameOverride(childNiceName); + nAttr.setChannelBox(true); cAttr.addChild(child); } return result; @@ -437,6 +439,7 @@ CreateAttrOperation::createNumericAttr(const HAPI_ParmInfo &parm) result = nAttr.create(attrName, attrName, type); nAttr.setNiceNameOverride(niceName); + nAttr.setChannelBox(true); if(parm.type == HAPI_PARMTYPE_NODE) { @@ -492,7 +495,7 @@ CreateAttrOperation::createEnumAttr(const HAPI_ParmInfo &parm) MString field = Util::HAPIString(choiceInfos[i].labelSH); eAttr.addField(field, static_cast<short>(enumIndex++)); } - + eAttr.setChannelBox(true); delete[] choiceInfos; return result; }
Change implicit fallthrough flag to work with older versions of gcc.
@@ -28,7 +28,7 @@ else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") endif(NOT QUICK_BUILD) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wimplicit-fallthrough=0 -Wsign-compare -Wshadow") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-implicit-fallthrough -Wsign-compare -Wshadow") if(WITH_COVERAGE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -fprofile-arcs -ftest-coverage")
replace the use of shared_ptr with ref
@@ -85,7 +85,7 @@ public: /// Get a singleton of Common Diagnostic Stack that is used for regitering CollectorCallback and is used to call /// to collect and upload data. /// </summary> -MATSDK_LIBABI std::shared_ptr<ICommonDiagnosticSystem> GetCommonDiagnosticSystem() noexcept; +MATSDK_LIBABI ICommonDiagnosticSystem& GetCommonDiagnosticSystem() noexcept; }
session client BUGFIX using not initialized variable
@@ -650,7 +650,7 @@ build_schema_info_yl(struct nc_session *session) struct lyd_node *yldata = NULL; NC_MSG_TYPE msg; uint64_t msgid; - struct ly_set *modules; + struct ly_set *modules = NULL; struct schema_info *result; unsigned int u, c; struct lyd_node *iter;
DOCS: Update gppkg - update requirements for --migrate
<codeblock><b>gppkg</b> [<b>-i</b> <varname>package</varname> | <b>-u</b> <varname>package</varname> | <b>-r </b> <varname>name</varname>-<varname>version</varname> | <b>-c</b>] [<b>-d</b> <varname>master_data_directory</varname>] [<b>-a</b>] [<b>-v</b>] -<b>gppkg --migrate</b> <varname>GPHOME_1</varname> <varname>GPHOME_2</varname> [<b>-a</b>] [<b>-v</b>] +<b>gppkg --migrate</b> <varname>GPHOME_old</varname> <varname>GPHOME_new</varname> [<b>-a</b>] [<b>-v</b>] <b>gppkg</b> [<b>-q</b> | <b>--query</b>] <varname>query_option</varname> and installation of any dependencies.</pd> </plentry> <plentry> - <pt>--migrate <varname>GPHOME_1</varname> - <varname>GPHOME_2</varname></pt> + <pt>--migrate <varname>GPHOME_old</varname> + <varname>GPHOME_new</varname></pt> <pd>Migrates packages from a separate <codeph>$GPHOME</codeph>. Carries over packages from one version of Greenplum Database to another.</pd> <pd>For example: <codeph>gppkg --migrate /usr/local/greenplum-db-&lt;old-version> /usr/local/greenplum-db-&lt;new-version></codeph></pd> - <pd>This option is automatically invoked by the installer during minor upgrades. - This option is given here for cases when the user wants to migrate packages - manually.</pd> - <pd>Migration can only proceed if <codeph>gppkg</codeph> is executed from the - installation directory to which packages are being migrated. That is, - <codeph>GPHOME_2</codeph> must match the <codeph>$GPHOME</codeph> from - which the currently executing <codeph>gppkg</codeph> is being run. </pd> + <pd>When migrating packages, these requirements must be met.<ul + id="ul_sx3_hwx_41b"> + <li>At least the master instance of the destination Greenplum Database + must be started (the instance installed in + <varname>GPHOME_new</varname>). Before running the + <codeph>gppkg</codeph> command start the Greenplum Database + master with the command <codeph>gpstart -m</codeph>.</li> + <li>Run the <codeph>gppkg</codeph> utility from the + <varname>GPHOME_new</varname> installation. The migration + destination installation directory. </li> + </ul></pd> </plentry> <plentry> <pt>-q | --query <varname>query_option</varname></pt>
removes unnecessary and non-portable type casts
@@ -5840,12 +5840,13 @@ void arm_rfft_fast_f32( uint32_t blockSize) { uint32_t i = 0U; - int32_t rOffset, dst_end; + int32_t rOffset; + int32_t* dst_end; /* Copy the value of Index pointer that points * to the current location from where the input samples to be read */ rOffset = *readOffset; - dst_end = (int32_t) (dst_base + dst_length); + dst_end = dst_base + dst_length; /* Loop over the blockSize */ i = blockSize; @@ -5858,7 +5859,7 @@ void arm_rfft_fast_f32( /* Update the input pointer */ dst += dstInc; - if (dst == (int32_t *) dst_end) + if (dst == dst_end) { dst = dst_base; } @@ -5939,13 +5940,14 @@ void arm_rfft_fast_f32( uint32_t blockSize) { uint32_t i = 0; - int32_t rOffset, dst_end; + int32_t rOffset; + q15_t* dst_end; /* Copy the value of Index pointer that points * to the current location from where the input samples to be read */ rOffset = *readOffset; - dst_end = (int32_t) (dst_base + dst_length); + dst_end = dst_base + dst_length; /* Loop over the blockSize */ i = blockSize; @@ -5958,7 +5960,7 @@ void arm_rfft_fast_f32( /* Update the input pointer */ dst += dstInc; - if (dst == (q15_t *) dst_end) + if (dst == dst_end) { dst = dst_base; } @@ -6039,13 +6041,14 @@ void arm_rfft_fast_f32( uint32_t blockSize) { uint32_t i = 0; - int32_t rOffset, dst_end; + int32_t rOffset; + q7_t* dst_end; /* Copy the value of Index pointer that points * to the current location from where the input samples to be read */ rOffset = *readOffset; - dst_end = (int32_t) (dst_base + dst_length); + dst_end = dst_base + dst_length; /* Loop over the blockSize */ i = blockSize; @@ -6058,7 +6061,7 @@ void arm_rfft_fast_f32( /* Update the input pointer */ dst += dstInc; - if (dst == (q7_t *) dst_end) + if (dst == dst_end) { dst = dst_base; }
Send lovrEye to fragment shaders;
@@ -28,7 +28,6 @@ const char* lovrShaderVertexPrefix = "" "#version 150 \n" #endif "#define MAX_BONES 48 \n" -"#define lovrEye (gl_InstanceID & 1) \n" "#define lovrTransform lovrTransforms[lovrEye] \n" "#define lovrView lovrViews[lovrEye] \n" "#define lovrProjection lovrProjections[lovrEye] \n" @@ -43,6 +42,7 @@ const char* lovrShaderVertexPrefix = "" "in vec4 lovrBoneWeights; \n" "out vec2 texCoord; \n" "out vec4 vertexColor; \n" +"flat out int lovrEye; \n" "layout(std140) uniform lovrCamera { \n" " mat4 lovrProjections[2]; \n" " mat4 lovrViews[2]; \n" @@ -64,6 +64,7 @@ const char* lovrShaderFragmentPrefix = "" #endif "in vec2 texCoord; \n" "in vec4 vertexColor; \n" +"flat in int lovrEye; \n" "out vec4 lovrCanvas[gl_MaxDrawBuffers]; \n" "uniform float lovrMetalness; \n" "uniform float lovrRoughness; \n" @@ -83,6 +84,7 @@ const char* lovrShaderVertexSuffix = "" "void main() { \n" " texCoord = lovrTexCoord; \n" " vertexColor = lovrVertexColor; \n" +" lovrEye = gl_InstanceID & 1; \n" " mat4 pose = \n" " lovrPose[lovrBones[0]] * lovrBoneWeights[0] + \n" " lovrPose[lovrBones[1]] * lovrBoneWeights[1] + \n"
session server BUGFIX invalid dereference
@@ -108,7 +108,8 @@ nc_server_ch_client_lock(const char *name, const char *endpt_name, NC_TRANSPORT_ break; } for (j = 0; j < client->ch_endpt_count; ++j) { - if (!strcmp(client->ch_endpts[j].name, endpt_name) && (!ti || (ti == client->ch_endpts[j].ti))) { + if ((!endpt_name || !strcmp(client->ch_endpts[j].name, endpt_name)) && + (!ti || (ti == client->ch_endpts[j].ti))) { endpt = &client->ch_endpts[j]; break; }
doc/bmc: Document SBE validation on P8 platforms
@@ -53,3 +53,30 @@ Real-time clock On platforms where a real-time-clock is not available, skiboot may use the IPMI SEL Time as a real-time-clock device. + +SBE validation +-------------- + +On some P8 platforms with an AMI or SMC BMC (ie. astbmc) SBE validation is done +by a tool on the BMC. This is done to inspect the SBE and detect if a malicious +host has written to the SBE, especially in multi-tenant +"Bare-Metal-As-A-Service" scenarios. + +To complicate this the SBE validation occurs at host-runtime and reads the SBE +SEEPROM over I2C using the FSI master which will conflict with anything the +host may be doing at the same time. To avoid this Skiboot will pause boot until +the validation is complete. +If SBE validation is required the BMC will communicate this to Skiboot by +setting an IPMI System Boot Option with OEM parameter 0x62. When this flag is +set Skiboot will pause and wait for the validation to complete and the flag to +be cleared. This ensures the validation completes before the execution is passed +to Petitboot and the host operating system and any conflicts could occur. During +this process Skiboot will print + SBE validation required, waiting for completion + System will be powered off if validation fails +to the console with an update every minute until complete. + +Unfortunately the validation performed by the BMC leaves the SBE in a bad +state. Once the validation is complete Skiboot will reboot to reset everything +to a good state and normal booting can resume. No such reboot is required if +the flag is not set and validation doesn't occur.
Command not found returns error
@@ -345,7 +345,8 @@ int cmd_process_long(struct commands *commands, const char *str, size_t len, err = cmd_long->h(pf_resp, &arg); } else { - err = re_hprintf(pf_resp, "command not found (%s)\n", name); + (void)re_hprintf(pf_resp, "command not found (%s)\n", name); + err = ENOTSUP; } out:
Report msg id as hexadecimal
@@ -1146,7 +1146,7 @@ static celix_status_t pubsub_topologyManager_metrics(pubsub_topology_manager_t * char uuidStr[UUID_STR_LEN+1]; uuid_unparse(rm->msgTypes[j].origins[m].originUUID, uuidStr); fprintf(os, " |- Message '%s' from framework UUID %s:\n", rm->msgTypes[j].typeFqn, uuidStr); - fprintf(os, " |- msg type = %i\n", rm->msgTypes[j].typeId); + fprintf(os, " |- msg type = 0x%X\n", rm->msgTypes[j].typeId); fprintf(os, " |- receive count = %li\n", rm->msgTypes[j].origins[m].nrOfMessagesReceived); fprintf(os, " |- serialization error = %li\n", rm->msgTypes[j].origins[m].nrOfSerializationErrors); fprintf(os, " |- missing seq numbers = %li\n", rm->msgTypes[j].origins[m].nrOfMissingSeqNumbers);
add raptor lake ids
@@ -1544,6 +1544,13 @@ int get_cpuname(void){ return CPUTYPE_NEHALEM; } break; + case 11: //family 6 exmodel 11 + switch (model) { + case 7: // Raptor Lake + if(support_avx2()) + return CPUTYPE_HASWELL; + } + break; } break; case 0x7: @@ -2334,6 +2341,12 @@ int get_coretype(void){ return CORE_NEHALEM; } + case 11: + switch (model) { + case 7: // Raptor Lake + if(support_avx2()) + return CORE_HASWELL; + } case 15: if (model <= 0x2) return CORE_NORTHWOOD; else return CORE_PRESCOTT;
Debug output doesn't make sense...
@@ -42,9 +42,6 @@ main(void) unsigned int i; usrsctp_init(0, NULL, NULL); -#ifdef SCTP_DEBUG - usrsctp_sysctl_set_sctp_debug_on(SCTP_DEBUG_ALL); -#endif printf("Entering the loop\n"); for (i = 0; i < 1000000; i++) { usrsctp_register_address(NULL);
anahera: Raise C1 port i2c speed to 1Mhz BRANCH=none TEST=On Anahera, Make sure the C1 port is charging.
@@ -38,7 +38,7 @@ const struct i2c_port_t i2c_ports[] = { /* I2C4 C1 TCPC */ .name = "tcpc1", .port = I2C_PORT_USB_C1_TCPC, - .kbps = 400, + .kbps = 1000, .scl = GPIO_EC_I2C_USB_C1_TCPC_SCL, .sda = GPIO_EC_I2C_USB_C1_TCPC_SDA, }, @@ -54,7 +54,7 @@ const struct i2c_port_t i2c_ports[] = { /* I2C6 */ .name = "ppc1,retimer1", .port = I2C_PORT_USB_C1_PPC, - .kbps = 400, + .kbps = 1000, .scl = GPIO_EC_I2C_USB_C1_MIX_SCL, .sda = GPIO_EC_I2C_USB_C1_MIX_SDA, },
artik053/openocd: fix build.sh to make it work on windows The environment variable 'HOSTTYPE' specifies the type of installed OS. However, MSYS has 32 bits and 64 bits, and can be classified into 'MSYSTEM_CARCH'. This commit fixes to provide builds in the Windows environment.
@@ -29,7 +29,9 @@ fi buildDir=$srcRoot copyDir=$srcRoot/.. -CFLAGS="-mtune=generic -O2 -pipe" +CFLAGS="-O2 -pipe" + +CTARGET=`gcc -dumpmachine` die() { if [ -n "$1" ]; then echo $1; fi @@ -105,28 +107,29 @@ fetch_libconfuse() { } setenv() { - case $OSTYPE in - linux*) + case $CTARGET in + *linux*) HOST=linux ;; - msys*) + *mingw*|*msys) HOST=win ;; *) - die "Not-support OS type - $OSTYPE" + die "Not-support OS type - $CTARGET" ;; esac - case $HOSTTYPE in + case $CTARGET in x86_64*) HOST=${HOST}64 + CFLAGS="-mtune=generic $CFLAGS" ;; i386*|i686*) HOST=${HOST}32 - CFLAGS="-march=$HOSTTYPE $CFLAGS" + CFLAGS="-m32 -march=i686 $CFLAGS" ;; *) - die "Unknown host type" + die "Unknown arch type" ;; esac
Make sure we save ALPN data in the session
@@ -1400,6 +1400,17 @@ int tls_parse_stoc_alpn(SSL *s, PACKET *pkt, unsigned int context, X509 *x, } s->s3->alpn_selected_len = len; + /* We also put a copy in the session */ + OPENSSL_free(s->session->ext.alpn_selected); + s->session->ext.alpn_selected = OPENSSL_memdup(s->s3->alpn_selected, + s->s3->alpn_selected_len); + s->session->ext.alpn_selected_len = s->s3->alpn_selected_len; + + if (s->session->ext.alpn_selected == NULL) { + *al = SSL_AD_INTERNAL_ERROR; + return 0; + } + return 1; }
socketpool: check poll exipred after lisklist inserted Issues
@@ -601,9 +601,9 @@ int h2o_socketpool_return(h2o_socketpool_t *pool, h2o_socket_t *sock) __sync_add_and_fetch(&pool->_shared.pooled_count, 1); pthread_mutex_lock(&pool->_shared.mutex); - check_pool_expired_locked(pool, h2o_socket_get_loop(sock)); h2o_linklist_insert(&pool->_shared.sockets, &entry->all_link); h2o_linklist_insert(&pool->targets.entries[target]->_shared.sockets, &entry->target_link); + check_pool_expired_locked(pool, h2o_socket_get_loop(sock)); pthread_mutex_unlock(&pool->_shared.mutex); return 0; }
Add sce_paf_malloc_align nid
@@ -7403,6 +7403,7 @@ modules: kernel: false nid: 0xA7D28DAE functions: + sce_paf_malloc_align: 0xAA9952E0 sce_paf_private_abs: 0x0F297A5E sce_paf_private_atexit: 0x9A1D1ED1 sce_paf_private_atof: 0x9C251354
discard: Make max_length aligned to sector size
@@ -61,7 +61,8 @@ void ocf_submit_volume_discard(ocf_volume_t volume, uint64_t addr, { struct ocf_submit_volume_context *context; uint64_t bytes; - uint64_t max_length = (uint32_t)~0; + uint64_t sector_mask = (1 << ENV_SECTOR_SHIFT) - 1; + uint64_t max_length = (uint32_t)~0 & ~sector_mask; struct ocf_io *io; context = env_vzalloc(sizeof(*context));
remove rounded-ending in lv_arc.c
@@ -239,37 +239,6 @@ static lv_design_res_t lv_arc_design(lv_obj_t * arc, const lv_area_t * clip_area lv_coord_t y = arc->coords.y1 + lv_obj_get_height(arc) / 2; lv_opa_t opa_scale = lv_obj_get_opa_scale(arc); lv_draw_arc(x, y, r, clip_area, ext->angle_start, ext->angle_end, style, opa_scale); - - /*Draw circle on the ends if enabled */ - if(style->line.rounded) { - lv_coord_t thick_half = style->line.width / 2; - lv_coord_t cir_x = ((r - thick_half + 1) * lv_trigo_sin(90 - ext->angle_start) >> LV_TRIGO_SHIFT); - lv_coord_t cir_y = ((r - thick_half + 1) * lv_trigo_sin(ext->angle_start) >> LV_TRIGO_SHIFT); - - lv_style_t cir_style; - lv_style_copy(&cir_style, &lv_style_plain); - cir_style.body.grad_color = style->line.color; - cir_style.body.main_color = cir_style.body.grad_color; - cir_style.body.radius = LV_RADIUS_CIRCLE; - lv_area_t cir_area; - cir_area.x1 = cir_x + x - thick_half +1; - cir_area.y1 = cir_y + y - thick_half +1; - cir_area.x2 = cir_x + x + thick_half; - cir_area.y2 = cir_y + y + thick_half; - - lv_draw_rect(&cir_area, clip_area, &cir_style, opa_scale); - - cir_x = ((r - thick_half + 1) * lv_trigo_sin(90 - ext->angle_end) >> LV_TRIGO_SHIFT); - cir_y = ((r - thick_half + 1) * lv_trigo_sin(ext->angle_end) >> LV_TRIGO_SHIFT); - - cir_area.x1 = cir_x + x - thick_half +1; - cir_area.y1 = cir_y + y - thick_half +1; - cir_area.x2 = cir_x + x + thick_half; - cir_area.y2 = cir_y + y + thick_half; - - lv_draw_rect(&cir_area, clip_area, &cir_style, opa_scale); - } - } /*Post draw when the children are drawn*/ else if(mode == LV_DESIGN_DRAW_POST) {
sse4.1: Add missing explicit cast to __m128i* Explicitly casting to __m128* on this line appears to be necessary to compile using clang or gcc when SIMDE_SSE4_1_NATIVE is defined.
@@ -987,7 +987,7 @@ SIMDE__FUNCTION_ATTRIBUTES simde__m128i simde_mm_stream_load_si128 (const simde__m128i* mem_addr) { #if defined(SIMDE_SSE4_1_NATIVE) - return SIMDE__M128I_C(_mm_stream_load_si128((void*) &(mem_addr->n))); + return SIMDE__M128I_C(_mm_stream_load_si128((__m128i*)(void*) &(mem_addr->n))); #else return *mem_addr; #endif
Bump SEDEM version (fix for Release Tracker)
}, "sedem": { "formula": { - "sandbox_id": 465320622, + "sandbox_id": 466065104, "match": "SEDEM archive" },
jni: fix JNI version check with correct API level
@@ -30,11 +30,11 @@ if (DEPENDENCY_PHASE) set (DIRS ${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} ${JAVA_AWT_INCLUDE_PATH}) set (LIBS ${JAVA_MAWT_LIBRARY} ${JNI_LIBRARIES} ${JAVA_AWT_LIBRARY} ${JAVA_JVM_LIBRARY}) # for check_symbol_exists set (CMAKE_REQUIRED_INCLUDES ${DIRS}) - safe_check_symbol_exists (JNI_VERSION_1_9 jni.h JNI_CORRECT_VERSION) + safe_check_symbol_exists (JNI_VERSION_9 jni.h JNI_CORRECT_VERSION) unset (CMAKE_REQUIRED_INCLUDES) if (NOT JNI_CORRECT_VERSION) - remove_plugin (jni "jni.h does not define JNI_VERSION_1_9") + remove_plugin (jni "jni.h does not define JNI_VERSION_9") endif () else () remove_plugin (jni "jni not found")
Eliminate trivial switch's.
@@ -2270,19 +2270,17 @@ dnssd_client_cb( if (!c) return; - switch (state) + if (state == AVAHI_CLIENT_FAILURE) { - default : - fprintf(stderr, "Ignored Avahi state %d.\n", state); - break; - - case AVAHI_CLIENT_FAILURE: if (avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED) { fputs("Avahi server crashed, exiting.\n", stderr); exit(1); } - break; + } + else + { + fprintf(stderr, "Ignored Avahi state %d.\n", state); } } #endif /* HAVE_MDNSRESPONDER */
[numerics] add an unstable test that pass only with mumps
@@ -825,10 +825,11 @@ if(WITH_${COMPONENT}_TESTING) INTERNAL_DPARAM 0 1e-10) NEW_GFC_3D_TEST(GFC3D_TwoRods1.dat SICONOS_GLOBAL_FRICTION_3D_NSGS) NEW_GFC_3D_TEST(GFC3D_TwoRods1.dat SICONOS_GLOBAL_FRICTION_3D_NSGS_WR) + IF (WITH_UNSTABLE_TEST) NEW_GFC_3D_TEST(GFC3D_TwoRods1.dat SICONOS_GLOBAL_FRICTION_3D_NSN_AC 0 0 0 0 0 - WILL_FAIL) - + WILL_FAIL) # pass with mumps only + ENDIF() # Alart Curnier functions NEW_TEST(AlartCurnierFunctions_test fc3d_AlartCurnierFunctions_test.c)
Allow logs to be read by others Dynomite assumes the instance its running on is secure, so we default to letting logs be editable by other users as well. This is motivated by the need to allow other agents on the instance to rotate old log files.
@@ -47,7 +47,7 @@ int log_init(int level, char *name) { if (name == NULL || !strlen(name)) { l->fd = STDERR_FILENO; } else { - l->fd = open(name, O_WRONLY | O_APPEND | O_CREAT, 0644); + l->fd = open(name, O_WRONLY | O_APPEND | O_CREAT, 0666); if (l->fd < 0) { log_stderr("opening log file '%s' failed: %s", name, strerror(errno)); return -1;
Remove warnings about unused variables.
@@ -195,6 +195,8 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr, || (use_systemd && (s = systemd_get_activated(family, socktype, -1, addr, addrlen, NULL)) == -1)) { +#else + (void)use_systemd; #endif if((s = socket(family, socktype, 0)) == -1) { *inuse = 0; @@ -613,6 +615,8 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto, && (s = systemd_get_activated(addr->ai_family, addr->ai_socktype, 1, addr->ai_addr, addr->ai_addrlen, NULL)) == -1)) { +#else + (void)use_systemd; #endif if((s = socket(addr->ai_family, addr->ai_socktype, 0)) == -1) { #ifndef USE_WINSOCK @@ -807,6 +811,9 @@ create_local_accept_sock(const char *path, int* noproto, int use_systemd) #ifdef HAVE_SYS_UN_H int s; struct sockaddr_un usock; +#ifndef HAVE_SYSTEMD + (void)use_systemd; +#endif verbose(VERB_ALGO, "creating unix socket %s", path); #ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
Disable OPENMVPT Travis target
@@ -73,13 +73,6 @@ jobs: name: PORTENTA_WORKSPACE # workspace names are escaped. paths: ~/build/$TARGET - - stage: build - env: TARGET=OPENMVPT - workspaces: - create: - name: OPENMVPT_WORKSPACE # workspace names are escaped. - paths: ~/build/$TARGET - - stage: build env: TARGET=NANO33 workspaces: @@ -115,12 +108,11 @@ jobs: - OPENMV4_WORKSPACE - OPENMV4P_WORKSPACE - PORTENTA_WORKSPACE - - OPENMVPT_WORKSPACE - NANO33_WORKSPACE - WINC1500_WORKSPACE - CYW4343_WORKSPACE script: - - zip -r firmware_${TRAVIS_TAG}.zip OPENMV2 OPENMV3 OPENMV4 OPENMV4P PORTENTA OPENMVPT NANO33 WINC1500 CYW4343 + - zip -r firmware_${TRAVIS_TAG}.zip OPENMV2 OPENMV3 OPENMV4 OPENMV4P PORTENTA NANO33 WINC1500 CYW4343 deploy: provider: releases api_key:
sensor_shell: return error in sensor_cmd_notify if no sensor found
@@ -789,6 +789,8 @@ sensor_cmd_notify(char *name, bool on, char *type_string) sensor = sensor_mgr_find_next_bydevname(name, NULL); if (!sensor) { console_printf("Sensor %s not found!\n", name); + rc = SYS_EINVAL; + goto done; } if (!strcmp(type_string, "single")) {
Updated changelog with release notes for 11.5-0, 11.6-1, 11.6-2
-aomp (11.0-1) UNRELEASED; urgency=medium +aomp (11.6-2) UNRELEASED; urgency=medium * Initial release of aomp is 0.3-2 * Please see example in /usr/lib/aomp/examples/vmuldemo @@ -329,4 +329,42 @@ aomp (11.0-1) UNRELEASED; urgency=medium * Issue #89 Linker error (The file was not recognized as a valid object file) when trying to * link archive file on command line * Issue #92 hipcc fails when AOMP is not installed in /usr/lib/aomp - -- Greg Rodgers <[email protected]> Tue, 07 Apr 2020 10:48:19 -0500 + * + * 11.5-0 + * Start using month in the release number consistent with ROCM numbering. + * However the version will continue to use the LLVM version number. + * Merge a fork of atmi and hostcall into the libomptarget hsa plugin. This removes + * dependencies on these two external components and allows us to streamline the code + * for the openmp device plugin. Merging this code caused the trunk delta to go up significantly + * as we prepare to submit this plugin upstream. + * Improved solvv coverage 9/201 fails, 95% passing rate on amdgcn + * AOMP supports -g compilation of C/C++ codes and will allow on target debugging. This is initial functionality. + * Hipcc now uses AOMP env variable to support installs not located in /usr/lib/aomp + * + * 11.6-1 + * Upgraded to ROCm 3.5 HIP/ROCclr + * Upgraded ROCt ROCr to 3.5 sources + * + * 11.6-2 + * Enabled OpenMP 5.0 by default, use -fopenmp-version=45 to enable OpenMP 4.5 compliance. + * Restructuring to prepare for upstream and inclusion to ROCm compiler. + * Fix issue #114 fix bitcode search path using hip policy HIP_DEVICE_LIB_PATH and hip-device-lib + * command line option. + * Turn on global_free for kmpc_impl_free. + * Significant cleanup and restructuring of hostrpc including: + * -Get rid of hostcall register functions. Replace with handlePayload(service, payload). + * handlPayload has a simple switch to call the correct service handler function. + * -Get rid of WITH_HSA macro. It is always on. + * -Move the hostrpc stubs and host fallback functions into a single library and include file. + * -It also makes the stubs openmp cpp source instead of hip and reorganizes everything in the directory + * openmp/libomptarget/hostrpc. + * -Move hostrpc_invoke.cl into DeviceRTLs/amdgcn because it is arch specific. + * -Generalize the vargs processing in printf to work for any vargs function that we want + * to execute on the host, including a vargs function that uses a function pointer. + * -Reorganize files, add global_allocate and global_free, and fix some compile warnings. + * -Fix llvm TypeID enum to match current upstream llvm TypeID. + * Moved strlen_max function inside the declare target #ifdef _DEVICE_GPU in hostrpc.cpp to resolve linker + * failure seen in pfspecifier_str smoke test. + * Fixed AOMP_GIT_CHECK_BRANCH in aomp_common_vars to not block builds in Red Hat if repo is on a specific commit hash. + + -- Greg Rodgers <[email protected]> Tue, 30 Jun 2020 10:40:48 -0500
[chainmaker][#436]add host name in Makefile
@@ -16,8 +16,8 @@ DEPENDENCE_LIBS = $(BOAT_LIB_DIR)/libboatwallet.a \ BOAT_CFLAGS += -DTEST_CHAINMAKER_NODE_URL=\"$(CHAINMKER_NODE_URL)\"\ -DTEST_CHAINMAKER_CHAIN_ID=\"$(CHAINMKER_CHAIN_ID)\"\ - -DTEST_CHAINMAKER_ORG_ID=\"$(CHAINMKER_ORG_ID)\" - + -DTEST_CHAINMAKER_ORG_ID=\"$(CHAINMKER_ORG_ID)\"\ + -DTEST_CHAINMAKER_HOST_NAME=\"$(CHAINMKER_HOST_NAME)\" all: $(OBJECTS_DIR) $(OBJECTS) $(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(OBJECTS) $(DEPENDENCE_LIBS) -o $(EXECUTABLE_DIR)/boattest
hssi: support new glob format for upstreamed drivers The glob path used to discover the ethernet interface name was updated by recent driver changes. Support both the old and the new formats.
@@ -57,39 +57,64 @@ public: : test_afu("hssi") {} - std::string ethernet_interface() + bool glob_ethernet_interface(const std::string &glob_pattern, std::string &eth_ifc) { - auto props = properties::get(handle_); + glob_t gl; - std::ostringstream oss; - oss << "/sys/bus/pci/devices/" << - std::setw(4) << std::setfill('0') << std::hex << props->segment << ":" << - std::setw(2) << std::setfill('0') << std::hex << props->bus << ":" << - std::setw(2) << std::setfill('0') << std::hex << props->device << "." << - std::setw(1) << std::setfill('0') << std::hex << props->function << - "/fpga_region/region*/dfl-fme.*/dfl-fme.*.*/net/*"; + if (glob(glob_pattern.c_str(), 0, nullptr, &gl)) { + if (gl.gl_pathv) + globfree(&gl); + return false; + } - glob_t gl; - if (glob(oss.str().c_str(), 0, nullptr, &gl)) { + if (!gl.gl_pathc) { if (gl.gl_pathv) globfree(&gl); - return std::string(""); + return false; } if (gl.gl_pathc > 1) std::cerr << "Warning: more than one ethernet interface found." << std::endl; - std::string ifc; - if (gl.gl_pathc) { - ifc = gl.gl_pathv[0]; + std::string ifc(gl.gl_pathv[0]); size_t pos = ifc.rfind("/") + 1; - ifc = ifc.substr(pos); - } + eth_ifc = ifc.substr(pos); if (gl.gl_pathv) globfree(&gl); + return true; + } + + std::string ethernet_interface() + { + auto props = properties::get(handle_); + + std::ostringstream oss; + oss << "/sys/bus/pci/devices/" << + std::setw(4) << std::setfill('0') << std::hex << props->segment << ":" << + std::setw(2) << std::setfill('0') << std::hex << props->bus << ":" << + std::setw(2) << std::setfill('0') << std::hex << props->device << "." << + std::setw(1) << std::setfill('0') << std::hex << props->function << + "/fpga_region/region*/dfl-fme.*/dfl-fme.*.*/net/*"; + + std::string ifc; + + if (glob_ethernet_interface(oss.str(), ifc)) + return ifc; + + std::ostringstream oss2; + oss2 << "/sys/bus/pci/devices/" << + std::setw(4) << std::setfill('0') << std::hex << props->segment << ":" << + std::setw(2) << std::setfill('0') << std::hex << props->bus << ":" << + std::setw(2) << std::setfill('0') << std::hex << props->device << "." << + std::setw(1) << std::setfill('0') << std::hex << props->function << + "/fpga_region/region*/dfl-fme.*/dfl_dev.*/net/*"; + + if (glob_ethernet_interface(oss2.str(), ifc)) return ifc; + + return std::string(""); } void mbox_write(uint16_t offset, uint32_t data)
arm/cache: fix build warning on LLVM clang armv7-m/arm_cache.c:93:24: warning: unused function 'arm_clz' [-Wunused-function] static inline uint32_t arm_clz(unsigned int value) ^
* ****************************************************************************/ +#ifdef CONFIG_ARMV7M_DCACHE static inline uint32_t arm_clz(unsigned int value) { uint32_t ret; @@ -97,6 +98,7 @@ static inline uint32_t arm_clz(unsigned int value) __asm__ __volatile__ ("clz %0, %1" : "=r"(ret) : "r"(value)); return ret; } +#endif /**************************************************************************** * Public Functions
In NxWM unit test, call boardctl(BOARDIOC_INIT) if available and appropriate.
#include <cstdlib> #include <cunistd> +#include <sys/boardctl.h> + #ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA # include "platform/configdata.hr" #endif @@ -675,6 +677,16 @@ int nxwm_main(int argc, char *argv[]) up_cxxinitialize(); #endif + // Should we perform board-specific initialization? There are two ways + // that board initialization can occur: 1) automatically via + // board_initialize() durring bootup if CONFIG_BOARD_INITIALIZE, or + // 2) here via a call to boardctl() if the interface is enabledi + // (CONFIG_LIB_BOARDCTL=y). + +#if defined(CONFIG_LIB_BOARDCTL) && !defined(CONFIG_BOARD_INITIALIZE) + (void)boardctl(BOARDIOC_INIT, 0); +#endif + // Initialize memory monitor logic initMemoryUsage(); @@ -688,6 +700,7 @@ int nxwm_main(int argc, char *argv[]) printf("nxwm_main: ERROR: Failed to initialize the NSH library\n"); return EXIT_FAILURE; } + showTestCaseMemory("nxwm_main: After initializing the NSH library"); #endif
Add dbg-io module for JN516x platform As JN516x is not an ARM core, it will not inherit configuration from Makefile.arm, so all required options has to be in Makefile.jn516x
@@ -111,6 +111,8 @@ endif CONTIKI_TARGET_DIRS = . dev CONTIKI_TARGET_MAIN = platform.c +MODULES += os/lib/dbg-io + ifeq ($(JN516x_WITH_DR1175),1) JN516x_WITH_DR1174 = 1 CFLAGS += -DSENSOR_BOARD_DR1175
11. single-home %gall state-machine
:::::::::::::::::::::::::::::::::::::::::::::::::::::: ++ mo ~% %gall-mo +> ~ - |_ $: $: our/@p - hen/duct - moz/(list move) + |_ $: $: hen=duct + moz=(list move) == mast == ++ mo-abed :: initialize - |= {our/@p hen/duct} + |= hen=duct ^+ +> %_ +> - our our hen hen +<+ (~(got by pol.all) our) == ?. (~(has by pol.all) p.p.q.hic) ~& [%gall-not-ours p.p.q.hic] [~ ..^$] - mo-abet:(mo-conf:(mo-abed:mo p.p.q.hic hen) q.p.q.hic q.q.hic) + mo-abet:(mo-conf:(mo-abed:mo hen) q.p.q.hic q.q.hic) :: $deal =< mo-abet ?. (~(has by pol.all) q.p.q.hic) :: either to us ?> (~(has by pol.all) p.p.q.hic) :: or from us - (mo-away:(mo-abed:mo p.p.q.hic hen) q.p.q.hic q.q.hic) - (mo-come:(mo-abed:mo q.p.q.hic hen) p.p.q.hic q.q.hic) + (mo-away:(mo-abed:mo hen) q.p.q.hic q.q.hic) + (mo-come:(mo-abed:mo hen) p.p.q.hic q.q.hic) :: $init :: ~& [%gall-init p.q.hic] ?: ?=($ge i.q.q.hic) =+ mes=((hard {@ud rook}) r.q.hic) =< mo-abet - (mo-gawk:(mo-abed:mo our hen) him dap mes) + (mo-gawk:(mo-abed:mo hen) him dap mes) =+ mes=((hard {@ud roon}) r.q.hic) =< mo-abet - (mo-gawd:(mo-abed:mo our hen) him dap mes) + (mo-gawd:(mo-abed:mo hen) him dap mes) :: $wegh :_ ..^$ :_ ~ [~ ~] ?. ?=(^ tyl) ~ - (mo-peek:(mo-abed:mo his *duct) syd high+`his ren tyl) + (mo-peek:(mo-abed:mo *duct) syd high+`his ren tyl) :: ++ stay :: save w+o cache `axle`all ^+ [*(list move) ..^$] ~| [%gall-take tea] ?> ?=({@ ?($sys $use) *} tea) - =+ our=(need (slaw %p i.tea)) - =+ mow=(mo-abed:mo our hen) + =+ mow=(mo-abed:mo hen) ?- i.t.tea $sys mo-abet:(mo-cyst:mow t.t.tea q.hin) $use mo-abet:(mo-cook:mow t.t.tea hin)
scope_getenv -> getenv
@@ -438,7 +438,9 @@ setupProfile(const char *libscopePath, const char *loaderVersion) { * requires libscope specifics that we don't want here. * Should fix that. */ - if (scope_getenv("SCOPE_START_NOPROFILE")) return TRUE; + if (getenv("SCOPE_START_NOPROFILE")) { + return TRUE; + } char buf[PATH_MAX] = {0}; int fd = scope_open("/etc/profile.d/scope.sh", O_CREAT | O_RDWR | O_TRUNC, 0644);
Add comments to else and endif preprocessor directives
extern void *gles, *egl, *bcm_host, *vcos, *gbm; #ifdef AMIGAOS4 #define proc_address(lib, name) os4GetProcAddress(name) -#else +#else // AMIGAOS4 #define proc_address(lib, name) dlsym(lib, name) void *open_lib(const char **names, const char *override); -#endif +#endif // AMIGAOS4 #define WARN_NULL(name) if (name == NULL) LOGD("LIBGL: warning, " #name " is NULL\n"); @@ -99,7 +99,7 @@ void *open_lib(const char **names, const char *override); LOAD_RAW_SILENT(gles, name, proc_address(gles, #name)); \ } -#else +#else // defined(AMIGAOS4) || defined(NOEGL) #define LOAD_GLES_OES(name) \ DEFINE_RAW(gles, name); \ @@ -121,6 +121,6 @@ void *open_lib(const char **names, const char *override); LOAD_EGL(eglGetProcAddress); \ LOAD_RAW_SILENT(gles, name, ((hardext.esversion==1)?((void*)egl_eglGetProcAddress(#name"OES")):((void*)dlsym(gles, #name)))); \ } -#endif // NOEGL +#endif // defined(AMIGAOS4) || defined(NOEGL) #endif // _GL4ES_LOADER_H_
end-to-end tested
# Bitcoin Demo/Integration Test -Dec 9, 2020 -Can use as the base of an integration test. +Use only one of `%main` or `%testnet` for `=network` in the examples below, and use the corresponding `xpubmain` or `xpubtest`. ## Start Services Runs the full node API services. @@ -61,7 +60,7 @@ Using 1 confirmation for testing. `~dopzod` ``` -:btc-wallet|command [%req-pay-address ~zod 20.000 feyb=10] +:btc-wallet|command [%init-payment ~zod 20.000 feyb=10] ``` ### Check State on ~zod/~dopzod @@ -78,11 +77,11 @@ Using 1 confirmation for testing. ### Idempotent `~dopzod` ``` -:btc-wallet|command [%req-pay-address ~zod 3.000 feyb=100] +:btc-wallet|command [%init-payment ~zod 3.000 feyb=100] ``` Or can change amount: ``` -:btc-wallet|command [%req-pay-address ~zod 3.000 feyb=100] +:btc-wallet|command [%init-payment ~zod 3.000 feyb=100] ``` ### Broadcast the Signed TX
add the category the git package to fix installation packages on gentoo are named as category/package, allowing there to be multiple packages of the same name.
@@ -153,7 +153,7 @@ install_tools() { yum --version >/dev/null 2>&1 && $sudoprefix yum install -y git readline-devel ccache && $sudoprefix yum groupinstall -y 'Development Tools'; } || { zypper --version >/dev/null 2>&1 && $sudoprefix zypper --non-interactive install git readline-devel ccache && $sudoprefix zypper --non-interactive install -t pattern devel_C_C++; } || { pacman -V >/dev/null 2>&1 && $sudoprefix pacman -S --noconfirm --needed git base-devel ccache; } || - { emerge -V >/dev/null 2>&1 && $sudoprefix emerge -atv git ccache gentoolkit; } || + { emerge -V >/dev/null 2>&1 && $sudoprefix emerge -atv dev-vcs/git ccache gentoolkit; } || { pkg list-installed >/dev/null 2>&1 && $sudoprefix pkg install -y git getconf build-essential readline ccache; } || # termux { pkg help >/dev/null 2>&1 && $sudoprefix pkg install -y git readline ccache ncurses; } || # freebsd { apk --version >/dev/null 2>&1 && $sudoprefix apk add git gcc g++ make readline-dev ncurses-dev libc-dev linux-headers; }
Fixed getblocktemplate for masternode/fortunastakes
@@ -382,6 +382,8 @@ Value getblocktemplate(const Array& params, bool fHelp) " \"payee_amount\" : required amount to pay\n" " \"fortunastake_payments\" : true|false, (boolean) true, if fortunastake payments are enabled" " \"enforce_fortunastake_payments\" : true|false (boolean) true, if fortunastake payments are enforced" + " \"masternode_payments\" : true|false, (boolean) true, if fortunastake payments are enabled" + " \"enforce_masternode_payments\" : true|false (boolean) true, if fortunastake payments are enforced" "See https://en.bitcoin.it/wiki/BIP_0022 for full specification."); std::string strMode = "template"; @@ -563,14 +565,15 @@ Value getblocktemplate(const Array& params, bool fHelp) CBitcoinAddress address2(address1); result.push_back(Pair("payee", address2.ToString().c_str())); result.push_back(Pair("payee_amount", (int64_t)GetFortunastakePayment(pindexPrev->nHeight+1, pblock->vtx[0].GetValueOut()))); - } - else { + } else { result.push_back(Pair("payee", "")); result.push_back(Pair("payee_amount", "")); } result.push_back(Pair("fortunastake_payments", bFortunastakePayments)); result.push_back(Pair("enforce_fortunastake_payments", bFortunastakePayments)); + result.push_back(Pair("masternode_payments", bFortunastakePayments)); + result.push_back(Pair("enforce_masternode_payments", bFortunastakePayments)); return result; } @@ -600,4 +603,3 @@ Value submitblock(const Array& params, bool fHelp) return Value::null; } -
Fix %next to not cancel the subscription if the watched file doesn't yet exist. Instead, register file creation as a change.
++ cach (unit (each cage lobe)) :: cached result ++ rove :: stored request $% {$sing p/mood} :: single request - {$next p/mood q/(unit (each cage lobe))} :: next version + {$next p/mood q/(unit cach)} :: next version $: $mult :: next version of any p/care :: q/(jug case spur) :: :: $next =+ ver=(aver p.rav) - ?~ ver - (duce [- p ~]:rav) - ?~ u.ver - (blub hen) + ?. ?=({$~ $~ *} ver) (duce -.rav p.rav ver) =+ yon=+((need (case-to-aeon:ze q.p.rav))) |- ^+ +>.^$ ?: (gth yon let.dom) - (duce -.rav p.rav u.ver) + (duce -.rav p.rav ver) =+ var=(aver p.rav(q [%ud yon])) ?~ var ~& [%oh-no rave=rav aeon=yon letdom=let.dom] :: $next =* mun p.p.i.xiq - :: =* dat q.p.i.xiq XX can't fuse right now - ?~ q.p.i.xiq + =* dat q.p.i.xiq + =; nex/(each _..wake _xaq) + ?: ?=($& -.nex) + $(xiq t.xiq, ..wake p.nex) + $(xiq t.xiq, xaq p.nex) + ?~ dat + :- %| =+ ver=(aver mun) - ?~ ver - $(xiq t.xiq, xaq [i.xiq xaq]) - ?~ u.ver - $(xiq t.xiq, ..wake (blub-all q.i.xiq ~)) - $(xiq t.xiq, xaq [i.xiq(q.p u.ver) xaq]) - =/ muc mun(q [%ud let.dom]) :: current mood + ?~ ver [i.xiq xaq] + [i.xiq(q.p ver) xaq] + =/ muc mun(q [%ud let.dom]) =+ var=(aver muc) ?~ var ~& [%oh-noes old=mun mood=muc letdom=let.dom] - $(xiq t.xiq) + |+xaq + ?~ u.dat + ?~ u.var |+[i.xiq xaq] :: not added + &+(blab-all q.i.xiq muc u.u.var) :: added ?~ u.var - $(xiq t.xiq, ..wake (blab-all q.i.xiq muc %& %null [%atom %n ~] ~)) - ?: (equivalent-data:ze u.q.p.i.xiq u.u.var) - $(xiq t.xiq, xaq [i.xiq xaq]) - $(xiq t.xiq, ..wake (blab-all q.i.xiq muc u.u.var)) + &+(blab-all q.i.xiq muc %& %null [%atom %n ~] ~):: deleted + ?: (equivalent-data:ze u.u.dat u.u.var) + |+[i.xiq xaq] :: unchanged + &+(blab-all q.i.xiq muc u.u.var) :: changed :: $mult =* rov p.i.xiq $3 ..^$(ruf ruf.old) $2 =/ rov |= a/rove-2 ^- rove - a + ?+ -.a a + $next + ?~ q.a a + a(q `q.a) + == =/ cul |= a/cult-2 ^- cult %- ~(gas by *cult)
docket: account for new kiln fact mark
=* cha ~(. ch desk.diff) ?+ -.diff `state :: - %merge + %commit =* cha ~(. ch desk.diff) ?. docket-exists:cha `state =/ =docket docket:cha
Re-enable typ check for RConfigCoolSetpoint Confirmed to be working as expected. Values must be passed as integer.
@@ -1171,12 +1171,8 @@ int DeRestPluginPrivate::changeSensorConfig(const ApiRequest &req, ApiResponse & } else if (rid.suffix == RConfigCoolSetpoint) { - - // Further Clarification on the type check required. Value should come in as integer by the client and expected as such by the API - // Suspended for now in favor of functionality - - //if (map[pi.key()].type() == QVariant::Double) - //{ + if (map[pi.key()].type() == QVariant::Double) + { qint16 coolsetpoint = map[pi.key()].toInt(&ok); if (addTaskThermostatReadWriteAttribute(task, deCONZ::ZclWriteAttributesId, 0x0000, 0x0011, deCONZ::Zcl16BitInt, coolsetpoint)) @@ -1190,14 +1186,14 @@ int DeRestPluginPrivate::changeSensorConfig(const ApiRequest &req, ApiResponse & rsp.httpStatus = HttpStatusBadRequest; return REQ_READY_SEND; } - /*} + } else { rsp.list.append(errorToMap(ERR_INVALID_VALUE, QString("/sensors/%1/config/%2").arg(id).arg(pi.key()).toHtmlEscaped(), QString("invalid value, %1, for parameter %2").arg(map[pi.key()].toString()).arg(pi.key()).toHtmlEscaped())); rsp.httpStatus = HttpStatusBadRequest; return REQ_READY_SEND; - }*/ + } } else if ((rid.suffix == RConfigMode) && !sensor->modelId().startsWith(QLatin1String("SPZB"))) {
Makefile: On Windows Subsystem for Linux (WSL), build as Posix
@@ -40,8 +40,9 @@ GREP_COLOR ?= OS ?= $(shell uname -s) MARCH ?= $(shell uname -m) +KERNEL ?= $(shell uname -r) -ifeq ($(OS),Linux) +ifeq ($(OS)$(findstring Microsoft,$(KERNEL)),Linux) ARCH := LINUX ARCH_CFLAGS := -std=c11 -I/usr/local/include \
Added infinity guards
@@ -304,7 +304,10 @@ SurviveVelocity *survive_optimizer_get_velocity(survive_optimizer *ctx) { static inline FLT fix_infinity(FLT d) { // assert(isfinite(*d)); - assert(!isnan(d)); + // assert(!isnan(d)); + if (isnan(d)) { + return 0; + } if (!isfinite(d)) { return linmath_enforce_range(d, -1e3, 1e3); } @@ -471,7 +474,7 @@ static void run_single_measurement(survive_optimizer *mpfunc_ctx, size_t meas_id for (int j = 0; j < pose_size; j++) { assert(derivs[jac_offset_obj + j]); - derivs[jac_offset_obj + j][meas_idx] = isfinite(out[j]) ? out[j] / meas->variance : 0; + derivs[jac_offset_obj + j][meas_idx] = fix_infinity(out[j] / meas->variance); } } @@ -485,7 +488,7 @@ static void run_single_measurement(survive_optimizer *mpfunc_ctx, size_t meas_id } for (int j = 0; j < pose_size; j++) { assert(derivs[jac_offset_lh + j]); - derivs[jac_offset_lh + j][meas_idx] = isfinite(out[j]) ? out[j] / meas->variance : 0; + derivs[jac_offset_lh + j][meas_idx] = fix_infinity(out[j] / meas->variance); } } } @@ -750,7 +753,7 @@ static int mpfunc(int m, int n, FLT *p, FLT *deviates, FLT **derivs, void *priva &world2lh->axisAnglePose, cal + axis); } scale3d(ptJac, ptJac, 1. / meas[meas_idx_jac].variance); - derivs[scale_idx][meas_idx + meas_idx_jac] = dot3d(xyzjac_scale, ptJac); + derivs[scale_idx][meas_idx + meas_idx_jac] = fix_infinity(dot3d(xyzjac_scale, ptJac)); } }
Remove redundant environment variable for max connections The function `make_cluster` included a default value for `DEFAULT_QD_MAX_CONNECT` but this value is set in the gpdemo Makefile since commit
@@ -55,9 +55,6 @@ function install_and_configure_gpdb() { function make_cluster() { source /usr/local/greenplum-db-devel/greenplum_path.sh export BLDWRAP_POSTGRES_CONF_ADDONS=${BLDWRAP_POSTGRES_CONF_ADDONS} - # Currently, the max_concurrency tests in src/test/isolation2 - # require max_connections of at least 129. - export DEFAULT_QD_MAX_CONNECT=150 export STATEMENT_MEM=250MB pushd gpdb_src/gpAux/gpdemo su gpadmin -c "source /usr/local/greenplum-db-devel/greenplum_path.sh; make create-demo-cluster"
remove module word from robus.h
******************************************************************************/ void Robus_Init(memory_stats_t *memory_stats); void Robus_Loop(void); -vm_t *Robus_ModuleCreate(uint8_t type); -void Robus_ModulesClear(void); +vm_t *Robus_ContainerCreate(uint8_t type); +void Robus_ContainersClear(void); uint8_t Robus_SendMsg(vm_t *vm, msg_t *msg); uint16_t *Robus_GetNodeBranches(uint8_t *size);
Tested some command sending flavors
@@ -552,7 +552,14 @@ Simple RESP formatting */ static FIOBJ fiobj2resp_tmp(FIOBJ obj1, FIOBJ obj2) { FIOBJ dest = fiobj_str_tmp(); - if (FIOBJ_TYPE(obj2) == FIOBJ_T_ARRAY) { + if (!obj2 || FIOBJ_IS_NULL(obj2)) { + fio_cstr_s s = fiobj_obj2cstr(obj1); + fiobj_str_write(dest, "*1\r\n$", 5); + fiobj_str_join(dest, fiobj_num_tmp(s.len)); + fiobj_str_write(dest, "\r\n", 2); + fiobj_str_write(dest, s.data, s.len); + fiobj_str_write(dest, "\r\n", 2); + } else if (FIOBJ_TYPE(obj2) == FIOBJ_T_ARRAY) { size_t count = fiobj_ary_count(obj2); fiobj_str_write(dest, "*", 1); fiobj_str_join(dest, fiobj_num_tmp(count + 1)); @@ -568,7 +575,7 @@ static FIOBJ fiobj2resp_tmp(FIOBJ obj1, FIOBJ obj2) { for (size_t i = 0; i < count; ++i) { fio_cstr_s s = fiobj_obj2cstr(ary[i]); - fiobj_str_write(dest, "$", 2); + fiobj_str_write(dest, "$", 1); fiobj_str_join(dest, fiobj_num_tmp(s.len)); fiobj_str_write(dest, "\r\n", 2); fiobj_str_write(dest, s.data, s.len); @@ -578,7 +585,7 @@ static FIOBJ fiobj2resp_tmp(FIOBJ obj1, FIOBJ obj2) { } else if (FIOBJ_TYPE(obj2) == FIOBJ_T_HASH) { FIOBJ json = fiobj_obj2json(obj2, 0); fio_cstr_s s = fiobj_obj2cstr(obj1); - fiobj_str_write(dest, "*2\r\n$", 4); + fiobj_str_write(dest, "*2\r\n$", 5); fiobj_str_join(dest, fiobj_num_tmp(s.len)); fiobj_str_write(dest, "\r\n", 2); fiobj_str_write(dest, s.data, s.len); @@ -592,7 +599,7 @@ static FIOBJ fiobj2resp_tmp(FIOBJ obj1, FIOBJ obj2) { } else { fio_cstr_s s = fiobj_obj2cstr(obj1); - fiobj_str_write(dest, "*2\r\n$", 4); + fiobj_str_write(dest, "*2\r\n$", 5); fiobj_str_join(dest, fiobj_num_tmp(s.len)); fiobj_str_write(dest, "\r\n", 2); fiobj_str_write(dest, s.data, s.len);
Decouple cache attached state from metadata refcount state
@@ -47,7 +47,7 @@ bool ocf_cache_is_running(ocf_cache_t cache) bool ocf_cache_is_device_attached(ocf_cache_t cache) { OCF_CHECK_NULL(cache); - return !ocf_refcnt_frozen(&cache->refcnt.metadata); + return !!cache->device; } ocf_cache_mode_t ocf_cache_get_mode(ocf_cache_t cache)
Improve extern call with {} parts
@@ -730,7 +730,6 @@ def gen_methodcall(mcall): funname = f'{m.path.name}{type_args_postfix}' argtypes = ", ".join(mcall.arguments.filter(lambda arg: not arg.is_vec()).map('expression').map(format_with_ref).filter(lambda t: t is not None) + ['SHORT_STDPARAMS']) - funname = funname_map[funname] if funname in funname_map else funname #[ ${format_expr(mcall, funname_override=funname)}; @@ -1015,9 +1014,9 @@ def gen_list_elems(elems, last): #[ ${', ' if len(elems) > 0 else ''}${last} -def gen_format_method_parameter(par, buf=None): - if 'expression' in par and par.expression.node_type in ('ListExpression'): - return buf +def gen_format_method_parameter(par, listexpr_to_buf): + if 'expression' in par and (listexpr := par.expression).node_type in ('ListExpression'): + return listexpr_to_buf[listexpr] if 'expression' in par and 'fld_ref' in par.expression: expr = par.expression.expr @@ -1106,13 +1105,8 @@ def gen_pre_format_call_extern_make_buf_data(component, vardata, varoffset): addError('Calling extern', f'Encountered unexpected extern argument of type {component.node_type}') -def gen_format_call_extern(args, mname, m, funname_override=None): - if funname_override is not None: - mname = funname_override - - listexprs = args.map('expression').filter('node_type', 'ListExpression') - if len(listexprs) > 0: - lec = listexprs[0].components +def gen_prepare_listexpr_arg(listexpr): + lec = listexpr.components components = lec.flatmap(lambda comp: comp.components if comp.node_type == 'ListExpression' else [comp]) hdrflds = components.map(get_hdrfld_name) @@ -1134,8 +1128,23 @@ def gen_format_call_extern(args, mname, m, funname_override=None): #pre[ .buffer = $vardata, #pre} }; + return buf + + +def gen_format_call_extern(args, mname, m, funname_override=None): + if funname_override is not None: + mname = funname_override + + fmt_args = [] + listexpr_to_buf = {} + + for listexpr in args.map('expression').filter('node_type', 'ListExpression'): + buf = gen_prepare_listexpr_arg(listexpr) + listexpr_to_buf[listexpr] = buf + with SugarStyle("inline_comment"): - fmt_args = [fmt_arg for arg in args if not arg.is_vec() for fmt_arg in [gen_format_method_parameter(arg, buf)] if fmt_arg is not None] + fmt_args += [fmt_arg for arg in args if not arg.is_vec() for fmt_arg in [gen_format_method_parameter(arg, listexpr_to_buf)] if fmt_arg is not None] + #[ $mname(${gen_list_elems(fmt_args, "SHORT_STDPARAMS_IN")}) ##############
procmeminfo:support memdump can show specific task for tlsf
#include <nuttx/fs/procfs.h> #include <nuttx/mutex.h> #include <nuttx/mm/mm.h> +#include <nuttx/sched.h> #include <nuttx/mm/mempool.h> #include "tlsf/tlsf.h" @@ -144,9 +145,15 @@ struct memdump_backtrace_s static void memdump_backtrace(FAR struct mm_heap_s *heap, FAR struct memdump_backtrace_s *dump) { +# if CONFIG_MM_BACKTRACE > 0 + FAR struct tcb_s *tcb; +# endif + dump->pid = getpid(); # if CONFIG_MM_BACKTRACE > 0 - if (heap->mm_procfs.backtrace) + tcb = nxsched_get_tcb(dump->pid); + if (heap->mm_procfs.backtrace || + (tcb && tcb->flags & TCB_FLAG_HEAPDUMP)) { int ret = backtrace(dump->backtrace, CONFIG_MM_BACKTRACE); while (ret < CONFIG_MM_BACKTRACE)
BugID:18874122: min tx data rate DR_0
/*! * Minimal datarate that can be used by the node */ -#define CN470_TX_MIN_DATARATE DR_2 +#define CN470_TX_MIN_DATARATE DR_0 /*! * Maximal datarate that can be used by the node
[core] perf: buffer.c internal inlines buffer_copy_string_len() and buffer_append_string_len() now internally inline what buffer_commit() does, but do not repeat the sanity checks already enforced by buffer_string_prepare_copy() and buffer_string_prepare_append(), respectively buffer_string_set_length() short-circuit common case
@@ -145,9 +145,11 @@ char* buffer_string_prepare_append(buffer *b, size_t size) { void buffer_string_set_length(buffer *b, size_t len) { force_assert(NULL != b); - force_assert(len + 1 > len); + if (len >= b->size) { + force_assert(len + 1 > len); buffer_realloc(b, len + 1); + } b->used = len + 1; b->ptr[len] = '\0'; @@ -181,9 +183,9 @@ void buffer_copy_string_len(buffer *b, const char *s, size_t s_len) { buffer_string_prepare_copy(b, s_len); - if (0 != s_len) memcpy(b->ptr, s, s_len); - - buffer_commit(b, s_len); + if (0 != s_len) memcpy(b->ptr, s, s_len); /*(s might be NULL)*/ + b->ptr[s_len] = '\0'; + b->used = s_len + 1; } void buffer_copy_buffer(buffer *b, const buffer *src) { @@ -218,11 +220,11 @@ void buffer_append_string_len(buffer *b, const char *s, size_t s_len) { target_buf = buffer_string_prepare_append(b, s_len); - if (0 == s_len) return; /* nothing to append */ + if (0 == s_len) return; /* nothing to append *//*(s might be NULL)*/ memcpy(target_buf, s, s_len); - - buffer_commit(b, s_len); + target_buf[s_len] = '\0'; + b->used += s_len; } void buffer_append_string_buffer(buffer *b, const buffer *src) {
Swig: Add properties to Morphism.
tinyspline::Vec3, binormal, binormal); +%attributeval(tinyspline::Morphism, + tinyspline::BSpline, + origin, + origin); +%attributeval(tinyspline::Morphism, + tinyspline::BSpline, + target, + target); +%attribute(tinyspline::Morphism, + tinyspline::real, + epsilon, + epsilon); %attribute(tinyspline::Vec2, tinyspline::real, x,
s5j/serial: fix invalid clock configuration on UART4 UARTDBG has incorrect PCLK and EXTCLK configurations. This may cause system hang when we access UARTDBG if it is not set as a default console.
@@ -971,8 +971,8 @@ static struct up_dev_s g_uart4priv = { .stopbits2 = CONFIG_UART4_2STOP, .rxd = GPIO_UART4_RXD, .txd = GPIO_UART4_TXD, - .pclk = CLK_GATE_UART0_PCLK, - .extclk = CLK_GATE_UART0_EXTCLK, + .pclk = CLK_GATE_UARTDBG_PCLK, + .extclk = CLK_GATE_UARTDBG_EXTCLK, }; static uart_dev_t g_uart4port = {
apps/examples/le_tc/kernel/tc_mqueue.c : Add missing return statement In tc_mqueue_mq_timedsend_timedreceive_failurechecks, return statement is missed. So duplicated mq_close prints the below ERRORs. mq_close_group: ERROR: mqdes(xxxxx) is not in this thread's group.
@@ -846,7 +846,11 @@ static void tc_mqueue_mq_timedsend_timedreceive_failurechecks(void) TC_ASSERT_GEQ_CLEANUP("timedreceive_test", mq_close(g_timedrecv_mqfd), 0, goto cleanup1); TC_ASSERT_GEQ("timedsend_test", mq_close(g_timedsend_mqfd), 0); + /* Unlink all mqueues related to this tc. */ + mq_unlink("t_mqueuer"); + mq_unlink("t_mqueues"); TC_SUCCESS_RESULT(); + return; cleanup2: mq_close(g_timedrecv_mqfd);
Only scale test counts if repeats > 1
@@ -462,9 +462,9 @@ def main(): # The fast and fastest presets are now sufficiently fast that # the results are noisy without more repeats testRepeats = args.testRepeats - if quality == "fast": + if quality == "fast" and testRepeats > 1: testRepeats *= 2 - elif quality == "fastest": + elif quality == "fastest" and testRepeats > 1: testRepeats *= 4 resultSet = run_test_set(encoder, testRef, testSet, quality,
ec: Only build ecp_nistp521-ppc64.s if enable-ec_nistp_64_gcc_128
@@ -30,9 +30,13 @@ IF[{- !$disabled{asm} -}] $ECASM_parisc20_64= $ECASM_ppc32= - $ECASM_ppc64=ecp_nistz256.c ecp_nistz256-ppc64.s ecp_nistp521-ppc64.s x25519-ppc64.s - $ECDEF_ppc64=ECP_NISTZ256_ASM ECP_NISTP521_ASM X25519_ASM + $ECASM_ppc64=ecp_nistz256.c ecp_nistz256-ppc64.s x25519-ppc64.s + $ECDEF_ppc64=ECP_NISTZ256_ASM X25519_ASM + IF[{- !$disabled{'ec_nistp_64_gcc_128'} -}] + $ECASM_ppc64=$ECASM_ppc64 ecp_nistp521-ppc64.s + $ECDEF_ppc64=$ECDEF_ppc64 ECP_NISTP521_ASM INCLUDE[ecp_nistp521.o]=.. + ENDIF $ECASM_c64xplus=
sosreport: update instance structure fields
@@ -203,8 +203,8 @@ int flb_sosreport(struct flb_config *config) print_host(&ins_in->host); } - if (ins_in->mp_buf_limit > 0) { - flb_utils_bytes_to_human_readable_size(ins_in->mp_buf_limit, + if (ins_in->mem_buf_limit > 0) { + flb_utils_bytes_to_human_readable_size(ins_in->mem_buf_limit, tmp, sizeof(tmp) - 1); printf(" Mem_Buf_Limit\t%s\n", tmp); }
sds: fix missing va_end(x) on flb_sds_printf() call when an increase is required
@@ -107,11 +107,7 @@ flb_sds_t flb_sds_increase(flb_sds_t s, size_t len) flb_errno(); return NULL; } - - if (tmp != head) { - head = tmp; - } - + head = (struct flb_sds *) tmp; head->alloc += len; out = head->buf; @@ -308,34 +304,35 @@ flb_sds_t flb_sds_printf(flb_sds_t *sds, const char *fmt, ...) } va_start(ap, fmt); - size = vsnprintf((char *) (s + flb_sds_len(s)), flb_sds_avail(s), fmt, ap); if (size < 0) { flb_warn("[%s] buggy vsnprintf return %d", __FUNCTION__, size); va_end(ap); return NULL; } + va_end(ap); + if (size > flb_sds_avail(s)) { tmp = flb_sds_increase(s, size); if (!tmp) { - va_end(ap); return NULL; } *sds = s = tmp; + + va_start(ap, fmt); size = vsnprintf((char *) (s + flb_sds_len(s)), flb_sds_avail(s), fmt, ap); if (size > flb_sds_avail(s)) { flb_warn("[%s] vsnprintf is insatiable ", __FUNCTION__); va_end(ap); return NULL; } + va_end(ap); } head = FLB_SDS_HEADER(s); head->len += size; s[head->len] = '\0'; - va_end(ap); - return s; }
cleanup: add prototype incorrectly removed CL:1900058 accidentally removed this prototype that was initially added in CL:1891255. BRANCH=none TEST=builds
@@ -2329,6 +2329,17 @@ void pd_notify_dp_alt_mode_entry(void); enum pd_cc_states pd_get_cc_state( enum tcpc_cc_voltage_status cc1, enum tcpc_cc_voltage_status cc2); +/* + * Optional, get the board-specific SRC DTS polarity. + * + * This function is used for SRC DTS mode. The polarity is predetermined as a + * board-specific setting, i.e. what Rp impedance the CC lines are pulled. + * + * @param port USB-C port number + * @return port polarity (0=CC1, 1=CC2) + */ +__override_proto uint8_t board_get_src_dts_polarity(int port); + /* ----- Logging ----- */ #ifdef CONFIG_USB_PD_LOGGING /**
xeonphi: make the interphi channel to be large page sized
#ifndef XEON_PHI_INTERPHI_H #define XEON_PHI_INTERPHI_H -#define XEON_PHI_INTERPHI_CHANNEL_SIZE BASE_PAGE_SIZE +#define XEON_PHI_INTERPHI_CHANNEL_SIZE (LARGE_PAGE_SIZE / 2) #define XEON_PHI_INTERPHI_FRAME_SIZE (2* XEON_PHI_INTERPHI_CHANNEL_SIZE)