message
stringlengths
6
474
diff
stringlengths
8
5.22k
Add SPI_3 to syscfg.restrictions.
@@ -401,8 +401,10 @@ syscfg.restrictions: - "!SPI_0_MASTER || (SPI_0_MASTER_PIN_SCK && SPI_0_MASTER_PIN_MOSI && SPI_0_MASTER_PIN_MISO)" - "!SPI_1_MASTER || (SPI_1_MASTER_PIN_SCK && SPI_1_MASTER_PIN_MOSI && SPI_1_MASTER_PIN_MISO)" - "!SPI_2_MASTER || (SPI_2_MASTER_PIN_SCK && SPI_2_MASTER_PIN_MOSI && SPI_2_MASTER_PIN_MISO)" + - "!SPI_3_MASTER || (SPI_3_MASTER_PIN_SCK && SPI_3_MASTER_PIN_MOSI && SPI_3_MASTER_PIN_MISO)" - "!SPI_0_SLAVE || (SPI_0_SLAVE_PIN_SCK && SPI_0_SLAVE_PIN_MOSI && SPI_0_SLAVE_PIN_MISO && SPI_0_SLAVE_PIN_SS)" - "!SPI_1_SLAVE || (SPI_1_SLAVE_PIN_SCK && SPI_1_SLAVE_PIN_MOSI && SPI_1_SLAVE_PIN_MISO && SPI_1_SLAVE_PIN_SS)" - "!SPI_2_SLAVE || (SPI_2_SLAVE_PIN_SCK && SPI_2_SLAVE_PIN_MOSI && SPI_2_SLAVE_PIN_MISO && SPI_2_SLAVE_PIN_SS)" + - "!SPI_3_SLAVE || (SPI_3_SLAVE_PIN_SCK && SPI_3_SLAVE_PIN_MOSI && SPI_3_SLAVE_PIN_MISO && SPI_3_SLAVE_PIN_SS)" - "!UART_0 || (UART_0_PIN_TX && UART_0_PIN_RX)" - "!UART_1 || (UART_1_PIN_TX && UART_1_PIN_RX)"
dill: store width for session when it changes
%text (fore (tuba p.kyz) ~) %crud :: (send `dill-belt`[%cru p.kyz q.kyz]) (crud p.kyz q.kyz) - %blew (send %rez p.p.kyz q.p.kyz) + %blew (send(wid p.p.kyz) %rez p.p.kyz q.p.kyz) %heft (pass /whey %$ whey/~) %meld (dump kyz) %pack (dump kyz)
nshlib: nsh_netcmds.c should include netlib.h even if neither TCP nor UDP are enabled
#include <nuttx/net/sixlowpan.h> #endif -#if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \ - !defined(CONFIG_DISABLE_SIGNALS) +#ifdef CONFIG_NETUTILS_NETLIB # include "netutils/netlib.h" #endif #if defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 # include "netutils/netlib.h" -# include "netutils/tftp.h" #endif #if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0 # ifndef CONFIG_NSH_DISABLE_WGET -# include "netutils/netlib.h" # include "netutils/webclient.h" # endif #endif
UserNotes: Fix process priorities not being properly restored after restart
@@ -173,7 +173,9 @@ PPH_STRING GetOpaqueXmlNodeText( _In_ mxml_node_t *node ) { - if (node->child && node->child->type == MXML_OPAQUE && node->child->value.opaque) + PCSTR string; + + if (string = mxmlGetOpaque(node)) { return PhConvertUtf8ToUtf16(node->child->value.opaque); } @@ -270,7 +272,7 @@ NTSTATUS LoadDb( comment = GetOpaqueXmlNodeText(currentNode); - if (tag && name && comment) + if (tag && name) { ULONG64 tagInteger; ULONG64 priorityClassInteger = 0;
Fix DCD_EVENT_XFER_COMPLETE was signaled, even after EP is closed
@@ -556,6 +556,9 @@ static void process_bus_reset(uint8_t rhport) /* When pipe0.buf has not NULL, DATA stage works in progress. */ _dcd.pipe0.buf = NULL; + USB0->TXIE = 1; /* Enable only EP0 */ + USB0->RXIE = 0; + /* Clear FIFO settings */ for (unsigned i = 1; i < DCD_ATTR_ENDPOINT_MAX; ++i) { USB0->EPIDX = i; @@ -660,6 +663,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * ep_desc) regs->TXCSRL = USB_TXCSRL1_CLRDT | USB_TXCSRL1_FLUSH; else regs->TXCSRL = USB_TXCSRL1_CLRDT; + USB0->TXIE |= TU_BIT(epn); } else { regs->RXMAXP = mps; regs->RXCSRH = (xfer == TUSB_XFER_ISOCHRONOUS) ? USB_RXCSRH1_ISO : 0; @@ -667,6 +671,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * ep_desc) regs->RXCSRL = USB_RXCSRL1_CLRDT | USB_RXCSRL1_FLUSH; else regs->RXCSRL = USB_RXCSRL1_CLRDT; + USB0->RXIE |= TU_BIT(epn); } /* Setup FIFO */ @@ -693,6 +698,8 @@ void dcd_edpt_close_all(uint8_t rhport) volatile hw_endpoint_t *regs = (volatile hw_endpoint_t *)(uintptr_t)&USB0->TXMAXP1; unsigned const ie = NVIC_GetEnableIRQ(USB0_IRQn); NVIC_DisableIRQ(USB0_IRQn); + USB0->TXIE = 1; /* Enable only EP0 */ + USB0->RXIE = 0; for (unsigned i = 1; i < DCD_ATTR_ENDPOINT_MAX; ++i) { regs->TXMAXP = 0; regs->TXCSRH = 0; @@ -727,6 +734,7 @@ void dcd_edpt_close(uint8_t rhport, uint8_t ep_addr) unsigned const ie = NVIC_GetEnableIRQ(USB0_IRQn); NVIC_DisableIRQ(USB0_IRQn); if (dir_in) { + USB0->TXIE &= ~TU_BIT(epn); regs->TXMAXP = 0; regs->TXCSRH = 0; if (regs->TXCSRL & USB_TXCSRL1_TXRDY) @@ -738,6 +746,7 @@ void dcd_edpt_close(uint8_t rhport, uint8_t ep_addr) USB0->TXFIFOSZ = 0; USB0->TXFIFOADD = 0; } else { + USB0->RXIE &= ~TU_BIT(epn); regs->RXMAXP = 0; regs->RXCSRH = 0; if (regs->RXCSRL & USB_RXCSRL1_RXRDY)
show diff information on mismatching evals
import csv import json +import itertools import os import random import shutil +import sys from pandas import read_csv from copy import deepcopy import numpy as np @@ -165,7 +167,13 @@ def compare_evals_with_precision(fit_eval, calc_eval, rtol=1e-6, skip_last_colum header_fit = header_fit[:-1] if header_fit != header_calc: return False - return np.all(np.isclose(array_fit, array_calc, rtol=rtol)) + is_close = np.isclose(array_fit, array_calc, rtol=rtol) + if np.all(is_close): + return True + for i, _ in itertools.islice(filter(lambda x: not np.all(x[1]), enumerate(is_close)), 100): + sys.stderr.write("index: {} {} != {}\n".format(i, array_fit[i], array_calc[i])) + return False + # returns (features DataFrame, cat_feature_indices) def load_pool_features_as_df(pool_file, cd_file, target_idx):
Fixed spelling in build-system.rst. Closes
@@ -76,7 +76,7 @@ An example project directory tree might look like this:: This example "myProject" contains the following elements: -- A top-level project Makefile. This Makefile set the ``PROJECT_NAME`` variable and (optionally) defines +- A top-level project Makefile. This Makefile sets the ``PROJECT_NAME`` variable and (optionally) defines other project-wide make variables. It includes the core ``$(IDF_PATH)/make/project.mk`` makefile which implements the rest of the ESP-IDF build system.
syntax error fixed in nasatbus.py
@@ -30,7 +30,7 @@ class NAsatbus(Target): } - IMPORTANT NOTE: openocd must be version 0.9 or later. +# IMPORTANT NOTE: openocd must be version 0.9 or later. def flash(self, binobj): """ Use an external shell to push the ELF file using openocd. It seems
BugID:18078169:Fix unnecessary item in sdk mal makefile
@@ -44,7 +44,6 @@ $(call CompLib_Map, FEATURE_ALCS_ENABLED, \ ) $(call CompLib_Map, FEATURE_MAL_ENABLED, \ src/services/mdal/mal \ - src/services/mdal/ref-impl \ ) $(call CompLib_Map, FEATURE_SAL_ENABLED, \ src/services/mdal/sal \
vm: added proc_current() NULL check in _vm_munmap()
@@ -370,7 +370,8 @@ int _vm_munmap(vm_map_t *map, void *vaddr, size_t size) long offs; map_entry_t *e, *s; map_entry_t t; - process_t *proc = proc_current()->process; + thread_t *thr = proc_current(); + process_t *proc = (thr != NULL) ? thr->process : NULL; t.vaddr = vaddr; t.size = size;
Upgrade +IPD statement parsing to support manual TCP read data
@@ -244,21 +244,67 @@ espi_parse_cipstatus(const char* str) { */ espr_t espi_parse_ipd(const char* str) { - uint8_t conn; + uint8_t conn, is_data_ipd; size_t len; + esp_conn_p c; + + + /* + * First check if this string is "notification only" or actual "data packet". + * + * Take decision based on ':' character before data. We can expect 3 types of format: + * + * +IPD,conn_num,available_bytes<CR><LF> : Notification only, for TCP connection + * +IPD,conn_num,bytes_in_packet:data : Data packet w/o remote ip/port, + * as response on manual TCP read or if AT+CIPDINFO=0 + * +IPD,conn_num,bytes_in_packet,remote_ip,remote_port:data : Data packet w/ remote ip/port, + * as response on automatic read of all connection types + */ + is_data_ipd = strchr(str, ':') != NULL; /* Check if we have ':' in string */ conn = espi_parse_number(&str); /* Parse number for connection number */ - len = espi_parse_number(&str); /* Parse number for number of bytes to read */ + len = espi_parse_number(&str); /* Parse number for number of available_bytes/bytes_to_read */ + + c = conn < ESP_CFG_MAX_CONNS ? &esp.conns[conn] : NULL; /* Get connection handle */ + if (c == NULL) { /* Invalid connection number */ + return espERR; + } + +#if ESP_CFG_CONN_MANUAL_TCP_RECEIVE + /* + * Check if +IPD is only notification and not actual data packet + */ + if (!is_data_ipd) { /* If not data packet */ + c->tcp_available_data = len; /* Set new value for number of bytes available to read from device */ + } else +#endif /* ESP_CFG_CONN_MANUAL_TCP_RECEIVE */ + /* + * If additional information are enabled (IP and PORT), + * parse them and save. + * + * Even if information is enabled, in case of manual TCP + * receive, these information are not present. + * + * Check for ':' character if it is end of string and determine how to proceed + */ + if (*str != ':') { espi_parse_ip(&str, &esp.ipd.ip); /* Parse incoming packet IP */ esp.ipd.port = espi_parse_port(&str); /* Get port on IPD data */ ESP_MEMCPY(&esp.conns[conn].remote_ip, &esp.ipd.ip, sizeof(esp.ipd.ip)); ESP_MEMCPY(&esp.conns[conn].remote_port, &esp.ipd.port, sizeof(esp.ipd.port)); + } + /* + * Data read procedure may only happen in case there is + * data packet available, otherwise do nothing further about this information + */ + if (is_data_ipd) { /* Shall we start IPD read procedure? */ esp.ipd.read = 1; /* Start reading network data */ esp.ipd.tot_len = len; /* Total number of bytes in this received packet */ esp.ipd.rem_len = len; /* Number of remaining bytes to read */ - esp.ipd.conn = &esp.conns[conn]; /* Pointer to connection we have data for */ + esp.ipd.conn = c; /* Pointer to connection we have data for */ + } return espOK; }
ruby: remove module name from ELEKTRA_README See for details.
@@ -620,7 +620,7 @@ int RUBY_PLUGIN_FUNCTION (Get) (ckdb::Plugin * handle, ckdb::KeySet * returned, keyNew (_MODULE_CONFIG_PATH "/exports/open", KEY_FUNC, RUBY_PLUGIN_FUNCTION (Open), KEY_END), keyNew (_MODULE_CONFIG_PATH "/exports/close", KEY_FUNC, RUBY_PLUGIN_FUNCTION (Close), KEY_END), keyNew (_MODULE_CONFIG_PATH "/exports/checkconf", KEY_FUNC, RUBY_PLUGIN_FUNCTION (CheckConf), KEY_END), -#include ELEKTRA_README (RUBY_PLUGIN_NAME) +#include ELEKTRA_README keyNew (_MODULE_CONFIG_PATH "/infos/version", KEY_VALUE, PLUGINVERSION, KEY_END), KS_END)); ksDel (n); return 0;
Fixed min/max.
@@ -197,7 +197,7 @@ static bool eir_found(struct bt_data *data, void *user_data) LOG_DBG("Found existing connection"); split_central_process_connection(default_conn); } else { - param = BT_LE_CONN_PARAM(0x0005, 0x000a, 5, 400); + param = BT_LE_CONN_PARAM(0x0006, 0x000c, 5, 400); err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, param, &default_conn); if (err) {
[kernel] update display method
@@ -59,8 +59,6 @@ GlobalFrictionContact::GlobalFrictionContact(int dimPb, SP::SolverOptions option { _gfc_driver = &gfc3d_driver; } - else - THROW_EXCEPTION("Wrong dimension value (must be 2 or 3) for FrictionContact constructor."); //Reset default storage type for numerics matrices. _numericsMatrixStorageType = NM_SPARSE; @@ -496,7 +494,7 @@ void GlobalFrictionContact::postCompute() void GlobalFrictionContact::display() const { - std::cout << "===== " << _contactProblemDim << "D Primal Friction Contact Problem " <<std::endl; + std::cout << "===== " << _contactProblemDim << "D Global Friction Contact Problem " <<std::endl; std::cout << "size (_sizeOutput) " << _sizeOutput << "(ie " << _sizeOutput / _contactProblemDim << " contacts)."<<std::endl; std::cout << "and size (_sizeGlobalOutput) " << _sizeGlobalOutput <<std::endl; std::cout << "_numericsMatrixStorageType" << _numericsMatrixStorageType<< std::endl;
OcAcpiLib: Make ACPI table count warning informational
@@ -575,7 +575,7 @@ AcpiInitContext ( } if (Context->NumberOfTables != DstIndex) { - DEBUG ((DEBUG_WARN, "OCA: Only %u ACPI tables out of %u were valid\n", DstIndex, Context->NumberOfTables)); + DEBUG ((DEBUG_INFO, "OCA: Only %u ACPI tables out of %u were valid\n", DstIndex, Context->NumberOfTables)); Context->NumberOfTables = DstIndex; }
smooth text inputoverlay
@@ -74,7 +74,7 @@ class InputOverlay(Images): super().add_to_frame(background, x_offset, y_offset) center_x = int(x_offset - self.font_width / 2) center_y = int(self.font_height / 2 + y_offset) - cv2.putText(background, self.n, (center_x, center_y), cv2.FONT_HERSHEY_DUPLEX, self.font_scale, self.color, 1) + cv2.putText(background, self.n, (center_x, center_y), cv2.FONT_HERSHEY_DUPLEX, self.font_scale, self.color, 1, lineType=cv2.LINE_AA) self.clicked_called = False
fix bufferoverflow
@@ -316,7 +316,7 @@ void bspline_coeff_derivative_n(unsigned int k, unsigned int n, unsigned int p, double v1[n - p - 1]; bspline_coeff_derivative(n, p, t1, v1, t, v); - bspline_coeff_derivative_n(k - 1, n - 1, p - 1, t2, v2, t1, v1); + bspline_coeff_derivative_n(k - 1, n - 2, p - 1, t2, v2, t1, v1); } }
graph-delete thread: fix %metadata-store scry and %hook reference to %push-hook
-/- spider, graph-view, graph=graph-store, *metadata-store, *group +/- spider, graph-view, graph=graph-store, met=metadata-store, *group /+ strandio, resource => |% ++ scry-metadata |= rid=resource =/ m (strand ,(unit resource)) - ;< paxs=(unit (set path)) bind:m - %+ scry:strandio ,(unit (set path)) + ;< group=(unit resource) bind:m + %+ scry:strandio ,(unit resource) ;: weld /gx/metadata-store/resource/graph (en-path:resource rid) /noun == - ?~ paxs (pure:m ~) - ?~ u.paxs (pure:m ~) - (pure:m `(de-path:resource n.u.paxs)) + (pure:m group) :: ++ scry-group |= rid=resource ;< ~ bind:m (poke-our %graph-push-hook %push-hook-action !>([%remove rid])) ;< ~ bind:m - %+ poke-our %metadata-hook - :- %metadata-action - !> :+ %remove - (en-path:resource group-rid) - [%graph (en-path:resource rid)] + (poke-our %metadata-push-hook %push-hook-action !>([%remove rid])) (pure:m ~) -- :: (poke-our %group-push-hook %push-hook-action !>([%remove rid.action])) ;< ~ bind:m (delete-graph u.ugroup-rid rid.action) ;< ~ bind:m - %+ poke-our %metadata-hook - metadata-hook-action+!>([%remove (en-path:resource u.ugroup-rid)]) + (poke-our %metadata-push-hook %push-hook-action !>([%remove rid.action])) (pure:m !>(~))
freertos: silence the static analysis warning referencing the workitem
@@ -649,7 +649,7 @@ void taskYIELD_OTHER_CORE( BaseType_t xCoreID, UBaseType_t uxPriority ) BaseType_t i; if (xCoreID != tskNO_AFFINITY) { - if ( curTCB->uxPriority < uxPriority ) { + if ( curTCB->uxPriority < uxPriority ) { // NOLINT(clang-analyzer-core.NullDereference) IDF-685 vPortYieldOtherCore( xCoreID ); } }
Add readfuncs.c support for AppendRelInfo. This is made necessary by the fact that commit added AppendRelInfos to plan trees. I'd concluded that this extra code was not necessary because we don't transmit that data to parallel workers ... but I forgot about -DWRITE_READ_PARSE_PLAN_TREES. Per buildfarm.
@@ -1342,6 +1342,33 @@ _readOnConflictExpr(void) READ_DONE(); } +/* + * Stuff from pathnodes.h. + * + * Mostly we don't need to read planner nodes back in again, but some + * of these also end up in plan trees. + */ + +/* + * _readAppendRelInfo + */ +static AppendRelInfo * +_readAppendRelInfo(void) +{ + READ_LOCALS(AppendRelInfo); + + READ_UINT_FIELD(parent_relid); + READ_UINT_FIELD(child_relid); + READ_OID_FIELD(parent_reltype); + READ_OID_FIELD(child_reltype); + READ_NODE_FIELD(translated_vars); + READ_INT_FIELD(num_child_cols); + READ_ATTRNUMBER_ARRAY(parent_colnos, local_node->num_child_cols); + READ_OID_FIELD(parent_reloid); + + READ_DONE(); +} + /* * Stuff from parsenodes.h. */ @@ -2690,6 +2717,8 @@ parseNodeString(void) return_value = _readFromExpr(); else if (MATCH("ONCONFLICTEXPR", 14)) return_value = _readOnConflictExpr(); + else if (MATCH("APPENDRELINFO", 13)) + return_value = _readAppendRelInfo(); else if (MATCH("RTE", 3)) return_value = _readRangeTblEntry(); else if (MATCH("RANGETBLFUNCTION", 16))
Ensure OSSL_PARAM_BLD_free() can accept a NULL All OpenSSL free functions should accept NULL.
@@ -125,6 +125,8 @@ static void free_all_params(OSSL_PARAM_BLD *bld) void OSSL_PARAM_BLD_free(OSSL_PARAM_BLD *bld) { + if (bld == NULL) + return; free_all_params(bld); sk_OSSL_PARAM_BLD_DEF_free(bld->params); OPENSSL_free(bld);
parallel-libs/petsc: configure.log file not in latest build
@@ -107,8 +107,6 @@ make make install DESTDIR=$RPM_BUILD_ROOT/%{install_path} -rm %{buildroot}%{install_path}/lib/petsc/conf/configure.log - # remove stock module file rm -rf %{buildroot}%{install_path}/lib/modules
OpenCanopy: Do not ASSERT for 0x0 resolution Fixes
@@ -33,8 +33,8 @@ struct GUI_POINTER_CONTEXT_ { EFI_ABSOLUTE_POINTER_PROTOCOL *AbsPointer; APPLE_EVENT_HANDLE AppleEventHandle; EFI_EVENT AbsPollEvent; - UINT32 MaxX; - UINT32 MaxY; + UINT32 MaxXPlus1; + UINT32 MaxYPlus1; GUI_PTR_POSITION CurPos; GUI_PTR_POSITION AbsLastDownPos; UINT32 OldEventExScale; @@ -198,14 +198,14 @@ InternalUpdateContextAbsolute ( } NewX = PointerState.CurrentX - Context->AbsPointer->Mode->AbsoluteMinX; - NewX *= Context->MaxX + 1; + NewX *= Context->MaxXPlus1; NewPos.Pos.X = (UINT32) DivU64x32 ( NewX, (UINT32) (Context->AbsPointer->Mode->AbsoluteMaxX - Context->AbsPointer->Mode->AbsoluteMinX) ); NewY = PointerState.CurrentY - Context->AbsPointer->Mode->AbsoluteMinY; - NewY *= Context->MaxY + 1; + NewY *= Context->MaxYPlus1; NewPos.Pos.Y = (UINT32) DivU64x32 ( NewY, (UINT32) (Context->AbsPointer->Mode->AbsoluteMaxY - Context->AbsPointer->Mode->AbsoluteMinY) @@ -345,13 +345,11 @@ GuiPointerConstruct ( EFI_STATUS Status2; DIMENSION Dimension; - ASSERT (DefaultX < Width); - ASSERT (DefaultY < Height); - ASSERT (Width <= MAX_INT32); - ASSERT (Height <= MAX_INT32); + ASSERT (DefaultX <= MAX_INT32); + ASSERT (DefaultY <= MAX_INT32); - Context.MaxX = Width - 1; - Context.MaxY = Height - 1; + Context.MaxXPlus1 = Width; + Context.MaxYPlus1 = Height; Context.CurPos.Pos.X = DefaultX; Context.CurPos.Pos.Y = DefaultY; Context.UiScale = UiScale;
[docker-build] [with examples] Fix yml error
@@ -196,8 +196,8 @@ fedora-33:test: jupyterlab:configure: variables: - BLAS_ROOT=$CONDA_PREFIX - GMP_ROOT=$CONDA_PREFIX + BLAS_ROOT: $CONDA_PREFIX + GMP_ROOT: $CONDA_PREFIX IMAGE_NAME: $CI_REGISTRY_IMAGE/sources/jupyterlab cdash_submit: 1 user_file: $CI_PROJECT_DIR/$siconos_confs/siconos_notebook.cmake
Check for change of direction at cursor update
@@ -2490,6 +2490,15 @@ ikvdb_kvs_cursor_update(struct hse_kvs_cursor *cur, struct hse_kvdb_opspec *os) if (ev(cur->kc_err)) return cur->kc_err; + /* Check if this call is trying to change cursor direction. */ + if (os) { + bool os_reverse = kvdb_kop_is_reverse(os); + bool cur_reverse = cur->kc_flags && (cur->kc_flags & HSE_KVDB_KOP_FLAG_REVERSE); + + if (ev(os_reverse != cur_reverse)) + return merr(EINVAL); + } + /* * Update is allowed to unbind a txn, bind to a new txn, * change from txn A to txn B without a unbind, or just
[BSP]fix F4-HAL bsp usbdriver
@@ -25,8 +25,10 @@ static struct ep_id _ep_pool[] = {0x0, USB_EP_ATTR_CONTROL, USB_DIR_INOUT, 64, ID_ASSIGNED }, {0x1, USB_EP_ATTR_BULK, USB_DIR_IN, 64, ID_UNASSIGNED}, {0x1, USB_EP_ATTR_BULK, USB_DIR_OUT, 64, ID_UNASSIGNED}, - {0x2, USB_EP_ATTR_INT, USB_DIR_OUT, 64, ID_UNASSIGNED}, {0x2, USB_EP_ATTR_INT, USB_DIR_IN, 64, ID_UNASSIGNED}, + {0x2, USB_EP_ATTR_INT, USB_DIR_OUT, 64, ID_UNASSIGNED}, + {0x3, USB_EP_ATTR_BULK, USB_DIR_IN, 64, ID_UNASSIGNED}, + {0x3, USB_EP_ATTR_BULK, USB_DIR_OUT, 64, ID_UNASSIGNED}, {0xFF, USB_EP_ATTR_TYPE_MASK, USB_DIR_MASK, 0, ID_ASSIGNED }, }; @@ -74,7 +76,7 @@ void HAL_PCD_ConnectCallback(PCD_HandleTypeDef *hpcd) void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd) { -// rt_usbd_sof_handler(&_stm_udc); + rt_usbd_sof_handler(&_stm_udc); } void HAL_PCD_DisconnectCallback(PCD_HandleTypeDef *hpcd) @@ -233,7 +235,7 @@ static rt_err_t _init(rt_device_t device) pcd = (PCD_HandleTypeDef*)device->user_data; pcd->Instance = USB_OTG_FS; - pcd->Init.dev_endpoints = 8; + pcd->Init.dev_endpoints = 4; pcd->Init.speed = PCD_SPEED_FULL; pcd->Init.dma_enable = DISABLE; pcd->Init.ep0_mps = DEP0CTL_MPS_64; @@ -249,7 +251,9 @@ static rt_err_t _init(rt_device_t device) HAL_PCDEx_SetRxFiFo(pcd, 0x80); HAL_PCDEx_SetTxFiFo(pcd, 0, 0x40); - HAL_PCDEx_SetTxFiFo(pcd, 1, 0x80); + HAL_PCDEx_SetTxFiFo(pcd, 1, 0x40); + HAL_PCDEx_SetTxFiFo(pcd, 2, 0x40); + HAL_PCDEx_SetTxFiFo(pcd, 3, 0x40); HAL_PCD_Start(pcd); return RT_EOK;
Fix typo setings -> settings
@@ -24,7 +24,7 @@ With: import UrbitInterface from '@urbit/http-api'; import { settings } from '@urbit/api'; const api: UrbitInterface = useApi(); -api.poke(setings.putEntry(bucket, key, value)); +api.poke(settings.putEntry(bucket, key, value)); ``` You may import single functions
Fixed an issue where groups comprised of edges were not being passed into Houdini properly.
@@ -4,35 +4,59 @@ def get_selected_components(component_type): components = [] sel_mask = -1 type_name = '' + expand = False - if component_type.lower() == 'vertex': + lwr_component_type = component_type.lower() + + if lwr_component_type == 'vertex': sel_mask = 31 type_name = 'vertices' - elif component_type.lower() == 'edge': + elif lwr_component_type == 'edge': sel_mask = 32 type_name = 'edges' - elif component_type.lower() == 'face': + expand = True + elif lwr_component_type == 'face': sel_mask = 34 type_name = 'faces' - elif component_type.lower() == 'uv': + elif lwr_component_type == 'uv': sel_mask = 35 type_name = 'UVs' else: cmds.error('Unknown component type. Must be "vertex", "edge", "face" or "uv".') - components_raw = cmds.filterExpand(cmds.ls(sl=True), sm=sel_mask, ex=False) + def extract_component(component): + lidx = component.find('[') + 1 + ridx = component.rfind(']') + + if lidx <= 0 or ridx <= 0 or ridx <= lidx: + cmds.warning('Could not determine %s index of "%s"' % (type_name, component)) + + return component[lidx:ridx] + + components_raw = cmds.filterExpand(cmds.ls(sl=True), sm=sel_mask, ex=expand) if not components_raw: return None + # Edges are handled differently in Houdini. Instead of an edge index, it is + # specified as two points with a "p" prefix. Eg "p1-3" represents an edge + # between point 1 and point 3. + if lwr_component_type == 'edge': + vertex_components = [] + for component in components_raw: - lidx = component.find('[') + 1 - ridx = component.rfind(']') + raw_vtx_components = cmds.polyListComponentConversion(component, fe=True, tv=True) - if lidx <= 0 or ridx <= 0 or ridx <= lidx: - cmds.warning('Could not determine %s index of "%s"' % (type_name, component)) + if len(raw_vtx_components) == 2: + vertex_components.append('p' + '-'.join([extract_component(raw_vtx_component) for raw_vtx_component in raw_vtx_components])) + elif len(raw_vtx_components) == 1: + vertex_components.append('p' + extract_component(raw_vtx_components[0]).replace(':', '-')) + else: + cmds.error('Unable to convert edge with %d vertices to a single range of vertices.' % len(raw_vtx_components)) - components.append(component[lidx:ridx].replace(':', '-')) + return ' '.join(vertex_components) - return ', '.join(components) + for component in components_raw: + components.append(extract_component(component).replace(':', '-')) + return ' '.join(components)
nat: enable multiworker tests Type: fix
@@ -9,7 +9,6 @@ from io import BytesIO from time import sleep import scapy.compat -from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from ipfix import IPFIX, Set, Template, Data, IPFIXDecoder from scapy.all import bind_layers, Packet, ByteEnumField, ShortField, \ @@ -862,7 +861,6 @@ def get_nat44_ei_in2out_worker_index(ip, vpp_worker_count): return 1 + h % vpp_worker_count -@tag_fixme_vpp_workers class TestNAT44EI(MethodHolder): """ NAT44EI Test Cases """
Add missing dlinkMacPrefix in de_web_plugin_private.h
@@ -489,6 +489,7 @@ extern const quint64 macPrefixMask; extern const quint64 celMacPrefix; extern const quint64 bjeMacPrefix; extern const quint64 davicomMacPrefix; +extern const quint64 dlinkMacPrefix; extern const quint64 deMacPrefix; extern const quint64 emberMacPrefix; extern const quint64 embertecMacPrefix;
Crash in config_init_fcb() While specifying the flash layout NRF52840 and NRF52832 need to be distinguished. Seperate structs are define for each oen now.
@@ -43,6 +43,15 @@ static const struct hal_flash_funcs nrf52k_flash_funcs = { .hff_init = nrf52k_flash_init }; +#ifdef NRF52840_XXAA +const struct hal_flash nrf52k_flash_dev = { + .hf_itf = &nrf52k_flash_funcs, + .hf_base_addr = 0x00000000, + .hf_size = 1024 * 1024, /* XXX read from factory info? */ + .hf_sector_cnt = 256, /* XXX read from factory info? */ + .hf_align = 1 +}; +#elif defined(NRF52832_XXAA) const struct hal_flash nrf52k_flash_dev = { .hf_itf = &nrf52k_flash_funcs, .hf_base_addr = 0x00000000, @@ -50,6 +59,9 @@ const struct hal_flash nrf52k_flash_dev = { .hf_sector_cnt = 128, /* XXX read from factory info? */ .hf_align = 1 }; +#else +#error "Must define hal_flash struct for NRF52 type" +#endif #define NRF52K_FLASH_READY() (NRF_NVMC->READY == NVMC_READY_READY_Ready)
doc: update TODO a bit see
@@ -35,16 +35,20 @@ Start arrays with _ (and not with #)? make KEY_END, ELEKTRA_PLUGIN_END also pointers and check them with sentinel, have a single way how to terminate vaargs -remove obsolete key/keyset flags +remove key/keyset flags +- that are obsolete/deprecated +- KDB_O_NOCASE (because it needs POSIX-only elektraStrCaseCmp) _t is reserved by POSIX, so cursor_t, keyswitch_t and option_t should be renamed to something elektra specific + internal APIs: malloc, realloc should use 2 parameters and check for multiplication overflow size_t, ssize_t are not fixed size, use uint32_t.. to have no problems on binary serialisation + unified behaviour (array sizes..) +-> remove SSIZE_T (only POSIX) empty/invalid keys should lead to an error in kdbGet
Only print final log when aof is loaded successfully Skip the print on AOF_NOT_EXIST status.
@@ -6475,6 +6475,7 @@ void loadDataFromDisk(void) { int ret = loadAppendOnlyFiles(server.aof_manifest); if (ret == AOF_FAILED || ret == AOF_OPEN_ERR) exit(1); + if (ret != AOF_NOT_EXIST) serverLog(LL_NOTICE, "DB loaded from append only file: %.3f seconds", (float)(ustime()-start)/1000000); } else { rdbSaveInfo rsi = RDB_SAVE_INFO_INIT;
jenkins: upload debian packages again
@@ -728,6 +728,7 @@ def buildPackageDebianStretch() { sh "gbp buildpackage -sa" } } + publishDebianPackages() } } }] @@ -1051,7 +1052,6 @@ def isMaster() { * @param remote where the repository is located */ def publishDebianPackages(remote="a7") { - if(isMaster()) { // This path must coincide with the incoming dir on a7 def remotedir = 'compose/frontend/volumes/incoming' sshPublisher( @@ -1093,9 +1093,6 @@ def publishDebianPackages(remote="a7") { verbose: true, failOnError: true ) - } else { - echo "Skipping package publish because we are not on master" - } } /* Run apiary
[doc/freertos]: fixed doc of pxTaskGetStackStart() Closes
@@ -1499,9 +1499,7 @@ configSTACK_DEPTH_TYPE uxTaskGetStackHighWaterMark2( TaskHandle_t xTask ) PRIVIL * INCLUDE_pxTaskGetStackStart must be set to 1 in FreeRTOSConfig.h for * this function to be available. * - * Returns the highest stack memory address on architectures where the stack grows down - * from high memory, and the lowest memory address on architectures where the - * stack grows up from low memory. + * Returns the lowest stack memory address, regardless of whether the stack grows up or down. * * @param xTask Handle of the task associated with the stack returned. * Set xTask to NULL to return the stack of the calling task.
doc: adjust "cities" example to be consistent with other SQL Reported-by: Discussion: Backpatch-through: 9.6
<programlisting> CREATE VIEW myview AS - SELECT city, temp_lo, temp_hi, prcp, date, location + SELECT name, temp_lo, temp_hi, prcp, date, location FROM weather, cities WHERE city = name; @@ -101,12 +101,12 @@ SELECT * FROM myview; <programlisting> CREATE TABLE cities ( - city varchar(80) primary key, + name varchar(80) primary key, location point ); CREATE TABLE weather ( - city varchar(80) references cities(city), + city varchar(80) references cities(name), temp_lo int, temp_hi int, prcp real,
Expose option to flip TextureData on load;
@@ -105,7 +105,8 @@ static int l_lovrDataNewTextureData(lua_State* L) { textureData = lovrTextureDataCreate(width, height, 0x0, format); } else { Blob* blob = luax_readblob(L, 1, "Texture"); - textureData = lovrTextureDataCreateFromBlob(blob, true); + bool flip = lua_isnoneornil(L, 2) ? true : lua_toboolean(L, 2); + textureData = lovrTextureDataCreateFromBlob(blob, flip); lovrRelease(blob); }
fsp/dump: Handle non-MPIPL scenario If MPIPL is not enabled then we will not create `/ibm,opal/dump` node and we should continue to parse/retrieve SYSDUMP. I missed this scenario when I fixed similar issue last time :-( Fixes: (fsp: Skip sysdump retrieval only in MPIPL boot)
@@ -830,11 +830,11 @@ static void check_ipl_sys_dump(void) if (!opal_node) return; dump_node = dt_find_by_path(opal_node, "dump"); - if (!dump_node) - return; + if (dump_node) { if (dt_find_property(dump_node, "mpipl-boot")) return; } + } dump_node = dt_find_by_path(dt_root, "ipl-params/platform-dump"); if (!dump_node)
libhfuzz: order of includes
#include "libhfcommon/common.h" -#include "libhfuzz.h" - #include "libhfcommon/files.h" #include "libhfcommon/log.h" #include "libhfcommon/ns.h" +#include "libhfuzz/libhfuzz.h" #if defined(_HF_ARCH_LINUX)
show target process cmdline in debug mode
@@ -58,6 +58,26 @@ static void show_event_per_sec(h2o_tracer_t *tracer, time_t t0) } } +static void show_process(pid_t pid) +{ + char cmdline[256]; + char proc_file[256]; + snprintf(proc_file, sizeof(proc_file), "/proc/%d/cmdline", pid); + FILE *f = fopen(proc_file, "r"); + if (f == nullptr) { + fprintf(stderr, "Failed to open %s: %s\n", proc_file, strerror(errno)); + exit(EXIT_FAILURE); + } + size_t nread = fread(cmdline, 1, sizeof(cmdline), f); + fclose(f); + for (size_t i = 0; i < nread; i++) { + if (cmdline[i] == '\0') { + cmdline[i] = ' '; + } + } + fprintf(stderr, "Attaching pid=%d (%s)\n", pid, cmdline); +} + int main(int argc, char **argv) { h2o_tracer_t *tracer; @@ -145,7 +165,7 @@ int main(int argc, char **argv) } if (debug) { - fprintf(stderr, "attaching pid=%d\n", h2o_pid); + show_process(h2o_pid); } ebpf::BPFPerfBuffer *perf_buffer = bpf->get_perf_buffer("events");
tests/run-tests: Run CPYTHON3 with -S flag. S is "don't imply 'import site' on initialization". This avoids sys.path minipulation and possibility of importing any module outside CPython standard library. This is required for clean-room testing, as CPython installtion may have user modules named "uio", "utime", etc.
@@ -430,7 +430,7 @@ def run_tests(pyb, tests, args, base_path="."): else: # run CPython to work out expected output try: - output_expected = subprocess.check_output([CPYTHON3, '-B', test_file]) + output_expected = subprocess.check_output([CPYTHON3, '-S', '-B', test_file]) if args.write_exp: with open(test_file_expected, 'wb') as f: f.write(output_expected)
Updated lux formula for
@@ -501,7 +501,7 @@ static int drv_als_liteon_ltr568_set_default_config(i2c_dev_t* drv) value = LTR568_SET_BITSLICE(value, ALS_CONTR_REG_ALS_SAR, LTR568_ALS_SAR_DISABLE); value = LTR568_SET_BITSLICE(value, ALS_CONTR_REG_ALS_GAIN, LTR568_ALS_GAIN_1X); value = LTR568_SET_BITSLICE(value, ALS_CONTR_REG_IR_EN, LTR568_IR_ENABLE); - value = LTR568_SET_BITSLICE(value, ALS_CONTR_REG_ALS_RES, LTR568_ALS_RES_14BIT); + value = LTR568_SET_BITSLICE(value, ALS_CONTR_REG_ALS_RES, LTR568_ALS_RES_16BIT); ret = sensor_i2c_write(drv, LTR568_ALS_CONTR, &value, I2C_DATA_LEN, I2C_OP_RETRIES); if (unlikely(ret)) { return ret; @@ -718,7 +718,7 @@ static int drv_als_liteon_ltr568_read(void *buf, size_t len) als_integ_time_val = drv_als_liteon_ltr568_get_integ_time_val(&ltr568_ctx); if ((als_gain_val != 0) && (als_integ_time_val != 0)) { - pdata->lux = (als_data * 10) / als_gain_val / als_integ_time_val; + pdata->lux = (als_data * 245) / als_gain_val / als_integ_time_val / 100; } else {
adds extra newline between headers and body
@@ -652,7 +652,7 @@ _cttp_creq_fire(u3_creq* ceq_u) } else { c3_c len_c[41]; - c3_w len_w = snprintf(len_c, 40, "Content-Length: %u\r\n", + c3_w len_w = snprintf(len_c, 40, "Content-Length: %u\r\n\r\n", ceq_u->bod_u->len_w); _cttp_creq_fire_body(ceq_u, _cttp_bod_new(len_w, len_c));
vere: do not use mainnet-proxy for galaxy booting Fallback to the default happens in dawn.c, which correctly points to roller.urbit.org, an endpoint that matches its request/response logic. Continuing to use an Ethereum endpoint instead of an L2 one will just result in 400s, since they don't speak the same language.
@@ -277,9 +277,6 @@ _main_getopt(c3_i argc, c3_c** argv) } } - c3_t imp_t = ((0 != u3_Host.ops_u.who_c) && - (4 == strlen(u3_Host.ops_u.who_c))); - if ( u3_Host.ops_u.gen_c != 0 && u3_Host.ops_u.nuu == c3n ) { fprintf(stderr, "-G only makes sense when bootstrapping a new instance\n"); return c3n; @@ -321,10 +318,6 @@ _main_getopt(c3_i argc, c3_c** argv) return c3n; } - if ( u3_Host.ops_u.eth_c == 0 && imp_t ) { - u3_Host.ops_u.eth_c = "http://eth-mainnet.urbit.org:8545"; - } - if ( u3_Host.ops_u.url_c != 0 && u3_Host.ops_u.pil_c != 0 ) { fprintf(stderr, "-B and -u cannot be used together\n"); return c3n;
Remove explicit wasm3.wasm output
@@ -35,7 +35,6 @@ if(WASIENV) set(CMAKE_C_COMPILER "wasicc") set(CMAKE_CXX_COMPILER "wasic++") - set(OUT_FILE "wasm3.wasm") set(APP_DIR "platforms/emscripten") #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dd_m3LogOutput=0") #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto -Wl,--lto-O3 -Wl,-z,stack-size=8388608")
sample/xgmplayer: fix typo on IMMEDIATLY
@@ -1765,7 +1765,7 @@ static void joyEvent(u16 joy, u16 changed, u16 state) void vint() { // do vblank process directly from the vint callback (easier to manage here) - SYS_doVBlankProcessEx(IMMEDIATLY); + SYS_doVBlankProcessEx(IMMEDIATELY); // set window visible from first row up to row 13 VDP_setWindowVPos(FALSE, 13);
nrf52dk; add defines to turn on rapid led toggling when in serial bootloader.
@@ -50,6 +50,9 @@ extern uint8_t _ram_start; #define BOOT_SERIAL_DETECT_PIN 13 /* Button 1 */ #define BOOT_SERIAL_DETECT_PIN_CFG HAL_GPIO_PULL_UP #define BOOT_SERIAL_DETECT_PIN_VAL 0 + +#define BOOT_SERIAL_REPORT_PIN LED_BLINK_PIN +#define BOOT_SERIAL_REPORT_FREQ (MYNEWT_VAL(OS_CPUTIME_FREQ) / 4) #endif #define NFFS_AREA_MAX (8)
Add NID_id_on_SmtpUTF8Mailbox to table of X.509 attributes
@@ -56,6 +56,7 @@ static const ASN1_STRING_TABLE tbl_standard[] = { {NID_SNILS, 1, 11, B_ASN1_NUMERICSTRING, STABLE_NO_MASK}, {NID_countryCode3c, 3, 3, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK}, {NID_countryCode3n, 3, 3, B_ASN1_NUMERICSTRING, STABLE_NO_MASK}, - {NID_dnsName, 0, -1, B_ASN1_UTF8STRING, STABLE_NO_MASK} + {NID_dnsName, 0, -1, B_ASN1_UTF8STRING, STABLE_NO_MASK}, + {NID_id_on_SmtpUTF8Mailbox, 1, ub_email_address, B_ASN1_UTF8STRING, STABLE_NO_MASK} };
nrf52820_microbit: set default UART baud rate to 115200
@@ -7,6 +7,7 @@ common: # - DELAY_FAST_CYCLES=2U # Fast delay needed to reach 8MHz SWD clock speed # - DAP_DEFAULT_SWJ_CLOCK=8000000 - BOARD_EXTRA_BUFFER=100 + - CDC_ACM_DEFAULT_BAUDRATE=115200 includes: - source/board/microbitv2/ - source/board/microbitv2/nrf52820/
Simplify ChangeLog entry for mbedtls_mpi_sub_abs fix.
Bugfix - * Fix mbedtls_mpi_sub_abs() to account for the possibility that the output - pointer could equal the first input pointer and if so to skip a memcpy() - call that would be redundant. Reported by Pascal Cuoq using TrustInSoft - Analyzer in #6701; observed independently by Aaron Ucko under Valgrind. + * Fix potential undefined behavior in mbedtls_mpi_sub_abs(). Reported by + Pascal Cuoq using TrustInSoft Analyzer in #6701; observed independently by + Aaron Ucko under Valgrind.
build: disable gcc warning stringop-overflow for gcc-10 or greater this warning causes build errors with gcc on ubuntu 22.04 Type: make
@@ -55,6 +55,10 @@ elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU") if (CMAKE_C_COMPILER_VERSION VERSION_LESS MIN_SUPPORTED_GNU_C_COMPILER_VERSION) set(COMPILER_TOO_OLD TRUE) endif() + set(GCC_STRING_OVERFLOW_WARNING_DISABLE_VERSION 10.0.0) + if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL GCC_STRING_OVERFLOW_WARNING_DISABLE_VERSION) + add_compile_options(-Wno-stringop-overflow) + endif() else() message(WARNING "WARNING: Unsupported C compiler `${CMAKE_C_COMPILER_ID}` is used") set (PRINT_MIN_C_COMPILER_VER TRUE)
[esp_system]: added __cxx_eh_arena_size_get again * This function has been accidentally removed. It is necessary to provide the emergency exception memory pool size for C++ code. Since our libstdc++ always has exceptions enabled, this function must exist here even if -fno-exception is set for user code.
@@ -138,6 +138,21 @@ static IRAM_ATTR void _Unwind_SetNoFunctionContextInstall_Default(unsigned char static const char* TAG = "cpu_start"; +/** + * This function overwrites a the same function of libsupc++ (part of libstdc++). + * Consequently, libsupc++ will then follow our configured exception emergency pool size. + * + * It will be called even with -fno-exception for user code since the stdlib still uses exceptions. + */ +size_t __cxx_eh_arena_size_get(void) +{ +#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS + return CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE; +#else + return 0; +#endif +} + /** * Xtensa gcc is configured to emit a .ctors section, RISC-V gcc is configured with --enable-initfini-array * so it emits an .init_array section instead.
opae.admin:mtd: address lint errors * Change how 'progress' object is tested as a file type. In Python 3, `open(...)` will return an object deriving from io.IOBase. Python 2 uses a `file` type object.
import fcntl import shutil import struct +import sys from opae.admin.utils.log import loggable from opae.admin.utils.progress import progress +if sys.version_info[0] == 3: + from io import IOBase as _ftype +else: + _ftype = file # noqa (Python 3 will report this as an error) + class mtd(loggable): """mtd encapsulates an mtd (flash) device""" @@ -181,7 +187,7 @@ class mtd(loggable): cfg = {'bytes': size} if callable(prg_writer): cfg['log'] = prg_writer - elif type(prg_writer) is file: + elif isinstance(prg_writer, _ftype): cfg['stream'] = prg_writer else: cfg['null'] = True
WebView.executeJS should be available from NodeJS code
@@ -217,8 +217,6 @@ If you open your page in WebView, and after it makes a few jumps by linking (for <DESC>Execute JavaScript on the current page from your controller. For most mobile platforms, WebView.execute_js has been implemented via redirection to URL with 'javascript:' schema. If WebView.execute_js used in an AJAX call handler method in the controller, it may lead to the situation where the success javascript handler will never be executed. This may happen because, at the moment of success handler should be executed, a URL of the page already has been changed. This means no handlers from the previous page are valid.</DESC> - <APPLIES rubyOnly="true"/> - <PARAMS> <PARAM name="javascriptText" type="STRING"> <DESC>The call to the JavaScript method on the current page, such as "test();".</DESC>
Minor style change, import <SceneCollisions /> hooks
-import React from "react"; +import React, { useEffect, useRef } from "react"; import { COLLISION_TOP, COLLISION_ALL, @@ -21,9 +21,9 @@ const SceneCollisions = ({ height, collisions, }: SceneCollisionsProps) => { - const canvas = React.useRef<HTMLCanvasElement>(null); + const canvas = useRef<HTMLCanvasElement>(null); - React.useEffect(() => { + useEffect(() => { if (canvas.current) { // eslint-disable-next-line no-self-assign canvas.current.width = canvas.current.width; // Clear canvas
Maybe actually fix?
@@ -101,6 +101,17 @@ void parse_ctx_free(rt_parse_ctx_t *parse_ctx) { free(parse_ctx); } +long expected_row_count(rt_parse_ctx_t *parse_ctx) { + long expected_rows = parse_ctx->file->rows; + if (parse_ctx->args->row_offset > 0) + expected_rows -= parse_ctx->args->row_offset; + if (expected_rows < 0) + expected_rows = 0; + if (parse_ctx->args->row_limit > 0 && parse_ctx->args->row_limit < expected_rows) + expected_rows = parse_ctx->args->row_limit; + return expected_rows; +} + static int handle_metadata(readstat_metadata_t *metadata, void *ctx) { rt_parse_ctx_t *rt_ctx = (rt_parse_ctx_t *)ctx; @@ -326,14 +337,3 @@ cleanup: return error; } -long expected_row_count(rt_parse_ctx_t *parse_ctx) { - long expected_rows = parse_ctx->file->rows; - if (parse_ctx->args->row_offset > 0) - expected_rows -= parse_ctx->args->row_offset; - if (expected_rows < 0) - expected_rows = 0; - if (parse_ctx->args->row_limit > 0 && parse_ctx->args->row_limit < expected_rows) - expected_rows = parse_ctx->args->row_limit; - return expected_rows; -} -
cleanup remove : 24.234.35.55:31333 88.99.254.6:16775 195.201.167.125:16800
5.189.132.84:16775 14.152.81.132:13655 -24.234.35.55:31333 45.76.37.252:13654 47.100.202.206:56600 47.104.147.94:13655 59.110.170.149:13655 82.53.153.199:9998 83.219.150.219:16775 -88.99.254.6:16775 88.198.100.226:13654 92.223.67.30:13655 92.223.72.45:16775 188.214.130.18:16775 192.99.147.126:16775 192.99.147.126:17775 -195.201.167.125:16800 195.201.168.17:16775 195.201.168.17:17775 195.201.169.202:16775
add moar quasar sysincls
- optional - variant - msl_utility +- source_filter: "^quasar/yandex_io/daemons/src/audiod/speex_port/" + includes: + - fixed_arm4.h + - fixed_arm5e.h + - fixed_bfin.h + - fixed_debug.h + - fixed_generic.h + - config.h + - os_support_custom.h +- source_filter: "^quasar/yandex_io/daemons/src/wifid/wpa_supplicant/" + includes: + - private/android_filesystem_config.h + - cutils/sockets.h + - cutils/properties.h
Moved patchrepo in build_hipvdi.sh out of condition that checks for existence of a build dir. This will not always be true.
@@ -90,11 +90,11 @@ if [ "$1" == "install" ] ; then $SUDO rm $AOMP_INSTALL_DIR/testfile fi +patchrepo $AOMP_REPOS/$AOMP_HIPVDI_REPO_NAME if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then if [ -d "$BUILD_DIR/build/hipvdi" ] ; then - patchrepo $AOMP_REPOS/$AOMP_HIPVDI_REPO_NAME echo echo "FRESH START , CLEANING UP FROM PREVIOUS BUILD" echo rm -rf $BUILD_DIR/build/hipvdi
[ctest] put again tripop cdash
@@ -11,8 +11,8 @@ set(CTEST_NIGHTLY_START_TIME "20:00:00 CET") # https is needed on cdash server side set(CTEST_DROP_METHOD "https") -set(CTEST_DROP_SITE "my.cdash.org/") -# set(CTEST_DROP_SITE "cdash-tripop.inrialpes.fr") +#set(CTEST_DROP_SITE "my.cdash.org/") +set(CTEST_DROP_SITE "cdash-tripop.inrialpes.fr") set(CTEST_DROP_LOCATION "/submit.php?project=Siconos") set(CTEST_DROP_SITE_CDASH TRUE) if(BUILD_NAME)
Configure flake8 For now, disable every check that is violated.
@@ -6,3 +6,38 @@ universal = 0 # -v: verbose output addopts = -s -v testpaths = pysam tests + +[flake8] +max-line-length = 100 +max-complexity = 23 +extend-ignore = E111, E117, E124, E125, E201, E202, E211, E225, E231, E265, E266, E302, E303, E305, E402, E501, E713, E722, E741, F401, F403, F405, F811, F821, F841, W291, W293, W391, W605 + +# E111 indentation is not a multiple of +# E117 over-indented +# E124 closing bracket does not match visual indentation +# E125 continuation line with same indent as next logical line +# E201 whitespace after '{' +# E202 whitespace before '}' +# E211 whitespace before '(' +# E225 missing whitespace around operator +# E231 missing whitespace after ':' +# E265 block comment should start with '# ' +# E266 too many leading '#' for block comment +# E302 expected 2 blank lines, found 1 +# E303 too many blank lines +# E305 expected 2 blank lines after class or function definition, found 1 +# E402 module level import not at top of file +# E501 line too long +# E713 test for membership should be 'not in' +# E722 do not use bare 'except' +# E741 ambiguous variable name '...' +# F401 '...' imported but unused +# F403 'from ... import *' used; unable to detect undefined names +# F405 '...' may be undefined, or defined from star imports: ... +# F811 redefinition of unused '...' from line ... +# F821 undefined name '...' +# F841 local variable '...' is assigned to but never used +# W291 trailing whitespace +# W293 blank line contains whitespace +# W391 blank line at end of file +# W605 invalid escape sequence '...'
Fixed an issue interposing __sprintf_chk and __fprintf_chk and passing var args.
@@ -4603,16 +4603,23 @@ pthread_create(pthread_t *thread, const pthread_attr_t *attr, EXPORTON int __fprintf_chk(FILE *stream, int flag, const char *format, ...) { - int rc; va_list ap; - va_start (ap, format); + int rc; - if (g_fn.__fprintf_chk) { - rc = g_fn.__fprintf_chk(stream, flag, format, ap); - } else { - rc = fprintf(stream, format, ap); + va_start (ap, format); + rc = vfprintf(stream, format, ap); + va_end (ap); + return rc; } +EXPORTON int +__sprintf_chk(char *str, int flag, size_t strlen, const char *format, ...) +{ + va_list ap; + int rc; + + va_start(ap, format); + rc = vsnprintf(str, strlen, format, ap); va_end(ap); return rc; } @@ -4637,23 +4644,6 @@ __memcpy_chk(void *dest, const void *src, size_t len, size_t destlen) return memcpy(dest, src, len); } -EXPORTON int -__sprintf_chk(char *str, int flag, size_t strlen, const char *format, ...) -{ - int rc; - va_list ap; - va_start (ap, format); - - if (g_fn.__sprintf_chk) { - rc = g_fn.__sprintf_chk(str, flag, strlen, format, ap); - } else { - rc = sprintf(str, format, ap); - } - - va_end (ap); - return rc; -} - EXPORTON long int __fdelt_chk(long int fdelt) {
Adding missing header references.
#include <psp2kern/bt.h> #include <psp2kern/ctrl.h> #include <psp2kern/display.h> +#include <psp2kern/power.h> #include <psp2kern/registrymgr.h> #include <psp2kern/sblacmgr.h> #include <psp2kern/sblaimgr.h> #include <psp2kern/sblauthmgr.h> +#include <psp2kern/syscon.h> +#include <psp2kern/uart.h> #include <psp2kern/udcd.h> #include <psp2kern/usbd.h> #include <psp2kern/usbserial.h> +#include <psp2kern/avcodec/jpegenc.h> + #include <psp2kern/io/devctl.h> #include <psp2kern/io/dirent.h> #include <psp2kern/io/fcntl.h> #include <psp2kern/lowio/gpio.h> #include <psp2kern/lowio/i2c.h> +#include <psp2kern/lowio/pervasive.h> #include <psp2kern/net/net.h> -#include <psp2kern/avcodec/jpegenc.h> - #endif
Fix leak in key rotation test
@@ -3399,6 +3399,7 @@ void picoquic_delete_cnx(picoquic_cnx_t* cnx) } picoquic_crypto_context_free(&cnx->crypto_context_new); + picoquic_crypto_context_free(&cnx->crypto_context_old); for (picoquic_packet_context_enum pc = 0; pc < picoquic_nb_packet_context; pc++) {
GitHub: Fix fileheader workflow. The workflow must run on the actual change not on the merge in order to detect properly updated file header.
@@ -21,6 +21,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.sha }} - id: files uses: jitterbit/get-changed-files@v1 - name: Check changed files
add low-mem nufft tests
@@ -154,9 +154,41 @@ tests/test-nufft-over: traj phantom resize nufft nrmse +# test low-mem adjoin + +tests/test-nufft-lowmem-adjoint: zeros noise traj nufft nrmse + set -e; mkdir $(TESTS_TMP) ; cd $(TESTS_TMP) ;\ + $(TOOLDIR)/zeros 4 1 128 128 3 z.ra ;\ + $(TOOLDIR)/noise -s321 z.ra n2.ra ;\ + $(TOOLDIR)/traj -r -x128 -y128 traj.ra ;\ + $(TOOLDIR)/nufft -a traj.ra n2.ra x1.ra ;\ + $(TOOLDIR)/nufft --lowmem -a traj.ra n2.ra x2.ra ;\ + $(TOOLDIR)/nrmse -t 0.000001 x1.ra x2.ra ;\ + rm *.ra ; cd .. ; rmdir $(TESTS_TMP) + touch $@ + + + +# test inverse using definition + +tests/test-nufft-lowmem-inverse: traj scale phantom nufft nrmse + set -e ; mkdir $(TESTS_TMP) ; cd $(TESTS_TMP) ;\ + $(TOOLDIR)/traj -r -x256 -y201 traj.ra ;\ + $(TOOLDIR)/scale 0.5 traj.ra traj2.ra ;\ + $(TOOLDIR)/phantom -t traj2.ra ksp.ra ;\ + $(TOOLDIR)/nufft -m5 -r -i traj2.ra ksp.ra reco1.ra ;\ + $(TOOLDIR)/nufft -m5 --lowmem -r -i traj2.ra ksp.ra reco2.ra ;\ + $(TOOLDIR)/nrmse -t 0.000001 reco1.ra reco2.ra ;\ + rm *.ra ; cd .. ; rmdir $(TESTS_TMP) + touch $@ + + + + TESTS += tests/test-nufft-forward tests/test-nufft-adjoint tests/test-nufft-inverse tests/test-nufft-toeplitz TESTS += tests/test-nufft-nudft tests/test-nudft-forward tests/test-nudft-adjoint TESTS += tests/test-nufft-batch tests/test-nufft-over +TESTS += tests/test-nufft-lowmem-adjoint tests/test-nufft-lowmem-inverse TESTS_GPU += tests/test-nufft-gpu
build BUGFIX installing removed header
@@ -276,7 +276,7 @@ install(TARGETS sysrepo DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${PROJECT_SOURCE_DIR}/src/sysrepo.h ${PROJECT_SOURCE_DIR}/src/sysrepo_types.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(FILES ${PROJECT_BINARY_DIR}/version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sysrepo) -install(FILES ${PROJECT_SOURCE_DIR}/src/types.h ${PROJECT_SOURCE_DIR}/src/utils/values.h ${PROJECT_SOURCE_DIR}/src/utils/xpath.h +install(FILES ${PROJECT_SOURCE_DIR}/src/utils/values.h ${PROJECT_SOURCE_DIR}/src/utils/xpath.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sysrepo) install(TARGETS sysrepoctl sysrepocfg sysrepo-plugind DESTINATION ${CMAKE_INSTALL_BINDIR})
Multiple reductions enabled.
@@ -43,5 +43,5 @@ int main() /// CHECK: DEVID:[[S:[ ]*]][[DEVID:[0-9]+]] SGN:8 /// CHECK: DEVID:[[S:[ ]*]][[DEVID:[0-9]+]] SGN:8 -/// CHECK: DEVID:[[S:[ ]*]][[DEVID:[0-9]+]] SGN:2 +/// CHECK: DEVID:[[S:[ ]*]][[DEVID:[0-9]+]] SGN:8
[LWIP] fixed select issues: pollset need clean.
@@ -52,7 +52,7 @@ int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struc /* Allocate the descriptor list for poll() */ if (npfds > 0) { - pollset = (struct pollfd *)rt_malloc(npfds * sizeof(struct pollfd)); + pollset = (struct pollfd *)rt_calloc(npfds, sizeof(struct pollfd)); if (!pollset) { return -1;
[io] add opacity management to contact objects
@@ -410,6 +410,7 @@ class InputObserver(): self.vview = vview self._opacity = 1.0 self._opacity_static = 1.0 + self._opacity_contact = 0.4 self._current_id = vtk.vtkIdTypeArray() self._renderer = vview.renderer self._renderer_window = vview.renderer_window @@ -473,6 +474,13 @@ class InputObserver(): for actor,_,_ in actors: actor.GetProperty().SetOpacity(self._opacity_static) + def set_opacity_contact(self): + for mu in self.vview.cf_prov._mu_coefs: + self.vview.cactor[mu].GetProperty().SetOpacity(self._opacity_contact) + self.vview.gactor[mu].GetProperty().SetOpacity(self._opacity_contact) + self.vview.clactor[mu].GetProperty().SetOpacity(self._opacity_contact) + self.vview.sactora[mu].GetProperty().SetOpacity(self._opacity_contact) + self.vview.sactorb[mu].GetProperty().SetOpacity(self._opacity_contact) def key(self, obj, event): @@ -507,20 +515,34 @@ class InputObserver(): self._time += self._time_step if key == 't': + print('Decrease the opacity of bodies') self._opacity -= .1 self.set_opacity() if key == 'T': + print('Increase the opacity of bodies') self._opacity += .1 self.set_opacity() if key == 'y': + print('Decrease the opacity of static bodies') self._opacity_static -= .1 self.set_opacity_static() if key == 'Y': + print('Increase the opacity of static bodies') self._opacity_static += .1 self.set_opacity_static() + + if key == 'u': + print('Decrease the opacity of contact elements') + self._opacity_contact -= .1 + self.set_opacity_contact() + + if key == 'U': + print('Increase the opacity of contact elements') + self._opacity_contact += .1 + self.set_opacity_contact() if key == 'c': print('camera position:', self._renderer.GetActiveCamera().GetPosition()) print('camera focal point', self._renderer.GetActiveCamera().GetFocalPoint()) @@ -906,7 +928,8 @@ class VView(object): self.cmapper[mu].ScalarVisibilityOn() self.cactor[mu] = vtk.vtkActor() - self.cactor[mu].GetProperty().SetOpacity(0.4) + + self.cactor[mu].GetProperty().SetOpacity(self.config.get('contact_opacity', 0.4)) self.cactor[mu].GetProperty().SetColor(0, 0, 1) self.cactor[mu].SetMapper(self.cmapper[mu])
Remove .txt from ignored file extensions in u_select.py ...since CMakeLists.txt is an important file.
@@ -25,8 +25,9 @@ import u_data # Accesses the instance database # Prefix to put at the start of all prints PROMPT = "u_select: " -# A list of file extensions to throw away -EXT_DISCARD = ["md", "txt", "jpg", "png", "gitignore"] +# A list of file extensions to throw away (note that .txt +# is not included since "CMakeLists.txt" is an important file) +EXT_DISCARD = ["md", "jpg", "png", "gitignore"] # A list of file extensions to keep for code files EXT_CODE = ["c", "cpp", "h", "hpp"]
uri_tcp_test when master bind fail we met a display issue about retval
@@ -173,6 +173,8 @@ wait_for_state_change (uri_tcp_test_main_t * utm, connection_state_t state) return 0; if (utm->state == STATE_FAILED) return -1; + if (utm->time_to_stop == 1) + return -1; } clib_warning ("timeout waiting for STATE_READY"); return -1; @@ -736,7 +738,7 @@ vl_api_bind_uri_reply_t_handler (vl_api_bind_uri_reply_t * mp) if (mp->retval) { - clib_warning ("bind failed: %s", format_api_error, + clib_warning ("bind failed: %U", format_api_error, clib_net_to_host_u32 (mp->retval)); utm->state = STATE_FAILED; return;
[libcpu][arm] Add exception install function
extern long list_thread(void); #endif +static rt_err_t (*rt_exception_hook)(void *context) = RT_NULL; + +/** + * This function set the hook, which is invoked on fault exception handling. + * + * @param exception_handle the exception handling hook function. + */ +void rt_hw_exception_install(rt_err_t (*exception_handle)(void *context)) +{ + rt_exception_hook = exception_handle; +} + /** * this function will show registers of CPU * @@ -33,6 +45,13 @@ void rt_hw_show_register(struct rt_hw_exp_stack *regs) rt_kprintf("fp :0x%08x ip :0x%08x\n", regs->fp, regs->ip); rt_kprintf("sp :0x%08x lr :0x%08x pc :0x%08x\n", regs->sp, regs->lr, regs->pc); rt_kprintf("cpsr:0x%08x\n", regs->cpsr); + if (rt_exception_hook != RT_NULL) + { + rt_err_t result; + + result = rt_exception_hook(regs); + if (result == RT_EOK) return; + } } void (*rt_trap_hook)(struct rt_hw_exp_stack *regs, const char *ex, unsigned int exception_type);
Include ID Context in context lookup.
@@ -242,7 +242,9 @@ void coap_receive(OpenQueueEntry_t *msg) { do { if (temp_desc->securityContext != NULL && temp_desc->securityContext->recipientIDLen == rcvdKidLen && - memcmp(rcvdKid, temp_desc->securityContext->recipientID, rcvdKidLen) == 0) { + memcmp(rcvdKid, temp_desc->securityContext->recipientID, rcvdKidLen) == 0 && + temp_desc->securityContext->idContextLen == rcvdKidContextLen && + memcmp(rcvdKidContext, temp_desc->securityContext->idContext, rcvdKidContextLen) == 0) { blindContext = temp_desc->securityContext; break;
landscape: check workspace in channel menu
@@ -34,7 +34,9 @@ export function ChannelMenu(props: ChannelMenuProps) { const history = useHistory(); const { metadata } = association; const app = metadata.module || association["app-name"]; - const baseUrl = `/~landscape${association?.["group-path"]}/resource/${app}${association["app-path"]}`; + const workspace = history.location.pathname.startsWith('/~landscape/home') + ? '/home' : association?.['group-path']; + const baseUrl = `/~landscape${workspace}/resource/${app}${association["app-path"]}`; const appPath = association["app-path"]; const [, ship, name] = appPath.startsWith("/ship/") @@ -59,7 +61,7 @@ export function ChannelMenu(props: ChannelMenuProps) { default: throw new Error("Invalid app name"); } - history.push(`/~landscape${association?.["group-path"]}`); + history.push(`/~landscape${workspace}`); }, [api, association]); const onDelete = useCallback(async () => { @@ -77,7 +79,7 @@ export function ChannelMenu(props: ChannelMenuProps) { default: throw new Error("Invalid app name"); } - history.push(`/~landscape${association?.["group-path"]}`); + history.push(`/~landscape${workspace}`); }, [api, association]); return (
hslua-objectorientation: bump version to 2.2.0.1
cabal-version: 2.2 name: hslua-objectorientation -version: 2.2.0 +version: 2.2.0.1 synopsis: Object orientation tools for HsLua description: Expose Haskell objects to Lua with an object oriented interface.
Fixed some minor format issues
@@ -138,7 +138,7 @@ This issue can be solved by instead running ````sh python setup.py install --user --prefix= ```` -The issue is discussed in detail here (https://stackoverflow.com/questions/4495120/combine-user-with-prefix-error-with-setup-py-install) +The issue is discussed in detail [here](https://stackoverflow.com/questions/4495120/combine-user-with-prefix-error-with-setup-py-install) ## Compiling against an external version of CLASS
Make contrib/android/install_openssl.sh Code of Conduct compliant.
@@ -21,7 +21,6 @@ fi cd openssl-1.1.1d || exit 1 -# Damn OpenSSL devs... They just make the shit up as they go... if ! cp ../contrib/android/15-android.conf Configurations/; then echo "Failed to copy OpenSSL Android config" exit 1
Fix h09server too
@@ -1547,7 +1547,7 @@ int create_sock(Address &local_addr, const char *addr, const char *port, hints.ai_socktype = SOCK_DGRAM; hints.ai_flags = AI_PASSIVE; - if (strcmp("addr", "*") == 0) { + if (strcmp(addr, "*") == 0) { addr = nullptr; }
another try at checking for for maya version 2016.5
@@ -771,8 +771,9 @@ houdiniEngineCreateUI() -imageOverlayLabel "BA" -annotation "Tear off a copy of the asset's current output nodes" -command "houdiniEngine_bakeSelectedAssets"; - int $intVersion = $mayaVersion; - if($intVersion > 2016) { + + if( getApplicationVersionAsFloat() >= 2016.5 ) + { menuItem -label "Freeze Asset" -imageOverlayLabel "BA" -version $mayaVersion
tests: fixed lagging ring buffer register function call
@@ -115,7 +115,7 @@ static void test_smart_flush() exit(EXIT_FAILURE); } - ret = flb_ring_buffer_register(rb, evl, window); + ret = flb_ring_buffer_add_event_loop(rb, evl, window); TEST_CHECK(ret == 0); if (ret) { exit(EXIT_FAILURE);
Fix irqtest build
--- irqtest - build library { + build drivermodule { target = "e1000n_irqtest_module", cFiles = [ "e1000n.c", "e1000n_hwinit.c", "e1000n_helpers.c", "test_instr_irqtest.c"], flounderBindings = [ "octopus", "e1000_devif" ], flounderDefs = [ "octopus", "e1000_devif" ], mackerelDevices = [ "e1000" ], - addLibraries = libDeps [ "pci_driver_client", - "int_msix_ctrl" ], + addLibraries = [ "pci", "pci_driver_client", "int_msix_ctrl" ], architectures = [ "x86_64" ], addCFlags = [ "-DLIBRARY", "-DUNDER_TEST" ] }, - build application { + build driverdomain { target = "e1000n_irqtest", - cFiles = [ "main.c"], - addLinkFlags = ["-T" ++ Config.source_dir ++ "/lib/driverkit/bfdrivers.ld" ], - - addLibraries = libDeps["driverkit", "pci", "pci_driver_client", - "bench", "trace", "skb", "net", "lwip2", - "driverkit_iommu"], addModules = ["e1000n_irqtest_module"], architectures = ["x86_64"], addCFlags = [ "-DUNDER_TEST"]
IAS: fix the ipc counter.
@@ -44,11 +44,13 @@ static void ias_ht_poll_one(struct ias_data *sd, struct thread *th) /* update unpaired IPC metrics */ run_us = ((float)cur_tsc - sd->ht_start_running_tsc[core]) / cycles_per_us; + if (run_us - us < WARMUP_US) + return; + if (!cores[sib]) { idle_us = ((float)cur_tsc - cores_idle_tsc[sib]) / cycles_per_us; - if (run_us - us < WARMUP_US || idle_us - us < WARMUP_US) + if (idle_us - us < WARMUP_US) return; - if (!cores[sib]) { ias_ewma(&sd->ht_unpaired_ipc, ipc, MIN(100.0, us) * IAS_EWMA_FACTOR); return;
fixed syrk_thread.c taken from wernsaar Stride calculation fix copied from
@@ -109,7 +109,7 @@ int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int ( if (nthreads - num_cpu > 1) { di = (double)i; - width = ((BLASLONG)( sqrt(di * di + dnum) - di) + mask) & ~mask; + width = (BLASLONG)(( sqrt(di * di + dnum) - di + mask)/(mask+1)) * (mask+1); if ((width <= 0) || (width > n_to - i)) width = n_to - i; @@ -149,7 +149,7 @@ int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int ( if (nthreads - num_cpu > 1) { di = (double)(arg -> n - i); - width = ((BLASLONG)(-sqrt(di * di + dnum) + di) + mask) & ~mask; + width = ((BLASLONG)((-sqrt(di * di + dnum) + di) + mask)/(mask+1)) * (mask+1); if ((width <= 0) || (width > n_to - i)) width = n_to - i;
YAML CPP: Fix Doxygen warning Before this change Doxygen would report the following warning: > found subsection command outside of section context! .
- infos/metadata = - infos/description = This storage plugin reads and writes data in the YAML format +# YAML CPP + ## Introduction The YAML CPP plugin reads and writes configuration data via the [yaml-cpp][] library.
SOVERSION bump to version 2.29.0
@@ -65,8 +65,8 @@ set(LIBYANG_MICRO_VERSION 27) set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION}) # set version of the library set(LIBYANG_MAJOR_SOVERSION 2) -set(LIBYANG_MINOR_SOVERSION 28) -set(LIBYANG_MICRO_SOVERSION 8) +set(LIBYANG_MINOR_SOVERSION 29) +set(LIBYANG_MICRO_SOVERSION 0) set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION}) set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION})
Enable -Werror for C++ compiler
@@ -451,8 +451,7 @@ if test "x$werror" != "xno"; then # For C++ compiler AC_LANG_PUSH(C++) AX_CHECK_COMPILE_FLAG([-Wall], [CXXFLAGS="$CXXFLAGS -Wall"]) - # TODO separate option for -Werror and warnings? - #AX_CHECK_COMPILE_FLAG([-Werror], [CXXFLAGS="$CXXFLAGS -Werror"]) + AX_CHECK_COMPILE_FLAG([-Werror], [CXXFLAGS="$CXXFLAGS -Werror"]) AX_CHECK_COMPILE_FLAG([-Wformat-security], [CXXFLAGS="$CXXFLAGS -Wformat-security"]) AX_CHECK_COMPILE_FLAG([-Wsometimes-uninitialized], [CXXFLAGS="$CXXFLAGS -Wsometimes-uninitialized"]) # Disable noexcept-type warning of g++-7. This is not harmful as
update readme documentation for new cmake option
@@ -67,7 +67,8 @@ Dependencies OpenEXR depends on [zlib](https://zlib.net). -PyIlmBase depends on [boost-python](https://github.com/boostorg/python). +PyIlmBase depends on [boost-python](https://github.com/boostorg/python) and +optionally on [numpy](http://www.numpy.org). In OpenEXR_Viewers: @@ -144,9 +145,9 @@ https://www.gnu.org/software/autoconf/autoconf.html. Alternatively, you can build with **cmake**, version 3.11 or newer. -In the root ``CMakeLists.txt`` file, or using a tools such as -**ccmake** or **cmake-gui**, configure the OpenEXR build. The options -are detailed below. +In the root ``CMakeLists.txt`` file, with -D options on the cmake +line, or by using a tools such as **ccmake** or **cmake-gui**, +configure the OpenEXR build. The options are detailed below. Create a source root directory, cd into it, and run **cmake** to configure the build. Select an appropriate generator, such as "Unix Makefiles", @@ -186,6 +187,12 @@ C++03 compatibility is possible as an option * ``OPENEXR_ENABLE_TESTS`` (ON) By default, the tests will be built. +* ``OPENEXR_RUN_FUZZ_TESTS`` (OFF) +By default, the damaged input tests will NOT be run, due to their long +running time. If you wish to run them as part of "make test" (or equivalent +in your build system), then enable this. A "make fuzz" target will be +available to run the fuzz test regardless. + * ``OPENEXR_PYTHON_MAJOR``, ``OPENEXR_PYTHON_MINOR`` "2", "7" By default, OpenEXR is built against Python 2.7.x.
in_dummy: fix context/destroy handling when configure fails (CID 164845)
@@ -112,7 +112,6 @@ static int configure(struct flb_in_dummy_config *ctx, &ctx->ref_msgpack, &ctx->ref_msgpack_size); if (ret != 0) { flb_error("[in_dummy] Unexpected error"); - config_destroy(ctx); return -1; } }
Config file parsing more forgiving, just ignores invalid ship names.
=((snag 1 txs) 'public') =((snag 2 txs) 'visible') %- ~(gas in *(set ship)) - %+ turn (slag 3 txs) - (cury slav %p) + %+ murn (slag 3 txs) + (cury slaw %p) -- ++ grad %txt --
MeteoFrance contribution: GRIB spectral complex packing (Added test)
@@ -16,7 +16,6 @@ files="regular_latlon_surface.grib2 \ regular_latlon_surface.grib1" for file in $files; do - infile=${data_dir}/$file outfile1=${infile}_decimalPrecision_1 outfile2=${infile}_decimalPrecision_2 @@ -26,5 +25,15 @@ for file in $files; do ${tools_dir}/grib_set -s changeDecimalPrecision=1 $infile $outfile2 ${tools_dir}/grib_compare -P -c data:n $infile $outfile2 > $REDIRECT ${tools_dir}/grib_compare $outfile1 $outfile2 - rm -f $outfile1 $outfile2 || true + rm -f $outfile1 $outfile2 done + +# ECC-458: spectral_complex packing +temp=temp.grib_decimalPrecision.grib +infile=${data_dir}/spectral_complex.grib1 +# Catch errors re negative values +export ECCODES_FAIL_IF_LOG_MESSAGE=1 +${tools_dir}/grib_set -r -s decimalScaleFactor=0 $infile $temp +${tools_dir}/grib_set -r -s decimalScaleFactor=1 $infile $temp + +rm -f $temp
abis/mlibc: add missing struct rusage members
struct rusage { struct timeval ru_utime; struct timeval ru_stime; + long int ru_maxrss; + long int ru_ixrss; + long int ru_idrss; + long int ru_isrss; + long int ru_minflt; + long int ru_majflt; + long int ru_nswap; + long int ru_inblock; + long int ru_oublock; + long int ru_msgsnd; + long int ru_msgrcv; + long int ru_nsignals; + long int ru_nvcsw; + long int ru_nivcsw; }; #endif // _ABIBITS_RESOURCE_H
Use now shared ECP_PUB_DER_MAX_BYTES define in pk_wrap.c
#include "mbedtls/ecp.h" #endif +#if defined(MBEDTLS_RSA_C) || defined(MBEDTLS_ECP_C) +#include "pkwrite.h" +#endif + #if defined(MBEDTLS_ECDSA_C) #include "mbedtls/ecdsa.h" #endif @@ -564,8 +568,7 @@ static int ecdsa_verify_wrap( void *ctx_arg, mbedtls_md_type_t md_alg, psa_status_t status; mbedtls_pk_context key; int key_len; - /* see ECP_PUB_DER_MAX_BYTES in pkwrite.c */ - unsigned char buf[30 + 2 * MBEDTLS_ECP_MAX_BYTES]; + unsigned char buf[MBEDTLS_PK_ECP_PUB_DER_MAX_BYTES]; unsigned char *p; mbedtls_pk_info_t pk_info = mbedtls_eckey_info; psa_algorithm_t psa_sig_md = PSA_ALG_ECDSA_ANY;
common/vboot/vb21_lib.c: Format with clang-format BRANCH=none TEST=none
@@ -52,7 +52,6 @@ const struct vb21_packed_key *vb21_get_packed_key(void) static void read_rwsig_info(struct ec_response_rwsig_info *r) { - const struct vb21_packed_key *vb21_key; int rv; @@ -61,10 +60,14 @@ static void read_rwsig_info(struct ec_response_rwsig_info *r) r->sig_alg = vb21_key->sig_alg; r->hash_alg = vb21_key->hash_alg; r->key_version = vb21_key->key_version; - { BUILD_ASSERT(sizeof(r->key_id) == sizeof(vb21_key->id), - "key ID sizes must match"); } - { BUILD_ASSERT(sizeof(vb21_key->id) == sizeof(vb21_key->id.raw), - "key ID sizes must match"); } + { + BUILD_ASSERT(sizeof(r->key_id) == sizeof(vb21_key->id), + "key ID sizes must match"); + } + { + BUILD_ASSERT(sizeof(vb21_key->id) == sizeof(vb21_key->id.raw), + "key ID sizes must match"); + } memcpy(r->key_id, vb21_key->id.raw, sizeof(r->key_id)); rv = vb21_is_packed_key_valid(vb21_key);
wicdec,icc: treat unsupported op as non-fatal ICC extraction via GetColorContexts may fail due to the operation not being supported with e.g., bitmaps.
@@ -134,7 +134,10 @@ static HRESULT ExtractICCP(IWICImagingFactory* const factory, IWICColorContext** color_contexts; IFS(IWICBitmapFrameDecode_GetColorContexts(frame, 0, NULL, &count)); - if (FAILED(hr) || count == 0) return hr; + if (FAILED(hr) || count == 0) { + // Treat unsupported operation as a non-fatal error. See crbug.com/webp/506. + return (hr == WINCODEC_ERR_UNSUPPORTEDOPERATION) ? S_OK : hr; + } color_contexts = (IWICColorContext**)calloc(count, sizeof(*color_contexts)); if (color_contexts == NULL) return E_OUTOFMEMORY;
doc: \123 and \x12 escapes in COPY are in database encoding. The backslash sequences, including \123 and \x12 escapes, are interpreted after encoding conversion. The docs failed to mention that. Backpatch to all supported versions. Reported-by: Andreas Grob Discussion:
@@ -628,12 +628,12 @@ COPY <replaceable class="parameter">count</replaceable> <row> <entry><literal>\</literal><replaceable>digits</replaceable></entry> <entry>Backslash followed by one to three octal digits specifies - the character with that numeric code</entry> + the byte with that numeric code</entry> </row> <row> <entry><literal>\x</literal><replaceable>digits</replaceable></entry> <entry>Backslash <literal>x</literal> followed by one or two hex digits specifies - the character with that numeric code</entry> + the byte with that numeric code</entry> </row> </tbody> </tgroup> @@ -665,6 +665,12 @@ COPY <replaceable class="parameter">count</replaceable> or vice versa). </para> + <para> + All backslash sequences are interpreted after encoding conversion. + The bytes specified with the octal and hex-digit backslash sequences must + form valid characters in the database encoding. + </para> + <para> <command>COPY TO</command> will terminate each row with a Unix-style newline (<quote><literal>\n</literal></quote>). Servers running on Microsoft Windows instead
Fixes framework.c
@@ -974,11 +974,11 @@ celix_status_t fw_startBundle(framework_pt framework, long bndId, int options __ if (createCalled) { destroy(activator->userData, context); } - bundle_setContext(bundle, NULL); - bundle_setActivator(bundle, NULL); + bundle_setContext(entry->bnd, NULL); + bundle_setActivator(entry->bnd, NULL); bundleContext_destroy(context); free(activator); - framework_setBundleStateAndNotify(framework, bundle, OSGI_FRAMEWORK_BUNDLE_RESOLVED); + framework_setBundleStateAndNotify(framework, entry->bnd, OSGI_FRAMEWORK_BUNDLE_RESOLVED); } } }
Workaround anti replay fail of GnuTLS
@@ -947,6 +947,16 @@ int mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext( uint32_t obfuscated_ticket_age = (uint32_t)( now - session->ticket_received ); + /* Workaround for anti replay fail of GnuTLS server. + * + * The time unit of ticket age is milliseconds, but current unit is + * seconds. If the ticket was received at the end of first second and + * sent in next second, GnuTLS think it is replay attack. + * + */ + if( obfuscated_ticket_age > 0 ) + obfuscated_ticket_age -= 1; + obfuscated_ticket_age *= 1000; obfuscated_ticket_age += session->ticket_age_add;
set irq priority for freertos
@@ -51,7 +51,10 @@ void board_init(void) SysTick_Config(SystemCoreClock / 1000); #elif CFG_TUSB_OS == OPT_OS_FREERTOS // If freeRTOS is used, IRQ priority is limit by max syscall ( smaller is higher ) -// NVIC_SetPriority(USB0_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY ); + NVIC_SetPriority(USB_OTG1_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY ); +#ifdef USB_OTG2_IRQn + NVIC_SetPriority(USB_OTG2_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY ); +#endif #endif // LED
GraphContent: fix emphasis
@@ -260,7 +260,20 @@ const renderers = { </Text> ); }, - + strong: ({ children }) => { + return ( + <Text fontWeight="bold"> + {children} + </Text> + ); + }, + emphasis: ({ children }) => { + return ( + <Text fontStyle="italic" fontSize="1" lineHeight={'20px'}> + {children} + </Text> + ) + }, blockquote: ({ children, tall, ...rest }) => { return ( <Text