message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
peview: Fix memory leak | @@ -1455,7 +1455,10 @@ INT_PTR CALLBACK PvpPeHashesDlgProc(
hashString = PhBufferToHexString(entry->PageHash, sizeof(entry->PageHash));
PvPeHashesAddListViewItem(context->ListViewHandle, PV_HASHLIST_CATEGORY_PAGEHASH, MAXINT, &count, TRUE, NULL, number, hashString);
+ PhFree(entry);
}
+
+ PhDereferenceObject(results->PageHashList);
}
ExtendedListView_SetRedraw(context->ListViewHandle, TRUE);
|
stm32/main: run a static program | @@ -104,8 +104,15 @@ static uint32_t get_user_program(uint8_t **buf) {
#ifdef PYBRICKS_MPY_MAIN_MODULE
mp_print_str(&mp_plat_print, "\nLoading program from flash.\n");
- // TODO: set buf to address in flash and return len stored in flash
- return 0;
+ // FIXME: This is a placeholder program that does the following:
+ // motor = Motor(Port.A)
+ // motor.run_angle(500, 720)
+ static uint8_t _flash_program[] = {77, 3, 0, 31, 46, 4, 0, 0, 0, 0, 0, 8, 54, 0, 246, 0, 47, 0, 0, 255, 27, 248, 0, 27, 249, 0, 29, 250, 0, 100, 1, 36, 247, 0, 27, 247, 0, 30, 251, 0, 20, 131, 116, 20, 133, 80, 102, 2, 50, 17, 91, 8, 60, 109, 111, 100, 117, 108, 101, 62, 9, 115, 99, 114, 105, 112, 116, 46, 112, 121, 5, 77, 111, 116, 111, 114, 4, 80, 111, 114, 116, 1, 65, 5, 109, 111, 116, 111, 114, 5, 109, 111, 116, 111, 114, 9, 114, 117, 110, 95, 97, 110, 103, 108, 101, 0, 0};
+ uint32_t _flash_program_len = sizeof(_flash_program);
+
+ // FIXME: This should be stored and set during build
+ *buf = _flash_program;
+ return _flash_program_len;
#endif
// Empty rx buffer
|
An infinite_loop fault should break when reset.
This commit fixes fault injector such that when a infinte_loop fault is reset,
the infinite loop is broken and the fault is removed, as expected. | @@ -414,7 +414,9 @@ FaultInjector_InjectFaultNameIfSet(
entryLocal->faultName,
FaultInjectorTypeEnumToString[entryLocal->faultInjectorType])));
- for (ii=0; ii < cnt; ii++)
+ for (ii=0;
+ ii < cnt && FaultInjector_LookupHashEntry(entryLocal->faultName);
+ ii++)
{
pg_usleep(1000000L); // sleep for 1 sec (1 sec * 3600 = 1 hour)
CHECK_FOR_INTERRUPTS();
@@ -1128,7 +1130,10 @@ InjectFault(char *faultName, char *type, char *ddlStatement, char *databaseName,
if (faultEntry.faultInjectorType == FaultInjectorTypeStatus)
appendStringInfo(buf, "%s", faultEntry.bufOutput);
else
+ {
appendStringInfo(buf, "Success:");
+ elog(LOG, "injected fault '%s' type '%s'", faultName, type);
+ }
}
else
appendStringInfo(buf, "Failure: %s", faultEntry.bufOutput);
|
gmskmodem/sandbox: removing unused variable in program | @@ -62,16 +62,13 @@ int main(int argc, char*argv[])
float complex x [num_samples]; // transmitted signal
float complex y [num_samples]; // received signal
float complex z [num_samples]; // received signal
- unsigned int sym_out[num_symbols]; // output symbols
// create modem objects
gmskmod mod = gmskmod_create(k, m, beta);
// generate message signal
- for (i=0; i<num_symbols; i++) {
+ for (i=0; i<num_symbols; i++)
sym_in[i] = rand() % 2;
- sym_out[i] = 0;
- }
// modulate signal
for (i=0; i<num_symbols; i++)
|
Added PR's 708,709 and associated commits to 2.5.0 release notes | @@ -54,8 +54,8 @@ Minor release with miscellaneous bug fixes and small features
### Merged Pull Requests
-
-
+* [709](https://github.com/AcademySoftwareFoundation/openexr/pull/709) Fix clean pthreads strikes back
+* [708](https://github.com/AcademySoftwareFoundation/openexr/pull/708) Fix clean pthreads
* [707](https://github.com/AcademySoftwareFoundation/openexr/pull/707) A clean version of #673: Allow the use of Pthreads with WIN32/64
* [705](https://github.com/AcademySoftwareFoundation/openexr/pull/705) added recent commits and PR's to 2.5.0 release notes
* [704](https://github.com/AcademySoftwareFoundation/openexr/pull/704) fixed typos in README.md
@@ -188,6 +188,9 @@ Minor release with miscellaneous bug fixes and small features
### Commits \[ git log v2.4.0...v2.5.0\]
+* [b12ea7f3](https://github.com/AcademySoftwareFoundation/openexr/commit/b12ea7f30d624d51f1b69a2ffa9159a4f07a7974) Pthreads: Some stuff @meshula overlooked. ([Gregorio Litenstein](@[email protected]) 2020-05-04)
+* [af8864d2](https://github.com/AcademySoftwareFoundation/openexr/commit/af8864d259d3ef523fc75eaab4f9a74b0f3b092c) pthreads: Fix CMake/Autotools to check for them ([Gregorio Litenstein](@[email protected]) 2020-05-04)
+* [2ef3d626](https://github.com/AcademySoftwareFoundation/openexr/commit/2ef3d6265a56cd1ca7c4112a616db6987f134c4a) Pthreads: Some stuff @meshula overlooked. ([Gregorio Litenstein](@[email protected]) 2020-05-04)
* [3ab677bd](https://github.com/AcademySoftwareFoundation/openexr/commit/3ab677bd375db896215459a49de77ac87fbbb19c) A clean version of #673: Allow the use of Pthreads with WIN32/64 builds under MinGW ([Cary Phillips](@[email protected]) 2020-05-01)
* [4bb99704](https://github.com/AcademySoftwareFoundation/openexr/commit/4bb99704799830f1be1fa8cde559e3f2f63068a1) added recent commits and PR's to 2.5.0 release notes ([Cary Phillips](@[email protected]) 2020-04-30)
* [ac4fb158](https://github.com/AcademySoftwareFoundation/openexr/commit/ac4fb15895447ce042528cc965ce2b242d130311) fixed wording of OpenEXR_Viewers in 2.5.0 release notes. ([Cary Phillips](@[email protected]) 2020-04-29)
|
Eliminate another warning about an unused function | # define CONFIG_NSH_CODECS_BUFSIZE 128
#endif
+#undef NEED_CMD_CODECS_PROC
+#undef HAVE_CODECS_URLENCODE
+#undef HAVE_CODECS_URLDECODE
+#undef HAVE_CODECS_BASE64ENC
+#undef HAVE_CODECS_BASE64DEC
+#undef HAVE_CODECS_HASH_MD5
+
+#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLENCODE)
+# define HAVE_CODECS_URLENCODE 1
+#endif
+
+#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLDECODE)
+# define HAVE_CODECS_URLDECODE 1
+#endif
+
+#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64ENC)
+# define HAVE_CODECS_BASE64ENC 1
+#endif
+
+#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64DEC)
+# define HAVE_CODECS_BASE64DEC 1
+#endif
+
+#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
+# define HAVE_CODECS_HASH_MD5 1
+#endif
+
+#if defined() || defined() || defined() || defined() || defined()
+# define NEED_CMD_CODECS_PROC 1
+#endif
+
+
#define CODEC_MODE_URLENCODE 1
#define CODEC_MODE_URLDECODE 2
#define CODEC_MODE_BASE64ENC 3
@@ -213,6 +245,7 @@ static int calc_codec_buffsize(int srclen, uint8_t mode)
* Name: cmd_codecs_proc
****************************************************************************/
+#ifdef NEED_CMD_CODECS_PROC
static int cmd_codecs_proc(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv,
uint8_t mode, codec_callback_t func)
{
@@ -237,7 +270,6 @@ static int cmd_codecs_proc(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv,
int fd = -1;
int buflen = 0;
int srclen = 0;
- int i = 0;
int ret = OK;
/* Get the command options */
@@ -388,6 +420,8 @@ static int cmd_codecs_proc(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv,
#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
if (mode == CODEC_MODE_HASH_MD5)
{
+ int i;
+
MD5Final(mac, &ctx);
src = (FAR char *)&mac;
dest = destbuf;
@@ -423,6 +457,8 @@ static int cmd_codecs_proc(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv,
#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
if (mode == CODEC_MODE_HASH_MD5)
{
+ int i;
+
func(srcbuf, srclen, (char *)&ctx, &buflen, 0);
MD5Final(mac, &ctx);
src = (char *)&mac;
@@ -475,6 +511,7 @@ errout:
ret = ERROR;
goto exit;
}
+#endif
/****************************************************************************
* Public Functions
|
Don't show external poses from recordings by default | #include "survive_gz.h"
STATIC_CONFIG_ITEM(PLAYBACK_REPLAY_POSE, "playback-replay-pose", 'i', "Whether or not to output pose", 0)
+STATIC_CONFIG_ITEM(PLAYBACK_REPLAY_EXTERNAL_POSE, "playback-replay-external-pose", 'i',
+ "Whether or not to output external pose", 0)
STATIC_CONFIG_ITEM(PLAYBACK, "playback", 's', "File to be used for playback if playing a recording.", 0)
STATIC_CONFIG_ITEM(PLAYBACK_FACTOR, "playback-factor", 'f',
"Time factor of playback -- 1 is run at the same timing as original, 0 is run as fast as possible.",
@@ -50,7 +52,7 @@ typedef struct SurvivePlaybackData {
FLT playback_time;
bool hasRawLight;
bool hasSweepAngle;
- bool outputExternalPose;
+ bool outputCalculatedPose, outputExternalPose;
uint32_t total_sleep_time;
bool *keepRunning;
@@ -214,7 +216,7 @@ static int parse_and_run_lhpose(const char *line, struct SurvivePlaybackData *dr
&pose.Rot[0], &pose.Rot[1], &pose.Rot[2], &pose.Rot[3]);
SurviveContext *ctx = driver->ctx;
- if (driver->outputExternalPose) {
+ if (driver->outputCalculatedPose) {
char buffer[32] = {0};
snprintf(buffer, 31, "previous_LH%d", lh);
SURVIVE_INVOKE_HOOK(external_pose, ctx, buffer, &pose);
@@ -226,11 +228,13 @@ static int parse_and_run_externalpose(const char *line, SurvivePlaybackData *dri
char name[128] = { 0 };
SurvivePose pose;
- int rr = sscanf(line, "%s EXTERNAL_POSE " SurvivePose_sformat "\n", name, &pose.Pos[0], &pose.Pos[1], &pose.Pos[2],
- &pose.Rot[0], &pose.Rot[1], &pose.Rot[2], &pose.Rot[3]);
+ if (driver->outputExternalPose) {
+ int rr = sscanf(line, "%s EXTERNAL_POSE " SurvivePose_sformat "\n", name, &pose.Pos[0], &pose.Pos[1],
+ &pose.Pos[2], &pose.Rot[0], &pose.Rot[1], &pose.Rot[2], &pose.Rot[3]);
SurviveContext *ctx = driver->ctx;
SURVIVE_INVOKE_HOOK(external_pose, ctx, name, &pose);
+ }
return 0;
}
@@ -404,7 +408,7 @@ static int playback_pump_msg(struct SurviveContext *ctx, void *_driver) {
parse_and_run_imu(line, driver, false);
break;
case 'P':
- if (strcmp(op, "POSE") == 0 && driver->outputExternalPose)
+ if (strcmp(op, "POSE") == 0 && driver->outputCalculatedPose)
parse_and_run_pose(line, driver);
break;
case 'A':
@@ -492,7 +496,8 @@ int DriverRegPlayback(SurviveContext *ctx) {
sp->ctx = ctx;
sp->playback_dir = playback_file;
- sp->outputExternalPose = survive_configi(ctx, "playback-replay-pose", SC_GET, 0);
+ sp->outputCalculatedPose = survive_configi(ctx, "playback-replay-pose", SC_GET, 0);
+ sp->outputExternalPose = survive_configi(ctx, PLAYBACK_REPLAY_EXTERNAL_POSE_TAG, SC_GET, 0);
sp->playback_file = gzopen(playback_file, "r");
if (sp->playback_file == 0) {
|
Fix OP_ARYCAT in case of nil in 1st param | @@ -1909,6 +1909,15 @@ static inline int op_arycat( mrbc_vm *vm, mrbc_value *regs )
{
FETCH_B();
+ if( regs[a].tt == MRBC_TT_NIL ){
+ // arycat(nil, [...]) #=> [...]
+ assert( regs[a+1].tt == MRBC_TT_ARRAY );
+ regs[a] = regs[a+1];
+ regs[a+1].tt = MRBC_TT_NIL;
+
+ return 0;
+ }
+
assert( regs[a ].tt == MRBC_TT_ARRAY );
assert( regs[a+1].tt == MRBC_TT_ARRAY );
|
Testing curl call | @@ -63,7 +63,7 @@ SUT_PATH=(`find $BUILD_HOME -name "bin" -type d`)
# determine latest tag from GitHub API
LATEST_URL="https://api.github.com/repos/openwateranalytics/epanet-example-networks/releases/latest"
-LATEST_TAG=(`curl --silent ${LATEST_URL} | jq -r .tag_name`)
+LATEST_TAG=(`curl ${LATEST_URL} | jq -r .tag_name`)
if [ ${LATEST_TAG} == 'null' ]; then
echo "ERROR: curl | jq - ${LATEST_URL}"
exit 1
|
Add printf warning flags to CMake Build
Add extra printf warning flags into the cmake build, only adding those
that are supported by each version of the compiler | @@ -179,6 +179,9 @@ if(CMAKE_COMPILER_IS_GNU)
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
OUTPUT_VARIABLE GCC_VERSION)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings")
+ if (GCC_VERSION VERSION_GREATER 3.0 OR GCC_VERSION VERSION_EQUAL 3.0)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat=2 -Wno-format-nonliteral")
+ endif()
if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wvla")
endif()
@@ -194,6 +197,10 @@ if(CMAKE_COMPILER_IS_GNU)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-signedness")
endif()
endif()
+ if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0)
+ # Cannot use -Wformat-truncation=2 as this fails on mbedtls_snprintf (unknown buffer size)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation")
+ endif()
set(CMAKE_C_FLAGS_RELEASE "-O2")
set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
@@ -204,7 +211,7 @@ if(CMAKE_COMPILER_IS_GNU)
endif(CMAKE_COMPILER_IS_GNU)
if(CMAKE_COMPILER_IS_CLANG)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
set(CMAKE_C_FLAGS_RELEASE "-O2")
set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
|
VERSION bump to version 2.0.181 | @@ -61,7 +61,7 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
# set version of the project
set(LIBYANG_MAJOR_VERSION 2)
set(LIBYANG_MINOR_VERSION 0)
-set(LIBYANG_MICRO_VERSION 180)
+set(LIBYANG_MICRO_VERSION 181)
set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
# set version of the library
set(LIBYANG_MAJOR_SOVERSION 2)
|
mesh: Remove dependency on BT_MESH_IV_UPDATE_TEST in shell
Only enable the IV update commands when CONFIG_BT_MESH_IV_UPDATE_TEST
is defined. | @@ -796,19 +796,6 @@ struct shell_cmd_help cmd_net_send_help = {
NULL, "<hex string>", NULL
};
-static int cmd_iv_update(int argc, char *argv[])
-{
- if (bt_mesh_iv_update()) {
- printk("Transitioned to IV Update In Progress state\n");
- } else {
- printk("Transitioned to IV Update Normal state\n");
- }
-
- printk("IV Index is 0x%08lx\n", bt_mesh.iv_index);
-
- return 0;
-}
-
static int cmd_rpl_clear(int argc, char *argv[])
{
bt_mesh_rpl_clear();
@@ -859,6 +846,20 @@ struct shell_cmd_help cmd_lpn_unsubscribe_help = {
};
#endif
+#if MYNEWT_VAL(BLE_MESH_IV_UPDATE_TEST)
+static int cmd_iv_update(int argc, char *argv[])
+{
+ if (bt_mesh_iv_update()) {
+ printk("Transitioned to IV Update In Progress state\n");
+ } else {
+ printk("Transitioned to IV Update Normal state\n");
+ }
+
+ printk("IV Index is 0x%08lx\n", bt_mesh.iv_index);
+
+ return 0;
+}
+
static int cmd_iv_update_test(int argc, char *argv[])
{
bool enable;
@@ -882,6 +883,7 @@ static int cmd_iv_update_test(int argc, char *argv[])
struct shell_cmd_help cmd_iv_update_test_help = {
NULL, "<value: off, on>", NULL
};
+#endif
#if MYNEWT_VAL(BLE_MESH_CFG_CLI)
@@ -2484,6 +2486,7 @@ static const struct shell_cmd mesh_commands[] = {
.sc_cmd_func = cmd_net_send,
.help = &cmd_net_send_help,
},
+#if MYNEWT_VAL(BLE_MESH_IV_UPDATE_TEST)
{
.sc_cmd = "iv-update",
.sc_cmd_func = cmd_iv_update,
@@ -2494,6 +2497,7 @@ static const struct shell_cmd mesh_commands[] = {
.sc_cmd_func = cmd_iv_update_test,
.help = &cmd_iv_update_test_help,
},
+#endif
{
.sc_cmd = "rpl-clear",
.sc_cmd_func = cmd_rpl_clear,
|
Fix improper init for blowback source | @@ -10695,7 +10695,7 @@ int test_stateless_blowback_one(picoquic_quic_t* quic, uint64_t * simulated_time
*was_sent = 0;
/* Format random 1 RTT packet */
- filler = 0xff ^ ((uint8_t)simulated_time & 0xff);
+ filler = 0xff ^ (((uint8_t)*simulated_time) & 0xff);
memset(bytes, filler, sizeof(bytes));
bytes[0] &= 0x7f;
picoquic_set_test_address(&addr_peer, 0x01010101, 1234);
|
trim end slash | <_XmakeExecutable>"$([System.IO.Path]::GetFullPath('$(XmakeProgramDir)xmake.exe'))"</_XmakeExecutable>
<_XmakeEnv>
chcp 65001 > NUL
- set XMAKE_CONFIGDIR=$(XmakeConfigDir)
- set XMAKE_PROGRAM_DIR=$(XmakeProgramDir)
+ set XMAKE_CONFIGDIR=$(XmakeConfigDir.TrimEnd('/\'.ToCharArray()))
+ set XMAKE_PROGRAM_DIR=$(XmakeProgramDir.TrimEnd('/\'.ToCharArray()))
</_XmakeEnv>
</PropertyGroup>
|
bpf_module: clean up some ".bpf.fn." usage
Replace usage of the raw string with macro. | @@ -428,7 +428,7 @@ int BPFModule::load_maps(sec_map_def §ions) {
// update instructions
for (auto section : sections) {
auto sec_name = section.first;
- if (strncmp(".bpf.fn.", sec_name.c_str(), 8) == 0) {
+ if (strncmp(BPF_FN_PREFIX, sec_name.c_str(), 8) == 0) {
uint8_t *addr = get<0>(section.second);
uintptr_t size = get<1>(section.second);
struct bpf_insn *insns = (struct bpf_insn *)addr;
@@ -903,7 +903,7 @@ int BPFModule::bcc_func_load(int prog_type, const char *name,
int btf_fd = btf_->get_fd();
char secname[256];
- ::snprintf(secname, sizeof(secname), ".bpf.fn.%s", name);
+ ::snprintf(secname, sizeof(secname), "%s%s", BPF_FN_PREFIX, name);
ret = btf_->get_btf_info(secname, &func_info, &func_info_cnt,
&finfo_rec_size, &line_info,
&line_info_cnt, &linfo_rec_size);
|
usbdev:resolve ADB compilation errors | @@ -528,7 +528,7 @@ static void usb_adb_wrcomplete(FAR struct usbdev_ep_s *ep,
{
case OK: /* Normal completion */
{
- usbtrace(TRACE_CLASSWRCOMPLETE, priv->nwrq);
+ usbtrace(TRACE_CLASSWRCOMPLETE, sq_count(&priv->txfree));
/* Notify all waiting writers that write req is available */
@@ -549,7 +549,7 @@ static void usb_adb_wrcomplete(FAR struct usbdev_ep_s *ep,
case -ESHUTDOWN: /* Disconnection */
{
- usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_WRSHUTDOWN), priv->nwrq);
+ usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_WRSHUTDOWN), sq_count(&priv->txfree));
}
break;
@@ -600,7 +600,7 @@ static void usb_adb_rdcomplete(FAR struct usbdev_ep_s *ep,
{
case 0: /* Normal completion */
- usbtrace(TRACE_CLASSRDCOMPLETE, priv->nrdq);
+ usbtrace(TRACE_CLASSRDCOMPLETE, sq_count(&priv->rxpending));
/* Restart request due to either no reader or
* empty frame received.
@@ -816,7 +816,7 @@ static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep,
#ifdef CONFIG_USBDEV_DUALSPEED
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
FAR struct usbdev_devinfo_s *devinfo,
- uint8_t speed, uint8_t type);
+ uint8_t speed, uint8_t type)
#else
static int16_t usbclass_mkcfgdesc(FAR uint8_t *buf,
FAR struct usbdev_devinfo_s *devinfo)
@@ -1198,7 +1198,12 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
case USB_DESC_TYPE_CONFIG:
{
+#ifndef CONFIG_USBDEV_DUALSPEED
ret = usbclass_mkcfgdesc(ctrlreq->buf, NULL);
+#else
+ ret = usbclass_mkcfgdesc(ctrlreq->buf, NULL,
+ dev->speed, ctrl->req);
+#endif
}
break;
|
fixed sprite corruption | @@ -231,6 +231,7 @@ static void processSelectCanvasMouse(Sprite* sprite, s32 x, s32 y)
{
tic_rect rect = {x, y, CANVAS_SIZE, CANVAS_SIZE};
const s32 Size = CANVAS_SIZE / sprite->size;
+ bool endDrag = false;
if(checkMousePos(&rect))
{
@@ -265,13 +266,16 @@ static void processSelectCanvasMouse(Sprite* sprite, s32 x, s32 y)
sprite->select.rect = (tic_rect){sprite->select.start.x, sprite->select.start.y, 1, 1};
}
}
- else if(sprite->select.drag)
+ else endDrag = sprite->select.drag;
+ }
+ else endDrag = sprite->select.drag;
+
+ if(endDrag)
{
copySelection(sprite);
sprite->select.drag = false;
}
}
-}
static void floodFill(Sprite* sprite, s32 l, s32 t, s32 r, s32 b, s32 x, s32 y, u8 color, u8 fill)
{
|
Reverse the logic of flagging malformed packet in fragmentation code to allow padding | @@ -66,7 +66,7 @@ ip4_frag_do_fragment (vlib_main_t * vm, u32 pi, u32 ** buffer,
ptr = 0;
max = (mtu - sizeof (*ip4) - vnet_buffer (p)->ip_frag.header_offset) & ~0x7;
- if (rem < (p->current_length - offset - sizeof (*ip4)))
+ if (rem > (p->current_length - offset - sizeof (*ip4)))
{
*error = IP_FRAG_ERROR_MALFORMED;
return;
|
Added missing logical operator in js-parser-expr
This fix is needed to build JerryScript 2.1 on a STM board.
JerryScript-DCO-1.0-Signed-off-by: bence gabor kis | @@ -2154,7 +2154,7 @@ parser_parse_expression (parser_context_t *context_p, /**< context */
*
* If this is not done, it is possible to carry the flag over to the next expression.
*/
- bool has_super_ref = (context_p->status_flags & PARSER_CLASS_SUPER_PROP_REFERENCE);
+ bool has_super_ref = (context_p->status_flags & PARSER_CLASS_SUPER_PROP_REFERENCE) != 0;
context_p->status_flags &= (uint32_t) ~PARSER_CLASS_SUPER_PROP_REFERENCE;
#endif
|
[target][qemu-m4] tweak a line after stm32f4xx library changed a definition. | @@ -89,7 +89,7 @@ static void setup_pins(void) {
GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_UP;
GPIO_Init(GPIOG, &GPIO_InitStruct);
- GPIOE->BSRRL |= GPIO_Pin_7; // set PE7 high
+ GPIOE->BSRR |= GPIO_Pin_7; // set PE7 high
// Setup display CS Pin
gpio_config(GPIO(GPIO_PORT_G, 8), GPIO_OUTPUT);
|
sdcard_image-rpi.bbclass: Use armstub machine feature | @@ -55,7 +55,7 @@ do_image_rpi_sdimg[depends] = " \
dosfstools-native:do_populate_sysroot \
virtual/kernel:do_deploy \
${IMAGE_BOOTLOADER}:do_deploy \
- ${@bb.utils.contains('ARMSTUB', '', '', 'armstubs:do_deploy',d)} \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'armstub', 'armstubs:do_deploy', '' ,d)} \
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'rpi-u-boot-scr:do_deploy', '',d)} \
"
|
Checkout with submodules. | @@ -13,6 +13,8 @@ jobs:
steps:
- uses: actions/checkout@v2
+ with:
+ submodules: recursive
- name: update build environment
run: sudo apt-get update --fix-missing -y
- name: install prerequisites
@@ -32,6 +34,8 @@ jobs:
steps:
- uses: actions/checkout@v2
+ with:
+ submodules: recursive
- name: install prerequisites
run: brew install cppcheck libjpeg libpng libusb openssl
- name: configure
|
Fixed protocol version string handling in router. | @@ -842,7 +842,7 @@ nxt_app_http_req_header_parse(nxt_task_t *task, nxt_app_parse_ctx_t *ctx,
h->done = 1;
h->version.start = p->version.str;
- h->version.length = nxt_strlen(p->version.str);
+ h->version.length = sizeof(p->version.str);
h->method = p->method;
|
vere: copy argv[0] before calling dirname() | @@ -361,7 +361,9 @@ _main_getopt(c3_i argc, c3_c** argv)
if ( (U3_BIN_ALIAS_LEN <= len_w)
&& (0 == strcmp(argv[0] + (len_w - U3_BIN_ALIAS_LEN), U3_BIN_ALIAS)) )
{
- u3_Host.dir_c = _main_repath(dirname(argv[0]));
+ c3_c* bin_c = strdup(argv[0]);
+ u3_Host.dir_c = _main_repath(dirname(bin_c));
+ c3_free(bin_c);
}
// no args, invalid command
//
|
doc: mention pg_upgrade extension script
Since commit pg_upgrade automatically creates a script to
update extensions, so mention that instead of ALTER EXTENSION.
Backpatch-through: 9.6 | @@ -308,8 +308,9 @@ make prefix=/usr/local/pgsql.new install
must be installed in the new cluster, usually via operating system
commands. Do not load the schema definitions, e.g., <command>CREATE
EXTENSION pgcrypto</command>, because these will be duplicated from
- the old cluster. (Extensions with available updates can be processed
- later using <literal>ALTER EXTENSION ... UPDATE</literal>.)
+ the old cluster. If extension updates are available,
+ <application>pg_upgrade</application> will report this and create
+ a script that can be run later to update them.
</para>
</step>
|
ChangeLog entry is fixed in a different PR | Bugfix
- * Fix a bug whereby the list of signature algorithms sent as part of the
+ * Fix a bug whereby the the list of signature algorithms sent as part of the
TLS 1.2 server certificate request would get corrupted, meaning the first
algorithm would not get sent and an entry consisting of two random bytes
would be sent instead. Found by Serban Bejan and Dudek Sebastian.
|
[hardware] Dump the CSR values in hex and dec | @@ -1404,7 +1404,7 @@ module snitch
always_ff @(posedge clk_i or posedge rst_i) begin
// Display CSR write if the CSR does not exist
if (!rst_i && csr_dump && inst_valid_o && inst_ready_i && !stall) begin
- $display("[DUMP] %3d: 0x%3h = %d", hart_id_i, inst_data_i[31:20], alu_result);
+ $display("[DUMP] %3d: 0x%3h = 0x%08h, %d", hart_id_i, inst_data_i[31:20], alu_result, alu_result);
end
end
// pragma translate_on
|
TerrainShape mass fix; | @@ -901,6 +901,10 @@ void lovrShapeGetMass(Shape* shape, float density, float* cx, float* cy, float*
dMassTranslate(&m, -m.c[0], -m.c[1], -m.c[2]);
break;
}
+
+ case SHAPE_TERRAIN: {
+ break;
+ }
}
const dReal* position = dGeomGetOffsetPosition(shape->id);
@@ -1052,7 +1056,7 @@ MeshShape* lovrMeshShapeCreate(int vertexCount, float* vertices, int indexCount,
return mesh;
}
-TerrainShape* lovrTerrainShapeCreate(float* vertices, int widthSamples, int depthSamples, float horizontalScale, float verticalScale) {
+TerrainShape* lovrTerrainShapeCreate(float* vertices, uint32_t widthSamples, uint32_t depthSamples, float horizontalScale, float verticalScale) {
const float thickness = 10.f;
TerrainShape* terrain = calloc(1, sizeof(TerrainShape));
lovrAssert(terrain, "Out of memory");
|
add support for arm packages | @@ -31,8 +31,16 @@ if [ "$OS" == 'Linux' ]; then
ARCH='x64'
LIBDIR="lib64"
else
- ARCH=x86
LIBDIR="lib"
+ if [ "$ARCH" == "aarch64" ]; then
+ ARCH=arm64
+ else
+ if [ "$ARCH" == "armv7l" ]; then
+ ARCH=arm
+ else
+ ARCH=x86
+ fi
+ fi
fi
else
if [ "$OS" == 'Darwin' ]; then
@@ -53,6 +61,9 @@ while :; do
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
case $lowerI in
+ -a|-arch|--arch)
+ ARCH=$1
+ ;;
-d|-debug|--debug)
CONFIG=Debug
;;
@@ -119,9 +130,16 @@ if [ "$OS" == "linux" ]; then
${FILES}
# Debian/Ubuntu
- if [ "$LIBDIR" == 'lib64' ]; then
+ if [ "$ARCH" == 'x64' ]; then
LIBDIR="lib/x86_64-linux-gnu"
fi
+ if [ "$ARCH" == 'arm64' ];then
+ LIBDIR="lib/aarch64-linux-gnu"
+ fi
+ if [ "$ARCH" == 'arm' ];then
+ LIBDIR="lib/arm-linux-gnueabihf"
+ fi
+
FILES="${ARTIFACTS}/libmsquic.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}=/usr/${LIBDIR}/libmsquic.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}"
FILES="${FILES} ${ARTIFACTS}/libmsquic.${LIBEXT}.${VER_MAJOR}=/usr/${LIBDIR}/libmsquic.${LIBEXT}.${VER_MAJOR}"
if [ -e "$ARTIFACTS/libmsquic.lttng.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" ]; then
|
Touch up styling of %exp messages | @@ -86,8 +86,14 @@ export class Message extends Component {
renderExp(expression, result) {
return (<>
- <p><pre className="clamp-attachment">{expression}</pre></p>
- <p><pre className="clamp-attachment">{result[0].join('\n')}</pre></p>
+ <p>
+ <pre className="clamp-attachment pa1 mt0 bg-light-gray">
+ {expression}
+ </pre>
+ <pre className="clamp-attachment pa1 mb0">
+ {result[0].join('\n')}
+ </pre>
+ </p>
</>);
}
|
doc/console: translate console.rst into zh_CN | @@ -125,7 +125,7 @@ A few other functions are provided by the command registration module:
``esp_console_run``
This function takes the command line string, splits it into argc/argv argument list using ``esp_console_split_argv``, looks up the command in the list of registered components, and if it is found, executes its handler.
-``esp_console_split_argv``
+``esp_console_register_help_command``
Adds ``help`` command to the list of registered commands. This command prints the list of all the registered commands, along with their arguments and help texts.
``esp_console_get_completion``
|
rfc5482: initialize TCP User Timeout Option with sys default | @@ -47,6 +47,7 @@ od_config_init(od_config_t *config)
config->keepalive = 15;
config->keepalive_keep_interval = 5;
config->keepalive_probes = 3;
+ config->keepalive_usr_timeout = 0; // use sys default
config->workers = 1;
config->resolvers = 1;
config->client_max_set = 0;
|
Fix `ocf_engine_unmapped_count()`
Inserted entries should be considered mapped. | @@ -109,7 +109,8 @@ static inline uint32_t ocf_engine_mapped_count(struct ocf_request *req)
*/
static inline uint32_t ocf_engine_unmapped_count(struct ocf_request *req)
{
- return req->core_line_count - (req->info.hit_no + req->info.invalid_no);
+ return req->core_line_count -
+ (req->info.hit_no + req->info.invalid_no + req->info.insert_no);
}
void ocf_map_cache_line(struct ocf_request *req,
|
Reorder includes to allow build on FreeBSD | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-#include <getopt.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/udp.h>
-#include <stdio.h>
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
+#include <getopt.h>
+#include <netinet/udp.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <stdio.h>
#include <unistd.h>
#include <picotls.h>
#include "quicly.h"
|
Remove full speed defaults.
#595, | @@ -69,21 +69,9 @@ func fanControl(pwmDutyMin int, pin int, tempTarget float32) {
})
pwmDuty := 0
- tempWhenRampStarted := float32(0.)
for {
if temp > (tempTarget + hysteresis) {
- if tempWhenRampStarted < 1. {
- tempWhenRampStarted = temp
- }
pwmDuty = iMax(iMin(pwmDutyMax, pwmDuty+1), pwmDutyMin)
- if pwmDuty == pwmDutyMax {
- // At the maximum duty cycle currently.
- // Has the temperature increased "substantially" since the ramp-up started?
- if temp > (tempWhenRampStarted + hysteresis) {
- // Give up. The fan does not like the PWM control.
- break
- }
- }
} else if temp < (tempTarget - hysteresis) {
pwmDuty = iMax(pwmDuty-1, 0)
if pwmDuty < pwmDutyMin {
|
Update: Reference to the logo in readme added | **OpenNARS for Applications**
+<img src="https://user-images.githubusercontent.com/8284677/74609985-02087e80-50e7-11ea-9562-218dec34714d.png" width="500" height="450">
+
This is a completely new platform and not branched from the existing OpenNARS codebase. The ONA (OpenNARS for Applications) system takes the logic and conceptual ideas of OpenNARS, the event handling and procedure learning capabilities of ANSNA, and the control model from ALANN. The system is written in C and is extremely capable.
The ONA implementation has been developed with a pragmatic mindset. The focus on the design has been to implement the 'existing' theory as effectively as possible and make firm decisions rather than keep as many options open as possible. This has led to some small conceptual differences to OpenNARS for Research (ONR).
|
cnat: fix session scanner restart point
Restart point saved by caller, do not restart at i=0.
Type: fix | @@ -165,7 +165,7 @@ cnat_session_scan (vlib_main_t * vm, f64 start_time, int i)
if (alloc_arena (h) == 0)
return 0.0;
- for (i = 0; i < h->nbuckets; i++)
+ for ( /* caller saves starting point */ ; i < h->nbuckets; i++)
{
/* allow no more than 100us without a pause */
if ((vlib_time_now (vm) - start_time) > 10e-5)
|
Fix yapyc uids blinking | import os
import ymake
-from _common import stripext, rootrel_arc_src, listid, resolve_to_ymake_path, generate_chunks
+from _common import stripext, rootrel_arc_src, tobuilddir, listid, resolve_to_ymake_path, generate_chunks
from pyx import PyxParser
@@ -299,12 +299,14 @@ def onpy_srcs(unit, *args):
for path, mod in pys:
root_rel_path = rootrel_arc_src(path, unit)
- unit.onpy_compile_bytecode([root_rel_path + '-', path])
+ src = unit.resolve_arc_path(path) or path
+ dst = tobuilddir(src) + '.yapyc'
+ unit.onpy_compile_bytecode([root_rel_path + '-', src])
key = '/py_modules/' + mod
res += [
path, key,
'-', 'resfs/src/{}={}'.format(key, root_rel_path),
- path + '.yapyc', '/py_code/' + mod,
+ dst, '/py_code/' + mod,
]
unit.onresource(res)
|
Add void parameter to avoid warning in python plugin. | @@ -349,6 +349,7 @@ void function_py_interface_destroy(function func, function_impl impl)
if (py_func->values != NULL)
{
/* TODO: Check why Py_DECREF of each value segfaults */
+ (void)func;
/*
signature s = function_signature(func);
|
acrn-config: Fix ve820 table generation when guest memory size is >512MB
This patch fixes an issue with generation of guest ve820 when the size
of the memory is >512MB. The issue is primarily with respect to converting
between hex and int.
Acked-by: Victor Sun | @@ -48,9 +48,9 @@ def ve820_per_launch(config, hpa_size, hpa2_size):
#HPA2 is always allocated in >4G space.
high_mem_hpa2_len.append(int(hpa2_size[i], 16))
if (high_mem_hpa_len[i] != 0) and (high_mem_hpa2_len[i] != 0):
- high_mem_hpa2_addr.append(hex(FOUR_GBYTE) + high_mem_hpa_len[i])
+ high_mem_hpa2_addr.append(FOUR_GBYTE + high_mem_hpa_len[i])
else:
- high_mem_hpa2_addr.append(hex(FOUR_GBYTE))
+ high_mem_hpa2_addr.append(FOUR_GBYTE)
if (high_mem_hpa_len[i] != 0) and (high_mem_hpa2_len[i] != 0):
print("#define VM{}_VE820_ENTRIES_{}\t{}U".format(i, board_name, 7), file=config)
@@ -113,9 +113,9 @@ def ve820_per_launch(config, hpa_size, hpa2_size):
print("", file=config)
print("\t{\t/* HPA2 after high mem*/", file=config)
print("\t\t.baseaddr = {}UL,\t/* {}GB */".format(
- hex(high_mem_hpa2_addr[i]), int(high_mem_hpa2_addr[i], 16) / 1024 / 1024 / 1024), file=config)
+ hex(high_mem_hpa2_addr[i]), high_mem_hpa2_addr[i] / 1024 / 1024 / 1024), file=config)
print("\t\t.length = {}UL,\t/* {}MB */".format(
- hex(high_mem_hpa_len[i]), high_mem_hpa_len[i] / 1024 / 1024), file=config)
+ hex(high_mem_hpa2_len[i]), high_mem_hpa2_len[i] / 1024 / 1024), file=config)
print("\t\t.type = E820_TYPE_RAM", file=config)
print("\t},", file=config)
print("", file=config)
|
Implement ANIMATING_NONE. | @@ -21400,7 +21400,7 @@ void update_animation()
}
else if((unsigned)f >= (unsigned)self->animation->numframes)
{
- self->animating = 0;
+ self->animating = ANIMATING_NONE;
if(self->autokill)
{
@@ -21422,7 +21422,7 @@ void update_animation()
if(!self->animation->loop.mode)
{
- self->animating = 0;
+ self->animating = ANIMATING_NONE;
if(self->autokill)
{
@@ -28809,7 +28809,7 @@ int star_move()
self->energy_status.health_current = 0;
if(self->modeldata.nodieblink == 2)
{
- self->animating = 0;
+ self->animating = ANIMATING_NONE;
}
}
|
CI: add CRYPTOS definition to Jenkinsfile | @@ -104,7 +104,8 @@ enum TEST {
MEM, // Test for memoryleaks via valgrind
NOKDB, // Only run tests that do not write to disk
ALL, // Run all tests
- INSTALL // Run all tests on an installed version of Elektra
+ INSTALL, // Run all tests on an installed version of Elektra
+ CRYPTOS // Test crypto, fcrypt and gpgme for memory leaks (quite unstable)
public TEST() {} // WORKAROUND https://issues.jenkins-ci.org/browse/JENKINS-33023
}
|
Move todo list from README to issue tracker. | @@ -11,19 +11,10 @@ Right now the focus is on portable implementations, but eventually I'd
like to try to implement instruction sets with one another (like
implementing SSE using NEON).
-Instruction sets I'd like to implement include:
-
- * [x86](https://software.intel.com/sites/landingpage/IntrinsicsGuide/)
- * SSE
- * SSE2
- * SSE3
- * SSE4.1
- * SSE4.2
- * AVX
- * AVX2
- * AVX-512
- * ARM
- * NEON
+For information on which instruction sets we intend to support, or to
+track progress, see the
+[instruction-set-support](https://github.com/nemequ/simde/issues?q=is%3Aissue+is%3Aopen+label%3Ainstruction-set-support)
+label in the issue tracker.
It's going to be a while before this project is really usable, if
ever. There are a *lot* of instructions. If you'd like to help,
@@ -33,11 +24,12 @@ implementation, but it's really not difficult work.
## Portability
-The code currently requires GCC (or a compiler masquerading as GCC,
-like clang or icc). It wouldn't be too difficult to support other
-compilers, one would mostly just need to add macros for accessing
-individual elements in the vector types, and define vector types in an
-ifdef to avoid relying on the `vector_size` GNU C extension.
+The code currently requires GCC (or a compiler which implements GCC's
+vector extensions, like clang or icc). It wouldn't be too difficult
+to support other compilers, one would mostly just need to add macros
+for accessing individual elements in the vector types, and define
+vector types in an ifdef to avoid relying on the `vector_size` GNU C
+extension.
I don't know when, or if, I'll get around to it, but if you're willing
to work on it patches are welcome.
|
Clarify VariantFile.fetch start/stop region parameters
These are 0-based and half-open. Fixes | @@ -4364,9 +4364,10 @@ cdef class VariantFile(HTSFile):
return bcf_str_cache_get_charptr(bcf_hdr_id2name(hdr, rid))
def fetch(self, contig=None, start=None, stop=None, region=None, reopen=False, end=None, reference=None):
- """fetch records in a :term:`region` using 0-based indexing. The
- region is specified by :term:`contig`, *start* and *end*.
- Alternatively, a samtools :term:`region` string can be supplied.
+ """fetch records in a :term:`region`, specified either by
+ :term:`contig`, *start*, and *end* (which are 0-based, half-open);
+ or alternatively by a samtools :term:`region` string (which is
+ 1-based inclusive).
Without *contig* or *region* all mapped records will be fetched. The
records will be returned ordered by contig, which will not necessarily
|
Makefile.vc: use /MANIFEST:EMBED
this removes the mt.exe step and may fix some build failures if the
executable is locked after linking, e.g., by an antivirus program | @@ -31,12 +31,11 @@ CCNODBG = cl.exe $(NOLOGO) /O2 /DNDEBUG
CCDEBUG = cl.exe $(NOLOGO) /Od /Zi /D_DEBUG /RTC1
CFLAGS = /I. /Isrc $(NOLOGO) /W3 /EHsc /c
CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN
-LDFLAGS = /LARGEADDRESSAWARE /MANIFEST /NXCOMPAT /DYNAMICBASE
+LDFLAGS = /LARGEADDRESSAWARE /MANIFEST:EMBED /NXCOMPAT /DYNAMICBASE
LDFLAGS = $(LDFLAGS) $(PLATFORM_LDFLAGS)
LNKDLL = link.exe /DLL $(NOLOGO)
LNKEXE = link.exe $(NOLOGO)
LNKLIB = lib.exe $(NOLOGO)
-MT = mt.exe $(NOLOGO)
RCNODBG = rc.exe $(NOLOGO) /l"0x0409" # 0x409 = U.S. English
RCDEBUG = $(RCNODBG) /D_DEBUG
@@ -502,13 +501,9 @@ LNKLIBS = $(LNKLIBS) Shell32.lib
{$(DIROBJ)\examples}.obj{$(DIRBIN)}.exe:
$(LNKEXE) $(LDFLAGS) /OUT:$@ $** $(LNKLIBS)
- $(MT) -manifest [email protected] -outputresource:$@;1
- del [email protected]
{$(DIROBJ)\extras}.obj{$(DIRBIN)}.exe:
$(LNKEXE) $(LDFLAGS) /OUT:$@ $** $(LNKLIBS)
- $(MT) -manifest [email protected] -outputresource:$@;1
- del [email protected]
clean::
@-erase /s $(DIROBJ)\*.dll 2> NUL
|
xpath BUGFIX start node proper merge | @@ -1116,7 +1116,12 @@ lyxp_set_scnode_merge(struct lyxp_set *set1, struct lyxp_set *set2)
}
}
- if (j == orig_used) {
+ if (j < orig_used) {
+ /* node is there, but update its status if needed */
+ if (set1->val.scnodes[j].in_ctx == LYXP_SET_SCNODE_START_USED) {
+ set1->val.scnodes[j].in_ctx = set2->val.scnodes[i].in_ctx;
+ }
+ } else {
memcpy(&set1->val.scnodes[set1->used], &set2->val.scnodes[i], sizeof *set2->val.scnodes);
++set1->used;
}
|
Add texture/color variants to lovr.graphics.newMaterial; | @@ -683,6 +683,19 @@ int l_lovrGraphicsNewFont(lua_State* L) {
int l_lovrGraphicsNewMaterial(lua_State* L) {
MaterialData* materialData = lovrMaterialDataCreateEmpty();
Material* material = lovrMaterialCreate(materialData, false);
+
+ int index = 1;
+
+ if (lua_isuserdata(L, index)) {
+ Texture* texture = luax_checktype(L, index++, Texture);
+ lovrMaterialSetTexture(material, TEXTURE_DIFFUSE, texture);
+ }
+
+ if (lua_isnumber(L, index)) {
+ Color color = luax_checkcolor(L, index);
+ lovrMaterialSetColor(material, COLOR_DIFFUSE, color);
+ }
+
luax_pushtype(L, Material, material);
return 1;
}
|
travis: fix typo and increase timeouts | @@ -268,7 +268,7 @@ before_script:
-DBUILD_FULL="${BUILD_FULL:-OFF}"
-DBUILD_SHARED="${BUILD_SHARED:-ON}"
-DENABLE_ASAN="${ENABLE_ASAN:-OFF}"
- -DCOMMON_FLAGS="${COMMON_FLAGS--Werror}"
+ -DCOMMON_FLAGS="${COMMON_FLAGS:--Werror}"
-DENABLE_DEBUG=ON
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DKDB_DB_SYSTEM="$SYSTEM_DIR"
@@ -283,7 +283,7 @@ before_script:
- cmake ${CMAKE_OPT[@]}
script:
- - travis_wait 20 ninja
+ - travis_wait 30 ninja
- output="$(ninja install 2>&1)" || printf '%s' "$output"
- - travis_wait 20 ninja run_all
- - travis_wait 20 kdb run_all
+ - travis_wait 30 ninja run_all
+ - travis_wait 30 kdb run_all
|
/lib/test/ames-gall: clean up lanes | life=3
rift=0
public-key=bud-pub
- sponsor=~nec
+ sponsor=~bud
==
- =. route.peer-state `[direct=%.y `lane:ames`[%& ~nec]]
+ =. route.peer-state `[direct=%.y `lane:ames`[%& ~bud]]
[%known peer-state]
:: tell ~bud about ~nec
::
public-key=nec-pub
sponsor=~nec
==
- =. route.peer-state `[direct=%.y `lane:ames`[%| `@`%lane-bar]]
+ =. route.peer-state `[direct=%.y `lane:ames`[%& ~nec]]
[%known peer-state]
:: metamorphose
::
|
[numerics] remove hard-coded verbose mode | @@ -537,7 +537,7 @@ void statsIterationCallback(FrictionContactProblem *problem,
void fc3d_nsgs(FrictionContactProblem* problem, double *reaction,
double *velocity, int* info, SolverOptions* options)
{
- verbose=1;
+ /* verbose=1; */
/* int and double parameters */
int* iparam = options->iparam;
double* dparam = options->dparam;
|
input: add debug message if collector fails | @@ -518,6 +518,7 @@ static int collector_start(struct flb_input_collector *coll,
FLB_ENGINE_EV_CORE,
MK_EVENT_READ, event);
if (ret == -1) {
+ flb_error("[input collector] COLLECT_EVENT registration failed");
close(coll->fd_event);
coll->running = FLB_FALSE;
return -1;
@@ -530,14 +531,22 @@ static int collector_start(struct flb_input_collector *coll,
int flb_input_collector_start(int coll_id, struct flb_input_instance *in)
{
+ int ret;
+ int c = 0;
struct mk_list *head;
struct flb_input_collector *coll;
mk_list_foreach(head, &in->config->collectors) {
coll = mk_list_entry(head, struct flb_input_collector, _head);
if (coll->id == coll_id) {
- return collector_start(coll, in->config);
+ ret = collector_start(coll, in->config);
+ if (ret == -1) {
+ flb_error("[input] error starting collector #%i: %s",
+ in->name);
+ }
+ return ret;
}
+ c++;
}
return -1;
|
bugid:16796279:[http2-example]update http2 stream api | @@ -356,7 +356,7 @@ static int http2_stream_test()
return -1;
}
- ret = IOT_HTTP2_Stream_Query(handle, &info_download);
+ ret = IOT_HTTP2_Stream_Query(handle, &info_download, &my_header_info);
if (ret < 0) {
EXAMPLE_TRACE("=========iotx_http2_downstream_query failed %d!!!!!\n", ret);
IOT_HTTP2_Stream_Disconnect(handle);
@@ -380,7 +380,7 @@ static int http2_stream_test()
if(info_upload.stream_len-info_upload.send_len<info_upload.packet_len) {
info_upload.packet_len = info_upload.stream_len-info_upload.send_len;
}
- ret = IOT_HTTP2_Stream_Send(handle, &info_upload);
+ ret = IOT_HTTP2_Stream_Send(handle, &info_upload, &my_header_info);
if(ret <0 ) {
EXAMPLE_TRACE("send err, ret = %d\n",ret);
break;
@@ -399,7 +399,7 @@ static int http2_stream_test()
if(info_upload.stream_len-info_upload.send_len<info_upload.packet_len) {
info_upload.packet_len = info_upload.stream_len-info_upload.send_len;
}
- ret = IOT_HTTP2_Stream_Send(handle, &info_upload);
+ ret = IOT_HTTP2_Stream_Send(handle, &info_upload, &my_header_info);
if(ret <0 ) {
EXAMPLE_TRACE("send err, ret = %d\n",ret);
break;
|
[BSP][imxrt1052-evk] fix rt_i2c_transfer bug. | @@ -294,7 +294,7 @@ static rt_size_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
if (rt1052_i2c->msg[i].flags & RT_I2C_RD)
{
LPI2C_MasterStart(rt1052_i2c->I2C, rt1052_i2c->msg[i].addr, kLPI2C_Read);
- if (LPI2C_MasterReceive(rt1052_i2c->I2C, rt1052_i2c->msg->buf, rt1052_i2c->msg->len) == kStatus_LPI2C_Nak)
+ if (LPI2C_MasterReceive(rt1052_i2c->I2C, rt1052_i2c->msg[i].buf, rt1052_i2c->msg[i].len) == kStatus_LPI2C_Nak)
{
i = 0;
break;
@@ -303,7 +303,7 @@ static rt_size_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
else
{
LPI2C_MasterStart(rt1052_i2c->I2C, rt1052_i2c->msg[i].addr, kLPI2C_Write);
- if (LPI2C_MasterSend(rt1052_i2c->I2C, rt1052_i2c->msg->buf, rt1052_i2c->msg->len) == kStatus_LPI2C_Nak)
+ if (LPI2C_MasterSend(rt1052_i2c->I2C, rt1052_i2c->msg[i].buf, rt1052_i2c->msg[i].len) == kStatus_LPI2C_Nak)
{
i = 0;
break;
|
re-add replacement statement | @@ -65,7 +65,7 @@ Depends: ${misc:Depends},
oidc-agent-cli,
xterm | x-terminal-emulator,
yad
-Replaces: oidc-agent-prompt (<= 4.0.2-1)
+Replaces: oidc-agent (<= 4.0.2-1), oidc-agent-prompt (<= 4.0.2-1)
Description: oidc-agent desktop integration
Desktop integration files for oidc-gen and oidc-agent and for creating the user
dialog.
|
Clarify the EVP_PKEY_decrypt manual page
Fixes | @@ -18,19 +18,21 @@ EVP_PKEY_decrypt - decrypt using a public key algorithm
=head1 DESCRIPTION
The EVP_PKEY_decrypt_init() function initializes a public key algorithm
-context using key B<pkey> for a decryption operation.
+context using key I<pkey> for a decryption operation.
The EVP_PKEY_decrypt_init_ex() function initializes a public key algorithm
-context using key B<pkey> for a decryption operation and sets the
-algorithm specific B<params>.
+context using key I<pkey> for a decryption operation and sets the
+algorithm specific I<params>.
The EVP_PKEY_decrypt() function performs a public key decryption operation
-using B<ctx>. The data to be decrypted is specified using the B<in> and
-B<inlen> parameters. If B<out> is B<NULL> then the maximum size of the output
-buffer is written to the B<outlen> parameter. If B<out> is not B<NULL> then
-before the call the B<outlen> parameter should contain the length of the
-B<out> buffer, if the call is successful the decrypted data is written to
-B<out> and the amount of data written to B<outlen>.
+using I<ctx>. The data to be decrypted is specified using the I<in> and
+I<inlen> parameters. If I<out> is NULL then the minimum required size of
+the output buffer is written to the I<*outlen> parameter.
+
+If I<out> is not NULL then before the call the I<*outlen> parameter must
+contain the length of the I<out> buffer. If the call is successful the
+decrypted data is written to I<out> and the amount of the decrypted data
+written to I<*outlen>, otherwise an error is returned.
=head1 NOTES
|
enhance the plugin feature list | // Plugin sub-category //
/////////////////////////
+#define CLAP_PLUGIN_FEATURE_SYNTHESIZER "synthesizer"
+#define CLAP_PLUGIN_FEATURE_SAMPLER "sampler"
+#define CLAP_PLUGIN_FEATURE_DRUM "drum" // For single drum
+#define CLAP_PLUGIN_FEATURE_DRUM_MACHINE "drum-machine"
+
#define CLAP_PLUGIN_FEATURE_FILTER "filter"
#define CLAP_PLUGIN_FEATURE_PHASER "phaser"
#define CLAP_PLUGIN_FEATURE_EQUALIZER "equalizer"
|
Update Per-Processor Socket IOCTL to Correct Name | @@ -40,11 +40,12 @@ QuicFuzzerRecvMsg(
#pragma warning(disable:4116) // unnamed type definition in parentheses
//
-// This is a (currently) undocumented socket IOCTL. It allows for creating
-// per-processor sockets for the same UDP port. This is used to get better
-// parallelization to improve performance.
+// This IOCTL allows for creating per-processor sockets for the same UDP port.
+// This is used to get better parallelization to improve performance.
//
-#define SIO_SET_PORT_SHARING_PER_PROC_SOCKET _WSAIOW(IOC_VENDOR,21)
+#ifndef SIO_CPU_AFFINITY
+#define SIO_CPU_AFFINITY _WSAIOW(IOC_VENDOR,21)
+#endif
//
// Not yet available in the SDK. When available this code can be removed.
@@ -1153,7 +1154,7 @@ QuicDataPathBindingCreate(
Result =
WSAIoctl(
SocketContext->Socket,
- SIO_SET_PORT_SHARING_PER_PROC_SOCKET,
+ SIO_CPU_AFFINITY,
&Processor,
sizeof(Processor),
NULL,
@@ -1168,7 +1169,7 @@ QuicDataPathBindingCreate(
"[ udp][%p] ERROR, %u, %s.",
Binding,
WsaError,
- "SIO_SET_PORT_SHARING_PER_PROC_SOCKET");
+ "SIO_CPU_AFFINITY");
Status = HRESULT_FROM_WIN32(WsaError);
goto Error;
}
|
cleanup: redrix: Fix macro string
BRANCH=none
TEST=make BOARD=redrix | * found in the LICENSE file.
*/
-#ifndef __BOARD_BRYA_FW_CONFIG_H_
-#define __BOARD_BRYA_FW_CONFIG_H_
+#ifndef __BOARD_REDRIX_FW_CONFIG_H_
+#define __BOARD_REDRIX_FW_CONFIG_H_
#include <stdint.h>
@@ -52,4 +52,4 @@ union redrix_cbi_fw_config get_fw_config(void);
*/
bool ec_cfg_has_eps(void);
-#endif /* __BOARD_BRYA_FW_CONFIG_H_ */
+#endif /* __BOARD_REDRIX_FW_CONFIG_H_ */
|
fix memory leak in jam | (u3k(x), u3nc(u3nc(x, u3qc_lsh(0, 1, u3t(d))), u3k(l)), 0);
u3z(d);
+ u3z(l);
return y;
}
u3z(d);
u3z(x);
+ u3z(l);
return z;
}
return (jamframe*) u3a_peek(sizeof(jamframe));
}
+
u3_noun
u3qe_jam(u3_atom a)
{
{
u3_noun z = u3qa_add(2, fam->b);
u3_noun y = u3qa_add(z, p_d);
- _jam_push(u3t(fam->a), y, q_d, &(fam->tel));
+ _jam_push(u3t(fam->a), y, u3k(q_d), &(fam->tel));
u3z(z);
continue;
}
}
else {
u3_noun z = u3qa_add(2, fam->b);
- u3_noun w = u3nc(u3nc(2, 1), u3k(fam->l));
+ u3_noun w = u3nc(u3nc(2, 1), fam->l);
_jam_push(u3h(a), z, w, &(fam->hed));
continue;
}
|
[numerics] fix lcp_path without PATH ... | #include <stdio.h>
#include "SiconosConfig.h"
+#include "LinearComplementarityProblem.h"
+#include "SolverOptions.h"
+
#ifdef HAVE_PATHFERRIS
#include <stdlib.h>
#include <string.h>
#include "SimpleLCP.h"
#include "numerics_verbose.h"
-#include "LinearComplementarityProblem.h"
-#include "SolverOptions.h"
#include "NumericsMatrix.h"
#endif /*HAVE_PATHFERRIS*/
|
make test: vcl fix OSError exception handling | @@ -215,7 +215,7 @@ class VCLTestCase(VppTestCase):
os.killpg(os.getpgid(worker_client.process.pid),
signal.SIGKILL)
worker_client.join()
- except:
+ except OSError:
self.logger.debug(
"Couldn't kill client worker process")
raise
|
out_cloudwatch_logs: fix spelling mistake | @@ -549,7 +549,7 @@ static struct flb_config_map config_map[] = {
{
FLB_CONFIG_MAP_STR, "metric_dimensions", NULL,
0, FLB_FALSE, 0,
- "Metric dimensions is a list of lsits. If you have only one list of "
+ "Metric dimensions is a list of lists. If you have only one list of "
"dimensions, put the values as a comma seperated string. If you want to put "
"list of lists, use the list as semicolon seperated strings. If your value "
"is 'd1,d2;d3', we will consider it as [[d1, d2],[d3]]."
|
sse: fix _mm_cvtps_pi8 to not read memory it shouldn't | @@ -736,7 +736,7 @@ simde_mm_cvtps_pi8 (simde__m128 a) {
#else
simde__m64 r;
SIMDE__VECTORIZE
- for (size_t i = 0 ; i < (sizeof(r.i8) / sizeof(r.i8[0])) ; i++) {
+ for (size_t i = 0 ; i < (sizeof(a.f32) / sizeof(a.f32[0])) ; i++) {
r.i8[i] = (int8_t) a.f32[i];
}
return r;
|
[numerics] uncomment code | @@ -963,8 +963,8 @@ void gfc3d_ADMM(GlobalFrictionContactProblem* restrict problem_original, double*
}
- /* tmp_m = options->dWork; /\* options->dWork may be reallocated by computeError *\/ */
- /* tmp_n = &options->dWork[m]; */
+ tmp_m = options->dWork; /* options->dWork may be reallocated by computeError */
+ tmp_n = &options->dWork[m];
|
examples/watchdog/watchdog_main.c: Elapsed var is now being updated through clock | #define DEVNAME_SIZE 16
+/* Number of timeout expirations to change mode to reset the chip */
+
/****************************************************************************
* Private Types
****************************************************************************/
@@ -230,9 +232,13 @@ int main(int argc, FAR char *argv[])
#ifdef CONFIG_DEBUG_WATCHDOG
struct watchdog_status_s status;
#endif
- long elapsed;
int fd;
int ret;
+ uint64_t elapsed;
+ uint64_t start_ms;
+ uint64_t current_time_ms;
+ struct timespec tstart;
+ struct timespec tnow;
/* Parse the command line */
@@ -266,13 +272,19 @@ int main(int argc, FAR char *argv[])
goto errout_with_dev;
}
+ /* Get the starting time */
+
+ clock_gettime(CLOCK_REALTIME, &tstart);
+ start_ms = (tstart.tv_sec * 1000) + (tstart.tv_nsec / 1000000);
+
/* Then ping */
- for (elapsed = 0; elapsed < wdog.pingtime; elapsed += wdog.pingdelay)
+ for (elapsed = 0; elapsed < wdog.pingtime;
+ elapsed = current_time_ms - start_ms)
{
/* Sleep for the requested amount of time */
- usleep(wdog.pingdelay * 1000);
+ usleep((wdog.pingdelay * 1000) - CONFIG_USEC_PER_TICK);
/* Show watchdog status. Only if debug is enabled because this
* could interfere with the timer.
@@ -299,17 +311,23 @@ int main(int argc, FAR char *argv[])
goto errout_with_dev;
}
- printf(" ping elapsed=%ld\n", elapsed);
+ printf(" ping elapsed=%" PRIu64 "\n", elapsed);
fflush(stdout);
+
+ /* Get current time to calculate the elapsed time */
+
+ clock_gettime(CLOCK_REALTIME, &tnow);
+ current_time_ms = (uint64_t)((tnow.tv_sec * 1000)
+ + (tnow.tv_nsec / 1000000));
}
/* Then stop pinging */
- for (; ; elapsed += wdog.pingdelay)
+ for (; ; elapsed = current_time_ms - start_ms)
{
/* Sleep for the requested amount of time */
- usleep(wdog.pingdelay * 1000);
+ usleep((wdog.pingdelay * 1000) - CONFIG_USEC_PER_TICK);
/* Show watchdog status. Only if debug is enabled because this
* could interfere with the timer.
@@ -327,8 +345,14 @@ int main(int argc, FAR char *argv[])
status.flags, status.timeout, status.timeleft);
#endif
- printf(" NO ping elapsed=%ld\n", elapsed);
+ printf(" NO ping elapsed=%" PRIu64 "\n", elapsed);
fflush(stdout);
+
+ /* Get current time to calculate the elapsed time */
+
+ clock_gettime(CLOCK_REALTIME, &tnow);
+ current_time_ms = (uint64_t)((tnow.tv_sec * 1000)
+ + (tnow.tv_nsec / 1000000));
}
/* We should not get here */
|
fallback from cooperlake to skylake if gcc<10 | @@ -110,6 +110,8 @@ if (${CORE} STREQUAL "COOPERLAKE")
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
if (${GCC_VERSION} VERSION_GREATER 10.1 OR ${GCC_VERSION} VERSION_EQUAL 10.1)
set (CCOMMON_OPT = "${CCOMMON_OPT} -march=cooperlake")
+ else ()
+ set (CCOMMON_OPT "${CCOMMON_OPT} -march=skylake-avx512")
endif()
endif ()
endif ()
|
Ensure that a Hello is sent in the same packet as an IHU.
If no Hello has been buffered yet, insert an unscheduled Hello.
This only works if rfc6126-compatible is false. | @@ -1683,6 +1683,7 @@ send_ihu(struct neighbour *neigh, struct interface *ifp)
{
int rxcost, interval;
int send_rtt_data;
+ int unicast;
if(neigh == NULL && ifp == NULL) {
struct interface *ifp_aux;
@@ -1718,7 +1719,9 @@ send_ihu(struct neighbour *neigh, struct interface *ifp)
neigh->ifp->name,
format_address(neigh->address));
- if((ifp->flags & IF_TIMESTAMPS) != 0 && neigh->hello_send_us &&
+ unicast = !!(ifp->flags & IF_UNICAST);
+
+ if(!!(ifp->flags & IF_TIMESTAMPS) != 0 && neigh->hello_send_us &&
/* Checks whether the RTT data is not too old to be sent. */
timeval_minus_msec(&now, &neigh->hello_rtt_receive_time) < 1000000) {
send_rtt_data = 1;
@@ -1727,7 +1730,16 @@ send_ihu(struct neighbour *neigh, struct interface *ifp)
send_rtt_data = 0;
}
- buffer_ihu((ifp->flags & IF_UNICAST) != 0 ? &neigh->buf : &ifp->buf,
+ if(send_rtt_data) {
+ /* Ensure that there is a Hello in the same packet. */
+ ensure_space(unicast ? &neigh->buf : &ifp->buf, ifp, 14 + 16);
+ if(unicast)
+ send_unicast_hello(neigh, 0, 0);
+ else
+ send_multicast_hello(ifp, 0, 0);
+ }
+
+ buffer_ihu(unicast ? &neigh->buf : &ifp->buf,
ifp, rxcost, interval, neigh->address,
send_rtt_data, neigh->hello_send_us,
time_us(neigh->hello_rtt_receive_time));
|
Solving memory leakage in function get_cache in magic.c | @@ -67,11 +67,15 @@ static int get_cache(MAGIC_CACHE** cache)
(*cache)->magic_cookie = magic_open(0);
if ((*cache)->magic_cookie == NULL)
+ {
+ yr_free(*cache);
return ERROR_INSUFFICIENT_MEMORY;
+ }
if (magic_load((*cache)->magic_cookie, NULL) != 0)
{
magic_close((*cache)->magic_cookie);
+ yr_free(*cache);
return ERROR_INTERNAL_FATAL_ERROR;
}
|
add docs for new -reloadNoSync option | @@ -83,6 +83,7 @@ houdiniAsset
[-resetSimulation string ]
[-cookMessages string ]
[-reloadAsset string]
+[-reloadNoSync string]
[-sync string]
[-syncAttributes]
[-syncOutputs]
@@ -121,6 +122,11 @@ houdiniAsset
<td>assetName</td>
<td>reload the asset definition for the specified asset, from the hda from which it was previously loaded</td>
</tr>
+<tr>
+ <td>-reloadNoSync(-rn)</td>
+ <td>assetName</td>
+ <td>reload the asset definition for the specified asset, from the hda from which it was previously loaded, but do not sync the asset after reloading. If you know that the asset has the same number and types of outputs as before, this avoids deleting and rebuilding the output shapes in Maya, and any downstream modifications to the outputs will be preserved.</td>
+</tr>
<tr>
<td>-sync(-syn)</td>
<td>assetNode </td>
|
OpenCorePkg\Library\OcDevicePathLib\OcDevicePathLib.c: Fix warning C4244: '=': conversion from 'const UINT32' to 'UINT{8|16}', possible loss of data | @@ -210,7 +210,7 @@ OcFixAppleBootDevicePathNodeRestore (
if (NodeType == MESSAGING_DEVICE_PATH) {
switch (NodeSubType) {
case MSG_SATA_DP:
- Node.Sata->PortMultiplierPortNumber = RestoreContext->Sata.PortMultiplierPortNumber;
+ Node.Sata->PortMultiplierPortNumber = (UINT16) RestoreContext->Sata.PortMultiplierPortNumber;
break;
//
@@ -221,7 +221,7 @@ OcFixAppleBootDevicePathNodeRestore (
//
case MSG_NVME_NAMESPACE_DP:
case 0x22:
- Node.NvmeNamespace->Header.SubType = RestoreContext->SasExNvme.SubType;
+ Node.NvmeNamespace->Header.SubType = (UINT8) RestoreContext->SasExNvme.SubType;
break;
default:
|
test/usb_tcpmv2_td_pd_ll_e4.c: Format with clang-format
BRANCH=none
TEST=none | @@ -31,8 +31,8 @@ static int td_pd_ll_e4(enum pd_data_role data_role)
/*
* a) Run PROC.PD.E1 Bring-up according to the UUT role.
*/
- TEST_EQ(proc_pd_e1(data_role, INITIAL_AND_ALREADY_ATTACHED),
- EC_SUCCESS, "%d");
+ TEST_EQ(proc_pd_e1(data_role, INITIAL_AND_ALREADY_ATTACHED), EC_SUCCESS,
+ "%d");
/*
* Make sure we are idle. Reject everything that is pending
@@ -44,9 +44,7 @@ static int td_pd_ll_e4(enum pd_data_role data_role)
* and do not send GoodCrc for nRetryCount + 1 times
* (nRetryCount equals 3 since PD 2.1).
*/
- partner_send_msg(TCPCI_MSG_SOP,
- PD_CTRL_GET_SINK_CAP,
- 0, 0, NULL);
+ partner_send_msg(TCPCI_MSG_SOP, PD_CTRL_GET_SINK_CAP, 0, 0, NULL);
retries = 3;
TEST_EQ(verify_tcpci_tx_retry_count(TCPCI_MSG_SOP, 0, PD_DATA_SINK_CAP,
@@ -68,8 +66,8 @@ static int td_pd_ll_e4(enum pd_data_role data_role)
/*
* d) Check that the UUT issues a Hard Reset.
*/
- TEST_EQ(mock_tcpci_get_reg(TCPC_REG_TRANSMIT),
- TCPCI_MSG_TX_HARD_RESET, "%d");
+ TEST_EQ(mock_tcpci_get_reg(TCPC_REG_TRANSMIT), TCPCI_MSG_TX_HARD_RESET,
+ "%d");
mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS | TCPC_REG_ALERT_TX_FAILED);
mock_tcpci_set_reg(TCPC_REG_TRANSMIT, 0);
task_wait_event(1 * MSEC);
|
fix error with pull file | @@ -216,6 +216,12 @@ rho::net::CNetResponseWrapper CNetRequestWrapper::pushMultipartData(const String
rho::net::CNetResponseWrapper CNetRequestWrapper::pullFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders,bool overwriteFile,bool createFolders, bool* pFileExistsFlag )
{
+
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+ const rho::common::ISecurityTokenGenerator* generator = rho_conf_getInt("disable_external_access") ?
+ rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
+#endif
+
if (!overwriteFile && common::CRhoFile::isFileExist(strFilePath.c_str())) {
LOGC(WARNING,"Net") + "pullFile: " + strFilePath + " already exists, won't download since overwrite flag is not set";
@@ -247,6 +253,7 @@ rho::net::CNetResponseWrapper CNetRequestWrapper::pullFile(const String& strUrl,
//don't request headers of will overwrite anyway
if (!overwriteFile) {
Hashtable<String, String> h;
+
::getNetRequest().doRequest("HEAD", strUrl, "", oSession, &h );
if ( h.containsKey("last-modified") )
@@ -276,6 +283,19 @@ rho::net::CNetResponseWrapper CNetRequestWrapper::pullFile(const String& strUrl,
return m_pReqImpl->createEmptyNetResponse();
}
+
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+ Hashtable<String,String> headers;
+ if(!pHeaders)
+ pHeaders = &headers;
+ if(generator)
+#if defined(OS_ANDROID)
+ pHeaders->insert(std::make_pair(SECURITY_HEADER, "RhodesAgent RHO-SECURE-TOKEN=" + generator->getSecurityToken()));
+#elif defined(OS_WINDOWS_DESKTOP)
+ pHeaders->insert(std::make_pair(SECURITY_HEADER, generator->getSecurityToken()));
+#endif
+
+#endif
INetResponse* pResp = m_pReqImpl->pullFile( strUrl, tmpFile, oSession, pHeaders );
tmpFile.close();
|
[lwip] add list_udps. | @@ -673,6 +673,35 @@ void list_tcps(void)
rt_exit_critical();
}
FINSH_FUNCTION_EXPORT(list_tcps, list all of tcp connections);
-#endif
+#endif /* LWIP_TCP */
+
+#if LWIP_UDP
+void list_udps(void)
+{
+ struct udp_pcb *pcb;
+ rt_uint32_t num = 0;
+ char local_ip_str[16];
+ char remote_ip_str[16];
+
+ rt_enter_critical();
+ rt_kprintf("Active UDP PCB states:\n");
+ for (pcb = udp_pcbs; pcb != NULL; pcb = pcb->next)
+ {
+ strcpy(local_ip_str, ipaddr_ntoa(&(pcb->local_ip)));
+ strcpy(remote_ip_str, ipaddr_ntoa(&(pcb->remote_ip)));
+
+ rt_kprintf("#%d %d %s:%d <==> %s:%d \n",
+ num, (int)pcb->flags,
+ local_ip_str,
+ pcb->local_port,
+ remote_ip_str,
+ pcb->remote_port);
+
+ num++;
+ }
+ rt_exit_critical();
+}
+FINSH_FUNCTION_EXPORT(list_udps, list all of udp connections);
+#endif /* LWIP_UDP */
#endif
|
Fix CMAKE_FLAGS in build.ps1. | @@ -27,10 +27,9 @@ if ($Env:PLATFORM -ne "Win32" -and $Env:PLATFORM -ne "Win64") {
# Make BUILD_DIR next to this script.
$BUILD_DIR_FIXED = "$PSScriptRoot\$Env:BUILD_DIR"
-# Setup CMake generator.
+# Setup CMAKE_FLAGS.
+$CMAKE_FLAGS = "$Env:CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Release"
if ($Env:COMPILER -eq "mingw") {
- # sh.exe must not be in PATH when compiling with MinGW.
- Rename-Item -Path "C:\Program Files\Git\usr\bin\sh.exe" -NewName "sh2.exe"
$GENERATOR = "MinGW Makefiles"
} else {
$GENERATOR = "Visual Studio 15 2017"
@@ -38,6 +37,7 @@ if ($Env:COMPILER -eq "mingw") {
$GENERATOR = "$GENERATOR Win64"
}
}
+$CMAKE_FLAGS = "$CMAKE_FLAGS -G ""$GENERATOR"""
@@ -47,6 +47,8 @@ if ($Env:COMPILER -eq "mingw") {
choco install -y -r swig --version 3.0.9
choco install -y -r lua53
if ($Env:COMPILER -eq "mingw") {
+ sh.exe must not be in PATH when compiling with MinGW.
+ Rename-Item -Path "C:\Program Files\Git\usr\bin\sh.exe" -NewName "sh2.exe"
if ($Env:PLATFORM -eq "Win64") {
choco install -y -r mingw
} else {
@@ -55,18 +57,23 @@ if ($Env:COMPILER -eq "mingw") {
}
refreshenv
+# Enable installed and supported interfaces.
+$CMAKE_FLAGS = "$CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Release"
+$CMAKE_FLAGS = "$CMAKE_FLAGS -DTINYSPLINE_ENABLE_CSHARP=True"
+$CMAKE_FLAGS = "$CMAKE_FLAGS -DTINYSPLINE_ENABLE_D=True"
+$CMAKE_FLAGS = "$CMAKE_FLAGS -DTINYSPLINE_ENABLE_JAVA=True"
+
###############################################################################
### Compile targets.
###############################################################################
-$CMAKE_FLAGS = '-DCMAKE_BUILD_TYPE=Release'
-$CMAKE_FLAGS = '$CMAKE_FLAGS -DTINYSPLINE_ENABLE_CSHARP=True'
-$CMAKE_FLAGS = '$CMAKE_FLAGS -DTINYSPLINE_ENABLE_D=True'
-$CMAKE_FLAGS = '$CMAKE_FLAGS -DTINYSPLINE_ENABLE_JAVA=True'
-
mkdir $BUILD_DIR_FIXED
pushd $BUILD_DIR_FIXED
- cmake -G "$GENERATOR" $CMAKE_FLAGS "$PSScriptRoot\..\.."
- cmake --build .
+ Start-Process cmake `
+ -ArgumentList "$CMAKE_FLAGS $PSScriptRoot\..\.." `
+ -NoNewWindow -Wait
+ Start-Process cmake `
+ -ArgumentList "--build ." `
+ -NoNewWindow -Wait
popd
|
Fix wasm build.........; | @@ -15,6 +15,49 @@ int main(int argc, char** argv);
#ifndef LOVR_USE_OCULUS_MOBILE
+#ifdef EMSCRIPTEN
+#include <emscripten.h>
+typedef struct {
+ lua_State* L;
+ lua_State* T;
+ int argc;
+ char** argv;
+} lovrEmscriptenContext;
+
+void lovrDestroy(void* arg) {
+ lovrEmscriptenContext* context = arg;
+ lua_State* L = context->L;
+ emscripten_cancel_main_loop();
+ lua_close(L);
+}
+
+static void emscriptenLoop(void* arg) {
+ lovrEmscriptenContext* context = arg;
+ lua_getglobal(context->L, "_lovrHeadsetRenderError"); // webvr.c renderCallback failed
+ bool haveRenderError = !lua_isnil(context->L, -1);
+ if (!haveRenderError) {
+ lua_pop(context->L, 1);
+ }
+
+ int coroutineArgs = luax_pushLovrHeadsetRenderError(context->T);
+
+ if (lua_resume(context->T, coroutineArgs) != LUA_YIELD) {
+ bool restart = lua_type(context->T, -1) == LUA_TSTRING && !strcmp(lua_tostring(context->T, -1), "restart");
+ int status = lua_tonumber(context->T, -1);
+
+ lua_close(context->L);
+ emscripten_cancel_main_loop();
+
+ if (restart) {
+ main(context->argc, context->argv);
+ } else {
+ lovrPlatformDestroy();
+ exit(status);
+ }
+ }
+}
+#endif
+
int main(int argc, char** argv) {
if (argc > 1 && (!strcmp(argv[1], "--version") || !strcmp(argv[1], "-v"))) {
lovrLog("LOVR %d.%d.%d (%s)\n", LOVR_VERSION_MAJOR, LOVR_VERSION_MINOR, LOVR_VERSION_PATCH, LOVR_VERSION_ALIAS);
@@ -59,49 +102,6 @@ int main(int argc, char** argv) {
#endif
-#ifdef EMSCRIPTEN
-#include <emscripten.h>
-typedef struct {
- lua_State* L;
- lua_State* T;
- int argc;
- char** argv;
-} lovrEmscriptenContext;
-
-void lovrDestroy(void* arg) {
- lovrEmscriptenContext* context = arg;
- lua_State* L = context->L;
- emscripten_cancel_main_loop();
- lua_close(L);
-}
-
-static void emscriptenLoop(void* arg) {
- lovrEmscriptenContext* context = arg;
- lua_getglobal(context->L, "_lovrHeadsetRenderError"); // webvr.c renderCallback failed
- bool haveRenderError = !lua_isnil(context->L, -1);
- if (!haveRenderError) {
- lua_pop(context->L, 1);
- }
-
- int coroutineArgs = luax_pushLovrHeadsetRenderError(context->T);
-
- if (lua_resume(context->T, coroutineArgs) != LUA_YIELD) {
- bool restart = lua_type(context->T, -1) == LUA_TSTRING && !strcmp(lua_tostring(context->T, -1), "restart");
- int status = lua_tonumber(context->T, -1);
-
- lua_close(context->L);
- emscripten_cancel_main_loop();
-
- if (restart) {
- main(context->argc, context->argv);
- } else {
- lovrPlatformDestroy();
- exit(status);
- }
- }
-}
-#endif
-
typedef enum { // What flag is being searched for?
ARGFLAG_NONE, // Not processing a flag
ARGFLAG_ROOT
|
cleanup old 2x2 checks | @@ -275,16 +275,6 @@ char *SCS(get_cone_header)(const ScsCone *k) {
return tmp;
}
-static scs_int is_simple_semi_definite_cone(scs_int *s, scs_int ssize) {
- scs_int i;
- for (i = 0; i < ssize; i++) {
- if (s[i] > 2) {
- return 0; /* false */
- }
- }
- return 1; /* true */
-}
-
static scs_float exp_newton_one_d(scs_float rho, scs_float y_hat,
scs_float z_hat, scs_float w) {
scs_float t_prev, t = MAX(w - z_hat, MAX(-z_hat, 1e-9));
@@ -398,8 +388,8 @@ static scs_int proj_exp_cone(scs_float *v) {
}
static scs_int set_up_sd_cone_work_space(ScsConeWork *c, const ScsCone *k) {
-#ifdef USE_LAPACK
scs_int i;
+#ifdef USE_LAPACK
blas_int n_max = 0;
blas_int neg_one = -1;
blas_int info = 0;
@@ -436,10 +426,17 @@ static scs_int set_up_sd_cone_work_space(ScsConeWork *c, const ScsCone *k) {
}
return 0;
#else
- scs_printf("FATAL: Cannot solve SDPs without linked blas+lapack libraries\n");
- scs_printf("Install blas+lapack and re-compile SCS with blas+lapack library "
+ for (i = 0; i < k->ssize; i++) {
+ if (k->s[i] > 1) {
+ scs_printf(
+ "FATAL: Cannot solve SDPs without linked blas+lapack libraries\n");
+ scs_printf(
+ "Install blas+lapack and re-compile SCS with blas+lapack library "
"locations\n");
return -1;
+ }
+ }
+ return 0;
#endif
}
@@ -868,8 +865,7 @@ ScsConeWork *SCS(init_cone)(const ScsCone *k, const ScsScaling *scal,
}
}
if (k->ssize && k->s) {
- if (!is_simple_semi_definite_cone(k->s, k->ssize) &&
- set_up_sd_cone_work_space(c, k) < 0) {
+ if (set_up_sd_cone_work_space(c, k) < 0) {
SCS(finish_cone)(c);
return SCS_NULL;
}
|
in_head: use new input logging api | #include <fluent-bit/flb_info.h>
#include <fluent-bit/flb_input.h>
+#include <fluent-bit/flb_input_plugin.h>
#include <fluent-bit/flb_config.h>
#include <fluent-bit/flb_error.h>
#include <fluent-bit/flb_utils.h>
@@ -64,7 +65,7 @@ static int read_lines(struct flb_in_head_config *ctx)
new_len = ctx->buf_size + str_len + 1;
tmp = flb_malloc(new_len);
if (tmp == NULL) {
- flb_error("failed to allocate buffer");
+ flb_plg_error(ctx->ins, "failed to allocate buffer");
/* try to output partial data */
break;
}
@@ -123,7 +124,7 @@ static int single_value_per_record(struct flb_input_instance *i_ins,
read_bytes(ctx);
}
- flb_trace("%s read_len=%d buf_size=%d", __FUNCTION__,
+ flb_plg_trace(ctx->ins, "%s read_len=%d buf_size=%d", __FUNCTION__,
ctx->buf_len, ctx->buf_size);
if (ctx->add_path == FLB_TRUE) {
@@ -332,9 +333,9 @@ static int in_head_config_read(struct flb_in_head_config *ctx,
}
}
- flb_debug("[in_head] buf_size=%d path=%s",
+ flb_plg_debug(ctx->ins, "buf_size=%d path=%s",
ctx->buf_size, ctx->filepath);
- flb_debug("[in_head] interval_sec=%d interval_nsec=%d",
+ flb_plg_debug(ctx->ins, "interval_sec=%d interval_nsec=%d",
ctx->interval_sec, ctx->interval_nsec);
return 0;
@@ -384,7 +385,7 @@ static int in_head_init(struct flb_input_instance *in,
goto init_error;
}
- flb_trace("%s read_len=%d buf_size=%d", __FUNCTION__, ctx->buf_len,
+ flb_plg_trace(ctx->ins, "%s read_len=%d buf_size=%d", __FUNCTION__, ctx->buf_len,
ctx->buf_size);
flb_input_set_context(in, ctx);
@@ -394,7 +395,7 @@ static int in_head_init(struct flb_input_instance *in,
ctx->interval_sec,
ctx->interval_nsec, config);
if (ret < 0) {
- flb_error("could not set collector for head input plugin");
+ flb_plg_error(ctx->ins, "could not set collector for head input plugin");
goto init_error;
}
|
fixed captured mouse on game menu/exit | @@ -364,6 +364,7 @@ void tic_api_reset(tic_mem* memory)
resetBlitSegment(memory);
memset(&memory->ram.vram.vars, 0, sizeof memory->ram.vram.vars);
+ memory->ram.input.mouse.relative = 0;
tic_api_clip(memory, 0, 0, TIC80_WIDTH, TIC80_HEIGHT);
|
docs/uselect: Describe POLLHUP/POLLERR semantics in more details.
Per POSIX,
these flags aren't valid in the input eventmask. Instead, they can be
returned in unsolicited manner in the output eventmask at any time. | @@ -35,12 +35,15 @@ Methods
Register *obj* for polling. *eventmask* is logical OR of:
- * ``select.POLLIN`` - data available for reading
- * ``select.POLLOUT`` - more data can be written
- * ``select.POLLERR`` - error occurred
- * ``select.POLLHUP`` - end of stream/connection termination detected
+ * `uselect.POLLIN` - data available for reading
+ * `uselect.POLLOUT` - more data can be written
- *eventmask* defaults to ``select.POLLIN | select.POLLOUT``.
+ Note that flags like `uselect.POLLHUP` and `uselect.POLLERR` are
+ *not* valid as input eventmask (these are unsolicited events which
+ will be returned from `poll()` regardless of whether they are asked
+ for). This semantics is per POSIX.
+
+ *eventmask* defaults to ``uselect.POLLIN | uselect.POLLOUT``.
.. method:: poll.unregister(obj)
@@ -52,15 +55,21 @@ Methods
.. method:: poll.poll(timeout=-1)
- Wait for at least one of the registered objects to become ready, with optional
- timeout in milliseconds (if *timeout* arg is not specified or -1, there is no
- timeout). Returns list of (``obj``, ``event``, ...) tuples, ``event`` element specifies
- which events happened with a stream and is a combination of ``select.POLL*``
- constants described above. There may be other elements in tuple, depending
- on a platform and version, so don't assume that its size is 2. In case of
- timeout, an empty list is returned.
-
- Timeout is in milliseconds.
+ Wait for at least one of the registered objects to become ready or have an
+ exceptional condition, with optional timeout in milliseconds (if *timeout*
+ arg is not specified or -1, there is no timeout).
+
+ Returns list of (``obj``, ``event``, ...) tuples. There may be other elements in
+ tuple, depending on a platform and version, so don't assume that its size is 2.
+ The ``event`` element specifies which events happened with a stream and
+ is a combination of ``uselect.POLL*`` constants described above. Note that
+ flags `uselect.POLLHUP` and `uselect.POLLERR` can be returned at any time
+ (even if were not asked for), and must be acted on accordingly (the
+ corresponding stream unregistered from poll and likely closed), because
+ otherwise all further invocations of `poll()` may return immediately with
+ these flags set for this stream again.
+
+ In case of timeout, an empty list is returned.
.. admonition:: Difference to CPython
:class: attention
|
Updated 'special thanks' part | @@ -154,12 +154,12 @@ SGDK is completly free but you can support it on Patreon: https://www.patreon.co
## SPECIAL THANKS
-Of course I thank all my patreon for their continuous support but I want to dedicace a very special and warmfull thanks for
-my premium patreon supporters (100$ / month):
+Of course I thank all my patreon for their continuous support but I want to dedicace a very special and warmfull thanks for generous donation from:
- Bitmap Bureau (Xeno Crisis team)
- Neofid Studios (Demons of Asteborg team)
- Dmitry (D I)
+- Rajen Savjani
## POWERED BY THE SGDK!
|
METADATA.ini: remove duplicates | @@ -644,54 +644,6 @@ type = enum
status = implemented
description = sets the conflict handling for missing key conflicts in kdbGet, see spec plugin README
-[conflict/get/member]
-type = enum
- ERROR
- WARNING
- INFO
-status = implemented
-description = sets the conflict handling for range conflicts in kdbGet, see spec plugin README
-
-[conflict/get/member]
-type = enum
- ERROR
- WARNING
- INFO
-status = implemented
-description = sets the conflict handling for member conflicts in kdbGet, see spec plugin README
-
-[conflict/get/invalid]
-type = enum
- ERROR
- WARNING
- INFO
-status = implemented
-description = sets the conflict handling for invalid conflicts in kdbGet, see spec plugin README
-
-[conflict/get/count]
-type = enum
- ERROR
- WARNING
- INFO
-status = implemented
-description = sets the conflict handling for count conflicts in kdbGet, see spec plugin README
-
-[conflict/get/collision]
-type = enum
- ERROR
- WARNING
- INFO
-status = implemented
-description = sets the conflict handling for collision conflicts in kdbGet, see spec plugin README
-
-[conflict/get/missing]
-type = enum
- ERROR
- WARNING
- INFO
-status = implemented
-description = sets the conflict handling for missing key conflicts in kdbGet, see spec plugin README
-
[conflict/get/range]
type = enum
ERROR
|
input: disable storage_type for metrics plugin | @@ -349,6 +349,11 @@ int flb_input_set_property(struct flb_input_instance *ins,
flb_sds_destroy(tmp);
}
else if (prop_key_check("storage.type", k, len) == 0 && tmp) {
+ /* If the input generate metrics, always use memory storage (for now) */
+ if (ins->event_type == FLB_INPUT_LOGS) {
+ ins->storage_type = CIO_STORE_MEM;
+ }
+ else {
/* Set the storage type */
if (strcasecmp(tmp, "filesystem") == 0) {
ins->storage_type = CIO_STORE_FS;
@@ -360,6 +365,7 @@ int flb_input_set_property(struct flb_input_instance *ins,
flb_sds_destroy(tmp);
return -1;
}
+ }
flb_sds_destroy(tmp);
}
else {
|
Fix limits on scene switch event | @@ -13,7 +13,7 @@ const fields = [
label: l10n("FIELD_X"),
type: "number",
min: 0,
- max: 30,
+ max: 255,
defaultValue: 0,
width: "50%"
},
@@ -22,7 +22,7 @@ const fields = [
label: l10n("FIELD_Y"),
type: "number",
min: 0,
- max: 31,
+ max: 255,
defaultValue: 0,
width: "50%"
},
|
examples/openssl: remove assert on RAND_set_rand_method | -#include <assert.h>
#include <openssl/rand.h>
#ifdef __cplusplus
@@ -27,9 +26,9 @@ static RAND_METHOD hf_method = {
hf_stat,
};
-void HFResetRand(void)
+static void HFResetRand(void)
{
- assert(RAND_set_rand_method(&hf_method) == 1);
+ RAND_set_rand_method(&hf_method);
}
#ifdef __cplusplus
|
Fix interning build for cmake version 3.15+ | @@ -491,7 +491,16 @@ if (NOT $ENV{S2N_LIBCRYPTO} STREQUAL "awslc")
target_compile_options(${PROJECT_NAME} PRIVATE -Wcast-qual)
endif()
-#work around target differences
+# For interning, we need to find the static libcrypto library. Cmake configs
+# can branch on the variable BUILD_SHARED_LIBS to e.g. avoid having to define
+# multiple targets. An example is AWS-LC:
+# https://github.com/awslabs/aws-lc/blob/main/crypto/cmake/crypto-config.cmake#L5
+if (S2N_INTERN_LIBCRYPTO)
+ set(BUILD_SHARED_LIBS_BACKUP ${BUILD_SHARED_LIBS})
+ set(BUILD_SHARED_LIBS OFF)
+endif()
+
+# Work around target differences
if (TARGET crypto)
message(STATUS "S2N found target: crypto")
set(LINK_LIB "crypto")
@@ -502,6 +511,8 @@ else()
endif()
if (S2N_INTERN_LIBCRYPTO)
+ # Restore the old BUILD_SHARED_LIBS value
+ set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BACKUP})
message(STATUS "Enabling libcrypto interning")
endif()
@@ -542,10 +553,32 @@ if (LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX)
endif()
if (S2N_INTERN_LIBCRYPTO)
+
+ # Check if the AWS::crypto target has beeen added and handle it
+ if (TARGET AWS::crypto)
+ # Get the target library type (shared or static)
+ get_target_property(target_type AWS::crypto TYPE)
+ message(STATUS "AWS::crypto target type: ${target_type}")
+
+ # If we didn't find the a target with static library type, fallback to
+ # existing crypto_STATIC_LIBRARY and crypto_INCLUDE_DIR
+ if (target_type STREQUAL STATIC_LIBRARY)
+ # We need an path to the include directory and libcrypto.a archive.
+ # The finder module defines these appropriately, but if we go through
+ # the target config we need to query this information from the target
+ # first.
+ get_target_property(crypto_STATIC_LIBRARY AWS::crypto LOCATION)
+ get_target_property(crypto_INCLUDE_DIR AWS::crypto INTERFACE_INCLUDE_DIRECTORIES)
+ endif()
+ endif()
+
if (NOT crypto_STATIC_LIBRARY)
message(FATAL_ERROR "libcrypto interning requires a static build of libcrypto.a to be available")
endif()
+ message(STATUS "crypto_STATIC_LIBRARY: ${crypto_STATIC_LIBRARY}")
+ message(STATUS "crypto_INCLUDE_DIR: ${crypto_INCLUDE_DIR}")
+
# Don't call link_target_libraries here, just make sure the libcrypto include dir is in the path
include_directories("${crypto_INCLUDE_DIR}")
|
[autoconf] force large file support
force large file support; ignore --disable-lfs
(already forced in lighttpd meson, CMake, and Scons builds)
x-ref:
"File upload regression with --disable-lfs" | @@ -1527,7 +1527,8 @@ AC_ARG_ENABLE([lfs],
[
case "${enableval}" in
yes) ENABLE_LFS=yes ;;
- no) ENABLE_LFS=no ;;
+ no) ENABLE_LFS=yes
+ AC_MSG_NOTICE([large file support forced; --disable-lfs ignored]) ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-lfs]) ;;
esac
],
|
fixed src/text sources compilation | @@ -8,9 +8,11 @@ endif
include $(GDK)/common.mk
SRC_LIB_C := $(wildcard $(SRC_LIB)/*.c)
-SRC_LIB_C += $(wildcard $(SRC_LIB)/*/*.c)
+SRC_LIB_C += $(wildcard $(SRC_LIB)/ext/*.c)
+SRC_LIB_C += $(wildcard $(SRC_LIB)/ext/*/*.c)
SRC_LIB_S := $(wildcard $(SRC_LIB)/*.s)
-SRC_LIB_S += $(wildcard $(SRC_LIB)/*/*.s)
+SRC_LIB_S += $(wildcard $(SRC_LIB)/ext/*.s)
+SRC_LIB_S += $(wildcard $(SRC_LIB)/ext/*/*.s)
SRC_LIB_S80 := $(wildcard $(SRC_LIB)/*.s80)
RES_LIB_RES := $(wildcard $(RES_LIB)/*.res)
|
tool: elektrad fix null /kdb result | @@ -60,10 +60,6 @@ func lookup(ks elektra.KeySet, key elektra.Key, depth int) (*lookupResult, error
ks = ks.Cut(key)
foundKey := ks.Lookup(key)
- if foundKey == nil {
- return nil, nil
- }
-
var meta map[string]string
exists := foundKey != nil
name := key.BaseName()
|
bitcoin: address joe review | ?> ?=(%bucket -.dat)
|^ :- =/ del=event:settings [%del-bucket %landscape %btc-wallet]
(poke-our:hc %settings-store %settings-event !>(del))
- %- zing
- %+ turn ~(tap by bucket.dat)
- (cork copy-if-missing drop)
+ (murn ~(tap by bucket.dat) copy-if-missing)
::
++ copy-if-missing
|= [=key:settings =val:settings]
|= upd=update:bp
^- (quip card _state)
|^
- ?~ prov `state
- ?. =(host.u.prov src.bowl) `state
+ ?: =(~ prov) `state
+ ?. =(host:(need prov) src.bowl) `state
?. ?=(%.y -.upd) `state
?- -.p.upd
%address-info
::
%tx-info
:: TODO: why do we get a nest-fail when using =^ ?
- =/ [cards=(list card) sty=state-3]
+ =^ cards=(list card) state
(handle-tx-info:hc info.p.upd)
- :_ sty
+ :_ state
:_ cards
(poke-internal:hc [%close-pym info.p.upd])
::
|
Pin coap-cli to working version 0.5.1 | @@ -35,7 +35,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E03280
&& apt-get -qq clean
# Install coap-cli
-RUN npm -q install coap-cli -g \
+RUN npm -q install [email protected] -g \
&& sudo ln -s /usr/bin/nodejs /usr/bin/node
# Install ARM toolchain
|
review5: add keil-c51 toolchain & rules | -
-rule("c51.static")
+rule("c51.binary")
on_load(function (target)
-- we disable checking flags for cross toolchain automatically
target:set("policy", "check.auto_ignore_flags", false)
|
Don't seek past rows in xport
Row count is unknown, so row_offset > actual row count will be a seek error. | @@ -570,13 +570,18 @@ static readstat_error_t xport_process_row(xport_ctx_t *ctx, const char *row, siz
}
pos += variable->storage_width;
- if (ctx->handle.value && !ctx->variables[i]->skip) {
+ if (ctx->handle.value && !ctx->variables[i]->skip && !ctx->row_offset) {
if (ctx->handle.value(ctx->parsed_row_count, variable, value, ctx->user_ctx) != READSTAT_HANDLER_OK) {
retval = READSTAT_ERROR_USER_ABORT;
goto cleanup;
}
}
}
+ if (ctx->row_offset) {
+ ctx->row_offset--;
+ } else {
+ ctx->parsed_row_count++;
+ }
cleanup:
free(string);
@@ -600,14 +605,6 @@ static readstat_error_t xport_read_data(xport_ctx_t *ctx) {
goto cleanup;
}
- if (ctx->row_offset) {
- if (ctx->io->seek(ctx->row_length * ctx->row_offset, READSTAT_SEEK_CUR, ctx->io->io_ctx) == -1) {
- retval = READSTAT_ERROR_SEEK;
- goto cleanup;
- }
- ctx->row_offset = 0;
- }
-
memset(blank_row, ' ', ctx->row_length);
while (1) {
ssize_t bytes_read = read_bytes(ctx, row, ctx->row_length);
@@ -639,7 +636,7 @@ static readstat_error_t xport_read_data(xport_ctx_t *ctx) {
if (retval != READSTAT_OK)
goto cleanup;
- if (++(ctx->parsed_row_count) == ctx->row_limit)
+ if (ctx->parsed_row_count == ctx->row_limit)
goto cleanup;
num_blank_rows--;
@@ -653,7 +650,7 @@ static readstat_error_t xport_read_data(xport_ctx_t *ctx) {
if (retval != READSTAT_OK)
goto cleanup;
- if (++(ctx->parsed_row_count) == ctx->row_limit)
+ if (ctx->parsed_row_count == ctx->row_limit)
break;
}
|
Adopt the upstream's default value of 'log_line_prefix' | @@ -3696,9 +3696,7 @@ static struct config_string ConfigureNamesString[] =
GUC_NO_SHOW_ALL
},
&Log_line_prefix,
- /* GPDB_12_MERGE_FIXME: Could we adopt the upstream's default? Is there some
- * reason for this particular prefix in GPDB? */
- "%m|%u|%d|%p|%I|%X|:-",
+ "%m [%p] ",
NULL, NULL, NULL
},
|
dpdk: bump to 21.08
Type: feature
This patch bumps dpdk version from 21.05 to 21.08 | @@ -22,9 +22,10 @@ DPDK_FAILSAFE_PMD ?= n
DPDK_MACHINE ?= default
DPDK_MLX_IBV_LINK ?= static
-dpdk_version ?= 21.05
+dpdk_version ?= 21.08
dpdk_base_url ?= http://fast.dpdk.org/rel
dpdk_tarball := dpdk-$(dpdk_version).tar.xz
+dpdk_tarball_md5sum_21.08 := de33433a1806280996a0ecbe66e3642f
dpdk_tarball_md5sum_21.05 := a78bba290b11d9717d1272cc6bfaf7c3
dpdk_tarball_md5sum := $(dpdk_tarball_md5sum_$(dpdk_version))
dpdk_url := $(dpdk_base_url)/$(dpdk_tarball)
|
Change default in blacklist | @@ -720,8 +720,8 @@ static int AttachInterface(SurviveViveData *sv, struct SurviveUSBInfo *usbObject
}
static const struct DeviceInfo *find_known_device(SurviveContext *ctx, uint16_t idVendor, uint16_t idProduct) {
- const char *blacklist = survive_configs(ctx, "blacklist-devs", SC_GET, "-");
- for (const struct DeviceInfo *info = KnownDeviceTypes; info->name; info++) {
+ const char *blacklist = survive_configs(ctx, "blacklist-devs", SC_GET, 0);
+ for (const struct DeviceInfo *info = KnownDeviceTypes; info->name && blacklist; info++) {
if (info == 0 || strstr(blacklist, info->name)) {
continue;
}
|
mount: detect availability of cache plugin | @@ -314,7 +314,7 @@ Plugin * elektraMountGlobalsLoadPlugin (KeySet * referencePlugins, Key * cur, Ke
KeySet * elektraDefaultGlobalConfig (void)
{
- return ksNew (
+ KeySet * config = ksNew (
24, keyNew ("system/elektra/globalplugins", KEY_VALUE, "", KEY_END),
keyNew ("system/elektra/globalplugins/postcommit", KEY_VALUE, "list", KEY_END),
keyNew ("system/elektra/globalplugins/postcommit/user", KEY_VALUE, "list", KEY_END),
@@ -338,15 +338,25 @@ KeySet * elektraDefaultGlobalConfig (void)
#endif
keyNew ("system/elektra/globalplugins/postgetcleanup", KEY_VALUE, "list", KEY_END),
keyNew ("system/elektra/globalplugins/postgetstorage", KEY_VALUE, "list", KEY_END),
- keyNew ("system/elektra/globalplugins/postgetcache", KEY_VALUE, "cache", KEY_END),
+ keyNew ("system/elektra/globalplugins/postgetcache", KEY_VALUE, "", KEY_END),
keyNew ("system/elektra/globalplugins/postrollback", KEY_VALUE, "list", KEY_END),
keyNew ("system/elektra/globalplugins/precommit", KEY_VALUE, "list", KEY_END),
keyNew ("system/elektra/globalplugins/pregetstorage", KEY_VALUE, "list", KEY_END),
- keyNew ("system/elektra/globalplugins/pregetcache", KEY_VALUE, "cache", KEY_END),
+ keyNew ("system/elektra/globalplugins/pregetcache", KEY_VALUE, "", KEY_END),
keyNew ("system/elektra/globalplugins/prerollback", KEY_VALUE, "list", KEY_END),
keyNew ("system/elektra/globalplugins/presetcleanup", KEY_VALUE, "list", KEY_END),
keyNew ("system/elektra/globalplugins/presetstorage", KEY_VALUE, "list", KEY_END),
keyNew ("system/elektra/globalplugins/procgetstorage", KEY_VALUE, "list", KEY_END), KS_END);
+
+ // TODO: this is a poor way of detecting whether cache is compiled, but simply
+ // matching against cache might fail because of other plugins (e.g. "cachefilter")
+ if (strstr (ELEKTRA_PLUGINS, ";cache;") != NULL)
+ {
+ ksAppendKey (config, keyNew ("system/elektra/globalplugins/postgetcache", KEY_VALUE, "cache", KEY_END));
+ ksAppendKey (config, keyNew ("system/elektra/globalplugins/pregetcache", KEY_VALUE, "cache", KEY_END));
+ }
+
+ return config;
}
int mountGlobals (KDB * kdb, KeySet * keys, KeySet * modules, Key * errorKey)
|
safety measure for cases with "no report file provided" | @@ -83,15 +83,18 @@ namespace ebi
continue;
}
+ std::string synonym_found_in_assembly_report = record_core.chromosome;
+ if (assembly_report != ebi::vcf::NO_MAPPING) {
std::vector<std::string> found_synonyms = get_matching_synonyms_list(synonyms_map,
- line_num,
- record_core,
- fasta_index,
- outputs);
+ line_num, record_core, fasta_index, outputs);
if(found_synonyms.size() != 1) {
+ // found one or more synonyms matching in fasta index file
+ // so we wont validate the ambigious contig
+ is_valid = false;
continue;
}
- std::string synonym_found_in_assembly_report = found_synonyms[0];
+ synonym_found_in_assembly_report = found_synonyms[0];
+ }
auto fasta_sequence = bioio::read_fasta_contig(fasta_input,
fasta_index.at(synonym_found_in_assembly_report),
|
crypto-native: add missing static_always_inline
Type: improvement | @@ -258,7 +258,7 @@ static const u8x16 aese_prep_mask1 =
static const u8x16 aese_prep_mask2 =
{ 12, 13, 14, 15, 12, 13, 14, 15, 12, 13, 14, 15, 12, 13, 14, 15 };
-static inline void
+static_always_inline void
aes128_key_expand_round_neon (u8x16 * rk, u32 rcon)
{
u8x16 r, t, last_round = rk[-1], z = { };
@@ -272,7 +272,7 @@ aes128_key_expand_round_neon (u8x16 * rk, u32 rcon)
rk[0] = r;
}
-void
+static_always_inline void
aes128_key_expand (u8x16 * rk, const u8x16 * k)
{
rk[0] = k[0];
@@ -288,7 +288,7 @@ aes128_key_expand (u8x16 * rk, const u8x16 * k)
aes128_key_expand_round_neon (rk + 10, 0x36);
}
-static inline void
+static_always_inline void
aes192_key_expand_round_neon (u8x8 * rk, u32 rcon)
{
u8x8 r, last_round = rk[-1], z = { };
@@ -316,7 +316,7 @@ aes192_key_expand_round_neon (u8x8 * rk, u32 rcon)
rk[2] = r;
}
-void
+static_always_inline void
aes192_key_expand (u8x16 * ek, const u8x16u * k)
{
u8x8 *rk = (u8x8 *) ek;
@@ -333,7 +333,7 @@ aes192_key_expand (u8x16 * ek, const u8x16u * k)
}
-static inline void
+static_always_inline void
aes256_key_expand_round_neon (u8x16 * rk, u32 rcon)
{
u8x16 r, t, z = { };
@@ -349,7 +349,7 @@ aes256_key_expand_round_neon (u8x16 * rk, u32 rcon)
rk[0] = r;
}
-void
+static_always_inline void
aes256_key_expand (u8x16 * rk, u8x16 const *k)
{
rk[0] = k[0];
|
Work CD-CI
Revert changes from last commit. | steps:
- task: DotNetCoreCLI@2
- condition: eq(variables['System.PullRequest.PullRequestId'], '')
+ condition: ne(variables['system.pullrequest.isfork'], true)
displayName: Install NBGV tool
inputs:
command: custom
@@ -11,13 +11,13 @@ steps:
arguments: install --tool-path . nbgv
- script: nbgv cloud -a -c
- condition: eq(variables['System.PullRequest.PullRequestId'], '')
+ condition: ne(variables['system.pullrequest.isfork'], true)
displayName: Set build number
# Currently Azure pipelines won't let PRs from forks setting the build ID
- # so we need to come up with a version number to use for the build
+ # so we need to come up with a versiom number to use for the build
- task: PowerShell@2
- condition: ne(variables['System.PullRequest.PullRequestId'], '')
+ condition: eq(variables['system.pullrequest.isfork'], true)
displayName: Set temporary build number
inputs:
targetType: 'inline'
|
Added null checks for strdup | @@ -704,9 +704,9 @@ static ACVP_RESULT match_dependencies_page(ACVP_CTX *ctx,
name = json_object_get_string(dep_obj, "name");
description = json_object_get_string(dep_obj, "description");
- tmp_dep.type = strdup(type);
- tmp_dep.name = strdup(name);
- tmp_dep.description = strdup(description);
+ if (type) tmp_dep.type = strdup(type);
+ if (name) tmp_dep.name = strdup(name);
+ if (description) tmp_dep.description = strdup(description);
this_match = compare_dependencies(dep, &tmp_dep);
if (this_match) {
@@ -2068,16 +2068,16 @@ static ACVP_RESULT match_modules_page(ACVP_CTX *ctx,
version = json_object_get_string(module_obj, "version");
description = json_object_get_string(module_obj, "description");
- tmp_module->type = strdup(type);
- tmp_module->name = strdup(name);
- tmp_module->version = strdup(version);
- tmp_module->description = strdup(description);
+ if (type) tmp_module->type = strdup(type);
+ if (name) tmp_module->name = strdup(name);
+ if (version) tmp_module->version = strdup(version);
+ if (description) tmp_module->description = strdup(description);
tmp_module->vendor = tmp_vendor;
vurl = json_object_get_string(module_obj, "vendorUrl");
aurl = json_object_get_string(module_obj, "addressUrls");
- tmp_vendor->url = strdup(vurl);
- tmp_vendor->address.url = strdup(aurl);
+ if (vurl) tmp_vendor->url = strdup(vurl);
+ if (aurl) tmp_vendor->address.url = strdup(aurl);
/*
* Construct the tmp_vendor->persons
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.