message
stringlengths
6
474
diff
stringlengths
8
5.22k
[mechanics] initialize _with_equality_contraints
@@ -534,13 +534,13 @@ void SiconosBulletCollisionManager::initialize_impl() } SiconosBulletCollisionManager::SiconosBulletCollisionManager() - : SiconosCollisionManager() + : SiconosCollisionManager(),_with_equality_constraints(false) { initialize_impl(); } SiconosBulletCollisionManager::SiconosBulletCollisionManager(const SiconosBulletOptions &options) - : _options(options) + : _with_equality_constraints(false),_options(options) { initialize_impl(); }
doc(spi_master): format the documentation of several fields and macros in `spi_master.h`
@@ -36,8 +36,8 @@ extern "C" #define SPI_DEVICE_HALFDUPLEX (1<<4) ///< Transmit data before receiving it, instead of simultaneously #define SPI_DEVICE_CLK_AS_CS (1<<5) ///< Output clock on CS line if CS is active /** There are timing issue when reading at high frequency (the frequency is related to whether native pins are used, valid time after slave sees the clock). - * In half-duplex mode, the driver automatically inserts dummy bits before reading phase to fix the timing issue. Set this flag to disable this feature. - * However in full-duplex mode, dummy bits are not allowed to use and no way to prevent reading data from being corrupted. + * - In half-duplex mode, the driver automatically inserts dummy bits before reading phase to fix the timing issue. Set this flag to disable this feature. + * - In full-duplex mode, however, the hardware cannot use dummy bits, so there is no way to prevent data being read from getting corrupted. * Set this flag to confirm that you're going to work with output only, or read without dummy bits at your own risk. */ #define SPI_DEVICE_NO_DUMMY (1<<6) @@ -79,12 +79,18 @@ typedef struct { */ struct spi_transaction_t { uint32_t flags; ///< Bitwise OR of SPI_TRANS_* flags - uint16_t cmd; ///< Command data, of which the length is set in the ``command_bits`` of spi_device_interface_config_t. - ///< <b>NOTE: this field, used to be "command" in ESP-IDF 2.1 and before, is re-written to be used in a new way in ESP-IDF 3.0.</b> - ///< - Example: write 0x0123 and command_bits=12 to send command 0x12, 0x3_ (in previous version, you may have to write 0x3_12). - uint64_t addr; ///< Address data, of which the length is set in the ``address_bits`` of spi_device_interface_config_t. - ///< <b>NOTE: this field, used to be "address" in ESP-IDF 2.1 and before, is re-written to be used in a new way in ESP-IDF3.0.</b> - ///< - Example: write 0x123400 and address_bits=24 to send address of 0x12, 0x34, 0x00 (in previous version, you may have to write 0x12340000). + uint16_t cmd; /**< Command data, of which the length is set in the ``command_bits`` of spi_device_interface_config_t. + * + * <b>NOTE: this field, used to be "command" in ESP-IDF 2.1 and before, is re-written to be used in a new way in ESP-IDF 3.0.</b> + * + * Example: write 0x0123 and command_bits=12 to send command 0x12, 0x3_ (in previous version, you may have to write 0x3_12). + */ + uint64_t addr; /**< Address data, of which the length is set in the ``address_bits`` of spi_device_interface_config_t. + * + * <b>NOTE: this field, used to be "address" in ESP-IDF 2.1 and before, is re-written to be used in a new way in ESP-IDF3.0.</b> + * + * Example: write 0x123400 and address_bits=24 to send address of 0x12, 0x34, 0x00 (in previous version, you may have to write 0x12340000). + */ size_t length; ///< Total data length, in bits size_t rxlength; ///< Total data length received, should be not greater than ``length`` in full-duplex mode (0 defaults this to the value of ``length``). void *user; ///< User-defined variable. Can be used to store eg transaction ID.
job-impressions and job-impressions-completed are member variables in the server_job_t structure, so just set those values rather than (re)creating an attribute for them.
@@ -414,8 +414,36 @@ process_attr_message( { serverLogJob(SERVER_LOGLEVEL_DEBUG, job, "options[%d].name=\"%s\", .value=\"%s\"", num_options - i, option->name, option->value); - if (!strcmp(option->name, "job-impressions") || !strcmp(option->name, "job-impressions-col") || !strcmp(option->name, "job-media-sheets") || !strcmp(option->name, "job-media-sheets-col") || - (mode == SERVER_TRANSFORM_COMMAND && (!strcmp(option->name, "job-impressions-completed") || !strcmp(option->name, "job-impressions-completed-col") || !strcmp(option->name, "job-media-sheets-completed") || !strcmp(option->name, "job-media-sheets-completed-col")))) + if (!strcmp(option->name, "job-impressions")) + { + /* + * Update job-impressions attribute... + */ + + serverLogJob(SERVER_LOGLEVEL_DEBUG, job, "Setting Job Status attribute \"%s\" to \"%s\".", option->name, option->value); + + _cupsRWLockWrite(&job->rwlock); + + job->impressions = atoi(option->value); + + _cupsRWUnlock(&job->rwlock); + } + else if (mode == SERVER_TRANSFORM_COMMAND && !strcmp(option->name, "job-impressions-completed")) + { + /* + * Update job-impressions-completed attribute... + */ + + serverLogJob(SERVER_LOGLEVEL_DEBUG, job, "Setting Job Status attribute \"%s\" to \"%s\".", option->name, option->value); + + _cupsRWLockWrite(&job->rwlock); + + job->impcompleted = atoi(option->value); + + _cupsRWUnlock(&job->rwlock); + } + else if (!strcmp(option->name, "job-impressions-col") || !strcmp(option->name, "job-media-sheets") || !strcmp(option->name, "job-media-sheets-col") || + (mode == SERVER_TRANSFORM_COMMAND && (!strcmp(option->name, "job-impressions-completed-col") || !strcmp(option->name, "job-media-sheets-completed") || !strcmp(option->name, "job-media-sheets-completed-col")))) { /* * Update Job Status attribute...
engine: warn when a 'retry' fails
@@ -185,6 +185,11 @@ static inline int flb_engine_manager(flb_pipefd_t fd, struct flb_config *config) flb_buffer_chunk_pop(config->buffer_ctx, thread_id, task); } #endif + /* Notify about this failed retry */ + flb_warn("[engine] Task cannot be retried: " + "task_id=%i thread_id=%i output=%s", + task->id, out_th->id, out_th->o_ins->name); + flb_output_thread_destroy_id(thread_id, task); if (task->users == 0) { flb_task_destroy(task);
dojo: parse %as in ++parse-value instead of ++parse-build Allows things like `+hello &helm-hi 'hi'`. Fixes
;~(plug (cold %ur lus) parse-url) ;~(plug (cold %ge lus) parse-model) ;~(plug (cold %te hep) sym (star ;~(pfix ace parse-source))) - ;~(plug (cold %as pad) sym ;~(pfix ace parse-source)) ;~(plug (cold %do cab) parse-hoon ;~(pfix ace parse-source)) parse-value == == ++ parse-value ;~ pose + ;~(plug (cold %as pad) sym ;~(pfix ace parse-source)) (stag %sa ;~(pfix tar pad sym)) (stag %ex parse-hoon) (stag %tu (ifix [lac rac] (most ace parse-source)))
occ: Update Dynamic Data comment block with new GPU presence fields Document new GPU presence fields in the comment block next to struct occ_dynamic_data. Fixes: ("occ: Add support for GPU presence detection") Suggested-by: Shilpasri G Bhat
@@ -212,6 +212,11 @@ struct occ_response_buffer { * * struct occ_dynamic_data - Contains runtime attributes * @occ_state: Current state of OCC + * @major_version: Major version number + * @minor_version: Minor version number (backwards compatible) + * Version 1 indicates GPU presence populated + * @gpus_present: Bitmask of GPUs present (on systems where GPU + * presence is detected through APSS) * @cpu_throttle: Reason for limiting the max pstate * @mem_throttle: Reason for throttling memory * @quick_pwr_drop: Indicates if QPD is asserted
Fix name of event method.
@@ -446,7 +446,7 @@ _papplSystemWebAddPrinter( " <tr><th></th><td><input type=\"submit\" value=\"Add Printer\"></td></tr>\n" " </tbody></table>\n" " </form>\n" - " <script>document.forms['form']['device_uri'].onChange = function () {\n" + " <script>document.forms['form']['device_uri'].onchange = function () {\n" " if (this.value == 'socket') {\n" " document.forms['form']['hostname'].disabled = false;\n" " document.forms['form']['hostname'].required = true;\n"
Test: Remove trailing semicolon from macro
@@ -37,7 +37,7 @@ using namespace kdb; cerr << message << endl; \ exit (1); \ } \ - SUCCEED () << message; + SUCCEED () << message #define succeed_if_same(x, y, message) ASSERT_EQ (x, y) << message #define compare_keyset(keySet1, keySet2) ASSERT_EQ (keySet1, keySet2) << "Key sets are not equal"
extmod/modlogger: experimental editor file write This adds experimental support to let the external editor create a file on the computer.
@@ -112,6 +112,7 @@ STATIC mp_obj_t tools_Logger_save(size_t n_args, const mp_obj_t *pos_args, mp_ma } #else tools_Logger_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); + mp_print_str(&mp_plat_print, "PB_OF\n"); #endif //PYBRICKS_HUB_EV3 // Read log size information @@ -155,6 +156,8 @@ STATIC mp_obj_t tools_Logger_save(size_t n_args, const mp_obj_t *pos_args, mp_ma if (fclose(log_file) != 0) { err = PBIO_ERROR_IO; } +#else + mp_print_str(&mp_plat_print, "PB_EOF\n"); #endif // PYBRICKS_HUB_EV3 pb_assert(err);
system/utils/README : Update heapinfo cmd information 1. heapinfo supports -e, -r and -k options, but there was no description in README. and for using heapinfo cmd, CONFIG_DEBUG_MM_HEAPINFO is mandantory, so changing the explanation for enabling the heapinfo cmd. 2. CONFIG_ENABLE_HEAPINFO is changed to CONFIG_ENABLE_HEAPINFO_CMD. 3. fix typo for irqinfo
@@ -335,6 +335,11 @@ Options: -f Show the free list -g Show the User defined group allocation details (for -g option, CONFIG_HEAPINFO_GROUP is needed) + -e HEAP_IDX Show the heap[HEAP_IDX] allocation details + (-e option is available when CONFIG_MM_NHEAPS is greater than 1) + -r Show the all region information + (-r option is available when CONFIG_MM_REGIONS is greater than 1) + -k OPTION Show the kernel heap memory allocation details based on above options TASH>>heapinfo @@ -379,7 +384,7 @@ PID | PPID | STACK | CURR_HEAP | PEAK_HEAP | NAME - Owner : The holder who allocate the memory ### How to Enable -Enable *CONFIG_ENABLE_HEAPINFO* to use this command on menuconfig as shown below: +Enable *CONFIG_ENABLE_HEAPINFO_CMD* to use this command on menuconfig as shown below: ``` Application Configuration -> System Libraries and Add-Ons -> [*] Kernel shell commands -> [*] heapinfo ``` @@ -387,7 +392,7 @@ Application Configuration -> System Libraries and Add-Ons -> [*] Kernel shell co #### Dependency Enable CONFIG_DEBUG_MM_HEAPINFO. ``` -Debug options -> [*] Enable Debug Output Features +Debug options -> [*] Enable Debug Output Features -> [*] Heap Info debug option ``` ### Heapinfo for User defined Group @@ -408,9 +413,9 @@ Heap Allocation Information per User defined Group **************************************************************** PEAK | HEAP_ON_PEAK | STACK_ON_PEAK | THREADS_IN_GROUP ---------------------------------------------------------------- - 4572 | 3568 | 1004 | jckim,jckim2 - 5772 | 4768 | 1004 | jckim3 - 2940 | 896 | 2044 | asdf + 4572 | 3568 | 1004 | abc,def + 5772 | 4768 | 1004 | ghi,jklmn + 2940 | 896 | 2044 | opqr ``` @@ -427,7 +432,7 @@ TASH>>irqinfo 4 | 90 | 36 | up_interrupt ``` ### How to Enable -Enable *CONFIG_ENABLE_HEAPINFO* to use this command on menuconfig as shown below: +Enable *CONFIG_ENABLE_IRQINFO_CMD* to use this command on menuconfig as shown below: ``` Application Configuration -> System Libraries and Add-Ons -> [*] Kernel shell commands -> [*] irqinfo ```
Add osxfuse
@@ -27,17 +27,17 @@ RECURSE( platform platform/python protobuf + protobuf/java protobuf/python protobuf/python/test - protobuf/java protobuf/ut snappy sqlite3 tensorboard yaml zlib - zstd06 zstd + zstd06 ) IF (OS_FREEBSD OR OS_LINUX)
stm32/modpyb: Remove unused includes and clean up comments. The documentation (including the examples) for elapsed_millis and elapsed_micros can be found in docs/library/pyb.rst so doesn't need to be written in full in the source code.
#include <stdio.h> #include "py/runtime.h" -#include "py/gc.h" -#include "py/builtin.h" #include "py/mphal.h" #include "lib/utils/pyexec.h" -#include "lib/oofatfs/ff.h" -#include "lib/oofatfs/diskio.h" #include "drivers/dht/dht.h" -#include "gccollect.h" #include "stm32_it.h" #include "irq.h" -#include "systick.h" #include "led.h" -#include "pin.h" #include "timer.h" #include "extint.h" #include "usrsw.h" @@ -71,16 +64,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_fault_debug_obj, pyb_fault_debug); #if MICROPY_PY_PYB_LEGACY -/// \function elapsed_millis(start) -/// Returns the number of milliseconds which have elapsed since `start`. -/// -/// This function takes care of counter wrap, and always returns a positive -/// number. This means it can be used to measure periods upto about 12.4 days. -/// -/// Example: -/// start = pyb.millis() -/// while pyb.elapsed_millis(start) < 1000: -/// # Perform some operation +// Returns the number of milliseconds which have elapsed since `start`. +// This function takes care of counter wrap and always returns a positive number. STATIC mp_obj_t pyb_elapsed_millis(mp_obj_t start) { uint32_t startMillis = mp_obj_get_int(start); uint32_t currMillis = mp_hal_ticks_ms(); @@ -88,16 +73,8 @@ STATIC mp_obj_t pyb_elapsed_millis(mp_obj_t start) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis); -/// \function elapsed_micros(start) -/// Returns the number of microseconds which have elapsed since `start`. -/// -/// This function takes care of counter wrap, and always returns a positive -/// number. This means it can be used to measure periods upto about 17.8 minutes. -/// -/// Example: -/// start = pyb.micros() -/// while pyb.elapsed_micros(start) < 1000: -/// # Perform some operation +// Returns the number of microseconds which have elapsed since `start`. +// This function takes care of counter wrap and always returns a positive number. STATIC mp_obj_t pyb_elapsed_micros(mp_obj_t start) { uint32_t startMicros = mp_obj_get_int(start); uint32_t currMicros = mp_hal_ticks_us();
consistent commit order
@@ -704,8 +704,7 @@ static bool mi_os_commitx(void* addr, size_t size, bool commit, bool conservativ #if defined(_WIN32) if (commit) { - // if the memory was already committed, the call succeeds but it is not zero'd - // *is_zero = true; + // *is_zero = true; // note: if the memory was already committed, the call succeeds but the memory is not zero'd void* p = VirtualAlloc(start, csize, MEM_COMMIT, PAGE_READWRITE); err = (p == start ? 0 : GetLastError()); } @@ -717,22 +716,27 @@ static bool mi_os_commitx(void* addr, size_t size, bool commit, bool conservativ // WebAssembly guests can't control memory protection #elif defined(MAP_FIXED) && !defined(__APPLE__) // Linux - if (!commit) { + if (commit) { + // commit: just change the protection + err = mprotect(start, csize, (PROT_READ | PROT_WRITE)); + if (err != 0) { err = errno; } + } + else { // decommit: use mmap with MAP_FIXED to discard the existing memory (and reduce rss) const int fd = mi_unix_mmap_fd(); void* p = mmap(start, csize, PROT_NONE, (MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE), fd, 0); if (p != start) { err = errno; } } - else { - // commit: just change the protection + #else + // macOSX and others. + if (commit) { + // commit: ensure we can access the area err = mprotect(start, csize, (PROT_READ | PROT_WRITE)); if (err != 0) { err = errno; } } - #else - // MacOS and others. - if (!commit) { + else { #if defined(MADV_DONTNEED) - // decommit: use MADV_DONTNEED as it decrease rss immediately (unlike MADV_FREE) + // decommit: use MADV_DONTNEED as it decreases rss immediately (unlike MADV_FREE) err = madvise(start, csize, MADV_DONTNEED); #else // decommit: just disable access @@ -740,11 +744,6 @@ static bool mi_os_commitx(void* addr, size_t size, bool commit, bool conservativ if (err != 0) { err = errno; } #endif } - else { - // commit: ensure we can access the area - err = mprotect(start, csize, (PROT_READ | PROT_WRITE)); - if (err != 0) { err = errno; } - } #endif if (err != 0) { _mi_warning_message("%s error: start: %p, csize: 0x%x, err: %i\n", commit ? "commit" : "decommit", start, csize, err);
add proc for loading an asset and connecting as history - to be used for shelf buttons
@@ -266,6 +266,9 @@ houdiniEngine_connectHistory(string $inputAttr, string $objects[], string $compo int $validObjectsCount = validateInputObjects($objects, $validObjects, $invalidObjects); + if(!`exists houdiniEngine_clearAssetInput`) + source houdiniEngineAssetInput; + if(size($invalidObjects)) { print("Error: Some selected objects are not even remotely close to meshes: " @@ -398,3 +401,17 @@ houdiniEngine_connectHistory(string $inputAttr, string $objects[], string $compo return 1; } +global proc +houdiniEngine_loadAndAddHistory(string $assetFile, string $assetName) +{ + + // assume that geo to get history is selected + // but load asset selects the newly created asset node instead + string $old_selection[] = `ls -selection -long`; + string $assetLocation = `houdiniEngine_findAsset $assetFile`; + + string $assetNode = `houdiniEngine_loadAsset $assetLocation $assetName`; + catchQuiet(`select -replace $old_selection`); + houdiniEngine_addHistory( $assetNode); + +}
Clean up some code and comments in partbounds.c. Do some minor cleanup for commit 1) remove a useless assignment (in normal builds) and 2) improve comments a little. Back-patch to v13 where the aforementioned commit went in. Author: Etsuro Fujita Discussion:
@@ -1020,8 +1020,6 @@ partition_bounds_merge(int partnatts, JoinType jointype, List **outer_parts, List **inner_parts) { - PartitionBoundInfo outer_binfo = outer_rel->boundinfo; - /* * Currently, this function is called only from try_partitionwise_join(), * so the join type should be INNER, LEFT, FULL, SEMI, or ANTI. @@ -1031,10 +1029,10 @@ partition_bounds_merge(int partnatts, jointype == JOIN_ANTI); /* The partitioning strategies should be the same. */ - Assert(outer_binfo->strategy == inner_rel->boundinfo->strategy); + Assert(outer_rel->boundinfo->strategy == inner_rel->boundinfo->strategy); *outer_parts = *inner_parts = NIL; - switch (outer_binfo->strategy) + switch (outer_rel->boundinfo->strategy) { case PARTITION_STRATEGY_HASH: @@ -1075,7 +1073,7 @@ partition_bounds_merge(int partnatts, default: elog(ERROR, "unexpected partition strategy: %d", - (int) outer_binfo->strategy); + (int) outer_rel->boundinfo->strategy); return NULL; /* keep compiler quiet */ } } @@ -1528,7 +1526,7 @@ merge_range_bounds(int partnatts, FmgrInfo *partsupfuncs, &next_index); Assert(merged_index >= 0); - /* Get the range of the merged partition. */ + /* Get the range bounds of the merged partition. */ get_merged_range_bounds(partnatts, partsupfuncs, partcollations, jointype, &outer_lb, &outer_ub, @@ -1833,7 +1831,7 @@ merge_matching_partitions(PartitionMap *outer_map, PartitionMap *inner_map, /* * If neither of them has been merged, merge them. Otherwise, if one has - * been merged with a dummy relation on the other side (and the other + * been merged with a dummy partition on the other side (and the other * hasn't yet been merged with anything), re-merge them. Otherwise, they * can't be merged, so return -1. */
fpgasupdate: hold the FME during non-PR update Holding an exclusive lock on the FME device during non-PR updates prevents another fpgaconf from initiating, preventing the driver from re-enabling the Port prematurely with respect to the initial non-PR update.
@@ -727,6 +727,7 @@ def main(): '%s : %s', pac.pci_node.pci_address, sec_dev.devpath) try: + with pac.fme: with sec_dev as descr: stat, mesg = update_fw(descr, args, pac) except SecureUpdateError as exc:
vpp-papi: Only install enum34 for python<=3.4.
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import sys + +stdlib_enum = sys.version_info >= (3, 4) try: from setuptools import setup, find_packages except ImportError: from distutils.core import setup, find_packages -setup(name='vpp_papi', +setup( + name='vpp_papi', version='1.6.2', description='VPP Python binding', author='Ole Troan', @@ -25,9 +29,8 @@ setup(name='vpp_papi', url='https://wiki.fd.io/view/VPP/Python_API', license='Apache-2.0', test_suite='vpp_papi.tests', - # Add when we don't need to support 2.7.5 - # 'enum34;python_version<"3.4"'], - install_requires=['cffi >= 1.6', 'enum34'], + install_requires=['cffi >= 1.6'] if stdlib_enum else + ['cffi >= 1.6', 'enum34'], packages=find_packages(), long_description='''VPP Python language binding.''', zip_safe=True)
Add support of Cgroup Array in Python
@@ -142,6 +142,8 @@ def Table(bpf, map_id, map_fd, keytype, leaftype, **kwargs): t = LruHash(bpf, map_id, map_fd, keytype, leaftype) elif ttype == BPF_MAP_TYPE_LRU_PERCPU_HASH: t = LruPerCpuHash(bpf, map_id, map_fd, keytype, leaftype) + elif ttype == BPF_MAP_TYPE_CGROUP_ARRAY: + t = CgroupArray(bpf, map_id, map_fd, keytype, leaftype) if t == None: raise Exception("Unknown table type %d" % ttype) return t @@ -199,8 +201,7 @@ class TableBase(MutableMapping): return leaf def __setitem__(self, key, leaf): - res = lib.bpf_update_elem(self.map_fd, ct.byref(key), ct.byref(leaf), - 0) + res = lib.bpf_update_elem(self.map_fd, ct.byref(key), ct.byref(leaf), 0) if res < 0: errstr = os.strerror(ct.get_errno()) raise Exception("Could not update table: %s" % errstr) @@ -477,6 +478,40 @@ class ProgArray(ArrayBase): leaf = self.Leaf(leaf.fd) super(ProgArray, self).__setitem__(key, leaf) +class FileDesc: + def __init__(self, fd): + if (fd is None) or (fd < 0): + raise Exception("Invalid file descriptor") + self.fd = fd + + def clean_up(self): + if (self.fd is not None) and (self.fd >= 0): + os.close(self.fd) + self.fd = None + + def __del__(self): + self.clean_up() + + def __enter__(self, *args, **kwargs): + return self + + def __exit__(self, *args, **kwargs): + self.clean_up() + +class CgroupArray(ArrayBase): + def __init__(self, *args, **kwargs): + super(CgroupArray, self).__init__(*args, **kwargs) + + def __setitem__(self, key, leaf): + if isinstance(leaf, int): + super(CgroupArray, self).__setitem__(key, self.Leaf(leaf)) + elif isinstance(leaf, str): + # TODO: Add os.O_CLOEXEC once we move to Python version >3.3 + with FileDesc(os.open(leaf, os.O_RDONLY)) as f: + super(CgroupArray, self).__setitem__(key, self.Leaf(f.fd)) + else: + raise Exception("Cgroup array key must be either FD or cgroup path") + class PerfEventArray(ArrayBase): def __init__(self, *args, **kwargs):
remove unused network
@@ -7,12 +7,6 @@ x-scope-common: &scope-common working_dir: /opt/appscope privileged: true -networks: - fluentbit-net: - -volumes: - test_output: - services: # These tests run on all platforms; x86_64 and aarch64
Add support for TS011F_TZ3000_amdymr7l
{ "schema": "devcap1.schema.json", - "manufacturername": "_TZ3000_g5xawfcq", - "modelid": "TS0121", + "manufacturername": ["_TZ3000_g5xawfcq", "_TZ3000_amdymr7l"], + "modelid": ["TS0121", "TS011F"], "product": "BW-SHP13", "vendor": "Blitzwolf", "sleeper": false,
Remove pedantic arg
@@ -10,7 +10,7 @@ inc = include_directories('include') ent_sources = ['ent.c'] libent_dep = declare_dependency(sources : ent_sources, - compile_args : ['-Wall', '-pedantic'], + compile_args : ['-Wall'], include_directories : inc) libent = both_libraries('ent',
shareProfile: add missing lodash import
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'; +import _ from 'lodash'; import { Box, Row, Text, BaseImage } from '@tlon/indigo-react'; import { uxToHex } from '~/logic/lib/util'; import { Sigil } from '~/logic/lib/sigil';
Updater: disable installer mode
@@ -66,7 +66,7 @@ HRESULT CALLBACK FinalTaskDialogCallbackProc( break; info.lpFile = PhGetStringOrEmpty(context->SetupFilePath); - info.lpParameters = L"-update"; + //info.lpParameters = L"-update"; info.lpVerb = PhGetOwnTokenAttributes().Elevated ? NULL : L"runas"; info.nShow = SW_SHOW; info.hwnd = hwndDlg;
feat(underglow): Debounce state settings save
@@ -227,6 +227,14 @@ static void zmk_rgb_underglow_tick_handler(struct k_timer *timer) { K_TIMER_DEFINE(underglow_tick, zmk_rgb_underglow_tick_handler, NULL); +#if IS_ENABLED(CONFIG_SETTINGS) +static void zmk_rgb_underglow_save_state_work() { + settings_save_one("rgb/underglow/state", &state, sizeof(state)); +} + +static struct k_delayed_work underglow_save_work; +#endif + static int zmk_rgb_underglow_init(struct device *_arg) { led_strip = device_get_binding(STRIP_LABEL); if (led_strip) { @@ -248,6 +256,7 @@ static int zmk_rgb_underglow_init(struct device *_arg) { #if IS_ENABLED(CONFIG_SETTINGS) settings_register(&rgb_conf); + k_delayed_work_init(&underglow_save_work, zmk_rgb_underglow_save_state_work); #endif k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50)); @@ -257,7 +266,8 @@ static int zmk_rgb_underglow_init(struct device *_arg) { int zmk_rgb_underglow_save_state() { #if IS_ENABLED(CONFIG_SETTINGS) - return settings_save_one("rgb/underglow/state", &state, sizeof(state)); + k_delayed_work_cancel(&underglow_save_work); + return k_delayed_work_submit(&underglow_save_work, K_MINUTES(1)); #else return 0; #endif
include: netutils: pppd.h: update license to Apache Brennan Ashton has signed the ICLA. As a result we can migrate the license to Apache.
/**************************************************************************** * apps/include/netutils/pppd.h * - * Copyright (C) 2015 Brennan Ashton. All rights reserved. - * Author: Brennan Ashton <[email protected]> + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ****************************************************************************/ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* Configuration ************************************************************/ + /* Required configuration settings: * * CONFIG_NETUTILS_PPPD_PAP - PPPD PAP authentication support
arm: fix fmadd parameter order
@@ -83,9 +83,9 @@ static inline float32x4_t glmm_fmadd(float32x4_t a, float32x4_t b, float32x4_t c) { #if defined(__aarch64__) - return vfmaq_f32(a, b, c); + return vfmaq_f32(c, a, b); #else - return vmlaq_f32(a, b, c); + return vmlaq_f32(c, a, b); #endif } @@ -93,9 +93,9 @@ static inline float32x4_t glmm_fnmadd(float32x4_t a, float32x4_t b, float32x4_t c) { #if defined(__aarch64__) - return vfmsq_f32(a, b, c); + return vfmsq_f32(c, a, b); #else - return vmlsq_f32(a, b, c); + return vmlsq_f32(c, a, b); #endif }
Solr updated to 6.6.4
<configuration> <!-- Version of Solr should be retrieved from a property file as well as the SHA1 --> - <url>http://archive.apache.org/dist/lucene/solr/6.6.2/solr-6.6.2.tgz</url> - <sha1>e4a772a7770010f85bfce26a39520584a85d5c3f</sha1> + <url>http://archive.apache.org/dist/lucene/solr/6.6.4/solr-6.6.4.tgz</url> + <sha1>8a7c9571fe5b8a2779c85f43b4bb2316a2ec2afe</sha1> <unpack>true</unpack> </configuration> </execution>
fix(draw_sw): fix image cache to access the freed stack space
@@ -112,7 +112,6 @@ void lv_draw_sw_layer_blend(struct _lv_draw_ctx_t * draw_ctx, struct _lv_draw_la img.header.w = lv_area_get_width(draw_ctx->buf_area); img.header.h = lv_area_get_height(draw_ctx->buf_area); img.header.cf = draw_ctx->render_with_alpha ? LV_IMG_CF_TRUE_COLOR_ALPHA : LV_IMG_CF_TRUE_COLOR; - lv_img_cache_invalidate_src(&img); /*Restore the original draw_ctx*/ draw_ctx->buf = layer_ctx->original.buf; @@ -123,6 +122,7 @@ void lv_draw_sw_layer_blend(struct _lv_draw_ctx_t * draw_ctx, struct _lv_draw_la /*Blend the layer*/ lv_draw_img(draw_ctx, draw_dsc, &layer_ctx->area_act, &img); lv_draw_wait_for_finish(draw_ctx); + lv_img_cache_invalidate_src(&img); } void lv_draw_sw_layer_destroy(lv_draw_ctx_t * draw_ctx, lv_draw_layer_ctx_t * layer_ctx)
gadgets/collect/process: Add missing Close() calls The documentation on NewCollectionWithOptions() states that "Omitting Collection.Close() during application shutdown is an error.", this commit fixes that by adding this missing line. Even if AttachIter() doesn't state we should call Close() on the returned link, it's a good practice.
@@ -60,6 +60,7 @@ func RunCollector(enricher gadgets.DataEnricher, mntnsmap *ebpf.Map) ([]processc if err != nil { return nil, fmt.Errorf("failed to create BPF collection: %w", err) } + defer coll.Close() dumpTask, ok := coll.Programs[BPFIterName] if !ok { @@ -71,6 +72,7 @@ func RunCollector(enricher gadgets.DataEnricher, mntnsmap *ebpf.Map) ([]processc if err != nil { return nil, fmt.Errorf("failed to attach BPF iterator: %w", err) } + defer dumpTaskIter.Close() file, err := dumpTaskIter.Open() if err != nil {
Fix crash in usbmon
@@ -706,7 +706,7 @@ void *pcap_thread_fn(void *_driver) { survive_dump_buffer(ctx, pktData, usbp->data_len); } - if (usbp->event_type == 'C' && usbp->transfer_type == 2) { + if (usbp->event_type == 'C' && usbp->transfer_type == 2 && dev->so) { survive_usb_feature_read(dev->so, pktData, usbp->data_len); }
apps/examples/kernel_sample_main.c : Add check memory usage after workqueue test There is missing memory usage checking after running workqueue test.
@@ -467,6 +467,7 @@ static int user_main(int argc, char *argv[]) #ifdef CONFIG_SCHED_WORKQUEUE printf("\nuser_main: workqueue() test\n"); workqueue_test(); + check_test_memory_usage(); #endif #ifndef CONFIG_DISABLE_PTHREAD
Tests: skip "close failed" alert in test_proxy_parallel test.
@@ -196,6 +196,8 @@ Content-Length: 10 self.assertEqual(resp['body'], payload, 'body') def test_proxy_parallel(self): + self.skip_alerts.append(r'close\(\d+\) failed') + payload = 'X' * 4096 * 257 buff_size = 4096 * 258
Make all calss to WNCNetworkInformation inside try/catch block. Fixes
@@ -133,8 +133,8 @@ static NSLock* _allReachabilityOperationsLock; } + (void)_checkGlobalReachability { - WNCConnectionProfile* internetConnectionProfile = [WNCNetworkInformation getInternetConnectionProfile]; @try { + WNCConnectionProfile* internetConnectionProfile = [WNCNetworkInformation getInternetConnectionProfile]; if (internetConnectionProfile && [internetConnectionProfile getNetworkConnectivityLevel] == WNCNetworkConnectivityLevelInternetAccess) { SCNetworkReachabilityFlags newFlags = kSCNetworkReachabilityFlagsReachable;
Fix error reporting in external entity test handler
@@ -1180,7 +1180,7 @@ external_entity_loader(XML_Parser parser, strlen(test_data->parse_text), XML_TRUE) == XML_STATUS_ERROR) { - xml_failure(parser); + xml_failure(extparser); return XML_STATUS_ERROR; } XML_ParserFree(extparser);
dshot: tweak timing
// Tim_1 is running at 84mhz with APB2 clock currently configured at 42MHZ // clock cycles per bit for a bit timing period of 1.67us #define DSHOT_BIT_TIME ((PWM_CLOCK_FREQ_HZ / 1000 / profile.motor.dshot_time) - 1) -#define DSHOT_T0H_TIME (DSHOT_BIT_TIME * 0.30 + 0.05) -#define DSHOT_T1H_TIME (DSHOT_BIT_TIME * 0.60 + 0.05) +#define DSHOT_T0H_TIME (DSHOT_BIT_TIME * 0.35 + 0.05) +#define DSHOT_T1H_TIME (DSHOT_BIT_TIME * 0.70 + 0.05) #define DSHOT_CMD_BEEP1 1 #define DSHOT_CMD_BEEP2 2
fix typo in swayidle(1)
@@ -49,7 +49,7 @@ swayidle \ ``` This will lock your screen after 300 seconds of inactivity, then turn off your -displays after another 600 seconds, and turn your screens back on when resumed. +displays after another 300 seconds, and turn your screens back on when resumed. It will also lock your screen before your computer goes to sleep. # AUTHORS
Import: Improve style of code blocks
@@ -54,30 +54,32 @@ kdb export system/backup > backup.ecf `backup.ecf` contains all the information about the keys below `system/backup`: ```sh -$ cat backup.ecf -kdbOpen 1 -ksNew 3 -keyNew 19 0 -system/backup/key1 -keyMeta 7 1 -binary -keyEnd -keyNew 19 0 -system/backup/key2 -keyMeta 7 1 -binary -keyEnd -keyNew 19 0 -system/backup/key3 -keyMeta 7 1 -binary -keyEnd -ksEnd +cat backup.ecf +#> kdbOpen 1 +#> ksNew 3 +#> keyNew 19 0 +#> system/backup/key1 +#> keyMeta 7 1 +#> binary +#> keyEnd +#> keyNew 19 0 +#> system/backup/key2 +#> keyMeta 7 1 +#> binary +#> keyEnd +#> keyNew 19 0 +#> system/backup/key3 +#> keyMeta 7 1 +#> binary +#> keyEnd +#> ksEnd ``` Before the import command, `system/backup` does not exists and no keys are contained there. After the import command, running the command `kdb ls system/backup` prints: +``` system/backup/key1 system/backup/key2 system/backup/key3 +```
common/usbc: Add missing fallthrough annotations BRANCH=none TEST=make buildall Code-Coverage: Zoss
@@ -74,11 +74,11 @@ void pe_run(int port, int evt, int en) case SM_PAUSED: if (!en) break; - /* fall through */ + __fallthrough; case SM_INIT: pe_init(port); local_state[port] = SM_RUN; - /* fall through */ + __fallthrough; case SM_RUN: if (en) run_state(port, &pe[port].ctx);
hexnumber: fix metadata see
- infos/recommends = - infos/placements = postgetstorage presetstorage - infos/status = maintained unittest nodep configurable -- infos/metadata = unit/base type +- infos/metadata = unit/base - infos/ordering = type - infos/description = converts hexadecimal values into decimal and back
out_null: accept metrics events
@@ -55,5 +55,6 @@ struct flb_output_plugin out_null_plugin = { .description = "Throws away events", .cb_init = cb_null_init, .cb_flush = cb_null_flush, + .event_type = FLB_OUTPUT_LOGS | FLB_OUTPUT_METRICS, .flags = 0, };
DDF cosmetics
"manufacturername": "$MF_LUMI", "modelid": "lumi.switch.n2aeu1", "vendor": "Xiaomi", - "product": "Aqara H1 2-gang switch (neutral wire) WS-EUK04", + "product": "Aqara H1 dual rocker switch (neutral wire) WS-EUK04", "sleeper": false, "status": "Gold", "subdevices": [ }, { "name": "attr/swversion", - "refresh.interval": 84000, + "refresh.interval": 86400, "read": { "at": "0x0006", "cl": "0x0000", "name": "state/alert" }, { - "name": "state/on" + "name": "state/on", + "refresh.interval": 86400 }, { "name": "state/reachable" }, { "name": "attr/swversion", - "refresh.interval": 84000, + "refresh.interval": 86400, "read": { "at": "0x0006", "cl": "0x0000", "name": "state/alert" }, { - "name": "state/on" + "name": "state/on", + "refresh.interval": 86400 }, { "name": "state/reachable" }, { "name": "attr/swversion", - "refresh.interval": 84000, + "refresh.interval": 86400, "read": { "at": "0x0006", "cl": "0x0000", }, { "name": "config/devicemode", - "public": false, + "refresh.interval": 86400, "read": { "at": "0x0009", "cl": "0xfcc0", "mf": "0x115f" }, "values": [ - ["compatibility", 1], ["zigbee", 2] + ["\"compatibility\"", "Default mode for Xiaomi devices"], + ["\"zigbee\"", "Closer to zigbee standard"] ], "default": "compatibility" }, { "name": "config/ledindication", + "refresh.interval": 86400, "read": { "at": "0x0203", "cl": "0xfcc0", "fn": "zcl", "mf": "0x115f" }, - "default": false + "values": [ + [true, "Device LED always on"], + [false, "Device LED off from 9pm - 9am"] + ], + "default": true }, { "name": "config/on" }, { "name": "attr/swversion", - "refresh.interval": 84000, + "refresh.interval": 86400, "read": { "at": "0x0006", "cl": "0x0000", }, { "name": "attr/swversion", - "refresh.interval": 84000, + "refresh.interval": 86400, "read": { "at": "0x0006", "cl": "0x0000",
Update: Memory.c: further improvement for control for mutual entailment support
@@ -372,7 +372,7 @@ void Memory_ProcessNewBeliefEvent(Event *event, long currentTime, double priorit } if(revision_happened) { - Memory_AddEvent(&c->belief, currentTime, priority, false, true, true, 0, false); + Memory_AddEvent(&c->belief, currentTime, priority, false, true, true, 0, temporalImplicationEvent); if(event->occurrenceTime == OCCURRENCE_ETERNAL) { Memory_printAddedEvent(&c->belief, priority, false, false, true, true, false); @@ -384,10 +384,6 @@ void Memory_ProcessNewBeliefEvent(Event *event, long currentTime, double priorit void Memory_AddEvent(Event *event, long currentTime, double priority, bool input, bool derived, bool revised, int layer, bool temporalImplicationEvent) { - if(SEMANTIC_INFERENCE_NAL_LEVEL <= 7) - { - temporalImplicationEvent = false; - } if(!revised && !input) //derivations get penalized by complexity as well, but revised ones not as they already come from an input or derivation { double complexity = Term_Complexity(&event->term);
qpacketmodem/autotest: adding useful print statement (if verbose)
@@ -116,6 +116,8 @@ void autotest_qpacketmodem_evm() // decode frame and get EVM estimate qpacketmodem_decode_soft(q, frame, payload_rx); float evm = qpacketmodem_get_demodulator_evm(q); + if (liquid_autotest_verbose) + printf(" EVM: %.3f dB, SNR: %.3f dB\n", evm, SNRdB); // destroy object qpacketmodem_destroy(q);
fix printf issue in GCC environment
@@ -155,13 +155,13 @@ _ssize_t _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes) #ifdef WITH_LWIP_TELNETD TelnetWrite('\r'); #endif - hal_uart_send(&uart_stdio, (void *)"\r", 1, 0); + hal_uart_send(&uart_stdio, (void *)"\r", 1, AOS_WAIT_FOREVER); } #ifdef WITH_LWIP_TELNETD TelnetWrite(*tmp); #endif - hal_uart_send(&uart_stdio, (void *)tmp, 1, 0); + hal_uart_send(&uart_stdio, (void *)tmp, 1, AOS_WAIT_FOREVER); tmp++; }
luax_checkendpoints; Allows drawing a sphere/capsule using 2 endpoints.
@@ -529,11 +529,28 @@ static int l_lovrPassSphere(lua_State* L) { return 0; } +static bool luax_checkendpoints(lua_State* L, int index, float transform[16]) { + float *v, *u; + VectorType t1, t2; + if ((v = luax_tovector(L, index + 0, &t1)) == NULL || t1 != V_VEC3) return false; + if ((u = luax_tovector(L, index + 1, &t2)) == NULL || t2 != V_VEC3) return false; + float radius = luax_optfloat(L, index + 2, 1.); + float orientation[4]; + float forward[4] = { 0.f, 0.f, -1.f, 0.f }; + float direction[4]; + vec3_sub(vec3_init(direction, u), v); + quat_between(orientation, forward, direction); + mat4_identity(transform); + mat4_translate(transform, (v[0] + u[0]) / 2.f, (v[1] + u[1]) / 2.f, (v[2] + u[2]) / 2.f); + mat4_rotateQuat(transform, orientation); + mat4_scale(transform, radius, radius, vec3_length(direction)); + return true; +} + static int l_lovrPassCylinder(lua_State* L) { Pass* pass = luax_checktype(L, 1, Pass); float transform[16]; - // TODO vec3+vec3 - int index = luax_readmat4(L, 2, transform, -2); + int index = luax_checkendpoints(L, 2, transform) ? 5 : luax_readmat4(L, 2, transform, -2); bool capped = lua_isnoneornil(L, index) ? true : lua_toboolean(L, index++); float angle1 = luax_optfloat(L, index++, 0.f); float angle2 = luax_optfloat(L, index++, 2.f * (float) M_PI); @@ -545,7 +562,7 @@ static int l_lovrPassCylinder(lua_State* L) { static int l_lovrPassCapsule(lua_State* L) { Pass* pass = luax_checktype(L, 1, Pass); float transform[16]; - int index = luax_readmat4(L, 2, transform, -2); + int index = luax_checkendpoints(L, 2, transform) ? 5 : luax_readmat4(L, 2, transform, -2); uint32_t segments = luax_optu32(L, index, 32); lovrPassCapsule(pass, transform, segments); return 0;
Use config helpers in example
@@ -104,16 +104,13 @@ int initialize_cache(ocf_ctx_t ctx, ocf_cache_t *cache) context.error = &ret; /* Cache configuration */ - cache_cfg.backfill.max_queue_size = 65536; - cache_cfg.backfill.queue_unblock_size = 60000; - cache_cfg.cache_line_size = ocf_cache_line_size_4; - cache_cfg.cache_mode = ocf_cache_mode_wt; + ocf_mngt_cache_config_set_default(&cache_cfg); cache_cfg.metadata_volatile = true; cache_cfg.name = "cache1"; /* Cache deivce (volume) configuration */ + ocf_mngt_cache_device_config_set_default(&device_cfg); device_cfg.volume_type = VOL_TYPE; - device_cfg.cache_line_size = ocf_cache_line_size_4; ret = ocf_uuid_set_str(&device_cfg.uuid, "cache"); if (ret) return ret; @@ -210,8 +207,9 @@ int initialize_core(ocf_cache_t cache, ocf_core_t *core) context.error = &ret; /* Core configuration */ - core_cfg.volume_type = VOL_TYPE; + ocf_mngt_core_config_set_default(&core_cfg); core_cfg.name = "core1"; + core_cfg.volume_type = VOL_TYPE; ret = ocf_uuid_set_str(&core_cfg.uuid, "core"); if (ret) return ret;
Remove unused 'now' variable in handleSensorEvent()
@@ -2537,7 +2537,6 @@ void DeRestPluginPrivate::handleSensorEvent(const Event &e) { return; } - const QDateTime now = QDateTime::currentDateTime(); // speedup sensor state check if ((e.what() == RStatePresence || e.what() == RStateButtonEvent) &&
Separate SoundData and SoundDataStrema constructors they take the same arguments so we can't overload the function parameterically. also I find it pretty confusing that lovr uses overloads so much in the api, so I really don't mind having a separate constructor :S
@@ -78,12 +78,7 @@ static int l_lovrDataNewSoundData(lua_State* L) { uint32_t sampleRate = luaL_optinteger(L, 3, 44100); SampleFormat format = luax_checkenum(L, 4, SampleFormat, "i16"); Blob* blob = luax_totype(L, 5, Blob); - SoundData* soundData; - if(blob) { - soundData = lovrSoundDataCreateRaw(frames, channels, sampleRate, format, blob); - } else { - soundData = lovrSoundDataCreateStream(frames, channels, sampleRate, format); - } + SoundData* soundData = lovrSoundDataCreateRaw(frames, channels, sampleRate, format, blob); luax_pushtype(L, SoundData, soundData); lovrRelease(SoundData, soundData); return 1; @@ -98,6 +93,17 @@ static int l_lovrDataNewSoundData(lua_State* L) { return 1; } +static int l_lovrDataNewSoundDataStream(lua_State* L) { + uint64_t frames = luaL_checkinteger(L, 1); + uint32_t channels = luaL_optinteger(L, 2, 2); + uint32_t sampleRate = luaL_optinteger(L, 3, 44100); + SampleFormat format = luax_checkenum(L, 4, SampleFormat, "i16"); + SoundData* soundData = lovrSoundDataCreateStream(frames, channels, sampleRate, format); + luax_pushtype(L, SoundData, soundData); + lovrRelease(SoundData, soundData); + return 1; +} + static int l_lovrDataNewTextureData(lua_State* L) { TextureData* textureData = NULL; if (lua_type(L, 1) == LUA_TNUMBER) { @@ -128,6 +134,7 @@ static const luaL_Reg lovrData[] = { { "newModelData", l_lovrDataNewModelData }, { "newRasterizer", l_lovrDataNewRasterizer }, { "newSoundData", l_lovrDataNewSoundData }, + { "newSoundDataStream", l_lovrDataNewSoundDataStream }, { "newTextureData", l_lovrDataNewTextureData }, { NULL, NULL } };
Reformat AES changes for readability
@@ -550,15 +550,14 @@ int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key, } #endif + ctx->rk_offset = 0; #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_PADLOCK_ALIGN16) if( aes_padlock_ace == -1 ) aes_padlock_ace = mbedtls_padlock_has_support( MBEDTLS_PADLOCK_ACE ); if( aes_padlock_ace ) ctx->rk_offset = MBEDTLS_PADLOCK_ALIGN16( ctx->buf ) - ctx->buf; - else #endif - ctx->rk_offset = 0; RK = ctx->buf + ctx->rk_offset; #if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64) @@ -655,15 +654,14 @@ int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key, mbedtls_aes_init( &cty ); + ctx->rk_offset = 0; #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_PADLOCK_ALIGN16) if( aes_padlock_ace == -1 ) aes_padlock_ace = mbedtls_padlock_has_support( MBEDTLS_PADLOCK_ACE ); if( aes_padlock_ace ) ctx->rk_offset = MBEDTLS_PADLOCK_ALIGN16( ctx->buf ) - ctx->buf; - else #endif - ctx->rk_offset = 0; RK = ctx->buf + ctx->rk_offset; /* Also checks keybits */
YAML CPP: Add boolean config for `type` plugin
@@ -40,7 +40,8 @@ KeySet * contractYamlCpp (void) keyNew ("system/elektra/modules/yamlcpp/exports/set", KEY_FUNC, elektraYamlcppSet, KEY_END), #include ELEKTRA_README keyNew ("system/elektra/modules/yamlcpp/infos/version", KEY_VALUE, PLUGINVERSION, KEY_END), - keyNew ("system/elektra/modules/yamlcpp/config/needs/binary/meta", KEY_VALUE, "true", KEY_END), KS_END); + keyNew ("system/elektra/modules/yamlcpp/config/needs/binary/meta", KEY_VALUE, "true", KEY_END), + keyNew ("system/elektra/modules/yamlcpp/config/needs/boolean/restore", KEY_VALUE, "#1", KEY_END), KS_END); } }
Fix PHP example.
@@ -7,7 +7,7 @@ include("tinyspline.php"); $spline = new BSpline(7); // Setup control points. -$ctrlp = $spline->ctrlp; +$ctrlp = $spline->controlPoints; $ctrlp[0] = -1.75; // x0 $ctrlp[1] = -1.0; // y0 $ctrlp[2] = -1.5; // x1 @@ -22,16 +22,16 @@ $ctrlp[10] = 0.0; // x5 $ctrlp[11] = 0.5; // y5 $ctrlp[12] = 0.5; // x6 $ctrlp[13] = 0.0; // y6 -$spline->ctrlp = $ctrlp; +$spline->controlPoints = $ctrlp; // Evaluate `spline` at u = 0.4. -$result = $spline->evaluate(0.4)->result; +$result = $spline->eval(0.4)->result; echo "x = $result[0], y = $result[1]\n"; // Derive `spline` and subdivide it into a sequence of Bezier curves. $beziers = $spline->derive()->toBeziers(); // Evaluate `beziers` at u = 0.3. -$result = $beziers->evaluate(0.3)->result; +$result = $beziers->eval(0.3)->result; echo "x = $result[0], y = $result[1]\n"; ?>
esp_http_server: Update LRU counter on accepting a new connection Closes
@@ -67,6 +67,8 @@ static esp_err_t httpd_accept_conn(struct httpd_data *hd, int listen_fd) close(new_fd); return ESP_FAIL; } + httpd_sess_update_lru_counter(hd->hd_sd->handle, new_fd); + ESP_LOGD(TAG, LOG_FMT("complete")); return ESP_OK; }
stm32/powerctrl: Disable IRQs during stop mode to allow reconfig on wake
@@ -260,6 +260,10 @@ set_clk: #endif void powerctrl_enter_stop_mode(void) { + // Disable IRQs so that the IRQ that wakes the device from stop mode is not + // executed until after the clocks are reconfigured + uint32_t irq_state = disable_irq(); + #if defined(STM32L4) // Configure the MSI as the clock source after waking up __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI); @@ -331,6 +335,9 @@ void powerctrl_enter_stop_mode(void) { #endif #endif + + // Enable IRQs now that all clocks are reconfigured + enable_irq(irq_state); } #if !defined(STM32L4)
Benchmarks: opmphm: activate all keysets
@@ -25,7 +25,7 @@ void printStderrExit (const char * msg); void showShape (void); // generate KeySets KeySetShape * getKeySetShapes (void); -const size_t numberOfShapes = 336; +const size_t numberOfShapes = 660; // config const size_t keySetsPerShape = 1; const size_t minN = 1000; @@ -725,12 +725,11 @@ KeySetShape * getKeySetShapes (void) if (!out) printStderrExit ("malloc KeySetShapes"); const unsigned int wordLength[4] = { 1, 5, 20, 50 }; const unsigned int special[2] = { 5, 10 }; - //~ const unsigned int parent[5] = { 0, 1, 5, 15, 30 }; - const unsigned int parent[4] = { 0, 1, 5, 15 }; - const KsShapeFunction shapeFunctions[7] = - { shapefConstBinary5, shapefConstBinary10, shapefConstBinary20, shapefBinaryRand, - shapefConstBranch2, shapefConstBranch3, shapefConstBranch5 /*, shapefDynamicBranch5, shapefDynamicBranch10, - shapefDynamicBranch15, shapefDynamicBranch20 */ }; + const unsigned int parent[5] = { 0, 1, 5, 15, 30 }; + const KsShapeFunction shapeFunctions[11] = { shapefConstBinary5, shapefConstBinary10, shapefConstBinary20, + shapefBinaryRand, shapefConstBranch2, shapefConstBranch3, + shapefConstBranch5, shapefDynamicBranch5, shapefDynamicBranch10, + shapefDynamicBranch15, shapefDynamicBranch20 }; // numberOfShapes = 6 * 2 * 5 * shapefCount size_t shapeCount = 0; for (int w0 = 0; w0 < 4; ++w0) @@ -739,9 +738,9 @@ KeySetShape * getKeySetShapes (void) { for (int s = 0; s < 2; ++s) { - for (int p = 0; p < 4; ++p) + for (int p = 0; p < 5; ++p) { - for (int sf = 0; sf < 7; ++sf) + for (int sf = 0; sf < 11; ++sf) { out[shapeCount].minWordLength = wordLength[w0]; out[shapeCount].maxWordLength = wordLength[w1];
checks if call is available before calling call, closes
@@ -88,6 +88,8 @@ static void call_window_update_vumeters(struct call_window *win) static gboolean call_timer(gpointer arg) { struct call_window *win = arg; + if (!win || !win->call) + return false; call_window_update_duration(win); return G_SOURCE_CONTINUE; } @@ -96,6 +98,8 @@ static gboolean call_timer(gpointer arg) static gboolean vumeter_timer(gpointer arg) { struct call_window *win = arg; + if (!win || !win->call) + return false; call_window_update_vumeters(win); return G_SOURCE_CONTINUE; } @@ -367,17 +371,17 @@ static void call_window_destructor(void *arg) mem_deref(window->attended_transfer_dial); gdk_threads_leave(); + if (window->duration_timer_tag) + g_source_remove(window->duration_timer_tag); + if (window->vumeter_timer_tag) + g_source_remove(window->vumeter_timer_tag); + mem_deref(window->call); mem_deref(window->mq); mem_deref(window->vu.enc); mem_deref(window->vu.dec); mem_deref(window->attended_call); - if (window->duration_timer_tag) - g_source_remove(window->duration_timer_tag); - if (window->vumeter_timer_tag) - g_source_remove(window->vumeter_timer_tag); - pthread_mutex_lock(&last_data_mut); last_call_win = NULL; pthread_mutex_unlock(&last_data_mut);
Clarification in parametersDefault.
@@ -319,7 +319,7 @@ outSAMfilter None outSAMmultNmax -1 - int: max number of multiple alignments for a read that will be output to the SAM/BAM files. + int: max number of multiple alignments for a read that will be output to the SAM/BAM files. Note that if this value is not equal to -1, the top scoring alignment will be output first -1 ... all alignments (up to --outFilterMultimapNmax) will be output outSAMtlen 1
BUFR: Key 'bufrHeaderSubCentre' should not be a codetable
@@ -5,7 +5,7 @@ section_length[3] section1Length ; unsigned[1] masterTableNumber :dump; -codetable[1] bufrHeaderSubCentre 'common/c-1.table' : dump; +unsigned[1] bufrHeaderSubCentre : dump; codetable[1] bufrHeaderCentre 'common/c-1.table' : dump; unsigned[1] updateSequenceNumber :dump;
Check custom multitarget eval inheritance
@@ -1704,8 +1704,14 @@ cdef class _PreprocessParams: if params_to_json.get("eval_metric") == "PythonUserDefinedPerObject": self.customMetricDescriptor = _BuildCustomMetricDescriptor(params["eval_metric"]) - if (issubclass(params["eval_metric"].__class__, MultiTargetCustomMetric)): + is_multitarget_metric = issubclass(params["eval_metric"].__class__, MultiTargetCustomMetric) + if is_multitarget_objective(params_to_json["loss_function"]): + assert is_multitarget_metric, \ + "Custom eval metric should be inherited from MultiTargetCustomMetric for multi-target objective" params_to_json["eval_metric"] = "PythonUserDefinedMultiTarget" + else: + assert not is_multitarget_metric, \ + "Custom eval metric should not be inherited from MultiTargetCustomMetric for single-target objective" if params_to_json.get("callbacks") == "PythonUserDefinedPerObject": self.customCallbackDescriptor = _BuildCustomCallbackDescritor(params["callbacks"])
[mod_fastcgi] fix NULL ptr deref from bugfix (fixes (thx rgenoud) x-ref: "SIGSEGV on file upload"
@@ -187,7 +187,7 @@ static handler_t fcgi_stdin_append(server *srv, handler_ctx *hctx) { } fcgi_header(&(header), FCGI_STDIN, request_id, weWant, 0); - hctx->wb->first->type == MEM_CHUNK /* else FILE_CHUNK for temp file */ + (chunkqueue_is_empty(hctx->wb) || hctx->wb->first->type == MEM_CHUNK) /* else FILE_CHUNK for temp file */ ? chunkqueue_append_mem(hctx->wb, (const char *)&header, sizeof(header)) : chunkqueue_append_mem_min(hctx->wb, (const char *)&header, sizeof(header)); chunkqueue_steal(hctx->wb, req_cq, weWant);
Compress byte reading macros in if statements exchange MBEDTLS_BYTE_x in if statements with MBEDTLS_GET_UINT16_BE
@@ -1848,8 +1848,7 @@ read_record_header: for( j = 0, p = buf + ciph_offset + 2; j < ciph_len; j += 2, p += 2 ) for( i = 0; ciphersuites[i] != 0; i++ ) { - if( p[0] != MBEDTLS_BYTE_1( ciphersuites[i] ) || - p[1] != MBEDTLS_BYTE_0( ciphersuites[i] )) + if( MBEDTLS_GET_UINT16_BE(p, 0) != ciphersuites[i] ) continue; got_common_suite = 1; @@ -1865,8 +1864,7 @@ read_record_header: for( i = 0; ciphersuites[i] != 0; i++ ) for( j = 0, p = buf + ciph_offset + 2; j < ciph_len; j += 2, p += 2 ) { - if( p[0] != MBEDTLS_BYTE_1( ciphersuites[i] ) || - p[1] != MBEDTLS_BYTE_0( ciphersuites[i] )) + if( MBEDTLS_GET_UINT16_BE(p, 0) != ciphersuites[i] ) continue; got_common_suite = 1;
crypto: openssl - IV len not passed by caller. Callee knows from algo type
@@ -118,10 +118,10 @@ openssl_ops_enc_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops, int len; if (op->flags & VNET_CRYPTO_OP_FLAG_INIT_IV) - RAND_bytes (op->iv, op->iv_len); + RAND_bytes (op->iv, 8); EVP_EncryptInit_ex (ctx, cipher, 0, 0, 0); - EVP_CIPHER_CTX_ctrl (ctx, EVP_CTRL_GCM_SET_IVLEN, op->iv_len, NULL); + EVP_CIPHER_CTX_ctrl (ctx, EVP_CTRL_GCM_SET_IVLEN, 8, NULL); EVP_EncryptInit_ex (ctx, 0, 0, op->key, op->iv); if (op->aad_len) EVP_EncryptUpdate (ctx, NULL, &len, op->aad, op->aad_len);
tweak box projection warm start for stability
@@ -673,12 +673,13 @@ static scs_float proj_box_cone(scs_float *tx, const scs_float *bl, } t = MAX(t - gt / MAX(ht, 1e-8), 0.); /* newton step */ #if VERBOSITY > 3 - scs_printf("t_new %4f, t_prev %4f, gt %4f, ht %4f\n", t, t_prev, gt, ht); + scs_printf("t warm start: %1.3e, t[0]: %1.3e\n", t_warm_start, tx[0]); + scs_printf("t_new %1.3e, t_prev %1.3e, gt %1.3e, ht %1.3e\n", t, t_prev, gt, ht); scs_printf("ABS(gt / (ht + 1e-6)) %.4e, ABS(t - t_prev) %.4e\n", ABS(gt / (ht + 1e-6)), ABS(t - t_prev)); #endif if (ABS(gt / MAX(ht, 1e-6)) < 1e-12 * MAX(t, 1.) || - ABS(t - t_prev) < 1e-10 * MAX(t, 1.)) { + ABS(t - t_prev) < 1e-11 * MAX(t, 1.)) { break; } } @@ -899,7 +900,7 @@ ScsConeWork *SCS(init_cone)(const ScsCone *k, const ScsScaling *scal, scs_int co c->cone_len = cone_len; c->s = (scs_float *)scs_calloc(cone_len, sizeof(scs_float)); if (k->bsize && k->bu && k->bl) { - c->box_t_warm_start = 0.; + c->box_t_warm_start = 1.; if (scal) { c->bu = (scs_float *)scs_calloc(k->bsize - 1, sizeof(scs_float)); c->bl = (scs_float *)scs_calloc(k->bsize - 1, sizeof(scs_float));
Fix build on Raspbian Stretch Issues
@@ -8,11 +8,9 @@ DEFINES += DECONZ_DLLSPEC=Q_DECL_IMPORT unix:contains(QMAKE_HOST.arch, armv6l) { DEFINES += ARCH_ARM ARCH_ARMV6 - INCLUDEPATH += /usr/include } unix:contains(QMAKE_HOST.arch, armv7l) { DEFINES += ARCH_ARM ARCH_ARMV7 - INCLUDEPATH += /usr/include } QMAKE_CXXFLAGS += -Wno-attributes \
added check for when no var has been selected
@@ -1689,10 +1689,20 @@ QvisSelectionsWindow::deleteSelection() void QvisSelectionsWindow::updateQuery() { + if( selectionProps.GetHistogramType() == + SelectionProperties::HistogramVariable && + selectionProps.GetHistogramVariable().empty() ) + { + Warning(tr("No histogram variable has been selected for the display axis.")); + } // Force an update of the selection but do not update the plots that use it. + else + { bool updatePlots = false; + Apply(true, updatePlots, DONT_ALLOW_CACHING); } +} // **************************************************************************** // Method: QvisSelectionsWindow::updateSelection @@ -1712,9 +1722,18 @@ QvisSelectionsWindow::updateQuery() void QvisSelectionsWindow::updateSelection() { + if( selectionProps.GetHistogramType() == + SelectionProperties::HistogramVariable && + selectionProps.GetHistogramVariable().empty() ) + { + Warning(tr("No histogram variable has been selected for the display axis.")); + } // Force an update of the selection and update the plots that use it. + else + { Apply(true, DEFAULT_UPDATE_PLOTS, ALLOW_CACHING); } +} // **************************************************************************** // Method: QvisSelectionsWindow::loadSelection
TravisCI: simplify printing installed files
@@ -47,14 +47,14 @@ elif [[ ${MODE} = cmake ]]; then cmake . make all test make DESTDIR="${PWD}"/ROOT install - ( cd ROOT/ && find | sort ) + find ROOT -printf "%P\n" | sort elif [[ ${MODE} = cmake-oos ]]; then mkdir build cd build cmake .. make all test make DESTDIR="${PWD}"/ROOT install - ( cd ROOT/ && find | sort ) + find ROOT -printf "%P\n" | sort else ./qa.sh "${MODE}" fi
Fix error handling in ts_internal_bspline_new.
@@ -340,6 +340,9 @@ void ts_internal_bspline_new(size_t n_ctrlp, size_t dim, size_t deg, const size_t sof_knots = n_knots + sof_real; const size_t sof_spline = sof_impl + sof_ctrlp + sof_knots; + tsError e; + jmp_buf b; + if (dim < 1) longjmp(buf, TS_DIM_ZERO); if (deg >= n_ctrlp) @@ -353,8 +356,14 @@ void ts_internal_bspline_new(size_t n_ctrlp, size_t dim, size_t deg, _spline_->pImpl->dim = dim; _spline_->pImpl->n_ctrlp = n_ctrlp; _spline_->pImpl->n_knots = n_knots; + + TRY(b, e) ts_internal_bspline_fill_knots( - *_spline_, type, 0.f, 1.f, _spline_, buf); + *_spline_, type, 0.f, 1.f, _spline_, b); + CATCH + ts_bspline_free(_spline_); + longjmp(buf, e); + ETRY } tsError ts_bspline_new(size_t n_ctrlp, size_t dim, size_t deg,
make/import: copy the exported buildin registers copy the exported buildin registers to avoid symbols dropping on import build
@@ -95,6 +95,7 @@ fi WD=${PWD} IMPORTDIR=${WD}/import +BUILTINDIR=${WD}/builtin DARCHDIR=${IMPORTDIR}/arch DINCDIR=${IMPORTDIR}/include DLIBDIR=${IMPORTDIR}/libs @@ -144,6 +145,7 @@ SLIBDIR=${EXPORTDIR}/libs SSCRIPTSDIR=${EXPORTDIR}/scripts SSTARTDIR=${EXPORTDIR}/startup STOOLSDIR=${EXPORTDIR}/tools +REGISTERSDIR=${EXPORTDIR}/registry unset SALLDIRS if [ -d ${SARCHDIR} ]; then @@ -170,6 +172,9 @@ fi mv ${SALLDIRS} ${IMPORTDIR}/. || \ { echo "ERROR: Failed to move ${SALLDIRS} to ${IMPORTDIR}"; exit 1; } +cp -rf ${REGISTERSDIR} ${BUILTINDIR}/. || \ + { echo "ERROR: Failed to move ${REGISTERSDIR} to ${BUILTINDIR}"; exit 1; } + # Move the .config file in place in the import directory SFILES=".config"
Added newline for better readability.
@@ -772,6 +772,7 @@ log_fcb_copy_entry(struct log *log, struct fcb_entry *entry, struct fcb *fcb_tmp; rc = log_fcb_read(log, entry, &ueh, 0, LOG_BASE_ENTRY_HDR_SIZE); + if (rc != LOG_BASE_ENTRY_HDR_SIZE) { goto err; }
Added SceNpDrmForDriver
@@ -3511,9 +3511,29 @@ modules: sceNpSetPlatformType: 0xE807D0BC kernel: false nid: 0xECB62224 - SceNpDrmPackage: - nid: 0x78 - libraries: + SceNpDrm: + nid: 0xE7E2CE05 + libraries: + SceNpDrmForDriver: + functions: + ksceNpDrmCheckActData: 0x9265B350 + ksceNpDrmEbootSigConvert: 0xA29B75F9 + ksceNpDrmEbootSigGenMultiDisc: 0x39A7A666 + ksceNpDrmEbootSigGenPs1: 0x6D9223E1 + ksceNpDrmEbootSigGenPsp: 0x90B1A6D3 + ksceNpDrmEbootSigVerify: 0x7A319692 + ksceNpDrmGetFixedRifName: 0x5D73448C + ksceNpDrmGetLegacyDocKey: 0x4E321BDE + ksceNpDrmGetRifInfo: 0xDB406EAE + ksceNpDrmGetRifName: 0xDF62F3B8 + ksceNpDrmGetRifNameForInstall: 0x17573133 + ksceNpDrmPspEbootSigGen: 0xEF387FC4 + ksceNpDrmPspEbootVerify: 0xB6CA3A2C + ksceNpDrmRemoveActData: 0x8B85A509 + ksceNpDrmUpdateAccountId: 0x116FC0D6 + ksceNpDrmUpdateDebugSettings: 0xA91C7443 + kernel: true + nid: 0xD84DC44A SceNpDrmPackage: functions: _sceNpDrmPackageCheck: 0xA1D885FA
perf-tools/extrae: ignore post build checks
@@ -35,6 +35,7 @@ BuildRequires: binutils-devel BuildRequires: libxml2-devel BuildRequires: papi%{PROJ_DELIM} Requires: papi%{PROJ_DELIM} +#!BuildIgnore: post-build-checks # Default library install path %define install_path %{OHPC_LIBS}/%{compiler_family}/%{mpi_family}/%{pname}/%version
edit type conversion
@@ -57,7 +57,8 @@ namespace NKernel { while (i < docCount) { const ui64 highBits = ((ui64)qids[i]) << 32; - const ui64 lowBits = reinterpret_cast<ui32>(NextUniformF(&s)); + const int lowBits32 = reinterpret_cast<int>(NextUniformF(&s)); + const ui64 lowBits = lowBits32; keys[i] = lowBits | highBits; i += gridDim.x * blockDim.x; }
Doc: Add how to configure network MTU size
@@ -144,3 +144,23 @@ It is important to note that your Ethernet controller driver of your MCU needs to support CONFIG_ARCH_PHY_INTERRUPT (and implement ``arch_phy_irq()``). +How to define the MTU and MSS for the network packets? +------------------------------------------------------ + +As you probably know the "MSS = MTU - 40", so you just need to setup the MTU. +If you search for MTU in the menuconfig you will not find it, but you can +setup the MTU using the ``CONFIG_NET_ETH_PKTSIZE`` here:: + + Networking Support ---> + Driver buffer configuration ---> + (590) Ethernet packet buffer size + +Then just figure it out using this formula: + + MTU = NET_ETH_PKTSIZE - 14 + + MSS = MTU - 40 + +In this case you have MTU = 590 - 14 => MTU = 576! + +And the MSS = 576 - 40 => MSS = 536.
esp_eth: deprecate esp_eth_receive Ethernet driver is interrupt driven only, don't support polling mode. So deprecate esp_eth_receive API.
@@ -195,7 +195,8 @@ esp_err_t esp_eth_update_input_path( esp_err_t esp_eth_transmit(esp_eth_handle_t hdl, void *buf, size_t length); /** -* @brief General Receive +* @brief General Receive is deprecated and shall not be accessed from app code, +* as polling is not supported by Ethernet. * * @param[in] hdl: handle of Ethernet driver * @param[out] buf: buffer to preserve the received packet @@ -203,6 +204,9 @@ esp_err_t esp_eth_transmit(esp_eth_handle_t hdl, void *buf, size_t length); * * @note Before this function got invoked, the value of "length" should set by user, equals the size of buffer. * After the function returned, the value of "length" means the real length of received data. +* @note This API was exposed by accident, users should not use this API in their applications. +* Ethernet driver is interrupt driven, and doesn't support polling mode. +* Instead, users should register input callback with ``esp_eth_update_input_path``. * * @return * - ESP_OK: receive frame buffer successfully @@ -211,7 +215,7 @@ esp_err_t esp_eth_transmit(esp_eth_handle_t hdl, void *buf, size_t length); * in this case, value of returned "length" indicates the real size of incoming data. * - ESP_FAIL: receive frame buffer failed because some other error occurred */ -esp_err_t esp_eth_receive(esp_eth_handle_t hdl, uint8_t *buf, uint32_t *length); +esp_err_t esp_eth_receive(esp_eth_handle_t hdl, uint8_t *buf, uint32_t *length) __attribute__((deprecated("Ethernet driver is interrupt driven only, please register input callback with esp_eth_update_input_path"))); /** * @brief Misc IO function of Etherent driver
Python Plugin: Require Python bindings
@@ -3,8 +3,9 @@ include (LibAddBinding) if (DEPENDENCY_PHASE) find_package(PythonLibs 3 QUIET) find_swig() + check_binding_included ("swig_python" BINDING_WAS_ADDED SUBDIRECTORY "swig/python" SILENT) - if (PYTHONLIBS_FOUND AND SWIG_FOUND) + if (PYTHONLIBS_FOUND AND SWIG_FOUND AND BINDING_WAS_ADDED) include (LibAddMacros) add_custom_command (OUTPUT runtime.h @@ -16,6 +17,8 @@ if (DEPENDENCY_PHASE) set_source_files_properties ("python.cpp" PROPERTIES COMPILE_FLAGS "${SWIG_COMPILE_FLAGS}") elseif (NOT PYTHONLIBS_FOUND) remove_plugin (python "python 3 libs (libpython3-dev) not found") + elseif (NOT BINDING_WAS_ADDED) + remove_plugin (python "swig_python binding is required") else () remove_plugin (python "swig not found") endif ()
update python developer tutorial Update python developer tutorial for lesson disksnoop.py.
@@ -194,7 +194,7 @@ REQ_WRITE = 1 # from include/linux/blk_types.h # load BPF program b = BPF(text=""" #include <uapi/linux/ptrace.h> -#include <linux/blkdev.h> +#include <linux/blk-mq.h> BPF_HASH(start, struct request *); @@ -217,9 +217,12 @@ void trace_completion(struct pt_regs *ctx, struct request *req) { } } """) - +if BPF.get_kprobe_functions(b'blk_start_request'): b.attach_kprobe(event="blk_start_request", fn_name="trace_start") b.attach_kprobe(event="blk_mq_start_request", fn_name="trace_start") +if BPF.get_kprobe_functions(b'__blk_account_io_done'): + b.attach_kprobe(event="__blk_account_io_done", fn_name="trace_completion") +else: b.attach_kprobe(event="blk_account_io_done", fn_name="trace_completion") [...] ```
fix assertion bug for pxfprotocol test
@@ -107,6 +107,7 @@ test_pxfprotocol_import_first_call(void **state) /* set mock behavior for uri parsing */ GPHDUri* gphd_uri = palloc0(sizeof(GPHDUri)); + gphd_uri->fragments = palloc(sizeof(List)); expect_string(parseGPHDUri, uri_str, uri_param_segwork); will_return(parseGPHDUri, gphd_uri);
conf: parser: add syslog parser
Time_Key time Time_Format %Y-%m-%dT%H:%M:%S Time_Keep On + +[PARSER] + Name syslog + Format regex + Regex ^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$ + Time_Key time + Time_Format %b %d %H:%M:%S
Java: fixing Spring applications start. This closes issue on GitHub.
@@ -1517,7 +1517,7 @@ public class Context implements ServletContext, InitParams || ci.isAnnotation() || ci.isAbstract()) { - return; + continue; } trace("loadInitializer: handles class: " + ci.getName());
sysdeps/managarm: convert sys_waitpid to helix_ng
@@ -59,38 +59,27 @@ int sys_waitpid(pid_t pid, int *status, int flags, struct rusage *ru, pid_t *ret } SignalGuard sguard; - HelAction actions[3]; - globalQueue.trim(); managarm::posix::CntRequest<MemoryAllocator> req(getSysdepsAllocator()); req.set_request_type(managarm::posix::CntReqType::WAIT); req.set_pid(pid); req.set_flags(flags); - frg::string<MemoryAllocator> ser(getSysdepsAllocator()); - req.SerializeToString(&ser); - actions[0].type = kHelActionOffer; - actions[0].flags = kHelItemAncillary; - actions[1].type = kHelActionSendFromBuffer; - actions[1].flags = kHelItemChain; - actions[1].buffer = ser.data(); - actions[1].length = ser.size(); - actions[2].type = kHelActionRecvInline; - actions[2].flags = 0; - HEL_CHECK(helSubmitAsync(getPosixLane(), actions, 3, - globalQueue.getQueue(), 0, 0)); - - auto element = globalQueue.dequeueSingle(); - auto offer = parseHandle(element); - auto send_req = parseSimple(element); - auto recv_resp = parseInline(element); + auto [offer, send_head, recv_resp] = + exchangeMsgsSync( + getPosixLane(), + helix_ng::offer( + helix_ng::sendBragiHeadOnly(req, getSysdepsAllocator()), + helix_ng::recvInline() + ) + ); - HEL_CHECK(offer->error); - HEL_CHECK(send_req->error); - HEL_CHECK(recv_resp->error); + HEL_CHECK(offer.error()); + HEL_CHECK(send_head.error()); + HEL_CHECK(recv_resp.error()); managarm::posix::SvrResponse<MemoryAllocator> resp(getSysdepsAllocator()); - resp.ParseFromArray(recv_resp->data, recv_resp->length); + resp.ParseFromArray(recv_resp.data(), recv_resp.length()); if(resp.error() == managarm::posix::Errors::ILLEGAL_ARGUMENTS) { return EINVAL; }
rm unused variable;
@@ -424,7 +424,6 @@ static void fakeRenderTo(headsetRenderCallback callback, void* userdata) { glfwGetWindowSize(window, &w, &h); - float transform[16]; mat4_perspective(state.projection, state.clipNear, state.clipFar, 67 * M_PI / 180.0, (float)w/h); // render
update watch to github from example
-# This package is maintained in the same repository by the same people as -# upstream. Not sure if this is the smartest approach in general, but -# this makes watch obsolete +version=4 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/oidc-agent-$1\.tar\.gz/ \ + https://github.com/indigo-dc/oidc-agent/tags .*/v?(\d\S+)\.tar\.gz
OcAppleDiskImageLib: Remove incorrect FreePool() call.
@@ -252,7 +252,6 @@ InternalParsePlist ( Block = AllocatePool (BlockDictChildDataSize); if (Block == NULL) { - FreePool (Block); Result = FALSE; goto DONE_ERROR; }
nbtree README: move VACUUM linear scan section. Discuss VACUUM's linear scan after discussion of tuple deletion by VACUUM, but before discussion of page deletion by VACUUM. This progression is a lot more natural. Also tweak the wording a little. It seems unnecessary to talk about how it worked prior to PostgreSQL 8.2.
@@ -214,6 +214,34 @@ page). Since we hold a lock on the lower page (per L&Y) until we have re-found the parent item that links to it, we can be assured that the parent item does still exist and can't have been deleted. +VACUUM's linear scan, concurrent page splits +-------------------------------------------- + +VACUUM accesses the index by doing a linear scan to search for deletable +TIDs, while considering the possibility of deleting empty pages in +passing. This is in physical/block order, not logical/keyspace order. +The tricky part of this is avoiding missing any deletable tuples in the +presence of concurrent page splits: a page split could easily move some +tuples from a page not yet passed over by the sequential scan to a +lower-numbered page already passed over. + +To implement this, we provide a "vacuum cycle ID" mechanism that makes it +possible to determine whether a page has been split since the current +btbulkdelete cycle started. If btbulkdelete finds a page that has been +split since it started, and has a right-link pointing to a lower page +number, then it temporarily suspends its sequential scan and visits that +page instead. It must continue to follow right-links and vacuum dead +tuples until reaching a page that either hasn't been split since +btbulkdelete started, or is above the location of the outer sequential +scan. Then it can resume the sequential scan. This ensures that all +tuples are visited. It may be that some tuples are visited twice, but +that has no worse effect than an inaccurate index tuple count (and we +can't guarantee an accurate count anyway in the face of concurrent +activity). Note that this still works if the has-been-recently-split test +has a small probability of false positives, so long as it never gives a +false negative. This makes it possible to implement the test with a small +counter value stored on each index page. + Deleting entire pages during VACUUM ----------------------------------- @@ -371,33 +399,6 @@ as part of the atomic update for the delete (either way, the metapage has to be the last page locked in the update to avoid deadlock risks). This avoids race conditions if two such operations are executing concurrently. -VACUUM needs to do a linear scan of an index to search for deleted pages -that can be reclaimed because they are older than all open transactions. -For efficiency's sake, we'd like to use the same linear scan to search for -deletable tuples. Before Postgres 8.2, btbulkdelete scanned the leaf pages -in index order, but it is possible to visit them in physical order instead. -The tricky part of this is to avoid missing any deletable tuples in the -presence of concurrent page splits: a page split could easily move some -tuples from a page not yet passed over by the sequential scan to a -lower-numbered page already passed over. (This wasn't a concern for the -index-order scan, because splits always split right.) To implement this, -we provide a "vacuum cycle ID" mechanism that makes it possible to -determine whether a page has been split since the current btbulkdelete -cycle started. If btbulkdelete finds a page that has been split since -it started, and has a right-link pointing to a lower page number, then -it temporarily suspends its sequential scan and visits that page instead. -It must continue to follow right-links and vacuum dead tuples until -reaching a page that either hasn't been split since btbulkdelete started, -or is above the location of the outer sequential scan. Then it can resume -the sequential scan. This ensures that all tuples are visited. It may be -that some tuples are visited twice, but that has no worse effect than an -inaccurate index tuple count (and we can't guarantee an accurate count -anyway in the face of concurrent activity). Note that this still works -if the has-been-recently-split test has a small probability of false -positives, so long as it never gives a false negative. This makes it -possible to implement the test with a small counter value stored on each -index page. - Fastpath For Index Insertion ----------------------------
rsa_cms_verify: Avoid negative return with missing pss parameters Fixes
@@ -222,7 +222,7 @@ static int rsa_cms_verify(CMS_SignerInfo *si) CMS_SignerInfo_get0_algs(si, NULL, NULL, NULL, &alg); nid = OBJ_obj2nid(alg->algorithm); if (nid == EVP_PKEY_RSA_PSS) - return ossl_rsa_pss_to_ctx(NULL, pkctx, alg, NULL); + return ossl_rsa_pss_to_ctx(NULL, pkctx, alg, NULL) > 0; /* Only PSS allowed for PSS keys */ if (EVP_PKEY_is_a(pkey, "RSA-PSS")) { ERR_raise(ERR_LIB_RSA, RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE);
[drivers][alarm]Compact alarm output
@@ -753,21 +753,20 @@ void rt_alarm_dump(void) rt_alarm_t alarm; rt_uint8_t index = 0; - rt_kprintf("| id | YYYY-MM-DD hh:mm:ss | week | flag | en |\n"); - rt_kprintf("+----+---------------------+------+------+----+\n"); + rt_kprintf("| hh:mm:ss | week | flag | en |\n"); + rt_kprintf("+----------+------+------+----+\n"); for (next = _container.head.next; next != &_container.head; next = next->next) { alarm = rt_list_entry(next, struct rt_alarm, list); rt_uint8_t flag_index = get_alarm_flag_index(alarm->flag); - rt_kprintf("| %2d | %04d-%02d-%02d %02d:%02d:%02d | %2d | %2s | %2d |\n", - index++, alarm->wktime.tm_year + 1900, alarm->wktime.tm_mon + 1, alarm->wktime.tm_mday, + rt_kprintf("| %02d:%02d:%02d | %2d | %2s | %2d |\n", alarm->wktime.tm_hour, alarm->wktime.tm_min, alarm->wktime.tm_sec, alarm->wktime.tm_wday, _alarm_flag_tbl[flag_index].name, alarm->flag & RT_ALARM_STATE_START); } - rt_kprintf("+----+---------------------+------+------+----+\n"); + rt_kprintf("+----------+------+------+----+\n"); } -MSH_CMD_EXPORT_ALIAS(rt_alarm_dump, rt_alarm_dump, dump alarm info); +MSH_CMD_EXPORT_ALIAS(rt_alarm_dump, list_alarm, list alarm info); /** \brief initialize alarm service system *
Fix lovr.data.newBlob(blob);
@@ -30,6 +30,7 @@ static int l_lovrDataNewBlob(lua_State* L) { size = blob->size; data = malloc(size); lovrAssert(data, "Out of memory"); + memcpy(data, blob->data, size); } const char* name = luaL_optstring(L, 2, ""); Blob* blob = lovrBlobCreate(data, size, name);
Fix library prefix of C# binding for Windows.
@@ -1061,6 +1061,11 @@ function (tinyspline_add_swig_library) COMPILE_FLAGS "${TINYSPLINE_BINDING_CXX_FLAGS} ${ARGS_FLAGS}") target_compile_definitions(${ARGS_TARGET} PUBLIC ${TINYSPLINE_CXX_DEFINITIONS}) + # Fix library prefix for C#. + if(${ARGS_LANG} STREQUAL "csharp") + set_property(TARGET ${ARGS_TARGET} + APPEND PROPERTY PREFIX "lib") + endif() # Fix library prefix for Go. if(${ARGS_LANG} STREQUAL "go") set_property(TARGET ${ARGS_TARGET} @@ -1068,8 +1073,7 @@ function (tinyspline_add_swig_library) endif() # Fix library prefix for non-windows platforms. if(NOT ${TINYSPLINE_PLATFORM_IS_WINDOWS}) - if(${ARGS_LANG} STREQUAL "csharp" - OR ${ARGS_LANG} STREQUAL "d") + if(${ARGS_LANG} STREQUAL "d") set_property(TARGET ${ARGS_TARGET} APPEND PROPERTY PREFIX "lib") endif()
Add eventDecoration when sending events via IDataInspector
@@ -668,6 +668,10 @@ namespace MAT_NS_BEGIN { m_customDecorator->decorate(*(event->source)); } + if (m_dataInspector) + { + m_dataInspector->decorate(*(event->source)); + } GetSystem()->sendEvent(event); } }
u3: cleanup comments about snapshot system limitations
//! ### limitations //! //! - loom page size is fixed (16 KB), and must be a multiple of the -//! system page size. (can the size vary at runtime give south.bin's -//! reversed order? alternately, if system page size > ours, the fault -//! handler could dirty N pages at a time.) -//! - update atomicity is suspect: patch application must either -//! completely succeed or leave on-disk segments intact. unapplied -//! patches can be discarded (triggering event replay), but once -//! patch application begins it must succeed. -//! may require integration into the overall signal-handling regime. +//! system page size. +//! - update atomicity is crucial: +//! - patch application must either completely succeed or +//! leave on-disk segments (memory image) intact. +//! - unapplied patches can be discarded (triggering event replay), +//! but once patch application begins it must succeed. +//! - may require integration into the overall signal-handling regime. //! - many errors are handled with assertions. //! //! ### enhancements
Fix static mapping lookup issue for NAT plugin
@@ -3340,6 +3340,7 @@ snat_in2out_fast_static_map_fn (vlib_main_t * vm, } key0.addr = ip0->src_address; + key0.protocol = proto0; key0.port = udp0->src_port; key0.fib_index = rx_fib_index0;
Makefile: Add new opensuse-leap os id Newer opensuse no longer reports in /etc/os-release as opensuse. It refers to itself as opensuse-leap. I imagine they think that sounds cooler or something.
@@ -53,7 +53,7 @@ endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) PKG=deb -else ifeq ($(filter rhel centos fedora opensuse,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter rhel centos fedora opensuse opensuse-leap,$(OS_ID)),$(OS_ID)) PKG=rpm endif @@ -139,6 +139,13 @@ else endif endif +ifeq ($(OS_ID),opensuse-leap) +ifeq ($(SUSE_ID),15.0) + RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 + RPM_SUSE_PYTHON_DEPS += python2-virtualenv +endif +endif + RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS) ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),) @@ -280,6 +287,9 @@ else ifneq ("$(wildcard /etc/redhat-release)","") else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) @sudo -E zypper refresh @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) +else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID)) + @sudo -E zypper refresh + @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) else $(error "This option currently works only on Ubuntu, Debian, Centos or openSUSE systems") endif
[mod_openssl] reject invalid ALPN
@@ -662,7 +662,7 @@ mod_openssl_alpn_select_cb (SSL *ssl, const unsigned char **out, unsigned char * for (unsigned int i = 0, n; i < inlen; i += n) { n = in[i++]; - if (i+n > inlen) break; + if (i+n > inlen || 0 == n) break; switch (n) { #if 0 case 2: /* "h2" */
Triggers are stateless and always require processing
@@ -42,13 +42,6 @@ enum { // Does this trigger support per port automations? CLAP_TRIGGER_IS_AUTOMATABLE_PER_PORT = 1 << 4, - - // This trigger will affect the plugin output and requires to be done via - // process() if the plugin is active. - // - // A simple example would be a sample-and-hold, triggering it will change the output signal and must be - // processed. - CLAP_TRIGGER_REQUIRES_PROCESS = 1 << 5, }; typedef uint32_t clap_trigger_info_flags;
add missing "void" in prototype.
@@ -99,7 +99,7 @@ static int gcd(int a, int b) return a; } -void setup_test_framework() +void setup_test_framework(void) { char *TAP_levels = getenv("HARNESS_OSSL_LEVEL"); char *test_seed = getenv("OPENSSL_TEST_RAND_ORDER");
Added ndb and signal messages to msg.js
@@ -97,9 +97,11 @@ var sbpImports = { imu: require('./imu.js'), logging: require('./logging.js'), navigation: require('./navigation.js'), + ndb: require('./ndb.js'), observation: require('./observation.js'), piksi: require('./piksi.js'), settings: require('./settings.js'), + signal: require('./signal.js'), system: require('./system.js'), tracking: require('./tracking.js'), user: require('./user.js')
icmpv6: add NTOHL when parse ICMPV6 option MTU
@@ -408,7 +408,7 @@ void icmpv6_input(FAR struct net_driver_s *dev, unsigned int iplen) { FAR struct icmpv6_mtu_s *mtuopt = (FAR struct icmpv6_mtu_s *)opt; - dev->d_pktsize = mtuopt->mtu; + dev->d_pktsize = NTOHL(mtuopt->mtu); } break;
fix(http2): move "BOAT_TLS_SUPPORT" and "BOAT_TLS_IDENTIFY_CLIENT" to "boatwallet.h"
@@ -29,6 +29,9 @@ boatwallet.h is the SDK header file. #include "boattypes.h" +#define BOAT_TLS_SUPPORT 1 //!< If need client support TLS, set it to 1. +#define BOAT_TLS_IDENTIFY_CLIENT 0 //!< If server need identify client, set it to 1. + //! @brief The generate mode of the used private key typedef enum {
Add link to where to find editors copy of the RATS arch doc
@@ -42,6 +42,12 @@ Depending on the plugin registration design, the app developer, the enclave signer, and/or the party configuring an application will choose one or more plugins to support and ensure they are available. +NOTE: The RATS Architecture referenced below is maintained in the +[RATS github repository](https://github.com/ietf-rats-wg/architecture) +which may have a later version that the draft linked below. When +in doubt, go to the github repo which has links to the Internet Draft, +latest Editors' Copy, and diffs between them. + As noted in the [RATS Architecture](https://tools.ietf.org/wg/rats/draft-ietf-rats-architecture/), an implementation acts in one or more of the three roles: Attester,
added documentation on * operator for strings
@@ -246,6 +246,12 @@ Returns a new string that concatenates this string and `other`. It is a runtime error if `other` is not a string. +### *****(count) operator + +Returns a new string that contains this string repeated `count` times. + +It is a runtime error if `count` is not a positive integer. + ### **==**(other) operator Checks if the string is equal to `other`.
Fix a spinlock leak for fault injector
@@ -734,9 +734,12 @@ FaultInjector_MarkEntryAsResume( } if (entryLocal->faultInjectorType != FaultInjectorTypeSuspend) + { + FiLockRelease(); ereport(ERROR, (errcode(ERRCODE_FAULT_INJECT), errmsg("only suspend fault can be resumed"))); + } entryLocal->faultInjectorType = FaultInjectorTypeResume;