message
stringlengths
6
474
diff
stringlengths
8
5.22k
add a specific toolchain env
@@ -126,10 +126,14 @@ SRCDIR="$(pwd)/toolchains" module_all qemu --prefix="${RISCV}" --target-list=ris cd "$RDIR" +# create specific env.sh { echo "export CHIPYARD_TOOLCHAIN_SOURCED=1" echo "export RISCV=$(printf '%q' "$RISCV")" echo "export PATH=\${RISCV}/bin:\${PATH}" echo "export LD_LIBRARY_PATH=\${RISCV}/lib\${LD_LIBRARY_PATH:+":\${LD_LIBRARY_PATH}"}" -} > env.sh +} > env-$TOOLCHAIN.sh + +# create general env.sh +ln -s env-$TOOLCHAIN.sh env.sh echo "Toolchain Build Complete!"
doc: update 2.7 release notes Fix errors in description of changes. Add mention of SOS -> Service_VM change in config options/values.
@@ -90,8 +90,8 @@ User-Friendly VM names user-friendly VM name. Extend Use of CAT Cache Tuning to VMs - In previous releases, Cache Allocation Technology (vCAT) was available only - at the hypervisor level and with per-VM granularity. In this v2.7 release, + In previous releases, Cache Allocation Technology (CAT) was available only + at the hypervisor level and with per-pCPU granularity. In this v2.7 release, each VM with exclusive cache resources can partition them with per-thread granularity and allocate cache resources to prioritized tasks. @@ -137,6 +137,15 @@ The following elements were removed. - ``KATA_VM`` VM type. - ``hv.CAPACITIES.MAX_EFI_MMAP_ENTRIES`` +- ``hv.MEMORY.HV_RAM_SIZE`` (Hypervisor RAM size is now computed by the linker) + +As part of using consistent names for UOS and SOS, we also change configuration +option names or values using these obsolete terms: + +- The :option:`vm.vm_type` option value ``SOS_VM`` is now ``SERVICE_VM`` +- The :option:`vm.legacy_vuart.base` option value ``SOS_VM_COM1_BASE`` is now + ``SERVICE_VM_COM1_BASE``, with the same change for COM2, COM3, and COM4 base + and for the :option:`vm.legacy_vuart.irq` option values. In v2.7, the ``acrn-dm`` command line parameter ``--cpu_affinity`` is now mandatory when launching a User VM. If the launch XML settings, used to generate the launch
tests: internal: parser: validate tz with format 'hh:mm'
@@ -77,9 +77,11 @@ struct time_check time_entries[] = { /* Same date for different timezones, same timestamp */ {"generic_TZ" , "07/17/2017 20:17:03 +0000" , 1500322623, 0, 0}, {"generic_TZ" , "07/18/2017 01:47:03 +0530" , 1500322623, 0, 0}, + {"generic_TZ" , "07/18/2017 01:47:03 +05:30" , 1500322623, 0, 0}, {"generic_TZ" , "07/18/2017 05:17:03 +0900" , 1500322623, 0, 0}, {"generic_TZ" , "07/17/2017 22:17:03 +0200" , 1500322623, 0, 0}, {"generic_N_TZ" , "07/17/2017 22:17:03.1 +0200", 1500322623, 0.1, 0}, + {"generic_N_TZ" , "07/17/2017 22:17:03.1 +02:00", 1500322623, 0.1, 0}, /* Same date for different timezones, same timestamp w/ fixed UTC offset */ {"generic" , "07/18/2017 01:47:03" , 1500322623, 0, 19800},
Add comment explaining crecord_getmem
@@ -797,6 +797,8 @@ end function RecordCoder:declare_getmem() if self.layout.prim_size == 0 then return "" end + -- This function is a specialization of the macro getudatamem that generates + -- a cleaner assembly because NUVALUE is a compile-time constant. local out = util.render([[ static ${STRUCT} *${GETMEM}(Udata *u) {
esp32/modsocket: Use m_new_obj_with_finaliser instead of calloc.
@@ -119,7 +119,7 @@ STATIC mp_obj_t socket_accept(const mp_obj_t arg0) { socket_obj_t *self = MP_OBJ_TO_PTR(arg0); int x = lwip_accept(self->fd, NULL, NULL); if (x >= 0) { - socket_obj_t *sock = (socket_obj_t *)calloc(1, sizeof(socket_obj_t)); + socket_obj_t *sock = m_new_obj_with_finaliser(socket_obj_t); sock->base.type = self->base.type; sock->fd = x; return MP_OBJ_FROM_PTR(sock); @@ -315,7 +315,7 @@ STATIC const mp_obj_type_t socket_type = { STATIC mp_obj_t get_socket(mp_uint_t n_args, const mp_obj_t *args) { // XXX TODO support for UDP and RAW. - socket_obj_t *sock = (socket_obj_t *)calloc(1, sizeof(socket_obj_t)); + socket_obj_t *sock = m_new_obj_with_finaliser(socket_obj_t); sock->base.type = &socket_type; sock->domain = AF_INET; sock->type = SOCK_STREAM;
Improve error messages for bad vertex formats;
@@ -51,6 +51,8 @@ bool luax_checkvertexformat(lua_State* L, int index, VertexFormat* format) { const char* name = lua_tostring(L, -3); AttributeType type = luaL_checkoption(L, -2, NULL, AttributeTypes); int count = lua_tointeger(L, -1); + lovrAssert(type != ATTR_BYTE || count == 1, "Vertex attribute with type 'byte' must have a count of 1"); + lovrAssert(count >= 1 || count <= 4, "Vertex attribute counts must be between 1 and 4"); vertexFormatAppend(format, name, type, count); lua_pop(L, 4); }
UWP build script cleanup
@@ -77,7 +77,6 @@ def buildWinPhoneNativeDLL(args, arch): '-DCMAKE_GENERATOR_PLATFORM=%s' % platformArch, '-DCMAKE_BUILD_TYPE=%s' % args.nativeconfiguration, '-DWRAPPER_DIR=%s' % ('%s/generated/winphone-csharp/wrappers' % baseDir), - '-DANGLE_LIB_DIR=%s' % ('%s/libs-external/angle/prebuilt/Lib/%s' % (baseDir, platformArch)), "-DSDK_CPP_DEFINES=%s" % " ".join(defines), "-DSDK_VERSION='%s'" % version, "-DSDK_PLATFORM='Windows Phone 10'",
[chainmaker]modify ptr malloc
@@ -82,11 +82,12 @@ BOAT_RESULT generateTxRequestPack(BoatHlchainmakerTx *tx_ptr, char *method, Boat transactPayload.n_parameters = transaction_para->n_parameters; transactPayload.parameters = (BoatKeyValuePair**) BoatMalloc(sizeof(BoatKeyValuePair*) * transactPayload.n_parameters); + BoatKeyValuePair* array = BoatMalloc(sizeof(BoatKeyValuePair) * transactPayload.n_parameters); int i; for (i = 0; i < transactPayload.n_parameters; i++) { - transactPayload.parameters[i] = BoatMalloc(sizeof(BoatKeyValuePair)); + transactPayload.parameters[i] = &array[i]; transactPayload.parameters[i]->key = transaction_para->parameters[i].key; transactPayload.parameters[i]->value = transaction_para->parameters[i].value; } @@ -97,11 +98,7 @@ BOAT_RESULT generateTxRequestPack(BoatHlchainmakerTx *tx_ptr, char *method, Boat output_ptr->field_len = packedLength; common__transact_payload__pack(&transactPayload, output_ptr->field_ptr); - //free - for (i = 0; i < transactPayload.n_parameters; i++) - { - BoatFree(transactPayload.parameters[i]); - } + BoatFree(array); BoatFree(transactPayload.parameters); return result;
hw/scripts; if port was passed as last parameter in --extrajtagcmd, and the target uses openocd, PORT was extracted incorrectly.
@@ -56,7 +56,15 @@ parse_extra_jtag_cmd() { case $1 in -port) shift - PORT=$1 + # Many BSP scripts append their own things additional + # parameters. This is done in a way where openocd delimeter is + # immediatelly adjacent to parameters passed via newt. + # The following is to filter out the delimeter from + # PORT, but keep it present within the string passed + # to openocd. + PORT=`echo $1 | tr -c -d 0-9` + ADDITIONAL_CHARS=`echo $1 | tr -d 0-9` + NEW_EXTRA_JTAG_CMD="$NEW_EXTRA_JTAG_CMD $ADDITIONAL_CHARS" shift ;; *)
STORE: Clear a couple of TODOs that were there for the sake of SM2 We now have decoder support for SM2, so the cheats that were in place for the sake of lacking decoders aren't needed any more. Fixes
@@ -337,20 +337,6 @@ static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data, pk = EVP_PKCS82PKEY_with_libctx(p8info, libctx, propq); PKCS8_PRIV_KEY_INFO_free(p8info); } - - /* - * It wasn't PKCS#8, so we must try the hard way. - * However, we can cheat a little bit, because we know - * what's not yet fully supported in out decoders. - * TODO(3.0) Eliminate these when we have decoder support. - */ - if (pk == NULL) { - derp = der; - pk = d2i_PrivateKey_ex(EVP_PKEY_SM2, NULL, - &derp, der_len, - libctx, NULL); - RESET_ERR_MARK(); - } } if (pk != NULL) @@ -360,19 +346,6 @@ static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data, der = data->octet_data; der_len = (long)data->octet_data_size; } - - /* - * Last, we try parameters. We cheat the same way we do for - * private keys above. - * TODO(3.0) Eliminate these when we have decoder support. - */ - if (pk == NULL) { - derp = der; - pk = d2i_KeyParams(EVP_PKEY_SM2, NULL, &derp, der_len); - RESET_ERR_MARK(); - if (pk != NULL) - *store_info_new = OSSL_STORE_INFO_new_PARAMS; - } CLEAR_ERR_MARK(); return pk;
remove boolean usage and use 0/1 instead If we do not use jemalloc (mostly with valgrind) and use an old compiler that does not support C11 we will get compilation error
@@ -334,7 +334,7 @@ static void redisProtocolToLuaType_Error(void *ctx, const char *str, size_t len, /* push a field indicate to ignore updating the stats on this error * because it was already updated when executing the command. */ lua_pushstring(lua,"ignore_error_stats_update"); - lua_pushboolean(lua, true); + lua_pushboolean(lua, 1); lua_settable(lua,-3); } @@ -891,7 +891,7 @@ static int luaRedisGenericCommand(lua_State *lua, int raise_error) { /* push a field indicate to ignore updating the stats on this error * because it was already updated when executing the command. */ lua_pushstring(lua,"ignore_error_stats_update"); - lua_pushboolean(lua, true); + lua_pushboolean(lua, 1); lua_settable(lua,-3); goto cleanup; }
testcase/kernel: enable sem_setprotocol testcase always The sem_setprotocol is always available to use, but it works differently with CONFIG_PRIORITY_INHERITANCE. This commit removes covering the entire tc_semaphore_sem_setprotocol with conditional and checks different return value.
@@ -362,7 +362,6 @@ static void tc_semaphore_sem_destroy(void) TC_SUCCESS_RESULT(); } -#ifdef CONFIG_PRIORITY_INHERITANCE /** * @fn :tc_semaphore_sem_setprotocol * @brief :Set semaphore protocol attribute @@ -384,7 +383,12 @@ static void tc_semaphore_sem_setprotocol(void) TC_ASSERT_EQ("sem_setprotocol", ret_chk, OK); ret_chk = sem_setprotocol(&sem, SEM_PRIO_INHERIT); +#ifdef CONFIG_PRIORITY_INHERITANCE TC_ASSERT_EQ("sem_setprotocol", ret_chk, OK); +#else + TC_ASSERT_EQ("sem_setprotocol", ret_chk, ERROR); + TC_ASSERT_EQ("sem_setprotocol", errno, ENOSYS); +#endif ret_chk = sem_setprotocol(&sem, SEM_PRIO_PROTECT); TC_ASSERT_EQ("sem_setprotocol", ret_chk, ERROR); @@ -400,7 +404,6 @@ static void tc_semaphore_sem_setprotocol(void) TC_SUCCESS_RESULT(); } -#endif /** * @fn :tc_semaphore_sem_tickwait @@ -431,9 +434,7 @@ int semaphore_main(void) { tc_semaphore_sem_destroy(); tc_semaphore_sem_post_wait(); -#ifdef CONFIG_PRIORITY_INHERITANCE tc_semaphore_sem_setprotocol(); -#endif tc_semaphore_sem_tickwait(); tc_semaphore_sem_trywait(); tc_semaphore_sem_timedwait();
mmapstorage: update readme and update news
@@ -83,5 +83,4 @@ sudo kdb umount user/tests/mmapstorage ## Limitations -Currently mapped files shall not be altered, otherwise the behaviour is undefined. Therefore we set an -advisory lock with `flock()`, such that competing KDB instances can not overwrite mapped files. +Currently mapped files shall not be altered, otherwise the behaviour is undefined.
replay UPDATE always send replayComplete Even for subscriptions on modules that do not support replay.
@@ -761,9 +761,8 @@ sr_replay_notify(sr_conn_ctx_t *conn, const char *mod_name, uint32_t sub_id, con SR_CHECK_INT_GOTO(!shm_mod, err_info, cleanup); if (!ATOMIC_LOAD_RELAXED(shm_mod->replay_supp)) { - /* nothing to do */ SR_LOG_WRN("Module \"%s\" does not support notification replay.", mod_name); - goto cleanup; + goto replay_complete; } /* create event session */ @@ -844,6 +843,7 @@ sr_replay_notify(sr_conn_ctx_t *conn, const char *mod_name, uint32_t sub_id, con } } +replay_complete: /* replay last notification if the subscription continues */ sr_time_get(&notif_ts, 0); if ((!stop_time || (stop_time >= notif_ts.tv_sec)) && (err_info = sr_notif_call_callback(ev_sess, cb, tree_cb,
Replace tabs with spaces, add XTAL_RC to BSP
@@ -28,6 +28,10 @@ syscfg.defs: description: 'External 32k oscillator available.' value: 1 + XTAL_RC: + description: 'RC LF Clock' + value: 0 + UART_0: description: 'Whether to enable UART0' value: 1
dm: mei: enable virtio_mei compilation Add virtio_mei to the Makefile Acked-by: Wang, Yu1
@@ -99,6 +99,7 @@ SRCS += hw/pci/virtio/virtio_net.c SRCS += hw/pci/virtio/virtio_rnd.c SRCS += hw/pci/virtio/virtio_ipu.c SRCS += hw/pci/virtio/virtio_hyper_dmabuf.c +SRCS += hw/pci/virtio/virtio_mei.c SRCS += hw/pci/virtio/virtio_rpmb.c SRCS += hw/pci/irq.c SRCS += hw/pci/uart.c
added section for WSL2
@@ -26,6 +26,7 @@ sudo apt-get install -y build-essential libssl-dev sudo apt-get install -y libcurl4-openssl-dev ``` +\* If you do not have Ubuntu or Debian but have Windows 10, you can install WSL2 and get either Ubuntu or Debian [here](https://docs.microsoft.com/en-us/windows/wsl/install-win10). ### Compile ```
Fix name of ipv6-n-tuple
#define foreach_flow_type \ _(IP4_N_TUPLE, ip4_n_tuple, "ipv4-n-tuple") \ - _(IP6_N_TUPLE, ip6_n_tuple, "ipv4-n-tuple") \ + _(IP6_N_TUPLE, ip6_n_tuple, "ipv6-n-tuple") \ _(IP4_VXLAN, ip4_vxlan, "ipv4-vxlan") \ _(IP6_VXLAN, ip6_vxlan, "ipv6-vxlan")
Add TS_THROW_3.
@@ -184,6 +184,17 @@ typedef struct { goto __ ## label ## __; \ } +#define TS_THROW_3(label, status, err, msg, arg1, arg2, arg3) \ +{ \ + if ((status) != NULL) { \ + (status)->code = err; \ + sprintf((status)->message, msg, arg1, arg2, arg3); \ + } \ + goto __ ## label ## __; \ +} + + + /****************************************************************************** * * * :: Data Types *
Delete references to gitarc It was deleted in r3989077.
"afl-fuzz": { "description": "Run afl-fuzz" }, "horadric": { "description": "Run horadric generator" }, "run_python_udf": {"description": "run_python_udf tool"}, - "gitarc": { "description": "Run git-like client with FUSE support"}, "arc": { "description": "Arcadia command-line client" }, "graphs_difference": { "description": "Run graphs_difference tool", "visible": false }, "contexts_difference": { "description": "Run contexts_difference tool", "visible": false }, {"host": {"os": "LINUX", "arch": "aarch64"}, "default": true} ] }, - "gitarc": { - "tools": { - "gitarc": { "bottle": "gitarc", "executable": "gitarc" } - }, - "platforms": [ - {"host": {"os": "LINUX"}, "default": true} - ] - }, "gcc82": { "tools": { "cc": { "bottle": "gcc82", "executable": "cc" }, "hg": ["hg/hg"] } }, - "gitarc": { - "formula": { - "sandbox_id": [286482792], - "match": "gitarc" - }, - "executable": { - "gitarc": ["git/gitarc"] - } - }, "python": { "formula": { "sandbox_id": 465552932,
Fix tcp_accept man page
@@ -7,7 +7,7 @@ tcp_accept - accepts an incoming TCP connection **#include &lt;libdill.h>** -**int tcp_accept(int **_s_**, int64_t** _deadline_**);** +**int tcp_accept(int **_s_**, struct ipaddr **\*_addr_**, int64_t** _deadline_**);** # DESCRIPTION @@ -15,6 +15,8 @@ TCP protocol is a bytestream protocol (i.e. data can be sent via **bsend()** and This function accepts an incoming TCP connection from the listening socket _s_. +If _addr_ paramerer is not **NULL** the IP address of the connecting peer will be stored inside it. + _deadline_ is a point in time when the operation should time out. Use the **now()** function to get your current point in time. 0 means immediate timeout, i.e., perform the operation if possible or return without blocking if not. -1 means no deadline, i.e., the call will block forever if the operation cannot be performed. The socket can be cleanly shut down using **tcp_close()** function.
ssse3: add casts to silence some warnings from NEON functions
@@ -349,7 +349,7 @@ simde_mm_shuffle_epi8 (simde__m128i a, simde__m128i b) { /* Mask out the bits we're not interested in. vtbl will result in 0 for any values outside of [0, 15], so if the high bit is set it will return 0, just like in SSSE3. */ - b_.neon_i8 = vandq_s8(b_.neon_i8, vdupq_n_s8((1 << 7) | 15)); + b_.neon_i8 = vandq_s8(b_.neon_i8, vdupq_n_s8((int8_t)((1 << 7) | 15))); /* Convert a from an int8x16_t to an int8x8x2_t */ int8x8x2_t i = { .val = { vget_low_s8(a_.neon_i8), vget_high_s8(a_.neon_i8) } }; @@ -384,7 +384,7 @@ simde_mm_shuffle_pi8 (simde__m64 a, simde__m64 b) { b_ = simde__m64_to_private(b); #if defined(SIMDE_SSSE3_NEON) - b_.neon_i8 = vand_s8(b_.neon_i8, vdup_n_s8((1 << 7) | 7)); + b_.neon_i8 = vand_s8(b_.neon_i8, vdup_n_s8((int8_t)((1 << 7) | 7))); r_.neon_i8 = vtbl1_s8(a_.neon_i8, b_.neon_i8); #else for (size_t i = 0 ; i < (sizeof(r_.u8) / sizeof(r_.u8[0])) ; i++) {
ARMv8: setting new kernel stack properly in coredata
@@ -248,8 +248,10 @@ errval_t spawn_xcore_monitor(coreid_t coreid, hwid_t hwid, return err; } +#define ARMV8_KERNEL_STACK_SIZE (16 * 1024) + struct mem_info stack_mem; - err = app_memory_alloc(16*1024, &stack_mem); + err = app_memory_alloc(ARMV8_KERNEL_STACK_SIZE, &stack_mem); if (err_is_fail(err)) { DEBUG_ERR(err, "Can not allocate space for new app kernel."); return err; @@ -291,7 +293,10 @@ errval_t spawn_xcore_monitor(coreid_t coreid, hwid_t hwid, struct armv8_core_data *core_data = (struct armv8_core_data *)cpu_mem.buf; - core_data->stack = stack_mem.frameid.base; + /* set the stack */ + core_data->kernel_stack = stack_mem.frameid.base + stack_mem.frameid.bytes - 16; + core_data->boot_magic = ARMV8_BOOTMAGIC_PSCI; + core_data->elf.size = sizeof(struct Elf64_Shdr); core_data->elf.addr = cpu_binary.paddr + (uintptr_t)cpu_head->e_shoff; core_data->elf.num = cpu_head->e_shnum;
dockerfiles: fix typo
@@ -107,7 +107,7 @@ COPY . ./ WORKDIR /tmp/fluent-bit/build/ # CMake configuration variables ARG CFLAGS="-std=gnu99" -ARG CMAKE_INSTALL_PREFIX=/opt/fuent-bit/ +ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ ARG FLB_RELEASE=On ARG FLB_TRACE=On
make work when previous run was only oidc-agent
@@ -112,11 +112,22 @@ fi mkdir -p $OIDC_CONFIG_DIR/.keychain INITSCRIPT="$OIDC_CONFIG_DIR/.keychain/`uname -n`.sh" +make_initscript() +{ + ( + echo "OIDC_SOCK=$OIDC_SOCK; export OIDC_SOCK;" + echo "OIDCD_PID=$OIDCD_PID; export OIDCD_PID;" + ) >$INITSCRIPT +} + # If not already set, read the agent variables from the initialization script if [ -z "$OIDC_SOCK" ] || [ -z "$OIDCD_PID" ]; then if [ -f "$INITSCRIPT" ]; then source $INITSCRIPT fi +elif [ ! -f $INITSCRIPT ] && kill -0 "$OIDCD_PID" 2>/dev/null; then + # must have previously ran just oidc-agent, so create the init script + make_initscript fi if [ -z "$OIDCD_PID" ] || ! kill -0 "$OIDCD_PID" 2>/dev/null; then @@ -137,13 +148,9 @@ if [ -z "$OIDCD_PID" ] || ! kill -0 "$OIDCD_PID" 2>/dev/null; then CMDS="${CMDS/echo /echo echo $ME: }" eval "$CMDS" echo ";" - ( - echo "OIDC_SOCK=$OIDC_SOCK; export OIDC_SOCK;" - echo "OIDCD_PID=$OIDCD_PID; export OIDCD_PID;" - ) >$INITSCRIPT + make_initscript elif $KILL; then # Kill a running agent - . $INITSCRIPT if oidc-agent -k; then rm -f $INITSCRIPT else
ebuild: cleanup of DPDK options in external.mk With the move to meson, most DPDK options in external.mk are not used anymore Type: improvement
@@ -29,30 +29,11 @@ ifneq ($(DPDK_MLX5_PMD),) DPDK_MAKE_ARGS += DPDK_MLX5_PMD=y endif -DPDK_MLX_IBVERBS_DLOPEN=$(strip $($(PLATFORM)_uses_dpdk_ibverbs_link_dlopen)) -ifneq ($(DPDK_MLX_IBVERBS_DLOPEN),) -DPDK_MAKE_ARGS += DPDK_MLX_IBVERBS_DLOPEN=y -endif - DPDK_MLX4_PMD=$(strip $($(PLATFORM)_uses_dpdk_mlx4_pmd)) ifneq ($(DPDK_MLX4_PMD),) DPDK_MAKE_ARGS += DPDK_MLX4_PMD=y endif -DPDK_PLATFORM_TARGET=$(strip $($(PLATFORM)_dpdk_target)) -ifneq ($(DPDK_PLATFORM_TARGET),) -DPDK_MAKE_ARGS += DPDK_TARGET=$(DPDK_PLATFORM_TARGET) -endif - -ifneq (,$(TARGET_PLATFORM)) -DPDK_MAKE_ARGS += DPDK_AARCH64_GENERIC=n -endif - -DPDK_MAKE_EXTRA_ARGS = $(strip $($(PLATFORM)_dpdk_make_extra_args)) -ifneq ($(DPDK_MAKE_EXTRA_ARGS),) -DPDK_MAKE_ARGS += DPDK_MAKE_EXTRA_ARGS="$(DPDK_MAKE_EXTRA_ARGS)" -endif - ifeq ("$(V)","1") DPDK_MAKE_ARGS += DPDK_VERBOSE=1 endif
SOVERSION bump to version 2.27.5
@@ -66,7 +66,7 @@ set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_ # set version of the library set(LIBYANG_MAJOR_SOVERSION 2) set(LIBYANG_MINOR_SOVERSION 27) -set(LIBYANG_MICRO_SOVERSION 4) +set(LIBYANG_MICRO_SOVERSION 5) set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION}) set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION})
[mechanics] initialize dimension in SiconosBulletOptions
@@ -211,7 +211,8 @@ public: // Default Bullet options SiconosBulletOptions::SiconosBulletOptions() - : contactBreakingThreshold(0.02) + : dimension(SICONOS_BULLET_3D) + , contactBreakingThreshold(0.02) , contactProcessingThreshold(0.03) , worldScale(1.0) , useAxisSweep3(false)
client_http_get : free stat
@@ -240,6 +240,8 @@ on_close(struct neat_flow_operations *opCB) opCB->on_error = NULL; neat_set_operations(opCB->ctx, opCB->flow, opCB); + free(opCB->userData); + // stop event loop if all flows are closed flows_active--; if (config_log_level >= 1) {
wireless/ieee802154: msdu_length in meta data converted to a seperate length argument
@@ -121,12 +121,12 @@ static int tx(int fd, FAR const char *str, int verbose) /* Each byte is represented by 2 chars */ - tx.meta.msdu_length = str_len >> 1; + tx.length = str_len >> 1; /* Check if the number of chars is a multiple of 2 and that the number of * bytes does not exceed the max MAC frame payload supported */ - if ((str_len & 1) || (tx.meta.msdu_length > IEEE802154_MAX_MAC_PAYLOAD_SIZE)) + if ((str_len & 1) || (tx.length > IEEE802154_MAX_MAC_PAYLOAD_SIZE)) { goto data_error; } @@ -150,7 +150,7 @@ static int tx(int fd, FAR const char *str, int verbose) if (verbose) { - for (i = 0; i < tx.meta.msdu_length; i++) + for (i = 0; i < tx.length; i++) { printf("%02X", g_txframe[i]); }
Use set_global_assignment for loading Tcl in PIM Quartus archives need it instead of using "source".
@@ -413,7 +413,7 @@ def emitQsfConfig(args, afu_ifc_db, platform_db, platform_defaults_db, f.write('}\n\n') f.write( - "source {0}/par/platform_if_addenda.qsf\n".format(args.platform_if)) + "set_global_assignment -name SOURCE_TCL_SCRIPT_FILE {0}/par/platform_if_addenda.qsf\n".format(args.platform_if)) f.close()
core/pci: No validation on pd and ecap in pcie_slot_create() The PCI device and its PCIe capability offset should be valid in pcie_slot_create(). No need to validate them. This removes the validation logic to make the function simpler. No functional changes introduced.
@@ -449,7 +449,6 @@ struct pci_slot *pcie_slot_create(struct phb *phb, struct pci_device *pd) return NULL; /* Cache the link and slot capabilities */ - if (pd) { ecap = pci_cap(pd, PCI_CFG_CAP_ID_EXP, false); pci_cfg_read16(phb, pd->bdfn, ecap + PCICAP_EXP_CAPABILITY_REG, &slot->pcie_cap); @@ -457,7 +456,6 @@ struct pci_slot *pcie_slot_create(struct phb *phb, struct pci_device *pd) &slot->link_cap); pci_cfg_read32(phb, pd->bdfn, ecap + PCICAP_EXP_SLOTCAP, &slot->slot_cap); - } if (slot->slot_cap & PCICAP_EXP_SLOTCAP_HPLUG_CAP) slot->pluggable = 1; @@ -467,13 +465,11 @@ struct pci_slot *pcie_slot_create(struct phb *phb, struct pci_device *pd) /* The power is on by default */ slot->power_state = PCI_SLOT_POWER_ON; - if (pd && ecap) { - pci_cfg_read16(phb, pd->bdfn, - ecap + PCICAP_EXP_SLOTCTL, &slot_ctl); + pci_cfg_read16(phb, pd->bdfn, ecap + PCICAP_EXP_SLOTCTL, + &slot_ctl); if (((slot_ctl & PCICAP_EXP_SLOTCTL_PWRI) >> 8) == PCIE_INDIC_OFF) slot->power_state = PCI_SLOT_POWER_OFF; } - } if (slot->slot_cap & PCICAP_EXP_SLOTCAP_PWRI) slot->power_led_ctl = PCI_SLOT_PWR_LED_CTL_KERNEL;
Fixed first MAP scroll update
@@ -190,7 +190,9 @@ Map* MAP_create(const MapDefinition* mapDef, VDPPlane plane, u16 baseTile) void MAP_scrollTo(Map* map, u32 x, u32 y) { // first scroll ? - if (map->planeWidthMask == 0) + const bool init = (map->planeWidthMask == 0); + + if (init) { // init plane dimension map->planeWidthMask = (planeWidth >> 1) - 1; @@ -207,7 +209,7 @@ void MAP_scrollTo(Map* map, u32 x, u32 y) updateMap(map, x >> 4, y >> 4); // X scrolling changed ? - if (map->posX != x) + if (init || (map->posX != x)) { u16 len; @@ -236,7 +238,7 @@ void MAP_scrollTo(Map* map, u32 x, u32 y) map->posX = x; } // Y scrolling changed ? - if (map->posY != y) + if (init || (map->posY != y)) { switch(VDP_getVerticalScrollingMode()) {
Fix mac check issue for vitual tunnel interface with no mac address
@@ -412,9 +412,11 @@ ethernet_input_inline (vlib_main_t * vm, else { if (!ethernet_address_cast (e0->dst_address) && + (hi->hw_address != 0) && !eth_mac_equal ((u8 *) e0, hi->hw_address)) error0 = ETHERNET_ERROR_L3_MAC_MISMATCH; if (!ethernet_address_cast (e1->dst_address) && + (hi->hw_address != 0) && !eth_mac_equal ((u8 *) e1, hi->hw_address)) error1 = ETHERNET_ERROR_L3_MAC_MISMATCH; determine_next_node (em, variant, 0, type0, b0, @@ -628,6 +630,7 @@ ethernet_input_inline (vlib_main_t * vm, else { if (!ethernet_address_cast (e0->dst_address) && + (hi->hw_address != 0) && !eth_mac_equal ((u8 *) e0, hi->hw_address)) error0 = ETHERNET_ERROR_L3_MAC_MISMATCH; determine_next_node (em, variant, 0, type0, b0,
usb: write the right register for clearing OHCI hub status
@@ -216,7 +216,7 @@ usb_error_t usb_ohci_roothub_exec(struct usb_device *device, return USB_ERR_IOERROR; } // write the value to the register - ohci_rh_portstat_rawwr(hc->ohci_base, req_index, ps); + ohci_rh_portctrl_rawwr(hc->ohci_base, req_index, ps); switch (req_value) { case USB_HUB_FEATURE_C_PORT_CONNECTION: @@ -485,7 +485,7 @@ usb_error_t usb_ohci_roothub_exec(struct usb_device *device, return USB_ERR_IOERROR; break; } - ohci_rh_portstat_rawwr(hc->ohci_base, req_index, ps); + ohci_rh_portctrl_rawwr(hc->ohci_base, req_index, ps); /* * handle the reset of the port */
Add a CHANGES entry for the safestack updates
@@ -23,6 +23,12 @@ OpenSSL 3.0 ### Changes between 1.1.1 and 3.0 [xx XXX xxxx] + * Changed all "STACK" functions to be macros instead of inline functions. Macro + parameters are still checked for type safety at compile time via helper + inline functions. + + *Matt Caswell* + * Remove the RAND_DRBG API The RAND_DRBG API did not fit well into the new provider concept as @@ -607,8 +613,7 @@ OpenSSL 3.0 *Rich Salz* - * Added documentation for the STACK API. OpenSSL only defines the STACK - functions where they are used. + * Added documentation for the STACK API. *Rich Salz*
Test parameter entity with name with top bytes non-zero
@@ -6140,6 +6140,59 @@ START_TEST(test_attr_after_solidus) } END_TEST +static void XMLCALL +accumulate_entity_decl(void *userData, + const XML_Char *entityName, + int UNUSED_P(is_parameter_entity), + const XML_Char *value, + int value_length, + const XML_Char *UNUSED_P(base), + const XML_Char *UNUSED_P(systemId), + const XML_Char *UNUSED_P(publicId), + const XML_Char *UNUSED_P(notationName)) +{ + CharData *storage = (CharData *)userData; + + CharData_AppendXMLChars(storage, entityName, -1); + CharData_AppendXMLChars(storage, "=", 1); + CharData_AppendXMLChars(storage, value, value_length); + CharData_AppendXMLChars(storage, "\n", 1); +} + + +START_TEST(test_utf16_pe) +{ + /* <!DOCTYPE doc [ + * <!ENTITY % {KHO KHWAI}{CHO CHAN} '<!ELEMENT doc (#PCDATA)>'> + * %{KHO KHWAI}{CHO CHAN}; + * ]> + * <doc></doc> + * + * where {KHO KHWAI} = U+0E04 = 0xe0 0xb8 0x84 in UTF-8 + * and {CHO CHAN} = U+0E08 = 0xe0 0xb8 0x88 in UTF-8 + */ + const char text[] = + "\0<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0d\0o\0c\0 \0[\0\n" + "\0<\0!\0E\0N\0T\0I\0T\0Y\0 \0%\0 \x0e\x04\x0e\x08\0 " + "\0'\0<\0!\0E\0L\0E\0M\0E\0N\0T\0 " + "\0d\0o\0c\0 \0(\0#\0P\0C\0D\0A\0T\0A\0)\0>\0'\0>\0\n" + "\0%\x0e\x04\x0e\x08\0;\0\n" + "\0]\0>\0\n" + "\0<\0d\0o\0c\0>\0<\0/\0d\0o\0c\0>"; + const XML_Char *expected = + "\xe0\xb8\x84\xe0\xb8\x88=<!ELEMENT doc (#PCDATA)>\n"; + CharData storage; + + CharData_Init(&storage); + XML_SetUserData(parser, &storage); + XML_SetEntityDeclHandler(parser, accumulate_entity_decl); + if (_XML_Parse_SINGLE_BYTES(parser, text, sizeof(text)-1, + XML_TRUE) == XML_STATUS_ERROR) + xml_failure(parser); + CharData_CheckXMLChars(&storage, expected); +} +END_TEST + /* * Namespaces tests. */ @@ -11560,6 +11613,7 @@ make_suite(void) tcase_add_test(tc_basic, test_utf16_attribute); tcase_add_test(tc_basic, test_utf16_second_attr); tcase_add_test(tc_basic, test_attr_after_solidus); + tcase_add_test(tc_basic, test_utf16_pe); suite_add_tcase(s, tc_namespace); tcase_add_checked_fixture(tc_namespace,
Changed "source" to "src"
@@ -376,7 +376,7 @@ elseif(RTOS_FREERTOS_CHECK) include_directories( ${CMSIS_RTOS_INCLUDE_DIR}) # add source directory - add_subdirectory("source") + add_subdirectory("src") ####################### # mbed OS @@ -528,7 +528,7 @@ elseif(RTOS_RTX_RTOS_CHECK) set(RTXRTOS_INCLUDE_DIRS ${RTXRTOS_SOURCE_DIR}) # add source directory - add_subdirectory("source") + add_subdirectory("src") ####################### # RTX RTOS2 @@ -587,7 +587,7 @@ support for RTX RTOS2 is in the works, please check latter... set(RTXRTOS2_INCLUDE_DIRS ${RTXRTOS2_SOURCE_DIR}) # add source directory - add_subdirectory("source") + add_subdirectory("src") ####################### @@ -612,6 +612,6 @@ else() endif() # add source directory - add_subdirectory("source") + add_subdirectory("src") endif()
tests: runtime: filter_rewrite_tag: remove unused function
@@ -38,52 +38,6 @@ struct expect_str { pthread_mutex_t result_mutex = PTHREAD_MUTEX_INITIALIZER; int num_output = 0; -/* Callback to check expected results */ -static int cb_check_result(void *record, size_t size, void *data) -{ - char *p; - char *result; - struct expect_str *expected; - - expected = (struct expect_str*)data; - result = (char *) record; - - if (!TEST_CHECK(expected != NULL)) { - flb_error("expected is NULL"); - } - if (!TEST_CHECK(result != NULL)) { - flb_error("result is NULL"); - } - - while(expected != NULL && expected->str != NULL) { - if (expected->found == FLB_TRUE) { - p = strstr(result, expected->str); - if(!TEST_CHECK(p != NULL)) { - flb_error("Expected to find: '%s' in result '%s'", - expected->str, result); - } - } - else { - p = strstr(result, expected->str); - if(!TEST_CHECK(p == NULL)) { - flb_error("'%s' should be removed in result '%s'", - expected->str, result); - } - } - - /* - * If you want to debug your test - * - * printf("Expect: '%s' in result '%s'", expected, result); - */ - - expected++; - } - - flb_free(record); - return 0; -} - static int cb_count_msgpack(void *record, size_t size, void *data) { msgpack_unpacked result;
quic: use hardware serial for passthrough
@@ -538,26 +538,21 @@ void process_serial(uint8_t *data, uint32_t len) { send_quic(QUIC_CMD_SERIAL, QUIC_FLAG_NONE, encode_buffer, cbor_encoder_len(&enc)); -#define USART usart_port_defs[port] - LL_USART_Disable(USART.channel); - - soft_serial_t serial; - soft_serial_init(&serial, USART.tx_pin, USART.rx_pin, baudrate); + serial_enable_rcc(port); + serial_init(port, baudrate, false); while (1) { uint8_t data = 0; - if (usb_serial_read(&data, 1) == 1) { - soft_serial_set_output(&serial); - soft_serial_write_byte(&serial, data); + while (usb_serial_read(&data, 1)) { + serial_write_bytes(port, &data, 1); } - soft_serial_set_input(&serial); - if (soft_serial_read_byte(&serial, &data)) { + while (serial_read_bytes(port, &data, 1)) { usb_serial_write(&data, 1); } } -#undef USART + break; }
long_options doesn't need to be static Without this change, scan-build warns that the address of stack variable "gui" is being stored in a global variable.
@@ -320,7 +320,7 @@ int main(int argc, char** argv) #else int gui = 1; #endif - static struct option long_options[] = { + struct option long_options[] = { {"gui", no_argument, &gui, 1}, {"no-gui", no_argument, &gui, 0}, {0, 0, 0, 0}
serial: add enable for uart7 and 8
@@ -43,6 +43,16 @@ void serial_enable_rcc(usart_ports_t port) { case 6: LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_USART6); break; +#endif +#ifdef UART7 + case 7: + LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_UART7); + break; +#endif +#ifdef UART8 + case 8: + LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_UART8); + break; #endif } } @@ -78,6 +88,16 @@ void serial_enable_isr(usart_ports_t port) { case 6: interrupt_enable(USART6_IRQn, UART_PRIORITY); break; +#endif +#ifdef UART7 + case 7: + interrupt_enable(UART7_IRQn, UART_PRIORITY); + break; +#endif +#ifdef UART8 + case 8: + interrupt_enable(UART8_IRQn, UART_PRIORITY); + break; #endif } }
[kernel] delete trailing whitespace
@@ -161,13 +161,11 @@ void MoreauJeanOSI::fillDSLinks(Interaction &inter, InteractionProperties& inter VectorOfVectors& workV = *interProp.workVectors; workV.resize(MoreauJeanOSI::WORK_INTERACTION_LENGTH); - workV[MoreauJeanOSI::OSNSP_RHS].reset(new SiconosVector(inter.getSizeOfY())); VectorOfBlockVectors& DSlink = *interProp.DSlink; Relation &relation = *inter.relation(); - RELATION::TYPES relationType = relation.getType(); // Check if interations levels (i.e. y and lambda sizes) are compliant with the current osi. @@ -1555,7 +1553,6 @@ void MoreauJeanOSI::computeFreeOutput(InteractionsGraph::VDescriptor& vertex_int if(inter.relation()->getType() == Lagrangian || inter.relation()->getType() == NewtonEuler) { _NSLEffectOnFreeOutput nslEffectOnFreeOutput = _NSLEffectOnFreeOutput(osnsp, inter, - indexSet.properties(vertex_inter)); inter.nonSmoothLaw()->accept(nslEffectOnFreeOutput); }
avf: properly set irq queue masks Type: fix Fixes:
@@ -693,7 +693,8 @@ avf_op_config_irq_map (vlib_main_t * vm, avf_device_t * ad) imi->vecmap[0].vector_id = 1; imi->vecmap[0].vsi_id = ad->vsi_id; - imi->vecmap[0].rxq_map = 1; + imi->vecmap[0].rxq_map = (1 << ad->n_rx_queues) - 1; + imi->vecmap[0].txq_map = (1 << ad->n_tx_queues) - 1; avf_log_debug (ad, "config_irq_map: vsi_id %u vector_id %u rxq_map %u", ad->vsi_id, imi->vecmap[0].vector_id,
[meson] add with_zstd to meson_options.txt
@@ -148,6 +148,11 @@ option('with_zlib', value: true, description: 'with deflate-support for mod_deflate [default: on]', ) +option('with_zstd', + type: 'boolean', + value: false, + description: 'with zstd-support for mod_deflate [default: off]', +) option('build_extra_warnings', type: 'boolean',
Must call mbedtls_mpi_mod_modulus_init() before anything else in tests
@@ -117,10 +117,12 @@ void mpi_mod_raw_cond_assign( char * input_X, mbedtls_mpi_uint *X = NULL; mbedtls_mpi_uint *Y = NULL; mbedtls_mpi_uint *buff_m = NULL; - mbedtls_mpi_mod_modulus m; size_t limbs_X; size_t limbs_Y; + mbedtls_mpi_mod_modulus m; + mbedtls_mpi_mod_modulus_init( &m ); + TEST_EQUAL( mbedtls_test_read_mpi_core( &X, &limbs_X, input_X ), 0 ); TEST_EQUAL( mbedtls_test_read_mpi_core( &Y, &limbs_Y, input_Y ), 0 ); @@ -129,8 +131,6 @@ void mpi_mod_raw_cond_assign( char * input_X, size_t bytes = limbs * sizeof( mbedtls_mpi_uint ); size_t copy_bytes = copy_limbs * sizeof( mbedtls_mpi_uint ); - mbedtls_mpi_mod_modulus_init( &m ); - TEST_EQUAL( limbs_X, limbs_Y ); TEST_ASSERT( copy_limbs <= limbs ); @@ -190,10 +190,12 @@ void mpi_mod_raw_cond_swap( char * input_X, mbedtls_mpi_uint *X = NULL; mbedtls_mpi_uint *Y = NULL; mbedtls_mpi_uint *buff_m = NULL; - mbedtls_mpi_mod_modulus m; size_t limbs_X; size_t limbs_Y; + mbedtls_mpi_mod_modulus m; + mbedtls_mpi_mod_modulus_init( &m ); + TEST_EQUAL( mbedtls_test_read_mpi_core( &tmp_X, &limbs_X, input_X ), 0 ); TEST_EQUAL( mbedtls_test_read_mpi_core( &tmp_Y, &limbs_Y, input_Y ), 0 ); @@ -202,8 +204,6 @@ void mpi_mod_raw_cond_swap( char * input_X, size_t bytes = limbs * sizeof( mbedtls_mpi_uint ); size_t copy_bytes = copy_limbs * sizeof( mbedtls_mpi_uint ); - mbedtls_mpi_mod_modulus_init( &m ); - TEST_EQUAL( limbs_X, limbs_Y ); TEST_ASSERT( copy_limbs <= limbs );
Silence compiler warning in non-assert builds. Per buildfarm.
@@ -6820,7 +6820,7 @@ void process_pending_request(AsyncRequest *areq) { ForeignScanState *node = (ForeignScanState *) areq->requestee; - PgFdwScanState *fsstate = (PgFdwScanState *) node->fdw_state; + PgFdwScanState *fsstate PG_USED_FOR_ASSERTS_ONLY = (PgFdwScanState *) node->fdw_state; EState *estate = node->ss.ps.state; MemoryContext oldcontext;
wlanhcx2psk: Missing comma rendered faulty Netgear list.
@@ -203,7 +203,7 @@ static void keywriteng(void) size_t ca, cn, cs; const char *adjectiv[] = { "ancient", "antique", "aquatic", - "baby", "basic", "big", "bitter", "black", "blue", "bold", "bottled" "brave", "breezy", "bright", "brown", + "baby", "basic", "big", "bitter", "black", "blue", "bold", "bottled", "brave", "breezy", "bright", "brown", "calm", "carrot", "charming", "cheerful", "chip", "chummy", "classy", "clean", "clear", "clever", "cloudy", "cold", "cool", "crispy", "curly", "daily", "deep", "delightful", "dizzy", "dynamic", "elated", "elegant", "excite", "excited", "exotic",
shell-test: be less specific in regex
@@ -256,11 +256,11 @@ kdb set /tutorial/links/url "invalid url" Note that the backend `tutorial.dump` is mounted for all namespaces: ```sh kdb file user/tutorial -# STDOUT-REGEX: /(home|Users)/.*/\.config/tutorial\.dump +# STDOUT-REGEX: /.*/tutorial\.dump kdb file system/tutorial -# STDOUT-REGEX: .*/tutorial\.dump +# STDOUT-REGEX: /.*/tutorial\.dump kdb file dir/tutorial -# STDOUT-REGEX: /.*/\.dir/tutorial\.dump +# STDOUT-REGEX: /.*/tutorial\.dump ``` If you want to set a key for another namespace and do not want to go without validation,
fix unaligned memory access in SipHash
@@ -7037,14 +7037,14 @@ static inline uint64_t fio_siphash_xy(const void *data, size_t len, size_t x, size_t y) { /* initialize the 4 words */ uint64_t v0 = - (0x0706050403020100ULL ^ 0x736f6d6570736575ULL) * (uint64_t)fio_listen; + (0x0706050403020100ULL ^ 0x736f6d6570736575ULL) ^ (uint64_t)fio_listen; uint64_t v1 = - (0x0f0e0d0c0b0a0908ULL ^ 0x646f72616e646f6dULL) * (uint64_t)fio_start; + (0x0f0e0d0c0b0a0908ULL ^ 0x646f72616e646f6dULL) ^ (uint64_t)fio_start; uint64_t v2 = - (0x0706050403020100ULL ^ 0x6c7967656e657261ULL) * (uint64_t)fio_attach; + (0x0706050403020100ULL ^ 0x6c7967656e657261ULL) ^ (uint64_t)fio_listen; uint64_t v3 = - (0x0f0e0d0c0b0a0908ULL ^ 0x7465646279746573ULL) * (uint64_t)fio_accept; - const uint64_t *w64 = data; + (0x0f0e0d0c0b0a0908ULL ^ 0x7465646279746573ULL) ^ (uint64_t)fio_start; + const uint8_t *w8 = data; uint8_t len_mod = len & 255; union { uint64_t i; @@ -7066,19 +7066,18 @@ static inline uint64_t fio_siphash_xy(const void *data, size_t len, size_t x, } while (0); while (len >= 8) { - word.i = sip_local64(*w64); + word.i = sip_local64(fio_str2u64(w8)); v3 ^= word.i; /* Sip Rounds */ for (size_t i = 0; i < x; ++i) { hash_map_SipRound; } v0 ^= word.i; - w64 += 1; + w8 += 8; len -= 8; } word.i = 0; uint8_t *pos = word.str; - uint8_t *w8 = (void *)w64; switch (len) { /* fallthrough is intentional */ case 7: pos[6] = w8[6];
change blynk declare
@@ -357,7 +357,7 @@ Blockly.Arduino.blynk_videourl = function() { Blockly.Arduino.blynk_bridge_auth = function() { var Vpin = this.getFieldValue('Vpin'); var auth = Blockly.Arduino.valueToCode(this, 'auth', Blockly.Arduino.ORDER_ATOMIC); - Blockly.Arduino.definitions_['bridge1.setAuthToken'] ='WidgetBridge bridge1('+Vpin+');\n'; + Blockly.Arduino.definitions_['var_declare_WidgetBridge'] ='WidgetBridge bridge1('+Vpin+');\n'; var code='bridge1.setAuthToken('+auth+'); \n'; return code; };
doc: update doc build instructions New versions of doc build tools are listed, along with tweaks to the requirements.txt and list of tools installed with apt for building documentation.
@@ -124,22 +124,21 @@ Installing the documentation tools Our documentation processing has been tested to run with Python 3.6.3 and these other tools: -* breathe version: 4.9.1 -* sphinx version: 1.7.7 -* docutils version: 0.14 -* sphinx-rtd-theme version: 0.4.0 -* kconfiglib version: 10.9.1 -* sphinx-tabs version: 1.1.13 +* breathe version: 4.23.0 +* sphinx version: 3.2.1 +* docutils version: 0.16 +* sphinx-rtd-theme version: 0.5.0 +* kconfiglib version: 14.1.0 +* sphinx-tabs version: 1.3.0 * doxygen version: 1.8.13 -Depending on your Linux version, install the needed tools: - -* For Ubuntu use: +Depending on your Linux version, install the needed tools. +For Ubuntu use: .. code-block:: bash sudo apt-get install doxygen python3-pip \ - python3-wheel make graphviz + python3-wheel make graphviz xsltproc Then use ``pip3`` to install the remaining Python-based tools: @@ -149,7 +148,7 @@ Then use ``pip3`` to install the remaining Python-based tools: pip3 install --user -r scripts/requirements.txt Add ``$HOME/.local/bin`` to the front of your ``PATH`` so the system will -find expected versions of Python utilities such as ``sphinx-build`` and +find expected versions of these Python utilities such as ``sphinx-build`` and ``breathe``: .. code-block:: bash @@ -166,7 +165,8 @@ And with that you're ready to generate the documentation. .. note:: We've provided a script you can run to show what versions of the - documentation building tools are installed.:: + documentation building tools are installed and compare with the + tool versions shown above.:: doc/scripts/show-versions.py
Improve wording on how latency is measured
-.TH biolatency 8 "2015-08-20" "USER COMMANDS" +.TH biolatency 8 "2019-12-12" "USER COMMANDS" .SH NAME biolatency \- Summarize block device I/O latency as a histogram. .SH SYNOPSIS @@ -8,8 +8,8 @@ biolatency traces block device I/O (disk I/O), and records the distribution of I/O latency (time). This is printed as a histogram either on Ctrl-C, or after a given interval in seconds. -The latency of the disk I/O is measured from the issue to the device to its -completion. A \-Q option can be used to include time queued in the kernel. +The latency of disk I/O operations is measured from when requests are issued to the device +up to completion. A \-Q option can be used to include time queued in the kernel. This tool uses in-kernel eBPF maps for storing timestamps and the histogram, for efficiency.
fix undefine error
@@ -1906,8 +1906,10 @@ static inline const void *mbedtls_ssl_get_sig_algs( #endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */ } + #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) +#if defined(MBEDTLS_SSL_PROTO_TLS1_3) static inline int mbedtls_ssl_sig_alg_is_received( const mbedtls_ssl_context *ssl, uint16_t own_sig_alg ) { @@ -1922,6 +1924,7 @@ static inline int mbedtls_ssl_sig_alg_is_received( const mbedtls_ssl_context *ss } return( 0 ); } +#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */ static inline int mbedtls_ssl_sig_alg_is_offered( const mbedtls_ssl_context *ssl, uint16_t proposed_sig_alg )
must add sse3 cflag if we are going to use sse3 intrinsics ...
@@ -66,7 +66,7 @@ RANLIB := @RANLIB@ INCLUDE_CFLAGS = $(addprefix -I ,$(include_dirs)) CONFIG_CFLAGS = @CFLAGS@ @DEBUG_OPTION@ @ARCH_OPTION@ # -g : debugging info -CFLAGS += $(INCLUDE_CFLAGS) -Wall -fPIC $(CONFIG_CFLAGS) +CFLAGS += $(INCLUDE_CFLAGS) -Wall -fPIC -msse3 $(CONFIG_CFLAGS) LDFLAGS += @LDFLAGS@ @LIBS@ ARFLAGS = r PATHSEP = /
interface: fix S3 canUpload logic s3.credentials is always set, but the fields are all '' if s3 is not configured. So prior to this change, if the user had configured an active bucket, they would always be shown an upload dialog even if they had no storage configured.
@@ -23,10 +23,14 @@ const useStorage = (s3: S3State, gcp: GcpState, useEffect(() => { // prefer GCP if available, else use S3. - if (gcp.accessKey !== undefined) { - client.current = new GcpClient(gcp.accessKey); + if (gcp.current !== undefined) { + client.current = new GcpClient(gcp.current.accessKey); } else { - if (!s3.credentials) { + // XX ships currently always have S3 credentials, but the fields are all + // set to '' if they are not configured. + if (!s3.credentials || + !s3.credentials.accessKeyId || + !s3.credentials.secretAccessKey) { return; } client.current = new S3({ @@ -38,8 +42,8 @@ const useStorage = (s3: S3State, gcp: GcpState, const canUpload = useMemo( () => - (client && s3.configuration.currentBucket !== "") || false, - [client, s3.configuration.currentBucket] + (client.current && s3.configuration.currentBucket !== "") || false, + [client.current, s3.configuration.currentBucket] ); const upload = useCallback(
out_loki: adjust test formatter callback params
@@ -1623,6 +1623,7 @@ static int cb_loki_format_test(struct flb_config *config, struct flb_input_instance *ins, void *plugin_context, void *flush_ctx, + int event_type, const char *tag, int tag_len, const void *data, size_t bytes, void **out_data, size_t *out_size)
freebsd: fix link
@@ -65,7 +65,7 @@ MAKE_ENV+= FEATURES="${FEATURES}" do-install: ${MKDIR} ${STAGEDIR}/usr/bin ${INSTALL_PROGRAM} ${WRKSRC}/build/kadnode ${STAGEDIR}${PREFIX}/bin/ - ${LN} -sf ${STAGEDIR}${PREFIX}/bin/kadnode ${STAGEDIR}${PREFIX}/bin/kadnode-ctl + ${LN} -sf kadnode ${STAGEDIR}${PREFIX}/bin/kadnode-ctl ${INSTALL_LIB} ${WRKSRC}/build/libnss_kadnode.so.2 ${STAGEDIR}${PREFIX}/lib/nss_kadnode.so ${LN} -sf ${STAGEDIR}${PREFIX}/lib/nss_kadnode.so ${STAGEDIR}${PREFIX}/lib/nss_kadnode.so.1
groups: update version in docket
color+0xee.5432 glob-http+['https://bootstrap.urbit.org/glob-0v3.c3vkk.bvn2l.fmc76.l3ro9.0i5j0.glob' 0v3.c3vkk.bvn2l.fmc76.l3ro9.0i5j0] base+'landscape' - version+[1 3 5] + version+[1 0 1] website+'https://tlon.io' license+'MIT' ==
fix: routecmp wasn't properly comparing major params
@@ -192,17 +192,17 @@ routecmp(char key[], struct _route_s *route) if (0 == ret) return 0; /* check if fits major parameter criteria */ - if (strstr(route->key, "/channels/%llu") + if (strstr(key, "/channels/%llu") && strstr(route->key, "/channels/%llu")) { return 0; } - if (strstr(route->key, "/guilds/%llu") + if (strstr(key, "/guilds/%llu") && strstr(route->key, "/guilds/%llu")) { return 0; } - if (strstr(route->key, "/webhook/%llu") + if (strstr(key, "/webhook/%llu") && strstr(route->key, "/webhook/%llu")) { return 0;
vere: comment out unused code that doesn't compile on MingW
@@ -13,6 +13,7 @@ _save_time_cb(uv_timer_t* tim_u) u3_pier_save(pir_u); } +#if 0 /* u3_save_ef_chld(): report save termination. */ void @@ -34,6 +35,7 @@ u3_save_ef_chld(u3_pier *pir_u) } sav_u->pid_w = 0; } +#endif /* u3_save_io_init(): initialize autosave. */
corrects alias u3dq (u3nt -> u3nq)
# define u3do(txt_c, arg) u3v_do(txt_c, arg) # define u3dc(txt_c, a, b) u3v_do(txt_c, u3nc(a, b)) # define u3dt(txt_c, a, b, c) u3v_do(txt_c, u3nt(a, b, c)) -# define u3dq(txt_c, a, b, c, d) u3v_do(txt_c, u3nt(a, b, c, d)) +# define u3dq(txt_c, a, b, c, d) u3v_do(txt_c, u3nq(a, b, c, d)) /* u3to(), u3of(): offset/pointer conversion. */
[verilator] Add missing `memloader` module from lowrisc
@@ -206,4 +206,69 @@ module tc_sram #( `endif `endif // pragma translate_on + +// Copyright lowRISC contributors. +// Licensed under the Apache License, Version 2.0, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 + +/** + * Memory loader for simulation + * + * Include this file in a memory primitive to load a memory array from + * simulation. + * + * Requirements: + * - A memory array named `sram`. + * - A parameter `DataWidth` giving the memory width (word size) in bit. + * - A parameter `NumWords` giving the memory depth in words. + */ + +`ifndef SYNTHESIS + // Task for loading 'sram' with SystemVerilog system task $readmemh() + export "DPI-C" task simutil_memload; + + task simutil_memload; + input string file; + $readmemh(file, sram); + endtask + + // Function for setting a specific element in |sram| + // Returns 1 (true) for success, 0 (false) for errors. + export "DPI-C" function simutil_set_mem; + + function int simutil_set_mem(input int index, input bit [255:0] val); + + // Function will only work for memories <= 256 bits + if (DataWidth > 256) begin + return 0; + end + + if (index >= NumWords) begin + return 0; + end + + sram[index] = val[DataWidth-1:0]; + return 1; + endfunction + + // Function for getting a specific element in |sram| + export "DPI-C" function simutil_get_mem; + + function int simutil_get_mem(input int index, output bit [255:0] val); + + // Function will only work for memories <= 256 bits + if (DataWidth > 256) begin + return 0; + end + + if (index >= NumWords) begin + return 0; + end + + val = 0; + val[DataWidth-1:0] = sram[index]; + return 1; + endfunction +`endif + endmodule
YAML: Remove `goto` statement
@@ -513,18 +513,17 @@ int elektraYamlSet (Plugin * handle ELEKTRA_UNUSED, KeySet * returned ELEKTRA_UN int errorNumber = errno; FILE * destination = fopen (keyString (parentKey), "w"); - if (!destination) goto error; // The bitwise or in the next line is correct, since we need to close the file even if writing fails - if ((writeFile (destination, returned, parentKey) < 0) | (fclose (destination) == EOF)) goto error; //! OCLint - - return ELEKTRA_PLUGIN_STATUS_SUCCESS; - -error: + if (!destination || (writeFile (destination, returned, parentKey) < 0) | (fclose (destination) == EOF)) //! OCLint + { ELEKTRA_SET_ERROR_SET (parentKey); errno = errorNumber; return ELEKTRA_PLUGIN_STATUS_ERROR; } + return ELEKTRA_PLUGIN_STATUS_SUCCESS; +} + Plugin * ELEKTRA_PLUGIN_EXPORT (yaml) { return elektraPluginExport ("yaml", ELEKTRA_PLUGIN_GET, &elektraYamlGet, ELEKTRA_PLUGIN_SET, &elektraYamlSet, ELEKTRA_PLUGIN_END);
framework/media : Correct wrong casting type. SocketOutputDataSource::write return type is ssize_t
@@ -100,7 +100,7 @@ bool SocketOutputDataSource::isPrepare() ssize_t SocketOutputDataSource::write(unsigned char* buf, size_t size) { if (!buf) { - return (size_t)0; + return (ssize_t)0; } return send(mSockFd, buf, size, 0);
Fix newreno bug Based on commit
@@ -162,9 +162,9 @@ void picoquic_newreno_notify(picoquic_path_t* path_x, case picoquic_newreno_alg_congestion_avoidance: switch (notification) { case picoquic_congestion_notification_acknowledgement: { - uint64_t complete_ack = nb_bytes_acknowledged + nr_state->residual_ack; - nr_state->residual_ack = complete_ack % path_x->cwin; - path_x->cwin += complete_ack / path_x->cwin; + uint64_t complete_delta = nb_bytes_acknowledged * path_x->send_mtu + nr_state->residual_ack; + nr_state->residual_ack = complete_delta % path_x->cwin; + path_x->cwin += complete_delta / path_x->cwin; break; } case picoquic_congestion_notification_repeat:
remove ifndef guard
* limitations under the License. */ -#undef MBEDTLS_SSL_ENCRYPT_THEN_MAC -#undef MBEDTLS_SSL_EXTENDED_MASTER_SECRET -#undef MBEDTLS_SSL_PROTO_TLS1_2 - -#if !defined(MBEDTLS_SSL_PROTO_TLS1_3) #define MBEDTLS_SSL_PROTO_TLS1_3 -#endif - -#if !defined(MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE) #define MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE -#endif +#undef MBEDTLS_SSL_ENCRYPT_THEN_MAC +#undef MBEDTLS_SSL_EXTENDED_MASTER_SECRET +#undef MBEDTLS_SSL_PROTO_TLS1_2 #undef MBEDTLS_SSL_PROTO_DTLS #undef MBEDTLS_SSL_DTLS_ANTI_REPLAY #undef MBEDTLS_SSL_DTLS_HELLO_VERIFY
[libretro] remove PSP build
@@ -137,15 +137,6 @@ else ifeq ($(platform), psl1ght) ENDIANNESS_DEFINES := -DMSB_FIRST STATIC_LINKING = 1 -# PSP -else ifeq ($(platform), psp1) - TARGET := $(TARGET_NAME)_libretro_$(platform).a - CC = psp-gcc$(EXE_EXT) - CXX = psp-g++$(EXE_EXT) - AR = psp-ar$(EXE_EXT) - COMMONFLAGS += -DPSP -G0 - STATIC_LINKING = 1 - # Vita else ifeq ($(platform), vita) TARGET := $(TARGET_NAME)_libretro_$(platform).a
Remove redundant SHA384 `if defined` block.
@@ -1283,14 +1283,6 @@ int query_config( const char *config ) } #endif /* MBEDTLS_SHA512_SMALLER */ -#if defined(MBEDTLS_SHA384_C) - if( strcmp( "MBEDTLS_SHA384_C", config ) == 0 ) - { - MACRO_EXPANSION_TO_STR( MBEDTLS_SHA384_C ); - return( 0 ); - } -#endif /* MBEDTLS_SHA384_C */ - #if defined(MBEDTLS_SSL_ALL_ALERT_MESSAGES) if( strcmp( "MBEDTLS_SSL_ALL_ALERT_MESSAGES", config ) == 0 ) {
stick |mass outputs in mass subdirectory of put
** */ #include <uv.h> +#include <sys/stat.h> #include "all.h" #include "vere/vere.h" @@ -1868,7 +1869,14 @@ _raft_grab(u3_noun rus) c3_c* wen_c = u3r_string(u3A->wen); c3_c nam_c[2048]; - snprintf(nam_c, 2048, "%s/.urb/put/%s-mass.txt", u3_Host.dir_c, wen_c); + snprintf(nam_c, 2048, "%s/.urb/put/mass", u3_Host.dir_c); + + struct stat st; + if ( -1 == stat(nam_c, &st) ) { + mkdir(nam_c, 0700); + } + + snprintf(nam_c, 2048, "%s/%s.txt", nam_c, wen_c); fil_u = fopen(nam_c, "w"); fprintf(fil_u, "%s\r\n", wen_c);
Explicitly find libcrypto static/shared libs, export the winner based on BUILD_SHARED_LIBS
# # LibCrypto_FOUND System has libcrypto, include and library dirs found # LibCrypto_INCLUDE_DIR The crypto include directories. -# LibCrypto_LIBRARY The crypto library. +# LibCrypto_LIBRARY The crypto library, depending on the value of BUILD_SHARED_LIBS. +# LibCrypto_SHARED_LIBRARY The path to libcrypto.so +# LibCrypto_STATIC_LIBRARY The path to libcrypto.a + find_path(LibCrypto_INCLUDE_DIR NAMES openssl/crypto.h HINTS ${CMAKE_PREFIX_PATH}/include ${CMAKE_INSTALL_PREFIX}/include ) - -if (BUILD_SHARED_LIBS) - find_library(LibCrypto_LIBRARY - NAMES libcrypto.so libcrypto.a +find_library(LibCrypto_SHARED_LIBRARY + NAMES libcrypto.so HINTS ${CMAKE_PREFIX_PATH}/build/crypto ${CMAKE_PREFIX_PATH}/build @@ -34,9 +35,8 @@ if (BUILD_SHARED_LIBS) ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ) -else() - find_library(LibCrypto_LIBRARY - NAMES libcrypto.a libcrypto.so +find_library(LibCrypto_STATIC_LIBRARY + NAMES libcrypto.a HINTS ${CMAKE_PREFIX_PATH}/build/crypto ${CMAKE_PREFIX_PATH}/build @@ -49,6 +49,11 @@ else() ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ) + +if (BUILD_SHARED_LIBS) + set(LibCrypto_LIBRARY ${LibCrypto_SHARED_LIBRARY}) +else() + set(LibCrypto_LIBRARY ${LibCrypto_STATIC_LIBRARY}) endif() @@ -62,10 +67,14 @@ mark_as_advanced( LibCrypto_ROOT_DIR LibCrypto_INCLUDE_DIR LibCrypto_LIBRARY + LibCrypto_SHARED_LIBRARY + LibCrypto_STATIC_LIBRARY ) if(LibCrypto_FOUND) - message(STATUS "Libcrypto Include Dir: ${LibCrypto_INCLUDE_DIR}") + message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}") + message(STATUS "LibCrypto Shared Lib: ${LibCrypto_SHARED_LIBRARY}") + message(STATUS "LibCrypto Static Lib: ${LibCrypto_STATIC_LIBRARY}") if (NOT TARGET LibCrypto::Crypto AND (EXISTS "${LibCrypto_LIBRARY}") )
scripts: allow JSON to be spelled json
@@ -65,7 +65,7 @@ s:\<Key/value:Key-value:g s/[^#"]\<data-?type/data type/g -s/([^\./`-])[Jj]son/\1JSON/ +s/([^\./`-])[J]son/\1JSON/ s/\<([Mm])etaspecification/\1eta-specification/g s/\<([Mm])etamodel/\1eta-model/g
Bump major version since cfg got a new field
@@ -22,7 +22,7 @@ AC_CONFIG_SRCDIR([src/encmain.c]) # - Increment when making new releases and major or minor was not changed since last release. # # Here is a somewhat sane guide to lib versioning: http://apr.apache.org/versioning.html -ver_major=5 +ver_major=6 ver_minor=1 ver_release=0
Fix formatting of restoreFile() definition.
@@ -20,7 +20,8 @@ Restore File #include "storage/helper.h" /**********************************************************************************************************************************/ -FN_EXTERN List *restoreFile( +FN_EXTERN List * +restoreFile( const String *const repoFile, const unsigned int repoIdx, const CompressType repoFileCompressType, const time_t copyTimeBegin, const bool delta, const bool deltaForce, const String *const cipherPass, const List *const fileList) {
I updated the visit-build-open script for building 2.13.0 on ubuntu1104_64 and ubuntu1404_64.
@@ -441,7 +441,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1 cd $dist/src ver=\`cat VERSION\` ver2=\`echo \$ver | tr "." "_"\` -/home/visit/visit/thirdparty_shared/2.12.0/cmake/3.0.2/linux-x86_64_gcc-4.5/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> ../../buildlog 2>&1 +/home/visit/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.5/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> ../../buildlog 2>&1 make -j 3 package >> ../../buildlog 2>&1 mv visit\$ver2.linux-x86_64.tar.gz ../.. cd ../.. @@ -506,7 +506,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1 cd $dist/src ver=\`cat VERSION\` ver2=\`echo \$ver | tr "." "_"\` -/home/brugger1/visit/thirdparty_shared/2.12.0/cmake/3.0.2/linux-x86_64_gcc-4.8/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> ../../buildlog 2>&1 +/home/brugger1/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> ../../buildlog 2>&1 make -j 3 package >> ../../buildlog 2>&1 mv visit\$ver2.linux-x86_64.tar.gz ../.. cd ../..
Add read_cfg to README.md
@@ -75,6 +75,7 @@ A partial list of parameters are below. See the config file for a complete list. | `gpu_color`<br>`gpu_color`<br>`vram_color`<br>`ram_color`<br>`io_color`<br>`engine_color`<br>`frametime_color`<br>`background_color`<br>`text_color` | Change default colors: `gpu_color=RRGGBB`| | `alpha` | Set the opacity of all text and frametime graph `0.0-1.0` | | `background_alpha` | Set the opacity of the background `0.0-1.0` | +| `read_cfg` | Add to MANGOHUD_CONFIG as first parameter to also load config file. Otherwise only MANGOHUD_CONFIG parameters are used. | Note: Width and Height are set automatically based on the font_size, but can be overridden.
mangle: memcpy -> memmove to allow for overlapping mem regions
@@ -41,7 +41,7 @@ static inline void mangle_Overwrite(run_t* run, const uint8_t* src, size_t off, sz = maxToCopy; } - memcpy(&run->dynamicFile[off], src, sz); + memmove(&run->dynamicFile[off], src, sz); } static inline void mangle_Move(run_t* run, size_t off_from, size_t off_to, size_t len) {
PATCH needs to have a body, this change fixes it
@@ -114,6 +114,8 @@ set_method(CURL *ehandle, enum http_method method, struct api_resbody_s *body) break; case PATCH: curl_easy_setopt(ehandle, CURLOPT_CUSTOMREQUEST, "PATCH"); + curl_easy_setopt(ehandle, CURLOPT_POSTFIELDS, body->str); + curl_easy_setopt(ehandle, CURLOPT_POSTFIELDSIZE, body->size); break; case PUT: curl_easy_setopt(ehandle, CURLOPT_CUSTOMREQUEST, "PUT"); @@ -304,7 +306,7 @@ custom_easy_init(struct _settings_s *settings, CURLcode ecode; /* DEBUG ONLY FUNCTIONS */ //set debug callback - D_ONLY(ecode = curl_easy_setopt(new_ehandle, CURLOPT_DEBUGFUNCTION, &curl_debug_cb)); + D_ONLY(ecode = curl_easy_setopt(new_ehandle, CURLOPT_DEBUGFUNCTION, NULL)); D_ASSERT_S(CURLE_OK == ecode, curl_easy_strerror(ecode)); //set ptr to settings containing dump files
turn on metric events
@@ -81,7 +81,7 @@ ENV SCOPE_LOG_DEST=file:///tmp/scope.log ENV SCOPE_METRIC_VERBOSITY=4 ENV SCOPE_EVENT_LOGFILE=true ENV SCOPE_EVENT_CONSOLE=true -ENV SCOPE_EVENT_METRIC=false +ENV SCOPE_EVENT_METRIC=true ENV SCOPE_EVENT_HTTP=true ENV SCOPE_EVENT_DEST=file:///go/events.log
HardwareDevices: Fix network deltas for disconnected wireless devices
* Hardware Devices Plugin * * Copyright (C) 2016 wj32 - * Copyright (C) 2015-2020 dmex + * Copyright (C) 2015-2021 dmex * * This file is part of Process Hacker. * @@ -64,7 +64,6 @@ VOID NetAdaptersUpdate( PDV_NETADAPTER_ENTRY entry; ULONG64 networkInOctets = 0; ULONG64 networkOutOctets = 0; - ULONG64 linkSpeedValue = 0; entry = PhReferenceObjectSafe(NetworkAdaptersList->Items[i]); @@ -172,14 +171,16 @@ VOID NetAdaptersUpdate( PhInitializeDelta(&entry->NetworkSendDelta); PhInitializeDelta(&entry->NetworkReceiveDelta); } - - if (entry->NetworkReceiveRaw < networkInOctets) + else + { + //if (entry->NetworkReceiveRaw < networkInOctets) entry->NetworkReceiveRaw = networkInOctets; - if (entry->NetworkSendRaw < networkOutOctets) + //if (entry->NetworkSendRaw < networkOutOctets) entry->NetworkSendRaw = networkOutOctets; PhUpdateDelta(&entry->NetworkSendDelta, entry->NetworkSendRaw); PhUpdateDelta(&entry->NetworkReceiveDelta, entry->NetworkReceiveRaw); + } if (!entry->HaveFirstSample) {
[ci]add ft2004
@@ -38,6 +38,7 @@ jobs: - {RTT_BSP: "apm32/apm32f103xe-minibroard", RTT_TOOL_CHAIN: "sourcery-arm"} - {RTT_BSP: "apollo2", RTT_TOOL_CHAIN: "sourcery-arm"} - {RTT_BSP: "asm9260t", RTT_TOOL_CHAIN: "sourcery-arm"} + - {RTT_BSP: "ft2004", RTT_TOOL_CHAIN: "sourcery-arm"} - {RTT_BSP: "at91/at91sam9g45", RTT_TOOL_CHAIN: "sourcery-arm"} - {RTT_BSP: "at91/at91sam9260", RTT_TOOL_CHAIN: "sourcery-arm"} - {RTT_BSP: "allwinner_tina", RTT_TOOL_CHAIN: "sourcery-arm"}
Detach USB kernel driver before setting configuration
@@ -282,31 +282,28 @@ pappl_usb_find( if (libusb_control_transfer(device->handle, LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_ENDPOINT_IN | LIBUSB_RECIPIENT_DEVICE, 8, /* GET_CONFIGURATION */ 0, 0, (unsigned char *)&current, 1, 5000) < 0) current = 0; - if (confptr->bConfigurationValue != current) +#ifdef __linux + // Make sure the old, busted usblp kernel driver is not loaded... + if (libusb_kernel_driver_active(device->handle, device->iface) == 1) { - // Select the configuration we want... - if (libusb_set_configuration(device->handle, confptr->bConfigurationValue) < 0) + if ((err = libusb_detach_kernel_driver(device->handle, device->iface)) < 0 && err != LIBUSB_ERROR_NOT_FOUND) { + _papplDeviceError(err_cb, err_data, "Unable to detach usblp kernel driver for USB printer %04x:%04x: %s", devdesc.idVendor, devdesc.idProduct, libusb_strerror((enum libusb_error)err)); libusb_close(device->handle); device->handle = NULL; } } +#endif // __linux -#ifdef __linux - if (device->handle) + if (device->handle && confptr->bConfigurationValue != current) { - // Make sure the old, busted usblp kernel driver is not loaded... - if (libusb_kernel_driver_active(device->handle, device->iface) == 1) - { - if ((err = libusb_detach_kernel_driver(device->handle, device->iface)) < 0 && err != LIBUSB_ERROR_NOT_FOUND) + // Select the configuration we want... + if (libusb_set_configuration(device->handle, confptr->bConfigurationValue) < 0) { - _papplDeviceError(err_cb, err_data, "Unable to detach usblp kernel driver for USB printer %04x:%04x: %s", devdesc.idVendor, devdesc.idProduct, libusb_strerror((enum libusb_error)err)); libusb_close(device->handle); device->handle = NULL; } } - } -#endif // __linux if (device->handle) {
fix: cmd_sticky crash sway with empty container
@@ -16,6 +16,11 @@ struct cmd_results *cmd_sticky(int argc, char **argv) { return error; } struct sway_container *container = config->handler_context.container; + + if (container == NULL) { + return cmd_results_new(CMD_FAILURE, "sticky", "No current container"); + }; + if (!container_is_floating(container)) { return cmd_results_new(CMD_FAILURE, "sticky", "Can't set sticky on a tiled container");
Respect DILL_DISAVLE_SOCKETS in libdillimpl.h
@@ -41,6 +41,8 @@ struct hvfs { DILL_EXPORT int hmake(struct hvfs *vfs); +#if !defined DILL_DISABLE_SOCKETS + /******************************************************************************/ /* Bytestream sockets. */ /******************************************************************************/ @@ -69,3 +71,5 @@ struct msock_vfs { #endif +#endif +
Drop atpanic wrapper function The use of longjmp in lua makes dealing with lua exceptions difficult. There doesn't seem to be a sensible way to handle those exceptions, so the host program will exit with a panic either way. With that in mind, the `atpanic` function doesn't seem very useful.
@@ -41,7 +41,6 @@ module Foreign.Lua , module Foreign.Lua.Types , module Foreign.Lua.Util -- * Lua API functions - , atpanic , call , checkstack , close
Missing show()
@@ -150,6 +150,7 @@ void Application::onMessage(const clap::RemoteChannel::Message &msg) { #ifdef Q_OS_WIN hostWindow_.reset(QWindow::fromWinId(rq.hwnd)); quickView_->setParent(hostWindow_.get()); + _quickView->show(); sync(); rp.succeed = true; #endif @@ -167,6 +168,7 @@ void Application::onMessage(const clap::RemoteChannel::Message &msg) { #ifdef Q_OS_MACOS hostWindow_.reset(QWindow::fromWinId(rq.nsView)); quickView_->setParent(hostWindow_.get()); + _quickView->show(); sync(); rp.succeed = true; #endif
fix(draw) ensure variable is initialized to avoid warning Fixes
@@ -202,7 +202,7 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(lv_draw_ctx_t * draw_ctx, const lv_draw cmd_state_t cmd_state = CMD_STATE_WAIT; uint32_t i; uint32_t par_start = 0; - lv_color_t recolor; + lv_color_t recolor = lv_color_black(); lv_color_t color = lv_color_black(); int32_t letter_w;
task_wdt: correct critical section API in ISR context
@@ -135,7 +135,7 @@ void __attribute__((weak)) esp_task_wdt_isr_user_handler(void) */ static void task_wdt_isr(void *arg) { - portENTER_CRITICAL(&twdt_spinlock); + portENTER_CRITICAL_ISR(&twdt_spinlock); twdt_task_t *twdttask; const char *cpu; //Reset hardware timer so that 2nd stage timeout is not reached (will trigger system reset) @@ -169,12 +169,12 @@ static void task_wdt_isr(void *arg) esp_task_wdt_isr_user_handler(); if (twdt_config->panic){ //Trigger Panic if configured to do so ESP_EARLY_LOGE(TAG, "Aborting."); - portEXIT_CRITICAL(&twdt_spinlock); + portEXIT_CRITICAL_ISR(&twdt_spinlock); esp_reset_reason_set_hint(ESP_RST_TASK_WDT); abort(); } - portEXIT_CRITICAL(&twdt_spinlock); + portEXIT_CRITICAL_ISR(&twdt_spinlock); } /*
OcAppleKernelLib: STAB symbols are not considered defined.
@@ -150,8 +150,9 @@ MachoSymbolIsDefined ( { ASSERT (Symbol != NULL); - return (Symbol->Type & MACH_N_TYPE_TYPE) == MACH_N_TYPE_ABS - || MachoSymbolIsSection (Symbol); + return (((Symbol->Type & MACH_N_TYPE_STAB) == 0) + && (((Symbol->Type & MACH_N_TYPE_TYPE) == MACH_N_TYPE_ABS) + || MachoSymbolIsSection (Symbol))); } /** @@ -422,7 +423,7 @@ MachoGetSymbolByRelocationOffset64 ( **/ STATIC MACH_NLIST_64 * -InternalGetSymbolByName ( +InternalGetLocalDefinedSymbolByNameWorker ( IN OUT OC_MACHO_CONTEXT *Context, IN MACH_NLIST_64 *SymbolTable, IN UINT32 NumberOfSymbols, @@ -439,6 +440,11 @@ InternalGetSymbolByName ( if (!InternalSymbolIsSane (Context, &SymbolTable[Index])) { break; } + + if (!MachoSymbolIsDefined (&SymbolTable[Index])) { + continue; + } + TmpName = MachoGetSymbolName64 (Context, &SymbolTable[Index]); if (AsciiStrCmp (Name, TmpName) == 0) { return &SymbolTable[Index]; @@ -478,14 +484,14 @@ MachoGetLocalDefinedSymbolByName ( DySymtab = Context->DySymtab; if (DySymtab != NULL) { - Symbol = InternalGetSymbolByName ( + Symbol = InternalGetLocalDefinedSymbolByNameWorker ( Context, &SymbolTable[DySymtab->LocalSymbolsIndex], DySymtab->NumLocalSymbols, Name ); if (Symbol == NULL) { - Symbol = InternalGetSymbolByName ( + Symbol = InternalGetLocalDefinedSymbolByNameWorker ( Context, &SymbolTable[DySymtab->ExternalSymbolsIndex], DySymtab->NumExternalSymbols, @@ -494,7 +500,7 @@ MachoGetLocalDefinedSymbolByName ( } } else { ASSERT (Context->Symtab != NULL); - Symbol = InternalGetSymbolByName ( + Symbol = InternalGetLocalDefinedSymbolByNameWorker ( Context, SymbolTable, Context->Symtab->NumSymbols,
[numerics] remove convexQP_ADMM_reduced fro a while
@@ -1131,7 +1131,6 @@ if(WITH_${COMPONENT}_TESTING) BEGIN_TEST(src/QP/test) NEW_TEST(ConvexQP_test0 ConvexQP_test.c) NEW_TEST(ConvexQP_PG ConvexQP_test1.c) - NEW_TEST(ConvexQP_ADMM_reduced ConvexQP_test2.c) NEW_TEST(ConvexQP_ADDM ConvexQP_test3.c) NEW_TEST(ConvexQP_ADDM_ACCELERATION ConvexQP_test4.c) NEW_TEST(ConvexQP_ADDM_ACCELERATION_AND_RESTART ConvexQP_test5.c) @@ -1140,6 +1139,14 @@ if(WITH_${COMPONENT}_TESTING) NEW_TEST(ConvexQP_ADMM_ACCELERATION_FC3D ConvexQP_testFC3D4.c) NEW_TEST(ConvexQP_ADMM_ACCELERATION_AND_RESTART_FC3D ConvexQP_testFC3D5.c) END_TEST() + + # NEW_TEST(ConvexQP_ADMM_reduced ConvexQP_test2.c) + + # IF(WITH_MUMPS) + # SET(ConvexQP_ADMM_reduced_PROPERTIES WILL_FAIL TRUE) + # ENDIF(WITH_MUMPS) + + BEGIN_TEST(src/AVI/test) IF(HAS_ONE_LP_SOLVER)
Auto detect endianess... for older gcc
@@ -185,6 +185,16 @@ ifeq ($(shell printf "\#include <libpq-fe.h>\\nint main(void) {}\n" | $(CC) $(IN endif +# Set Endian Flag +ifeq ($(shell printf "int main(void) {int i = 1; return (int)(i & ((unsigned char *)&i)[0]);}\n" | $(CC) -xc -o endian_test - >> /dev/null 2> /dev/null ; ./endian_test >> /dev/null 2> /dev/null; echo $$?; rm endian_test 2> /dev/null), 0) + $(info * Detected Big Endian mode) + FLAGS:=$(FLAGS) __BIG_ENDIAN__ +else + $(info * Assuming Little Endian mode) + FLAGS:=$(FLAGS) __BIG_ENDIAN__=0 +endif + + ##################### # Updated flags and final values
fix typo in discard_server example
* Usage: discard_server [local_encaps_port] [remote_encaps_port] * * Example - * Server: $ ./daytime_server 11111 22222 + * Server: $ ./discard_server 11111 22222 * Client: $ ./client 127.0.0.1 9 0 22222 11111 */
Update minimum compiler versions
@@ -30,9 +30,9 @@ Requirements ------------ The libngtcp2 C library itself does not depend on any external -libraries. The example client, and server are written in C++17, and -should compile with the modern C++ compilers (e.g., clang >= 8.0, or -gcc >= 8.0). +libraries. The example client, and server are written in C++20, and +should compile with the modern C++ compilers (e.g., clang >= 11.0, or +gcc >= 11.0). The following packages are required to configure the build system:
Renamed Time to Speed to match MP example
@@ -35,11 +35,10 @@ const int16_t DEFAULT_ANGLE = 120; // The brightness (between 0 and 31) to set the LEDs to const int16_t DEFAULT_BRIGHTNESS = 16; - - // How many times the LEDs will be updated per second const uint UPDATES = 60; + // Pick *one* LED type by uncommenting the relevant line below: // APA102-style LEDs with Data/Clock lines. AKA DotStar @@ -62,7 +61,7 @@ enum ENCODER_MODE { COLOUR, ANGLE, BRIGHTNESS, - TIME + SPEED }; float wrap(float v, float min, float max) { @@ -159,7 +158,7 @@ int main() { brightness_gauge(brightness, 31); break; - case ENCODER_MODE::TIME: + case ENCODER_MODE::SPEED: speed += count; speed = std::min((int16_t)100, std::max((int16_t)0, speed)); speed_gauge(speed, 100); @@ -197,10 +196,10 @@ int main() { case ENCODER_MODE::BRIGHTNESS: led.set_rgb(0, 255, 0); - if(a_pressed) mode = ENCODER_MODE::TIME; + if(a_pressed) mode = ENCODER_MODE::SPEED; break; - case ENCODER_MODE::TIME: + case ENCODER_MODE::SPEED: led.set_rgb(0, 0, 255); if(a_pressed) mode = ENCODER_MODE::COLOUR; break; @@ -209,8 +208,8 @@ int main() { if(cycle) colour_cycle(hue, (float)(t * speed) / 100.0f, (float)angle); - auto first_led = led_strip.get(led_strip.num_leds / 2); - enc.set_led(first_led.r, first_led.g, first_led.b); + auto mid_led = led_strip.get(led_strip.num_leds / 2); + enc.set_led(mid_led.r, mid_led.g, mid_led.b); // Sleep time controls the rate at which the LED buffer is updated // but *not* the actual framerate at which the buffer is sent to the LEDs
fix build on ghc4.8 (issue
@@ -778,7 +778,12 @@ but we call `exit` instead (i.e. not returning). #ifdef __cplusplus #include <new> static bool mi_try_new_handler(bool nothrow) { + #if defined(_MSC_VER) || (__cplusplus >= 201103L) std::new_handler h = std::get_new_handler(); + #else + std::new_handler h = std::set_new_handler(); + std::set_new_handler(h); + #endif if (h==NULL) { if (!nothrow) throw std::bad_alloc(); return false;
avoid atomic read on aligned allocation on Linux
@@ -240,13 +240,15 @@ static void* mi_wasm_heap_grow(size_t size, size_t try_alignment) { static void* mi_unix_mmapx(size_t size, size_t try_alignment, int protect_flags, int flags, int fd) { void* p = NULL; #if (MI_INTPTR_SIZE >= 8) && !defined(MAP_ALIGNED) - // on 64-bit systems, use a special area for 4MiB aligned allocations + // on 64-bit systems, use the virtual address area after 4TiB for 4MiB aligned allocations static volatile intptr_t aligned_base = ((intptr_t)1 << 42); // starting at 4TiB - if (try_alignment <= MI_SEGMENT_SIZE && (size%MI_SEGMENT_SIZE)==0 && (aligned_base%try_alignment)==0) { + if (try_alignment <= MI_SEGMENT_SIZE && (size%MI_SEGMENT_SIZE)==0) { intptr_t hint = mi_atomic_add(&aligned_base,size) - size; + if (hint%try_alignment == 0) { p = mmap((void*)hint,size,protect_flags,flags,fd,0); if (p==MAP_FAILED) p = NULL; // fall back to regular mmap } + } #endif if (p==NULL) { p = mmap(NULL,size,protect_flags,flags,fd,0); @@ -273,10 +275,10 @@ static void* mi_unix_mmap(size_t size, size_t try_alignment, int protect_flags) protect_flags |= PROT_MAX(PROT_READ | PROT_WRITE); // BSD #endif #if defined(VM_MAKE_TAG) - // darwin: tracking anonymous page with a specific ID all up to 98 are taken officially but LLVM sanitizers had taken 99 + // macOS: tracking anonymous page with a specific ID. (All up to 98 are taken officially but LLVM sanitizers had taken 99) fd = VM_MAKE_TAG(100); #endif - if (large_os_page_size > 0 && use_large_os_page(size, try_alignment)) { + if (use_large_os_page(size, try_alignment)) { int lflags = flags; int lfd = fd; #ifdef MAP_ALIGNED_SUPER @@ -308,7 +310,7 @@ static void* mi_unix_mmap(size_t size, size_t try_alignment, int protect_flags) #endif // Primitive allocation from the OS. -// Note: the `alignment` is just a hint and the returned pointer is not guaranteed to be aligned. +// Note: the `try_alignment` is just a hint and the returned pointer is not guaranteed to be aligned. static void* mi_os_mem_alloc(size_t size, size_t try_alignment, bool commit, mi_stats_t* stats) { mi_assert_internal(size > 0 && (size % _mi_os_page_size()) == 0); if (size == 0) return NULL; @@ -319,7 +321,7 @@ static void* mi_os_mem_alloc(size_t size, size_t try_alignment, bool commit, mi_ if (commit) flags |= MEM_COMMIT; p = mi_win_virtual_alloc(NULL, size, try_alignment, flags); #elif defined(__wasi__) - p = mi_wasm_heap_grow(size, try_alignment); + p = mi_wasm_herap_grow(size, try_alignment); #else int protect_flags = (commit ? (PROT_WRITE | PROT_READ) : PROT_NONE); p = mi_unix_mmap(size, try_alignment, protect_flags);
apps/netutils/tftpc: Missing header file causes errors in some configurations.
#include <nuttx/net/netconfig.h> #include <nuttx/net/ethernet.h> #include <nuttx/net/ip.h> +#include <nuttx/net/udp.h> /**************************************************************************** * Pre-processor Definitions #if MIN_UDP_MSS < TFTP_MAXPACKETSIZE # define TFTP_PACKETSIZE MIN_UDP_MSS # ifdef CONFIG_CPP_HAVE_WARNING -# warning "uIP MSS is too small for TFTP" +# warning "MSS is too small for TFTP" # endif #else # define TFTP_PACKETSIZE TFTP_MAXPACKETSIZE
Decouple `engine_version` from `fps`
@@ -1446,10 +1446,13 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::Text("ms"); ImGui::PopFont(); } + if (!params.enabled[OVERLAY_PARAM_ENABLED_fps] && params.enabled[OVERLAY_PARAM_ENABLED_engine_version]){ + ImGui::TableNextRow(); + ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(params.engine_color), "%s", is_vulkan ? data.engineName.c_str() : "OpenGL"); + } ImGui::EndTable(); - auto engine_color = ImGui::ColorConvertU32ToFloat4(params.engine_color); - if (params.enabled[OVERLAY_PARAM_ENABLED_fps] && params.enabled[OVERLAY_PARAM_ENABLED_engine_version]){ + if (params.enabled[OVERLAY_PARAM_ENABLED_engine_version]){ ImGui::PushFont(data.font1); ImGui::Dummy(ImVec2(0, 8.0f)); if (is_vulkan) {
spi: fix dma_transfer_done init
@@ -269,7 +269,7 @@ uint8_t spi_transfer_byte_timeout(spi_ports_t port, uint8_t data, uint32_t timeo return LL_SPI_ReceiveData8(PORT.channel); } -volatile uint8_t dma_transfer_done[4 * 8]; +volatile uint8_t dma_transfer_done[32] = {[0 ... 31] = 1}; #define DMA_TRANSFER_DONE dma_transfer_done[(PORT.dma.dma_port - 1) * 8 + PORT.dma.rx_stream_index] void spi_dma_init(spi_ports_t port) {
fix typo tranform -> transform
@@ -65,7 +65,7 @@ must be separated by one space. For example: to apply a rotation and flip, or "normal" to apply no transform. If a single output is chosen and a rotation direction is specified (_clockwise_ or _anticlockwise_) then the transform is added or - subtracted from the current tranform. + subtracted from the current transform. *output* <name> disable|enable Enables or disables the specified output (all outputs are enabled by