message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Remove boomerang member from projectile struct. | @@ -1852,7 +1852,6 @@ typedef struct
int knife; // custknife;
s_axis_principal_int position; // Location at which projectiles are spawned
int star; // custstar;
- int boomerang; // custboomerang;
} s_projectile;
typedef struct
|
Copy gemspec to the build directory | @@ -270,7 +270,9 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: ruby-${{ matrix.ruby }}-${{ matrix.os }}_amd64
- path: ${{runner.workspace}}/build/*.gem
+ path: |
+ ${{runner.workspace}}/build/*.gem
+ ${{runner.workspace}}/build/*.gemspec
if-no-files-found: error
uwp:
@@ -331,7 +333,7 @@ jobs:
mv actions/docker/* build
mkdir -p build/macosx64
find actions -name '*win_amd64.whl' -exec mv {} build/windows64 \;
- find actions -name '*darwin*.gem' -exec mv {} build/macosx64 \;
+ find actions -name '*darwin*.gem' -exec mv {} build/macosx64 \; -printf "%h\n" | xargs -I[] find [] -name '*.gemspec' -exec mv {} build/macosx64 \;
find actions/macos_amd64 -name '*go.zip' -exec mv {} build/macosx64 \;
find actions/macos_amd64 -name '*.jar' -exec mv {} build/macosx64 \;
find actions/macos_amd64 -name '*.nupkg' -exec mv {} build/macosx64 \;
|
mlibc/libc: Transfer DrmMode in {GET, SET}CRTC | @@ -1155,6 +1155,22 @@ int ioctl(int fd, unsigned long request, void *arg) {
param->gamma_size = resp.drm_gamma_size();
param->mode_valid = resp.drm_mode_valid();
+ param->mode.clock = resp.drm_mode().clock();
+ param->mode.hdisplay = resp.drm_mode().hdisplay();
+ param->mode.hsync_start = resp.drm_mode().hsync_start();
+ param->mode.hsync_end = resp.drm_mode().hsync_end();
+ param->mode.htotal = resp.drm_mode().htotal();
+ param->mode.hskew = resp.drm_mode().hskew();
+ param->mode.vdisplay = resp.drm_mode().vdisplay();
+ param->mode.vsync_start = resp.drm_mode().vsync_start();
+ param->mode.vsync_end = resp.drm_mode().vsync_end();
+ param->mode.vtotal = resp.drm_mode().vtotal();
+ param->mode.vscan = resp.drm_mode().vscan();
+ param->mode.vrefresh = resp.drm_mode().vrefresh();
+ param->mode.flags = resp.drm_mode().flags();
+ param->mode.type = resp.drm_mode().type();
+ memcpy(param->mode.name, resp.drm_mode().name().data(), resp.drm_mode().name().size());
+
return resp.result();
}
case DRM_IOCTL_MODE_SETCRTC: {
@@ -1175,6 +1191,23 @@ int ioctl(int fd, unsigned long request, void *arg) {
req.set_drm_crtc_id(param->crtc_id);
req.set_drm_fb_id(param->fb_id);
+ req.mutable_drm_mode().set_clock(param->mode.clock);
+ req.mutable_drm_mode().set_hdisplay(param->mode.hdisplay);
+ req.mutable_drm_mode().set_hsync_start(param->mode.hsync_start);
+ req.mutable_drm_mode().set_hsync_end(param->mode.hsync_end);
+ req.mutable_drm_mode().set_htotal(param->mode.htotal);
+ req.mutable_drm_mode().set_hskew(param->mode.hskew);
+ req.mutable_drm_mode().set_vdisplay(param->mode.vdisplay);
+ req.mutable_drm_mode().set_vsync_start(param->mode.vsync_start);
+ req.mutable_drm_mode().set_vsync_end(param->mode.vsync_end);
+ req.mutable_drm_mode().set_vtotal(param->mode.vtotal);
+ req.mutable_drm_mode().set_vscan(param->mode.vscan);
+ req.mutable_drm_mode().set_vrefresh(param->mode.vrefresh);
+ req.mutable_drm_mode().set_flags(param->mode.flags);
+ req.mutable_drm_mode().set_type(param->mode.type);
+ req.mutable_drm_mode().set_name(frigg::String<MemoryAllocator>(getAllocator(),
+ param->mode.name, strlen(param->mode.name)));
+
frigg::String<MemoryAllocator> ser(getAllocator());
req.SerializeToString(&ser);
actions[0].type = kHelActionOffer;
|
Remove unused string reference | @@ -787,12 +787,13 @@ VOID PhGetStockApplicationIcon(
if (systemDirectory = PhGetSystemDirectory())
{
- PH_STRINGREF dllBaseName;
+ dllFileName = PhConcatStringRefZ(&systemDirectory->sr, L"\\user32.dll");
- PhInitializeStringRef(&dllBaseName, L"\\user32.dll");
- dllFileName = PhConcatStringRef2(&systemDirectory->sr, &dllBaseName);
-
- PhExtractIcon(dllFileName->Buffer, &largeIcon, &smallIcon);
+ PhExtractIcon(
+ dllFileName->Buffer,
+ &largeIcon,
+ &smallIcon
+ );
PhDereferenceObject(dllFileName);
PhDereferenceObject(systemDirectory);
|
nrf52820_hic: Configure NFC pins as GPIO in nRF52833. | #include "gpio_extra.h"
#include "compiler.h"
+#include "nrf_nvmc.h"
#include "dl_nrf_gpio.h"
#define NRF52833_COMBINED_SENSOR_INT_PIN NRF_GPIO_PIN_MAP(0, 9)
@@ -35,6 +36,15 @@ static const uint32_t COMBINED_SENSOR_INT_PIN = NRF52820_COMBINED_SENSOR_INT_PIN
COMPILER_ASSERT(GPIO_CHECK_PRESENT_NRF52820(NRF52820_COMBINED_SENSOR_INT_PIN));
#endif
+/* NFC configuration in the User UICR area, needed to configure NFC pins as GPIO */
+#define NRF52833_UICR_NFCPINS_OFFSET (0x20CUL)
+#define NRF52833_UCIR_NFCPINS_ADDRESS (NRF_UICR_BASE + NRF52833_UICR_NFCPINS_OFFSET)
+#define NRF52833_UICR_NFCPINS_PROTECT_Pos (0UL) /*!< Position of PROTECT field. */
+#define NRF52833_UICR_NFCPINS_PROTECT_Msk (0x1UL << NRF52833_UICR_NFCPINS_PROTECT_Pos) /*!< Bit mask of PROTECT field. */
+#define NRF52833_UICR_NFCPINS_PROTECT_Disabled (0UL) /*!< Operation as GPIO pins. Same protection as normal GPIO pins. */
+#define NRF52833_UICR_NFCPINS_PROTECT_NFC (1UL) /*!< Operation as NFC antenna pins. Configures the protection for NFC operation. */
+
+
void gpio_enable_hid_led()
{
gpio_cfg_output(GPIO_REG(LED_HID), GPIO_IDX(LED_HID));
@@ -57,6 +67,18 @@ void gpio_init_combined_int()
if (NRF_FICR->INFO.PART == 0x52833) {
// nRF52833
COMBINED_SENSOR_INT_PIN = NRF52833_COMBINED_SENSOR_INT_PIN;
+
+ // Configure the NFC pins as GPIO in the UICR if not done already
+ volatile uint32_t* const nrf_uicr_nfcpins = (uint32_t *) NRF52833_UCIR_NFCPINS_ADDRESS;
+ if ((*nrf_uicr_nfcpins & NRF52833_UICR_NFCPINS_PROTECT_Msk) ==
+ (NRF52833_UICR_NFCPINS_PROTECT_NFC << NRF52833_UICR_NFCPINS_PROTECT_Pos)) {
+ nrf_nvmc_mode_set(NRF_NVMC, NRF_NVMC_MODE_WRITE);
+ *nrf_uicr_nfcpins &= ~NRF52833_UICR_NFCPINS_PROTECT_Msk;
+ while (!nrf_nvmc_ready_check(NRF_NVMC));
+ nrf_nvmc_mode_set(NRF_NVMC, NRF_NVMC_MODE_READONLY);
+ // Changes only take effect after a system reset
+ NVIC_SystemReset();
+ }
} else {
// nRF52820
COMBINED_SENSOR_INT_PIN = NRF52820_COMBINED_SENSOR_INT_PIN;
|
avoid issue with memset (optimizer issue with builtin_memset?) | @@ -7442,7 +7442,8 @@ static int dns_ai_setent(struct addrinfo **ent, union dns_any *any, enum dns_typ
switch (type) {
case DNS_T_A:
- saddr = memset(&sin, '\0', sizeof sin);
+ memset(&sin, '\0', sizeof sin);
+ saddr = (struct sockaddr *)&sin;
sin.sin_family = AF_INET;
sin.sin_port = htons(ai->port);
@@ -7454,7 +7455,8 @@ static int dns_ai_setent(struct addrinfo **ent, union dns_any *any, enum dns_typ
break;
case DNS_T_AAAA:
- saddr = memset(&sin6, '\0', sizeof sin6);
+ memset(&sin6, '\0', sizeof sin6);
+ saddr = (struct sockaddr *)&sin6;
sin6.sin6_family = AF_INET6;
sin6.sin6_port = htons(ai->port);
|
sdl/surface: Add Surface.Duplicate() for SDL2 2.0.6" | @@ -3,6 +3,14 @@ package sdl
/*
#include "sdl_wrapper.h"
+#if !(SDL_VERSION_ATLEAST(2,0,6))
+#pragma message("SDL_DuplicateSurface is not supported before SDL 2.0.6")
+static inline SDL_Surface* SDL_DuplicateSurface(SDL_Surface *surface)
+{
+ return NULL;
+}
+#endif
+
#if !(SDL_VERSION_ATLEAST(2,0,5))
#pragma message("SDL_CreateRGBSurfaceWithFormat is not supported before SDL 2.0.5")
static inline SDL_Surface* SDL_CreateRGBSurfaceWithFormat(Uint32 flags, int width, int height, int depth, Uint32 format)
@@ -420,3 +428,15 @@ func (surface *Surface) Pixels() []byte {
func (surface *Surface) Data() unsafe.Pointer {
return surface.pixels
}
+
+// Duplicate creates a new surface identical to the existing surface
+func (surface *Surface) Duplicate() (newSurface *Surface, err error) {
+ _newSurface := C.SDL_DuplicateSurface(surface.cptr())
+ if _newSurface == nil {
+ err = GetError()
+ return
+ }
+
+ newSurface = (*Surface)(unsafe.Pointer(_newSurface))
+ return
+}
|
HardwareDevices: Remove unused code | @@ -77,16 +77,11 @@ LRESULT CALLBACK MainWndDevicesSubclassProc(
}
}
}
-
- goto DefaultWndProc;
}
break;
}
return DefSubclassProc(hWnd, uMsg, wParam, lParam);
-
-DefaultWndProc:
- return DefWindowProc(hWnd, uMsg, wParam, lParam);
}
VOID AddRemoveDeviceChangeCallback(
|
turns |ask into a no-op | [[her %hood] %helm-hi ?~(mes '' (crip u.mes))]
::
++ poke-send-ask
- |= mel/cord =< abet
- %^ emit %poke /helm/ask/(scot %p ~socden-malzod)
- [[~socden-malzod %ask] %ask-mail mel]
+ |= mel/cord
+ abet
::
++ poke-serve
|= top/?(desk beam) =< abet
|
Discard packet if packet number is duplicate after removing packet protection | @@ -6093,7 +6093,6 @@ static ssize_t conn_recv_pkt(ngtcp2_conn *conn, const ngtcp2_path *path,
int non_probing_pkt = 0;
int key_phase_bit_changed = 0;
int force_decrypt_failure = 0;
- int invalid_reserved_bits = 0;
if (pkt[0] & NGTCP2_HEADER_FORM_BIT) {
nread = ngtcp2_pkt_decode_hd_long(&hd, pkt, pktlen);
@@ -6233,22 +6232,6 @@ static ssize_t conn_recv_pkt(ngtcp2_conn *conn, const ngtcp2_path *path,
}
}
- rv = ngtcp2_pkt_verify_reserved_bits(plain_hdpkt[0]);
- if (rv != 0) {
- invalid_reserved_bits = 1;
-
- ngtcp2_log_info(&conn->log, NGTCP2_LOG_EVENT_PKT,
- "packet has incorrect reserved bits");
-
- /* Will return error after decrypting payload */
- }
-
- if (pktns_pkt_num_is_duplicate(pktns, hd.pkt_num)) {
- ngtcp2_log_info(&conn->log, NGTCP2_LOG_EVENT_PKT,
- "packet was discarded because of duplicated packet number");
- return NGTCP2_ERR_DISCARD_PKT;
- }
-
if (hd.type == NGTCP2_PKT_SHORT) {
key_phase_bit_changed = conn_key_phase_changed(conn, &hd);
}
@@ -6314,10 +6297,20 @@ static ssize_t conn_recv_pkt(ngtcp2_conn *conn, const ngtcp2_path *path,
return NGTCP2_ERR_DISCARD_PKT;
}
- if (invalid_reserved_bits) {
+ rv = ngtcp2_pkt_verify_reserved_bits(plain_hdpkt[0]);
+ if (rv != 0) {
+ ngtcp2_log_info(&conn->log, NGTCP2_LOG_EVENT_PKT,
+ "packet has incorrect reserved bits");
+
return NGTCP2_ERR_PROTO;
}
+ if (pktns_pkt_num_is_duplicate(pktns, hd.pkt_num)) {
+ ngtcp2_log_info(&conn->log, NGTCP2_LOG_EVENT_PKT,
+ "packet was discarded because of duplicated packet number");
+ return NGTCP2_ERR_DISCARD_PKT;
+ }
+
payload = conn->crypto.decrypt_buf.base;
payloadlen = (size_t)nwrite;
|
SOVERSION bump to version 6.4.19 | @@ -72,7 +72,7 @@ set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_
# with backward compatible change and micro version is connected with any internal change of the library.
set(SYSREPO_MAJOR_SOVERSION 6)
set(SYSREPO_MINOR_SOVERSION 4)
-set(SYSREPO_MICRO_SOVERSION 18)
+set(SYSREPO_MICRO_SOVERSION 19)
set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}.${SYSREPO_MICRO_SOVERSION})
set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
|
homebridge install script fix and added check for inet connection before update | @@ -234,10 +234,22 @@ function checkUpdate {
hb_version=""
hb_hue_version=""
+ curl --head --connect-timeout 20 -k https://www.npmjs.com/ &> /dev/null
+ if [ $? -ne 0 ]; then
+ if [[ ! -z "$PROXY_ADDRESS" && ! -z "$PROXY_PORT" && "$PROXY_ADDRESS" != "none" ]]; then
+ export http_proxy="http://${PROXY_ADDRESS}:${PROXY_PORT}"
+ export https_proxy="http://${PROXY_ADDRESS}:${PROXY_PORT}"
+ [[ $LOG_DEBUG ]] && echo "${LOG_DEBUG}set proxy: ${PROXY_ADDRESS}:${PROXY_PORT}"
+ else
+ [[ $LOG_WARN ]] && echo "${LOG_WARN}no internet connection. Abort update check."
+ return
+ fi
+ fi
+
hb_version=$(homebridge --version)
if [ -f "/usr/lib/node_modules/homebridge-hue/package.json" ]; then
hb_hue_version=$(cat /usr/lib/node_modules/homebridge-hue/package.json | grep \"version\": | cut -d'"' -f 4)
- if [[ ! "$hb_hue_version" =~ "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" ]]
+ if [[ ! "$hb_hue_version" =~ "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" ]]; then
hb_hue_version=""
fi
fi
|
Docs: fix speed code sample printf format specifiers
`%ull` should be `%llu`. | @@ -42,7 +42,7 @@ Otherwise, one way to measure performance is to augment the code to take timing
uint64_t end = esp_timer_get_time();
- printf("%u iterations took %ull milliseconds (%ull microseconds per invocation)\n",
+ printf("%u iterations took %llu milliseconds (%llu microseconds per invocation)\n",
MEASUREMENTS, (end - start)/1000, (end - start)/MEASUREMENTS);
}
|
Use condition for not sensitive data | @@ -588,9 +588,8 @@ int mbedtls_cf_rsaes_pkcs1_v15_unpadding( size_t ilen,
size_t plaintext_size = 0;
unsigned output_too_large;
- plaintext_max_size = mbedtls_cf_size_if( output_max_len > ilen - 11,
- ilen - 11,
- output_max_len );
+ plaintext_max_size = ( output_max_len > ilen - 11 ) ? ilen - 11
+ : output_max_len;
/* Check and get padding length in constant time and constant
* memory trace. The first byte must be 0. */
|
[tests] OpenBSD crypt() support limited to bcrypt
OpenBSD crypt() does not support (insecure) crypt-des or crypt-md5
(The password used in the tests and lighttpd.htpasswd is crypt-des.
Something else could be used so that the tests can execute,
though that something might be different on different platforms.) | @@ -75,6 +75,9 @@ EOF
$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 , 'HTTP-Content' => '' } ];
ok($tf->handle_http($t) == 0, 'FastCGI + bin-copy-environment');
+SKIP: {
+ skip "no crypt-des under openbsd", 2 if $^O eq 'openbsd';
+
$t->{REQUEST} = ( <<EOF
GET /get-server-env.php?env=REMOTE_USER HTTP/1.0
Host: auth.example.org
@@ -92,6 +95,7 @@ EOF
);
$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'Basic' } ];
ok($tf->handle_http($t) == 0, '$_SERVER["AUTH_TYPE"]');
+}
$t->{REQUEST} = ( <<EOF
GET /index.html?auth-ok HTTP/1.0
|
Include meta keys in sha 256 calculation | @@ -42,11 +42,17 @@ kdb_boolean_t computeSha256OfKeySetWithoutValues (char hash_string[65], KeySet *
struct Sha_256 sha_256;
sha_256_init(&sha_256, hash);
- // Loop through all keys, feed full key name into sha_256_write().
+ // Loop through all keys, feed full key name and meta keys + values into sha_256_write().
Key * currentKey;
ksRewind(onlyBelowParentKey);
while ((currentKey = ksNext (onlyBelowParentKey)) != NULL) {
sha_256_write (&sha_256, keyName(currentKey), strlen(keyName(currentKey)));
+ KeySet * currentMetaKeys = keyMeta(currentKey);
+ Key * currentMetaKey;
+ while ((currentMetaKey = ksNext (currentMetaKeys))) {
+ sha_256_write (&sha_256, keyName(currentMetaKey), strlen(keyName(currentMetaKey)));
+ sha_256_write (&sha_256, keyString(currentMetaKey), strlen(keyString(currentMetaKey)));
+ }
}
hash_to_string(hash_string, hash);
|
avx512/abs: work around buggy pd functions in GCC 7 - 8.2 | @@ -524,8 +524,11 @@ simde_mm512_mask_abs_ps(simde__m512 src, simde__mmask16 k, simde__m512 v2) {
SIMDE_FUNCTION_ATTRIBUTES
simde__m512d
simde_mm512_abs_pd(simde__m512d v2) {
- #if defined(SIMDE_X86_AVX512F_NATIVE) && (!defined(HEDLEY_GCC_VERSION) || HEDLEY_GCC_VERSION_CHECK(7,0,0))
+ #if defined(SIMDE_X86_AVX512F_NATIVE) && (!defined(HEDLEY_GCC_VERSION) || HEDLEY_GCC_VERSION_CHECK(8,3,0))
return _mm512_abs_pd(v2);
+ #elif defined(SIMDE_X86_AVX512F_NATIVE) && (!defined(HEDLEY_GCC_VERSION) || HEDLEY_GCC_VERSION_CHECK(7,0,0))
+ /* gcc bug: https://gcc.gnu.org/legacy-ml/gcc-patches/2018-01/msg01962.html */
+ return _mm512_abs_pd(_mm512_castpd_ps(v2));
#else
simde__m512d_private
r_,
@@ -557,8 +560,11 @@ simde_mm512_abs_pd(simde__m512d v2) {
SIMDE_FUNCTION_ATTRIBUTES
simde__m512d
simde_mm512_mask_abs_pd(simde__m512d src, simde__mmask8 k, simde__m512d v2) {
- #if defined(SIMDE_X86_AVX512F_NATIVE) && (!defined(HEDLEY_GCC_VERSION) || HEDLEY_GCC_VERSION_CHECK(7,0,0))
+ #if defined(SIMDE_X86_AVX512F_NATIVE) && (!defined(HEDLEY_GCC_VERSION) || HEDLEY_GCC_VERSION_CHECK(8,3,0))
return _mm512_mask_abs_pd(src, k, v2);
+ #elif defined(SIMDE_X86_AVX512F_NATIVE) && (!defined(HEDLEY_GCC_VERSION) || HEDLEY_GCC_VERSION_CHECK(7,0,0))
+ /* gcc bug: https://gcc.gnu.org/legacy-ml/gcc-patches/2018-01/msg01962.html */
+ return _mm512_mask_abs_pd(src, k, _mm512_castpd_ps(v2));
#else
return simde_mm512_mask_mov_pd(src, k, simde_mm512_abs_pd(v2));
#endif
|
kernel/timer: move a location of marking not in use
This commit fixs SVACE issue as shown below.
WID:5109936 Pointer '&timer->pt_flags' is dereferenced
at timer_release.c:120 after the referenced memory was
deallocated at sched_free.c:135 by passing as 1st parameter
to function 'sched_ufree' at timer_release.c:115. | @@ -114,10 +114,6 @@ static inline void timer_free(struct posix_timer_s *timer)
irqrestore(flags);
sched_kfree(timer);
}
-
- /* Mark this timer is not in use */
-
- timer->pt_flags &= ~PT_FLAGS_INUSE;
}
/********************************************************************************
@@ -167,6 +163,12 @@ int timer_release(FAR struct posix_timer_s *timer)
(void)wd_delete(timer->pt_wdog);
+ /* Mark this timer is not in use before releasing the timer.
+ * This prevents returning some value when timer API is called after release
+ */
+
+ timer->pt_flags &= ~PT_FLAGS_INUSE;
+
/* Release the timer structure */
timer_free(timer);
|
use -maxv2 on haswell | @@ -17,7 +17,7 @@ ifeq ($(TARGET_CORE), SKYLAKEX)
endif
endif
else ifeq($(TARGET_CORE), HASWELL)
- override CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE) -march=core-avx2
+ override CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE) -mavx2
else
override CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE)
endif
|
sanitizers: w/o -S just set some reasonable values inside the process | */
#define kSAN_COV_OPTS "coverage=1:coverage_direct=1"
-static void sanitizers_Regular(honggfuzz_t * hfuzz)
+static bool sanitizers_Regular(void)
{
- hfuzz->sanOpts.asanOpts = util_StrDup(kSAN_REGULAR);
- hfuzz->sanOpts.msanOpts = util_StrDup(kSAN_REGULAR);
- hfuzz->sanOpts.ubsanOpts = util_StrDup(kSAN_REGULAR);
+ if (setenv("ASAN_OPTIONS", kSAN_REGULAR, 1) == -1) {
+ PLOG_E("setenv(ASAN_OPTIONS=%s", kSAN_REGULAR);
+ return false;
+ }
+ if (setenv("MSAN_OPTIONS", kSAN_REGULAR, 1) == -1) {
+ PLOG_E("setenv(MSAN_OPTIONS=%s", kSAN_REGULAR);
+ return false;
+ }
+ if (setenv("UBSAN_OPTIONS", kSAN_REGULAR, 1) == -1) {
+ PLOG_E("setenv(UBSAN_OPTIONS=%s", kSAN_REGULAR);
+ return false;
+ }
+ return true;
}
bool sanitizers_Init(honggfuzz_t * hfuzz)
@@ -120,8 +130,7 @@ bool sanitizers_Init(honggfuzz_t * hfuzz)
}
if (hfuzz->enableSanitizers == false) {
- sanitizers_Regular(hfuzz);
- return true;
+ return sanitizers_Regular();
}
/* Set sanitizer flags once to avoid performance overhead per worker spawn */
|
fix bug for gpu-mode of cdiag operator | @@ -39,6 +39,7 @@ struct cdiag_s {
unsigned int N;
const long* dims;
const long* strs;
+ const long* ddims;
const long* dstrs;
const complex float* diag;
#ifdef USE_CUDA
@@ -57,7 +58,7 @@ static void cdiag_apply(const linop_data_t* _data, complex float* dst, const com
if (cuda_ondevice(src)) {
if (NULL == data->gpu_diag)
- ((struct cdiag_s*)data)->gpu_diag = md_gpu_move(data->N, data->dims, data->diag, CFL_SIZE);
+ ((struct cdiag_s*)data)->gpu_diag = md_gpu_move(data->N, data->ddims, data->diag, CFL_SIZE);
diag = data->gpu_diag;
}
@@ -74,7 +75,7 @@ static void cdiag_adjoint(const linop_data_t* _data, complex float* dst, const c
if (cuda_ondevice(src)) {
if (NULL == data->gpu_diag)
- ((struct cdiag_s*)data)->gpu_diag = md_gpu_move(data->N, data->dims, data->diag, CFL_SIZE);
+ ((struct cdiag_s*)data)->gpu_diag = md_gpu_move(data->N, data->ddims, data->diag, CFL_SIZE);
diag = data->gpu_diag;
}
@@ -93,12 +94,13 @@ static void cdiag_free(const linop_data_t* _data)
const struct cdiag_s* data = CAST_DOWN(cdiag_s, _data);
#ifdef USE_CUDA
- md_free((void*)data->gpu_diag);
+ md_free(data->gpu_diag);
#endif
- free((void*)data->dims);
- free((void*)data->dstrs);
- free((void*)data->strs);
- free((void*)data);
+ xfree(data->ddims);
+ xfree(data->dims);
+ xfree(data->dstrs);
+ xfree(data->strs);
+ xfree(data);
}
static struct linop_s* linop_gdiag_create(unsigned int N, const long dims[N], unsigned int flags, const complex float* diag, bool rdiag)
@@ -109,18 +111,20 @@ static struct linop_s* linop_gdiag_create(unsigned int N, const long dims[N], un
data->rmul = rdiag;
data->N = N;
- PTR_ALLOC(long[N], dims2);
+ PTR_ALLOC(long[N], ddims);
PTR_ALLOC(long[N], dstrs);
+ PTR_ALLOC(long[N], dims2);
PTR_ALLOC(long[N], strs);
- long ddims[N];
- md_select_dims(N, flags, ddims, dims);
+ md_select_dims(N, flags, *ddims, dims);
+ md_calc_strides(N, *dstrs, *ddims, CFL_SIZE);
+
md_copy_dims(N, *dims2, dims);
md_calc_strides(N, *strs, dims, CFL_SIZE);
- md_calc_strides(N, *dstrs, ddims, CFL_SIZE);
data->dims = *PTR_PASS(dims2);
data->strs = *PTR_PASS(strs);
+ data->ddims = *PTR_PASS(ddims);
data->dstrs = *PTR_PASS(dstrs);
data->diag = diag; // make a copy?
#ifdef USE_CUDA
|
Support multiple instances of the encoder. | @@ -134,19 +134,20 @@ int ec11_init(struct device *dev)
return 0;
}
-struct ec11_data ec11_data;
-
-const struct ec11_config ec11_cfg = {
- .a_label = DT_INST_GPIO_LABEL(0, a_gpios),
- .a_pin = DT_INST_GPIO_PIN(0, a_gpios),
- .a_flags = DT_INST_GPIO_FLAGS(0, a_gpios),
- .b_label = DT_INST_GPIO_LABEL(0, b_gpios),
- .b_pin = DT_INST_GPIO_PIN(0, b_gpios),
- .b_flags = DT_INST_GPIO_FLAGS(0, b_gpios),
- COND_CODE_0(DT_INST_NODE_HAS_PROP(0, resolution), (1), (DT_INST_PROP(0, resolution))),
-};
-
-DEVICE_AND_API_INIT(ec11, DT_INST_LABEL(0), ec11_init,
- &ec11_data,
- &ec11_cfg, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
+#define EC11_INST(n) \
+ struct ec11_data ec11_data_##n; \
+ const struct ec11_config ec11_cfg_##n = { \
+ .a_label = DT_INST_GPIO_LABEL(n, a_gpios), \
+ .a_pin = DT_INST_GPIO_PIN(n, a_gpios), \
+ .a_flags = DT_INST_GPIO_FLAGS(n, a_gpios), \
+ .b_label = DT_INST_GPIO_LABEL(n, b_gpios), \
+ .b_pin = DT_INST_GPIO_PIN(n, b_gpios), \
+ .b_flags = DT_INST_GPIO_FLAGS(n, b_gpios), \
+ COND_CODE_0(DT_INST_NODE_HAS_PROP(n, resolution), (1), (DT_INST_PROP(n, resolution))), \
+ }; \
+ DEVICE_AND_API_INIT(ec11, DT_INST_LABEL(n), ec11_init, \
+ &ec11_data_##n, \
+ &ec11_cfg_##n, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, \
&ec11_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(EC11_INST)
\ No newline at end of file
|
notify: cleanup %watch-not-unique cases | ?- -.old
%0
:_ this(state old)
- ?. (~(has by wex.bowl) [/hark our.bowl %hark-store])
+ ?: (~(has by wex.bowl) [/hark our.bowl %hark-store])
~
[(~(watch-our pass:io /hark) %hark-store /updates)]~
==
?. (is-whitelisted:do src.bowl u.entry)
~|("permission denied" !!)
=. clients.u.entry (~(put by clients.u.entry) src.bowl ~)
- :_ state(provider-state (~(put by provider-state) service.act u.entry))
- :~ %: register-binding:do
+ =/ cards=(list card)
+ :_ ~
+ %: register-binding:do
service.act
u.entry
binding-endpoint.u.entry
src.bowl
address.act
==
+ =/ =wire /agentio-watch/notify/(scot %p src.bowl)/[service.act]
+ =? cards !(~(has by wex.bowl) wire src.bowl %notify)
+ :_ cards
%+ watch:pass
[src.bowl %notify]
/notify/(scot %p src.bowl)/[service.act]
- ==
+ :- cards
+ state(provider-state (~(put by provider-state) service.act u.entry))
::
%client-leave
=/ entry=(unit provider-entry) (~(get by provider-state) service.act)
|
ignore errorcount if force_interface is set | @@ -5629,11 +5629,7 @@ strncpy(pwrq.ifr_name, interfacename, IFNAMSIZ -1);
pwrq.u.freq.flags = IW_FREQ_FIXED;
pwrq.u.freq.m = channelscanlist[cpa];
pwrq.u.freq.e = 0;
-if(ioctl(fd_socket, SIOCSIWFREQ, &pwrq) < 0)
- {
- if(forceinterfaceflag == false) return false;
- return true;
- }
+if(ioctl(fd_socket, SIOCSIWFREQ, &pwrq) < 0) return false;
if(ioctl(fd_socket, SIOCGIWFREQ, &pwrq) == 0) aktchannel = pwrq.u.freq.m;
return true;
}
@@ -5979,7 +5975,7 @@ while(wantstopflag == false)
if(errorcount >= maxerrorcount)
{
fprintf(stderr, "\nmaximum number of errors is reached\n");
- globalclose();
+ if(forceinterfaceflag == false) globalclose();
}
if(gpiobutton > 0)
{
@@ -6306,7 +6302,7 @@ while(wantstopflag == false)
if(errorcount >= maxerrorcount)
{
fprintf(stderr, "\nmaximum number of errors is reached\n");
- globalclose();
+ if(forceinterfaceflag == false) globalclose();
}
if(gpiobutton > 0)
{
@@ -6421,7 +6417,7 @@ while(wantstopflag == false)
if(errorcount >= maxerrorcount)
{
fprintf(stderr, "\nmaximum number of errors is reached\n");
- globalclose();
+ if(forceinterfaceflag == false) globalclose();
}
if(gpiobutton > 0)
{
|
Fix python module len() implementations
They were all missing the 'self.' prefix when accessing the 'obj'
instance variable, causing the following exception when attempting to
call len() on (for example) a ReplyInfo_RRSet:
File "/usr/lib/python3.7/site-packages/unboundmodule.py", line 377, in __len__
def __len__(self): return obj.rrset_count
NameError: name 'obj' is not defined | @@ -314,16 +314,16 @@ struct packed_rrset_data {
class RRSetData_RRLen:
def __init__(self, obj): self.obj = obj
def __getitem__(self, index): return _unboundmodule._get_data_rr_len(self.obj, index)
- def __len__(self): return obj.count + obj.rrsig_count
+ def __len__(self): return self.obj.count + self.obj.rrsig_count
class RRSetData_RRTTL:
def __init__(self, obj): self.obj = obj
def __getitem__(self, index): return _unboundmodule._get_data_rr_ttl(self.obj, index)
def __setitem__(self, index, value): _unboundmodule._set_data_rr_ttl(self.obj, index, value)
- def __len__(self): return obj.count + obj.rrsig_count
+ def __len__(self): return self.obj.count + self.obj.rrsig_count
class RRSetData_RRData:
def __init__(self, obj): self.obj = obj
def __getitem__(self, index): return _unboundmodule._get_data_rr_data(self.obj, index)
- def __len__(self): return obj.count + obj.rrsig_count
+ def __len__(self): return self.obj.count + self.obj.rrsig_count
%}
%inline %{
@@ -404,12 +404,12 @@ struct dns_msg {
class ReplyInfo_RRSet:
def __init__(self, obj): self.obj = obj
def __getitem__(self, index): return _unboundmodule._rrset_rrsets_get(self.obj, index)
- def __len__(self): return obj.rrset_count
+ def __len__(self): return self.obj.rrset_count
class ReplyInfo_Ref:
def __init__(self, obj): self.obj = obj
def __getitem__(self, index): return _unboundmodule._rrset_ref_get(self.obj, index)
- def __len__(self): return obj.rrset_count
+ def __len__(self): return self.obj.rrset_count
%}
%inline %{
|
Build: Run Coverity on Linux | @@ -222,13 +222,19 @@ jobs:
analyze-coverity:
name: Analyze Coverity
- runs-on: macos-latest
+ runs-on: ubuntu-latest
env:
JOB_TYPE: COVERITY
+ TOOLCHAINS: GCC5
if: github.repository_owner == 'acidanthera' && github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v2
+ - name: Install Dependencies
+ run: |
+ sudo apt-get update
+ sudo apt-get install curl nasm uuid-dev libssl-dev iasl
+
- name: CI Bootstrap
run: |
src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1
@@ -238,9 +244,8 @@ jobs:
- name: Run Coverity
working-directory: UDK
run: |
- src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/coverity/covstrap.sh) && eval "$src" || exit 1
+ src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/coverity/covstrap-linux.sh) && eval "$src" || exit 1
env:
COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
COVERITY_SCAN_EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
COVERITY_BUILD_COMMAND: ../build_oc.tool --skip-tests --skip-package RELEASE
- MAKE: /usr/bin/make
|
Interface: Fixes URL message parsing | @@ -209,8 +209,35 @@ export class ChatInput extends Component {
return;
}
let message = [];
- editorMessage.split(' ').map((each) => {
- if (this.isUrl(each)) {
+ let isInCodeBlock = false;
+ let endOfCodeBlock = false;
+ editorMessage.split(/\r?\n/).forEach((line) => {
+ // A line of backticks enters and exits a codeblock
+ if (line.startsWith('```')) {
+ // But we need to check if we've ended a codeblock
+ endOfCodeBlock = isInCodeBlock;
+ isInCodeBlock = (!isInCodeBlock);
+ } else {
+ endOfCodeBlock = false;
+ }
+ if (isInCodeBlock) {
+ message.push(`\n${line}`);
+ } else if (endOfCodeBlock) {
+ message.push(`\n${line}\n`);
+ } else {
+ line.split(/\s/).forEach((str) => {
+ if (
+ (str.startsWith('`') && str !== '`')
+ || (str === '`' && !isInCodeBlock)
+ ) {
+ isInCodeBlock = true;
+ } else if (
+ (str.endsWith('`') && str !== '`')
+ || (str === '`' && isInCodeBlock)
+ ) {
+ isInCodeBlock = false;
+ }
+ if (this.isUrl(str) && !isInCodeBlock) {
if (message.length > 0) {
message = message.join(' ');
message = this.getLetterType(message);
@@ -222,7 +249,7 @@ export class ChatInput extends Component {
);
message = [];
}
- const URL = this.getLetterType(each);
+ const URL = this.getLetterType(str);
props.api.chat.message(
props.station,
`~${window.ship}`,
@@ -230,10 +257,14 @@ export class ChatInput extends Component {
URL
);
} else {
- return message.push(each);
+ message.push(str);
}
});
+ }
+
+ });
+
if (message.length > 0) {
message = message.join(' ');
message = this.getLetterType(message);
|
hal: nrf51 spi1 fix | @@ -512,7 +512,7 @@ hal_spi_init(int spi_num, void *cfg, uint8_t spi_type)
irq_handler = nrf51_spi1_irq_handler;
if (spi_type == HAL_SPI_TYPE_MASTER) {
#if MYNEWT_VAL(SPI_1_MASTER)
- spi->nhs_spi.spim = NRF_SPIM1;
+ spi->nhs_spi.spim = NRF_SPI1;
#else
assert(0);
#endif
|
doc: Add stitched ciphers to EVP_EncryptInit.pod
These ciphers don't appear to be documented anywhere. Given the
performance[1] benefits I think it makes sense to expose them.
[1] | @@ -19,8 +19,8 @@ EVP_CIPHER_CTX_mode, EVP_CIPHER_param_to_asn1, EVP_CIPHER_asn1_to_param,
EVP_CIPHER_CTX_set_padding, EVP_enc_null, EVP_des_cbc, EVP_des_ecb,
EVP_des_cfb, EVP_des_ofb, EVP_des_ede_cbc, EVP_des_ede, EVP_des_ede_ofb,
EVP_des_ede_cfb, EVP_des_ede3_cbc, EVP_des_ede3, EVP_des_ede3_ofb,
-EVP_des_ede3_cfb, EVP_desx_cbc, EVP_rc4, EVP_rc4_40, EVP_idea_cbc,
-EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_rc2_cbc,
+EVP_des_ede3_cfb, EVP_desx_cbc, EVP_rc4, EVP_rc4_40, EVP_rc4_hmac_md5,
+EVP_idea_cbc, EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_rc2_cbc,
EVP_rc2_ecb, EVP_rc2_cfb, EVP_rc2_ofb, EVP_rc2_40_cbc, EVP_rc2_64_cbc,
EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc,
EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb, EVP_rc5_32_12_16_cbc,
@@ -30,6 +30,8 @@ EVP_aes_192_cbc, EVP_aes_192_ecb, EVP_aes_192_cfb, EVP_aes_192_ofb,
EVP_aes_256_cbc, EVP_aes_256_ecb, EVP_aes_256_cfb, EVP_aes_256_ofb,
EVP_aes_128_gcm, EVP_aes_192_gcm, EVP_aes_256_gcm,
EVP_aes_128_ccm, EVP_aes_192_ccm, EVP_aes_256_ccm,
+EVP_aes_128_cbc_hmac_sha1, EVP_aes_256_cbc_hmac_sha1,
+EVP_aes_128_cbc_hmac_sha256, EVP_aes_256_cbc_hmac_sha256
EVP_chacha20, EVP_chacha20_poly1305 - EVP cipher routines
=head1 SYNOPSIS
|
Remove unused pragma | #ifndef _PH_PHNATINL_H
#define _PH_PHNATINL_H
-#pragma once
-
// This file contains inlined native API wrapper functions. These functions were previously
// exported, but are now inlined because they are extremely simple wrappers around equivalent native
// API functions.
|
cmake: use CLI11_INCLUDE_DIRS variable | @@ -31,7 +31,7 @@ add_library(afu-test INTERFACE)
target_include_directories(afu-test INTERFACE
${OPAE_INCLUDE_PATHS}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CLI11_ROOT}/include
+ ${CLI11_INCLUDE_DIRS}
${spdlog_INCLUDE_DIRS}
)
@@ -39,6 +39,7 @@ target_link_libraries(afu-test INTERFACE
opae-c opae-cxx-core
${spdlog_LIBRARIES}
)
+
target_compile_options(afu-test INTERFACE
-Wno-unused-result
)
|
mangle: don't change filesz in 50% of cases | @@ -561,7 +561,7 @@ static void mangle_Shrink(run_t* run, bool printable HF_ATTR_UNUSED) {
static void mangle_Resize(run_t* run, bool printable) {
size_t oldsz = run->dynamicFileSz;
- uint64_t v = util_rndGet(0, 16);
+ uint64_t v = util_rndGet(0, 32);
ssize_t newsz = 0;
switch (v) {
@@ -574,6 +574,9 @@ static void mangle_Resize(run_t* run, bool printable) {
case 9 ... 16:
newsz = oldsz + 8 - v;
break;
+ case 17 ... 32:
+ newsz = run->dynamicFileSz;
+ break;
default:
LOG_F("Illegal value from util_rndGet: %" PRIu64, v);
break;
@@ -621,7 +624,6 @@ void mangle_mangleContent(run_t* run) {
mangle_Expand,
mangle_Shrink,
mangle_ASCIIVal,
- mangle_Resize,
};
if (run->mutationsPerRun == 0U) {
|
{AH} test deployment via .travis | @@ -15,7 +15,7 @@ env:
- secure: bTbky3Un19NAl62lix8bMLmBv9IGNhFkRXlZH+B253nYub7jwQwPQKum3ct9ea+XHJT5//uM0B8WAF6eyugpNkPQ7+S7SEH5BJuCt30nv6qvGhSO2AffZKeHEDnfW2kqGrivn87TqeomlSBlO742CD/V0wOIUwkTT9tutd+E7FU=
_deploy_common: &deploy_common
- if: tag IS present
+ if: branch = master AND type = push AND fork = false
install:
- python3 -m pip install cibuildwheel twine
|
POWER10: Update param.h
Increasing the values of DGEMM_DEFAULT_P and DGEMM_DEFAULT_Q helps
in improving performance ~10% for DGEMM. | @@ -2388,7 +2388,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif
-#if defined(POWER9) || defined(POWER10)
+#if defined(POWER9)
#define SNUMOPT 16
#define DNUMOPT 8
@@ -2426,6 +2426,39 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif
#if defined(POWER10)
+#define SNUMOPT 16
+#define DNUMOPT 8
+
+#define GEMM_DEFAULT_OFFSET_A 0
+#define GEMM_DEFAULT_OFFSET_B 65536
+#define GEMM_DEFAULT_ALIGN 0x0ffffUL
+
+#define SGEMM_DEFAULT_UNROLL_M 16
+#define SGEMM_DEFAULT_UNROLL_N 8
+#define DGEMM_DEFAULT_UNROLL_M 8
+#define DGEMM_DEFAULT_UNROLL_N 8
+#define CGEMM_DEFAULT_UNROLL_M 8
+#define CGEMM_DEFAULT_UNROLL_N 4
+#define ZGEMM_DEFAULT_UNROLL_M 8
+#define ZGEMM_DEFAULT_UNROLL_N 2
+
+#define SGEMM_DEFAULT_P 832
+#define DGEMM_DEFAULT_P 320
+#define CGEMM_DEFAULT_P 512
+#define ZGEMM_DEFAULT_P 256
+
+#define SGEMM_DEFAULT_Q 1026
+#define DGEMM_DEFAULT_Q 960
+#define CGEMM_DEFAULT_Q 1026
+#define ZGEMM_DEFAULT_Q 1026
+
+#define SGEMM_DEFAULT_R 4096
+#define DGEMM_DEFAULT_R 4096
+#define CGEMM_DEFAULT_R 4096
+#define ZGEMM_DEFAULT_R 4096
+
+#define SYMV_P 8
+
#undef SBGEMM_DEFAULT_UNROLL_N
#undef SBGEMM_DEFAULT_UNROLL_M
#undef SBGEMM_DEFAULT_P
@@ -2436,10 +2469,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define SBGEMM_DEFAULT_P 832
#define SBGEMM_DEFAULT_Q 1026
#define SBGEMM_DEFAULT_R 4096
-#undef DGEMM_DEFAULT_UNROLL_M
-#undef DGEMM_DEFAULT_UNROLL_N
-#define DGEMM_DEFAULT_UNROLL_M 8
-#define DGEMM_DEFAULT_UNROLL_N 8
#endif
#if defined(SPARC) && defined(V7)
|
removed unnecessary debug statement that didn't work on windows | @@ -871,7 +871,6 @@ void init_chipids (char *dir_to_scan)
if (!dir_to_scan) dir_to_scan = "./";
devicelist = NULL;
- fprintf (stderr, "stlink_chipid_params %ld\n", sizeof (struct stlink_chipid_params));
//dump_chips ();
d = opendir(".");
if (d) {
|
xive: Fix typo and spelling in a comment
This commit fixes a typo and a spelling in a comment about the XIVE set
translate mechanism. | * with one EQ and one IPI. There is also enought EATs to cover all the PHBs.
*
* Similarily, for MMIO access, the BARs support what is called "set
- * translation" which allows tyhe BAR to be devided into a certain
+ * translation" which allows the BAR to be divided into a certain
* number of sets. The VC BAR (ESBs, ENDs, ...) supports 64 sets and
* the PC BAT supports 16. Each "set" can be routed to a specific
* block and offset within a block.
|
Actor set position codegen | @@ -904,7 +904,9 @@ class ScriptBuilder {
actorSetPosition = (x = 0, y = 0) => {
this._addComment("Actor Set Position");
- this._addComment("NOT IMPLEMENTED");
+ this._setConst("^/(ACTOR + 1)/", x * 8 * 16);
+ this._setConst("^/(ACTOR + 2)/", (y + 1) * 8 * 16);
+ this._actorSetPosition("ACTOR");
this._addNL();
};
|
common/keyboard_8042: Update kblog while holding mutex
i8042_send_to_host can be called from multiple tasks. Make sure we don't
mix up or lose any kblog entries.
BRANCH=none
TEST=Built and saw kblog is still populated. | @@ -252,11 +252,12 @@ static void i8042_send_to_host(int len, const uint8_t *bytes,
int i;
struct data_byte data;
+ /* Enqueue output data if there's space */
+ mutex_lock(&to_host_mutex);
+
for (i = 0; i < len; i++)
kblog_put('s', bytes[i]);
- /* Enqueue output data if there's space */
- mutex_lock(&to_host_mutex);
if (queue_space(&to_host) >= len) {
kblog_put('t', to_host.state->tail);
for (i = 0; i < len; i++) {
|
Tests: Use `const` qualifier in exception handler | @@ -362,7 +362,7 @@ TEST (key, exceptions)
{
test.setName ("no");
}
- catch (kdb::KeyInvalidName &)
+ catch (kdb::KeyInvalidName const &)
{
succeed_if (test.getName () == "", "not set to noname");
}
@@ -374,7 +374,7 @@ TEST (key, exceptions)
{
test.setName ("no");
}
- catch (kdb::KeyInvalidName &)
+ catch (kdb::KeyInvalidName const &)
{
succeed_if (test.getName () == "", "not set to noname");
}
|
haskell-debian-stretch: make it verbose to see what is going on.. | @@ -60,9 +60,9 @@ if (NOT BUILD_STATIC)
string (REPLACE " " ";" CABAL_OPTS_SANITIZED ${CABAL_OPTS})
add_custom_command (
OUTPUT ${BINDING_HASKELL_NAME}
- COMMAND ${CABAL_EXECUTABLE} install ${CABAL_OPTS_SANITIZED} --only-dependencies -v0 || 0
- COMMAND ${CABAL_EXECUTABLE} configure ${CABAL_OPTS_SANITIZED} -v0
- COMMAND ${CABAL_EXECUTABLE} build -v0
+ COMMAND ${CABAL_EXECUTABLE} install ${CABAL_OPTS_SANITIZED} --only-dependencies
+ COMMAND ${CABAL_EXECUTABLE} configure ${CABAL_OPTS_SANITIZED}
+ COMMAND ${CABAL_EXECUTABLE} build
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${BINDING_HASKELL_DEPENDENCIES} ${ELEKTRA_DEPENDENCY}
)
|
sys/console: Remove unnecessary prefix from struct members | #include "console/console.h"
#include "console_priv.h"
-#define CONSOLE_HEAD_INC(cr) (((cr)->cr_head + 1) & ((cr)->cr_size - 1))
-#define CONSOLE_TAIL_INC(cr) (((cr)->cr_tail + 1) & ((cr)->cr_size - 1))
+#define CONSOLE_HEAD_INC(cr) (((cr)->head + 1) & ((cr)->size - 1))
+#define CONSOLE_TAIL_INC(cr) (((cr)->tail + 1) & ((cr)->size - 1))
static struct uart_dev *uart_dev;
static struct console_ring cr_tx;
@@ -41,17 +41,17 @@ typedef void (*console_write_char)(struct uart_dev*, uint8_t);
static console_write_char write_char_cb;
struct console_ring {
- uint8_t cr_head;
- uint8_t cr_tail;
- uint16_t cr_size;
- uint8_t *cr_buf;
+ uint8_t head;
+ uint8_t tail;
+ uint16_t size;
+ uint8_t *buf;
};
static void
console_add_char(struct console_ring *cr, char ch)
{
- cr->cr_buf[cr->cr_head] = ch;
- cr->cr_head = CONSOLE_HEAD_INC(cr);
+ cr->buf[cr->head] = ch;
+ cr->head = CONSOLE_HEAD_INC(cr);
}
static uint8_t
@@ -59,8 +59,8 @@ console_pull_char(struct console_ring *cr)
{
uint8_t ch;
- ch = cr->cr_buf[cr->cr_tail];
- cr->cr_tail = CONSOLE_TAIL_INC(cr);
+ ch = cr->buf[cr->tail];
+ cr->tail = CONSOLE_TAIL_INC(cr);
return ch;
}
@@ -70,7 +70,7 @@ console_queue_char(struct uart_dev *uart_dev, uint8_t ch)
int sr;
OS_ENTER_CRITICAL(sr);
- while (CONSOLE_HEAD_INC(&cr_tx) == cr_tx.cr_tail) {
+ while (CONSOLE_HEAD_INC(&cr_tx) == cr_tx.tail) {
/* TX needs to drain */
uart_start_tx(uart_dev);
OS_EXIT_CRITICAL(sr);
@@ -93,7 +93,7 @@ console_tx_flush(int cnt)
uint8_t byte;
for (i = 0; i < cnt; i++) {
- if (cr_tx.cr_head == cr_tx.cr_tail) {
+ if (cr_tx.head == cr_tx.tail) {
/*
* Queue is empty.
*/
@@ -152,7 +152,7 @@ console_out(int c)
static int
console_tx_char(void *arg)
{
- if (cr_tx.cr_head == cr_tx.cr_tail) {
+ if (cr_tx.head == cr_tx.tail) {
/*
* No more data.
*/
@@ -189,8 +189,8 @@ uart_console_init(void)
.uc_rx_char = console_rx_char,
};
- cr_tx.cr_size = MYNEWT_VAL(CONSOLE_UART_TX_BUF_SIZE);
- cr_tx.cr_buf = cr_tx_buf;
+ cr_tx.size = MYNEWT_VAL(CONSOLE_UART_TX_BUF_SIZE);
+ cr_tx.buf = cr_tx_buf;
write_char_cb = console_queue_char;
if (!uart_dev) {
|
YAwn: Disable memory check for part of YAEP code | #include "memory.hpp"
#include "walk.hpp"
+#ifdef ENABLE_ASAN
+#include <sanitizer/lsan_interface.h>
+#endif
+
using std::cerr;
using std::cout;
using std::endl;
@@ -199,7 +203,13 @@ namespace yawn
*/
int addToKeySet (CppKeySet & keySet, CppKey & parent, string const & filename)
{
+#ifdef ENABLE_ASAN
+ __lsan_disable ();
+#endif
yaep parser;
+#ifdef ENABLE_ASAN
+ __lsan_enable ();
+#endif
auto grammar = parseGrammar (parser, parent);
if (grammar.size () <= 0) return -1;
@@ -219,7 +229,13 @@ int addToKeySet (CppKeySet & keySet, CppKey & parent, string const & filename)
int ambiguousOutput;
struct yaep_tree_node * root = nullptr;
+#ifdef ENABLE_ASAN
+ __lsan_disable ();
+#endif
parser.parse (nextToken, syntaxError, alloc, nullptr, &root, &ambiguousOutput);
+#ifdef ENABLE_ASAN
+ __lsan_enable ();
+#endif
if (handleErrors (ambiguousOutput, errorListener, filename, grammar, parent) < 0) return -1;
|
Remove un-needed hidden argument | @@ -197,10 +197,6 @@ NSString * const kTSKDefaultReportUri = @"https://overmind.datatheorem.com/trust
#pragma mark TrustKit Implicit Initialization via Library Constructor
-// TRUSTKIT_SKIP_LIB_INITIALIZATION define allows consumers to opt out of the dylib constructor.
-// This might be useful to mitigate integration risks, if the consumer doens't wish to use
-// plist file, and wants to initialize lib manually later on.
-#ifndef TRUSTKIT_SKIP_LIB_INITIALIZATION
__attribute__((constructor)) static void initializeWithInfoPlist(int argc, const char **argv)
{
@@ -215,5 +211,3 @@ __attribute__((constructor)) static void initializeWithInfoPlist(int argc, const
[TrustKit initializeWithConfiguration:trustKitConfigFromInfoPlist];
}
}
-
-#endif
|
idf.py: fix debug extenstion to work with unit tests | @@ -100,9 +100,9 @@ def action_extensions(base_actions, project_path):
_terminate_async_target("gdbgui")
_terminate_async_target("gdb")
- def post_debug(action, ctx, args, block):
+ def post_debug(action, ctx, args, **kwargs):
""" Deal with asynchronous targets, such as openocd running in background """
- if block == 1:
+ if kwargs["block"] == 1:
for target in ["openocd", "gdbgui"]:
if target in processes and processes[target] is not None:
break
|
OpenCoreMisc: Change early logging message | @@ -194,7 +194,7 @@ OcMiscEarlyInit (
if (!EFI_ERROR (Status)) {
DEBUG ((
DEBUG_INFO,
- "OC: Boot timestamp: - %04u.%02u.%02u %02u:%02u:%02u\n",
+ "OC: Boot timestamp - %04u.%02u.%02u %02u:%02u:%02u\n",
BootTime.Year,
BootTime.Month,
BootTime.Day,
@@ -205,7 +205,7 @@ OcMiscEarlyInit (
} else {
DEBUG ((
DEBUG_INFO,
- "OC: Boot timestamp: - %r\n",
+ "OC: Boot timestamp - %r\n",
Status
));
}
|
[kernel] force MLCP to allocate interaction blocks in preCompute | @@ -138,6 +138,7 @@ void MLCP::computeDiagonalInteractionBlock(const InteractionsGraph::VDescriptor&
bool MLCP::preCompute(double time)
{
+ _hasBeenUpdated=false;
bool res = LinearOSNS::preCompute(time);
_numerics_problem.n = _n;
_numerics_problem.m = _m;
|
Pass correct arguments to webvr sittingToStanding; | @@ -123,7 +123,7 @@ void lovrHeadsetGetEyePosition(HeadsetEye eye, float* x, float* y, float* z) {
int i = eye == EYE_LEFT ? 0 : 1;
emscripten_vr_get_eye_offset(i, x, y, z);
float m[16];
- mat4_multiply(mat4_identity(m), emscripten_vr_get_sitting_to_standing_matrix(i));
+ mat4_multiply(mat4_identity(m), emscripten_vr_get_sitting_to_standing_matrix());
mat4_multiply(m, mat4_invert(emscripten_vr_get_view_matrix(i)));
mat4_translate(m, *x, *y, *z);
*x = m[12];
|
doc: Add kdb command renames to release news | @@ -184,6 +184,7 @@ you up to date with the multi-language support provided by Elektra.
- Checks for `kdbCommit` have been added to [kdb check](../help/kdb-check.md). _(Vid Leskovar)_
- add PID file config setting for kdb-run-rest-frontend _(Markus Raab)_
- Added `kdb showmeta` command which prints out all metadata along with its values for a given key. _(Michael Zronek)_
+- Renamed kdb plugin commands following a hierarchical structure. `kdb info` is now `kdb plugin-info`, `kdb check` is now `kdb plugin-check` and `kdb list` is now `kdb plugin-list`. We also removed the obsolete `kdb fstab` functionality. _(Philipp Gackstatter)_
- <<TODO>>
## Scripts
|
Fix having flow out of an empty tank | @@ -437,40 +437,12 @@ void tankstatus(Project *pr, int k, int n1, int n2)
tank = &net->Tank[i];
if (tank->A == 0.0) return;
- // Find head difference across link
- h = hyd->NodeHead[n1] - hyd->NodeHead[n2];
-
- // If tank is full, then prevent flow into it
if (hyd->NodeHead[n1] >= tank->Hmax - hyd->Htol && !tank->CanOverflow)
{
- // Case 1: Link is a pump discharging into tank
- if (link->Type == PUMP)
- {
- if (link->N2 == n1) hyd->LinkStatus[k] = TEMPCLOSED;
- }
-
- // Case 2: Downstream head > tank head
- // (e.g., an open outflow check valve would close)
- else if (cvstatus(pr, OPEN, h, q) == CLOSED)
- {
- hyd->LinkStatus[k] = TEMPCLOSED;
- }
+ if (q < 0.0) hyd->LinkStatus[k] = TEMPCLOSED;
}
-
- // If tank is empty, then prevent flow out of it
if (hyd->NodeHead[n1] <= tank->Hmin + hyd->Htol)
{
- // Case 1: Link is a pump discharging from tank
- if (link->Type == PUMP)
- {
- if (link->N1 == n1) hyd->LinkStatus[k] = TEMPCLOSED;
- }
-
- // Case 2: Tank head > downstream head
- // (e.g., a closed outflow check valve would open)
- else if (cvstatus(pr, CLOSED, h, q) == OPEN)
- {
- hyd->LinkStatus[k] = TEMPCLOSED;
- }
+ if (q > 0.0) hyd->LinkStatus[k] = TEMPCLOSED;
}
}
|
Re-enable CancelResume test without flakey data size comparison checks
Checking data sizes in NSURL::NSURLSession_DownloadTaskWithURL_WithCancelResume would intermittently cause failures, so re-enabling this test with just state checks. This is not going to catch as many types of regressions as the previous implementation but it shouldn't fail for passing code either. | @@ -654,10 +654,6 @@ public:
* Test to verify a download task call can be successfully made and can be cancelled/resumed at runtime.
*/
TEST_METHOD(DownloadTaskWithURL_WithCancelResume) {
- BEGIN_TEST_METHOD_PROPERTIES()
- TEST_METHOD_PROPERTY(L"Ignore", L"true")
- END_TEST_METHOD_PROPERTIES()
-
NSURLSessionDownloadTaskTestHelper* downloadTaskTestHelper = [[NSURLSessionDownloadTaskTestHelper alloc] init];
NSURLSession* session = [downloadTaskTestHelper createSession];
NSURL* url = [NSURL URLWithString:@"http://speedtest.ams01.softlayer.com/downloads/test500.zip"];
@@ -682,16 +678,7 @@ public:
ASSERT_EQ_MSG(500, std::lround(fileSizeInMB), "FAILED: Expected download file size does not match!");
// Make sure download is in progress.
- double lastBytesDownloaded = (double)downloadTaskTestHelper.totalBytesWritten / 1024 / 1024;
- LOG_INFO("Download in progress - %fMB", lastBytesDownloaded);
- [NSThread sleepForTimeInterval:0.5];
ASSERT_EQ(NSURLSessionTaskStateRunning, downloadTask.state);
- [NSThread sleepForTimeInterval:0.5];
- double currentBytesDownloaded = (double)downloadTaskTestHelper.totalBytesWritten / 1024 / 1024;
- LOG_INFO("Download in progress - %fMB", currentBytesDownloaded);
- ASSERT_GT_MSG(currentBytesDownloaded,
- lastBytesDownloaded,
- "FAILED: File download should be in progress, but no more has been downloaded!");
// Now cancel the download
__block NSCondition* conditionCancelled = [[NSCondition alloc] init];
@@ -712,19 +699,10 @@ public:
[conditionCancelled unlock];
// Make sure download has stopped.
- [NSThread sleepForTimeInterval:0.5];
ASSERT_EQ(NSURLSessionTaskStateCanceling, downloadTask.state);
- lastBytesDownloaded = (double)downloadTaskTestHelper.totalBytesWritten / 1024 / 1024;
- [NSThread sleepForTimeInterval:1];
- currentBytesDownloaded = (double)downloadTaskTestHelper.totalBytesWritten / 1024 / 1024;
- ASSERT_EQ_MSG(currentBytesDownloaded,
- lastBytesDownloaded,
- "FAILED: File download should have stopped, but downloaded an extra %.4f MB!",
- currentBytesDownloaded - lastBytesDownloaded);
- LOG_INFO("Download stuck at - %fMB", currentBytesDownloaded);
- LOG_INFO("Resuming download...");
// Now resume the download
+ LOG_INFO("Resuming download...");
downloadTask = [session downloadTaskWithResumeData:downloadResumeData];
[downloadTask resume];
@@ -740,16 +718,6 @@ public:
LOG_INFO("Download resumed");
// Make sure download is in progress again.
- lastBytesDownloaded = (double)downloadTaskTestHelper.totalBytesWritten / 1024 / 1024;
- LOG_INFO("Download in progress - %fMB", lastBytesDownloaded);
- [NSThread sleepForTimeInterval:0.5];
- currentBytesDownloaded = (double)downloadTaskTestHelper.totalBytesWritten / 1024 / 1024;
- LOG_INFO("Download in progress - %fMB", currentBytesDownloaded);
- ASSERT_GT_MSG(currentBytesDownloaded, lastBytesDownloaded, "FAILED: File download should be in progress!");
- [NSThread sleepForTimeInterval:0.5];
- lastBytesDownloaded = currentBytesDownloaded;
- currentBytesDownloaded = (double)downloadTaskTestHelper.totalBytesWritten / 1024 / 1024;
- LOG_INFO("Download in progress - %fMB", currentBytesDownloaded);
- ASSERT_GT_MSG(currentBytesDownloaded, lastBytesDownloaded, "FAILED: File download should be in progress!");
+ ASSERT_EQ(NSURLSessionTaskStateRunning, downloadTask.state);
}
};
\ No newline at end of file
|
masternode gui | @@ -249,8 +249,8 @@ bool CActiveMasternode::Register(std::string strService, std::string strKeyMaste
return false;
}
- if(!GetMasterNodeVin(vin, pubKeyCollateralAddress, keyCollateralAddress, txHash, strOutputIndex)) {
- errorMessage = "could not allocate vin";
+ if(!GetMasterNodeVin(vin, pubKeyCollateralAddress, keyCollateralAddress, txHash, strOutputIndex, errorMessage)) {
+ //errorMessage = "could not allocate vin";
printf("Register::Register() - Error: %s\n", errorMessage.c_str());
return false;
}
@@ -304,7 +304,6 @@ bool CActiveMasternode::GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secr
bool CActiveMasternode::GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secretKey, std::string strTxHash, std::string strOutputIndex) {
CScript pubScript;
-
// Find possible candidates
vector<COutput> possibleCoins = SelectCoinsMasternode();
COutput *selectedOutput;
|
Better newSound error messages; | @@ -67,7 +67,8 @@ static int l_lovrDataNewRasterizer(lua_State* L) {
}
static int l_lovrDataNewSound(lua_State* L) {
- if (lua_type(L, 1) == LUA_TNUMBER) {
+ int type = lua_type(L, 1);
+ if (type == LUA_TNUMBER) {
uint64_t frames = luaL_checkinteger(L, 1);
SampleFormat format = luax_checkenum(L, 2, SampleFormat, "f32");
ChannelLayout layout = luax_checkenum(L, 3, ChannelLayout, "stereo");
@@ -81,6 +82,8 @@ static int l_lovrDataNewSound(lua_State* L) {
luax_pushtype(L, Sound, sound);
lovrRelease(sound, lovrSoundDestroy);
return 1;
+ } else if (type != LUA_TSTRING && type != LUA_TUSERDATA) {
+ return luax_typeerror(L, 1, "number, string, or Blob");
}
Blob* blob = luax_readblob(L, 1, "Sound");
|
Fix skipping OpenSSL tests | @@ -40,7 +40,7 @@ $TPKG -a ../.. fake 31-load-pyldnsx.tpkg
$TPKG -a ../.. fake 32-unbound-regression.tpkg
$TPKG -a ../.. fake 999-compile-nossl.tpkg
command -v indent || $TPKG -a ../.. fake codingstyle.tpkg
-grep -q '^#define HAVE_SSL 1' ../ldns/config.h || (
+grep -q '^#define HAVE_SSL ' ../ldns/config.h || (
$TPKG -a ../.. fake 19-keygen.tpkg
$TPKG -a ../.. fake 20-sign-zone.tpkg
$TPKG -a ../.. fake 25-ZONEMD.tpkg
|
Use static asserts to verify c0 kvset cheaps can accomodate large kvs values... | #include "c0_cursor.h"
#include "c0_kvsetm.h"
+/* The minimum c0 cheap size should be at least 2MB and large enough to accomodate
+ * at least one max-sized kvs value plus associated overhead.
+ */
+_Static_assert(HSE_C0_CHEAP_SZ_MIN >= (2ul << 20), "min c0 cheap size too small");
+_Static_assert(HSE_C0_CHEAP_SZ_MIN >= HSE_KVS_VLEN_MAX + (1ul << 20), "min c0 cheap size too small");
+_Static_assert(HSE_C0_CHEAP_SZ_DFLT >= HSE_C0_CHEAP_SZ_MIN, "default c0 cheap size too small");
+_Static_assert(HSE_C0_CHEAP_SZ_MAX >= HSE_C0_CHEAP_SZ_DFLT, "max c0 cheap size too small");
+
/*
* A struct c0_kvset contains a Bonsai tree that is used in a RCU style.
* In userspace this is part of the Bonsai tree library. The kernel space
|
Space View iterator: add more checks | @@ -228,7 +228,7 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
/* Orthographic not supported. This happens when Nr (camera altitude) is missing */
if (grib_is_missing(h, sNrInRadiusOfEarth, &ret)) {
- grib_context_log(h->context, GRIB_LOG_ERROR, "Orthographic view (Nr missing) not supported");
+ grib_context_log(h->context, GRIB_LOG_ERROR, "Space View: Orthographic view (Nr missing) not supported");
return GRIB_NOT_IMPLEMENTED;
}
if ((ret = grib_get_double_internal(h, sNrInRadiusOfEarth, &nrInRadiusOfEarth)) != GRIB_SUCCESS)
@@ -256,7 +256,7 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
}
if (nrInRadiusOfEarth == 0) {
- grib_context_log(h->context, GRIB_LOG_ERROR, "Key %s must be greater than zero", sNrInRadiusOfEarth);
+ grib_context_log(h->context, GRIB_LOG_ERROR, "Space View: Key %s must be greater than zero", sNrInRadiusOfEarth);
return GRIB_GEOCALCULUS_PROBLEM;
}
@@ -265,8 +265,12 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
lap = latOfSubSatellitePointInDegrees;
lop = lonOfSubSatellitePointInDegrees;
- if (lap != 0.0)
- return GRIB_NOT_IMPLEMENTED;
+ if (lap != 0.0) {
+ grib_context_log(h->context, GRIB_LOG_ERROR,
+ "Space View: Key '%s' must be 0 (satellite must be located in the equator plane)",
+ sLatOfSubSatellitePointInDegrees);
+ return GRIB_GEOCALCULUS_PROBLEM;
+ }
/*orient_angle = orientationInDegrees;*/
/* if (orient_angle != 0.0) return GRIB_NOT_IMPLEMENTED; */
@@ -278,7 +282,7 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
/* adjustBadlyEncodedEcmwfGribs(h, &nx, &ny, &dx, &dy, &xp, &yp); */
if (dx == 0 || dy == 0) {
- grib_context_log(h->context, GRIB_LOG_ERROR, "Keys %s and %s must be greater than zero", sDx, sDy);
+ grib_context_log(h->context, GRIB_LOG_ERROR, "Space View: Keys %s and %s must be greater than zero", sDx, sDy);
return GRIB_GEOCALCULUS_PROBLEM;
}
rx = angular_size / dx;
|
Parser: Don't touch tokens after parsing the lambda body.
It's already checked for being '}', so that will never trigger. The
other (a token grab) is not used. | @@ -2722,9 +2722,6 @@ lily_var *lily_parser_lambda_eval(lily_parse_state *parser,
root_result = parse_lambda_body(parser, expect_type);
fini_expr_state(parser);
- NEED_CURRENT_TOK(tk_right_curly)
- lily_lexer(lex);
-
if (root_result != NULL)
lily_tm_insert(parser->tm, tm_return, root_result);
|
doc: fix the URL for projectacrn.github.io repo
Fix the URL used to clone the projectacrn.github.io repo. | @@ -265,7 +265,7 @@ directly to the upstream repo rather than to a personal forked copy):
.. code-block:: bash
cd ~/projectacrn
- git clone https://projectacrn/projectacrn.github.io.git
+ git clone https://github.com/projectacrn/projectacrn.github.io.git
Then, after you've verified the generated HTML from ``make html`` looks
good, you can push directly to the publishing site with:
|
fix incorrect invocation of cn_metrics.py in cn.tree.metrics | @@ -101,7 +101,7 @@ fi
set +u
get_tree_shape () {
- local metrics_cmd1=($(which cn_metrics.py) "$1" "$2")
+ local metrics_cmd1=($(which cn_metrics.py) -C "$1" "$2")
local metrics_cmd2=($(which cn_metrics) "$1" "$2")
local out="$TMP"/shape
|
check_config.h: make TLS1.3 requirements verification more readable | #endif
/* TLS 1.3 requires at least one ciphersuite, so at least SHA-256 or SHA-384 */
-#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && \
- !( ( defined(PSA_WANT_ALG_SHA_256) || defined(PSA_WANT_ALG_SHA_348) ) && \
- ( defined(MBEDTLS_USE_PSA_CRYPTO) || ( defined(MBEDTLS_MD_C) && ( defined(MBEDTLS_SHA256_C) || defined(MBEDTLS_SHA384_C) ) ) ) )
+#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
+/* We always need at least one of the hashes via PSA (for use with HKDF) */
+#if !( defined(PSA_WANT_ALG_SHA_256) || defined(PSA_WANT_ALG_SHA_384) )
#error "MBEDTLS_SSL_PROTO_TLS1_3 defined, but not all prerequisites"
-#endif
+#endif /* !(PSA_WANT_ALG_SHA_256 || PSA_WANT_ALG_SHA_384) */
+#if !defined(MBEDTLS_USE_PSA_CRYPTO)
+/* When USE_PSA_CRYPTO is not defined, we also need SHA-256 or SHA-384 via the
+ * legacy interface, including via the MD layer, for the parts of the code
+ * that are shared with TLS 1.2 (running handshake hash). */
+#if !defined(MBEDTLS_MD_C) || \
+ !( defined(MBEDTLS_SHA256_C) || defined(MBEDTLS_SHA384_C) )
+#error "MBEDTLS_SSL_PROTO_TLS1_3 defined, but not all prerequisites"
+#endif /* !MBEDTLS_MD_C || !(MBEDTLS_SHA256_C || MBEDTLS_SHA384_C) */
+#endif /* !MBEDTLS_USE_PSA_CRYPTO */
+#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
/*
* The current implementation of TLS 1.3 requires MBEDTLS_SSL_KEEP_PEER_CERTIFICATE.
|
CONNECT: cancel hostinfo_getaddr on error (especially timeout).
A timeout while waiting for dns resolution can cause `on_error` to send an
error response, and if dns resolution happens to finish right afterwards then
`on_getaddr` will get called and it will try to send another error response. | @@ -61,6 +61,10 @@ static void start_connect(struct st_connect_request_t *creq);
static void on_error(struct st_connect_request_t *creq, const char *errstr)
{
h2o_timer_unlink(&creq->timeout);
+ if (creq->getaddr_req != NULL) {
+ h2o_hostinfo_getaddr_cancel(creq->getaddr_req);
+ creq->getaddr_req = NULL;
+ }
if (creq->sock != NULL) {
h2o_socket_close(creq->sock);
creq->sock = NULL;
|
nvbios/power/unk90: there is a ver 0x20 as well | @@ -2148,6 +2148,7 @@ int envy_bios_parse_power_unk90(struct envy_bios *bios) {
bios_u8(bios, unk90->offset + 0x0, &unk90->version);
switch(unk90->version) {
case 0x10:
+ case 0x20:
err |= bios_u8(bios, unk90->offset + 0x1, &unk90->hlen);
err |= bios_u8(bios, unk90->offset + 0x2, &unk90->rlen);
err |= bios_u8(bios, unk90->offset + 0x3, &unk90->entriesnum);
|
Add CPPFLAGS to REAL_CFLAGS | @@ -41,7 +41,7 @@ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || ec
OPTIMIZATION?=-O3
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
DEBUG_FLAGS?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
REAL_LDFLAGS=$(LDFLAGS)
DYLIBSUFFIX=so
|
build: always build packages | @@ -133,9 +133,8 @@ stage("Full builds") {
parallel generate_full_build_stages()
}
-// build debian packages if on master
-// TODO replace true with env.ghprbSourceBranch=="master"
-maybeStage("Build Debian Packages", true) {
+// build debian packages + upload if on master
+stage("Build Debian Packages") {
parallel generate_package_build_stages()
}
|
WResolver: Remove useless `ifdef` | - infos/provides = resolver
- infos/needs =
- infos/placements = rollback getresolver setresolver
-#ifdef _WIN32
- infos/status = recommended maintained nodep configurable unfinished nodoc
-#else
-- infos/status = recommended maintained nodep configurable unfinished nodoc
-#endif
- infos/description = Returns success on every call and can be used as resolver.
## Introduction
|
Changelog: Document VoiceOver changes | @@ -50,6 +50,8 @@ OpenCore Changelog
- Updated OpenShell `devices` command to support misaligned device names returned by some Apple firmware
- Added `(dmg)` suffix to DMG boot options in OpenCanopy
- Added identifiers for Rocket Lake and Tiger Lake CPUs
+- Added VoiceOver 'disk image' indication
+- Fixed VoiceOver indications played twice in rare cases
#### v0.6.7
- Fixed ocvalidate return code to be non-zero when issues are found
|
After allocating chunks set the fields in a consistent way.
This removes two assignments for the flags field being done
twice and adds one, which was missing.
Thanks to Felix Weinrank for reporting the issue he found
by using fuzz testing of the userland stack. | #ifdef __FreeBSD__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 339027 2018-09-30 21:31:33Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 339040 2018-10-01 13:09:18Z tuexen $");
#endif
#include <netinet/sctp_os.h>
@@ -9475,14 +9475,15 @@ sctp_queue_op_err(struct sctp_tcb *stcb, struct mbuf *op_err)
return;
}
chk->copy_by_ref = 0;
+ chk->rec.chunk_id.id = SCTP_OPERATION_ERROR;
+ chk->rec.chunk_id.can_take_data = 0;
+ chk->flags = 0;
chk->send_size = (uint16_t)chunk_length;
chk->sent = SCTP_DATAGRAM_UNSENT;
chk->snd_count = 0;
chk->asoc = &stcb->asoc;
chk->data = op_err;
chk->whoTo = NULL;
- chk->rec.chunk_id.id = SCTP_OPERATION_ERROR;
- chk->rec.chunk_id.can_take_data = 0;
hdr = mtod(op_err, struct sctp_chunkhdr *);
hdr->chunk_type = SCTP_OPERATION_ERROR;
hdr->chunk_flags = 0;
@@ -9704,7 +9705,6 @@ sctp_send_shutdown_ack(struct sctp_tcb *stcb, struct sctp_nets *net)
chk->send_size = sizeof(struct sctp_chunkhdr);
chk->sent = SCTP_DATAGRAM_UNSENT;
chk->snd_count = 0;
- chk->flags = 0;
chk->asoc = &stcb->asoc;
chk->data = m_shutdown_ack;
chk->whoTo = net;
@@ -9759,7 +9759,6 @@ sctp_send_shutdown(struct sctp_tcb *stcb, struct sctp_nets *net)
chk->send_size = sizeof(struct sctp_shutdown_chunk);
chk->sent = SCTP_DATAGRAM_UNSENT;
chk->snd_count = 0;
- chk->flags = 0;
chk->asoc = &stcb->asoc;
chk->data = m_shutdown;
chk->whoTo = net;
@@ -12898,7 +12897,6 @@ sctp_send_str_reset_req(struct sctp_tcb *stcb,
chk->book_size = sizeof(struct sctp_chunkhdr);
chk->send_size = SCTP_SIZE32(chk->book_size);
chk->book_size_scale = 0;
-
chk->data = sctp_get_mbuf_for_msg(MCLBYTES, 0, M_NOWAIT, 1, MT_DATA);
if (chk->data == NULL) {
sctp_free_a_chunk(stcb, chk, SCTP_SO_LOCKED);
|
moved appveyor FX3SDK to downloads.myriadrf.org | @@ -30,7 +30,7 @@ install:
7z x wxWidgets-3.1.0-headers.7z -oC:\\projects\\deps\\wxWidgets > nul
- appveyor DownloadFile https://github.com/jocover/LimeSuite/releases/download/fx3sdk/FX3SDK.zip FX3SDK.zip
+ appveyor DownloadFile http://downloads.myriadrf.org/project/limesuite/appveyor/FX3SDK.zip FX3SDK.zip
7z x FX3SDK.zip -oC:\projects\deps\FX3SDK > nul
|
Change calculateSpecificationToken() to not take NULL terminator into account. | @@ -58,8 +58,9 @@ kdb_boolean_t calculateSpecificationToken (char * hash_string, KeySet * ks, Key
* (e.g. tools/kdb/gen.cpp passes keys in cascading namespace while src/libs/highlevel/elektra.c passes keys in spec namespace).
*/
keySetNamespace (cascadingKey, KEY_NS_CASCADING);
- // Feed key name into sha_256_write()
- sha_256_write (&sha_256, keyName(cascadingKey), keyGetNameSize(cascadingKey));
+ // Feed key name into sha_256_write() without NULL terminator (hence -1).
+ // This makes it easier to compare expected results with other sha256 tools.
+ sha_256_write (&sha_256, keyName(cascadingKey), keyGetNameSize(cascadingKey) - 1);
// Note: The value of the key itself is not relevant / part of specification. Only the key's name + its metadata!
KeySet * currentMetaKeys = keyMeta(currentKey);
@@ -67,8 +68,8 @@ kdb_boolean_t calculateSpecificationToken (char * hash_string, KeySet * ks, Key
ksRewind(currentMetaKeys);
// Feed name + values from meta keys into sha_256_write().
while ((currentMetaKey = ksNext (currentMetaKeys)) != NULL) {
- sha_256_write (&sha_256, keyName(currentMetaKey), keyGetNameSize (currentMetaKey));
- sha_256_write (&sha_256, keyString(currentMetaKey), keyGetValueSize(currentMetaKey));
+ sha_256_write (&sha_256, keyName(currentMetaKey), keyGetNameSize (currentMetaKey) - 1 );
+ sha_256_write (&sha_256, keyString(currentMetaKey), keyGetValueSize(currentMetaKey) - 1);
}
keyDel(cascadingKey);
|
Lower deployment target | GENERATE_PKGINFO_FILE = YES;
INFOPLIST_FILE = TrustKit/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MODULEMAP_FILE = "$(SRCROOT)/TrustKit/TrustKit.modulemap";
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_FILE = TrustKit/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MODULEMAP_FILE = "$(SRCROOT)/TrustKit/TrustKit.modulemap";
|
add manjaro theme | -static const char *fonts[] = {"Monaco-Nerd-Font-Complete-Mono:size=12"};
-static const char dmenufont[] = "Monaco-Nerd-Font-Complete-Mono:size=12";
-static const char col_gray1[] = "#282a36"; /* top bar d */
-static const char col_gray2[] = "#bd93f9";/*unfocused fonts d */
-static const char col_gray3[] = "#6272a4";/*unfocused border d */
-static const char col_gray4[] = "#8be9fd";/*focused fonts d */
-static const char col_gray5[] = "#50fa7b";/*focused windows d */
-static const char col_cyan[] = "#44475a";/*focused dmenu or topbar d */
\ No newline at end of file
+static const char *fonts[] = {"Cantarell-Regular:size=12"};
+static const char dmenufont[] = "Cantarell-Regular:size=12";
+static const char col_gray1[] = "#1B2224"; /* top bar d */
+static const char col_gray2[] = "#A4ABAA";/*unfocused fonts d */
+static const char col_gray3[] = "#686868";/*unfocused border d */
+static const char col_gray4[] = "#FFFFFF";/*focused fonts d */
+static const char col_gray5[] = "#2EB398";/*focused windows d */
+static const char col_cyan[] = "#2EB398";/*focused dmenu or topbar d */
\ No newline at end of file
|
CI: Temperaroily disable `deploy_docs_production` since `needs` has a bug which will be fixed in GitLab 13.4 | @@ -86,24 +86,24 @@ deploy_docs_preview:
DOCS_DEPLOY_PATH: "$DOCS_PATH"
DOCS_DEPLOY_URL_BASE: "https://$CI_DOCKER_REGISTRY/docs/esp-idf"
-# deploy docs to production webserver
-deploy_docs_production:
- # The DOCS_PROD_* variables used by this job are "Protected" so these branches must all be marked "Protected" in Gitlab settings
- extends:
- - .deploy_docs_template
- - .rules:protected-no_label
- stage: post_deploy
- needs: # ensure runs after push_to_github succeeded
- - build_docs_html
- - build_docs_pdf
- - push_to_github
- variables:
- TYPE: "preview"
- DOCS_DEPLOY_PRIVATEKEY: "$DOCS_PROD_DEPLOY_KEY"
- DOCS_DEPLOY_SERVER: "$DOCS_PROD_SERVER"
- DOCS_DEPLOY_SERVER_USER: "$DOCS_PROD_SERVER_USER"
- DOCS_DEPLOY_PATH: "$DOCS_PROD_PATH"
- DOCS_DEPLOY_URL_BASE: "https://docs.espressif.com/projects/esp-idf"
+## deploy docs to production webserver
+#deploy_docs_production:
+# # The DOCS_PROD_* variables used by this job are "Protected" so these branches must all be marked "Protected" in Gitlab settings
+# extends:
+# - .deploy_docs_template
+# - .rules:protected-no_label
+# stage: post_deploy
+# needs: # ensure runs after push_to_github succeeded
+# - build_docs_html
+# - build_docs_pdf
+# - push_to_github
+# variables:
+# TYPE: "preview"
+# DOCS_DEPLOY_PRIVATEKEY: "$DOCS_PROD_DEPLOY_KEY"
+# DOCS_DEPLOY_SERVER: "$DOCS_PROD_SERVER"
+# DOCS_DEPLOY_SERVER_USER: "$DOCS_PROD_SERVER_USER"
+# DOCS_DEPLOY_PATH: "$DOCS_PROD_PATH"
+# DOCS_DEPLOY_URL_BASE: "https://docs.espressif.com/projects/esp-idf"
deploy_test_result:
extends:
|
Fixed sorting on hits and visitors when larger than INT_MAX. | @@ -155,8 +155,8 @@ cmp_num_desc (const void *a, const void *b) {
const GHolderItem *ia = a;
const GHolderItem *ib = b;
- int va = ia->metrics->hits;
- int vb = ib->metrics->hits;
+ uint64_t va = ia->metrics->hits;
+ uint64_t vb = ib->metrics->hits;
return (va < vb) - (va > vb);
}
@@ -167,8 +167,8 @@ cmp_num_asc (const void *a, const void *b) {
const GHolderItem *ia = a;
const GHolderItem *ib = b;
- int va = ia->metrics->hits;
- int vb = ib->metrics->hits;
+ uint64_t va = ia->metrics->hits;
+ uint64_t vb = ib->metrics->hits;
return (va > vb) - (va < vb);
}
@@ -179,8 +179,8 @@ cmp_vis_desc (const void *a, const void *b) {
const GHolderItem *ia = a;
const GHolderItem *ib = b;
- int va = ia->metrics->visitors;
- int vb = ib->metrics->visitors;
+ uint64_t va = ia->metrics->visitors;
+ uint64_t vb = ib->metrics->visitors;
return (va < vb) - (va > vb);
}
@@ -191,8 +191,8 @@ cmp_vis_asc (const void *a, const void *b) {
const GHolderItem *ia = a;
const GHolderItem *ib = b;
- int va = ia->metrics->visitors;
- int vb = ib->metrics->visitors;
+ uint64_t va = ia->metrics->visitors;
+ uint64_t vb = ib->metrics->visitors;
return (va > vb) - (va < vb);
}
@@ -203,8 +203,8 @@ cmp_raw_num_desc (const void *a, const void *b) {
const GRawDataItem *ia = a;
const GRawDataItem *ib = b;
- int va = ia->hits;
- int vb = ib->hits;
+ uint64_t va = ia->hits;
+ uint64_t vb = ib->hits;
return (va < vb) - (va > vb);
}
|
improve saved animation | @@ -113,7 +113,7 @@ export default class TreeItem extends React.Component {
this.setState({ saved: true })
setTimeout(() => {
this.setState({ saved: false })
- }, 1000)
+ }, 900)
}, 500),
})
}}
|
Avoiding compilation on systems with no working shared memory. | @@ -314,6 +314,10 @@ nxt_port_new_port_mmap(nxt_task_t *task, nxt_process_t *process,
nxt_errno);
}
+#else
+
+#error No working shared memory implementation.
+
#endif
if (nxt_slow_path(ftruncate(fd, PORT_MMAP_SIZE) == -1)) {
|
mfu_flist_walk: added more error messages
Added a few error messages to places with TODO | @@ -265,7 +265,8 @@ static void walk_getdents_create(CIRCLE_handle* handle)
mfu_file_t* mfu_file = *CURRENT_PFILE;
int status = mfu_file_lstat(path, &st, mfu_file);
if (status != 0) {
- /* TODO: print error */
+ MFU_LOG(MFU_LOG_ERR, "Failed to stat: '%s' (errno=%d %s)",
+ path, errno, strerror(errno));
return;
}
@@ -317,16 +318,12 @@ static void walk_readdir_process_dir(const char* dir, CIRCLE_handle* handle)
st.st_mode |= S_IXUSR;
mfu_file_chmod(dir, st.st_mode, mfu_file);
dirp = mfu_file_opendir(dir, mfu_file);
- if (dirp == NULL) {
- if (errno == EACCES) {
- MFU_LOG(MFU_LOG_ERR, "Failed to open directory with opendir: `%s' (errno=%d %s)", dir, errno, strerror(errno));
- }
- }
}
}
if (! dirp) {
- /* TODO: print error */
+ MFU_LOG(MFU_LOG_ERR, "Failed to open directory with opendir: '%s' (errno=%d %s)",
+ dir, errno, strerror(errno));
}
else {
/* Read all directory entries */
@@ -381,7 +378,8 @@ static void walk_readdir_process_dir(const char* dir, CIRCLE_handle* handle)
}
}
else {
- /* error */
+ MFU_LOG(MFU_LOG_ERR, "Failed to stat: '%s' (errno=%d %s)",
+ newpath, errno, strerror(errno));
}
}
@@ -420,7 +418,8 @@ static void walk_readdir_create(CIRCLE_handle* handle)
mfu_file_t* mfu_file = *CURRENT_PFILE;
int status = mfu_file_lstat(path, &st, mfu_file);
if (status != 0) {
- /* TODO: print error */
+ MFU_LOG(MFU_LOG_ERR, "Failed to stat: '%s' (errno=%d %s)",
+ path, errno, strerror(errno));
return;
}
@@ -461,7 +460,8 @@ static void walk_stat_process_dir(char* dir, CIRCLE_handle* handle)
DIR* dirp = mfu_file_opendir(dir, mfu_file);
if (! dirp) {
- /* TODO: print error */
+ MFU_LOG(MFU_LOG_ERR, "Failed to open directory with opendir: '%s' (errno=%d %s)",
+ dir, errno, strerror(errno));
}
else {
while (1) {
|
doc: Editorial changes to hypercall hld | @@ -13,26 +13,26 @@ The application binary interface (ABI) of ACRN hypercalls is defined as follows.
- A guest VM executes the ``vmcall`` instruction to trigger a hypercall.
-- Input parameters of a hypercall includes:
+- Input parameters of a hypercall include:
- - An hypercall ID in register ``R8``, which specifies the kind of service
+ - A hypercall ID in register ``R8``, which specifies the kind of service
requested by the guest VM.
- The first parameter in register ``RDI`` and the second in register
``RSI``. The semantics of those two parameters vary among different kinds of
- hypercalls and are defined in the hypercall APIs reference. For hypercalls
+ hypercalls and are defined in the :ref:`hv-hypercall-ref`. For hypercalls
requesting operations on a specific VM, the first parameter is typically the
ID of that VM.
- The register ``RAX`` contains the return value of the hypercall after a guest
VM executes the ``vmcall`` instruction, unless the ``vmcall`` instruction
- triggers an exception. Other general purpose registers are not modified by a
+ triggers an exception. Other general-purpose registers are not modified by a
hypercall.
-- In case a hypercall parameter is defined as a pointer to a data structure,
- fields in that structure can be either input, output or inout.
+- If a hypercall parameter is defined as a pointer to a data structure,
+ fields in that structure can be either input, output, or inout.
-There are some restrictions for hypercall and upcall:
+There are some restrictions for hypercalls and upcalls:
#. Only specific VMs (the Service VM and the VM with Trusty enabled)
can invoke hypercalls. A VM that cannot invoke hypercalls gets ``#UD``
@@ -58,6 +58,8 @@ Service VM registers the IRQ handler for vector (0xF3) and notifies the I/O
emulation module in the Service VM once the IRQ is triggered. View the detailed
upcall process at :ref:`ipi-management`.
+.. _hv-hypercall-ref:
+
Hypercall APIs Reference
************************
|
Fix: BLE test framework
Adding a test that clean up all previously bonded devices | @@ -526,6 +526,7 @@ TEST_GROUP_RUNNER( Full_BLE )
RUN_TEST_CASE( Full_BLE, BLE_CreateAttTable_StartService );
RUN_TEST_CASE( Full_BLE, BLE_Advertising_SetProperties );//@TOTO, incomplete
+ RUN_TEST_CASE( Full_BLE, BLE_Connection_RemoveAllBonds );
RUN_TEST_CASE( Full_BLE, BLE_Advertising_SetAvertisementData );//@TOTO, incomplete
RUN_TEST_CASE( Full_BLE, BLE_Advertising_StartAdvertisement );
@@ -556,6 +557,44 @@ TEST_GROUP_RUNNER( Full_BLE )
prvGroupFree();
}
+void prvRemoveBond(BTBdaddr_t * pxDeviceAddres)
+{
+ BTStatus_t xStatus;
+ BLETESTBondedCallback_t xBondedEvent;
+
+ xStatus = pxBTInterface->pxRemoveBond(pxDeviceAddres);
+ TEST_ASSERT_EQUAL(eBTStatusSuccess, xStatus);
+
+ xStatus = prvWaitEventFromQueue(eBLEHALEventBondedCb, (void *)&xBondedEvent, sizeof(BLETESTBondedCallback_t), BLE_TESTS_WAIT);
+ TEST_ASSERT_EQUAL(eBTStatusSuccess, xStatus);
+ TEST_ASSERT_EQUAL(eBTStatusSuccess, xBondedEvent.xStatus);
+ TEST_ASSERT_EQUAL(false, xBondedEvent.bIsBonded);
+ TEST_ASSERT_EQUAL(0, memcmp(&xBondedEvent.xRemoteBdAddr, pxDeviceAddres, sizeof(BTBdaddr_t) ));
+
+}
+
+TEST( Full_BLE, BLE_Connection_RemoveAllBonds )
+{
+ BTProperty_t pxProperty;
+ uint16_t usIndex;
+
+ /* Set the name */
+ pxProperty.xType = eBTpropertyAdapterBondedDevices;
+
+ /* Get bonded devices */
+ prvSetGetProperty(&pxProperty, false);
+
+ for(usIndex = 0; usIndex < pxProperty.xLen; usIndex++)
+ {
+ prvRemoveBond(&((BTBdaddr_t *)pxProperty.pvVal)[usIndex]);
+ }
+
+ /* Get bonded devices. */
+ prvSetGetProperty(&pxProperty, false);
+ /* Check none are left. */
+ TEST_ASSERT_EQUAL(0, pxProperty.xLen);
+}
+
bool prvGetCheckDeviceBonded(BTBdaddr_t * pxDeviceAddres)
{
BTProperty_t pxProperty;
@@ -578,6 +617,7 @@ bool prvGetCheckDeviceBonded(BTBdaddr_t * pxDeviceAddres)
return bFoundRemoteDevice;
}
+
void prvWaitConnection(bool bConnected)
{
BLETESTConnectionCallback_t xConnectionEvent;
@@ -618,17 +658,8 @@ TEST( Full_BLE, BLE_Connection_Mode1Level2 )
TEST( Full_BLE, BLE_Connection_RemoveBonding )
{
bool bFoundRemoteDevice;
- BTStatus_t xStatus;
- BLETESTBondedCallback_t xBondedEvent;
- xStatus = pxBTInterface->pxRemoveBond(&xAddressConnectedDevice);
- TEST_ASSERT_EQUAL(eBTStatusSuccess, xStatus);
-
- xStatus = prvWaitEventFromQueue(eBLEHALEventBondedCb, (void *)&xBondedEvent, sizeof(BLETESTBondedCallback_t), BLE_TESTS_WAIT);
- TEST_ASSERT_EQUAL(eBTStatusSuccess, xStatus);
- TEST_ASSERT_EQUAL(eBTStatusSuccess, xBondedEvent.xStatus);
- TEST_ASSERT_EQUAL(false, xBondedEvent.bIsBonded);
- TEST_ASSERT_EQUAL(0, memcmp(&xBondedEvent.xRemoteBdAddr, &xAddressConnectedDevice, sizeof(BTBdaddr_t) ));
+ prvRemoveBond(&xAddressConnectedDevice);
bFoundRemoteDevice = prvGetCheckDeviceBonded(&xAddressConnectedDevice);
TEST_ASSERT_EQUAL(false, bFoundRemoteDevice);
|
HLS: Remove comment | @@ -196,7 +196,7 @@ void action_wrapper(snap_membus_t *din_gmem,
(ap_uint<MEMDW> *)(T1_type == HOST_DRAM) ?
(dout_gmem + (T1_address >> ADDR_RIGHT_SHIFT)) :
(d_ddrmem + (T1_address >> ADDR_RIGHT_SHIFT)),
- T1_size); */
+ T1_size);
memcpy((snap_membus_t *)__table2,
(snap_membus_t *)(T2_type == HOST_DRAM) ?
|
Fix omission of daylight savings time in mktime
Since with daylight savings times, certain times
are ambiguous (the hours before and after the switch), mktime
needs to allow reading a dst flag. | @@ -673,6 +673,18 @@ static Janet os_date(int32_t argc, Janet *argv) {
return janet_wrap_struct(janet_struct_end(st));
}
+static int entry_getdst(Janet env_entry) {
+ if (janet_checktype(env_entry, JANET_TABLE)) {
+ JanetTable *entry = janet_unwrap_table(env_entry);
+ return janet_truthy(janet_table_get(entry, janet_ckeywordv("dst")));
+ } else if (janet_checktype(env_entry, JANET_STRUCT)) {
+ const JanetKV *entry = janet_unwrap_struct(env_entry);
+ return janet_truthy(janet_struct_get(entry, janet_ckeywordv("dst")));
+ } else {
+ return 0;
+ }
+}
+
#ifdef JANET_WINDOWS
typedef int32_t timeint_t;
#else
@@ -725,6 +737,7 @@ static Janet os_mktime(int32_t argc, Janet *argv) {
t_info.tm_mday = entry_getint(argv[0], "month-day") + 1;
t_info.tm_mon = entry_getint(argv[0], "month");
t_info.tm_year = entry_getint(argv[0], "year") - 1900;
+ t_info.tm_isdst = entry_getdst(argv[0]);
if (argc >= 2 && janet_truthy(argv[1])) {
/* local time */
|
Disable -Wstringop-truncation also for GCC 8. | @@ -167,12 +167,12 @@ static char * parson_strndup(const char *string, size_t n) {
return NULL;
}
output_string[n] = '\0';
-#if __GNUC__ > 8
+#if __GNUC__ >= 8
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-truncation"
#endif
strncpy(output_string, string, n);
-#if __GNUC__ > 8
+#if __GNUC__ >= 8
#pragma GCC diagnostic pop
#endif
return output_string;
|
user_version.h: use ESP_SDK* constants
Derive NODE_VERSION by concatenating string constants. | #ifndef __USER_VERSION_H__
#define __USER_VERSION_H__
-#define NODE_VERSION_MAJOR 2U
-#define NODE_VERSION_MINOR 1U
-#define NODE_VERSION_REVISION 0U
-#define NODE_VERSION_INTERNAL 0U
+#include "version.h" /* ESP firmware header */
+
+#define NODE_VERSION_MAJOR ESP_SDK_VERSION_MAJOR
+#define NODE_VERSION_MINOR ESP_SDK_VERSION_MINOR
+#define NODE_VERSION_REVISION ESP_SDK_VERSION_PATCH
+#define NODE_VERSION_INTERNAL 0
+
+#define NODE_VERSION_STR(x) #x
+#define NODE_VERSION_XSTR(x) NODE_VERSION_STR(x)
+
+#define NODE_VERSION "NodeMCU " ESP_SDK_VERSION_STRING "." NODE_VERSION_XSTR(NODE_VERSION_INTERNAL)
-#define NODE_VERSION "NodeMCU 2.1.0"
#ifndef BUILD_DATE
#define BUILD_DATE "unspecified"
#endif
|
modified json for update release archive file. | },
"url": "https://github.com/ROBOTIS-GIT/OpenCR/releases/download/1.4.0/opencr_core_1.4.0.tar.bz2",
"archiveFileName": "opencr_core_1.4.0.tar.bz2",
- "checksum": "SHA-256:d258f298f9934f7da14cdd2548dfb67ec17246f0ac82d31df11700a0ed2ef919",
- "size": "19272596",
+ "checksum": "SHA-256:c2450e112784cf4774d830669a41d20470edc925f8e1872b32f59826fd98706c",
+ "size": "19273334",
"help": {
"online": "http://emanual.robotis.com/docs/en/parts/controller/opencr10/"
},
|
nimble/gap: Add missing listener callback call on Scan Request | @@ -755,15 +755,18 @@ ble_gap_scan_req_rcvd(uint8_t instance, uint8_t scan_addr_type,
ble_gap_event_fn *cb;
void *cb_arg;
- ble_gap_slave_extract_cb(instance, &cb, &cb_arg);
- if (cb != NULL) {
memset(&event, 0, sizeof event);
event.type = BLE_GAP_EVENT_SCAN_REQ_RCVD;
event.scan_req_rcvd.instance = instance;
event.scan_req_rcvd.scan_addr.type = scan_addr_type;
memcpy(event.scan_req_rcvd.scan_addr.val, scan_addr, 6);
+
+ ble_gap_slave_extract_cb(instance, &cb, &cb_arg);
+ if (cb != NULL) {
cb(&event, cb_arg);
}
+
+ ble_gap_event_listener_call(&event);
}
#endif
|
Keep consistency order. | @@ -802,8 +802,8 @@ static int ssl_tls1_3_process_server_finished( mbedtls_ssl_context *ssl )
*/
static int ssl_tls1_3_write_client_certificate( mbedtls_ssl_context *ssl )
{
- mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_CLIENT_CERTIFICATE_VERIFY );
MBEDTLS_SSL_DEBUG_MSG( 1, ( "%s hasn't been implemented", __func__ ) );
+ mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_CLIENT_CERTIFICATE_VERIFY );
return( 0 );
}
@@ -812,8 +812,8 @@ static int ssl_tls1_3_write_client_certificate( mbedtls_ssl_context *ssl )
*/
static int ssl_tls1_3_write_client_certificate_verify( mbedtls_ssl_context *ssl )
{
- mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_CLIENT_FINISHED );
MBEDTLS_SSL_DEBUG_MSG( 1, ( "%s hasn't been implemented", __func__ ) );
+ mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_CLIENT_FINISHED );
return( 0 );
}
@@ -822,8 +822,8 @@ static int ssl_tls1_3_write_client_certificate_verify( mbedtls_ssl_context *ssl
*/
static int ssl_tls1_3_write_client_finished( mbedtls_ssl_context *ssl )
{
- mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_FLUSH_BUFFERS );
MBEDTLS_SSL_DEBUG_MSG( 1, ( "%s hasn't been implemented", __func__ ) );
+ mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_FLUSH_BUFFERS );
return( 0 );
}
@@ -832,8 +832,8 @@ static int ssl_tls1_3_write_client_finished( mbedtls_ssl_context *ssl )
*/
static int ssl_tls1_3_flush_buffers( mbedtls_ssl_context *ssl )
{
- mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_HANDSHAKE_WRAPUP );
MBEDTLS_SSL_DEBUG_MSG( 1, ( "%s hasn't been implemented", __func__ ) );
+ mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_HANDSHAKE_WRAPUP );
return( 0 );
}
|
client: Log HTTP stream close | @@ -2009,6 +2009,10 @@ int Client::http_stream_close(int64_t stream_id, uint64_t app_error_code) {
}
if (auto it = streams_.find(stream_id); it != std::end(streams_)) {
+ if (!config.quiet) {
+ std::cerr << "HTTP/3 stream " << stream_id << " closed with error code "
+ << app_error_code << std::endl;
+ }
streams_.erase(it);
}
|
'Correct' renaming of 'Quick Start Guide' to 'Using the CLI', + inbound links | ---
-title: Quick Start Guide
+title: Using the CLI
---
-## Quick Start Guide
+## Using the CLI
---
### Explore the CLI
@@ -25,7 +25,6 @@ scope curl https://google.com
>> should see output of curl here <<
```
-
### Let's explore captured data
To see the monitoring and visualization features AppScope offers, exercise some of its options. E.g.:
@@ -79,7 +78,7 @@ fs.error 7 Count operation 525 class: stat,file: summary,host: 771f60
-- Display last session's captured events with `scope events`:
+- Display the last session's captured events with `scope events`:
```
[j98] Jan 31 21:38:53 ps console stdout 19:40
@@ -104,7 +103,7 @@ fs.error 7 Count operation 525 class: stat,file: summary,host: 771f60
[Bh9] Jan 31 21:38:53 ps console stdout /usr/bin/ps -ef
```
-- Filter out last session's events, for just `http` with `scope events -t http`:
+- Filter out the last session's events, for just `http` with `scope events -t http`:
```
[MJ33] Jan 31 19:55:22 cribl http http-resp http.host:localhost:9000 http.method:GET http.scheme:http http.target:/ http.response_content_length:1630
@@ -121,7 +120,7 @@ fs.error 7 Count operation 525 class: stat,file: summary,host: 771f60
```
-- List this AppScope sessions history with `scope history`:
+- List this AppScope session's history with `scope history`:
```
Displaying last 20 sessions
@@ -135,4 +134,5 @@ ID COMMAND CMDLINE PID AGE DURATION TOTAL EVENTS
### Next Steps
-For guidance on taking AppScope to the next level, [join](https://cribl.io/community?utm_source=appscope&utm_medium=footer&utm_campaign=appscope) our [Community Slack](https://app.slack.com/client/TD0HGJPT5/CPYBPK65V/thread/C01BM8PU30V-1611001888.001100).
+- Explore the [Loader, Library, and .yml files](/docs/loader-library).
+- View the complete [CLI Reference](/docs/cli-reference).
\ No newline at end of file
|
fixed walking flag | @@ -17327,7 +17327,7 @@ static int common_anim_series(entity *ent, int arraya[], int maxa, int forcemode
if (forcemode || normal_find_target(iAni, 0)) //Opponent in range of current animation?
{
ent_set_anim(ent, iAni, 0); //Set animation.
- if ( defaulta == ANI_WALK || defaulta == ANI_UP || defaulta == ANI_DOWN ) ent->walking = 1; // set walking prop
+ if ( iAni == ANI_WALK || iAni == ANI_UP || iAni == ANI_DOWN ) ent->walking = 1; // set walking prop
return 1; //Return 1 and exit.
}
|
syscall_schedule: dereference of invalid current caused crash under smp; place it before thread_pause | @@ -2513,8 +2513,8 @@ static void syscall_schedule(context f, u64 call)
current_cpu()->state = cpu_kernel;
syscall_debug(f);
} else {
- thread_pause(current);
enqueue(runqueue, ¤t->deferred_syscall);
+ thread_pause(current);
runloop();
}
}
|
Fix error type of lms_import_public_key
Was returning an incorrect error when bad public key sizes were input | @@ -235,9 +235,9 @@ int mbedtls_lms_import_public_key( mbedtls_lms_public_t *ctx,
mbedtls_lms_algorithm_type_t type;
mbedtls_lmots_algorithm_type_t otstype;
- if( key_size < MBEDTLS_LMS_PUBLIC_KEY_LEN(ctx->params.type) )
+ if( key_size != MBEDTLS_LMS_PUBLIC_KEY_LEN(ctx->params.type) )
{
- return( MBEDTLS_ERR_LMS_BUFFER_TOO_SMALL );
+ return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
}
type = mbedtls_lms_network_bytes_to_unsigned_int( MBEDTLS_LMS_TYPE_LEN,
|
Fix for selection text. | @@ -1226,13 +1226,21 @@ implements SensorEventListener
//Log.v("VIEW","Run setPopupSelection " + (activity.mIncrementalText ?"inc ":"smart ") + inSel0 + "..." + inSel1 );
if (inSel0!=inSel1)
activity.mKeyInTextView.setSelection(inSel0,inSel1);
- else
- activity.mKeyInTextView.setSelection(inSel0);
+ else {
+ int selection = calcSelectionIndex(inSel0, activity.mKeyInTextView);
+ activity.mKeyInTextView.setSelection(selection);
+ }
activity.mTextUpdateLockout = false;
}
}} );
}
+ private static int calcSelectionIndex(int index, EditText editText){
+ if(index >= editText.getText().length())
+ return 0;
+ return index;
+ }
+
void onSelectionChanged(final int selStart, final int selEnd)
{
if (mTextUpdateLockout || mView==null || mIncrementalText)
|
Migrate tile colors from scene entity to background entity | @@ -65,6 +65,7 @@ const migrateProject = project => {
if (release === "6") {
data = migrateFrom200r6To200r7Events(data);
data = migrateFrom200r6To200r7Actors(data);
+ data = migrateFrom200r6To200r7Backgrounds(data);
data = migrateFrom200r6To200r7Scenes(data);
data = migrateFrom200r6To200r7Settings(data);
release = "7";
@@ -1010,6 +1011,24 @@ const migrateFrom200r6To200r7Actors = data => {
};
};
+/*
+ * Version 2.0.0 r7 moves image color data into background entity rather than scene
+ */
+const migrateFrom200r6To200r7Backgrounds = data => {
+ return {
+ ...data,
+ backgrounds: data.backgrounds.map(background => {
+ // Find an existing scene using this background and copy the tile colors used
+ const scene = data.scenes.find((scene) => scene.backgroundId === background.id);
+ const tileColors = (scene && scene.tileColors) || [];
+ return {
+ ...background,
+ tileColors
+ };
+ })
+ };
+}
+
/*
* Version 2.0.0 r7 switches scene type to be a string enum
*/
|
fixed sprite corruption, third attempt :) | @@ -229,9 +229,13 @@ static void copySelection(Sprite* sprite)
static void processSelectCanvasMouse(Sprite* sprite, s32 x, s32 y)
{
+ tic_mem* tic = sprite->tic;
+
tic_rect rect = {x, y, CANVAS_SIZE, CANVAS_SIZE};
const s32 Size = CANVAS_SIZE / sprite->size;
+ bool endDrag = false;
+
if(checkMousePos(&rect))
{
setCursor(tic_cursor_hand);
@@ -265,13 +269,16 @@ static void processSelectCanvasMouse(Sprite* sprite, s32 x, s32 y)
sprite->select.rect = (tic_rect){sprite->select.start.x, sprite->select.start.y, 1, 1};
}
}
- else if(sprite->select.drag)
+ else endDrag = sprite->select.drag;
+ }
+ else endDrag = !tic->ram.input.mouse.left && sprite->select.drag;
+
+ if(endDrag)
{
copySelection(sprite);
sprite->select.drag = false;
}
}
-}
static void floodFill(Sprite* sprite, s32 l, s32 t, s32 r, s32 b, s32 x, s32 y, u8 color, u8 fill)
{
|
BindBufferMemory, BindImageMemory - Return VK_ERROR_UNKNOWN for unknown allocation type | @@ -15598,7 +15598,7 @@ VkResult VmaAllocator_T::BindBufferMemory(
VkBuffer hBuffer,
const void* pNext)
{
- VkResult res = VK_SUCCESS;
+ VkResult res = VK_ERROR_UNKNOWN;
switch(hAllocation->GetType())
{
case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
@@ -15623,7 +15623,7 @@ VkResult VmaAllocator_T::BindImageMemory(
VkImage hImage,
const void* pNext)
{
- VkResult res = VK_SUCCESS;
+ VkResult res = VK_ERROR_UNKNOWN;
switch(hAllocation->GetType())
{
case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
|
landscape: move transcluded comments to new render
Fixes urbit/landscape#814
Fixes urbit/landscape#813 | @@ -4,6 +4,7 @@ import ChatMessage from "../chat/components/ChatMessage";
import { Association, GraphNode, Post, Group } from "@urbit/api";
import { useGroupForAssoc } from "~/logic/state/group";
import { MentionText } from "~/views/components/MentionText";
+import { GraphContentWide } from '~/views/landscape/components/Graph/GraphContentWide';
import Author from "~/views/components/Author";
import { NoteContent } from "../publish/components/Note";
import { PostContent } from "~/views/landscape/components/Home/Post/PostContent";
@@ -74,11 +75,11 @@ function TranscludedComment(props: {
group={group}
/>
<Box p="2">
- <MentionText
+ <GraphContentWide
api={api}
transcluded={transcluded}
- content={comment.post.contents}
- group={group}
+ post={comment.post}
+ showOurContact={false}
/>
</Box>
</Col>
|
rework layout of "create new key" dialog | @@ -136,8 +136,8 @@ export default class AddDialog extends Component {
onRequestClose={this.handleClose}
>
<h1>Creating new {arrayKeyLength ? 'array ' : ''}key at <b>{path}</b></h1>
- <div style={{ display: 'flex', alignItems: 'center' }}>
- <div style={{ flex: 'initial' }}>
+ <div style={{ display: 'flex' }}>
+ <div style={{ flex: 1 }}>
<TextField
ref="nameField"
floatingLabelText="name"
@@ -152,8 +152,7 @@ export default class AddDialog extends Component {
}}
/>
</div>
- </div>
- <div style={{ display: 'block', marginTop: 8 }}>
+ <div style={{ flex: 1 }}>
<SelectField
floatingLabelText="type"
floatingLabelFixed={true}
@@ -168,22 +167,9 @@ export default class AddDialog extends Component {
)}
</SelectField>
</div>
- <div style={{ display: 'block', marginTop: 8 }}>
- <SelectField
- floatingLabelText="visibility"
- floatingLabelFixed={true}
- onFocus={() => !this.state.paused && this.setState({ paused: true })}
- onChange={(e, _, val) => {
- this.setState({ visibility: val, paused: false })
- }}
- value={visibility}
- >
- {Object.keys(VISIBILITY_LEVELS).map(lvl =>
- <MenuItem key={lvl} value={lvl} primaryText={lvl} />
- )}
- </SelectField>
</div>
- <div style={{ display: 'block', marginTop: 8 }}>
+ <div style={{ display: 'flex' }}>
+ <div style={{ flex: 1 }}>
{type !== 'enum' && renderField({
value,
meta: { 'check/type': type },
@@ -210,6 +196,22 @@ export default class AddDialog extends Component {
</div>
)}
</div>
+ <div style={{ flex: 1 }}>
+ <SelectField
+ floatingLabelText="visibility"
+ floatingLabelFixed={true}
+ onFocus={() => !this.state.paused && this.setState({ paused: true })}
+ onChange={(e, _, val) => {
+ this.setState({ visibility: val, paused: false })
+ }}
+ value={visibility}
+ >
+ {Object.keys(VISIBILITY_LEVELS).map(lvl =>
+ <MenuItem key={lvl} value={lvl} primaryText={lvl} />
+ )}
+ </SelectField>
+ </div>
+ </div>
</FocusTrapDialog>
)
}
|
Remove leak. | @@ -1029,9 +1029,6 @@ scs_int SCS(solve)(ScsWork *w, ScsSolution *sol, ScsInfo * info) {
scs_int l = w->m + w->n + 1;
const ScsData * d = w->d;
const ScsCone * k = w->k;
- /* TODO delete me */
- scs_int* XXX = scs_calloc(10, sizeof(scs_int));
- XXX[0] = 1;
info->setup_time = w->setup_time;
/* initialize ctrl-c support */
scs_start_interrupt_listener();
|
README.webp_js: update Emscripten.cmake note
recent versions of the sdk don't set the EMSCRIPTEN environment
variable; provide a workaround. | @@ -17,6 +17,10 @@ using Emscripten and CMake.
- make sure the file $EMSCRIPTEN/cmake/Modules/Platform/Emscripten.cmake is
accessible. This is the toolchain file used by CMake to invoke Emscripten.
+ If $EMSCRIPTEN is unset search for Emscripten.cmake under $EMSDK and set
+ $EMSCRIPTEN accordingly, for example:
+ unix-like environments: export EMSCRIPTEN=$EMSDK/fastcomp/emscripten
+ windows: set EMSCRIPTEN=%EMSDK%\fastcomp\emscripten
- configure the project 'WEBP_JS' with CMake using:
|
vtep: correctly bring vtep lport up in SBDB
Fixes: ("binding: Correctly set Port_Binding.up for container/virtual ports.")
Acked-by: Mark Michelson | @@ -109,14 +109,12 @@ update_pb_chassis(const struct sbrec_port_binding *port_binding_rec,
port_binding_rec->chassis->name,
chassis_rec->name);
}
-
sbrec_port_binding_set_chassis(port_binding_rec, chassis_rec);
- if (port_binding_rec->n_up) {
+ } else if (port_binding_rec->n_up) {
bool up = true;
sbrec_port_binding_set_up(port_binding_rec, &up, 1);
}
}
-}
/* Checks and updates logical port to vtep logical switch bindings for each
|
grid: bump desk from ui | import { pick } from 'lodash-es';
import React, { useCallback } from 'react';
-import { kilnSuspend } from '@urbit/api/hood';
+import { kilnBump } from '@urbit/api/hood';
import { AppList } from '../../components/AppList';
import { Button } from '../../components/Button';
import { Dialog, DialogClose, DialogContent, DialogTrigger } from '../../components/Dialog';
@@ -49,9 +49,8 @@ export const BaseBlockedNotification = ({ notification }: BaseBlockedNotificatio
const handlePauseOTAs = useCallback(() => {}, []);
const handleArchiveApps = useCallback(async () => {
- await Promise.all(desks.map((d) => api.poke(kilnSuspend(d))));
- // TODO: retrigger OTA?
- }, [desks]);
+ api.poke(kilnBump(true));
+ }, []);
return (
<section
|
remove multipath compilation warning | @@ -7,7 +7,7 @@ static __attribute__((always_inline)) picoquic_path_t *schedule_path_rtt(picoqui
if (retransmit_p && from_path && reason) {
if (strncmp(PROTOOPID_NOPARAM_RETRANSMISSION_TIMEOUT, reason, 23) != 0) {
/* Fast retransmit or TLP, stay on the same path! */
- return (protoop_arg_t) from_path;
+ return from_path;
}
}
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.