message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Fix logic for detecting _libc_fpstate API
This fixes use of the incorrect API on x86 64-bit Linux, which was causing OpenEXR compilation to fail on the latest 64-bit Ubuntu.
See https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/x86/sys/ucontext.h which defines two different `_libc_fpstate` structs inside an `#ifdef __x86_64__` | @@ -243,14 +243,14 @@ restoreControlRegs (const ucontext_t& ucon, bool clearExceptions)
inline void
restoreControlRegs (const ucontext_t& ucon, bool clearExceptions)
{
-# if defined(__GLIBC__) || defined(__i386__)
+# if defined(__GLIBC__) && defined(__i386__)
setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
# else
setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
# endif
_fpstate* kfp = reinterpret_cast<_fpstate*> (ucon.uc_mcontext.fpregs);
-# if defined(__GLIBC__) || defined(__i386__)
+# if defined(__GLIBC__) && defined(__i386__)
setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
# else
setMxcsr (kfp->mxcsr, clearExceptions);
|
[core] forward SIGHUP only to lighttpd workers
(do not propagate SIGHUP to entire lighttpd process group,
which might include other processes such as CGI, rrdtool,
piped loggers, ...) | @@ -92,7 +92,6 @@ static volatile sig_atomic_t graceful_shutdown = 0;
static volatile sig_atomic_t srv_shutdown = 0;
static volatile sig_atomic_t handle_sig_alarm = 1;
static volatile sig_atomic_t handle_sig_hup = 0;
-static volatile sig_atomic_t forwarded_sig_hup = 0;
#if defined(HAVE_SIGACTION) && defined(SA_SIGINFO)
static volatile siginfo_t last_sigterm_info;
@@ -132,19 +131,8 @@ static void sigaction_handler(int sig, siginfo_t *si, void *context) {
handle_sig_alarm = 1;
break;
case SIGHUP:
- /**
- * we send the SIGHUP to all procs in the process-group
- * this includes ourself
- *
- * make sure we only send it once and don't create a
- * infinite loop
- */
- if (!forwarded_sig_hup) {
handle_sig_hup = 1;
last_sighup_info = *si;
- } else {
- forwarded_sig_hup = 0;
- }
break;
case SIGCHLD:
break;
@@ -171,20 +159,7 @@ static void signal_handler(int sig) {
}
break;
case SIGALRM: handle_sig_alarm = 1; break;
- case SIGHUP:
- /**
- * we send the SIGHUP to all procs in the process-group
- * this includes ourself
- *
- * make sure we only send it once and don't create a
- * infinite loop
- */
- if (!forwarded_sig_hup) {
- handle_sig_hup = 1;
- } else {
- forwarded_sig_hup = 0;
- }
- break;
+ case SIGHUP: handle_sig_hup = 1; break;
case SIGCHLD: break;
}
}
@@ -1082,7 +1057,6 @@ static int server_main (server * const srv, int argc, char **argv) {
graceful_shutdown = 0;
handle_sig_alarm = 1;
handle_sig_hup = 0;
- forwarded_sig_hup = 0;
chunkqueue_set_tempdirs_default_reset();
http_auth_dumbdata_reset();
http_vhostdb_dumbdata_reset();
@@ -1650,14 +1624,9 @@ static int server_main (server * const srv, int argc, char **argv) {
log_error_cycle(srv);
- /**
- * forward to all procs in the process-group
- *
- * we also send it ourself
- */
- if (!forwarded_sig_hup && 0 != srv->srvconf.max_worker) {
- forwarded_sig_hup = 1;
- kill(0, SIGHUP);
+ /* forward SIGHUP to workers */
+ for (int n = 0; n < npids; ++n) {
+ if (pids[n] > 0) kill(pids[n], SIGHUP);
}
}
if (handle_sig_alarm) {
|
Shared strings? | @@ -684,7 +684,8 @@ void *ws_on_data_inGIL(void *args_) {
rb_str_set_len(buffer, a->length);
fprintf(stderr, "INFO: iodine calling Ruby handler\n");
rb_funcallv(handler, iodine_on_message_func_id, 1, &buffer);
- /* reclaim full capacity */
+ /* make sure the string is modifiable and no buffer space is freed */
+ rb_str_modify(buffer);
rb_str_set_len(buffer, rb_str_capacity(buffer));
// RubyCaller.call2(handler, iodine_on_message_func_id, 1, &buffer);
return NULL;
|
Add travis tests for CC1350 boards | @@ -9,9 +9,11 @@ ipv6/multicast/ev-aducrf101mkxz \
cc26xx/cc26xx-web-demo/srf06-cc26xx \
cc26xx/very-sleepy-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
+cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=sensortag/cc1350 \
cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=srf06/cc13xx \
cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc2650 \
cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \
+cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \
cc26xx/very-sleepy-demo/srf06-cc26xx \
hello-world/cc2538dk \
ipv6/rpl-border-router/cc2538dk \
|
futex_wake_one(): remove assert on thread state
When the global kernel lock is removed, a thread being woken up
could run in another cpu and be blocked again, while the
futex_wake_one() function is still executing. Thus, in this
function there should be no assertions on the thread state. | @@ -46,15 +46,7 @@ static struct futex * soft_create_futex(process p, u64 key)
static thread futex_wake_one(struct futex * f)
{
- thread w;
-
- w = blockq_wake_one(f->bq);
- if (w == INVALID_ADDRESS)
- return w;
-
- /* w must be awake */
- assert(w->blocked_on != f->bq);
- return w;
+ return blockq_wake_one(f->bq);
}
/*
|
common/base32.c: Format with clang-format
BRANCH=none
TEST=none | #include "base32.h"
#include "util.h"
-static const unsigned char crc5_table1[] = {
- 0x00, 0x0E, 0x1C, 0x12, 0x11, 0x1F, 0x0D, 0x03,
- 0x0B, 0x05, 0x17, 0x19, 0x1A, 0x14, 0x06, 0x08
-};
+static const unsigned char crc5_table1[] = { 0x00, 0x0E, 0x1C, 0x12, 0x11, 0x1F,
+ 0x0D, 0x03, 0x0B, 0x05, 0x17, 0x19,
+ 0x1A, 0x14, 0x06, 0x08 };
-static const unsigned char crc5_table0[] = {
- 0x00, 0x16, 0x05, 0x13, 0x0A, 0x1C, 0x0F, 0x19,
- 0x14, 0x02, 0x11, 0x07, 0x1E, 0x08, 0x1B, 0x0D
-};
+static const unsigned char crc5_table0[] = { 0x00, 0x16, 0x05, 0x13, 0x0A, 0x1C,
+ 0x0F, 0x19, 0x14, 0x02, 0x11, 0x07,
+ 0x1E, 0x08, 0x1B, 0x0D };
uint8_t crc5_sym(uint8_t sym, uint8_t previous_crc)
{
@@ -46,9 +44,8 @@ static int decode_sym(int sym)
return -1;
}
-int base32_encode(char *dest, int destlen_chars,
- const void *srcbits, int srclen_bits,
- int add_crc_every)
+int base32_encode(char *dest, int destlen_chars, const void *srcbits,
+ int srclen_bits, int add_crc_every)
{
const uint8_t *src = srcbits;
int destlen_needed;
|
input: release tmp buffer when mem_buf_limit is used | @@ -206,6 +206,7 @@ int flb_input_set_property(struct flb_input_instance *in, char *k, char *v)
}
else if (prop_key_check("mem_buf_limit", k, len) == 0 && tmp) {
in->mp_buf_limit = flb_utils_size_to_bytes(tmp);
+ flb_free(tmp);
}
else if (in->p->flags & FLB_INPUT_NET) {
if (prop_key_check("listen", k, len) == 0) {
|
Add CAMERA_USAGE option for info.plist | ::if value::<true/>::else::<false/>::end::
::end::
</dict>
+ ::if (CAMERA_USAGE)::
+ <key>NSCameraUsageDescription</key>
+ <string>::CAMERA_USAGE::</string>
+ ::end::
</dict>
</plist>
|
Bump version to hslua 1.0.2 | name: hslua
-version: 1.0.1
+version: 1.0.2
synopsis: Bindings to Lua, an embeddable scripting language
description: HsLua provides bindings, wrappers, types, and helper
functions to bridge Haskell and <https://www.lua.org/ Lua>.
|
fix typo in patch name | @@ -24,7 +24,7 @@ Group: %{PROJ_NAME}/dev-tools
Source: https://sourceware.org/pub/%{pname}/%{pname}-%{version}.tar.bz2
Source1: OHPC_macros
%ifarch aarch64
-Patch1: revVEX3352..v3.13.0.patch
+Patch1: revVEX3352.v3.13.0.patch
Patch2: rev16269.v3.13.0.patch
Patch3: rev16309.patch
Patch4: thunderx_always_use_fallback_LLSC.patch
|
fixed a bug in EnergyResiduals | @@ -3660,7 +3660,7 @@ void EnergyResiduals(BODY *body, int iBody, int day) {
body[iBody].daLambdaSea[i+1]*(body[iBody].daTempWater[i]-body[iBody].daTempWater[i+1])-\
nu_fw*(body[iBody].daTempWater[i]-body[iBody].daTempLand[i])-\
body[iBody].daPlanckASea[i]-body[iBody].daPlanckBSea[i]*body[iBody].daTempWater[i];
- } else if (i==body[iBody].iNumLats) {
+ } else if (i==(body[iBody].iNumLats-1)) {
body[iBody].daEnergyResL[i] = body[iBody].daInsol[i][day]*\
(1.0-body[iBody].daAlbedoLand[i])-Cl_dt*(body[iBody].daDeltaTempL[i])-\
body[iBody].daLambdaSea[i]*(body[iBody].daTempLand[i]-body[iBody].daTempLand[i-1])-\
|
Main: initialize modules only after phase three | @@ -109,6 +109,7 @@ main(void)
}
#endif /* NETSTACK_CONF_WITH_IPV6 */
+ platform_init_stage_three();
#if BUILD_WITH_ORCHESTRA
orchestra_init();
@@ -120,8 +121,6 @@ main(void)
LOG_DBG("With Shell\n");
#endif /* BUILD_WITH_SHELL */
- platform_init_stage_three();
-
autostart_start(autostart_processes);
watchdog_start();
|
Add Elko thermostat, | @@ -213,6 +213,7 @@ static const SupportedDevice supportedDevices[] = {
{ VENDOR_119C, "TH1300ZB", sinopeMacPrefix }, // Sinope Thermostat
{ VENDOR_ZEN, "Zen-01", zenMacPrefix }, // Zen Thermostat
{ VENDOR_C2DF, "3157100-E", emberMacPrefix }, // Centralite Thermostat
+ { VENDOR_EMBER, "Super TR", emberMacPrefix }, // Elko Thermostat
{ VENDOR_DEVELCO, "SMSZB-120", develcoMacPrefix }, // Develco smoke sensor
{ VENDOR_DEVELCO, "SPLZB-131", develcoMacPrefix }, // Develco smart plug
{ VENDOR_DEVELCO, "WISZB-120", develcoMacPrefix }, // Develco window sensor
|
btshell: Fix bogus error message on connect | @@ -823,7 +823,9 @@ cmd_connect(int argc, char **argv)
if (ext == 0x00) {
rc = btshell_conn_initiate(own_addr_type, peer_addr_param, duration_ms,
&phy_1M_params);
+ if (rc) {
console_printf("error connecting; rc=%d\n", rc);
+ }
return rc;
}
@@ -831,7 +833,9 @@ cmd_connect(int argc, char **argv)
rc = btshell_ext_conn_initiate(own_addr_type, peer_addr_param,
duration_ms, &phy_1M_params,
NULL, NULL);
+ if (rc) {
console_printf("error connecting; rc=%d\n", rc);
+ }
return rc;
}
|
publish: fix backoff | :: if nacked, then set a exponential backoff and retry
=/ nack-count=@ud
+((~(gut by migrate) rid 0))
- ?: (gte 24 nack-count)
+ ?: (gte nack-count 24)
~& >>> "failed to migrate notebook {<rid>} to graph-store"
[~ this]
:_ this(migrate (~(put by migrate) rid nack-count))
|
Update README.md
Getting Help now points to cFS repo | @@ -16,6 +16,6 @@ Version description document contains references to internal repositories and so
## Getting Help
-The cFS community page http://coreflightsystem.org should be your first stop for getting help. Please post questions to http://coreflightsystem.org/questions/. There is also a forum at http://coreflightsystem.org/forums/ for more general discussions.
+For best results, submit issues:questions or issues:help wanted requests at https://github.com/nasa/cFS.
Official cFS page: http://cfs.gsfc.nasa.gov
|
parser: Enum dynaload doesn't need to do this.
This was necessary when dynaloads were able to run expressions. | @@ -2074,9 +2074,6 @@ static lily_class *dynaload_enum(lily_parse_state *parser, lily_module_entry *m,
collect_generics_for(parser, enum_cls);
lily_pop_lex_entry(lex);
- lily_type *save_self_type = parser->class_self_type;
- parser->class_self_type = enum_cls->self_type;
-
/* A flat enum like Option will have a header that points past any methods
to the variants. On the other hand, scoped enums will have a header that
points past the variants. */
@@ -2121,8 +2118,6 @@ static lily_class *dynaload_enum(lily_parse_state *parser, lily_module_entry *m,
if (save_next_class_id)
parser->symtab->next_class_id = save_next_class_id;
- parser->class_self_type = save_self_type;
-
return enum_cls;
}
|
py/send_message: add 'Rotate screen' to bootloader | @@ -891,6 +891,7 @@ class SendMessageBootloader:
("Show firmware hash at startup", self._show_fw_hash),
("Don't show firmware hash at startup", self._dont_show_fw_hash),
("Get firmware & sigkey hashes", self._get_hashes),
+ ("Rotate screen", self._device.screen_rotate),
)
choice = ask_user(choices)
if isinstance(choice, bool):
|
changed method of memsetting to address memory leak | @@ -1376,12 +1376,7 @@ array_list_insert(
array_list->current_size = array_list->current_size * 2;
array_list->data = (ion_fpos_t *) realloc(array_list->data, array_list->current_size * sizeof(ion_fpos_t));
-
- int i;
-
- for (i = old_size + 1; i < array_list->current_size - 1; i++) {
- memset(array_list->data + i * sizeof(ion_fpos_t), 0, sizeof(ion_fpos_t));
- }
+ memset(array_list->data + old_size * sizeof(ion_fpos_t), 0, sizeof(ion_fpos_t) * old_size);
if (NULL == array_list->data) {
free(array_list->data);
|
add common_modules to project.tcl | @@ -88,7 +88,7 @@ make_wrapper -files [get_files $bd_path/system.bd] -top
add_files -norecurse $bd_path/hdl/system_wrapper.v
-set files [glob -nocomplain projects/$project_name/*.v projects/$project_name/*.sv]
+set files [glob -nocomplain cores/common_modules/*.v projects/$project_name/*.v projects/$project_name/*.sv]
if {[llength $files] > 0} {
add_files -norecurse $files
}
|
ssl test ssl_decrypt_non_etm_cbc(): add missing ret check | @@ -3592,6 +3592,8 @@ void ssl_decrypt_non_etm_cbc( int cipher_type, int hash_id, int trunc_hmac,
MBEDTLS_SSL_MINOR_VERSION_3,
0 , 0 );
+ TEST_ASSERT( ret == 0 );
+
/* Determine padding/plaintext length */
TEST_ASSERT( length_selector >= -2 && length_selector <= 255 );
block_size = t0.ivlen;
|
Add missing flags for EVP_chacha20()
ChaCha20 code uses its own custom cipher_data. Add EVP_CIPH_CUSTOM_IV
and EVP_CIPH_ALWAYS_CALL_INIT so that the key and the iv can be set by
different calls of EVP_CipherInit_ex(). | @@ -127,7 +127,7 @@ static const EVP_CIPHER chacha20 = {
1, /* block_size */
CHACHA_KEY_SIZE, /* key_len */
CHACHA_CTR_SIZE, /* iv_len, 128-bit counter in the context */
- 0, /* flags */
+ EVP_CIPH_CUSTOM_IV | EVP_CIPH_ALWAYS_CALL_INIT,
chacha_init_key,
chacha_cipher,
NULL,
|
extprotocol: fix option parsing in check_ext_options
When this code was added (commit 210ab15e), it treated the
ExtTableEntry.options member as a List of DefElems. It's actually a List
of Values (specifically, T_Strings). This code will break when the
offset of DefElem.defname changes in the upcoming 8.4 merge iteration. | @@ -47,8 +47,8 @@ static void check_ext_options(const FunctionCallInfo fcinfo)
List *options = exttbl->options;
foreach(cell, options) {
- DefElem *def = (DefElem *) lfirst(cell);
- char *key = def->defname;
+ Value *value = (Value *) lfirst(cell);
+ char *key = value->val.str;
if (key && strcasestr(key, "database") && !strcasestr(key, "greenplum")) {
ereport(ERROR, (0, errmsg("This is greenplum.")));
|
website: update man page | @@ -81,7 +81,7 @@ A full text search using Algolia is implemented https://issues\.libelektra\.org/
.IP "" 0
.
.SS "Limitations"
-\fBAngularJS 2:\fR At the time of development start, there was no stable AngularJS 2 release available yet, only early previews\. Because of that, the frontend was developed using AngularJS 1\.5\.
+\fBAngularJS 2:\fR At the time of development start, there was no stable AngularJS 2 release available yet, only early previews\. Because of that, the frontend was developed using AngularJS 1\.5\. Later we tried an upgrade but failed of the extensive work which would be required\. Another idea would be to build a static webpage, so that at least the end user is not confronted with the old version of AngularJS: https://issues\.libelektra\.org/3470
.
.SH "Compiling and Installing"
.
|
Send protected packet as soon as handshake completes on client side | @@ -2014,16 +2014,14 @@ ssize_t ngtcp2_conn_write_pkt(ngtcp2_conn *conn, uint8_t *dest, size_t destlen,
return NGTCP2_ERR_REQUIRED_TRANSPORT_PARAM;
}
- if (!conn->early_rtb) {
- return 0;
- }
-
+ if (conn->early_rtb) {
rv = conn_process_early_rtb(conn);
if (rv != 0) {
return rv;
}
+ }
- return conn_retransmit(conn, dest, destlen, ts);
+ return conn_write_pkt(conn, dest, destlen, NULL, NULL, 0, NULL, 0, ts);
case NGTCP2_CS_CLIENT_TLS_HANDSHAKE_FAILED:
return conn_write_client_handshake(conn, dest, destlen, ts);
case NGTCP2_CS_SERVER_INITIAL:
|
* Be more safe in ejdb2_isolate_shared_release | @@ -725,7 +725,7 @@ static iwrc ejdb2_isolate_shared_release(EJDB2Handle **hp) {
EJDB2Handle *h = *hp;
*hp = 0;
if (--h->refs <= 0) {
- rc = ejdb_close(&h->db);
+ if (h->db) rc = ejdb_close(&h->db);
if (h->prev) {
h->prev->next = h->next;
} else {
|
Add missing qlog spin state initialization | @@ -1179,6 +1179,8 @@ int qlog_connection_start(uint64_t time, const picoquic_connection_id_t * cid, i
ctx->key_phase_received = 0;
ctx->spin_bit_sent_last = 0;
ctx->spin_bit_sent = 0;
+ ctx->spin_bit_received_last = 0;
+ ctx->spin_bit_received = 0;
fprintf(f, "{ \"qlog_version\": \"draft-00\", \"title\": \"picoquic\", \"traces\": [\n");
fprintf(f, "{ \"vantage_point\": { \"name\": \"backend-67\", \"type\": \"%s\" },\n",
|
neon/rndn: Fix macros to workaround bugs | @@ -77,8 +77,7 @@ SIMDE_FUNCTION_ATTRIBUTES
simde_float64x1_t
simde_vrndn_f64(simde_float64x1_t a) {
#if \
- defined(SIMDE_ARM_NEON_A32V8_NATIVE) && \
- (!defined(HEDLEY_GCC_VERSION) || defined(SIMDE_ARM_NEON_A64V8_NATIVE))
+ defined(SIMDE_ARM_NEON_A64V8_NATIVE)
return vrndn_f64(a);
#else
simde_float64x1_private
@@ -129,8 +128,7 @@ SIMDE_FUNCTION_ATTRIBUTES
simde_float64x2_t
simde_vrndnq_f64(simde_float64x2_t a) {
#if \
- defined(SIMDE_ARM_NEON_A32V8_NATIVE) && \
- (!defined(HEDLEY_GCC_VERSION) || defined(SIMDE_ARM_NEON_A64V8_NATIVE))
+ defined(SIMDE_ARM_NEON_A64V8_NATIVE)
return vrndnq_f64(a);
#else
simde_float64x2_private
|
Fix cache statistics reporting in fpgadiag.
_fpga_token changed. A better solution here would be to expose sysfspath in
the OPAE API given a token. | @@ -215,6 +215,7 @@ std::string fpga_resource::sysfs_path_from_token(fpga_token t)
{
struct _fpga_token
{
+ uint32_t instance;
uint64_t magic;
char sysfspath[256];
char devpath[256];
|
Fix incorrect extension layout | @@ -2681,7 +2681,7 @@ typedef struct _PROCESS_DISK_COUNTERS
} PROCESS_DISK_COUNTERS, *PPROCESS_DISK_COUNTERS;
// private
-typedef struct _ENERGY_STATE_DURATION
+typedef union _ENERGY_STATE_DURATION
{
union
{
@@ -2715,8 +2715,8 @@ typedef struct _PROCESS_ENERGY_VALUES
ULONG CompositionDirtyGenerated;
ULONG CompositionDirtyPropagated;
ULONG Reserved1;
- ULONGLONG AttributedCycles[2][4];
- ULONGLONG WorkOnBehalfCycles[2][4];
+ ULONGLONG AttributedCycles[4][2];
+ ULONGLONG WorkOnBehalfCycles[4][2];
} PROCESS_ENERGY_VALUES, *PPROCESS_ENERGY_VALUES;
typedef struct _TIMELINE_BITMAP
|
Update mili version to 22.1 in windows config-site. | @@ -213,7 +213,7 @@ VISIT_OPTION_DEFAULT(VISIT_MFEM_INCDEP ZLIB_INCLUDE_DIR CONDUIT_INCLUDE_DIR TYPE
##
## MILI
##
-VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/Mili/19.2)
+VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/Mili/22.1)
##
## OpenEXR
|
doc BUGFIX refer flag for config data validation | @@ -143,10 +143,10 @@ struct ly_in;
statements are not checked, and default values are not added (only the ones
parsed are present). */
#define LYD_PARSE_STRICT 0x020000 /**< Instead of silently ignoring data without schema definition raise an error.
- Do not combine with #LYD_PARSE_OPAQ (except for ::LYD_LYB). */
+ Do not combine with ::LYD_PARSE_OPAQ (except for ::LYD_LYB). */
#define LYD_PARSE_OPAQ 0x040000 /**< Instead of silently ignoring data without definition, parse them into
- an opaq node. Do not combine with #LYD_PARSE_STRICT (except for ::LYD_LYB). */
-#define LYD_PARSE_NO_STATE 0x080000 /**< Forbid state data in the parsed data. */
+ an opaq node. Do not combine with ::LYD_PARSE_STRICT (except for ::LYD_LYB). */
+#define LYD_PARSE_NO_STATE 0x080000 /**< Forbid state data in the parsed data. Usually used with ::LYD_VALIDATE_NO_STATE. */
#define LYD_PARSE_LYB_MOD_UPDATE 0x100000 /**< Only for LYB format, allow parsing data printed using a specific module
revision to be loaded even with a module with the same name but newer
@@ -179,7 +179,8 @@ struct ly_in;
*
* @{
*/
-#define LYD_VALIDATE_NO_STATE 0x0001 /**< Consider state data not allowed and raise an error if they are found. */
+#define LYD_VALIDATE_NO_STATE 0x0001 /**< Consider state data not allowed and raise an error if they are found.
+ Also, no implicit state data are added. */
#define LYD_VALIDATE_PRESENT 0x0002 /**< Validate only modules whose data actually exist. */
#define LYD_VALIDATE_OPTS_MASK 0x0000FFFF /**< Mask for all the LYD_VALIDATE_* options. */
|
[mod_access] remove excess trace
trace is still issued if access is denied
and r->log_request_handling is set | @@ -118,9 +118,7 @@ static int mod_access_check (const array * const allow, const array * const deny
}
/**
- * URI handler
- *
- * we will get called twice:
+ * handler is called twice:
* - after the clean up of the URL and
* - after the pathinfo checks are done
*
@@ -128,17 +126,9 @@ static int mod_access_check (const array * const allow, const array * const deny
*/
URIHANDLER_FUNC(mod_access_uri_handler) {
plugin_data *p = p_d;
-
mod_access_patch_config(r, p);
-
- if (NULL == p->conf.access_allow && NULL == p->conf.access_deny) {
+ if (NULL == p->conf.access_allow && NULL == p->conf.access_deny)
return HANDLER_GO_ON; /* access allowed; nothing to match */
- }
-
- if (r->conf.log_request_handling) {
- log_error(r->conf.errh, __FILE__, __LINE__,
- "-- mod_access_uri_handler called");
- }
return mod_access_check(p->conf.access_allow, p->conf.access_deny,
&r->uri.path, r->conf.force_lowercase_filenames)
|
Update the release documentation
Add instructions about release notes, and pushing tags. | @@ -15,6 +15,12 @@ incremeting the numbers:
We add pre-release tags of the format MAJOR.MINOR.PATCH-rc1.
+## Release Notes
+
+Before making a release, be sure to update the `docs/release-notes.md`
+to describe the release. This should be a high-level description of
+the changes, not a list of the git commits.
+
## Release Candidates
Prior to each release, tags are made (see below) for at least one
@@ -50,6 +56,7 @@ public key is signed by enough parties to be trusted.
At this point, the tag can be pushed to github to make the actual
release happen:
``` bash
+git push origin HEAD:refs/heads/master
git push origin va.b.c-rcn
```
|
fix windows unix socket | @@ -54,6 +54,7 @@ static tb_int_t tb_socket_type(tb_size_t type)
}
static tb_int_t tb_socket_proto(tb_size_t type, tb_size_t family)
{
+ if (family == TB_IPADDR_FAMILY_UNIX) return 0;
// get protocal type
switch (type & 0xff)
{
@@ -147,7 +148,7 @@ tb_socket_ref_t tb_socket_init(tb_size_t type, tb_size_t family)
tb_assert_and_check_break(t >= 0 && p >= 0);
// init socket family
- tb_int_t f = (family == TB_IPADDR_FAMILY_IPV6)? AF_INET6 : AF_INET;
+ tb_int_t f = (family == TB_IPADDR_FAMILY_UNIX)? AF_UNIX : (family == TB_IPADDR_FAMILY_IPV6)? AF_INET6 : AF_INET;
// sock
SOCKET fd = tb_ws2_32()->WSASocketA(f, t, p, tb_null, 0, WSA_FLAG_OVERLAPPED); //!< for iocp
@@ -464,6 +465,7 @@ tb_bool_t tb_socket_bind(tb_socket_ref_t sock, tb_ipaddr_ref_t addr)
// reuse addr
#ifdef SO_REUSEADDR
+ if (tb_ipaddr_family(addr) != TB_IPADDR_FAMILY_UNIX)
{
tb_int_t reuseaddr = 1;
if (tb_ws2_32()->setsockopt(tb_sock2fd(sock), SOL_SOCKET, SO_REUSEADDR, (tb_char_t*)&reuseaddr, sizeof(reuseaddr)) < 0)
|
make depend for unitauth.c | @@ -1108,7 +1108,9 @@ unitecs.lo unitecs.o: $(srcdir)/testcode/unitecs.c config.h $(srcdir)/util/log.h
$(srcdir)/util/net_help.h $(srcdir)/util/storage/slabhash.h $(srcdir)/edns-subnet/edns-subnet.h
unitauth.lo unitauth.o: $(srcdir)/testcode/unitauth.c config.h $(srcdir)/services/authzone.h \
$(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h \
- $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h
+ $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/data/msgreply.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/dns.h \
+ $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/sbuffer.h
acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \
$(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/locks.h \
$(srcdir)/util/log.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h \
|
Library/OcBootManagementLib: fix (im?)possible loss of data in PanicUnpack() | @@ -64,14 +64,14 @@ PanicUnpack (
while (PackedSize >= 7) {
CopyMem (&Sequence, PackedWalker, 7);
- *UnpackedWalker++ = BitFieldRead64 (Sequence, 7 * 0, 7 * 0 + 6);
- *UnpackedWalker++ = BitFieldRead64 (Sequence, 7 * 1, 7 * 1 + 6);
- *UnpackedWalker++ = BitFieldRead64 (Sequence, 7 * 2, 7 * 2 + 6);
- *UnpackedWalker++ = BitFieldRead64 (Sequence, 7 * 3, 7 * 3 + 6);
- *UnpackedWalker++ = BitFieldRead64 (Sequence, 7 * 4, 7 * 4 + 6);
- *UnpackedWalker++ = BitFieldRead64 (Sequence, 7 * 5, 7 * 5 + 6);
- *UnpackedWalker++ = BitFieldRead64 (Sequence, 7 * 6, 7 * 6 + 6);
- *UnpackedWalker++ = BitFieldRead64 (Sequence, 7 * 7, 7 * 7 + 6);
+ *UnpackedWalker++ = (UINT8) BitFieldRead64 (Sequence, 7 * 0, 7 * 0 + 6);
+ *UnpackedWalker++ = (UINT8) BitFieldRead64 (Sequence, 7 * 1, 7 * 1 + 6);
+ *UnpackedWalker++ = (UINT8) BitFieldRead64 (Sequence, 7 * 2, 7 * 2 + 6);
+ *UnpackedWalker++ = (UINT8) BitFieldRead64 (Sequence, 7 * 3, 7 * 3 + 6);
+ *UnpackedWalker++ = (UINT8) BitFieldRead64 (Sequence, 7 * 4, 7 * 4 + 6);
+ *UnpackedWalker++ = (UINT8) BitFieldRead64 (Sequence, 7 * 5, 7 * 5 + 6);
+ *UnpackedWalker++ = (UINT8) BitFieldRead64 (Sequence, 7 * 6, 7 * 6 + 6);
+ *UnpackedWalker++ = (UINT8) BitFieldRead64 (Sequence, 7 * 7, 7 * 7 + 6);
PackedWalker += 7;
PackedSize -= 7;
}
|
sim: Capture payload in TLV code
Since the signing code will also need a copy of the message, make a
local copy of it in the signature verification code, and compute the
digest all in one shot. | @@ -37,7 +37,7 @@ pub struct TlvGen {
flags: Flags,
kinds: Vec<TlvKinds>,
size: u16,
- hasher: digest::Context,
+ payload: Vec<u8>,
}
impl TlvGen {
@@ -47,7 +47,7 @@ impl TlvGen {
flags: Flags::SHA256,
kinds: vec![TlvKinds::SHA256],
size: 4 + 32,
- hasher: digest::Context::new(&digest::SHA256),
+ payload: vec![],
}
}
@@ -63,7 +63,7 @@ impl TlvGen {
/// Add bytes to the covered hash.
pub fn add_bytes(&mut self, bytes: &[u8]) {
- self.hasher.update(bytes);
+ self.payload.extend_from_slice(bytes);
}
/// Compute the TLV given the specified block of data.
@@ -71,7 +71,7 @@ impl TlvGen {
let mut result: Vec<u8> = vec![];
if self.kinds.contains(&TlvKinds::SHA256) {
- let hash = self.hasher.finish();
+ let hash = digest::digest(&digest::SHA256, &self.payload);
let hash = hash.as_ref();
assert!(hash.len() == 32);
|
fix unwanted change from last commit | @@ -215,7 +215,7 @@ nc_read_until(struct nc_session *session, const char *endtag, size_t limit, uint
len = strlen(endtag);
while (1) {
- if (limit && count >= limit) {
+ if (limit && count == limit) {
free(chunk);
WRN("Session %u: reading limit (%d) reached.", session->id, limit);
ERR("Session %u: invalid input data (missing \"%s\" sequence).", session->id, endtag);
|
One more extension for Tegra T1 | @@ -67,8 +67,8 @@ endif()
if(TEGRAX1)
add_definitions(-DTEGRAX1)
- add_definitions(-pipe -march=armv8-a+simd+crypto -mcpu=cortex-a57+crypto)
- set(CMAKE_ASM_FLAGS "-pipe -march=armv8-a+simd+crypto -mcpu=cortex-a57+crypto")
+ add_definitions(-pipe -march=armv8-a+crc+simd+crypto -mcpu=cortex-a57+crypto)
+ set(CMAKE_ASM_FLAGS "-pipe -march=armv8-a+crc+simd+crypto -mcpu=cortex-a57+crypto")
endif()
if(NOGIT)
|
Add missing add_blacklist for OpenGl apps | @@ -67,8 +67,15 @@ void imgui_init()
{
if (cfg_inited)
return;
- is_blacklisted(true);
+
parse_overlay_config(¶ms, getenv("MANGOHUD_CONFIG"));
+
+ //check for blacklist item in the config file
+ for (auto& item : params.blacklist) {
+ add_blacklist(item);
+ }
+
+ is_blacklisted(true);
notifier.params = ¶ms;
start_notifier(notifier);
window_size = ImVec2(params.width, params.height);
|
doc: update tools docs to use vm-ubuntu name | @@ -83,7 +83,7 @@ Use the ``list`` command to display VMs and their state:
# acrnctl list
vm1-14:59:30 untracked
- vm-yocto stopped
+ vm-ubuntu stopped
vm-android stopped
Start VM
@@ -94,7 +94,7 @@ command:
.. code-block:: none
- # acrnctl start vm-yocto
+ # acrnctl start vm-ubuntu
Stop VM
=======
@@ -103,7 +103,7 @@ Use the ``stop`` command to stop one or more running VM:
.. code-block:: none
- # acrnctl stop vm-yocto vm1-14:59:30 vm-android
+ # acrnctl stop vm-ubuntu vm1-14:59:30 vm-android
Use the optional ``-f`` or ``--force`` argument to force the stop operation.
This will trigger an immediate shutdown of the User VM by the ACRN Device Model
@@ -112,7 +112,7 @@ gracefully by itself.
.. code-block:: none
- # acrnctl stop -f vm-yocto
+ # acrnctl stop -f vm-ubuntu
RESCAN BLOCK DEVICE
===================
|
Add PhGetInternalWindowIcon | @@ -1702,3 +1702,32 @@ BOOLEAN PhShowRunFileDialog(
return result;
}
+
+HICON PhGetInternalWindowIcon(
+ _In_ HWND WindowHandle,
+ _In_ UINT Type
+ )
+{
+ static PH_INITONCE initOnce = PH_INITONCE_INIT;
+ static HICON (WINAPI *InternalGetWindowIcon_I)(
+ _In_ HWND WindowHandle,
+ _In_ ULONG Type
+ ) = NULL;
+
+ if (PhBeginInitOnce(&initOnce))
+ {
+ PVOID shell32Handle;
+
+ if (shell32Handle = LoadLibrary(L"shell32.dll"))
+ {
+ InternalGetWindowIcon_I = PhGetDllBaseProcedureAddress(shell32Handle, "InternalGetWindowIcon", 0);
+ }
+
+ PhEndInitOnce(&initOnce);
+ }
+
+ if (!InternalGetWindowIcon_I)
+ return NULL;
+
+ return InternalGetWindowIcon_I(WindowHandle, Type);;
+}
|
updating package counts in README | @@ -23,11 +23,11 @@ pre-packaged binary RPMs available per architecture type are summarized as follo
Base OS | aarch64 | x86_64 | noarch
:---: | :---: | :---: | :---:
-CentOS 7.5 | 329 | 558 | 35
-SLES 12 SP3 | 337 | 561 | 35
+CentOS 7.5 | 407 | 724 | 45
+SLES 12 SP3 | 414 | 727 | 45
A list of all available components is available on the OpenHPC
-[wiki](https://github.com/openhpc/ohpc/wiki/Component-List-v1.3.5), and
+[wiki](https://github.com/openhpc/ohpc/wiki/Component-List-v1.3.6), and
specific versioning details can be found in the "Package Manifest" appendix
located in each of the companion install guide documents. A list of updated
packages can be found in the [release
|
LICENSE; mention 3-clause BSD for LwIP, tinycrypt, and STM32CubeF7. | @@ -289,6 +289,13 @@ This product bundles parts of STM32CubeF4 1.5, which is available under the
* hw/bsp/stm32f4discovery/include/bsp/stm32f4xx_hal_conf.h
* hw/bsp/stm32f4discovery/src/system_stm32f4xx.c
+This product bundles parts of STM32CubeF7, which is available under the
+"3-clause BSD" license. Bundled files are:
+ * hw/mcu/stm/stm32f7xx/src/ext
+ * hw/bsp/stm32f767-nucleo/include/bsp/stm32f7xx_hal_conf.h
+ * hw/bsp/stm32f767-nucleo/src/system_stm32f7xx.c
+ * hw/bsp/stm32f767-nucleo/src/arch/cortex_m7/startup_stm32f767xx.s
+
This product bundles parts of mbed, which is available under the
"3-clause BSD" license. Bundled files are:
* hw/mcu/nordic/nrf51xxx/include/mcu/cortex_m0.h
@@ -352,8 +359,18 @@ This product bundles part of NXP mkw41z, which is available under the
* hw/bsp/usbmkw41z/no-boot-mkw41z512.ld
* hw/bsp/usbmkw41z/src/arch/cortex_m0/gcc_startup_mkw41z.s
-This product bundles part of mips architecture and ci40, which is available under the
-"3-clause BSD" license. Bundled files are:
+This product bundles part of mips architecture and ci40, which is available
+under the "3-clause BSD" license. Bundled files are:
* kernel/os/src/arch/mips/asm/ctx.S
* kernel/os/src/arch/mips/asm/excpt_isr.S
* hw/bsp/ci40/uhi32.ld
+
+This product bundles LwIP, which is available under the "3-clause BSD"
+license. For details, and bundled files see:
+ * net/ip/lwip_base/COPYING
+ * net/ip/lwip_base
+
+This product bundles tinycrypt, which is available under the "3-clause BSD"
+license. For details, and bundled files see:
+ * crypto/tinycrypt/LICENSE
+ * crypto/tinycrypt
|
netkvm: make code for getting module path reusable | @@ -259,11 +259,7 @@ public:
}
bool Install()
{
- CString s;
- HMODULE hModule = GetModuleHandleW(NULL);
- WCHAR path[MAX_PATH];
- GetModuleFileName(hModule, path, MAX_PATH);
- s = path;
+ CString s = BinaryPath();
CServiceManager mgr;
bool b = mgr.Install(ServiceName(), s);
return b;
@@ -283,6 +279,15 @@ public:
{
return m_Registered;
}
+ CString BinaryPath()
+ {
+ CString s;
+ HMODULE hModule = GetModuleHandle(NULL);
+ WCHAR path[MAX_PATH];
+ GetModuleFileName(hModule, path, MAX_PATH);
+ s = path;
+ return s;
+ }
protected:
CString m_Name;
HANDLE m_StopEvent = NULL;
|
The Cygwin gcc doesn't define _WIN32, don't pretend it does | @@ -105,7 +105,7 @@ void OPENSSL_cpuid_setup(void)
}
#endif
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
# include <tchar.h>
# include <signal.h>
# ifdef __WATCOMC__
@@ -320,7 +320,7 @@ void OPENSSL_die(const char *message, const char *file, int line)
{
OPENSSL_showfatal("%s:%d: OpenSSL internal error: %s\n",
file, line, message);
-#if !defined(_WIN32) || defined(__CYGWIN__)
+#if !defined(_WIN32)
abort();
#else
/*
|
http2: compare against zero since it's not a boolean | @@ -108,7 +108,7 @@ static void graceful_shutdown_resend_goaway(h2o_timer_t *entry)
/* After waiting a second, we still had active connections. If configured, wait one
* final timeout before closing the connections */
- if (do_close_stragglers && ctx->globalconf->http2.graceful_shutdown_timeout) {
+ if (do_close_stragglers && ctx->globalconf->http2.graceful_shutdown_timeout > 0) {
ctx->http2._graceful_shutdown_timeout.cb = graceful_shutdown_close_stragglers;
h2o_timer_link(ctx->loop, ctx->globalconf->http2.graceful_shutdown_timeout, &ctx->http2._graceful_shutdown_timeout);
}
|
Update drv_spi.c
Bug Fixed : clock division cannot been adjusted as expected due to wrong register configuration. | * Change Logs:
* Date Author Notes
* 2020-10-28 0xcccccccccccc Initial Version
+ * 2021-01-17 0xcccccccccccc Bug Fixed : clock division cannot been adjusted as expected due to wrong register configuration.
*/
/**
* @addtogroup ls2k
#ifdef RT_USING_SPI
static void spi_init(uint8_t spre_spr, uint8_t copl, uint8_t cpha)
{
- SET_SPI(SPSR, 0xc0 | (spre_spr & 0b00000011));
+ SET_SPI(SPSR, 0xc0);
SET_SPI(PARAM, 0x40);
SET_SPI(PARAM2, 0x01);
SET_SPI(SPER, (spre_spr & 0b00001100) >> 2);
- SET_SPI(SPCR, 0x50 | copl << 3 | cpha << 2);
+ SET_SPI(SPCR, 0x50 | copl << 3 | cpha << 2 | (spre_spr & 0b00000011));
SET_SPI(SOFTCS, 0xff);
}
|
firdespm/example: clarifying filter design in plot title | @@ -97,7 +97,7 @@ int main(int argc, char*argv[]) {
fprintf(fid,"grid on;\n");
fprintf(fid,"xlabel('normalized frequency');\n");
fprintf(fid,"ylabel('PSD [dB]');\n");
- fprintf(fid,"title(['Filter design/Kaiser window f_c: %f, S_L: %f, h: %u']);\n",
+ fprintf(fid,"title(['Filter design (firdespm) window f_c: %f, S_L: %f, h: %u']);\n",
fc, -As, h_len);
fprintf(fid,"axis([-0.5 0.5 -As-40 10]);\n");
|
Reduce Poser Calls
I've been seeing starvation that manifests itself as weird light data coming into the disambiguator. A major cause ended up being starvation. This change will cut the frequency of poser calls by by 75% | @@ -1520,7 +1520,7 @@ int PoserTurveyTori( SurviveObject * so, PoserData * poserData )
counter++;
// let's just do this occasionally for now...
- //if (counter % 1 == 0)
+ if (counter % 4 == 0)
QuickPose(so, 0);
}
// axis changed, time to increment the circular buffer index.
|
esp32/modesp32: Add hall_sensor() function. | #include "soc/rtc_cntl_reg.h"
#include "soc/sens_reg.h"
#include "driver/gpio.h"
+#include "driver/adc.h"
#include "py/nlr.h"
#include "py/obj.h"
@@ -138,6 +139,12 @@ STATIC mp_obj_t esp32_raw_temperature(void) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp32_raw_temperature_obj, esp32_raw_temperature);
+STATIC mp_obj_t esp32_hall_sensor(void) {
+ adc1_config_width(ADC_WIDTH_12Bit);
+ return MP_OBJ_NEW_SMALL_INT(hall_sensor_read());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp32_hall_sensor_obj, esp32_hall_sensor);
+
STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp32) },
@@ -145,6 +152,7 @@ STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_wake_on_ext0), MP_ROM_PTR(&esp32_wake_on_ext0_obj) },
{ MP_ROM_QSTR(MP_QSTR_wake_on_ext1), MP_ROM_PTR(&esp32_wake_on_ext1_obj) },
{ MP_ROM_QSTR(MP_QSTR_raw_temperature), MP_ROM_PTR(&esp32_raw_temperature_obj) },
+ { MP_ROM_QSTR(MP_QSTR_hall_sensor), MP_ROM_PTR(&esp32_hall_sensor_obj) },
{ MP_ROM_QSTR(MP_QSTR_ULP), MP_ROM_PTR(&esp32_ulp_type) },
|
Update rpl-udp example readme | -A simple RPL network with UDP communication. The DAG root also acts as
-UDP server. All other nodes are client. The clients send a UDP request
-that simply includes a counter as payload. When receiving a request, The
-server sends a reply with the same counter back to the originator.
+A simple RPL network with UDP communication. This is a self-contained example:
+it includes a DAG root (`udp-server.c`) and DAG nodes (`udp-clients.c`).
+This example runs without a border router -- this is a stand-alone RPL network.
+
+The DAG root also acts as UDP server. The DAG nodes are UDP client. The clients
+send a UDP request periodically, that simply includes a counter as payload.
+When receiving a request, The server sends a response with the same counter
+back to the originator.
The simulation files show example networks, for sky motes and for cooja motes.
|
MAP: Encode ht-ratio as f64 for API. | @@ -562,14 +562,14 @@ vl_api_map_param_get_t_handler (vl_api_map_param_get_t * mp)
rmp->ip4_pool_size = clib_net_to_host_u16 (mm->ip4_reass_conf_pool_size);
rmp->ip4_buffers = clib_net_to_host_u32 (mm->ip4_reass_conf_buffers);
rmp->ip4_ht_ratio =
- clib_net_to_host_u32 ((u32) mm->ip4_reass_conf_ht_ratio);
+ clib_net_to_host_u64 ((u64) mm->ip4_reass_conf_ht_ratio);
rmp->ip6_lifetime_ms =
clib_net_to_host_u16 (mm->ip6_reass_conf_lifetime_ms);
rmp->ip6_pool_size = clib_net_to_host_u16 (mm->ip6_reass_conf_pool_size);
rmp->ip6_buffers = clib_net_to_host_u32 (mm->ip6_reass_conf_buffers);
rmp->ip6_ht_ratio =
- clib_net_to_host_u32 ((u32) mm->ip6_reass_conf_ht_ratio);
+ clib_net_to_host_u64 ((u64) mm->ip6_reass_conf_ht_ratio);
rmp->sec_check_enable = mm->sec_check;
rmp->sec_check_fragments = mm->sec_check_frag;
|
DDF add BW-SHP15 variant (_TZ3000_u5u4cakc) | {
"schema": "devcap1.schema.json",
- "manufacturername": "_TZ3000_mraovvmm",
- "modelid": "TS011F",
+ "manufacturername": ["_TZ3000_mraovvmm", "_TZ3000_u5u4cakc"],
+ "modelid": ["TS011F", "TS011F"],
"product": "BW-SHP15",
"vendor": "Blitzwolf",
"sleeper": false,
|
ensure paths are canonicalized by get_filename_component prior to comparing
This fixes an issue under windows where the root is not properly
strequal | @@ -57,11 +57,17 @@ endif()
# has version names attached to it
function(PYILMBASE_EXTRACT_REL_SITEARCH varname pyver pyexe pysitearch)
get_filename_component(_exedir ${pyexe} DIRECTORY)
- string(FIND ${pysitearch} ${_exedir} _findloc)
+ # we do this such that cmake will canonicalize the slashes
+ # so the directory search will work under windows and unix
+ # consistently
+ get_filename_component(_basedir ${pysitearch} DIRECTORY)
+ get_filename_component(_basename ${pysitearch} NAME)
+ set(_basedir "${_basedir}/${_basename}")
+ string(FIND ${_basedir} ${_exedir} _findloc)
string(LENGTH ${_exedir} _elen)
while(_findloc EQUAL -1 AND _elen GREATER 0)
get_filename_component(_nexedir ${_exedir} DIRECTORY)
- string(FIND ${pysitearch} ${_nexedir} _findloc)
+ string(FIND ${_basedir} ${_nexedir} _findloc)
if (_nexedir STREQUAL _exedir)
message(WARNING "Unable to get parent directory for ${_exedir}, using absolute python site arch folder ${pysitearch}")
set(_elen -1)
@@ -72,7 +78,7 @@ function(PYILMBASE_EXTRACT_REL_SITEARCH varname pyver pyexe pysitearch)
string(LENGTH ${_exedir} _elen)
endwhile()
math(EXPR _elen "${_elen}+1")
- string(SUBSTRING ${pysitearch} ${_elen} -1 _reldir)
+ string(SUBSTRING ${_basedir} ${_elen} -1 _reldir)
set(${varname} ${_reldir} CACHE STRING "Destination sub-folder (relative) for the python ${pyver} modules")
endfunction()
@@ -99,7 +105,6 @@ endif()
# let's run a search and see what we get instead of making it
# an explicit required. The older names are not portable, but
# we'll do the best we can
-set(Boost_NO_BOOST_CMAKE ON)
find_package(Boost OPTIONAL_COMPONENTS
python
python2
|
hal: fix ee.get_gpio_in command for esp32-s3 | @@ -185,7 +185,7 @@ static inline void cpu_ll_waiti(void)
static inline uint32_t cpu_ll_read_dedic_gpio_in(void)
{
uint32_t value = 0;
- asm volatile("get_gpio_in %0" : "=r"(value) : :);
+ asm volatile("ee.get_gpio_in %0" : "=r"(value) : :);
return value;
}
|
Documentation change for uLocation only: clarify that uLocationGetStart() is one-shot. | @@ -347,7 +347,9 @@ int32_t uLocationGet(uDeviceHandle_t devHandle, uLocationType_t type,
/** Get the current location, non-blocking version. uNetworkInterfaceUp()
* (see the network API) must have been called on the given networkHandle
- * for this function to work.
+ * for this function to work. This is a one-shot establishment:
+ * once pCallback has been called it is over, you must call this
+ * function again to start a new location establishment attempt.
* Note that if you have a GNSS chip inside your cellular module
* (e.g. you have a SARA-R510M8S or SARA-R422M8S) then making a
* location call on the cell network will use that GNSS chip, there is
|
Improved VmaBlockMetadata_Buddy when used as a virtual allocator, to support allocation sizes down to 1 | @@ -5538,8 +5538,7 @@ public:
virtual void SetAllocationUserData(VkDeviceSize offset, void* userData);
private:
- static const VkDeviceSize MIN_NODE_SIZE = 32;
- static const size_t MAX_LEVELS = 30;
+ static const size_t MAX_LEVELS = 48;
static VkDeviceSize AlignAllocationSize(VkDeviceSize size) { return VmaNextPow2(size); }
@@ -10687,9 +10686,10 @@ void VmaBlockMetadata_Buddy::Init(VkDeviceSize size)
m_SumFreeSize = m_UsableSize;
// Calculate m_LevelCount.
+ const VkDeviceSize minNodeSize = IsVirtual() ? 1 : 16;
m_LevelCount = 1;
while(m_LevelCount < MAX_LEVELS &&
- LevelToNodeSize(m_LevelCount) >= MIN_NODE_SIZE)
+ LevelToNodeSize(m_LevelCount) >= minNodeSize)
{
++m_LevelCount;
}
|
Actually send ^D to the Urbit; handle %logo in response to shutdown. | @@ -70,6 +70,14 @@ runMaybeTermOutput t getter = case (getter t) of
Nothing -> pure ()
Just x -> runTermOutput t x
+-- Because of legacy reasons, some file operations are in the terminal
+-- driver. These should be filtered out and handled locally instead of in any
+-- abstractly connected terminal.
+isTerminalBlit :: Blit -> Bool
+isTerminalBlit (Sav _ _) = False
+isTerminalBlit (Sag _ _) = False
+isTerminalBlit _ = True
+
--------------------------------------------------------------------------------
-- Initializes the generalized input/output parts of the terminal.
@@ -288,13 +296,6 @@ initializeLocalTerminal = do
writeTQueue wq $ VerePrintOutput "interrupt"
writeTQueue rq $ Ctl $ Cord "c"
loop rd
- else if w == 4 then do
- -- EOT (^D)
- atomically $ writeTQueue wq $ VereBlankLine
- -- On ctrl-d, we end reading input. Returning instead of
- -- looping causes this Async() to return, which is detected by
- -- the main thread.
- pure ()
else if w <= 26 then do
sendBelt $ Ctl $ Cord $ pack [w2c (w + 97 - 1)]
loop rd
@@ -335,7 +336,29 @@ term TerminalSystem{..} king enqueueEv =
handleEffect :: TermEf -> IO ()
handleEffect = \case
- TermEfBlit _ blits -> atomically $ writeTQueue tsWriteQueue (VereBlitOutput blits)
+ TermEfBlit _ blits -> do
+ let (termBlits, fsWrites) = partition isTerminalBlit blits
+ atomically $ writeTQueue tsWriteQueue (VereBlitOutput termBlits)
+ for_ fsWrites handleFsWrite
TermEfInit _ _ -> pure ()
- TermEfLogo path _ -> pure ()
+ TermEfLogo path _ -> do
+ -- %logo is the shutdown path. A previous iteration just had the reader
+ -- thread exit when it saw a ^D, which was wrong because it didn't emit
+ -- a ^D to your Urbit, which does things and then sends us a %logo.
+ --
+ -- But this isn't optimal either. Right now, Pier spins forever,
+ -- waiting for some piece to exit or die, and I added the terminal
+ -- reading Async for expedience. But the terminal system ending should
+ -- additionally trigger taking a snapshot, along with any other clean
+ -- shutdown work.
+ --
+ -- If we have a separate terminal program which connects to the daemon,
+ -- this shouldn't be shutdown, but should be a sort of disconnect,
+ -- meaning it would be a VereOutput?
+ cancel tsReaderThread
TermEfMass _ _ -> pure ()
+
+ handleFsWrite :: Blit -> IO ()
+ handleFsWrite (Sag path noun) = pure ()
+ handleFsWrite (Sav path atom) = pure ()
+ handleFsWrite _ = pure ()
|
Disabled tests with errors related to recursion for readability of tests in docker. | @@ -128,8 +128,8 @@ add_subdirectory(metacall_node_async_test)
add_subdirectory(metacall_node_reentrant_test)
add_subdirectory(metacall_node_port_test)
add_subdirectory(metacall_node_port_await_test)
-add_subdirectory(metacall_node_python_port_mock_test)
-add_subdirectory(metacall_node_python_port_ruby_test)
+# add_subdirectory(metacall_node_python_port_mock_test) # TODO: Recursion bug in Python Port (disabled for readability of tests)
+# add_subdirectory(metacall_node_python_port_ruby_test) # TODO: Recursion bug in Python Port (disabled for readability of tests)
add_subdirectory(metacall_node_callback_test)
add_subdirectory(metacall_node_fail_test)
add_subdirectory(metacall_node_fail_env_var_test)
|
Python bindings now uses python3 specifically | @@ -128,7 +128,7 @@ file(GLOB REDIST_HEADERS
install(FILES ${REDIST_HEADERS} DESTINATION include/libsurvive/redist)
if(PYTHON_GENERATED_DIR)
- find_package (Python COMPONENTS Interpreter Development)
+ find_package (Python3 COMPONENTS Interpreter Development)
find_program(CTYPESGEN ctypesgen REQUIRED)
message("-- Building python bindings file to ${PYTHON_GENERATED_DIR}")
@@ -139,7 +139,7 @@ if(PYTHON_GENERATED_DIR)
list(APPEND INCLUDE_FLAGS "-I${include_directory}")
endforeach()
- add_custom_target(pysurvive ALL COMMAND ${Python_EXECUTABLE} ${CTYPESGEN} ${CMAKE_SOURCE_DIR}/include/libsurvive/*.h ${INCLUDE_FLAGS} --no-macros -L$<TARGET_FILE_DIR:survive> -llibsurvive.so
+ add_custom_target(pysurvive ALL COMMAND ${Python3_EXECUTABLE} ${CTYPESGEN} ${CMAKE_SOURCE_DIR}/include/libsurvive/*.h ${INCLUDE_FLAGS} --no-macros -L$<TARGET_FILE_DIR:survive> -llibsurvive.so
--strip-prefix=survive_ -P Survive -o ${PYTHON_GENERATED_DIR}pysurvive_generated.py )
endif()
|
Initialize throttle params before starting throttle maint task | @@ -1322,11 +1322,11 @@ ikvdb_open(
if (rp.low_mem || mavail < 32)
ikvdb_low_mem_adjust(self);
- tbkt_init(&self->ikdb_tb, self->ikdb_rp.throttle_burst, self->ikdb_rp.throttle_rate);
-
kvdb_rparams_print(&rp);
throttle_init(&self->ikdb_throttle, &self->ikdb_rp);
+ throttle_init_params(&self->ikdb_throttle, &self->ikdb_rp);
+ tbkt_init(&self->ikdb_tb, self->ikdb_rp.throttle_burst, self->ikdb_rp.throttle_rate);
if (!self->ikdb_rdonly) {
err = csched_create(
@@ -1453,7 +1453,6 @@ ikvdb_open(
ikvdb_rest_register(self, *handle);
- throttle_init_params(&self->ikdb_throttle, &self->ikdb_rp);
ikvdb_init_throttle_params(self);
return 0;
|
Fix test_good_cdata_ascii() to work for builds | @@ -2259,7 +2259,7 @@ END_TEST
START_TEST(test_good_cdata_ascii)
{
const char *text = "<a><![CDATA[<greeting>Hello, world!</greeting>]]></a>";
- const char *expected = "<greeting>Hello, world!</greeting>";
+ const XML_Char *expected = XCS("<greeting>Hello, world!</greeting>");
CharData storage;
CharData_Init(&storage);
|
updated cc26xx-web-demo to new ext-flash api | @@ -195,15 +195,15 @@ save_config()
int rv;
cc26xx_web_demo_sensor_reading_t *reading = NULL;
- rv = ext_flash_open();
+ rv = ext_flash_open(NULL);
if(!rv) {
printf("Could not open flash to save config\n");
- ext_flash_close();
+ ext_flash_close(NULL);
return;
}
- rv = ext_flash_erase(CONFIG_FLASH_OFFSET, sizeof(cc26xx_web_demo_config_t));
+ rv = ext_flash_erase(NULL, CONFIG_FLASH_OFFSET, sizeof(cc26xx_web_demo_config_t));
if(!rv) {
printf("Error erasing flash\n");
@@ -220,14 +220,14 @@ save_config()
}
}
- rv = ext_flash_write(CONFIG_FLASH_OFFSET, sizeof(cc26xx_web_demo_config_t),
+ rv = ext_flash_write(NULL, CONFIG_FLASH_OFFSET, sizeof(cc26xx_web_demo_config_t),
(uint8_t *)&cc26xx_web_demo_config);
if(!rv) {
printf("Error saving config\n");
}
}
- ext_flash_close();
+ ext_flash_close(NULL);
#endif
}
/*---------------------------------------------------------------------------*/
@@ -239,18 +239,18 @@ load_config()
cc26xx_web_demo_config_t tmp_cfg;
cc26xx_web_demo_sensor_reading_t *reading = NULL;
- int rv = ext_flash_open();
+ int rv = ext_flash_open(NULL);
if(!rv) {
printf("Could not open flash to load config\n");
- ext_flash_close();
+ ext_flash_close(NULL);
return;
}
- rv = ext_flash_read(CONFIG_FLASH_OFFSET, sizeof(tmp_cfg),
+ rv = ext_flash_read(NULL, CONFIG_FLASH_OFFSET, sizeof(tmp_cfg),
(uint8_t *)&tmp_cfg);
- ext_flash_close();
+ ext_flash_close(NULL);
if(!rv) {
printf("Error loading config\n");
|
extmod/modrobotics: add drivebase controls
Enable settings getters and setters for drivebase. This uses the same control interface as single motors. | #include "pberror.h"
#include "pbobj.h"
#include "pbkwarg.h"
+
+#include "modbuiltins.h"
#include "modmotor.h"
#include "modlogger.h"
@@ -25,6 +27,8 @@ typedef struct _robotics_DriveBase_obj_t {
motor_Motor_obj_t *left;
motor_Motor_obj_t *right;
mp_obj_t logger;
+ mp_obj_t heading_control;
+ mp_obj_t distance_control;
} robotics_DriveBase_obj_t;
// pybricks.robotics.DriveBase.__init__
@@ -59,6 +63,10 @@ STATIC mp_obj_t robotics_DriveBase_make_new(const mp_obj_type_t *type, size_t n_
// Create an instance of the Logger class
self->logger = logger_obj_make_new(&self->db->log);
+ // Create instances of the Control class
+ self->heading_control = builtins_Control_obj_make_new(&self->db->control_heading);
+ self->distance_control = builtins_Control_obj_make_new(&self->db->control_distance);
+
return MP_OBJ_FROM_PTR(self);
}
@@ -101,6 +109,8 @@ STATIC const mp_rom_map_elem_t robotics_DriveBase_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_drive), MP_ROM_PTR(&robotics_DriveBase_drive_obj) },
{ MP_ROM_QSTR(MP_QSTR_stop), MP_ROM_PTR(&robotics_DriveBase_stop_obj) },
{ MP_ROM_QSTR(MP_QSTR_log), MP_ROM_ATTRIBUTE_OFFSET(robotics_DriveBase_obj_t, logger) },
+ { MP_ROM_QSTR(MP_QSTR_heading_control), MP_ROM_ATTRIBUTE_OFFSET(robotics_DriveBase_obj_t, heading_control) },
+ { MP_ROM_QSTR(MP_QSTR_distance_control), MP_ROM_ATTRIBUTE_OFFSET(robotics_DriveBase_obj_t, distance_control) },
};
STATIC MP_DEFINE_CONST_DICT(robotics_DriveBase_locals_dict, robotics_DriveBase_locals_dict_table);
|
Adjust doxyfile to expand MBEDTLS_PRIVATE macro. | @@ -1577,13 +1577,13 @@ ENABLE_PREPROCESSING = YES
# compilation will be performed. Macro expansion can be done in a controlled
# way by setting EXPAND_ONLY_PREDEF to YES.
-MACRO_EXPANSION = NO
+MACRO_EXPANSION = YES
# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
# then the macro expansion is limited to the macros specified with the
# PREDEFINED and EXPAND_AS_DEFINED tags.
-EXPAND_ONLY_PREDEF = NO
+EXPAND_ONLY_PREDEF = YES
# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
# pointed to by INCLUDE_PATH will be searched when a #include is found.
@@ -1630,7 +1630,7 @@ PREDEFINED = WIN32 \
# Use the PREDEFINED tag if you want to use a different macro definition that
# overrules the definition found in the source code.
-EXPAND_AS_DEFINED =
+EXPAND_AS_DEFINED = MBEDTLS_PRIVATE
# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
# doxygen's preprocessor will remove all references to function-like macros
|
More changes to torii fitness calculations | @@ -386,7 +386,7 @@ FLT getPointFitnessForPna(Point pointIn, PointsAndAngle *pna)
return dist;
}
-int compareFlts(const void * b, const void * a)
+int compareFlts(const void * a, const void * b)
{
FLT a2 = *(const FLT*)a;
FLT b2 = *(const FLT*)b;
@@ -411,7 +411,7 @@ FLT getPointFitness(Point pointIn, PointsAndAngle *pna, size_t pnaCount, int deu
worstFitness = fitness;
}
- fitnesses[i] = fitness;
+ fitnesses[i] = FLT_FABS(fitness);
if (deubgPrint)
{
printf(" [%d, %d](%f)\n", pna[i].ai, pna[i].bi, fitness);
@@ -1534,7 +1534,7 @@ int PoserTurveyTori( SurviveObject * so, PoserData * poserData )
counter++;
// let's just do this occasionally for now...
- if (counter % 12 == 0)
+ if (counter % 4 == 0)
QuickPose(so, 0);
}
if (1 == l->lh && axis) // only once per full cycle...
@@ -1544,7 +1544,7 @@ int PoserTurveyTori( SurviveObject * so, PoserData * poserData )
counter++;
// let's just do this occasionally for now...
- if (counter % 12 == 0)
+ if (counter % 4 == 0)
QuickPose(so, 1);
}
// axis changed, time to increment the circular buffer index.
|
add platfrom flug | void suctionInit()
{
+#ifdef PLATFORM
pinMode(RELAY_PIN, OUTPUT);
+#endif
}
void suctionOn()
{
+#ifdef PLATFORM
digitalWrite(RELAY_PIN, HIGH);
+#endif
}
void suctionOff()
{
+#ifdef PLATFORM
digitalWrite(RELAY_PIN, LOW);
+#endif
}
|
Don't run OCSP tests when OCSP is disabled | @@ -168,6 +168,10 @@ checkhandshake($proxy, checkhandshake::RESUME_HANDSHAKE,
"Resumption handshake test");
unlink $session;
+SKIP: {
+ skip "No OCSP support in this OpenSSL build", 3
+ if disabled("ocsp");
+
#Test 3: A status_request handshake (client request only)
$proxy->clear();
$proxy->clientflags("-no_tls1_3 -status");
@@ -198,6 +202,7 @@ checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
| checkhandshake::STATUS_REQUEST_CLI_EXTENSION
| checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
"status_request handshake test");
+}
#Test 6: A client auth handshake
$proxy->clear();
@@ -276,8 +281,8 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
"ALPN handshake test");
SKIP: {
- skip "No CT and/or EC support in this OpenSSL build", 1
- if disabled("ct") || disabled("ec");
+ skip "No CT, EC or OCSP support in this OpenSSL build", 1
+ if disabled("ct") || disabled("ec") || disabled("ocsp");
#Test 14: SCT handshake (client request only)
$proxy->clear();
@@ -294,6 +299,10 @@ SKIP: {
"SCT handshake test (client)");
}
+SKIP: {
+ skip "No OCSP support in this OpenSSL build", 1
+ if disabled("ocsp");
+
#Test 15: SCT handshake (server support only)
$proxy->clear();
#Note: -ct also sends status_request
@@ -304,10 +313,11 @@ $proxy->start();
checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
checkhandshake::DEFAULT_EXTENSIONS,
"SCT handshake test (server)");
+}
SKIP: {
- skip "No CT and/or EC support in this OpenSSL build", 1
- if disabled("ct") || disabled("ec");
+ skip "No CT, EC or OCSP support in this OpenSSL build", 1
+ if disabled("ct") || disabled("ec") || disabled("ocsp");
#Test 16: SCT handshake (client and server)
#There is no built-in server side support for this so we are actually also
|
chip/it83xx/config_chip_it8xxx2.h: Format with clang-format
BRANCH=none
TEST=none | #define IT83XX_INTC_PLUG_IN_OUT_SUPPORT
/* Chip IT83202BX actually has TCPC physical port count. */
#define IT83XX_USBPD_PHY_PORT_COUNT 3
-#elif defined(CHIP_VARIANT_IT81302AX_1024) \
-|| defined(CHIP_VARIANT_IT81202AX_1024) \
-|| defined(CHIP_VARIANT_IT81302BX_1024) \
-|| defined(CHIP_VARIANT_IT81302BX_512) \
-|| defined(CHIP_VARIANT_IT81202BX_1024)
+#elif defined(CHIP_VARIANT_IT81302AX_1024) || \
+ defined(CHIP_VARIANT_IT81202AX_1024) || \
+ defined(CHIP_VARIANT_IT81302BX_1024) || \
+ defined(CHIP_VARIANT_IT81302BX_512) || \
+ defined(CHIP_VARIANT_IT81202BX_1024)
/*
* Workaround mul instruction bug, see:
#define CHIP_RAMCODE_ILM0 (CONFIG_RAM_BASE + 0) /* base+0000h~base+0FFF */
#define CHIP_H2RAM_BASE (CONFIG_RAM_BASE + 0x1000) /* base+1000h~base+1FFF */
-#define CHIP_RAMCODE_BASE (CONFIG_RAM_BASE + 0x2000) /* base+2000h~base+2FFF */
+#define CHIP_RAMCODE_BASE (CONFIG_RAM_BASE + 0x2000) /* base+2000h~base+2FFF \
+ */
#ifdef BASEBOARD_KUKUI
/*
|
cc2538-rf: More compact implementation of getting RSSIs | #define LQI_BIT_MASK 0x7F
/* RSSI Offset */
#define RSSI_OFFSET 73
+#define RSSI_INVALID -128
/* 192 usec off -> on interval (RX Callib -> SFD Wait). We wait a bit more */
#define ONOFF_TIME RTIMER_ARCH_SECOND / 3125
@@ -244,10 +245,11 @@ get_rssi(void)
on();
}
- /* Wait on RSSI_VALID */
- while((REG(RFCORE_XREG_RSSISTAT) & RFCORE_XREG_RSSISTAT_RSSI_VALID) == 0);
-
- rssi = (int8_t)(REG(RFCORE_XREG_RSSI) & RFCORE_XREG_RSSI_RSSI_VAL) - RSSI_OFFSET;
+ /* Wait for a valid RSSI reading */
+ do {
+ rssi = REG(RFCORE_XREG_RSSI);
+ } while(rssi == RSSI_INVALID);
+ rssi -= RSSI_OFFSET;
/* If we were off, turn back off */
if(was_off) {
|
Fix logic for 1 pixel high/wide preview images (Fixes | @@ -120,8 +120,8 @@ generatePreview (const char inFileName[],
previewHeight = max (int (h / (w * a) * previewWidth + .5f), 1);
previewPixels.resizeErase (previewHeight, previewWidth);
- float fx = (previewWidth > 0)? (float (w - 1) / (previewWidth - 1)): 1;
- float fy = (previewHeight > 0)? (float (h - 1) / (previewHeight - 1)): 1;
+ float fx = (previewWidth > 1)? (float (w - 1) / (previewWidth - 1)): 1;
+ float fy = (previewHeight > 1)? (float (h - 1) / (previewHeight - 1)): 1;
float m = Math<float>::pow (2.f, IMATH_NAMESPACE::clamp (exposure + 2.47393f, -20.f, 20.f));
for (int y = 0; y < previewHeight; ++y)
|
Free lookupKey in elektraClose | @@ -68,8 +68,9 @@ Elektra * elektraOpen (const char * application, ElektraError ** error)
void elektraClose (Elektra * elektra)
{
kdbClose (elektra->kdb, elektra->parentKey);
- ksDel (elektra->config);
keyDel (elektra->parentKey);
+ ksDel (elektra->config);
+ keyDel (elektra->lookupKey);
elektraFree (elektra);
}
|
OpenCoreMisc: Support BlessOverride | @@ -350,6 +350,8 @@ OcMiscBoot (
UINT32 Index;
UINT32 EntryIndex;
OC_INTERFACE_PROTOCOL *Interface;
+ UINTN BlessOverrideSize;
+ CHAR16 **BlessOverride;
//
// Do not use our boot picker unless asked.
@@ -399,6 +401,45 @@ OcMiscBoot (
return;
}
+ if (Config->Misc.BlessOverride.Count > 0) {
+ if (!OcOverflowMulUN (
+ Config->Misc.BlessOverride.Count,
+ sizeof (*BlessOverride),
+ &BlessOverrideSize))
+ {
+ BlessOverride = AllocateZeroPool (BlessOverrideSize);
+ } else {
+ BlessOverride = NULL;
+ }
+
+ if (BlessOverride == NULL) {
+ FreePool (Context);
+ DEBUG ((DEBUG_ERROR, "OC: Failed to allocate bless overrides!\n"));
+ return;
+ }
+
+ for (Index = 0; Index < Config->Misc.BlessOverride.Count; ++Index) {
+ BlessOverride[Index] = AsciiStrCopyToUnicode (
+ OC_BLOB_GET (
+ Config->Misc.BlessOverride.Values[Index]
+ ),
+ 0
+ );
+ if (BlessOverride[Index] == NULL) {
+ for (EntryIndex = 0; EntryIndex < Index; ++EntryIndex) {
+ FreePool (BlessOverride[EntryIndex]);
+ }
+ FreePool (BlessOverride);
+ FreePool (Context);
+ DEBUG ((DEBUG_ERROR, "OC: Failed to allocate bless overrides!\n"));
+ return;
+ }
+ }
+
+ Context->NumCustomBootPaths = Config->Misc.BlessOverride.Count;
+ Context->CustomBootPaths = BlessOverride;
+ }
+
Context->ScanPolicy = Config->Misc.Security.ScanPolicy;
Context->LoadPolicy = OC_LOAD_DEFAULT_POLICY;
Context->TimeoutSeconds = Config->Misc.Boot.Timeout;
|
Fix newTexture; | @@ -895,6 +895,7 @@ static int l_lovrGraphicsNewTexture(lua_State* L) {
TextureInfo info = {
.type = TEXTURE_2D,
.format = FORMAT_RGBA8,
+ .layers = 1,
.mipmaps = ~0u,
.samples = 1,
.usage = TEXTURE_SAMPLE,
@@ -917,10 +918,9 @@ static int l_lovrGraphicsNewTexture(lua_State* L) {
info.imageCount = luax_len(L, index++);
images = info.imageCount > COUNTOF(stack) ? malloc(info.imageCount * sizeof(Image*)) : stack;
lovrAssert(images, "Out of memory");
- info.type = TEXTURE_ARRAY;
- info.layers = info.imageCount;
if (info.imageCount == 0) {
+ info.layers = 6;
info.imageCount = 6;
info.type = TEXTURE_CUBE;
const char* faces[6] = { "right", "left", "top", "bottom", "back", "front" };
@@ -936,9 +936,16 @@ static int l_lovrGraphicsNewTexture(lua_State* L) {
lovrAssert(!lua_isnil(L, -1), "No array texture layers given and cubemap face '%s' missing", faces[i]);
images[i] = luax_checkimage(L, -1);
}
+ } else {
+ for (uint32_t i = 0; i < info.imageCount; i++) {
+ lua_rawgeti(L, 1, i + 1);
+ images[i] = luax_checkimage(L, -1);
+ lua_pop(L, 1);
}
- lovrCheck(lovrImageGetLayerCount(images[0]) == 1, "When a list of images is provided, each must have a single layer");
+ info.type = info.imageCount == 6 ? TEXTURE_CUBE : TEXTURE_ARRAY;
+ info.layers = info.imageCount == 1 ? lovrImageGetLayerCount(images[0]) : info.imageCount;
+ }
} else {
info.imageCount = 1;
images[0] = luax_checkimage(L, index++);
@@ -1019,10 +1026,6 @@ static int l_lovrGraphicsNewTexture(lua_State* L) {
lua_pop(L, 1);
}
- if (info.layers == 0) {
- info.layers = info.type == TEXTURE_CUBE ? 6 : 1;
- }
-
Texture* texture = lovrTextureCreate(&info);
for (uint32_t i = 0; i < info.imageCount; i++) {
|
Update an overlooked instance of xcode 10.0 as well | @@ -233,7 +233,7 @@ matrix:
- BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-10"
- <<: *test-macos
- osx_image: xcode10.0
+ osx_image: xcode11.5
env:
- BTYPE="TARGET=NEHALEM BINARY=32 NOFORTRAN=1"
|
apps/loraping: Fix compilation issues
Error: Settings defined by multiple packages:
LORA_MAC_TIMER_NUM:
Error: repos/apache-mynewt-core/hw/drivers/lora/sx1276/src/sx1276.c:29:2: error: #error "Must define a Lora MAC timer number"
#error "Must define a Lora MAC timer number"
^~~~~ | @@ -23,10 +23,6 @@ syscfg.defs:
Used by package management system to include mfrg firmware.
value: 1
- LORA_MAC_TIMER_NUM:
- description: Timer number used for lora mac and radio
- value: -1
-
syscfg.vals:
STATS_CLI: 1
STATS_NAMES: 1
|
Fix multiple STATUS lines for the same status code. | @@ -875,7 +875,8 @@ do_tests(cups_file_t *outfile, /* I - Output file */
int num_statuses = 0; /* Number of valid status codes */
_cups_status_t statuses[100], /* Valid status codes */
*last_status; /* Last STATUS (for predicates) */
- int num_expects = 0; /* Number of expected attributes */
+ int status_ok, /* Did we get a matching status? */
+ num_expects = 0; /* Number of expected attributes */
_cups_expect_t expects[200], /* Expected attributes */
*expect, /* Current expected attribute */
*last_expect; /* Last EXPECT (for predicates) */
@@ -3042,7 +3043,7 @@ do_tests(cups_file_t *outfile, /* I - Output file */
* values...
*/
- for (i = 0; i < num_statuses; i ++)
+ for (i = 0, status_ok = 0; i < num_statuses; i ++)
{
if (statuses[i].if_defined &&
!get_variable(vars, statuses[i].if_defined))
@@ -3052,15 +3053,15 @@ do_tests(cups_file_t *outfile, /* I - Output file */
get_variable(vars, statuses[i].if_not_defined))
continue;
- if (response->request.status.status_code == statuses[i].status)
+ if (ippGetStatusCode(response) == statuses[i].status)
{
+ status_ok = 1;
+
if (statuses[i].repeat_match && repeat_count < statuses[i].repeat_limit)
repeat_test = 1;
if (statuses[i].define_match)
set_variable(outfile, vars, statuses[i].define_match, "1");
-
- break;
}
else
{
@@ -3070,12 +3071,12 @@ do_tests(cups_file_t *outfile, /* I - Output file */
if (statuses[i].define_no_match)
{
set_variable(outfile, vars, statuses[i].define_no_match, "1");
- break;
+ status_ok = 1;
}
}
}
- if (i == num_statuses && num_statuses > 0)
+ if (!status_ok && num_statuses > 0)
{
for (i = 0; i < num_statuses; i ++)
{
|
Browser animations | @@ -10,7 +10,7 @@ import UIKit
import SafariServices
/// The main file browser used to edit scripts.
-class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocumentBrowserViewControllerDelegate, UIViewControllerRestoration {
+class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocumentBrowserViewControllerDelegate, UIViewControllerRestoration, UIViewControllerTransitioningDelegate {
override func viewDidLoad() {
super.viewDidLoad()
@@ -28,6 +28,9 @@ class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocument
restorationIdentifier = "Browser"
}
+ /// Transition controller for presenting and dismissing View controllers.
+ var transitionController: UIDocumentBrowserTransitionController?
+
/// Open the documentation or samples.
@objc func help(_ sender: UIBarButtonItem) {
let sheet = UIAlertController(title: "Pyto", message: Python.shared.version, preferredStyle: .actionSheet)
@@ -93,6 +96,14 @@ class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocument
/// - run: Set to `true` to run the script inmediately.
/// - completion: Code called after presenting the UI.
func openDocument(_ document: URL, run: Bool, completion: (() -> Void)? = nil) {
+
+ if presentedViewController != nil {
+ (((presentedViewController as? UITabBarController)?.viewControllers?.first as? UINavigationController)?.viewControllers.first as? EditorViewController)?.save()
+ dismiss(animated: true) {
+ self.openDocument(document, run: run, completion: completion)
+ }
+ }
+
Py_SetProgramName(document.lastPathComponent.cWchar_t)
let doc = PyDocument(fileURL: document)
@@ -108,6 +119,13 @@ class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocument
tabBarVC.view.tintColor = UIColor(named: "TintColor")
tabBarVC.view.backgroundColor = .clear
tabBarVC.modalPresentationStyle = .overCurrentContext
+
+ if #available(iOS 12.0, *) {
+ transitionController = transitionController(forDocumentAt: document)
+ transitionController?.targetView = tabBarVC.view
+ tabBarVC.transitioningDelegate = self
+ }
+
UIApplication.shared.keyWindow?.topViewController?.present(tabBarVC, animated: true, completion: {
if run {
editor.run()
@@ -168,4 +186,14 @@ class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocument
static func viewController(withRestorationIdentifierPath identifierComponents: [String], coder: NSCoder) -> UIViewController? {
return DocumentBrowserViewController()
}
+
+ // MARK: - View controller transition delegate
+
+ func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+ return transitionController
+ }
+
+ func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+ return transitionController
+ }
}
|
Fix link for error codes in the documentation | @@ -121,7 +121,7 @@ psa_status_t psa_its_get(psa_storage_uid_t uid,
*
* \retval #PSA_SUCCESS The operation completed successfully
* \retval #PSA_ERROR_DOES_NOT_EXIST The operation failed because the provided uid value was not found in the storage
- * \retval #PSA_ERROR_STORAGE_FAILURE The operation failed because the physical storage has failed (Fatal error)
+ * \retval #PSA_ERROR_DATA_CORRUPT The operation failed because stored data has been corrupted
* \retval #PSA_ERROR_INVALID_ARGUMENT The operation failed because one of the provided pointers(`p_info`)
* is invalid, for example is `NULL` or references memory the caller cannot access
*/
|
in_statsd: add missing type casting | @@ -266,7 +266,7 @@ static int cb_statsd_init(struct flb_input_instance *ins,
else {
port = DEFAULT_PORT;
}
- snprintf(ctx->port, sizeof(ctx->port), "%hu", port);
+ snprintf(ctx->port, sizeof(ctx->port), "%hu", (unsigned short) port);
/* Export plugin context */
flb_input_set_context(ins, ctx);
|
COIL: Remove non-inclusive words from common mock
BRANCH=none
TEST=make runhosttests | @@ -515,7 +515,7 @@ uint16_t mock_tcpci_get_reg(int reg_offset)
return tcpci_regs[reg_offset].value;
}
-int tcpci_i2c_xfer(int port, uint16_t slave_addr_flags,
+int tcpci_i2c_xfer(int port, uint16_t addr_flags,
const uint8_t *out, int out_size,
uint8_t *in, int in_size, int flags)
{
@@ -525,8 +525,8 @@ int tcpci_i2c_xfer(int port, uint16_t slave_addr_flags,
ccprints("ERROR: wrong I2C port %d", port);
return EC_ERROR_UNKNOWN;
}
- if (slave_addr_flags != MOCK_TCPCI_I2C_ADDR_FLAGS) {
- ccprints("ERROR: wrong I2C address 0x%x", slave_addr_flags);
+ if (addr_flags != MOCK_TCPCI_I2C_ADDR_FLAGS) {
+ ccprints("ERROR: wrong I2C address 0x%x", addr_flags);
return EC_ERROR_UNKNOWN;
}
|
bugID:18002625:[breeze] add OTA dependence on auth. | @@ -21,6 +21,9 @@ GLOBAL_DEFINES += BUILD_AOS
bz_en_ota ?= 0
ifeq ($(bz_en_ota),1)
+ifeq ($(bz_en_auth), 0)
+$(error OTA need authentication, please set "bz_en_auth = 1")
+endif
GLOBAL_DEFINES += CONFIG_AIS_OTA
$(NAME)_COMPONENTS += ota_ble
endif
|
vere: improves error handling in pill download | @@ -259,10 +259,12 @@ _king_get_atom(c3_c* url_c)
if ( CURLE_OK != result ) {
u3l_log("failed to fetch %s: %s\n",
url_c, curl_easy_strerror(result));
+ u3_king_bail();
exit(1);
}
if ( 300 <= cod_l ) {
u3l_log("error fetching %s: HTTP %ld\n", url_c, cod_l);
+ u3_king_bail();
exit(1);
}
|
cosmetics in status out | @@ -504,7 +504,7 @@ if(actioncount > 0) printf("ACTION (total)...........................: %ld\n",
if(awdlcount > 0) printf("AWDL (Apple Wireless Direct Link)........: %ld\n", awdlcount);
if(proberequestcount > 0) printf("PROBEREQUEST.............................: %ld\n", proberequestcount);
if(proberequestdirectedcount > 0) printf("PROBEREQUEST (directed)..................: %ld\n", proberequestdirectedcount);
-if(proberesponsecount > 0) printf("PROBERESPONSE.............................: %ld\n", proberesponsecount);
+if(proberesponsecount > 0) printf("PROBERESPONSE............................: %ld\n", proberesponsecount);
if(deauthenticationcount > 0) printf("DEAUTHENTICATION (total).................: %ld\n", deauthenticationcount);
if(disassociationcount > 0) printf("DISASSOCIATION (total)...................: %ld\n", disassociationcount);
if(authenticationcount > 0) printf("AUTHENTICATION (total)...................: %ld\n", authenticationcount);
@@ -559,7 +559,7 @@ if(eapolrc4count > 0) printf("EAPOL RC4 messages.......................: %ld\n
if(eapolrsncount > 0) printf("EAPOL RSN messages.......................: %ld\n", eapolrsncount);
if(eapolwpacount > 0) printf("EAPOL WPA messages.......................: %ld\n", eapolwpacount);
if(essidcount > 0) printf("ESSID (total unique).....................: %ld\n", essidcount);
-if(essiddupemax > 0) printf("ESSID changes (measured maximum)..........: %ld (warning)\n", essiddupemax);
+if(essiddupemax > 0) printf("ESSID changes (measured maximum).........: %ld (warning)\n", essiddupemax);
if(eaptimegapmax > 0) printf("EAPOLTIME gap (measured maximum usec)....: %" PRId64 "\n", eaptimegapmax);
if((eapolnccount > 0) && (eapolmpcount > 0))
{
|
Force DWARF4 for Valgrind | @@ -136,6 +136,8 @@ macro(astcenc_set_properties NAME)
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-reserved-identifier>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-cast-function-type>
+ # Force DWARF4 for Valgrind profiling
+ $<$<CXX_COMPILER_ID:Clang>:-gdwarf-4>
$<$<CXX_COMPILER_ID:Clang>:-Wdocumentation>)
target_link_options(${NAME}
|
ANI_BLOCKSTART (transition to blocking) animation now works for players. | @@ -24335,12 +24335,19 @@ void common_block()
// Controlling player is holding special key.
int hb2 = ((player + self->playerindex)->keys & FLAG_SPECIAL);
+ // If we are in a block transition, let's see if it is finished.
+ // If it is, apply block animation.
+ if (self->animnum == ANI_BLOCKSTART && !self->animating)
+ {
+ ent_set_anim(self, ANI_BLOCK, 0);
+ }
+
// In "Blockstun", at last frame of animation, and have holdblock
// after blockpain ability? Then we return to block.
//
// Otherwise, entity is a player with various other flags (see bh1) but
// not holding special key, or the entity has finihsed animation and
- // doesn't match any of the playeer/holdblock criteria (could be another
+ // doesn't match any of the player/holdblock criteria (could be another
// entity type, doesn't have holdblock ability, or controlling
// player isn't holding special key). In any of those cases, we disable
// blocking flag and return to idle.
@@ -31107,17 +31114,6 @@ void player_think()
set_blocking(self);
self->combostep[0] = 0;
- // If finished with block transition animation
- // then go to block.
- if(self->animnum == ANI_BLOCKSTART)
- {
- if (!self->animating)
- {
- ent_set_anim(self, ANI_BLOCK, 0);
- }
- }
- else
- {
// If we have a block tranisiton animation, use it. Otherwise
// go right to block.
if (validanim(self, ANI_BLOCKSTART))
@@ -31128,7 +31124,6 @@ void player_think()
{
ent_set_anim(self, ANI_BLOCK, 0);
}
- }
goto endthinkcheck;
}
|
Update ForceNoParent default setting | @@ -61,7 +61,7 @@ VOID PhAddDefaultSettings(
PhpAddStringSetting(L"FileBrowseExecutable", L"%SystemRoot%\\explorer.exe /select,\"%s\"");
PhpAddIntegerSetting(L"FirstRun", L"1");
PhpAddStringSetting(L"Font", L""); // null
- PhpAddIntegerSetting(L"ForceNoParent", L"0");
+ PhpAddIntegerSetting(L"ForceNoParent", L"1");
PhpAddStringSetting(L"HandleTreeListColumns", L"");
PhpAddStringSetting(L"HandleTreeListSort", L"0,1"); // 0, AscendingSortOrder
PhpAddIntegerSetting(L"HiddenProcessesMenuEnabled", L"0");
|
Update arm_rfft_fast_f16.c | @@ -477,7 +477,7 @@ void merge_rfft_f16(
of the symmetry properties of the FFT and have a speed advantage over complex
algorithms of the same length.
@par
- The Fast RFFT algorith relays on the mixed radix CFFT that save processor usage.
+ The Fast RFFT algorithm relays on the mixed radix CFFT that save processor usage.
@par
The real length N forward FFT of a sequence is computed using the steps shown below.
@par
|
test-suite: bump version for test-suite | # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([test-suite], [1.3.8], [https://github.com/openhpc/ohpc])
+AC_INIT([test-suite], [2.0.0], [https://github.com/openhpc/ohpc])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.14])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
Fix rounding in sRGB constant color block decode
Fix | @@ -75,11 +75,14 @@ static uint4 lerp_color_int(
ecolor0 = int4(ecolor0.x >> 8, ecolor0.y >> 8, ecolor0.z >> 8, ecolor0.w >> 8);
ecolor1 = int4(ecolor1.x >> 8, ecolor1.y >> 8, ecolor1.z >> 8, ecolor1.w >> 8);
}
+
int4 color = (ecolor0 * eweight0) + (ecolor1 * eweight1) + int4(32, 32, 32, 32);
color = int4(color.x >> 6, color.y >> 6, color.z >> 6, color.w >> 6);
if (decode_mode == DECODE_LDR_SRGB)
+ {
color = color * 257;
+ }
return uint4(color.x, color.y, color.z, color.w);
}
@@ -142,13 +145,26 @@ void decompress_symbolic_block(
if (scb->block_mode == -2)
{
- // For sRGB decoding, we should return only the top 8 bits.
- int mask = (decode_mode == DECODE_LDR_SRGB) ? 0xFF00 : 0xFFFF;
+ int ired = scb->constant_color[0];
+ int igreen = scb->constant_color[1];
+ int iblue = scb->constant_color[2];
+ int ialpha = scb->constant_color[3];
+
+ // For sRGB decoding a real decoder would just use the top 8 bits
+ // for color conversion. We don't color convert, so linearly scale
+ // the top 8 bits into the full 16 bit dynamic range
+ if (decode_mode == DECODE_LDR_SRGB)
+ {
+ ired = (ired >> 8) * 257;
+ igreen = (igreen >> 8) * 257;
+ iblue = (iblue >> 8) * 257;
+ ialpha = (ialpha >> 8) * 257;
+ }
- red = sf16_to_float(unorm16_to_sf16(scb->constant_color[0] & mask));
- green = sf16_to_float(unorm16_to_sf16(scb->constant_color[1] & mask));
- blue = sf16_to_float(unorm16_to_sf16(scb->constant_color[2] & mask));
- alpha = sf16_to_float(unorm16_to_sf16(scb->constant_color[3] & mask));
+ red = sf16_to_float(unorm16_to_sf16(ired));
+ green = sf16_to_float(unorm16_to_sf16(igreen));
+ blue = sf16_to_float(unorm16_to_sf16(iblue));
+ alpha = sf16_to_float(unorm16_to_sf16(ialpha));
use_lns = 0;
use_nan = 0;
}
|
Deprecate script/preprocess-wuffs.go | // +build ignore
+// Deprecated: unused as of commit 695a6815 "Remove gif.config_decoder".
+
// TODO: consider renaming this from script/preprocess-wuffs.go to
// cmd/wuffspreprocess, making it a "go install"able command line tool.
|
opts: complete long options | @@ -69,12 +69,22 @@ typedef float opt_fvec3_t[3];
#define OPT_SELECT(c, T, ptr, value, descr) { (c), NULL, false, opt_select, OPT_SEL(T, TYPE_CHECK(T*, ptr), value), "\t" descr }
#define OPT_SUBOPT(c, argname, descr, NR, opts) OPT_ARG(c, opt_subopt, struct opt_subopt_s, OPT_SUB(NR, opts), argname, descr)
-// If the character in these macros is 0, then it is only a long opt
+// If the character in these macros is 0 (please note: NOT '0'), then it is only a long opt
// Otherwise, it is both
#define OPTL_SET(c, s, ptr, descr) { (c), (s), false, opt_set, TYPE_CHECK(bool*, (ptr)), "\t" descr }
#define OPTL_ARG(c, s, _fun, T, ptr, argname, descr) { (c), (s), true, _fun, TYPE_CHECK(T*, (ptr)), " " argname " \t" descr }
+#define OPTL_STRING(c, s, ptr, argname, descr) OPTL_ARG(c, s, opt_string, const char*, ptr, argname, descr)
#define OPTL_UINT(c, s, ptr, argname, descr) OPTL_ARG(c, s, opt_uint, unsigned int, ptr, argname, descr)
#define OPTL_INT(c, s, ptr, argname, descr) OPTL_ARG(c, s, opt_int, int, ptr, argname, descr)
+#define OPTL_LONG(c, s, ptr, argname, descr) OPTL_ARG(c, s, opt_long, long, ptr, argname, descr)
+#define OPTL_FLOAT(c, s, ptr, argname, descr) OPTL_ARG(c, s, opt_float, float, ptr, argname, descr)
+#define OPTL_CFLOAT(c, s, ptr, argname, descr) OPTL_ARG(c, s, opt_cfloat, complex float, ptr, argname, descr)
+#define OPTL_VEC2(c, s, ptr, argname, descr) OPTL_ARG(c, s, opt_vec2, opt_vec2_t, ptr, argname, descr)
+#define OPTL_FLVEC2(c, s, ptr, argname, descr) OPTL_ARG(c, s, opt_float_vec2, opt_fvec2_t, ptr, argname, descr)
+#define OPTL_VEC3(c, s, ptr, argname, descr) OPTL_ARG(c, s, opt_vec3, opt_vec3_t, ptr, argname, descr)
+#define OPTL_FLVEC3(c, s, ptr, argname, descr) OPTL_ARG(c, s, opt_float_vec3, opt_fvec3_t, ptr, argname, descr)
+#define OPTL_SELECT(c, s, T, ptr, value, descr) { (c), (s), false, opt_select, OPT_SEL(T, TYPE_CHECK(T*, ptr), value), "\t" descr }
+#define OPTL_SUBOPT(c, s, argname, descr, NR, opts) OPTL_ARG(c, s, opt_subopt, struct opt_subopt_s, OPT_SUB(NR, opts), argname, descr)
extern void cmdline(int* argc, char* argv[], int min_args, int max_args, const char* usage_str, const char* help_str, int n, const struct opt_s opts[n]);
|
config_tools: bugfix for saving all enum values
fix the issue that saves all enum values are saved in scenario xml file
if user doesn't select any value in configurator. | @@ -137,8 +137,8 @@ export default {
this.defaultVal = []
}
this.defaultVal.push({
- "use_type": this.ConsoleUseType,
- "backend_type": this.ConsoleBackendType,
+ "use_type": "",
+ "backend_type": "",
"output_file_path": "",
"sock_file_path": "",
"tty_device_path": "",
|
Fix memleak in test/provider_test.c
This memory leak is triggered when configuring with 'no-legacy' | @@ -191,12 +191,15 @@ static int test_builtin_provider_with_child(void)
* In this case we assume we've been built with "no-legacy" and skip
* this test (there is no OPENSSL_NO_LEGACY)
*/
+ OSSL_LIB_CTX_free(libctx);
return 1;
}
if (!TEST_true(OSSL_PROVIDER_add_builtin(libctx, name,
- PROVIDER_INIT_FUNCTION_NAME)))
+ PROVIDER_INIT_FUNCTION_NAME))) {
+ OSSL_LIB_CTX_free(libctx);
return 0;
+ }
/* test_provider will free libctx and unload legacy as part of the test */
return test_provider(&libctx, name, legacy);
|
Fix Fix tabspace | @@ -263,7 +263,7 @@ PPH_STRING PhGetGroupAttributesString(
else
{
if (Attributes & SE_GROUP_ENABLED_BY_DEFAULT)
- string = PhCreateString(L"Disabled (modified");
+ string = PhCreateString(L"Disabled (modified)");
else
string = PhCreateString(L"Disabled");
}
@@ -419,9 +419,7 @@ VOID PhpUpdateSidsFromTokenGroups(
{
PPHP_TOKEN_PAGE_LISTVIEW_ITEM lvitem;
- lvitem = PhAllocate(sizeof(PHP_TOKEN_PAGE_LISTVIEW_ITEM));
- memset(lvitem, 0, sizeof(PHP_TOKEN_PAGE_LISTVIEW_ITEM));
-
+ lvitem = PhAllocateZero(sizeof(PHP_TOKEN_PAGE_LISTVIEW_ITEM));
lvitem->IsTokenGroupEntry = TRUE;
lvitem->TokenGroup = &Groups->Groups[i];
|
Update yfm for ya tool to 2.10.4 | },
"yfm": {
"formula": {
- "sandbox_id": 618755316,
+ "sandbox_id": 621597385,
"match": "yfm"
},
"executable": {
|
CMake: Set luajit EXCLUDE_FROM_ALL;
This prints a warning but it's nice to not build the luajit executable.
Ideally the target would not be created at all but the CMakeLists we
are using does not expose this as an option.
This is congruent with the vanilla Lua build options. | @@ -119,6 +119,7 @@ if(LOVR_USE_LUAJIT AND NOT EMSCRIPTEN)
set(LOVR_LUA ${LUAJIT_LIBRARIES})
else()
add_subdirectory(deps/luajit luajit)
+ set_target_properties(luajit PROPERTIES EXCLUDE_FROM_ALL 1)
include_directories(deps/luajit/src ${CMAKE_BINARY_DIR}/luajit)
set(LOVR_LUA libluajit)
endif()
|
Update: less motorbabbling, if it's too extreme new ops are called before relevant consequences can be seen, making it harder for the system to see the right relationships | //Truth expectation needed for executions
#define DECISION_THRESHOLD_INITIAL 0.501
//Motor babbling chance
-#define MOTOR_BABBLING_CHANCE_INITIAL 0.2
+#define MOTOR_BABBLING_CHANCE_INITIAL 0.1
//Decisions above the following threshold will suppress babbling actions
#define MOTOR_BABBLING_SUPPRESSION_THRESHOLD 0.6
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.