message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Fix test_nsalloc_realloc_long_ge_name() to work in builds | @@ -11620,8 +11620,8 @@ START_TEST(test_nsalloc_realloc_long_ge_name)
";"
"</doc>";
ExtOption options[] = {
- { "foo", "<!ELEMENT el EMPTY>" },
- { "bar", "<el/>" },
+ { XCS("foo"), "<!ELEMENT el EMPTY>" },
+ { XCS("bar"), "<el/>" },
{ NULL, NULL }
};
int i;
|
Update rtdef.h
Update version number to v4.0.1 | * 2018-11-22 Jesven add smp member to struct rt_thread
* add struct rt_cpu
* add smp relevant macros
+ * 2019-01-27 Bernard change version number to v4.0.1
*/
#ifndef __RT_DEF_H__
@@ -50,7 +51,7 @@ extern "C" {
/* RT-Thread version information */
#define RT_VERSION 4L /**< major version number */
#define RT_SUBVERSION 0L /**< minor version number */
-#define RT_REVISION 0L /**< revise version number */
+#define RT_REVISION 1L /**< revise version number */
/* RT-Thread version */
#define RTTHREAD_VERSION ((RT_VERSION * 10000) + \
|
CsrUtil: Fix called-as-tool detection | @@ -109,7 +109,6 @@ UefiMain (
CHAR16 *EndPtr;
UINTN Argc;
CHAR16 **Argv;
- CHAR16 **OldArgv;
UINT32 CsrConfig;
UINT32 Attributes;
@@ -120,7 +119,6 @@ UefiMain (
return Status;
}
- OldArgv = Argv;
Status = SplitArguments (&Argc, &Argv);
#ifdef PRINT_ARGUMENTS
@@ -295,7 +293,7 @@ UefiMain (
}
Print (L")\n");
- if (OldArgv != Argv) {
+ if (StrCmp (Argv[0], L"Self") == 0) {
//
// Pause if detect called as tool
//
|
graph: subscribe to keys globally | @@ -28,7 +28,6 @@ const groupSubscriptions: AppSubscription[] = [
];
const graphSubscriptions: AppSubscription[] = [
- ['/keys', 'graph-store'],
['/updates', 'graph-store']
];
@@ -58,6 +57,7 @@ export default class GlobalSubscription extends BaseSubscription<StoreState> {
this.subscribe('/all', 's3-store');
this.subscribe('/all', 'launch');
this.subscribe('/all', 'weather');
+ this.subscribe('/keys', 'graph-store');
}
restart() {
|
Replace "four bytes" with "two bytes" in macro documentation
When writing the documentation 4 bytes was written instead of 2 for
MBEDTLS_UINT16_LE | @@ -163,12 +163,12 @@ extern void (*mbedtls_test_hook_test_fail)( const char * test, int line, const c
#endif
/**
- * Get the unsigned 16 bits integer corresponding to four bytes in
+ * Get the unsigned 16 bits integer corresponding to two bytes in
* little-endian order (LSB first).
*
- * \param data Base address of the memory to get the four bytes from.
+ * \param data Base address of the memory to get the two bytes from.
* \param offset Offset from \p base of the first and least significant
- * byte of the four bytes to build the 16 bits unsigned
+ * byte of the two bytes to build the 16 bits unsigned
* integer from.
*/
#ifndef MBEDTLS_GET_UINT16_LE
|
kpoint.c changed signed type to long | @@ -642,7 +642,7 @@ static size_t get_dense_ir_reciprocal_mesh_normal(int grid_address[][3],
/* grid: reducible grid points */
/* ir_mapping_table: the mapping from each point to ir-point. */
- ptrdiff_t i;
+ long i;
size_t grid_point_rot;
int j;
int address_double[3], address_double_rot[3];
@@ -682,7 +682,7 @@ get_dense_ir_reciprocal_mesh_distortion(int grid_address[][3],
const int is_shift[3],
const MatINT *rot_reciprocal)
{
- ptrdiff_t i;
+ long i;
size_t grid_point_rot;
int j, k, indivisible;
int address_double[3], address_double_rot[3];
@@ -746,7 +746,7 @@ get_dense_ir_reciprocal_mesh_distortion(int grid_address[][3],
static size_t get_dense_num_ir(size_t ir_mapping_table[], const int mesh[3])
{
- ptrdiff_t i;
+ long i;
size_t num_ir;
num_ir = 0;
|
fix: on_ping calling wrong callback | @@ -298,7 +298,7 @@ cws_custom_new(struct websockets *ws, const char ws_protocols[])
.on_connect = &cws_on_connect_cb,
.on_text = &cws_on_text_cb,
.on_binary = &cws_on_binary_cb,
- .on_ping = &cws_on_pong_cb,
+ .on_ping = &cws_on_ping_cb,
.on_pong = &cws_on_pong_cb,
.on_close = &cws_on_close_cb,
.data = ws
|
CI: Add some legacy stuff that we do not test in GitHub CI yet
There are some options that seem to belong to the legacy build. | @@ -107,7 +107,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: config
- run: ./config -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 && perl configdata.pm --dump
+ run: ./config -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 && perl configdata.pm --dump
- name: make
run: make -s -j4
- name: make test
|
feat(fabric test):
add fabric nodes discover test case "Discover_Fail_orgName_ERR" | @@ -513,6 +513,32 @@ START_TEST(test_003NodesDiscover_0011Discover_Fail_ChainID_ERR)
}
END_TEST
+START_TEST(test_003NodesDiscover_0012Discover_Fail_orgName_ERR)
+{
+ BSINT32 rtnVal;
+ BoatHlfabricTx tx_ptr;
+ BoatHlfabricWallet *g_fabric_wallet_ptr = NULL;
+ BoatHlfabricWalletConfig wallet_config = get_fabric_wallet_settings();
+ BoatIotSdkInit();
+ /* 1. execute unit test */
+ rtnVal = BoatWalletCreate(BOAT_PROTOCOL_HLFABRIC, NULL, &wallet_config, sizeof(BoatHlfabricWalletConfig));
+ ck_assert_int_eq(rtnVal, BOAT_SUCCESS);
+ g_fabric_wallet_ptr = BoatGetWalletByIndex(rtnVal);
+ ck_assert(g_fabric_wallet_ptr != NULL);
+ rtnVal = BoatHlfabricTxInit(&tx_ptr, g_fabric_wallet_ptr, NULL, "mycc", NULL, "mychannel", "Org1MSP11");
+ ck_assert_int_eq(rtnVal, BOAT_SUCCESS);
+ long int timesec = 0;
+ time(×ec);
+ rtnVal = BoatHlfabricTxSetTimestamp(&tx_ptr, timesec, 0);
+ ck_assert_int_eq(rtnVal, BOAT_SUCCESS);
+ rtnVal = BoatHlfabricDiscoverySubmit(&tx_ptr,wallet_config.nodesCfg);
+ ck_assert_int_eq(rtnVal, BOAT_ERROR);
+ BoatHlfabricTxDeInit(&tx_ptr);
+ BoatIotSdkDeInit();
+ fabricWalletConfigFree(wallet_config);
+}
+END_TEST
+
Suite *make_nodesDiscover_suite(void)
{
/* Create Suite */
@@ -535,6 +561,7 @@ Suite *make_nodesDiscover_suite(void)
tcase_add_test(tc_nodesDiscover_api, test_003NodesDiscover_0009Discover_Fail_nodesCfg_endorser_NULL);
tcase_add_test(tc_nodesDiscover_api, test_003NodesDiscover_0010Discover_Fail_ChaincodeID_name_ERR);
tcase_add_test(tc_nodesDiscover_api, test_003NodesDiscover_0011Discover_Fail_ChainID_ERR);
+ tcase_add_test(tc_nodesDiscover_api, test_003NodesDiscover_0012Discover_Fail_orgName_ERR);
return s_nodesDiscover;
}
|
Tests: wait for unit.pid file before running tests.
Waiting for control.unit.sock was replaced by unit.pid due to current problem
with race between connect() and listen() calls for control.unit.sock.
This change should be reverted after fix. | @@ -185,7 +185,10 @@ class TestUnit(unittest.TestCase):
atexit.register(self.stop)
- if not self.waitforfiles(self.testdir + '/control.unit.sock'):
+ # Due to race between connect() and listen() after the socket binding
+ # tests waits for unit.pid file which is created after listen().
+
+ if not self.waitforfiles(self.testdir + '/unit.pid'):
exit("Could not start unit")
self.skip_alerts = [
|
Deploy coverage to GitHub pages | @@ -21,9 +21,11 @@ docker run \
${IMAGE_NAME} /bin/bash -c \
"mkdir build && pushd build && \
cmake ${SRC_DIR} && \
- cmake --build . --target docs && \
+ cmake --build . --target docs coverage && \
chown -R $(id -u):$(id -g) docs && \
+ chown -R $(id -u):$(id -g) coverage && \
cp -a docs/doxygen ${STORAGE}/doxygen && \
+ cp -a coverage ${STORAGE}/doxygen/html && \
popd"
docker rmi ${IMAGE_NAME}
|
fixing regexp to remove right spaces | @@ -6,7 +6,7 @@ function pretty.reindent_c(input)
local blank = false
for line in input:gmatch("([^\n]*)") do
local do_print = true
- line = line:match("^[ \t]*(.*)[ \t]*$")
+ line = line:match("^[ \t]*(.-)[ \t]*$")
if #line == 0 then
if blank or indent > 0 then
do_print = false
|
fix for
Possible null pointer dereference | @@ -331,6 +331,7 @@ get_tagged_value:
*err |= CborErrorIllegalType;
return;
} else {
+ if (*prev) != 0 {
(*prev)->next = _alloc_rep();
if ((*prev)->next == NULL) {
*err = CborErrorOutOfMemory;
@@ -338,6 +339,11 @@ get_tagged_value:
}
prev = &(*prev)->next;
}
+ else {
+ *err = CborErrorOutOfMemory;
+ return;
+ }
+ }
(*prev)->type = OC_REP_OBJECT;
(*prev)->next = 0;
oc_rep_t **obj = &(*prev)->value.object;
|
nimble/ll: Fix not re-initializing CSS on HCI reset
Reset CSS configuration to defaults on HCI reset. Otherwise we could
end up with enabled CSS after HCI reset. | @@ -1198,6 +1198,14 @@ ble_ll_sched_init(void)
g_ble_ll_sched_q_head_changed = 0;
+#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
+ memset(&g_ble_ll_sched_css, 0, sizeof (g_ble_ll_sched_css));
+#if !MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED_FIXED)
+ g_ble_ll_sched_css.slot_us = MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED_SLOT_US);
+ g_ble_ll_sched_css.period_slots = MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED_PERIOD_SLOTS);
+#endif
+#endif
+
return 0;
}
|
no game start | @@ -662,6 +662,7 @@ void attachdiskswapinterface(){
void retro_set_environment(retro_environment_t cb)
{
struct retro_log_callback logging;
+ BOOL allow_no_game = true;
environ_cb = cb;
@@ -688,6 +689,8 @@ void retro_set_environment(retro_environment_t cb)
{ NULL, NULL },
};
+ environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME, &allow_no_game);
+
if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging))
log_cb = logging.log;
else
@@ -1015,7 +1018,6 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
bool retro_load_game(const struct retro_game_info *game)
{
-
//get system dir
const char* syspath = 0;
char np2path[4096];
@@ -1039,7 +1041,10 @@ bool retro_load_game(const struct retro_game_info *game)
sprintf(np2cfg.biospath,"%s%c",np2path,G_DIR_SEPARATOR);
+ if(game != NULL)
strcpy(RPATH,game->path);
+ else
+ strcpy(RPATH,"");
attachdiskswapinterface();
|
rename HPC to SCALAPACK | @@ -19,7 +19,6 @@ MAKEFLAGS += -R
AR=./ar_lock.sh
# use for ppc64le HPC
-HPC?=0
MKL?=0
CUDA?=0
ACML?=0
@@ -27,6 +26,7 @@ OMP?=1
SLINK?=0
DEBUG?=0
FFTWTHREADS?=1
+SCALAPACK?=0
ISMRMRD?=0
NOEXEC_STACK?=0
PARALLEL?=0
@@ -49,9 +49,6 @@ NNAME = $(shell uname -n)
MYLINK=ln
-ifneq (,$(findstring ppc64le,$(shell uname -r)))
- HPC = 1
-endif
ifeq ($(UNAME),Darwin)
BUILDTYPE = MacOSX
@@ -349,7 +346,7 @@ endif
# BLAS/LAPACK
-ifeq ($(HPC),1)
+ifeq ($(SCALAPACK),1)
BLAS_L := -lopenblas -lscalapack
else
ifeq ($(ACML),1)
@@ -454,7 +451,7 @@ endif
# change for static linking
ifeq ($(SLINK),1)
-ifeq ($(HPC),1)
+ifeq ($(SCALAPACK),1)
BLAS_L += -lgfortran -lquadmath
else
# work around fortran problems with static linking
|
Fix LCOV exclusion symbols in xmlparse.c | @@ -1885,7 +1885,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
positionPtr = bufferPtr;
return XML_STATUS_SUSPENDED;
- /* LCOV_EXCL_END */
+ /* LCOV_EXCL_STOP */
case XML_INITIALIZED:
case XML_PARSING:
ps_parsing = XML_FINISHED;
@@ -3880,7 +3880,7 @@ doIgnoreSection(XML_Parser parser,
*/
*eventPP = next;
return XML_ERROR_UNEXPECTED_STATE;
- /* LCOV_EXCL_END */
+ /* LCOV_EXCL_STOP */
}
/* not reached */
}
|
v2.0.30 landed | -ejdb2 (2.0.30) UNRELEASED; urgency=medium
+ejdb2 (2.0.30) testing; urgency=medium
* Upgraded to iowow v1.3.29
- -- Anton Adamansky <[email protected]> Fri, 15 Nov 2019 13:26:58 +0700
+ -- Anton Adamansky <[email protected]> Fri, 15 Nov 2019 13:55:03 +0700
ejdb2 (2.0.29) testing; urgency=medium
|
zephyr: main: initialize the buttons
Initialize the button states and enables the interrupts.
BRANCH=None
TEST=With the following CLs, tested the volume buttons working. | #include <sys/printk.h>
#include <zephyr.h>
+#include "button.h"
#include "chipset.h"
#include "ec_tasks.h"
#include "hooks.h"
@@ -47,6 +48,11 @@ void main(void)
keyboard_scan_init();
}
+ if (IS_ENABLED(CONFIG_DEDICATED_RECOVERY_BUTTON) ||
+ IS_ENABLED(CONFIG_VOLUME_BUTTONS)) {
+ button_init();
+ }
+
if (IS_ENABLED(CONFIG_PLATFORM_EC_ESPI)) {
if (zephyr_shim_setup_espi() < 0) {
printk("Failed to init eSPI!\n");
|
Fix compile errors int the standalone solution | @@ -10,6 +10,7 @@ namespace SLua
/// </summary>
public class Logger
{
+#if !SLUA_STANDALONE
private static UnityEngine.Object FindScriptByMsg(string msg)
{
#if UNITY_EDITOR
@@ -31,6 +32,7 @@ namespace SLua
#endif
return null;
}
+#endif
public static void Log(string msg)
{
|
rune/libenclave/skeleton: Fix a compilation error
In the GNU C Library, "major" is defined by <sys/sysmacros.h> starting from glibc-2.25,
the macros major and minor are only available in <sys/sysmacros.h>. This fix is for historical compatibility. | #include <sys/mman.h>
#include <sys/stat.h>
#include <sys/time.h>
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 25
#include <sys/types.h>
+#else
+#include <sys/sysmacros.h>
+#endif
#include "defines.h"
#include "sgx_call.h"
|
Docker: Install YAEP in Debian Stretch | @@ -99,6 +99,15 @@ RUN echo '\
/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/\n' > /etc/ld.so.conf.d/jdk.conf
RUN ldconfig
+# YAEP
+RUN cd /tmp \
+ && git clone --depth 1 https://github.com/sanssecours/yaep.git \
+ && cd yaep \
+ && env CXXFLAGS='-fPIC' ./configure \
+ && make -C src install \
+ && cd .. \
+ && rm -r yaep
+
# Create User:Group
# The id is important as jenkins docker agents use the same id that is running
# on the slaves to execute containers
|
Document scrcpy via SSH tunnel in README | @@ -216,6 +216,29 @@ scrcpy -s 0123456789abcdef # short version
You can start several instances of _scrcpy_ for several devices.
+#### SSH tunnel
+
+To connect to a remote device, it is possible to connect a local `adb` client to
+a remote `adb` server (provided they use the same version of the _adb_
+protocol):
+
+```bash
+adb kill-server # kill the local adb server on 5037
+ssh -CN -L5037:localhost:5037 -R27183:localhost:27183 your_remote_computer
+# keep this open
+```
+
+From another terminal:
+
+```bash
+scrcpy
+```
+
+Like for wireless connections, it may be useful to reduce quality:
+
+```
+scrcpy -b2M -m800 --max-fps 15
+```
### Window configuration
|
set rx_sync and tx_sync to zero by default in sdr-transceiver.c | @@ -40,7 +40,6 @@ int main(int argc, char *argv[])
tx_ctrl_handler,
tx_data_handler
};
- volatile uint32_t *slcr;
volatile void *cfg, *sts;
char *end;
struct sockaddr_in addr;
@@ -64,8 +63,6 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
}
- slcr = mmap(NULL, sysconf(_SC_PAGESIZE), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0xF8000000);
-
switch(number)
{
case 1:
@@ -103,11 +100,13 @@ int main(int argc, char *argv[])
/* set default rx phase increment */
*rx_freq = (uint32_t)floor(600000/125.0e6*(1<<30)+0.5);
+ *rx_sync = 0;
/* set default rx sample rate */
*rx_rate = 625;
/* set default tx phase increment */
*tx_freq = (uint32_t)floor(600000/125.0e6*(1<<30)+0.5);
+ *tx_sync = 0;
/* set default tx sample rate */
*tx_rate = 625;
@@ -170,6 +169,7 @@ void *rx_ctrl_handler(void *arg)
/* set default rx phase increment */
*rx_freq = (uint32_t)floor(600000/125.0e6*(1<<30)+0.5);
+ *rx_sync = 0;
/* set default rx sample rate */
*rx_rate = 625;
@@ -214,6 +214,7 @@ void *rx_ctrl_handler(void *arg)
/* set default rx phase increment */
*rx_freq = (uint32_t)floor(600000/125.0e6*(1<<30)+0.5);
+ *rx_sync = 0;
/* set default rx sample rate */
*rx_rate = 625;
@@ -260,6 +261,7 @@ void *tx_ctrl_handler(void *arg)
*gpio = 0;
/* set default tx phase increment */
*tx_freq = (uint32_t)floor(600000/125.0e6*(1<<30)+0.5);
+ *tx_sync = 0;
/* set default tx sample rate */
*tx_rate = 625;
@@ -314,6 +316,7 @@ void *tx_ctrl_handler(void *arg)
*gpio = 0;
/* set default tx phase increment */
*tx_freq = (uint32_t)floor(600000/125.0e6*(1<<30)+0.5);
+ *tx_sync = 0;
/* set default tx sample rate */
*tx_rate = 625;
|
update the comments of opentimers | @@ -64,14 +64,12 @@ opentimers_id_t opentimers_create(void){
\brief schedule a period refer to comparing value set last time.
This function will schedule a timer which expires when the timer count reach
-to lastCompareValue + duration.
-
-Note: as this function schedule time depending on last compare value. It
-can't be called firstly after the timer is created.
+to current counter + duration.
\param[in] id indicates the timer id
\param[in] duration indicates the period asked for schedule since last comparing value
\param[in] uint_type indicates the unit type of this schedule: ticks or ms
+\param[in] timer_type indicates the timer type of this schedule: oneshot or periodic
\param[in] cb indicates when this scheduled timer fired, call this callback function.
*/
void opentimers_scheduleIn(opentimers_id_t id,
@@ -167,7 +165,8 @@ void opentimers_scheduleIn(opentimers_id_t id,
\brief schedule a period refer to given reference.
This function will schedule a timer which expires when the timer count reach
-to lastCompareValue + reference.
+to duration + reference. This function will be used in the implementation of slot FSM.
+All timers use this function are ONE_SHOT type timer.
\param[in] id indicates the timer id
\param[in] duration indicates the period asked for schedule after a given time indicated by reference parameter.
|
Update connection API comments | @@ -161,7 +161,7 @@ espi_conn_init(void) {
* \param[in] host: Connection host. In case of IP, write it as string, ex. "192.168.1.1"
* \param[in] port: Connection port
* \param[in] arg: Pointer to user argument passed to connection if successfully connected
- * \param[in] cb_func: Callback function for this connection. Set to NULL in case of default user callback function
+ * \param[in] cb_func: Callback function for this connection. Set to `NULL` in case of default user callback function
* \param[in] blocking: Status whether command should be blocking or not
* \return \ref espOK on success, member of \ref espr_t enumeration otherwise
*/
@@ -424,7 +424,7 @@ int8_t
esp_conn_getnum(esp_conn_p conn) {
int8_t res = -1;
if (conn != NULL && espi_is_valid_conn_ptr(conn)) {
- /* Protection not needed as every connection always has the same number */
+ /* Protection not needed as every connection has always the same number */
res = conn->num; /* Get number */
}
return res;
|
Fix compile warning in DECOMPRESSOR=ON builds | @@ -842,6 +842,7 @@ static void construct_block_size_descriptor_2d(
// Gather all the decimation grids that can be used with the current block
#if !defined(ASTCENC_DECOMPRESS_ONLY)
const float *percentiles = get_2d_percentile_table(x_texels, y_texels);
+ float always_threshold = 0.0f;
#else
// Unused in decompress-only builds
(void)can_omit_modes;
@@ -853,8 +854,6 @@ static void construct_block_size_descriptor_2d(
unsigned int always_block_mode_count = 0;
unsigned int always_decimation_mode_count = 0;
- float always_threshold = 0.0f;
-
// Iterate twice; first time keep the "always" blocks, second time keep the "non-always" blocks.
// This ensures that the always block modes and decimation modes are at the start of the list.
for (unsigned int j = 0; j < 2; j ++)
|
Tweak to atmesc.c. | @@ -2217,7 +2217,7 @@ void LogBodyAtmEsc(BODY *body,CONTROL *control,OUTPUT *output,SYSTEM *system,UPD
for (iOut=OUTSTARTATMESC;iOut<OUTENDATMESC;iOut++) {
if (output[iOut].iNum > 0) {
- printf("%d\n",output[iOut].iNum);
+ printf("%d\n",iOut);
fflush(stdout);
WriteLogEntry(body,control,&output[iOut],system,update,fnWrite[iOut],fp,iBody);
}
|
rename nodejs extension | @@ -69,7 +69,7 @@ android:
## Note: in order to simplify debugging only app messages and system channels with priority informative and higher, and any errors are enabled by default
logcatFilter: APP:I StrictMode:I DEBUG:I *:E
-extensions: ["jxcore"]
+extensions: ["nodejs"]
rhobundle:
exclude_items:
|
Fix a mistake via merge commit | @@ -137,7 +137,7 @@ static TVector<TString> GetAllMetrics() {
return {"Logloss", "CrossEntropy", "RMSE", "MAE", "Quantile", "LogLinQuantile",
"MAPE", "Poisson", "MultiClass", "MultiClassOneVsAll", "PairLogit", "PairLogitPairwise",
"YetiRank", "YetiRankPairwise", "QueryRMSE", "QuerySoftMax", "QueryCrossEntropy", "R2",
- "AUC", "Accuracy", "Precision", "Recall", "F1", "TotalF1", "MCC", "PairAccuracy", "QueryAverage",
+ "AUC", "Accuracy", "Precision", "Recall", "F1", "TotalF1", "MCC", "PairAccuracy", "AverageGain", "QueryAverage",
"PFound", "NDCG", "BalancedAccuracy", "BalancedErrorRate", "Kappa", "WKappa", "BrierScore",
"MSLE", "MedianAbsoluteError", "ZeroOneLoss", "HammingLoss", "HingeLoss", "SMAPE",
"PrecisionAt", "RecallAt", "MAP", "LogLikelihoodOfPrediction"};
@@ -161,7 +161,7 @@ void ParseCommandLine(int argc, const char* argv[],
TVector<TString> customMetrics = GetAllMetrics();
parser.AddLongOption("custom-metric",
- "A metric might have params, then params should be written in format Loss:paramName=value. Loss should be one of: Logloss, CrossEntropy, RMSE, MAE, Quantile, LogLinQuantile, MAPE, Poisson, MultiClass, MultiClassOneVsAll, PairLogit, PairLogitPairwise, YetiRank, YetiRankPairwise, QueryRMSE, QuerySoftMax, QueryCrossEntropy, R2, AUC, Accuracy, Precision, Recall, F1, TotalF1, MCC, PairAccuracy, AverageGain, PFound, NDCG, BalancedAccuracy, BalancedErrorRate, Kappa, WKappa, BrierScore, MSLE, MedianAbsoluteError, ZeroOneLoss, HammingLoss, HingeLoss, SMAPE, PrecisionAt, RecallAt, MAP")
+ "A metric might have params, then params should be written in format Loss:paramName=value. Loss should be one of: " + JoinRange(",", customMetrics.begin(), customMetrics.end()))
.AddLongName("custom-loss")
.RequiredArgument("comma separated list of metric functions")
.Handler1T<TString>([plainJsonPtr](const TString& lossFunctionsLine) {
|
Update Version.hpp
Update Version.hpp to today's date to force GitHub Action rerun (it's stuck in a bad state...) | #define MAT_VERSION_HPP
// WARNING: DO NOT MODIFY THIS FILE!
// This file has been automatically generated, manual changes will be lost.
-#define BUILD_VERSION_STR "3.2.239.1"
-#define BUILD_VERSION 3,2,239,1
+#define BUILD_VERSION_STR "3.2.253.1"
+#define BUILD_VERSION 3,2,253,1
#ifndef RESOURCE_COMPILER_INVOKED
#include <stdint.h>
@@ -30,7 +30,7 @@ namespace ARIASDK_NS_BEGIN {
uint64_t const Version =
((uint64_t)3 << 48) |
((uint64_t)2 << 32) |
- ((uint64_t)239 << 16) |
+ ((uint64_t)253 << 16) |
((uint64_t)1);
} ARIASDK_NS_END
|
set rxpk_done when it's expectedFrame. | @@ -233,13 +233,12 @@ void cb_endFrame(PORT_TIMER_WIDTH timestamp) {
// toggle led if the frame is expected
if (expectedFrame){
+ // indicate I just received a packet from bsp_radio_tx mote
+ app_vars.rxpk_done = 1;
leds_debug_toggle();
}
- // indicate I just received a packet from bsp_radio_tx mote
- app_vars.rxpk_done = 1;
-
// keep listening (needed for at86rf215 radio)
radio_rxEnable();
radio_rxNow();
|
esp32/psram: ESP32-PICO-V3 does not have PSRAM and does not support external PSRAM | @@ -816,6 +816,9 @@ esp_err_t IRAM_ATTR psram_enable(psram_cache_mode_t mode, psram_vaddr_mode_t vad
}
psram_io.psram_clk_io = D2WD_PSRAM_CLK_IO;
psram_io.psram_cs_io = D2WD_PSRAM_CS_IO;
+ } else if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4 && esp_efuse_get_chip_ver() >= 3) {
+ ESP_EARLY_LOGE(TAG, "This chip is ESP32-PICO-V3. It does not support PSRAM (disable it in Kconfig)");
+ abort();
} else if ((pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2) || (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4)) {
ESP_EARLY_LOGI(TAG, "This chip is ESP32-PICO");
rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
|
Re-enable ompd source copy in build_openmp.sh. | @@ -281,7 +281,6 @@ if [ "$1" == "install" ] ; then
fi
# we do not yet have OMPD in llvm 12, disable this for now.
- if [ "$AOMP_MAJOR_VERSION" != "13" ] ; then
# Copy selected debugable runtime sources into the installation lib-debug/src directory
# to satisfy the above -fdebug-prefix-map.
$SUDO mkdir -p $AOMP_INSTALL_DIR/lib-debug/src/openmp/runtime/src
@@ -296,4 +295,3 @@ if [ "$1" == "install" ] ; then
$SUDO cp -rp $AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp/libompd/src $AOMP_INSTALL_DIR/lib-debug/src/openmp/libompd
fi
fi
-fi
|
change cloog-isl's repository to the current active one
appears to be dead. Cloog's active repo is
now at Switch to the latter. Commit
head remains the same. | url = git://repo.or.cz/isl.git
[submodule "cloog-isl"]
path = cloog-isl
- url = git://repo.or.cz/cloog.git
+ url = https://github.com/periscop/cloog.git
[submodule "piplib"]
path = piplib
url = https://github.com/periscop/piplib.git
|
xive: Add locking to some API calls
The interrupt allocation calls might happen from threaded inits
and the EQ management can happen from Linux. The underlying cache
management will require mutual exclusion. | @@ -1265,6 +1265,8 @@ uint32_t xive_alloc_hw_irqs(uint32_t chip_id, uint32_t count, uint32_t align)
x = chip->xive;
assert(x);
+ lock(&x->lock);
+
/* Allocate the HW interrupts */
base = x->int_hw_bot - count;
base &= ~(align - 1);
@@ -1272,6 +1274,7 @@ uint32_t xive_alloc_hw_irqs(uint32_t chip_id, uint32_t count, uint32_t align)
xive_err(x,
"HW alloc request for %d interrupts aligned to %d failed\n",
count, align);
+ unlock(&x->lock);
return XIVE_IRQ_ERROR;
}
x->int_hw_bot = base;
@@ -1285,6 +1288,8 @@ uint32_t xive_alloc_hw_irqs(uint32_t chip_id, uint32_t count, uint32_t align)
ive->w = IVE_VALID | IVE_MASKED | SETFIELD(IVE_EQ_DATA, 0ul, base + i);
}
+
+ unlock(&x->lock);
return base;
}
@@ -1300,6 +1305,8 @@ uint32_t xive_alloc_ipi_irqs(uint32_t chip_id, uint32_t count, uint32_t align)
x = chip->xive;
assert(x);
+ lock(&x->lock);
+
/* Allocate the IPI interrupts */
base = x->int_ipi_top + (align - 1);
base &= ~(align - 1);
@@ -1307,6 +1314,7 @@ uint32_t xive_alloc_ipi_irqs(uint32_t chip_id, uint32_t count, uint32_t align)
xive_err(x,
"IPI alloc request for %d interrupts aligned to %d failed\n",
count, align);
+ unlock(&x->lock);
return XIVE_IRQ_ERROR;
}
x->int_ipi_top = base + count;
@@ -1322,6 +1330,7 @@ uint32_t xive_alloc_ipi_irqs(uint32_t chip_id, uint32_t count, uint32_t align)
SETFIELD(IVE_EQ_DATA, 0ul, base + i);
}
+ unlock(&x->lock);
return base;
}
@@ -1523,6 +1532,8 @@ static bool xive_set_eq_info(uint32_t isn, uint32_t target, uint8_t prio)
return false;
}
+ lock(&x->lock);
+
/* Are we masking ? */
if (prio == 0xff) {
/* Masking, just set the M bit */
@@ -1539,6 +1550,7 @@ static bool xive_set_eq_info(uint32_t isn, uint32_t target, uint8_t prio)
if (!xive_eq_for_target(target, prio, &eq_blk, &eq_idx)) {
xive_err(x, "Can't find EQ for target/prio 0x%x/%d\n",
target, prio);
+ unlock(&x->lock);
return false;
}
@@ -1558,6 +1570,7 @@ static bool xive_set_eq_info(uint32_t isn, uint32_t target, uint8_t prio)
/* Scrub IVE from cache */
xive_ivc_scrub(x, x->chip_id, GIRQ_TO_IDX(isn));
+ unlock(&x->lock);
return true;
}
|
wireless: gs2200m: Fix to release a bound socket | @@ -90,6 +90,7 @@ enum sock_state_e
{
CLOSED,
OPENED,
+ BOUND,
CONNECTED,
};
@@ -527,19 +528,12 @@ static int close_request(int fd, FAR struct gs2200m_s *priv,
cid = usock->cid;
- if (SOCK_STREAM == usock->type && CONNECTED != usock->state)
+ if ((BOUND != usock->state) && (CONNECTED != usock->state))
{
ret = -EBADFD;
goto errout;
}
- if (SOCK_DGRAM == usock->type && 'z' == cid)
- {
- /* the udp socket is not bound */
-
- goto errout;
- }
-
memset(&clmsg, 0, sizeof(clmsg));
clmsg.cid = cid;
ioctl(priv->gsfd, GS2200M_IOC_CLOSE, (unsigned long)&clmsg);
@@ -783,7 +777,10 @@ static int sendto_request(int fd, FAR struct gs2200m_s *priv,
if (usock->cid != smsg.cid)
{
+ /* cid is newly assigned (bound) */
+
usock->cid = smsg.cid;
+ usock->state = BOUND;
}
if (0 != nret)
@@ -1023,6 +1020,7 @@ static int bind_request(int fd, FAR struct gs2200m_s *priv,
if (0 == ret)
{
usock->cid = bmsg.cid;
+ usock->state = BOUND;
}
prepare:
|
prov: update gmac to have additional init arguments | @@ -98,9 +98,30 @@ static size_t gmac_size(void)
return EVP_GCM_TLS_TAG_LEN;
}
-static int gmac_init(void *vmacctx)
+static int gmac_setkey(struct gmac_data_st *macctx,
+ const unsigned char *key, size_t keylen)
{
- return ossl_prov_is_running();
+ EVP_CIPHER_CTX *ctx = macctx->ctx;
+
+ if (keylen != (size_t)EVP_CIPHER_CTX_key_length(ctx)) {
+ ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
+ return 0;
+ }
+ if (!EVP_EncryptInit_ex(ctx, NULL, NULL, key, NULL))
+ return 0;
+ return 1;
+}
+
+static int gmac_init(void *vmacctx, const unsigned char *key,
+ size_t keylen, const OSSL_PARAM params[])
+{
+ struct gmac_data_st *macctx = vmacctx;
+
+ if (!ossl_prov_is_running() || !gmac_set_ctx_params(macctx, params))
+ return 0;
+ if (key != NULL)
+ return gmac_setkey(macctx, key, keylen);
+ return 1;
}
static int gmac_update(void *vmacctx, const unsigned char *data,
@@ -186,6 +207,8 @@ static int gmac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
OSSL_LIB_CTX *provctx = PROV_LIBCTX_OF(macctx->provctx);
const OSSL_PARAM *p;
+ if (params == NULL)
+ return 1;
if (ctx == NULL
|| !ossl_prov_cipher_load_from_params(&macctx->cipher, params, provctx))
return 0;
@@ -200,17 +223,11 @@ static int gmac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
NULL))
return 0;
- if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_KEY)) != NULL) {
- if (p->data_type != OSSL_PARAM_OCTET_STRING)
+ if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_KEY)) != NULL)
+ if (p->data_type != OSSL_PARAM_OCTET_STRING
+ || !gmac_setkey(macctx, p->data, p->data_size))
return 0;
- if (p->data_size != (size_t)EVP_CIPHER_CTX_key_length(ctx)) {
- ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
- return 0;
- }
- if (!EVP_EncryptInit_ex(ctx, NULL, NULL, p->data, NULL))
- return 0;
- }
if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_IV)) != NULL) {
if (p->data_type != OSSL_PARAM_OCTET_STRING)
return 0;
|
Add test for training data with const target. | @@ -24,8 +24,15 @@ CATBOOST_PATH = yatest.common.binary_path("catboost/app/catboost")
BOOSTING_TYPE = ['Ordered', 'Plain']
PREDICTION_TYPES = ['Probability', 'RawFormulaVal', 'Class']
-CLASSIFICATION_LOSSES = ['Logloss', 'CrossEntropy', 'MultiClass', 'MultiClassOneVsAll']
+BINCLASS_LOSSES = ['Logloss', 'CrossEntropy']
MULTICLASS_LOSSES = ['MultiClass', 'MultiClassOneVsAll']
+CLASSIFICATION_LOSSES = BINCLASS_LOSSES + MULTICLASS_LOSSES
+REGRESSION_LOSSES = ['MAE', 'MAPE', 'Poisson', 'Quantile', 'RMSE', 'LogLinQuantile', 'Lq']
+PAIRWISE_LOSSES = ['PairLogit', 'PairLogitPairwise']
+GROUPWISE_LOSSES = ['YetiRank', 'YetiRankPairwise', 'QueryRMSE', 'QuerySoftMax']
+RANKING_LOSSES = PAIRWISE_LOSSES + GROUPWISE_LOSSES
+ALL_LOSSES = CLASSIFICATION_LOSSES + REGRESSION_LOSSES + RANKING_LOSSES
+
OVERFITTING_DETECTOR_TYPE = ['IncToDec', 'Iter']
@@ -3660,6 +3667,34 @@ def test_no_target():
yatest.common.execute(cmd)
[email protected]('loss_function', ALL_LOSSES)
+def test_const_target(loss_function):
+ train_path = yatest.common.test_output_path('train')
+ cd_path = yatest.common.test_output_path('train.cd')
+
+ np.savetxt(
+ train_path,
+ [[0, 0, 0],
+ [0, 0, 1],
+ [0, 0, 2],
+ [0, 0, 3],
+ [0, 0, 4]],
+ delimiter='\t',
+ fmt='%.4f'
+ )
+ np.savetxt(cd_path, [('0', 'Target'), ('1', 'GroupId')], delimiter='\t', fmt='%s')
+
+ cmd = (
+ CATBOOST_PATH,
+ 'fit',
+ '--loss-function', loss_function,
+ '-f', train_path,
+ '--cd', cd_path,
+ )
+ with pytest.raises(yatest.common.ExecutionError):
+ yatest.common.execute(cmd)
+
+
def test_negative_weights():
train_path = yatest.common.test_output_path('train')
cd_path = yatest.common.test_output_path('train.cd')
|
OSSL_STORE: Prevent spurious error during loading private keys | @@ -206,34 +206,47 @@ static int der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
ok = 0; /* Assume that we fail */
+ ERR_set_mark();
if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
derp = der;
if (ctx->desc->d2i_PKCS8 != NULL) {
key = ctx->desc->d2i_PKCS8(NULL, &derp, der_len, ctx);
- if (ctx->flag_fatal)
+ if (ctx->flag_fatal) {
+ ERR_clear_last_mark();
goto end;
+ }
} else if (ctx->desc->d2i_private_key != NULL) {
key = ctx->desc->d2i_private_key(NULL, &derp, der_len);
}
- if (key == NULL && ctx->selection != 0)
+ if (key == NULL && ctx->selection != 0) {
+ ERR_clear_last_mark();
goto next;
}
+ }
if (key == NULL && (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
derp = der;
if (ctx->desc->d2i_PUBKEY != NULL)
key = ctx->desc->d2i_PUBKEY(NULL, &derp, der_len);
else
key = ctx->desc->d2i_public_key(NULL, &derp, der_len);
- if (key == NULL && ctx->selection != 0)
+ if (key == NULL && ctx->selection != 0) {
+ ERR_clear_last_mark();
goto next;
}
+ }
if (key == NULL && (selection & OSSL_KEYMGMT_SELECT_ALL_PARAMETERS) != 0) {
derp = der;
if (ctx->desc->d2i_key_params != NULL)
key = ctx->desc->d2i_key_params(NULL, &derp, der_len);
- if (key == NULL && ctx->selection != 0)
+ if (key == NULL && ctx->selection != 0) {
+ ERR_clear_last_mark();
goto next;
}
+ }
+ if (key == NULL)
+ ERR_clear_last_mark();
+ else
+ ERR_pop_to_mark();
/*
* Last minute check to see if this was the correct type of key. This
|
Working on depends on decorator | #include <stdlib.h>
#endif
-#define BOOST_TEST_MODULE "hydqual"
+#define BOOST_TEST_MODULE hydqual
#include <boost/test/included/unit_test.hpp>
#include <boost/filesystem.hpp>
#include "test_fixtures.hpp"
using namespace std;
-using namespace boost;
+using namespace utf = boost::unit_test;
BOOST_AUTO_TEST_SUITE (test_hyd_qual)
@@ -157,7 +157,7 @@ BOOST_FIXTURE_TEST_CASE(test_hydr_savefile, FixtureOpenClose)
BOOST_CHECK(filesystem::exists(hyd_file) == true);
}
-BOOST_FIXTURE_TEST_CASE(test_hydr_usefile, FixtureOpenClose, * unit_test::depends_on("test_hyd_qual/test_hydr_savefile"))
+BOOST_FIXTURE_TEST_CASE(test_hydr_usefile, FixtureOpenClose, * utf::depends_on("test_hyd_qual/test_hydr_savefile"))
{
string hyd_file("test_savefile.hyd");
|
Cleanup Custom Event instance args after editing
Fixes bug where Custom Event variables where still rendered in dialogue even after removing them from the parameter list. | @@ -608,21 +608,21 @@ const editCustomEvent = (state, action) => {
"scenes",
action.id,
newState.entities.scenes,
- patch.script
+ patch
);
newState = updateEntitiesCustomEventScript(
newState,
"actors",
action.id,
newState.entities.actors,
- patch.script
+ patch
);
newState = updateEntitiesCustomEventScript(
newState,
"triggers",
action.id,
newState.entities.triggers,
- patch.script
+ patch
);
}
@@ -684,8 +684,11 @@ const updateEntitiesCustomEventName = (state, type, id, entities, name) => {
return newState;
};
-const updateEntitiesCustomEventScript = (state, type, id, entities, script) => {
+const updateEntitiesCustomEventScript = (state, type, id, entities, patch) => {
+ const { script, variables, actors } = patch;
let newState = state;
+ const usedVariables = Object.keys(variables).map((i) => `$variable[${i}]$`);
+ const usedActors = Object.keys(actors).map((i) => `$actor[${i}]$`);
Object.values(entities).forEach(entity => {
if (!entity || !entity.script) {
return;
@@ -699,8 +702,18 @@ const updateEntitiesCustomEventScript = (state, type, id, entities, script) => {
if (event.args.customEventId !== id) {
return event;
}
+ const newArgs = Object.assign({ ...event.args });
+ Object.keys(newArgs).forEach((k) => {
+ if (k.startsWith("$") &&
+ !usedVariables.find((v) => v === k) &&
+ !usedActors.find((a) => a === k)
+ ) {
+ delete newArgs[k];
+ }
+ });
return {
...event,
+ args: newArgs,
children: {
script: [...script]
}
|
Disable all resgroup spill tests.
These tests were derived from the resqueue tests, however they did not
work stable enough with resgroup. We'll disable them for now to make the
pipeline green. Later we'll refactor and reenable them. | @@ -20,10 +20,10 @@ test: resgroup/resgroup_cancel_terminate_concurrency
# memory spill tests
#test: resgroup/resgroup_memory_hashagg_spill
#test: resgroup/resgroup_memory_hashjoin_spill
-test: resgroup/resgroup_memory_materialize_spill
-test: resgroup/resgroup_memory_sisc_mat_sort
+#test: resgroup/resgroup_memory_materialize_spill
+#test: resgroup/resgroup_memory_sisc_mat_sort
#test: resgroup/resgroup_memory_sisc_sort_spill
-test: resgroup/resgroup_memory_sort_spill
+#test: resgroup/resgroup_memory_sort_spill
#test: resgroup/resgroup_memory_spilltodisk
# regression tests
|
ExtendedTools: Fix building with legacy v142 toolset | #include "framemon.h"
// d3dkmddi requires the WDK (dmex)
+#if defined(NTDDI_WIN10_CO) && (NTDDI_VERSION >= NTDDI_WIN10_CO)
#ifdef __has_include
#if __has_include (<dxmini.h>) && \
__has_include (<d3dkmddi.h>) && \
@@ -48,6 +49,9 @@ __has_include (<d3dkmthk.h>)
#else
#include "d3dkmt/d3dkmthk.h"
#endif
+#else
+#include "d3dkmt/d3dkmthk.h"
+#endif
#define PH_RECORD_MAX_USAGE 1
|
Fixed segfault when attempting to process a malformed JSON string.
This ensure we have a valid JSON key before processing value.
Fixes | @@ -803,7 +803,7 @@ parse_json_string (void *ptr_data, const char *str, int (*cb) (void *, char *, c
ws_append_str (&key, json_get_string (&json, &len));
}
/* val */
- else if (ctx == JSON_ARRAY || ((level % 2) == 0 && ctx != JSON_ARRAY)) {
+ else if (key && (ctx == JSON_ARRAY || ((level % 2) == 0 && ctx != JSON_ARRAY))) {
val = xstrdup (json_get_string (&json, &len));
if ((ret = (*cb) (ptr_data, key, val)))
goto clean;
|
pg_stat_activity: document client_port being null
As suggested by Stephen Frost.
Discussion: | @@ -652,7 +652,8 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser
<entry><structfield>client_port</structfield></entry>
<entry><type>integer</type></entry>
<entry>TCP port number that the client is using for communication
- with this backend, or <literal>-1</literal> if a Unix socket is used
+ with this backend, or <literal>-1</literal> if a Unix socket is used.
+ If this field is null, it indicates that this is an internal server process.
</entry>
</row>
<row>
|
mem-leak in stats handling | @@ -363,6 +363,9 @@ exit:
return elts;
}
+/*
+ * Return a copy of the clients list.
+ */
vpe_client_registration_t *
get_clients_for_stat (u32 reg, u32 item)
{
@@ -381,10 +384,13 @@ get_clients_for_stat (u32 reg, u32 item)
registration = pool_elt_at_index (sm->stats_registrations[reg], p[0]);
vec_reset_length (clients);
- pool_foreach (client, registration->clients, (
- {
+
+ /* *INDENT-OFF* */
+ pool_foreach (client, registration->clients,
+ ({
vec_add1 (clients, *client);}
));
+ /* *INDENT-ON* */
return clients;
}
@@ -608,6 +614,7 @@ static void
reg_prev = reg;
}
}
+ vec_free (clients);
#if STATS_DEBUG > 0
fformat (stdout, "%U\n", format_vnet_combined_counters, mp);
#endif
@@ -2355,6 +2362,7 @@ static void
continue;
}
}
+ vec_free (clients);
#if STATS_DEBUG > 0
fformat (stdout, "%U\n", format_vnet_simple_counters, mp);
@@ -2408,6 +2416,7 @@ vl_api_vnet_ip4_fib_counters_t_handler (vl_api_vnet_ip4_fib_counters_t * mp)
continue;
}
}
+ vec_free (clients);
if (reg_prev && vl_api_can_send_msg (reg_prev))
{
@@ -2457,6 +2466,7 @@ vl_api_vnet_ip4_nbr_counters_t_handler (vl_api_vnet_ip4_nbr_counters_t * mp)
continue;
}
}
+ vec_free (clients);
/* *INDENT-ON* */
if (reg_prev && vl_api_can_send_msg (reg_prev))
@@ -2507,6 +2517,8 @@ vl_api_vnet_ip6_fib_counters_t_handler (vl_api_vnet_ip6_fib_counters_t * mp)
continue;
}
}
+ vec_free (clients);
+
/* *INDENT-ON* */
if (reg_prev && vl_api_can_send_msg (reg_prev))
{
@@ -2556,6 +2568,8 @@ vl_api_vnet_ip6_nbr_counters_t_handler (vl_api_vnet_ip6_nbr_counters_t * mp)
continue;
}
}
+ vec_free (clients);
+
/* *INDENT-ON* */
if (reg_prev && vl_api_can_send_msg (reg_prev))
{
|
Include the process PID in assertion-failure messages.
This should help to identify what happened when studying the postmaster
log after-the-fact.
While here, clean up some old comments in the same function.
Discussion: | /*-------------------------------------------------------------------------
*
* assert.c
- * Assert code.
+ * Assert support code.
*
* Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
* IDENTIFICATION
* src/backend/utils/error/assert.c
*
- * NOTE
- * This should eventually work with elog()
- *
*-------------------------------------------------------------------------
*/
#include "postgres.h"
/*
* ExceptionalCondition - Handles the failure of an Assert()
+ *
+ * We intentionally do not go through elog() here, on the grounds of
+ * wanting to minimize the amount of infrastructure that has to be
+ * working to report an assertion failure.
*/
void
ExceptionalCondition(const char *conditionName,
@@ -31,20 +32,21 @@ ExceptionalCondition(const char *conditionName,
const char *fileName,
int lineNumber)
{
+ /* Report the failure on stderr (or local equivalent) */
if (!PointerIsValid(conditionName)
|| !PointerIsValid(fileName)
|| !PointerIsValid(errorType))
- write_stderr("TRAP: ExceptionalCondition: bad arguments\n");
+ write_stderr("TRAP: ExceptionalCondition: bad arguments in PID %d\n",
+ (int) getpid());
else
- {
- write_stderr("TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n",
+ write_stderr("TRAP: %s(\"%s\", File: \"%s\", Line: %d, PID: %d)\n",
errorType, conditionName,
- fileName, lineNumber);
- }
+ fileName, lineNumber, (int) getpid());
/* Usually this shouldn't be needed, but make sure the msg went out */
fflush(stderr);
+ /* If we have support for it, dump a simple backtrace */
#ifdef HAVE_BACKTRACE_SYMBOLS
{
void *buf[100];
@@ -55,12 +57,12 @@ ExceptionalCondition(const char *conditionName,
}
#endif
-#ifdef SLEEP_ON_ASSERT
-
/*
- * It would be nice to use pg_usleep() here, but only does 2000 sec or 33
- * minutes, which seems too short.
+ * If configured to do so, sleep indefinitely to allow user to attach a
+ * debugger. It would be nice to use pg_usleep() here, but that can sleep
+ * at most 2G usec or ~33 minutes, which seems too short.
*/
+#ifdef SLEEP_ON_ASSERT
sleep(1000000);
#endif
|
README.md: simplify the description of the installation location of all components | @@ -85,7 +85,7 @@ After build Inclavare Containers on your system, you can use the following comma
sudo make install
```
-`rune` will be installed to `/usr/local/bin/rune` on your system. `shim-rune` will be installed to `/usr/local/bin/containerd-shim-rune-v2`. `epm` will be installed to `/usr/local/bin/epm`. `sgx-tools` will be installed to `/usr/local/bin/sgx-tools`.
+`{rune,shim-rune,epm,sgx-tools}` will be installed to `/usr/local/bin/{rune,containerd-shim-rune-v2,epm,sgx-tools}` on your system.
If you don't want to build and install Inclavare Containers from latest source code. We also provide RPM/DEB repository to help you install Inclavare Containers quickly. Please see the [steps about how to configure repository](https://github.com/alibaba/inclavare-containers/blob/master/docs/create_a_confidential_computing_kubernetes_cluster_with_inclavare_containers.md#1-add-inclavare-containers-repository) firstly. Then you can run the following command to install Inclavare Containers on your system.
|
Fix treeview settings abstraction regression | */
#include <ph.h>
-#include <settings.h>
#include <treenew.h>
#include <uxtheme.h>
@@ -5356,7 +5355,7 @@ VOID PhTnpPaint(
textRect.right = viewRect.right - 20;
textRect.bottom = viewRect.bottom - 5;
- if (PhGetIntegerSetting(L"EnableThemeSupport"))
+ if (Context->ThemeSupport)
{
SetTextColor(hdc, RGB(0xff, 0xff, 0xff));
}
|
misc: Initial 20.09-rc0 commit
Type:docs | # Release Notes {#release_notes}
+* @subpage release_notes_2009
* @subpage release_notes_2005
* @subpage release_notes_2001
* @subpage release_notes_19082
* @subpage release_notes_1609
* @subpage release_notes_1606
+@page release_notes_2005 Release notes for VPP 20.09
+
+TBD
+
@page release_notes_2005 Release notes for VPP 20.05
TBD
|
Filters always have to use \ regardless of target platform. | p.push()
tree.traverse(tr, {
onbranch = function(node, depth)
- p.push('<Filter Include="%s">', path.translate(node.path))
+ p.push('<Filter Include="%s">', path.translate(node.path, '\\'))
p.w('<UniqueIdentifier>{%s}</UniqueIdentifier>', os.uuid(node.path))
p.pop('</Filter>')
end
for _, file in ipairs(files) do
if file.parent.path then
p.push('<%s Include=\"%s\">', tag, path.translate(file.relpath))
- p.w('<Filter>%s</Filter>', path.translate(file.parent.path))
+ p.w('<Filter>%s</Filter>', path.translate(file.parent.path, '\\'))
p.pop('</%s>', tag)
else
p.w('<%s Include=\"%s\" />', tag, path.translate(file.relpath))
|
Pass scrcpy-noconsole arguments through to scrcpy
PR <https://github.com/Genymobile/scrcpy/pull/2052> | -CreateObject("Wscript.Shell").Run "cmd /c scrcpy.exe", 0, false
+strCommand = "cmd /c scrcpy.exe"
+
+For Each Arg In WScript.Arguments
+ strCommand = strCommand & " """ & replace(Arg, """", """""""""") & """"
+Next
+
+CreateObject("Wscript.Shell").Run strCommand, 0, false
|
new bv of pidx | @@ -49,11 +49,11 @@ function bv_pidx_initialize_vars
function bv_pidx_info
{
- export PIDX_VERSION=${PIDX_VERSION:-"1.0beta"}
- export PIDX_FILE=${PIDX_FILE:-"PIDX-${PIDX_VERSION}.tgz"}
+ export PIDX_VERSION=${PIDX_VERSION:-"0.9.1"}
+ export PIDX_FILE=${PIDX_FILE:-"PIDX-${PIDX_VERSION}.tar.gz"}
export PIDX_COMPATIBILITY_VERSION=${PIDX_COMPATIBILITY_VERSION:-"1.8"}
export PIDX_BUILD_DIR=${PIDX_BUILD_DIR:-"PIDX-${PIDX_VERSION}"}
-# export PIDX_URL=${PIDX_URL:-"http://www.pidx.info/downloads/PIDX-${PIDX_VERSION}/src"}
+ export PIDX_URL=${PIDX_URL:-"https://github.com/sci-visus/PIDX/archive/v$PIDX_VERSION"}
export PIDX_MD5_CHECKSUM=""
export PIDX_SHA256_CHECKSUM=""
}
|
mpi-families/openmpi: alternate approach to silence pbs linkage warning - add to modulefile | @@ -195,11 +195,6 @@ export BASEFLAGS
%{__cp} %{SOURCE3} .
%{__chmod} 700 pbs-config
export PATH="./:$PATH"
-
-# temporarily disable dynamic linkage for pbs
-if [ -e /opt/pbs/lib/libpbs.la ]; then
- mv /opt/pbs/lib/libpbs.la /tmp
-fi
%endif
./configure ${BASEFLAGS} || { cat config.log && exit 1; }
@@ -211,13 +206,6 @@ fi
make %{?_smp_mflags}
-# restore dynamic linkage for pbs
-%if %{with_tm}
-if [ -e /tmp/libpbs.la ]; then
- mv /tmp/libpbs.la /opt/pbs/lib/libpbs.la
-fi
-%endif
-
%install
# OpenHPC compiler designation
%ohpc_setup_compiler
@@ -247,6 +235,7 @@ module-whatis "URL: %{url}"
set version %{version}
setenv MPI_DIR %{install_path}
+setenv OMPI_MCA_mca_base_component_show_load_errors 0
%if 0%{with_pmix}
setenv OHPC_MPI_LAUNCHERS pmix
%endif
|
omit idle up for controls_override | @@ -403,8 +403,13 @@ void control() {
} else {
// CONDITION: idle up is turned ON
+ if (flags.controls_override) {
+ // override is active, set throttle to input
+ state.throttle = state.rx_filtered.throttle;
+ } else {
// throttle range is mapped from idle throttle value to 100%
state.throttle = (float)IDLE_THR + input_throttle_calc(state.rx_filtered.throttle) * (1.0f - (float)IDLE_THR);
+ }
if ((state.rx_filtered.throttle > THROTTLE_SAFETY) && (flags.in_air == 0)) {
// change the state of in air flag when first crossing the throttle
|
HV: Remove dead code wrapped by #if 0 | @@ -296,12 +296,6 @@ int cr_access_vmexit_handler(struct vcpu *vcpu)
/* mov to cr4 */
vmx_write_cr4(vcpu, *regptr);
break;
-#if 0
- case 0x14:
- /* mov from cr4 (this should not happen) */
- case 0x10:
- /* mov from cr0 (this should not happen) */
-#endif
case 0x08:
/* mov to cr8 */
vlapic_set_cr8(vcpu->arch_vcpu.vlapic, *regptr);
@@ -324,21 +318,6 @@ int cr_access_vmexit_handler(struct vcpu *vcpu)
return 0;
}
-#if 0
-/*
- * VMX_PROCBASED_CTLS_INVLPG is not enabled in the VM-execution
- * control therefore we don't need it's handler.
- *
- * INVLPG: this instruction Invalidates any translation lookaside buffer
- */
-int invlpg_handler(__unused struct vcpu *vcpu)
-{
- pr_fatal("INVLPG executed");
-
- return 0;
-}
-#endif
-
/*
* XSETBV instruction set's the XCR0 that is used to tell for which
* components states can be saved on a context switch using xsave.
|
BugID:17646731:Add yloop summary in mk | @@ -4,7 +4,7 @@ $(NAME)_COMPONENTS := kernel.fs.vfs
$(NAME)_MBINS_TYPE := kernel
$(NAME)_VERSION := 0.0.1
-$(NAME)_SUMMARY :=
+$(NAME)_SUMMARY := yloop provides the event schedule mechanism for resource constrained devices.
$(NAME)_SOURCES := src/yloop.c
$(NAME)_SOURCES += src/local_event.c
|
refix typo
see | @@ -854,7 +854,7 @@ void splitCacheStoreState (KDB * handle, Split * split, KeySet * global, Key * p
ELEKTRA_LOG_DEBUG ("SIZE STORAGE STORE STUFF");
for (size_t i = 0; i < split->size; ++i)
{
- // TODO: simplify this code below, seems like this effects only the last split anyway
+ // TODO: simplify this code below, seems like this affects only the last split anyway
if (!split->handles[i] || !split->handles[i]->mountpoint)
{
ELEKTRA_LOG_DEBUG (">>>> Skipping split->handle[%ld]: pseudo-backend or no mountpoint", i);
@@ -869,7 +869,7 @@ void splitCacheStoreState (KDB * handle, Split * split, KeySet * global, Key * p
ELEKTRA_ASSERT (i == (split->size - 1), "ERROR: NOT THE LAST SPLIT");
continue;
}
- // TODO: simplify this code above, seems like this effects only the last split anyway
+ // TODO: simplify this code above, seems like this affects only the last split anyway
char * name = 0;
if (strlen (keyName (split->handles[i]->mountpoint)) != 0)
|
hw/hal: Define a set of I2C error codes
HAL I2C implementations currently return MCU-specific status code. This
commit introduces a generic set of I2C error codes for all
implementations to return. | @@ -62,6 +62,23 @@ extern "C" {
* :c:func:`hal_i2c_read()`; --- read back data, setting 'last_op' to '1'
*/
+/*** I2C status codes (0=success). */
+
+/** Unknown error. */
+#define HAL_I2C_ERR_UNKNOWN 1
+
+/** Invalid argument. */
+#define HAL_I2C_ERR_INVAL 2
+
+/** MCU failed to report result of I2C operation. */
+#define HAL_I2C_ERR_TIMEOUT 3
+
+/** Slave responded to address with NACK. */
+#define HAL_I2C_ERR_ADDR_NACK 4
+
+/** Slave responded to data byte with NACK. */
+#define HAL_I2C_ERR_DATA_NACK 5
+
/**
* When sending a packet, use this structure to pass the arguments.
*/
@@ -77,8 +94,8 @@ struct hal_i2c_master_data {
* writing a 0x81 in its protocol, you would pass
* only the top 7-bits to this function as 0x40
*/
- uint8_t address
- /** Number of buffer bytes to transmit or receive */;
+ uint8_t address;
+ /** Number of buffer bytes to transmit or receive */
uint16_t len;
/** Buffer space to hold the transmit or receive */
uint8_t *buffer;
|
[build] add headers for sendfile() detect on MacOS
(thx ryandesign)
x-ref: | @@ -1612,6 +1612,9 @@ if test "$ac_cv_func_sendfile" = yes; then
#include <sys/sendfile.h>
#endif /* HAVE_SYS_SENDFILE_H */
#include <errno.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/uio.h>
int main() {
int o = 0;
if (-1 == sendfile(-1, 0, &o, 0) && errno == ENOSYS) return -1;
|
[fix] Align in TUnalignedArrayBuf and TUnalignedMemoryIterator have slighty different semantics. Remove unneeded sizeWithoutPadding param. | @@ -16,13 +16,14 @@ namespace NCB {
template <class T, unsigned Align = alignof(T)>
class TUnalignedArrayBuf {
public:
- TUnalignedArrayBuf(void* begin, size_t sizeInBytes, bool sizeWithoutPadding = true)
+ TUnalignedArrayBuf(void* begin, size_t sizeInBytes)
: Begin(begin)
- , SizeInBytes(sizeWithoutPadding ? sizeInBytes : sizeInBytes - sizeInBytes % Align)
+ , SizeInBytes(sizeInBytes)
{
CB_ENSURE_INTERNAL(
- !sizeWithoutPadding || !(SizeInBytes % sizeof(T)),
- "sizeWithoutPadding does not correspond to size of array of type " << TypeName<T>()
+ !(sizeInBytes % sizeof(T)),
+ "sizeInBytes =" << sizeInBytes << " does not correspond to size of array of type "
+ << TypeName<T>()
);
}
@@ -54,8 +55,8 @@ namespace NCB {
}
}
- TUnalignedMemoryIterator<T, Align> GetIterator() const {
- return TUnalignedMemoryIterator<T, Align>(Begin, SizeInBytes);
+ TUnalignedMemoryIterator<T> GetIterator() const {
+ return TUnalignedMemoryIterator<T>(Begin, SizeInBytes);
}
|
Use localtime() to format time_t in cvtTimeToZ().
Using gmtime() produced output skewed by the local timezone.
Since this function is currently only used for debug logging this is not a live bug in the field. | @@ -395,7 +395,7 @@ cvtTimeToZ(time_t value, char *buffer, size_t bufferSize)
ASSERT(buffer != NULL);
- size_t result = strftime(buffer, bufferSize, "%s", gmtime(&value));
+ size_t result = strftime(buffer, bufferSize, "%s", localtime(&value));
if (result == 0)
THROW(AssertError, "buffer overflow");
|
Add deprecation note to the README-ENGINES file | -ENGINES
+Engines
=======
-With OpenSSL 0.9.6, a new component was added to support alternative
-cryptography implementations, most commonly for interfacing with external
-crypto devices (eg. accelerator cards). This component is called ENGINE,
-and its presence in OpenSSL 0.9.6 (and subsequent bug-fix releases)
-caused a little confusion as 0.9.6** releases were rolled in two
-versions, a "standard" and an "engine" version. In development for 0.9.7,
-the ENGINE code has been merged into the main branch and will be present
-in the standard releases from 0.9.7 forwards.
+Deprecation Note
+----------------
+
+The ENGINE API was introduced in OpenSSL version 0.9.6 as a low level
+interface for adding alternative implementations of cryptographic
+primitives, most notably for integrating hardware crypto devices.
+
+The ENGINE interface has its limitations and it has been superseeded
+by the [PROVIDER API](README-Provider.md), it is deprecated in OpenSSL
+version 3.0. The following documentation is retained as an aid for
+users who need to maintain or support existing ENGINE implementations.
+Support for new hardware devices or new algorithms should be added
+via providers, and existing engines should be converted to providers
+as soon as possible.
+
+Built-in ENGINE implementations
+-------------------------------
There are currently built-in ENGINE implementations for the following
crypto devices:
|
NN: fix mean values for GS images. | @@ -28,6 +28,8 @@ def get_mean_values(mean_file):
blob.ParseFromString(data)
arr = np.array(caffe.io.blobproto_to_array(blob))[0]
mean_vals = [int(x.mean().round()) for x in arr]
+ if (len(mean_vals) < 3):
+ mean_vals += [mean_vals[0]] * (3 - len(mean_vals))
return mean_vals
def convert_to_x4_weights(weights):
|
Debug: Update readme file | @@ -124,7 +124,7 @@ reload-uefi
b DebugBreak
```
-For simplicitly `macgdb.tool` performs them all. Note, that you need to run `reload-uefi`
+For simplicitly `rungdb.tool` performs them all. Note, that you need to run `reload-uefi`
after any new binary loads.
#### CLANGDWARF
@@ -146,9 +146,9 @@ export EFI_SYMBOL_PATH="$WORKSPACE/Build/OvmfX64/NOOPT_CLANGPDB/X64:$WORKSPACE/B
```
The reason for this requirement is fragile `--add-gnudebug-link` option
-[implementation in llvm-objcopy](https://github.com/llvm/llvm-project/blob/f69eba07726a9fe084812aa224309d62c4bdd2e4/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp#L84-L90). It strips path from
-the debug file preserving only filename and also does not update
-DataDirectory debug entry.
+[implementation in llvm-objcopy](https://bugs.llvm.org/show_bug.cgi?id=45277).
+It strips path from the debug file preserving only filename and also does not
+update DataDirectory debug entry.
#### References
|
update monitor flow | @@ -90,7 +90,7 @@ static void alink_set_sta_mode()
//Check if in AP mode
wext_get_mode(WLAN0_NAME, &mode);
- if(mode == IW_MODE_MASTER) {
+ if(1) {
#if CONFIG_LWIP_LAYER
dhcps_deinit();
#endif
@@ -534,12 +534,10 @@ static void stop_monitor(hal_wifi_module_t *m)
{
DBG_8195A("stop_monitor\r\n");
- wifi_set_promisc(RTW_PROMISC_DISABLE, NULL, 0);
-
+ //wifi_set_promisc(RTW_PROMISC_DISABLE, NULL, 0);
#if CONFIG_AUTO_RECONNECT
- wifi_set_autoreconnect(RTW_AUTORECONNECT_INFINITE);
+ //wifi_set_autoreconnect(RTW_AUTORECONNECT_INFINITE);
#endif
-
return;
}
|
Continue though fail to get log | @@ -249,6 +249,15 @@ ShowErrorCommand(
for(Index = 0; Index < DimmIdsNum; Index++) {
ReturnedCount = RequestedCount;
+ ReturnCode = GetDimmHandleByPid(pDimmIds[Index], pDimms, DimmCount, &DimmHandle, &DimmIndex);
+ if (EFI_ERROR(ReturnCode)) {
+ goto Finish;
+ }
+ ReturnCode = GetPreferredDimmIdAsString(DimmHandle, pDimms[DimmIndex].DimmUid,
+ DimmStr, MAX_DIMM_UID_LENGTH);
+ if (EFI_ERROR(ReturnCode)) {
+ goto Finish;
+ }
ReturnCode = pNvmDimmConfigProtocol->GetErrorLog(pNvmDimmConfigProtocol,
&pDimmIds[Index],
1,
@@ -262,19 +271,9 @@ ShowErrorCommand(
if (pCommandStatus->GeneralStatus != NVM_SUCCESS) {
ReturnCode = MatchCliReturnCode(pCommandStatus->GeneralStatus);
}
- break;
+ Print(L"Failed to get error logs from DIMM (" FORMAT_STR L")\n", DimmStr);
+ continue;
}
-
- ReturnCode = GetDimmHandleByPid(pDimmIds[Index], pDimms, DimmCount, &DimmHandle, &DimmIndex);
- if (EFI_ERROR(ReturnCode)) {
- goto Finish;
- }
- ReturnCode = GetPreferredDimmIdAsString(DimmHandle, pDimms[DimmIndex].DimmUid,
- DimmStr, MAX_DIMM_UID_LENGTH);
- if (EFI_ERROR(ReturnCode)) {
- goto Finish;
- }
-
if (ReturnedCount == 0) {
Print(L"No errors found on DIMM (" FORMAT_STR L")\n", DimmStr);
}
@@ -438,11 +437,6 @@ ShowErrorCommand(
}
}
- if (EFI_ERROR(ReturnCode)) {
- Print(L"Failed to get error logs.\n");
- goto Finish;
- }
-
Finish:
DisplayCommandStatus(L"Show error", L" on", pCommandStatus);
FreeCommandStatus(&pCommandStatus);
|
Minor additon to previous sanitizer commit. | @@ -94,7 +94,7 @@ int dynlink_impl_interface_unload_beos(dynlink handle, dynlink_impl impl)
{
(void)handle;
-#if defined(__ADDRESS_SANITIZER__) || defined(__THREAD_SANITIZER__) || defined(__MEMORY_SANITIZER__)
+#if defined(__ADDRESS_SANITIZER__) || defined(__THREAD_SANITIZER__) || defined(__MEMORY_SANITIZER__) || defined(__UB_SANITIZER__)
/* Disable dlclose when running with address sanitizer in order to maintain stacktraces */
(void)impl;
return 0;
|
add note on usage of OIDC_SET_COOKIE_APPEND in the sample config/doc | # state cookie: Lax
# session cookie: first time set Lax, updates (e.g. after inactivity timeout) Strict
# x_csrf discovery: Strict:
+#
+# The default `SameSite=None` cookie appendix on `Set-Cookie` response headers can be
+# conditionally overridden using an environment variable in the Apache config as in:
+# SetEnvIf User-Agent ".*IOS.*" OIDC_SET_COOKIE_APPEND=;
+# (since version 2.4.1)
+#
# When not defined the default is Off.
#OIDCCookieSameSite [On|Off]
|
Adding tests to 'if' in parser_spec | @@ -450,6 +450,27 @@ describe("Titan parser", function()
assert.are.same("ExpRepeat", err.label)
end)
+ it("Expected an expression after 'if'.", function()
+ local program, err =
+ parse_file("./testfiles/parser/expIf.titan")
+ assert.falsy(program)
+ assert.are.same("ExpIf", err.label)
+ end)
+
+ it("Expected 'then' in if statement.", function()
+ local program, err =
+ parse_file("./testfiles/parser/thenIf.titan")
+ assert.falsy(program)
+ assert.are.same("ThenIf", err.label)
+ end)
+
+ it("Expected 'end' to close the if statement.", function()
+ local program, err =
+ parse_file("./testfiles/parser/endIf.titan")
+ assert.falsy(program)
+ assert.are.same("EndIf", err.label)
+ end)
+
it("Expected variable declaration in for statement.", function()
local program, err =
parse_file("./testfiles/parser/declFor.titan")
|
fixed png cart saving | @@ -1756,6 +1756,8 @@ static void renderStudio()
tic_core_tick_start(impl.studio.tic);
}
+ processShortcuts();
+
switch(impl.mode)
{
case TIC_START_MODE: impl.start->tick(impl.start); break;
@@ -1901,7 +1903,6 @@ static void studioTick()
tic_net_start(impl.net);
#endif
- processShortcuts();
processMouseStates();
processGamepadMapping();
|
Fix CLI terminal text coloring | @@ -115,13 +115,14 @@ static void fio_cli_set(const char *aliases, const char *desc, cli_type type) {
fiobj_hash_set(arg_type, arg_name, fiobj_null());
break;
case CLI_NUM:
- fiobj_str_write2(help_str, "\t\x1B[1m-%s\x1B[0m\x1B[2 ###\x1B[0m\t%s\n",
+ fiobj_str_write2(help_str,
+ "\t\x1B[1m-%s\x1B[0m\x1B[2m ###\x1B[0m\t%s\n",
fiobj_obj2cstr(arg_name).data, desc);
fiobj_hash_set(arg_type, arg_name, fiobj_true());
break;
case CLI_STR:
fiobj_str_write2(help_str,
- "\t\x1B[1m-%s\x1B[0m\x1B[2 <val>\x1B[0m\t%s\n",
+ "\t\x1B[1m-%s\x1B[0m\x1B[2m <val>\x1B[0m\t%s\n",
fiobj_obj2cstr(arg_name).data, desc);
fiobj_hash_set(arg_type, arg_name, fiobj_false());
break;
|
Avoid random warning message in test case.
change client_min_messages to error to avoid printing
warning in test case gp_interconnect_min_retries_before_timeout
when network jitter. | @@ -19,6 +19,11 @@ SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(len
GROUP BY rval2
ORDER BY rval2;
+-- start_ignore
+-- Set client_min_messages to error to avoid warning message printed by network jitter
+set client_min_messages='ERROR';
+-- end_ignore
+
-- Set GUC value to its min value
SET gp_interconnect_min_retries_before_timeout = 1;
SHOW gp_interconnect_min_retries_before_timeout;
|
wifi_manager UTC bug fix
change tc error type | @@ -120,7 +120,7 @@ static void utc_wifi_manager_init_n(void)
ret = wifi_manager_init(NULL);
- TC_ASSERT_EQ("wifi_manager_init_n", ret, WIFI_MANAGER_FAIL);
+ TC_ASSERT_EQ("wifi_manager_init_n", ret, WIFI_MANAGER_INVALID_ARGS);
TC_SUCCESS_RESULT();
}
@@ -186,7 +186,7 @@ static void utc_wifi_manager_get_mode_n(void)
ret = wifi_manager_get_info(info);
- TC_ASSERT_EQ("wifi_manager_get_mode_n", ret, WIFI_MANAGER_FAIL);
+ TC_ASSERT_EQ("wifi_manager_get_mode_n", ret, WIFI_MANAGER_INVALID_ARGS);
TC_SUCCESS_RESULT();
}
@@ -319,7 +319,7 @@ static void utc_wifi_manager_deinit_n(void)
ret = wifi_manager_deinit();
- TC_ASSERT_EQ("wifi_manager_deinit_n", ret, WIFI_MANAGER_DEINITIALIZED);
+ TC_ASSERT_EQ("wifi_manager_deinit_n", ret, WIFI_MANAGER_FAIL);
TC_SUCCESS_RESULT();
}
@@ -331,8 +331,8 @@ static void utc_wifi_manager_scan_ap_n(void)
TC_ASSERT_EQ("wifi_manager_scan_ap_n", ret, WIFI_MANAGER_SUCCESS);
ret = wifi_manager_scan_ap();
- TC_ASSERT_EQ("wifi_manager_scan_ap_n", ret, WIFI_MANAGER_INVALID_ARGS);
+ TC_ASSERT_EQ("wifi_manager_scan_ap_n", ret, WIFI_MANAGER_FAIL);
TC_SUCCESS_RESULT();
}
|
Fix windows build with JANET_NO_NET | @@ -2212,9 +2212,9 @@ typedef struct {
JanetReadMode mode;
#ifdef JANET_WINDOWS
OVERLAPPED overlapped;
+ DWORD flags;
#ifdef JANET_NET
WSABUF wbuf;
- DWORD flags;
struct sockaddr from;
int fromlen;
#endif
@@ -2288,8 +2288,8 @@ JanetAsyncStatus ev_machine_read(JanetListenerState *s, JanetAsyncEvent event) {
state->overlapped.Offset = (DWORD) state->bytes_read;
status = ReadFile(s->stream->handle, state->chunk_buf, chunk_size, NULL, &state->overlapped);
- if (!status && (ERROR_IO_PENDING != WSAGetLastError())) {
- if (WSAGetLastError() == ERROR_BROKEN_PIPE) {
+ if (!status && (ERROR_IO_PENDING != GetLastError())) {
+ if (GetLastError() == ERROR_BROKEN_PIPE) {
if (state->bytes_read) {
janet_schedule(s->fiber, janet_wrap_buffer(state->buf));
} else {
@@ -2441,9 +2441,9 @@ typedef struct {
void *dest_abst;
#ifdef JANET_WINDOWS
OVERLAPPED overlapped;
+ DWORD flags;
#ifdef JANET_NET
WSABUF wbuf;
- DWORD flags;
#endif
#else
int flags;
@@ -2528,7 +2528,7 @@ JanetAsyncStatus ev_machine_write(JanetListenerState *s, JanetAsyncEvent event)
state->overlapped.Offset = (DWORD) 0xFFFFFFFF;
state->overlapped.OffsetHigh = (DWORD) 0xFFFFFFFF;
status = WriteFile(s->stream->handle, bytes, len, NULL, &state->overlapped);
- if (!status && (ERROR_IO_PENDING != WSAGetLastError())) {
+ if (!status && (ERROR_IO_PENDING != GetLastError())) {
janet_cancel(s->fiber, janet_ev_lasterr());
return JANET_ASYNC_STATUS_DONE;
}
|
Fixed seed variable concatenation pointer. | @@ -394,7 +394,7 @@ static int mbedtls_ctr_drbg_reseed_internal( mbedtls_ctr_drbg_context *ctx,
/* Gather entropy for a nonce if requested. */
if( nonce_len != 0 )
{
- if( 0 != ctx->f_entropy( ctx->p_entropy, seed, nonce_len ) )
+ if( 0 != ctx->f_entropy( ctx->p_entropy, seed + seedlen, nonce_len ) )
{
return( MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED );
}
|
made hall newdm flow idempotent | ^- (list {security name cord})
:~ [%mailbox %inbox 'default home']
[%journal %public 'visible activity']
+ [%mailbox %i 'dm invites']
==
|: [[typ=*security nom=*name des=*cord] ta]
(ta-action [%create nom des typ])
++ action-newdm
:: copy all behavior of create, permit, and source in that order
::
- |= {sis/(set ship)}
+ |= sis/(set ship)
+ :: generate circle name from sis as a dot seperated list of ship names
+ :: in alphabetical order
+ ::
=/ nom/name
%^ rsh 3 1
%+ roll
- %+ sort %+ turn (weld ~(tap in sis) [our.bol ~])
+ %+ sort %+ turn ~(tap in (~(put in sis) our.bol))
|= p/ship
^- cord
(scot %p p)
|= {p/cord nam/name}
^- @tas
(crip "{(trip `@t`nam)}.{(slag 1 (trip p))}")
+ :: if we've already created this circle, no-op
+ ::
+ ?: (~(has in ~(key by stories)) nom)
+ (ta-deltas ~)
+ :: check if we already have an invite to this dm group
+ :: or if we are creating it
+ ::
+ =/ inv=(list telegram)
+ %+ skim grams:(~(got by stories) %i)
+ |= g=telegram
+ ^- ?
+ ?. ?=({$inv *} sep.g) %.n
+ ?. =(nom nom.cir.sep.g) %.n
+ ?. (~(has in sis) aut.g) %.n
+ %.y
+ ::
+ =. inv %+ sort inv
+ |= {a/telegram b/telegram}
+ (lte wen.a wen.b)
+ :: create our side of the dm and source it to our inbox
+ ::
=/ dels/(list delta)
- :~
- :*
- %story
+ :~ :* %story
%inbox
%follow
&
[[[our.bol nom] ~] ~ ~]
==
- :*
- %story
+ :* %story
nom
%new
[[[our.bol nom] ~] ~ ~]
0
==
==
+ :: if we did initiate the dm, send out invites
+ ::
+ ?: ?=(~ inv)
+ =. ..ta-action (ta-deltas dels)
+ %- action-convey
+ ^- (list thought)
+ %+ turn ~(tap in (~(del in sis) our.bol))
+ |= a=ship
+ ^- thought
+ :* uid=(shaf a eny.bol)
+ aud=(sy [a %i] ~)
+ wen=now.bol
+ sep=[%inv & [our.bol nom]]
+ ==
+ :: if we did not initiate the dm, source to the initiators copy
+ ::
+ =. dels
+ :_ dels
+ :* %story
+ nom
+ %follow
+ &
+ [[[aut.i.inv nom] ~] ~ ~]
+ ==
(ta-deltas dels)
::
:: # %messaging
|
Make test_nsalloc_long_context() robust vs allocation pattern changes | @@ -11275,26 +11275,9 @@ START_TEST(test_nsalloc_long_context)
{ NULL, NULL }
};
int i;
-#define MAX_ALLOC_COUNT 40
- int repeat = 0;
+#define MAX_ALLOC_COUNT 70
for (i = 0; i < MAX_ALLOC_COUNT; i++) {
- /* Repeat some counts to defeat allocation caching */
- if ((i == 4 && repeat == 3) ||
- (i == 13 && repeat == 9) ||
- (i == 14 && repeat == 10)) {
- i -= 2;
- repeat++;
- }
- else if ((i == 2 && repeat < 2) ||
- (i == 3 && (repeat == 2 || repeat == 4 || repeat == 5)) ||
- (i == 4 && repeat == 6) ||
- (i == 5 && repeat == 7) ||
- (i == 7 && repeat == 8) ||
- (i == 13 && repeat == 11)) {
- i--;
- repeat++;
- }
allocation_count = i;
XML_SetUserData(parser, options);
XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);
@@ -11303,8 +11286,9 @@ START_TEST(test_nsalloc_long_context)
XML_TRUE) != XML_STATUS_ERROR)
break;
- XML_ParserFree(parser);
- parser = XML_ParserCreate(NULL);
+ /* See comment in test_nsalloc_xmlns() */
+ nsalloc_teardown();
+ nsalloc_setup();
}
if (i == 0)
fail("Parsing worked despite failing allocations");
|
Increase heap size for Nuvoton tests project
MQTT_System tests are failing because of allocation failure. This change
increase the heap size to address the failure. | #define configTICK_RATE_HZ ( ( TickType_t ) 1000 )
#define configMAX_PRIORITIES ( 7 )
#define configMINIMAL_STACK_SIZE ( ( uint16_t ) 100 )
-#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 247 * 512 ) )
+#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 256 * 512 ) )
#define configMAX_TASK_NAME_LEN ( 16 )
#define configUSE_TRACE_FACILITY 1
#define configUSE_16_BIT_TICKS 0
|
doc: fix typo in GSG
missing a trailing backslash on a command continuation | @@ -659,7 +659,7 @@ Build ACRN
scp ~/acrn-work/acrn-hypervisor/build/acrn-my_board-MyConfiguration*.deb \
~/acrn-work/*acrn-service-vm*.deb \
~/acrn-work/MyConfiguration/launch_user_vm_id1.sh \
- ~/acrn-work/acpica-unix-20210105/generate/unix/bin/iasl
+ ~/acrn-work/acpica-unix-20210105/generate/unix/bin/iasl \
[email protected]:~/acrn-work
Then, go to the target system and put the ``iasl`` tool in its proper
|
input: do not lock buffer to allow writes (realloc() problems) | @@ -786,8 +786,8 @@ struct flb_input_dyntag *flb_input_dyntag_create(struct flb_input_instance *in,
/* Destroy an dyntag node */
int flb_input_dyntag_destroy(struct flb_input_dyntag *dt)
{
- flb_debug("[dyntag %s] %p destroy (tag=%s)",
- dt->in->name, dt, dt->tag);
+ flb_warn("[dyntag %s] %p destroy (tag=%s, bytes=%lu)",
+ dt->in->name, dt, dt->tag, dt->mp_sbuf.size);
msgpack_sbuffer_destroy(&dt->mp_sbuf);
mk_list_del(&dt->_head);
@@ -905,7 +905,8 @@ void *flb_input_flush(struct flb_input_instance *i_ins, size_t *size)
char *buf;
if (i_ins->mp_sbuf.size == 0) {
- return 0;
+ *size = 0;
+ return NULL;
}
/* Allocate buffer */
@@ -933,7 +934,7 @@ void *flb_input_dyntag_flush(struct flb_input_dyntag *dt, size_t *size)
void *buf;
/*
- * MessagePack-C internal use a raw buffer for it operations, since we
+ * msgpack-c internal use a raw buffer for it operations, since we
* already appended data we just can take out the references to avoid
* a new memory allocation and skip a copy operation.
*/
@@ -942,13 +943,13 @@ void *flb_input_dyntag_flush(struct flb_input_dyntag *dt, size_t *size)
*size = dt->mp_sbuf.size;
/* Unset the lock, it means more data can be added */
- dt->lock = FLB_FALSE;
+ //dt->lock = FLB_FALSE;
/* Set it busy as it likely it's a reference for an outgoing task */
dt->busy = FLB_TRUE;
- msgpack_sbuffer_init(&dt->mp_sbuf);
- msgpack_packer_init(&dt->mp_pck, &dt->mp_sbuf, msgpack_sbuffer_write);
+ //msgpack_sbuffer_init(&dt->mp_sbuf);
+ //msgpack_packer_init(&dt->mp_pck, &dt->mp_sbuf, msgpack_sbuffer_write);
return buf;
}
|
apply autopep8 formatter | @@ -480,7 +480,6 @@ void h2o_raw_tracer::do_handle_event(const void *data, int data_len) {
handle_event_func += ' json_write_pair_c(out_, STR_LIT("%s"), event->%s, strlen(event->%s));\n' % (
json_field_name, event_t_name, event_t_name)
-
if metadata["provider"] == "h2o":
handle_event_func += ' json_write_pair_c(out_, STR_LIT("time"), time_milliseconds());\n'
|
Disable all composite ciphers with LibreSSL
These cipher isn't planned to be well supported in LibreSSL for TLS
usage. | static const EVP_CIPHER *s2n_evp_aes_128_cbc_hmac_sha1(void)
{
/* Symbols for AES-SHA1-CBC composite ciphers were added in Openssl 1.0.1:
- * See https://www.openssl.org/news/cl101.txt. LibreSSL defines OPENSSL_VERSION_NUMBER to be
- * 0x20000000L but AES-SHA1-CBC is in LibreSSL since first major release(2.0.0).
+ * See https://www.openssl.org/news/cl101.txt.
*/
- #if S2N_OPENSSL_VERSION_AT_LEAST(1,0,1)
+ #if S2N_OPENSSL_VERSION_AT_LEAST(1,0,1) && !defined LIBRESSL_VERSION_NUMBER
return EVP_aes_128_cbc_hmac_sha1();
#else
return NULL;
@@ -42,7 +41,7 @@ static const EVP_CIPHER *s2n_evp_aes_128_cbc_hmac_sha1(void)
static const EVP_CIPHER *s2n_evp_aes_256_cbc_hmac_sha1(void)
{
- #if S2N_OPENSSL_VERSION_AT_LEAST(1,0,1)
+ #if S2N_OPENSSL_VERSION_AT_LEAST(1,0,1) && !defined LIBRESSL_VERSION_NUMBER
return EVP_aes_256_cbc_hmac_sha1();
#else
return NULL;
|
vere: remove 'new' from header comments
'New' is relative; some of these subsystems were 'new' in 2015. | void (*bot_f)(); // call when chis is up
} u3_host; // host == computer == process
- /** New pier system.
+ /** Pier system.
**/
/* u3_ovum_news: u3_ovum lifecycle events
*/
c3_d
u3_time_gap_ms(u3_noun now, u3_noun wen);
- /** ward: common structure lifecycle
+ /** Common structure lifecycle.
**/
/* u3_dent_init(): initialize file record.
*/
c3_w
u3_mcut_host(c3_c* buf_c, c3_w len_w, u3_noun hot);
- /** New vere
+ /** IO drivers.
**/
/* u3_auto_init(): initialize all drivers.
*/
void
u3_lord_peek(u3_lord* god_u, u3_pico* pic_u);
- /** Filesystem (async)
+ /** Filesystem (async).
**/
/* u3_foil_folder(): load directory, blockingly. create if nonexistent.
*/
u3_dire*
u3_foil_folder(const c3_c* pax_c); // directory object, or 0
- /** Terminal, new style.
+ /** Terminal.
**/
/* u3_term_start_spinner(): prepare spinner state. RETAIN.
*/
u3_save_io_exit(u3_pier *pir_u);
- /** Storage, new school.
+ /** Storage.
**/
/* u3_unix_save(): save file undir .../.urb/[bas_m] or bail.
*/
u3_auto*
u3_cttp_io_init(u3_pier* pir_u);
- /** fore, first events
+ /** fore, first events.
**/
/* u3_hind_io_init(): initialize fore
*/
u3_auto*
u3_fore_io_init(u3_pier* pir_u);
- /** hind, defaults
+ /** hind, defaults.
**/
/* u3_hind_io_init(): initialize hint
*/
void
u3_pier_info(u3_pier* pir_u);
- /* u3_pier_boot(): start the new pier system.
+ /* u3_pier_boot(): start the pier.
*/
u3_pier*
u3_pier_boot(c3_w wag_w, // config flags
u3_noun pax, // path to pier
u3_weak fed); // extra private keys
- /* u3_pier_stay(): restart the new pier system.
+ /* u3_pier_stay(): restart the pier.
*/
u3_pier*
u3_pier_stay(c3_w wag_w, u3_noun pax);
|
print warning if driver is not able to send packets from hcxdumptool - increment error count after a tot of one second | @@ -1290,7 +1290,7 @@ if(FD_ISSET(txsocket, &txfds))
{
if(write(txsocket, packetoutptr, txsize) < 0)
{
- printf("\n%s - driver doesn't respond\n", errormessage);
+ printf("\ndriver is busy: %s\n", errormessage);
errorcount++;
return;
}
@@ -1299,7 +1299,7 @@ if(FD_ISSET(txsocket, &txfds))
}
else
{
- printf("\n%s - driver doesn't respond\n", errormessage);
+ printf("\ndriver is busy: %s\n", errormessage);
errorcount++;
return;
}
@@ -2284,7 +2284,7 @@ if(FD_ISSET(fd_socket, &txfds))
{
if(write(fd_socket, &packetsent, packetsentlen) < 0)
{
- printf("\nfailed to retransmit EAP packet - driver doesn't respond\n");
+ printf("\ndriver is busy: failed to retransmit EAP packet\n");
errorcount++;
return;
}
@@ -2293,7 +2293,7 @@ if(FD_ISSET(fd_socket, &txfds))
}
else
{
- printf("\nfailed to retransmit EAP packet - driver doesn't respond\n");
+ printf("\ndriver is busy: failed to retransmit EAP packet\n");
errorcount++;
return;
}
@@ -5378,8 +5378,6 @@ while(1)
get_channel();
if(beaconactiveflag == true) send_beacon_active();
if(rgbeaconlist->timestamp != 0) send_beacon_list_active();
- tvfd.tv_sec = 0;
- tvfd.tv_usec = FDUSECTIMER;
}
}
return;
@@ -5678,8 +5676,6 @@ while(1)
continue;
}
if((attackstatus &DISABLE_AP_ATTACKS) != DISABLE_AP_ATTACKS) send_proberequest_undirected_broadcast();
- tvfd.tv_sec = 0;
- tvfd.tv_usec = FDUSECTIMER;
}
}
return;
@@ -5771,8 +5767,6 @@ while(1)
if(channelscanlist[cpa] == 0) break;
if(set_channel() == false) continue;
if((attackstatus &DISABLE_AP_ATTACKS) != DISABLE_AP_ATTACKS) send_proberequest_undirected_broadcast();
- tvfd.tv_sec = 0;
- tvfd.tv_usec = FDUSECTIMER;
}
}
for(zeiger = scanlist; zeiger < scanlist +SCANLIST_MAX; zeiger++)
|
Changed order on which we verify bots to be the first thing we check. | @@ -553,6 +553,9 @@ verify_browser (char *str, char *type) {
if (str == NULL || *str == '\0')
return NULL;
+ if ((match = check_http_crawler (str)) && (token = parse_crawler (str, match, type)))
+ return token;
+
/* check user's list */
for (i = 0; i < conf.browsers_hash_idx; ++i) {
if ((match = strstr (str, conf.user_browsers_hash[i][0])) == NULL)
@@ -560,9 +563,6 @@ verify_browser (char *str, char *type) {
return parse_browser (match, type, i, conf.user_browsers_hash);
}
- if ((match = check_http_crawler (str)) && (token = parse_crawler (str, match, type)))
- return token;
-
/* fallback to default browser list */
for (j = 0; j < ARRAY_SIZE (browsers); ++j) {
if ((match = strstr (str, browsers_hash[j][0])) == NULL)
|
DOC:Correct IP_EVENT_STA_LOST_IP name
Fix the name of the IP_EVENT_STA_LOST_IP event (was IP_STA_LOST_IP)
Closes | @@ -206,11 +206,11 @@ IP_EVENT_GOT_IP6
++++++++++++++++++++++++++++++++++++
This event arises when the IPV6 SLAAC support auto-configures an address for the {IDF_TARGET_NAME}, or when this address changes. The event means that everything is ready and the application can begin its tasks (e.g., creating sockets).
-IP_STA_LOST_IP
+IP_EVENT_STA_LOST_IP
++++++++++++++++++++++++++++++++++++
This event arises when the IPV4 address become invalid.
-IP_STA_LOST_IP doesn't arise immediately after the Wi-Fi disconnects, instead it starts an IPV4 address lost timer, if the IPV4 address is got before ip lost timer expires, IP_EVENT_STA_LOST_IP doesn't happen. Otherwise, the event arises when IPV4 address lost timer expires.
+IP_EVENT_STA_LOST_IP doesn't arise immediately after the Wi-Fi disconnects, instead it starts an IPV4 address lost timer, if the IPV4 address is got before ip lost timer expires, IP_EVENT_STA_LOST_IP doesn't happen. Otherwise, the event arises when IPV4 address lost timer expires.
Generally the application don't need to care about this event, it is just a debug event to let the application know that the IPV4 address is lost.
|
ci: Add raspberrypi-armv7 to the build matrix | @@ -27,6 +27,7 @@ jobs:
- raspberrypi4
- raspberrypi-cm3
- raspberrypi-cm
+ - raspberrypi-armv7
image: [rpi-test-image]
distro: [poky]
runs-on: [self-hosted, Linux]
|
python2 only library is deprecated | @@ -235,6 +235,9 @@ ALLOW ads/libs/py_notifier -> contrib/deprecated/python/xmpppy
ALLOW yql/udfs/common/python/python_arc -> contrib/deprecated/python/xmpppy
DENY .* -> contrib/deprecated/python/xmpppy
+ALLOW contrib/python/fancycompleter -> contrib/python/pyrepl
+DENY .* -> contrib/python/pyrepl
+
ALLOW addappter/backend -> contrib/python/pycrypto
ALLOW adfox -> contrib/python/pycrypto
ALLOW alice/vins/api -> contrib/python/pycrypto
|
Fix v4l2 AVFrame memory leak
Unref frame immediately once encoded.
Fixes <https://github.com/Genymobile/scrcpy/pull/2279> | @@ -125,6 +125,7 @@ run_v4l2_sink(void *data) {
video_buffer_consume(&vs->vb, vs->frame);
bool ok = encode_and_write_frame(vs, vs->frame);
+ av_frame_unref(vs->frame);
if (!ok) {
LOGE("Could not send frame to v4l2 sink");
break;
|
libmemif: set data offset for memif buffer
Update descriptor offset based on data pointer
in memif_buffer_t.
Slave only, master will not modify the descriptor.
Type: feature | @@ -2492,7 +2492,10 @@ memif_tx_burst (memif_conn_handle_t conn, uint16_t qid,
memif_queue_t *mq = &c->tx_queues[qid];
memif_ring_t *ring = mq->ring;
uint16_t mask = (1 << mq->log2_ring_size) - 1;
+ uint32_t offset_mask = c->run_args.buffer_size - 1;
memif_buffer_t *b0;
+ memif_desc_t *d;
+ int64_t data_offset;
*tx = 0;
int err = MEMIF_ERR_SUCCESS;
@@ -2515,7 +2518,27 @@ memif_tx_burst (memif_conn_handle_t conn, uint16_t qid,
err = MEMIF_ERR_INVAL_ARG;
goto done;
}
- ring->desc[b0->desc_index & mask].length = b0->len;
+ d = &ring->desc[b0->desc_index & mask];
+ d->length = b0->len;
+ if (!c->args.is_master)
+ {
+ // reset headroom
+ d->offset = d->offset - (d->offset & offset_mask);
+ // calculate offset from user data
+ data_offset = b0->data - (d->offset + c->regions[d->region].addr);
+ if (data_offset != 0)
+ {
+ /* verify data offset */
+ if ((data_offset < 0) ||
+ (data_offset > (d->offset + offset_mask)))
+ {
+ printf ("%ld\n", data_offset);
+ err = MEMIF_ERR_INVAL_ARG;
+ goto done;
+ }
+ d->offset += data_offset;
+ }
+ }
#ifdef MEMIF_DBG_SHM
printf ("offset: %-6d\n", ring->desc[b0->desc_index & mask].offset);
@@ -2608,7 +2631,7 @@ memif_rx_burst (memif_conn_handle_t conn, uint16_t qid,
b0->flags |= MEMIF_BUFFER_FLAG_NEXT;
ring->desc[cur_slot & mask].flags &= ~MEMIF_DESC_FLAG_NEXT;
}
-/* b0->offset = ring->desc[cur_slot & mask].offset;*/
+
b0->queue = mq;
#ifdef MEMIF_DBG_SHM
printf ("data: %p\n", b0->data);
|
openssl-x509.pod.in: fix description of certificate serial number storage | @@ -496,18 +496,18 @@ See L<openssl-format-options(1)> for details.
Sets the CA serial number file to use.
-When the B<-CA> option is used to sign a certificate it uses a serial
-number specified in a file. This file consists of one line containing
-an even number of hex digits with the serial number to use. After each
-use the serial number is incremented and written out to the file again.
+When creating a certificate with this option, the certificate serial number
+is stored in the given file. This file consists of one line containing
+an even number of hex digits with the serial number used last time.
+After reading this number, it is incremented and used, and the file is updated.
The default filename consists of the CA certificate file base name with
F<.srl> appended. For example if the CA certificate file is called
F<mycacert.pem> it expects to find a serial number file called
F<mycacert.srl>.
-If the B<-CA> option is specified and both the <-CAserial> and <-CAcreateserial>
-options are not given and the default serial number file does not exist,
+If the B<-CA> option is specified and neither <-CAserial> or <-CAcreateserial>
+is given and the default serial number file does not exist,
a random number is generated; this is the recommended practice.
=item B<-CAcreateserial>
|
tls: add start_listen openssl API return value check
Type: improvement
Check SSL_CTX_use_* API return value and exit on error.
Check BIO_new return code.
Release allocated BIO on error cases. | @@ -753,25 +753,47 @@ openssl_start_listen (tls_ctx_t * lctx)
* Set the key and cert
*/
cert_bio = BIO_new (BIO_s_mem ());
+ if (!cert_bio)
+ {
+ clib_warning ("unable to allocate memory");
+ return -1;
+ }
BIO_write (cert_bio, ckpair->cert, vec_len (ckpair->cert));
srvcert = PEM_read_bio_X509 (cert_bio, NULL, NULL, NULL);
if (!srvcert)
{
clib_warning ("unable to parse certificate");
- return -1;
+ goto err;
}
- SSL_CTX_use_certificate (ssl_ctx, srvcert);
+ rv = SSL_CTX_use_certificate (ssl_ctx, srvcert);
+ if (rv != 1)
+ {
+ clib_warning ("unable to use SSL certificate");
+ goto err;
+ }
+
BIO_free (cert_bio);
cert_bio = BIO_new (BIO_s_mem ());
+ if (!cert_bio)
+ {
+ clib_warning ("unable to allocate memory");
+ return -1;
+ }
BIO_write (cert_bio, ckpair->key, vec_len (ckpair->key));
pkey = PEM_read_bio_PrivateKey (cert_bio, NULL, NULL, NULL);
if (!pkey)
{
clib_warning ("unable to parse pkey");
- return -1;
+ goto err;
}
- SSL_CTX_use_PrivateKey (ssl_ctx, pkey);
+ rv = SSL_CTX_use_PrivateKey (ssl_ctx, pkey);
+ if (rv != 1)
+ {
+ clib_warning ("unable to use SSL PrivateKey");
+ goto err;
+ }
+
BIO_free (cert_bio);
olc_index = openssl_listen_ctx_alloc ();
@@ -785,6 +807,10 @@ openssl_start_listen (tls_ctx_t * lctx)
return 0;
+err:
+ if (cert_bio)
+ BIO_free (cert_bio);
+ return -1;
}
static int
|
cmake: update path where man pages are generated | @@ -495,7 +495,7 @@ function (generate_manpage NAME)
set (MDFILE ${CMAKE_CURRENT_SOURCE_DIR}/${NAME}.md)
endif ()
- set (OUTFILE ${CMAKE_SOURCE_DIR}/doc/man/${NAME}.${SECTION})
+ set (OUTFILE ${CMAKE_SOURCE_DIR}/doc/man/man${SECTION}/${NAME}.${SECTION})
if (RONN_LOC)
add_custom_command (OUTPUT ${OUTFILE}
|
Write correct vcs command name out to stdout, when pulling and cloning. | @@ -693,7 +693,7 @@ if "!V_LINK_PARTS[%LINK_CLASSIFIER%]!" EQU "vcs" (
REM Does not exist, fetch it.
echo .. !L_VCS_CMD_CLONE!
for /F "usebackq tokens=*" %%i in (`!L_VCS_CMD_CLONE!`) do (
- echo .. %L_VCS_EXE%: %%i
+ echo .. !L_VCS_EXE!: %%i
)
REM The subsequent VCS update needs to be within the repository directory.
cd !V_LINK_PARTS[%VCS_NAME%]!
@@ -702,12 +702,12 @@ if "!V_LINK_PARTS[%LINK_CLASSIFIER%]!" EQU "vcs" (
echo .. !L_VCS_CMD_PULL!
cd !V_LINK_PARTS[%VCS_NAME%]!
for /F "usebackq tokens=*" %%i in (`!L_VCS_CMD_PULL!`) do (
- echo .. %L_VCS_EXE%: %%i
+ echo .. !L_VCS_EXE!: %%i
)
)
echo Updating: [!V_LINK_PARTS[%VCS_NAME%]!] !L_VCS_DESC! repository to revision [!V_LINK_PARTS[%VCS_REVISION%]!].
for /F "usebackq tokens=*" %%i in (`!L_VCS_CMD_UPDATE!`) do (
- echo .. %L_VCS_EXE%: %%i
+ echo .. !L_VCS_EXE!: %%i
)
goto exit_from_internal_function_fetch_dependency
) else (
|
Tutorial: Fix minor spelling mistakes | @@ -14,7 +14,7 @@ will be preferred over any stored values in a cascading lookup.
To use `elektraGetOpts` you need to link against `elektra-opts`, `elektra-meta` and `elektra-ease`.
## Options
-To define a command-line option either set the `opt` meta-key to the short option you want to use, or set `opt/long` to
+To define a command-line option either set the `opt` metakey to the short option you want to use, or set `opt/long` to
the long option you want to use. For short options, only the first character of the given value will be used ('\0' is ignored).
Short and long options can be used simultaneously.
@@ -41,16 +41,16 @@ To change whether an option expects an argument set `opt/arg` to either `"none"`
## Environment Variables
Elektra also supports parsing environment variables in a similar manner. For these there are however, less configuration
-options. You can simply specify one or more environment variables for a key using the `env` meta-key (or `env/#` meta-array
+options. You can simply specify one or more environment variables for a key using the `env` metakey (or `env/#` meta-array
for multiple).
## Arrays
-Both options and environment variables expose special behaviour, if used in combination with arrays.
+Both options and environment variables expose special behavior, if used in combination with arrays.
If an option is specified on a key with basename `#`, the option can be used repeatedly. All occurrences will be collected
into the array.
-Environment variables obviously cannot be repeated, instead a behaviour similar that used for PATH is adopted. On Windows
+Environment variables obviously cannot be repeated, instead a behavior similar that used for PATH is adopted. On Windows
the variable will be split at each ';' character. On all other systems ':' is used as a separator.
## Arguments (Parameters)
@@ -68,7 +68,7 @@ If the value contains a slash (`/`) it will be considered a path and only the pa
The options list will contain exactly one entry for each key that has at least one option. Each entry has to parts. First
all the options for the key are listed and then (possibly on the next line, if there are a lot of options), the description
-for the key is listed. The description is taken from the `opt/help` or alternatively the `description` meta-key.
+for the key is listed. The description is taken from the `opt/help` or alternatively the `description` metakey.
**Note:** `opt/help` is specified *only once per key*. That means even if the key uses `opt/#0`, `opt/#1`, etc. (unlike most
other metadata) the description will always be taken from `opt/help` directly, because there can only be one description. In
@@ -178,5 +178,5 @@ The following keys will be created by `elektraGetOpts` (assuming the specificati
* `proc/sw/org/erm/#0/current/interactive = "always"`
* `proc/sw/org/erm/#0/current/recursive = "1"`
-You can find a full working example [here](https://www.libelektra.org/examples/cascading). However, it uses a hard-coded
+You can find a full working example [here](https://www.libelektra.org/examples/cascading). However, it uses a hard coded
specification which is a bit harder to read.
|
Compute correct size of knot vector in bspline constructor. | @@ -325,13 +325,13 @@ void ts_internal_bspline_new(size_t n_ctrlp, size_t dim, size_t deg,
tsBSplineType type, tsBSpline *_spline_, jmp_buf buf)
{
const size_t order = deg + 1;
- const size_t n_knots = n_ctrlp + order;
+ const size_t num_knots = n_ctrlp + order;
const size_t len_ctrlp = n_ctrlp * dim;
const size_t sof_real = sizeof(tsReal);
const size_t sof_impl = sizeof(struct tsBSplineImpl);
const size_t sof_ctrlp = len_ctrlp * sof_real;
- const size_t sof_knots = n_knots + sof_real;
+ const size_t sof_knots = num_knots * sof_real;
const size_t sof_spline = sof_impl + sof_ctrlp + sof_knots;
tsError e;
@@ -349,7 +349,7 @@ void ts_internal_bspline_new(size_t n_ctrlp, size_t dim, size_t deg,
_spline_->pImpl->deg = deg;
_spline_->pImpl->dim = dim;
_spline_->pImpl->n_ctrlp = n_ctrlp;
- _spline_->pImpl->n_knots = n_knots;
+ _spline_->pImpl->n_knots = num_knots;
_spline_->pImpl->ctrlp = (tsReal *) (& _spline_->pImpl[1]);
_spline_->pImpl->knots = _spline_->pImpl->ctrlp + len_ctrlp;
|
Change how we detect pull requests. | @@ -2,7 +2,7 @@ stages:
- compile
# Don't run the combine stage in pull requests, because deploy is disabled there.
- name: combine
- if: env(TRAVIS_PULL_REQUEST) = false
+ if: type != pull_request
jobs:
include:
|
coverity out-of-bounds access: allocate \0 terminator byte to be safe | @@ -289,10 +289,10 @@ static int run_cert(X509 *crt, const char *nameincert,
for (; *pname != NULL; ++pname) {
int samename = strcasecmp(nameincert, *pname) == 0;
size_t namelen = strlen(*pname);
- char *name = OPENSSL_malloc(namelen);
+ char *name = OPENSSL_malloc(namelen + 1);
int match, ret;
- memcpy(name, *pname, namelen);
+ memcpy(name, *pname, namelen + 1);
match = -1;
if (!TEST_int_ge(ret = X509_check_host(crt, name, namelen, 0, NULL),
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.