message
stringlengths
6
474
diff
stringlengths
8
5.22k
Remove unneeded call to `lv_obj_set_pos`
@@ -335,10 +335,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy) /*Set the same coordinates for non screen objects*/ if(lv_obj_get_parent(copy) != NULL && parent != NULL) { lv_obj_set_pos(new_obj, lv_obj_get_x(copy), lv_obj_get_y(copy)); - } else { - lv_obj_set_pos(new_obj, 0, 0); } - } /*Send a signal to the parent to notify it about the new child*/
Update x86 HAL for timestamp
@@ -543,7 +543,7 @@ void LuosHAL_Reboot(void) ******************************************************************************/ uint64_t LuosHAL_GetTimestamp(void) { - return 0; + return (LuosHAL_GetSystick() * 1000); } /******************************************************************************
vendoring github.com/soniah/gosnmp
@@ -385,6 +385,9 @@ ALLOW .* -> vendor/github.com/siddontang/go-mysql/mysql # CONTRIB-1656 golang sftp server library ALLOW .* -> vendor/github.com/pkg/sftp +# CONTRIB-1670 +ALLOW .* -> vendor/github.com/soniah/gosnmp + # # Temporary exceptions. #
Disable depth mask when drawing text;
@@ -872,7 +872,9 @@ void lovrGraphicsPrint(const char* str, mat4 transform, float wrap, HorizontalAl lovrGraphicsTranslate(MATRIX_MODEL, 0, offsety, 0); lovrGraphicsBindTexture(font->texture); lovrGraphicsSetDefaultShader(SHADER_FONT); + glDepthMask(GL_FALSE); lovrGraphicsDrawPrimitive(GL_TRIANGLES, 0, 1, 0); + glDepthMask(GL_TRUE); lovrGraphicsPop(); }
some small update.
@@ -2162,11 +2162,10 @@ static inline int op_method( mrbc_vm *vm, mrbc_value *regs ) { FETCH_BB(); - mrbc_decref(&regs[a]); - mrbc_value val = mrbc_proc_new( vm, vm->pc_irep->reps[b] ); if( !val.proc ) return -1; // ENOMEM + mrbc_decref(&regs[a]); regs[a] = val; return 0; @@ -2210,14 +2209,14 @@ static inline int op_class( mrbc_vm *vm, mrbc_value *regs ) FETCH_BB(); const char *sym_name = mrbc_get_irep_symbol(vm, b); - mrbc_class *super = (regs[a+1].tt == MRBC_TT_CLASS) ? regs[a+1].cls : mrbc_class_object; - + mrbc_class *super = (regs[a+1].tt == MRBC_TT_CLASS) ? regs[a+1].cls : 0; mrbc_class *cls = mrbc_define_class(vm, sym_name, super); + if( !cls ) return -1; // ENOMEM - mrbc_value ret = {.tt = MRBC_TT_CLASS}; - ret.cls = cls; - - regs[a] = ret; + // (note) + // regs[a] was set to NIL by compiler. So, no need to release regs[a]. + regs[a].tt = MRBC_TT_CLASS; + regs[a].cls = cls; return 0; }
network: use flb_socket_error() for socket validation
@@ -309,7 +309,6 @@ static int net_connect_async(int fd, uint32_t mask; char so_error_buf[256]; char *str; - socklen_t len = sizeof(error); struct flb_upstream *u = u_conn->u; /* connect(2) */ @@ -367,11 +366,7 @@ static int net_connect_async(int fd, /* Check the connection status */ if (mask & MK_EVENT_WRITE) { - ret = getsockopt(u_conn->fd, SOL_SOCKET, SO_ERROR, &error, &len); - if (ret == -1) { - flb_error("[io] could not validate socket status"); - return -1; - } + error = flb_socket_error(u_conn->fd); /* Check the exception */ if (error != 0) {
Controller: fixed cleaning up of control socket file in some cases. Previously, the unix domain control socket file might have been left in the file system after a failed nxt_listen_socket_create() call.
@@ -48,7 +48,7 @@ nxt_listen_socket_create(nxt_task_t *task, nxt_listen_socket_t *ls) s = nxt_socket_create(task, family, sa->type, 0, ls->flags); if (s == -1) { - goto socket_fail; + goto fail; } if (nxt_socket_setsockopt(task, s, SOL_SOCKET, SO_REUSEADDR, 1) != NXT_OK) { @@ -95,7 +95,7 @@ nxt_listen_socket_create(nxt_task_t *task, nxt_listen_socket_t *ls) access = (S_IRUSR | S_IWUSR); if (nxt_file_set_access(name, access) != NXT_OK) { - goto fail; + goto listen_fail; } } @@ -106,7 +106,7 @@ nxt_listen_socket_create(nxt_task_t *task, nxt_listen_socket_t *ls) if (listen(s, ls->backlog) != 0) { nxt_alert(task, "listen(%d, %d) failed %E", s, ls->backlog, nxt_socket_errno); - goto fail; + goto listen_fail; } ls->socket = s; @@ -114,11 +114,25 @@ nxt_listen_socket_create(nxt_task_t *task, nxt_listen_socket_t *ls) return NXT_OK; +listen_fail: + +#if (NXT_HAVE_UNIX_DOMAIN) + + if (family == AF_UNIX) { + nxt_file_name_t *name; + + name = (nxt_file_name_t *) sa->u.sockaddr_un.sun_path; + + (void) nxt_file_delete(name); + } + +#endif + fail: + if (s != -1) { nxt_socket_close(task, s); - -socket_fail: + } thr->log = old;
Upgrade versions of flex and bison
set -xe + +# We use flex and bison + export LEX=flex export LEX_OUT=gribl.c $LEX -o gribl.c gribl.l @@ -7,6 +10,7 @@ sed 's/fgetc/getc/g' < grib_lex1.c > grib_lex.c rm -f grib_lex1.c rm -f $LEX_OUT +# This invokes bison yacc -v -d griby.y sed 's/yy/grib_yy/g' < y.tab.c > grib_yacc1.c sed 's/fgetc/getc/g' < grib_yacc1.c > grib_yacc.c
can be static so why not :p
@@ -694,7 +694,7 @@ public class TMX Collections.sort(objects, new ObjectComparator()); } - private boolean addField(String objectName, Map<String, TField> fields, TField field) + private static boolean addField(String objectName, Map<String, TField> fields, TField field) { if (fields.containsKey(field.name)) {
ipsec: fix IKEv2 crash when rsa cert is used for authentication Cause: EVP_MD_CTX object used but not initialized.
@@ -673,6 +673,7 @@ ikev2_verify_sign (EVP_PKEY * pkey, u8 * sigbuf, u8 * data) EVP_MD_CTX *md_ctx = EVP_MD_CTX_new (); #else EVP_MD_CTX md_ctx; + EVP_MD_CTX_init (&md_ctx); #endif #if OPENSSL_VERSION_NUMBER >= 0x10100000L
Reword Ctrl+x description Pressing Ctrl+x resizes the window to remove black borders, "optimal" is not well-defined.
@@ -58,7 +58,7 @@ static void usage(const char *arg0) { " resize window to 1:1 (pixel-perfect)\n" "\n" " Ctrl+x\n" - " resize window to optimal size (remove black borders)\n" + " resize window to remove black borders\n" "\n" " Ctrl+h\n" " Home\n"
[bsp][mb9bf500r] update scons config: disable IAR support.
@@ -18,8 +18,10 @@ elif CROSS_TOOL == 'keil': PLATFORM = 'armcc' EXEC_PATH = 'C:/Keil' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation' + print('================ERROR============================') + print('Not support iar yet!') + print('=================================================') + exit(0) if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH')
mbedtls_x509_sig_alg_gets(): remove md dependency
@@ -131,6 +131,48 @@ int mbedtls_x509_get_alg( unsigned char **p, const unsigned char *end, return( 0 ); } +/* + * Convert md type to string + */ +static inline const char* md_type_to_string( mbedtls_md_type_t md_alg ) +{ + switch( md_alg ) + { +#if defined(MBEDTLS_MD5_C) + case MBEDTLS_MD_MD5: + return( "MD5" ); +#endif +#if defined(MBEDTLS_SHA1_C) + case MBEDTLS_MD_SHA1: + return( "SHA1" ); +#endif +#if defined(MBEDTLS_SHA224_C) + case MBEDTLS_MD_SHA224: + return( "SHA224" ); +#endif +#if defined(MBEDTLS_SHA256_C) + case MBEDTLS_MD_SHA256: + return( "SHA256" ); +#endif +#if defined(MBEDTLS_SHA384_C) + case MBEDTLS_MD_SHA384: + return( "SHA384" ); +#endif +#if defined(MBEDTLS_SHA512_C) + case MBEDTLS_MD_SHA512: + return( "SHA512" ); +#endif +#if defined(MBEDTLS_RIPEMD160_C) + case MBEDTLS_MD_RIPEMD160: + return( "RIPEMD160" ); +#endif + case MBEDTLS_MD_NONE: + return( NULL ); + default: + return( NULL ); + } +} + #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) /* * HashAlgorithm ::= AlgorithmIdentifier @@ -864,16 +906,15 @@ int mbedtls_x509_sig_alg_gets( char *buf, size_t size, const mbedtls_x509_buf *s if( pk_alg == MBEDTLS_PK_RSASSA_PSS ) { const mbedtls_pk_rsassa_pss_options *pss_opts; - const mbedtls_md_info_t *md_info, *mgf_md_info; pss_opts = (const mbedtls_pk_rsassa_pss_options *) sig_opts; - md_info = mbedtls_md_info_from_type( md_alg ); - mgf_md_info = mbedtls_md_info_from_type( pss_opts->mgf1_hash_id ); + const char *name = md_type_to_string ( md_alg ); + const char *mgf_name = md_type_to_string ( pss_opts->mgf1_hash_id ); ret = mbedtls_snprintf( p, n, " (%s, MGF1-%s, 0x%02X)", - md_info ? mbedtls_md_get_name( md_info ) : "???", - mgf_md_info ? mbedtls_md_get_name( mgf_md_info ) : "???", + name ? name : "???", + mgf_name ? mgf_name : "???", (unsigned int) pss_opts->expected_salt_len ); MBEDTLS_X509_SAFE_SNPRINTF; }
include/driver/accel_bma2x2_public.h: Format with clang-format BRANCH=none TEST=none
@@ -44,7 +44,6 @@ extern const struct accelgyro_drv bma2x2_accel_drv; * other sensors are active. */ #define BMA255_ACCEL_MIN_FREQ 7810 -#define BMA255_ACCEL_MAX_FREQ \ - MOTION_MAX_SENSOR_FREQUENCY(125000, 15625) +#define BMA255_ACCEL_MAX_FREQ MOTION_MAX_SENSOR_FREQUENCY(125000, 15625) #endif /* CROS_EC_DRIVER_ACCEL_BMA2x2_PUBLIC_H */
[Kernel] fix the delay_until issue
@@ -569,7 +569,7 @@ rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick) if (rt_tick_get() - *tick < inc_tick) { - *tick = rt_tick_get() - *tick + inc_tick; + *tick = *tick + inc_tick - rt_tick_get(); /* suspend thread */ rt_thread_suspend(thread);
vere: implements -x (exit immediately after boot)
@@ -565,6 +565,14 @@ _fork_into_background_process() exit(WEXITSTATUS(status)); } +/* _stop_on_boot_completed_cb(): exit gracefully after boot is complete +*/ +static void +_stop_on_boot_completed_cb() +{ + u3_pier_exit(u3_pier_stub()); +} + c3_i main(c3_i argc, c3_c** argv) @@ -596,6 +604,10 @@ main(c3_i argc, return 0; } + if ( c3y == u3_Host.ops_u.tex ) { + u3_Host.bot_f = _stop_on_boot_completed_cb; + } + #if 0 if ( 0 == getuid() ) { chroot(u3_Host.dir_c);
[build] fix c_opts problem
@@ -85,7 +85,7 @@ define BUILD_C_RULE ifeq ($(COMPILER),) -include $(OUTPUT_DIR)/Modules/$(call GET_BARE_LOCATION,$(1))$(2:.c=.d) endif -$(OUTPUT_DIR)/Modules/$(call GET_BARE_LOCATION,$(1))$(2:.c=.o): $(strip $($(1)_LOCATION))$(2) $(CONFIG_FILE) $$(dir $(OUTPUT_DIR)/Modules/$(call GET_BARE_LOCATION,$(1))$(2)).d $(RESOURCES_DEPENDENCY) $(PROCESS_PRECOMPILED_FILES) | $(EXTRA_PRE_BUILD_TARGETS) +$(OUTPUT_DIR)/Modules/$(call GET_BARE_LOCATION,$(1))$(2:.c=.o): $(strip $($(1)_LOCATION))$(2) $(CONFIG_FILE) $$(dir $(OUTPUT_DIR)/Modules/$(call GET_BARE_LOCATION,$(1))$(2)).d $(RESOURCES_DEPENDENCY) $(LIBS_DIR)/$(1).c_opts $(PROCESS_PRECOMPILED_FILES) | $(EXTRA_PRE_BUILD_TARGETS) $$(if $($(1)_START_PRINT),,$(eval $(1)_START_PRINT:=1) $(QUIET)$(ECHO) Compiling $(1) ) $(QUIET)$(CC) $($(1)_C_OPTS) -D__FILENAME__='"$$(notdir $$<)"' $(call COMPILER_SPECIFIC_DEPS_FILE,$(OUTPUT_DIR)/Modules/$(call GET_BARE_LOCATION,$(1))$(2:.c=.d)) -o $$@ $$< $(COMPILER_SPECIFIC_STDOUT_REDIRECT) endef @@ -160,7 +160,7 @@ $(LIBS_DIR)/$(1).c_opts: $($(1)_PRE_BUILD_TARGETS) $(CONFIG_FILE) | $(LIBS_DIR) $(eval C_OPTS_FILE := $($(1)_C_OPTS) ) $(if $(IDE_IAR_FLAG),$(eval C_OPTS_FILE:=$(C_OPTS_IAR)),) $(if $(IDE_KEIL_FLAG),$(eval C_OPTS_FILE:=$(C_OPTS_KEIL)),) - $$(file >$$@, $(C_OPTS_FILE) ) + $$(call WRITE_FILE_CREATE, $$@, $(C_OPTS_FILE)) $(LIBS_DIR)/$(1).cpp_opts: $($(1)_PRE_BUILD_TARGETS) $(CONFIG_FILE) | $(LIBS_DIR) $(eval $(1)_CPP_OPTS:=$(COMPILER_SPECIFIC_COMP_ONLY_FLAG) $(COMPILER_SPECIFIC_DEPS_FLAG) $($(1)_CXXFLAGS) $($(1)_INCLUDES) $($(1)_DEFINES) $(AOS_SDK_INCLUDES) $(AOS_SDK_DEFINES))
extmod/modbuiltins/Control: add stall_tolerances
@@ -129,11 +129,43 @@ STATIC mp_obj_t builtins_Control_target_tolerances(size_t n_args, const mp_obj_t } STATIC MP_DEFINE_CONST_FUN_OBJ_KW(builtins_Control_target_tolerances_obj, 0, builtins_Control_target_tolerances); +// pybricks.builtins.Control.stall_tolerances +STATIC mp_obj_t builtins_Control_stall_tolerances(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + + PB_PARSE_ARGS_METHOD(n_args, pos_args, kw_args, + builtins_Control_obj_t, self, + PB_ARG_DEFAULT_NONE(speed), + PB_ARG_DEFAULT_NONE(time) + ); + + // Read current values + int32_t _speed, _time; + pbio_control_settings_get_stall_tolerances(&self->control->settings, &_speed, &_time); + + // If all given values are none, return current values + if (speed == mp_const_none && time == mp_const_none) { + mp_obj_t ret[2]; + ret[0] = mp_obj_new_int(_speed); + ret[1] = mp_obj_new_int(_time); + return mp_obj_new_tuple(2, ret); + } + + // Set user settings + _speed = pb_obj_get_default_int(speed, _speed); + _time = pb_obj_get_default_int(time, _time); + + pbio_control_settings_set_stall_tolerances(&self->control->settings, _speed, _time); + + return mp_const_none; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(builtins_Control_stall_tolerances_obj, 0, builtins_Control_stall_tolerances); + // dir(pybricks.builtins.Control) STATIC const mp_rom_map_elem_t builtins_Control_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_limits ), MP_ROM_PTR(&builtins_Control_limits_obj ) }, { MP_ROM_QSTR(MP_QSTR_pid ), MP_ROM_PTR(&builtins_Control_pid_obj ) }, { MP_ROM_QSTR(MP_QSTR_target_tolerances), MP_ROM_PTR(&builtins_Control_target_tolerances_obj) }, + { MP_ROM_QSTR(MP_QSTR_stall_tolerances), MP_ROM_PTR(&builtins_Control_stall_tolerances_obj ) }, }; STATIC MP_DEFINE_CONST_DICT(builtins_Control_locals_dict, builtins_Control_locals_dict_table);
Don't send Hellos and Updates to new neighbours. This slows down initial convergence, but avoids a broadcast burst at boot. Thanks to Teco Boot for pointing this out.
@@ -183,23 +183,6 @@ update_neighbour(struct neighbour *neigh, struct hello_history *hist, rc = 1; } - if(unicast) - return rc; - - /* Make sure to give neighbours some feedback early after association */ - if((hist->reach & 0xBF00) == 0x8000) { - /* A new neighbour */ - send_hello(neigh->ifp); - } else { - /* Don't send hellos, in order to avoid a positive feedback loop. */ - int a = (hist->reach & 0xC000); - int b = (hist->reach & 0x3000); - if((a == 0xC000 && b == 0) || (a == 0 && b == 0x3000)) { - /* Reachability is either 1100 or 0011 */ - send_self_update(neigh->ifp); - } - } - return rc; }
Bump firmware version to 0x262b0500 fix stability issues from 0x26240500..0x26290500
@@ -71,7 +71,7 @@ DEFINES += GIT_COMMMIT=\\\"$$GIT_COMMIT\\\" \ # Minimum version of the RaspBee firmware # which shall be used in order to support all features for this software release (case sensitive) DEFINES += GW_AUTO_UPDATE_FW_VERSION=0x260b0500 -DEFINES += GW_MIN_RPI_FW_VERSION=0x26280500 +DEFINES += GW_MIN_RPI_FW_VERSION=0x262b0500 # Minimum version of the deRFusb23E0X firmware # which shall be used in order to support all features for this software release
Make sure that the flags variable is initialized.
@@ -170,7 +170,8 @@ create_llao(uint8_t *llao, uint8_t type) { static void ns_input(void) { - uint8_t flags; + uint8_t flags = 0; + LOG_INFO("Received NS from "); LOG_INFO_6ADDR(&UIP_IP_BUF->srcipaddr); LOG_INFO_(" to ");
Add --strict-timing as a commandline option
@@ -41,6 +41,10 @@ static void usage(void) { " Set MIDI to be sent via OSC formatted for Plogue Bidule.\n" " The path argument is the path of the Plogue OSC MIDI device.\n" " Example: /OSC_MIDI_0/MIDI\n" + "\n" + " --strict-timing\n" + " Reduce the timing jitter of outgoing MIDI and OSC messages.\n" + " Uses more CPU time.\n" ); // clang-format on } @@ -1705,6 +1709,7 @@ enum { Argopt_osc_server, Argopt_osc_port, Argopt_osc_midi_bidule, + Argopt_strict_timing, }; int main(int argc, char** argv) { @@ -1714,11 +1719,13 @@ int main(int argc, char** argv) { {"osc-server", required_argument, 0, Argopt_osc_server}, {"osc-port", required_argument, 0, Argopt_osc_port}, {"osc-midi-bidule", required_argument, 0, Argopt_osc_midi_bidule}, + {"strict-timing", no_argument, 0, Argopt_strict_timing}, {NULL, 0, NULL, 0}}; char* input_file = NULL; int margin_thickness = 2; char const* osc_hostname = NULL; char const* osc_port = NULL; + bool strict_timing = false; Midi_mode midi_mode; midi_mode_init(&midi_mode); for (;;) { @@ -1748,6 +1755,9 @@ int main(int argc, char** argv) { case Argopt_osc_midi_bidule: { midi_mode_set_osc_bidule(&midi_mode, optarg); } break; + case Argopt_strict_timing: { + strict_timing = true; + } break; case '?': usage(); return 1; @@ -1905,7 +1915,7 @@ int main(int argc, char** argv) { doupdate(); double secs_to_d = ged_secs_to_deadline(&ged_state); int new_timeout; -#if 1 + if (strict_timing) { if (secs_to_d < ms_to_sec(0.5)) { new_timeout = 0; } else if (secs_to_d < ms_to_sec(1.5)) { @@ -1933,7 +1943,7 @@ int main(int argc, char** argv) { } else { new_timeout = 50; } -#else + } else { if (secs_to_d < ms_to_sec(0.5)) { new_timeout = 0; } else if (secs_to_d < ms_to_sec(1.0)) { @@ -1953,7 +1963,7 @@ int main(int argc, char** argv) { } else { new_timeout = 50; } -#endif + } if (new_timeout != cur_timeout) { wtimeout(stdscr, new_timeout); cur_timeout = new_timeout;
toml: Added test case for table arrays/comments Added testcase for checking if the element root key of a table array is handled properly, when present in a write keyset (see
@@ -113,6 +113,7 @@ static void testWriteReadArrayInlineTableAlternating (void); static void testWriteReadTable (void); static void testWriteReadTableNested (void); static void testWriteReadTableArray (void); +static void testWriteReadTableArrayWithComments (void); static void testWriteReadSimpleTableInTableArray (void); static void testWriteReadSimpleTableBeforeTableArray (void); static void testWriteReadString (void); @@ -205,6 +206,7 @@ static void testWriteRead (void) testWriteReadArray (); testWriteReadArrayNested (); testWriteReadTableArray (); + testWriteReadTableArrayWithComments (); testWriteReadTable (); testWriteReadTableNested (); testWriteReadInlineTable (); @@ -734,6 +736,37 @@ static void testWriteReadTableArray (void) TEST_WR_FOOT; } +static void testWriteReadTableArrayWithComments (void) +{ + TEST_WR_HEAD; + + WRITE_KV ("key", "0"); + SET_ORDER (0); + DUP_EXPECTED; + + WRITE_KEY ("ta"); + SET_ORDER (1); + SET_TOML_TYPE ("tablearray"); + DUP_EXPECTED; + SET_ARRAY ("#0"); + + WRITE_KEY ("ta/#0"); + SET_COMMENT (0, " inline comment", 4); + SET_COMMENT (1, " top-most preceding comment", 0); + SET_COMMENT (2, " preceding comment", 0); + DUP_EXPECTED; + + WRITE_KV ("ta/#0/a", "1"); + SET_ORDER (2); + DUP_EXPECTED; + + WRITE_KV ("ta/#0/b", "2"); + SET_ORDER (3); + DUP_EXPECTED; + + TEST_WR_FOOT; +} + static void testWriteReadInteger (void) { TEST_WR_HEAD;
Use proper extension on the avx512 testcase filename The need to call it .tmp existed only when it was generated by a tmpfile call, and the "-x c" option to tell the compiler it is actually a C source is not universally supported (this broke the test with clang-cl at least)
@@ -109,10 +109,10 @@ else() endif() if (X86_64 OR X86) - file(WRITE ${PROJECT_BINARY_DIR}/avx512.tmp "#include <immintrin.h>\n\nint main(void){ __asm__ volatile(\"vbroadcastss -4 * 4(%rsi), %zmm2\"); }") -execute_process(COMMAND ${CMAKE_C_COMPILER} -march=skylake-avx512 -c -v -o ${PROJECT_BINARY_DIR}/avx512.o -x c ${PROJECT_BINARY_DIR}/avx512.tmp OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE NO_AVX512) + file(WRITE ${PROJECT_BINARY_DIR}/avx512.c "#include <immintrin.h>\n\nint main(void){ __asm__ volatile(\"vbroadcastss -4 * 4(%rsi), %zmm2\"); }") +execute_process(COMMAND ${CMAKE_C_COMPILER} -march=skylake-avx512 -c -v -o ${PROJECT_BINARY_DIR}/avx512.o ${PROJECT_BINARY_DIR}/avx512.c OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE NO_AVX512) if (NO_AVX512 EQUAL 1) set (CCOMMON_OPT "${CCOMMON_OPT} -DNO_AVX512") endif() - file(REMOVE "avx512.tmp" "avx512.o") + file(REMOVE "avx512.c" "avx512.o") endif()
rtdl: suppress noisy logs in dlapi_*
static constexpr bool logEntryExit = false; static constexpr bool logStartup = false; +static constexpr bool logDlCalls = false; #ifndef MLIBC_STATIC_BUILD extern HIDDEN void *_GLOBAL_OFFSET_TABLE_[]; @@ -327,7 +328,7 @@ void *__dlapi_open(const char *file, int local) { // TODO: Thread-safety! auto rts = rtsCounter++; if(local) - mlibc::infoLogger() << "\e[31mrtdl: RTLD_LOCAL is not supported properly\e[39m" + mlibc::infoLogger() << "\e[31mrtdl: RTLD_LOCAL " << file << " is not supported properly\e[39m" << frg::endlog; if(!file) @@ -383,12 +384,16 @@ void *__dlapi_open(const char *file, int local) { extern "C" [[ gnu::visibility("default") ]] void *__dlapi_resolve(void *handle, const char *string) { - mlibc::infoLogger() << "rtdl: __dlapi_resolve(" << string << ")" << frg::endlog; + if (logDlCalls) + mlibc::infoLogger() << "rtdl: __dlapi_resolve(" << handle << ", " << string << ")" << frg::endlog; - __ensure(handle != reinterpret_cast<void *>(-1)); + __ensure(handle != RTLD_NEXT); frg::optional<ObjectSymbol> target; - if(handle) { + + if (handle == RTLD_DEFAULT) { + target = Scope::resolveWholeScope(globalScope.get(), string, 0); + } else { // POSIX does not unambiguously state how dlsym() is supposed to work; it just // states that "The symbol resolution algorithm used shall be dependency order // as described in dlopen()". @@ -428,12 +433,12 @@ void *__dlapi_resolve(void *handle, const char *string) { queue.push_back(dep); } } - }else{ - target = Scope::resolveWholeScope(globalScope.get(), string, 0); } if (!target) { + if (logDlCalls) mlibc::infoLogger() << "rtdl: could not resolve \"" << string << "\"" << frg::endlog; + lastError = "Cannot resolve requested symbol"; return nullptr; } @@ -449,6 +454,7 @@ struct __dlapi_symbol { extern "C" [[ gnu::visibility("default") ]] int __dlapi_reverse(const void *ptr, __dlapi_symbol *info) { + if (logDlCalls) mlibc::infoLogger() << "rtdl: __dlapi_reverse(" << ptr << ")" << frg::endlog; for(size_t i = 0; i < globalScope->_objects.size(); i++) { @@ -471,8 +477,10 @@ int __dlapi_reverse(const void *ptr, __dlapi_symbol *info) { ObjectSymbol cand{object, (Elf64_Sym *)(object->baseAddress + object->symbolTableOffset + i * sizeof(Elf64_Sym))}; if(eligible(cand) && cand.virtualAddress() == reinterpret_cast<uintptr_t>(ptr)) { + if (logDlCalls) mlibc::infoLogger() << "rtdl: Found symbol " << cand.getString() << " in object " << object->path << frg::endlog; + info->file = object->path.data(); info->base = reinterpret_cast<void *>(object->baseAddress); info->symbol = cand.getString(); @@ -504,7 +512,9 @@ int __dlapi_reverse(const void *ptr, __dlapi_symbol *info) { } } + if (logDlCalls) mlibc::infoLogger() << "rtdl: Could not find symbol in __dlapi_reverse()" << frg::endlog; + return -1; }
Restore the display of options with 'openssl version -a'
@@ -105,7 +105,8 @@ opthelp: dirty = version = 1; break; case OPT_A: - seed = cflags = version = date = platform = dir = engdir = 1; + seed = options = cflags = version = date = platform = dir = engdir + = 1; break; } }
missed an entry in cnmc/units
# Automatically generated by ./create_def.pl, do not edit -#2 metre dewpoint temperature -'K' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 6 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - } -#2 metre dewpoint temperature -'K' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 6 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - subCentre = 102 ; - } #Pressure (S) (not reduced) 'Pa' = { discipline = 0 ;
fix a comment in t/Util.pm
@@ -598,7 +598,7 @@ package H2ologTracer { kill("TERM", $tracer_pid) or warn("failed to kill h2olog[$tracer_pid]: $!"); } else { - Test::More::diag($_) while <$errfh>; # the case when BPF program doesn't compile + Test::More::diag($_) while <$errfh>; # in case h2olog shows error messages, e.g. BPF program doesn't compile Test::More::diag "h2olog[$tracer_pid] has already exited"; } });
ctype: fix example
@@ -31,32 +31,32 @@ be of any non-zero length, `wchar` must have exactly length 1. ```sh #Mount the plugin -sudo kdb mount typetest.dump user/tests/type dump type +sudo kdb mount typetest.dump user/tests/ctype dump ctype #Store a character value -kdb set user/tests/type/key a +kdb set user/tests/ctype/key a #Only allow character values -kdb setmeta user/tests/type/key check/type char -kdb get user/tests/type/key +kdb setmeta user/tests/ctype/key check/type char +kdb get user/tests/ctype/key #> a #If we store another character everything works fine -kdb set user/tests/type/key b -kdb get user/tests/type/key +kdb set user/tests/ctype/key b +kdb get user/tests/ctype/key #> b #If we try to store a string Elektra will not change the value -kdb set user/tests/type/key 'Not a char' +kdb set user/tests/ctype/key 'Not a char' #STDERR :.*Description : could not type check value of key.* #ERROR : 52 #RET : 5 -kdb get user/tests/type/key +kdb get user/tests/ctype/key #> b #Undo modifications to the database -kdb rm user/tests/type/key -sudo kdb umount user/tests/type +kdb rm user/tests/ctype/key +sudo kdb umount user/tests/ctype ```
h2olog: remove unnecessary function call
@@ -84,16 +84,14 @@ int trace_send_resp(struct pt_regs *ctx) { } """ -def print_req_line(line): +def handle_req_line(cpu, data, size): + line = b["rxbuf"].event(data) if line.http_version: v = "HTTP/%d.%d" % (line.http_version / 256, line.http_version % 256) print("%u %u RxProtocol %s" % (line.conn_id, line.req_id, v)) else: print("%u %u RxHeader %s %s" % (line.conn_id, line.req_id, line.header_name, line.header_value)) -def handle_req_line(cpu, data, size): - print_req_line(b["rxbuf"].event(data)) - def handle_resp_line(cpu, data, size): line = b["txbuf"].event(data) print("%u %u TxStatus %d" % (line.conn_id, line.req_id, line.http_status))
driver/temp_sensor/adt7481.h: Format with clang-format BRANCH=none TEST=none
#define ADT7481_CONV_CHAN_SEL_REMOTE2 (3 << 4) #define ADT7481_CONV_AVERAGING_L BIT(7) - /* Status1 register bits */ #define ADT7481_STATUS1_LOCAL_THERM_ALARM BIT(0) #define ADT7481_STATUS1_REMOTE1_THERM_ALARM BIT(1) #define ADT7481_CONSEC_EN_SDA_TIMEOUT BIT(6) #define ADT7481_CONSEC_MASK_LOCAL_ALERT BIT(7) - /* Limits */ #define ADT7481_HYSTERESIS_HIGH_LIMIT 255 #define ADT7481_HYSTERESIS_LOW_LIMIT 0
s5j/sflash: do not clear already cleared s5j_sflash_disable_wp() is trying to clear a bit that is already cleared.
@@ -129,9 +129,6 @@ static void s5j_sflash_disable_wp(void) sfcon = getreg32(rSF_CON); } while (sfcon & (1 << 31)); - sfcon = getreg32(rSF_CON) & ~(1 << 31); - putreg32(sfcon, rSF_CON); - sfcon = getreg32(rSF_CON) | (1 << 31); putreg32(sfcon, rSF_CON); }
Don't hang when a test fails.
++ expect-ford-empty |= [ford-gate=_ford-gate ship=@p] ^- tang + :: =/ ford *ford-gate - %- expect-eq !> - :- *ford-state:ford =/ state (~(got by state-by-ship.ax.+>+<.ford) ship) - state(cache cache:*ford-state:ford) + =. compiler-cache.state compiler-cache:*ford-state:ford + :: + ?: =(*ford-state:ford state) + ~ + :: + =/ build-state=(list tank) + %+ turn ~(tap in ~(key by builds.state)) + |= build=build:ford + [%leaf (build-to-tape:ford build)] + :: + =/ braces [[' ' ' ' ~] ['{' ~] ['}' ~]] + :: + :~ [%leaf "failed to cleanup"] + [%leaf "builds.state:"] + [%rose braces build-state] + == --
CullWorker updates, better handling of poles
#include "utils/Log.h" #include "utils/ThreadUtils.h" +#include <algorithm> + namespace carto { CullWorker::CullWorker() : @@ -158,6 +160,30 @@ namespace carto { } projectionSurface->tesselateSegment(mapPoses[i], mapPoses[(i + 1) % 4], envelopePoses); } + + // Check for X coordinate wrapping. Do quick fix of the poles. + bool addPole1 = _viewState.getFrustum().inside(projectionSurface->calculatePosition(MapPos(0, -std::numeric_limits<double>::infinity()))); + bool addPole2 = _viewState.getFrustum().inside(projectionSurface->calculatePosition(MapPos(0, std::numeric_limits<double>::infinity()))); + if (addPole1 || addPole2) { + double minX = -Const::WORLD_SIZE * 0.5; + double maxX = Const::WORLD_SIZE * 0.5; + double minY = std::min_element(envelopePoses.begin(), envelopePoses.end(), [](const MapPos& p1, const MapPos& p2) { return p1.getY() < p2.getY(); })->getY(); + double maxY = std::max_element(envelopePoses.begin(), envelopePoses.end(), [](const MapPos& p1, const MapPos& p2) { return p1.getY() < p2.getY(); })->getY(); + if (addPole1) { + minY = -std::numeric_limits<double>::infinity(); + } + if (addPole2) { + maxY = std::numeric_limits<double>::infinity(); + } + + envelopePoses.clear(); + envelopePoses.emplace_back(minX, minY); + envelopePoses.emplace_back(minX, maxY); + envelopePoses.emplace_back(maxX, maxY); + envelopePoses.emplace_back(maxX, minY); + } + + // Check if poles are visible. We _envelope = MapEnvelope(envelopePoses); }
use atomic load for segment map
@@ -1392,7 +1392,7 @@ static void mi_segment_map_allocated_at(const mi_segment_t* segment) { size_t index = mi_segment_map_index_of(segment, &bitidx); mi_assert_internal(index < MI_SEGMENT_MAP_WSIZE); if (index==0) return; - uintptr_t mask = mi_segment_map[index]; + uintptr_t mask = mi_atomic_load_relaxed(&mi_segment_map[index]); uintptr_t newmask; do { newmask = (mask | ((uintptr_t)1 << bitidx)); @@ -1404,7 +1404,7 @@ static void mi_segment_map_freed_at(const mi_segment_t* segment) { size_t index = mi_segment_map_index_of(segment, &bitidx); mi_assert_internal(index < MI_SEGMENT_MAP_WSIZE); if (index == 0) return; - uintptr_t mask = mi_segment_map[index]; + uintptr_t mask = mi_atomic_load_relaxed(&mi_segment_map[index]); uintptr_t newmask; do { newmask = (mask & ~((uintptr_t)1 << bitidx)); @@ -1417,7 +1417,8 @@ static mi_segment_t* _mi_segment_of(const void* p) { size_t bitidx; size_t index = mi_segment_map_index_of(segment, &bitidx); // fast path: for any pointer to valid small/medium/large object or first MI_SEGMENT_SIZE in huge - if (mi_likely((mi_segment_map[index] & ((uintptr_t)1 << bitidx)) != 0)) { + const uintptr_t mask = mi_atomic_load_relaxed(&mi_segment_map[index]); + if (mi_likely((mask & ((uintptr_t)1 << bitidx)) != 0)) { return segment; // yes, allocated by us } if (index==0) return NULL; @@ -1427,16 +1428,17 @@ static mi_segment_t* _mi_segment_of(const void* p) { // note: we could maintain a lowest index to speed up the path for invalid pointers? size_t lobitidx; size_t loindex; - uintptr_t lobits = mi_segment_map[index] & (((uintptr_t)1 << bitidx) - 1); + uintptr_t lobits = mask & (((uintptr_t)1 << bitidx) - 1); if (lobits != 0) { loindex = index; lobitidx = _mi_bsr(lobits); } else { + uintptr_t lomask = mask; loindex = index - 1; - while (loindex > 0 && mi_segment_map[loindex] == 0) loindex--; + while (loindex > 0 && (lomask = mi_atomic_load_relaxed(&mi_segment_map[loindex])) == 0) loindex--; if (loindex==0) return NULL; - lobitidx = _mi_bsr(mi_segment_map[loindex]); + lobitidx = _mi_bsr(lomask); } // take difference as the addresses could be larger than the MAX_ADDRESS space. size_t diff = (((index - loindex) * (8*MI_INTPTR_SIZE)) + bitidx - lobitidx) * MI_SEGMENT_SIZE;
witherspoon: fix using integer as NULL sparse warning platforms/astbmc/witherspoon.c:557:28: warning: Using plain integer as NULL pointer
@@ -555,7 +555,7 @@ static void witherspoon_finalise_dt(bool is_reboot) * SCL/SDA don't return to the idle state fast enough. Disable * the port to squash the errors. */ - for (c = next_chip(0); c; c = next_chip(c)) { + for (c = next_chip(NULL); c; c = next_chip(c)) { bool detected = false; int i;
Coding: Extend usage section for Prettier
@@ -412,7 +412,19 @@ npm install --global [email protected] ##### Usage -If you want, you can format all Markdown files in the repository using the script [`reformat-markdown`](../scripts/reformat-markdown). +You can format all Markdown files in the repository using the script [`reformat-markdown`](../scripts/reformat-markdown): + +```sh +scripts/reformat-markdown +``` + +. To format only some files, please specify a list of filenames after the command: + +```sh +scripts/reformat-markdown doc/CODING.md # Reformat this file +``` + +. ### Doxygen Guidelines
disables some overly-restrictive json response parsing
?> ?=([%1 *] der) =/ aut=auth (~(got by aut.der) i) ?> ?=([%1 *] aut) - =/ bod=[typ=@t sas=@t url=purl tok=@t] - (challenge:grab (need (de-json:html q:(need r.rep)))) - ?> ?=(%pending sas.bod) + :: XX 204 assuming pending? + :: =/ bod=[typ=@t sas=@t url=purl tok=@t] + :: (challenge:grab (need (de-json:html q:(need r.rep)))) + :: ?> ?=(%pending sas.bod) =. sas.cal.aut %pend =. der der(aut (~(put by aut.der) i aut)) =. rod (~(put by rod) ider der) == :: %fin - =/ bod=[aut=(list purl) fin=purl exp=@t sas=@t] - (order:grab (need (de-json:html q:(need r.rep)))) + :: XX rep body missing authorizations + :: =/ bod=[aut=(list purl) fin=purl exp=@t sas=@t] + :: (order:grab (need (de-json:html q:(need r.rep)))) :: XX check status? (i don't think failures get here) abet:poll-order ::
Fix SceRtc syscall argument
@@ -265,20 +265,22 @@ int _sceRtcConvertUtcToLocalTime(const SceRtcTick *utc, SceRtcTick *localtime); * @param[out] datetime - The datetime string buffer * @param[in] utc - The UTC time tick pointer * @param[in] offset - A timezone offset. this value have to minute value + * @param[in] a4 - The Syscall validity buffer * * @return 0 on success, < 0 on error. */ -int _sceRtcFormatRFC2822(char *datetime, const SceRtcTick *utc, int offset); +int _sceRtcFormatRFC2822(char *datetime, const SceRtcTick *utc, int offset, SceUInt64 *a4); /** * Convert RFC2822 time string from UTC with localtime * * @param[out] datetime - The datetime string buffer * @param[in] utc - The UTC time tick pointer + * @param[in] a3 - The Syscall validity buffer * * @return 0 on success, < 0 on error. */ -int _sceRtcFormatRFC2822LocalTime(char *datetime, const SceRtcTick *utc); +int _sceRtcFormatRFC2822LocalTime(char *datetime, const SceRtcTick *utc, SceUInt64 *a3); /** * Convert RFC3339 time string from UTC @@ -286,20 +288,22 @@ int _sceRtcFormatRFC2822LocalTime(char *datetime, const SceRtcTick *utc); * @param[out] datetime - The datetime string buffer * @param[in] utc - The UTC time tick pointer * @param[in] offset - A timezone offset. this value have to minute value + * @param[in] a4 - The Syscall validity buffer * * @return 0 on success, < 0 on error. */ -int _sceRtcFormatRFC3339(char *datetime, const SceRtcTick *utc, int offset); +int _sceRtcFormatRFC3339(char *datetime, const SceRtcTick *utc, int offset, SceUInt64 *a4); /** * Convert RFC3339 time string from UTC with localtime * * @param[out] datetime - The datetime string buffer * @param[in] utc - The UTC time tick pointer + * @param[in] a3 - The Syscall validity buffer * * @return 0 on success, < 0 on error. */ -int _sceRtcFormatRFC3339LocalTime(char *datetime, const SceRtcTick *utc); +int _sceRtcFormatRFC3339LocalTime(char *datetime, const SceRtcTick *utc, SceUInt64 *a3); int _sceRtcGetCurrentAdNetworkTick(SceRtcTick *tick); int _sceRtcGetCurrentClock(SceDateTime *time, int time_zone);
pbdrv/ev3dev: correctly check whether a motor is able to coast This check sometimes incorrectly passed because it defaulted to trying to coast motor0. this fixes
@@ -18,7 +18,6 @@ typedef struct _motor_file_t { pbio_iodev_type_id_t id; bool coasting; int dir_number; - bool files_open; FILE *f_encoder_count; FILE *f_encoder_rate; FILE *f_duty; @@ -26,7 +25,7 @@ typedef struct _motor_file_t { motor_file_t motor_files[] = { [PORT_TO_IDX(PBDRV_CONFIG_FIRST_MOTOR_PORT) ... PORT_TO_IDX(PBDRV_CONFIG_LAST_MOTOR_PORT)]{ - .files_open = false + .dir_number = -1 } }; @@ -49,11 +48,11 @@ pbio_error_t sysfs_motor_command(pbio_port_t port, const char* command) { // Close files if they are open void close_files(pbio_port_t port){ int port_index = PORT_TO_IDX(port); - if (motor_files[port_index].files_open) { + if (motor_files[port_index].dir_number >= 0) { fclose(motor_files[port_index].f_encoder_count); fclose(motor_files[port_index].f_encoder_rate); fclose(motor_files[port_index].f_duty); - motor_files[port_index].files_open = false; + motor_files[port_index].dir_number = -1; } } @@ -119,8 +118,6 @@ pbio_error_t sysfs_motor_init(pbio_port_t port){ motor_files[port_index].f_duty = fopen(filepath, "w"); // Close tacho-motor directory when done closedir (dp); - // Files are opened - motor_files[port_index].files_open = true; // Return success return PBIO_SUCCESS; }
Edited the Enclosed by line
@@ -7,7 +7,7 @@ comment: "Hi there. </br> In this regard, please take note that: </br> - read the template thoroughly</br> - all given header lines (starting with ###) **must not be deleted** </br> - - everything enclosed by <!-- --> is intended to give you guidance and should be replaced by your input specific to the issue </br> + - everything enclosed by `<!-- -->` is intended to give you guidance and should be replaced by your input specific to the issue </br> - Listings regarding your environment must be filled out completely where applicable (bug reports and user questions).</br> - Not following the template or providing insufficient information can still implicate manual closure.</br> </br>
Add debugging output for when a clay ford build fails.
|= row=build-result:ford ^- (unit [cage cage]) :: + ?: ?=([%error *] row) + ~& [%clay-whole-build-failed message.row] + ~ + ?: ?=([%success [%error *] *] row) + ~& [%clay-first-failure message.head.row] + ~ + ?: ?=([%success [%success *] [%error *]] row) + ~& [%clay-second-failure message.tail.row] + ~ ?. ?=([%success [%success *] [%success *]] row) ~ `[(result-to-cage:ford head.row) (result-to-cage:ford tail.row)]
Fix button maps schema validation, missing LIDL in on/off commands
"enum": [ "ADD_SCENE", "VIEW_SCENE", "REMOVE_SCENE", "STORE_SCENE", "RECALL_SCENE", "IKEA_STEP_CT", "IKEA_MOVE_CT", "IKEA_STOP_CT" ] }, "onoff-commands": { - "enum": [ "ATTRIBUTE_REPORT", "OFF", "ON", "TOGGLE", "OFF_WITH_EFFECT", "ON_WITH_TIMED_OFF" ] + "enum": [ "ATTRIBUTE_REPORT", "OFF", "ON", "TOGGLE", "OFF_WITH_EFFECT", "ON_WITH_TIMED_OFF", "LIDL" ] }, "level-commands": { "enum": [ "MOVE_TO_LEVEL", "MOVE", "STEP", "STOP", "MOVE_TO_LEVEL_WITH_ON_OFF", "MOVE_WITH_ON_OFF", "STEP_WITH_ON_OFF", "STOP_WITH_ON_OFF" ]
ppc still needs gcc-7 for cuda compilations
@@ -99,13 +99,8 @@ function getgxx7orless(){ echo $_loc } -if [ "$AOMP_PROC" == "ppc64le" ] ; then - GCCLOC=`which gcc-8` - GXXLOC=`which g++-8` -else GCCLOC=$(getgcc7orless) GXXLOC=$(getgxx7orless) -fi if [ "$GCCLOC" == "" ] ; then echo "ERROR: NO ADEQUATE gcc" echo " Please install gcc-5 or gcc-7"
Avoid creating spurious non-suffixed c/zgemm_kernels Plain cgemm_kernel and zgemm_kernel are not used anywhere, only cgemm_kernel_b etc. Needlessly building them (without any define like NN, CN, etc.) just happened to work on most platforms, but not on arm64. See
@@ -125,10 +125,13 @@ function (build_core TARGET_CORE KDIR TSUFFIX KERNEL_DEFINITIONS) set(USE_TRMM true) endif () - foreach (float_type ${FLOAT_TYPES}) + foreach (float_type SINGLE DOUBLE) string(SUBSTRING ${float_type} 0 1 float_char) GenerateNamedObjects("${KERNELDIR}/${${float_char}GEMMKERNEL}" "" "gemm_kernel" false "" "" false ${float_type}) + endforeach() + foreach (float_type ${FLOAT_TYPES}) + string(SUBSTRING ${float_type} 0 1 float_char) if (${float_char}GEMMINCOPY) GenerateNamedObjects("${KERNELDIR}/${${float_char}GEMMINCOPY}" "${float_type}" "${${float_char}GEMMINCOPYOBJ}" false "" "" true ${float_type}) endif ()
Add read/write APIs to testcase driver Add read/write APIs to testcase driver so that UTC apps can open /dev/testcase to pass ioctls
****************************************************************************/ static int testdrv_ioctl(FAR struct file *filep, int cmd, unsigned long arg); - +static ssize_t testdrv_read(FAR struct file *filep, FAR char *buffer, size_t len); +static ssize_t testdrv_write(FAR struct file *filep, FAR const char *buffer, size_t len); /**************************************************************************** * Private Data ****************************************************************************/ @@ -38,8 +39,8 @@ static int testdrv_ioctl(FAR struct file *filep, int cmd, unsigned long arg); static const struct file_operations testdrv_fops = { 0, /* open */ 0, /* close */ - 0, /* read */ - 0, /* write */ + testdrv_read, /* read */ + testdrv_write, /* write */ 0, /* seek */ testdrv_ioctl /* ioctl */ #ifndef CONFIG_DISABLE_POLL @@ -86,6 +87,17 @@ static int testdrv_ioctl(FAR struct file *filep, int cmd, unsigned long arg) return ret; } + +static ssize_t testdrv_read(FAR struct file *filep, FAR char *buffer, size_t len) +{ + return 0; /* Return EOF */ +} + +static ssize_t testdrv_write(FAR struct file *filep, FAR const char *buffer, size_t len) +{ + return len; /* Say that everything was written */ +} + /**************************************************************************** * Public Functions ****************************************************************************/
Completions: Check whole `kdb` command for value
# -- Functions ----------------------------------------------------------------------------------------------------------------------------- function __input_includes -d 'Check if the current command buffer contains one of the given values' - for input in (commandline -opc) + for input in (commandline -op) if contains -- $input $argv return 0 end
quic: render missing attributes
@@ -519,6 +519,14 @@ def handle_quic_event(cpu, data, size): rv["token_preview"] = binascii.hexlify(rv["token_preview"]) elif line.type == "new_token_acked": rv["token_generation"] = getattr(line, "token_generation") + elif line.type == "streams_blocked_send": + for k in ["limit", "is_unidirectional"]: + rv[k] = getattr(line, k) + elif line.type == "streams_blocked_receive": + for k in ["limit", "is_unidirectional"]: + rv[k] = getattr(line, k) + elif line.type == "data_blocked_receive": + rv["off"] = getattr(line, "off") elif line.type == "stream_data_blocked_receive": for k in ["stream_id", "limit"]: rv[k] = getattr(line, k)
ci: ignore partition nearly full warning
@@ -14,3 +14,4 @@ crosstool_version_check\.cmake CryptographyDeprecationWarning Warning: \d+/\d+ app partitions are too small for binary CMake Deprecation Warning at main/lib/tinyxml2/CMakeLists\.txt:11 \(cmake_policy\) +The smallest .+ partition is nearly full \(\d+% free space left\)!
netutils/dhcpd: minor patch for handling exception cases This commit is the patch to handling exception cases - when abnormal interface name is coming from applications, dhcpd should not run - dhcpd_run always return OK, it is not good to handle operation of dhcpd in application
@@ -1538,7 +1538,7 @@ int dhcpd_run(void *arg) int sockfd; int nbytes; #if DHCPD_SELECT - int ret; + int ret = OK; fd_set sockfd_set; #endif ndbg("Started on %s\n", DHCPD_IFNAME); @@ -1547,6 +1547,14 @@ int dhcpd_run(void *arg) memset(&g_state, 0, sizeof(struct dhcpd_state_s)); + /* Initialize netif address (ip address, netmask, default gateway) */ + + if (dhcpd_netif_init(DHCPD_IFNAME) < 0) { + ndbg("Failed to initialize network interface %s\n", DHCPD_IFNAME); + ret = ERROR; + return ret; + } + /* Now loop indefinitely, reading packets from the DHCP server socket */ sockfd = -1; @@ -1554,10 +1562,6 @@ int dhcpd_run(void *arg) g_dhcpd_quit = 0; g_dhcpd_running = 1; - /* Initialize netif address (ip address, netmask, default gateway) */ - - dhcpd_netif_init(DHCPD_IFNAME); - while (!g_dhcpd_quit) { /* Create a socket to listen for requests from DHCP clients */ @@ -1567,6 +1571,7 @@ int dhcpd_run(void *arg) sockfd = dhcpd_openlistener(); if (sockfd < 0) { ndbg("Failed to create socket\n"); + ret = ERROR; break; } } @@ -1660,7 +1665,7 @@ int dhcpd_run(void *arg) dhcpd_netif_deinit(DHCPD_IFNAME); - return OK; + return ret; }
Fix Android build (add additional target_link_libraries for GLES3)
@@ -574,7 +574,7 @@ elseif(APPLE) elseif(EMSCRIPTEN) target_sources(lovr PRIVATE src/platform/web.c) elseif(ANDROID) - target_link_libraries(lovr log EGL) + target_link_libraries(lovr log EGL GLESv3) target_sourceS(lovr PRIVATE src/platform/linux.c src/platform/android.c src/platform/print_override.c) elseif(UNIX) target_sourceS(lovr PRIVATE src/platform/linux.c)
Add CIPSTO command for server to enable timeout on server connections
@@ -1249,14 +1249,27 @@ espi_process_sub_cmd(esp_msg_t* msg, uint8_t is_ok, uint8_t is_error, uint8_t is /* * Are we enabling server mode for some reason? */ - if (CMD_IS_DEF(ESP_CMD_TCPIP_CIPSERVER) && msg->msg.tcpip_server.port) { + if (CMD_IS_DEF(ESP_CMD_TCPIP_CIPSERVER)) { + if (msg->msg.tcpip_server.en) { if (CMD_IS_CUR(ESP_CMD_TCPIP_CIPSERVERMAXCONN)) { /* Since not all AT versions support CIPSERVERMAXCONN command, ignore result */ n_cmd = ESP_CMD_TCPIP_CIPSERVER; } else if (CMD_IS_CUR(ESP_CMD_TCPIP_CIPSERVER)) { if (is_ok) { esp.cb_server = msg->msg.tcpip_server.cb; /* Set server callback function */ + n_cmd = ESP_CMD_TCPIP_CIPSTO; + } + } else if (CMD_IS_CUR(ESP_CMD_TCPIP_CIPSTO)) { + if (!is_ok) { + is_ok = 1; + } + } } + if (n_cmd == ESP_CMD_IDLE) { /* Do we still have execution? */ + esp.cb.cb.server.status = is_ok ? espOK : espERR; + esp.cb.cb.server.en = msg->msg.tcpip_server.en; + esp.cb.cb.server.port = msg->msg.tcpip_server.port; + espi_send_cb(ESP_CB_SERVER); /* Send to upper layer */ } } @@ -1574,7 +1587,7 @@ espi_initiate_cmd(esp_msg_t* msg) { case ESP_CMD_TCPIP_CIPSERVER: { /* Enable or disable server */ ESP_AT_PORT_SEND_BEGIN(); /* Begin AT command string */ ESP_AT_PORT_SEND_STR("+CIPSERVER="); - if (msg->msg.tcpip_server.port) { /* Do we have valid port? */ + if (msg->msg.tcpip_server.en) { /* Do we want to enable server? */ ESP_AT_PORT_SEND_STR("1"); send_port(msg->msg.tcpip_server.port, 0, 1); } else { /* Disable server */
Add define for vaq strength parameter
@@ -1215,6 +1215,11 @@ static double pixel_var(kvz_pixel * const arr, const uint32_t len) { return var; } +// Vaq strength +#ifndef VAQ_STRENGTH +# define VAQ_STRENGTH 1.5 +#endif + static void encoder_state_init_new_frame(encoder_state_t * const state, kvz_picture* frame) { assert(state->type == ENCODER_STATE_TYPE_MAIN); @@ -1230,7 +1235,7 @@ static void encoder_state_init_new_frame(encoder_state_t * const state, kvz_pict // Variance adaptive quantization if (cfg->vaq) { - double d = 1.5; // Empirically decided constant. Affects delta-QP strength + double d = VAQ_STRENGTH; // Empirically decided constant. Affects delta-QP strength // Calculate frame pixel variance uint32_t len = state->tile->frame->width * state->tile->frame->height;
vere: manage memory properly in _fore_import
@@ -22,6 +22,17 @@ _fore_inject_bail(u3_ovum* egg_u, u3_noun lud) u3_ovum_free(egg_u); } +/* _fore_import_bail(): handle failure on arbitrary injection. +*/ +static void +_fore_import_bail(u3_ovum* egg_u, u3_noun lud) +{ + u3_auto_bail_slog(egg_u, lud); + u3l_log("pier: import failed\n"); + + u3_ovum_free(egg_u); +} + /* _fore_inject(): inject an arbitrary ovum from a jammed file at [pax_c]. */ static void @@ -76,15 +87,16 @@ _fore_import(u3_auto* car_u, c3_c* pax_c) { // With apologies u3_noun arc = u3ke_cue(u3m_file(pax_c)); - c3_c * b64_c = u3r_string(u3do("crip", u3do("en-base64:mimes:html", arc))); - c3_w siz = strlen(b64_c) + 120; + u3_noun b64 = u3do("crip", u3do("en-base64:mimes:html", arc)); + c3_c * b64_c = u3r_string(b64); - c3_c bod_c[siz]; - snprintf(bod_c, siz, + c3_w siz_w = strlen(b64_c) + 120; + c3_c * bod_c = (c3_c *) c3_malloc(siz_w); + snprintf(bod_c, siz_w, "{\"source\": {\"import-all\": {\"base64-jam\": \"%s\"}}, \ \"sink\": {\"stdout\": null}}", b64_c); - u3_noun dat = u3nt(u3_nul, u3i_word(strlen(bod_c)), u3i_string(bod_c)); + u3_noun dat = u3nt(u3_nul, u3i_word(strlen(bod_c)), u3i_string(bod_c)); u3_noun req = u3nt(c3n, u3nc(u3i_string("ipv4"), u3i_word(0x7f000001)), u3nq(u3i_string("POST"), u3i_string("/"), u3_nul, dat)); @@ -92,7 +104,11 @@ _fore_import(u3_auto* car_u, c3_c* pax_c) u3_noun cad = u3nc(u3i_string("request-local"), req); u3_auto_peer( u3_auto_plan(car_u, u3_ovum_init(0, c3__e, wir, cad)), - 0, 0, _fore_inject_bail); + 0, 0, _fore_import_bail); + + u3z(b64); + c3_free(b64_c); + c3_free(bod_c); } /* _fore_io_talk():
publish: vertically align 'edit' and 'delete'
@@ -51,12 +51,12 @@ export function Note(props: NoteProps & RouteComponentProps) { const editUrl = props.location.pathname + "/edit"; if (`~${window.ship}` === note?.author) { editPost = ( - <Box display="inline-block"> + <Box display="inline-block" verticalAlign='middle'> <Link to={editUrl}> - <Text color="green">Edit</Text> + <Text display='inline-block' color="green">Edit</Text> </Link> <Text - className="dib f9 red2 ml2 pointer" + display='inline-block' color="red" ml={2} onClick={deletePost}
Added ability to quit channel from rver
:: %unsubscribe: unsubscribes from an application path :: [%unsubscribe request-id=@ud subscription-id=@ud] + :: %delete: kills a channel + :: + [%delete ~] == :: channel-timeout: the delay before a channel should be reaped :: %. item %+ pe %unsubscribe (ot id+ni subscription+ni ~) + ?: =('delete' u.maybe-key) + `[%delete ~] :: if we reached this, we have an invalid action key. fail parsing. :: ~ // the functions will be called, and the outstanding poke will be // removed after calling the success or failure function. // + this.outstandingPokes = new Map(); // a registry of requestId to subscription functions. // disconnect function may be called exactly once. // this.outstandingSubscriptions = new Map(); + + this.deleteOnUnload(); + } + + deleteOnUnload() { + window.addEventListener('beforeunload', (event) => { + this.delete(); + }); } // sends a poke to an app on an urbit ship return id; } + // quit the channel + // + delete() { + var id = this.nextId(); + this.sendJSONToChannel({ + "id": id, + "action": "delete" + }, false); + } + // unsubscribe to a specific subscription // unsubscribe(subscriptionId) { // sends a JSON command command to the server. // - sendJSONToChannel(j) { + sendJSONToChannel(j, connectAgain = true) { var req = new XMLHttpRequest(); req.open("PUT", this.channelURL()); req.setRequestHeader("Content-Type", "application/json"); this.lastEventId = this.lastAcknowledgedEventId; } + if (connectAgain) { this.connectIfDisconnected(); } + } // connects to the EventSource if we are not currently connected // var obj = JSON.parse(e.data); if (obj.response == "poke") { var funcs = this.outstandingPokes.get(obj.id); - if (obj.hasOwnProperty("ok")) + if (obj.hasOwnProperty("ok")) { funcs["success"]() - else if (obj.hasOwnProperty("err")) + } else if (obj.hasOwnProperty("err")) { funcs["fail"](obj.err) - else + } else { console.log("Invalid poke response: ", obj); + } this.outstandingPokes.delete(obj.id); } else if (obj.response == "subscribe") { channel(subscriptions (~(del by subscriptions.channel) channel-wire)) :: $(requests t.requests) + :: + %delete + =/ session + (~(got by session.channel-state.state) channel-id) + :: + =. session.channel-state.state + (~(del by session.channel-state.state) channel-id) + =. gall-moves + %+ weld + gall-moves + :: + :: produce a list of moves which cancels every gall subscription + :: + %+ turn ~(tap by subscriptions.session) + |= [channel-wire=path ship=@p app=term =path] + ^- move + :: + [duct %pass channel-wire [%g %deal [our ship] app %pull ~]] + :: + $(requests t.requests) + :: == :: +on-gall-response: turns a gall response into an event ::
Added new option to canonize ast for UDF in test framework and tests for yson optimization.
@@ -873,8 +873,9 @@ module GTEST: BASE_PROGRAM { ### Documentation: https://wiki.yandex-team.ru/yql/lib/#yqludftest module YQL_UDF_TEST: PYTEST { PEERDIR(yql/library/udf_test) - DEPENDS(yql/tools/yqlrun) + DEPENDS(yql/tools/astdiff) DEPENDS(yql/tools/udf_resolver) + DEPENDS(yql/tools/yqlrun) DATA(arcadia/yql/mount) }
Fix copying commands retaining the "> "
@@ -73,7 +73,13 @@ void Overlay::DrawImgui(IDXGISwapChain3* apSwapChain) const auto result = ImGui::ListBoxHeader("", listboxSize); for (auto& item : m_outputLines) if (ImGui::Selectable(item.c_str())) - std::strncpy(command, item.c_str(), sizeof(command) - 1); + { + auto str = item; + if (item[0] == '>' && item[1] == ' ') + str = str.substr(2); + + std::strncpy(command, str.c_str(), sizeof(command) - 1); + } if (m_outputScroll) {
Expose generator in shared library Was failing linking to `*.so` library
@@ -28,7 +28,7 @@ typedef struct { /** * Static constant generator 'h' maintained for historical reasons. */ -extern const secp256k1_generator *secp256k1_generator_h; +SECP256K1_API extern const secp256k1_generator *secp256k1_generator_h; /** Parse a 33-byte commitment into a commitment object. *
sdl/events: add SDL_DisplayEvent for 2.0.9
@@ -4,6 +4,10 @@ package sdl #include "sdl_wrapper.h" #include "events.h" +#if !SDL_VERSION_ATLEAST(2,0,9) +#define SDL_DISPLAYEVENT (0x150) +#endif + #if !SDL_VERSION_ATLEAST(2,0,2) #define SDL_RENDER_TARGETS_RESET (0x2000) #endif @@ -117,6 +121,9 @@ const ( APP_WILLENTERFOREGROUND = C.SDL_APP_WILLENTERFOREGROUND // application is entering foreground APP_DIDENTERFOREGROUND = C.SDL_APP_DIDENTERFOREGROUND // application entered foreground + // Display events + DISPLAYEVENT = C.SDL_DISPLAYEVENT // Display state change + // Window events WINDOWEVENT = C.SDL_WINDOWEVENT // window state change SYSWMEVENT = C.SDL_SYSWMEVENT // system specific event @@ -233,6 +240,29 @@ func (e *CommonEvent) GetTimestamp() uint32 { return e.Timestamp } +// DisplayEvent contains common event data. +// (https://wiki.libsdl.org/SDL_Event) +type DisplayEvent struct { + Type uint32 // the event type + Timestamp uint32 // timestamp of the event + Display uint32 // the associated display index + Event uint8 // TODO: (https://wiki.libsdl.org/SDL_DisplayEventID) + _ uint8 // padding + _ uint8 // padding + _ uint8 // padding + Data1 int32 // event dependent data +} + +// GetType returns the event type. +func (e *DisplayEvent) GetType() uint32 { + return e.Type +} + +// GetTimestamp returns the timestamp of the event. +func (e *DisplayEvent) GetTimestamp() uint32 { + return e.Timestamp +} + // WindowEvent contains window state change event data. // (https://wiki.libsdl.org/SDL_WindowEvent) type WindowEvent struct { @@ -979,6 +1009,8 @@ func PollEvent() Event { func goEvent(cevent *CEvent) Event { switch cevent.Type { + case DISPLAYEVENT: + return (*DisplayEvent)(unsafe.Pointer(cevent)) case WINDOWEVENT: return (*WindowEvent)(unsafe.Pointer(cevent)) case SYSWMEVENT:
Add support for locking/unlocking normals for polygons This is set using the "maya_locked_normal" int attribute.
@@ -1380,6 +1380,38 @@ OutputGeometryPart::computeMesh( } meshFn.setFaceVertexNormals(normals, faceList, polygonConnects); + + if(!HAPI_FAIL(hapiGetVertexAttribute( + myNodeId, myPartId, + "maya_locked_normal", + attrInfo, + intArray + ))) + { + Util::reverseWindingOrder(intArray, polygonCounts); + + MIntArray unlockFaceList; + MIntArray unlockVertexList; + + // normals are already locked, find the ones that need to be + // unlocked + for(unsigned int i = 0, j = 0, length = polygonCounts.length(); + i < length; ++i) + { + for(int k = 0; k < polygonCounts[i]; ++j, ++k) + { + if(!(intArray[j] == 0)) + { + continue; + } + + unlockFaceList.append(i); + unlockVertexList.append(polygonConnects[j]); + } + } + + meshFn.unlockFaceVertexNormals(unlockFaceList, unlockVertexList); + } } else if(owner == HAPI_ATTROWNER_POINT) { @@ -1392,6 +1424,30 @@ OutputGeometryPart::computeMesh( } meshFn.setVertexNormals(normals, vertexList); + + if(!HAPI_FAIL(hapiGetPointAttribute( + myNodeId, myPartId, + "maya_locked_normal", + attrInfo, + intArray + ))) + { + MIntArray unlockVertexList; + + // normals are already locked, find the ones that need to be + // unlocked + for(size_t i = 0; i < intArray.size(); i++) + { + if(!(intArray[i] == 0)) + { + continue; + } + + unlockVertexList.append(i); + } + + meshFn.unlockVertexNormals(unlockVertexList); + } } } }
lv_btnm: 0. byte (width dsc) 1. byte: hidden if \177 (0x7F)
@@ -416,7 +416,12 @@ static bool lv_btnm_design(lv_obj_t * btnm, const area_t * mask, lv_design_mode_ uint16_t btn_i = 0; uint16_t txt_i = 0; - for(btn_i = 0; btn_i < ext->btn_cnt; btn_i ++) { + for(btn_i = 0; btn_i < ext->btn_cnt; btn_i ++, txt_i ++) { + /*Search the next valid text in the map*/ + while(strcmp(ext->map_p[txt_i], "\n") == 0) txt_i ++; + + if(ext->map_p[txt_i][1] == '\177') continue; + lv_obj_get_cords(btnm, &area_btnm); area_cpy(&area_tmp, &ext->btn_areas[btn_i]); @@ -433,9 +438,6 @@ static bool lv_btnm_design(lv_obj_t * btnm, const area_t * mask, lv_design_mode_ lv_draw_rect(&area_tmp, mask, btn_style); - /*Search the next valid text in the map*/ - while(strcmp(ext->map_p[txt_i], "\n") == 0) txt_i ++; - /*Calculate the size of the text*/ const font_t * font = btn_style->font; point_t txt_size; @@ -449,7 +451,6 @@ static bool lv_btnm_design(lv_obj_t * btnm, const area_t * mask, lv_design_mode_ area_tmp.y2 = area_tmp.y1 + txt_size.y; lv_draw_label(&area_tmp, mask, btn_style, ext->map_p[txt_i], TXT_FLAG_NONE, NULL); - txt_i ++; } } return true;
put ALFA AWUS036ACH to the end of the list, because it doesn' work out of the box on a default kernel - a third party driver is mandatory
@@ -137,7 +137,6 @@ This list is for information purposes only and should not be regarded as a bindi | TP-LINK Archer T2UH | ID 148f:761a Ralink Technology, Corp. MT7610U ("Archer T2U" 2.4G+5G WLAN Adapter) | | ASUS USB-AC51 | ID 0b05:17d1 ASUSTek Computer, Inc. AC51 802.11a/b/g/n/ac Wireless Adapter [Mediatek MT7610U] | | ALFA AWUS036ACM | ID 0e8d:7612 MediaTek Inc. MT7612U 802.11a/b/g/n/ac Wireless Adapter | -| ALFA AWUS036ACH | ID 0bda:8812 Realtek Semiconductor Corp. RTL8812AU 802.11a/b/g/n/ac 2T2R DB WLAN Adapter <br /> Required driver: https://github.com/aircrack-ng/rtl8812au - interface must be set to monitor mode manually using iw before starting hcxdumptool | | CSL 300MBit 300649 | ID 148f:5572 Ralink Technology, Corp. RT5572 Wireless Adapter | | EDIMAX EW-7711UAN | ID 7392:7710 Edimax Technology Co., Ltd | | TENDA W311U+ | ID 148f:3070 Ralink Technology, Corp. RT2870/RT3070 Wireless Adapter | @@ -148,6 +147,8 @@ This list is for information purposes only and should not be regarded as a bindi | TP-Link TL-WN722N <br /> v1 | ID 0cf3:9271 Qualcomm Atheros Communications AR9271 802.11n <br /> Partly driver freezes and overheating problems | | TP-Link TL-WN722N <br /> v2/v3 | ID 2357:010c TP-Link TL-WN722N v2/v3 [Realtek RTL8188EUS] <br /> Recommended driver: https://github.com/kimocoder/realtek_rtwifi | | LogiLink WL0151A | ID 0bda:8179 Realtek Semiconductor Corp. RTL8188EUS 802.11n Wireless Network Adapter <br /> Recommended driver: https://github.com/kimocoder/realtek_rtwifi | +| ALFA AWUS036ACH | ID 0bda:8812 Realtek Semiconductor Corp. RTL8812AU 802.11a/b/g/n/ac 2T2R DB WLAN Adapter <br /> Required driver: https://github.com/aircrack-ng/rtl8812au - interface must be set to monitor mode manually using iw before starting hcxdumptool | + Always verify the actual chipset with 'lsusb' and/or 'lspci'!
framework/st_things : Resolves issues when svr db is missing If easysetup is not complete and there is no svrdb (initial) initialize fail Return 0 should not occur regardless of whether svrdb is present or not. Therefore, if svrdb is present, it is erased, and if not exist, logic that fails is normal.
@@ -276,11 +276,7 @@ int things_initialize_stack(const char *json_path, bool *easysetup_completed) if (es_state != ES_COMPLETE) { esm_save_easysetup_state(ES_NOT_COMPLETE); THINGS_LOG_D(THINGS_DEBUG, TAG, "delete svrdb"); - int ret = unlink(dm_get_svrdb_file_path()); - if (ret < 0) { - THINGS_LOG_D(THINGS_ERROR, TAG, "delete svrdb fail(%d)", errno); - return 0; - } + unlink(dm_get_svrdb_file_path()); } #ifdef CONFIG_ST_THINGS_FOTA
Add RAT reporting to build matrix
@@ -33,6 +33,15 @@ git: matrix: include: + # RAT Report + - os: linux + language: python + python: + - "3.5" + env: + - TEST=RAT + - DEBUG=1 + # newt build <targets> - os: linux env: @@ -120,22 +129,30 @@ matrix: before_install: - printenv - export GOPATH=$HOME/gopath - - go version + - if [ "${TEST}" != "RAT" ]; then go version; fi install: - git clone https://github.com/runtimeco/mynewt-travis-ci $HOME/ci - chmod +x $HOME/ci/*.sh - - $HOME/ci/${TRAVIS_OS_NAME}_travis_install.sh + - | + if [ "${TEST}" == "RAT" ]; then + pip install requests + else + $HOME/ci/${TRAVIS_OS_NAME}_travis_install.sh + fi before_script: - - newt version - - gcc --version - - if [ "${TEST}" != "TEST_ALL" ]; then arm-none-eabi-gcc --version; fi - - cp -R $HOME/ci/mynewt-core-project.yml project.yml - - cp -R $HOME/ci/mynewt-core-targets targets - - newt install + - | + if [ "${TEST}" != "RAT" ]; then + newt version + gcc --version + if [ "${TEST}" != "TEST_ALL" ]; then arm-none-eabi-gcc --version; fi + cp -R $HOME/ci/mynewt-core-project.yml project.yml + cp -R $HOME/ci/mynewt-core-targets targets + newt install # pass in the number of target sets - - $HOME/ci/prepare_test.sh $VM_AMOUNT + $HOME/ci/prepare_test.sh $VM_AMOUNT + fi script: # the following list of targets are known to fail building blinky, or @@ -144,7 +161,12 @@ script: - export IGNORED_BSPS="ci40 embarc_emsk hifive1 native-armv7 native-mips pic32mx470_6lp_clicker pic32mz2048_wi-fire sensorhub native" - - $HOME/ci/run_test.sh + - | + if [ "${TEST}" != "RAT" ]; then + $HOME/ci/run_test.sh + else + python $HOME/ci/check_license.py + fi cache: directories:
[mod_authn_gssapi] needs -lcom_err under Darwin
@@ -448,7 +448,7 @@ if test "x$use_krb5" = "xyes"; then AC_MSG_ERROR([gssapi_krb5 headers and/or libs where not found, install them or build with --without-krb5]) fi case $host_os in - *cygwin* ) KRB5_LIB="$KRB5_LIB -lcom_err";; + *darwin*|*cygwin* ) KRB5_LIB="$KRB5_LIB -lcom_err";; * ) ;; esac fi
[dpos] initialize pre-LIB by the last DB snapshot
@@ -530,7 +530,7 @@ func (bs *bootingStatus) loadLIB(get func([]byte) []byte) { } } -// reco restores the last LIB status by using the informations loaded from the +// init restores the last LIB status by using the informations loaded from the // DB. func (s *Status) init() { if s.initialized { @@ -547,6 +547,12 @@ func (s *Status) init() { s.pls.addConfirmInfo(s.bestBlock) + s.lib = bootState.lib + + if len(bootState.plib) != 0 { + s.pls.plib = bootState.plib + } + s.initialized = true }
cram: export TERM=dumb to prevent unfortunate coloring
@@ -32,6 +32,7 @@ set(ENV{CRITERION_SHORT_FILENAME} "1") set(ENV{CRITERION_JOBS} "1") set(ENV{CRITERION_DISABLE_TIME_MEASUREMENTS} "1") set(ENV{MSYS2_ARG_CONV_EXCL} "--filter=") +set(ENV{TERM} "dumb") if (WIN32) if (ENV{MINGW} STREQUAL "")
tap: remove the bridge configurations for TUN interface Type: fix
@@ -456,18 +456,19 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) args->rv = VNET_API_ERROR_NETLINK_ERROR; goto error; } - } if (args->host_bridge) { args->error = vnet_netlink_set_link_master (vif->ifindex, - (char *) args->host_bridge); + (char *) + args->host_bridge); if (args->error) { args->rv = VNET_API_ERROR_NETLINK_ERROR; goto error; } } + } if (args->host_ip4_prefix_len) { @@ -665,10 +666,10 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) ethernet_mac_address_generate (args->mac_addr.bytes); clib_memcpy (vif->mac_addr, args->mac_addr.bytes, 6); + vif->host_bridge = format (0, "%s%c", args->host_bridge, 0); } vif->host_if_name = format (0, "%s%c", host_if_name, 0); vif->net_ns = format (0, "%s%c", args->host_namespace, 0); - vif->host_bridge = format (0, "%s%c", args->host_bridge, 0); vif->host_mtu_size = args->host_mtu_size; clib_memcpy (vif->host_mac_addr, args->host_mac_addr.bytes, 6); vif->host_ip4_prefix_len = args->host_ip4_prefix_len;
feat(docs): Provide current status of Displays
--- -title: OLED Displays -sidebar_label: OLED Displays +title: Displays +sidebar_label: Displays --- -TODO: Documentation on OLED displays. +Displays in ZMK are currently a proof of concept and official support is coming soon. + +:::info +Although ZMK-powered keyboards _are_ capable of utilizing OLED and ePaper displays, the Displays feature is not yet considered production-ready due to an issue where the display remains blank after resuming from [external power cutoff](../behaviors/power#external-power-control). This issue can be tracked on GitHub at [zmkfirmware/zmk #674](https://github.com/zmkfirmware/zmk/issues/674). +:::
[RPC] Bugfix for ListBlockMetadataStream
@@ -13,14 +13,13 @@ import ( "strings" "time" - "github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc" - "github.com/aergoio/aergo-actor/actor" "github.com/aergoio/aergo/config" "github.com/aergoio/aergo/message" "github.com/aergoio/aergo/pkg/component" "github.com/aergoio/aergo/types" aergorpc "github.com/aergoio/aergo/types" + "github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc" "github.com/improbable-eng/grpc-web/go/grpcweb" "github.com/opentracing/opentracing-go" "github.com/soheilhy/cmux" @@ -120,7 +119,11 @@ func (ns *RPC) Receive(context actor.Context) { case *types.Block: server := ns.actualServer server.BroadcastToListBlockStream(msg) - meta := &types.BlockMetadata{Header: msg.GetHeader()} + meta := &types.BlockMetadata{ + Hash: msg.BlockHash(), + Header: msg.GetHeader(), + Txcount: int32(len(msg.GetBody().GetTxs())), + } server.BroadcastToListBlockMetadataStream(meta) case *actor.Started: case *actor.Stopping:
Fix postgres_fdw calls of clauselist_selectivity() We missed it in PostgreSQL 12 merge.
@@ -2927,7 +2927,8 @@ estimate_path_cost_size(PlannerInfo *root, fpinfo->remote_conds, 0, JOIN_INNER, - NULL)); + NULL, + false)); /* Factor in the selectivity of the locally-checked quals */ rows = clamp_row_est(retrieved_rows * fpinfo->local_conds_sel); } @@ -5874,7 +5875,8 @@ add_foreign_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel, fpinfo->local_conds, 0, JOIN_INNER, - NULL); + NULL, + false); cost_qual_eval(&fpinfo->local_conds_cost, fpinfo->local_conds, root);
Update uinject.c renaming overlapping function with coap causing the simulator to fail
@@ -33,7 +33,7 @@ static const uint8_t uinject_dst_addr[] = { //=========================== prototypes ====================================== -void _sock_handler(sock_udp_t *sock, sock_async_flags_t type, void *arg); +void uinject_sock_handler(sock_udp_t *sock, sock_async_flags_t type, void *arg); void _uinject_timer_cb(opentimers_id_t id); @@ -58,7 +58,7 @@ void uinject_init(void) { openserial_printf("Created a UDP socket\n"); - sock_udp_set_cb(&_sock, _sock_handler, NULL); + sock_udp_set_cb(&_sock, uinject_sock_handler, NULL); // start periodic timer uinject_vars.period = UINJECT_PERIOD_MS; @@ -76,7 +76,7 @@ void uinject_init(void) { -void _sock_handler(sock_udp_t *sock, sock_async_flags_t type, void *arg) { +void uinject_sock_handler(sock_udp_t *sock, sock_async_flags_t type, void *arg) { (void) arg; char buf[50];
Fix Luos_list
@@ -34,8 +34,9 @@ typedef enum typedef enum { // Common register for all services - GET_CMD = LUOS_LAST_RESERVED_CMD, // asks a service to publish its data - SET_CMD, // set some undefined data + UNKNOW = LUOS_LAST_RESERVED_CMD, // set or get some undefined data (change size of msg to set or get) + GET_CMD = UNKNOW, // retrocompatibility + SET_CMD, // retrocompatibility // Generic data COLOR, // color_t (R, G, B)
VERSION bump to version 2.1.67
@@ -64,7 +64,7 @@ endif() # micro version is changed with a set of small changes or bugfixes anywhere in the project. set(SYSREPO_MAJOR_VERSION 2) set(SYSREPO_MINOR_VERSION 1) -set(SYSREPO_MICRO_VERSION 66) +set(SYSREPO_MICRO_VERSION 67) set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_MICRO_VERSION}) # Version of the library
Check foo is choosy in "choose foo = etc"
@@ -1145,6 +1145,8 @@ func (q *checker) tcheckChoose(n *a.Choose) error { f := q.c.funcs[fQQID] if f == nil { return fmt.Errorf("check: no function named %q", fQQID.Str(q.tm)) + } else if !f.Choosy() { + return fmt.Errorf("check: choose assignee %q is not choosy", fQQID[2].Str(q.tm)) } for _, o := range n.Args() { o := o.AsExpr()
Make meson build file do cross compilation.
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -project('janet', 'c', default_options : ['c_std=c99']) +project('janet', 'c', default_options : ['c_std=c99'], version : '1.0.0') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') @@ -36,7 +36,7 @@ add_project_link_arguments('-rdynamic', language : 'c') incdir = include_directories('src/include') # Building generated sources -xxd = executable('xxd', 'tools/xxd.c') +xxd = executable('xxd', 'tools/xxd.c', native : true) gen = generator(xxd, output : '@[email protected]', arguments : ['@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@']) @@ -114,7 +114,8 @@ mainclient_src = [ janet_boot = executable('janet-boot', core_src, boot_src, boot_gen, include_directories : incdir, c_args : '-DJANET_BOOTSTRAP', - dependencies : [m_dep, dl_dep]) + dependencies : [m_dep, dl_dep], + native : true) # Build core image core_image = custom_target('core_image', @@ -126,24 +127,34 @@ libjanet = shared_library('janet', core_src, core_image, include_directories : incdir, dependencies : [m_dep, dl_dep], install : true) + janet_mainclient = executable('janet', core_src, core_image, init_gen, mainclient_src, include_directories : incdir, dependencies : [m_dep, dl_dep], install : true) +if meson.is_cross_build() + janet_nativeclient = executable('janet-native', core_src, core_image, init_gen, mainclient_src, + include_directories : incdir, + dependencies : [m_dep, dl_dep], + native : true) +else + janet_nativeclient = janet_mainclient +endif + # Documentation docs = custom_target('docs', input : ['tools/gendoc.janet'], output : ['doc.html'], capture : true, - command : [janet_mainclient, '@INPUT@']) + command : [janet_nativeclient, '@INPUT@']) # Amalgamated source amalg = custom_target('amalg', input : ['tools/amalg.janet', core_headers, core_src, core_image], output : ['janet.c'], capture : true, - command : [janet_mainclient, '@INPUT@']) + command : [janet_nativeclient, '@INPUT@']) # Amalgamated client janet_amalgclient = executable('janet-amalg', amalg, init_gen, mainclient_src, @@ -162,11 +173,11 @@ test_files = [ 'test/suite6.janet' ] foreach t : test_files - test(t, janet_mainclient, args : files([t]), workdir : meson.current_source_dir()) + test(t, janet_nativeclient, args : files([t]), workdir : meson.current_source_dir()) endforeach # Repl -run_target('repl', command : [janet_mainclient]) +run_target('repl', command : [janet_nativeclient]) # Installation install_man('janet.1')
io-libs/netcdf: bump version to v4.6.2
@@ -23,7 +23,7 @@ Name: %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM} Summary: C Libraries for the Unidata network Common Data Form License: NetCDF Group: %{PROJ_NAME}/io-libs -Version: 4.6.1 +Version: 4.6.2 Release: 1%{?dist} Url: http://www.unidata.ucar.edu/software/netcdf/ Source0: https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz
[chain] Verify named account tx when chain execute
@@ -13,6 +13,7 @@ import ( "math" "math/big" + "github.com/aergoio/aergo/account/key" "github.com/aergoio/aergo/consensus" "github.com/aergoio/aergo/contract" "github.com/aergoio/aergo/contract/name" @@ -628,6 +629,16 @@ func executeTx(bs *state.BlockState, tx *types.Tx, blockNo uint64, ts int64, pre txBody := tx.GetBody() account := name.Resolve(bs, txBody.Account) + + //TODO : after make named account cache remove below + if tx.NeedNameVerify() { + err = key.VerifyTxWithAddress(tx, account) + if err != nil { + return err + } + } + //TODO : remove above + sender, err := bs.GetAccountStateV(account) if err != nil { return err
Fix handling of uname output on AIX
# Checking cross compile $hostos = `uname -s | sed -e s/\-.*//`; chop($hostos); $hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch); +$hostarch = `uname -p` if ($hostos eq "AIX"); $hostarch = "x86_64" if ($hostarch eq "amd64"); $hostarch = "arm" if ($hostarch =~ /^arm.*/); $hostarch = "arm64" if ($hostarch eq "aarch64");
Workaround loss timer cancellation due to amplification limit
@@ -7188,6 +7188,25 @@ int ngtcp2_conn_read_handshake(ngtcp2_conn *conn, const ngtcp2_path *path, conn_discard_initial_state(conn); } + /* If server hits amplification limit, it cancels loss detection + timer. If server receives a packet from client, the limit is + increased and server can send more. If server has + ack-eliciting Initial or Handshake packets, it should resend it + if timer fired but timer is not armed in this case. So instead + of resending Initial/Handshake packets, if server has 1RTT data + to send, it might send them and then might hit amplification + limit again until it hits stream data limit. Initial/Handshake + data is not resent. In order to avoid this situation, try to + arm loss detection and check the expiry here so that on next + write call, we can resend Initial/Handshake first. */ + ngtcp2_conn_set_loss_detection_timer(conn, ts); + if (ngtcp2_conn_loss_detection_expiry(conn) <= ts) { + rv = ngtcp2_conn_on_loss_detection_timer(conn, ts); + if (rv != 0) { + return rv; + } + } + if (!(conn->flags & NGTCP2_CONN_FLAG_HANDSHAKE_COMPLETED)) { return 0; }
17.07 Release Note
# Release Notes {#release_notes} +* @subpage release_notes_1707 * @subpage release_notes_1704 * @subpage release_notes_17011 * @subpage release_notes_1701 * @subpage release_notes_1609 * @subpage release_notes_1606 +@page release_notes_1707 Release notes for VPP 17.07 + +More than 400 commits since the 1704 release. + +## Features +- Infrastructure + - make test; improved debuggability. + - TAB auto-completion on the CLI + - DPDK 17.05 + - python 3 support in test infra + +- Host stack + - Improved Linux TCP stack compatibility using IWL test suite (https://jira.fd.io/browse/VPP-720) + - Improved loss recovery (RFC5681, RFC6582, RF6675) + - Basic implementation of Eifel detection algorithm (RFC3522) + - Basic support for buffer chains + - Refactored session layer API + - Overall performance, scale and hardening + +- Interfaces + - memif: IP mode, jumbo frames, multi queue + - virtio-user support + - vhost-usr; adaptive (poll/interupt) support. + +- Network features + - MPLS Multicast FIB + + - BFD FIB integration + + - NAT64 support + + - GRE over IPv6 + + - Segement routing MPLS + + - IOAM configuration for SRv6 localsid + + - LISP + - NSH support + - native forward static routes + - L2 ARP + + - ACL multi-core suuport + + - Flowprobe: + - Add flowstartns, flowendns and tcpcontrolbits + - Stateful flows and IPv6, L4 recording + + - GTP-U support + + - VXLAN GPE support for FIB2.0 and bypass. + + +## Known issues + +For the full list of issues please reffer to fd.io [JIRA](https://jira.fd.io). + +## Issues fixed + +For the full list of fixed issues please reffer to: +- fd.io [JIRA](https://jira.fd.io) +- git [commit log](https://git.fd.io/vpp/log/?h=stable/1707) + @page release_notes_1704 Release notes for VPP 17.04 More than 500 commits since the 1701 release.
don't write 0 bytes via SSL_write (as behavior is undefined in OpenSSL)
@@ -296,7 +296,7 @@ static int dill_tls_bsendl(struct dill_bsock_vfs *bvfs, while(1) { uint8_t *base = it->iol_base; size_t len = it->iol_len; - while(1) { + while(len > 0) { ERR_clear_error(); int rc = SSL_write(self->ssl, base, len); if(dill_tls_followup(self, rc, deadline)) { @@ -304,7 +304,6 @@ static int dill_tls_bsendl(struct dill_bsock_vfs *bvfs, self->outerr = 1; return -1; } - if(rc == len) break; base += rc; len -= rc; } @@ -479,4 +478,3 @@ static void dill_tls_init(void) { init = 1; } } -
build: rebuild list of test files in meson.build
@@ -102,13 +102,17 @@ if get_option('build_tests') == true test_src = files( 'test/runner.c', - 'test/src/test_euler.c', 'test/src/test_bezier.c', 'test/src/test_cam.c', - 'test/src/test_struct.c', + 'test/src/test_cam_lh_no.c', + 'test/src/test_cam_lh_zo.c', + 'test/src/test_cam_rh_no.c', + 'test/src/test_cam_rh_zo.c', 'test/src/test_clamp.c', 'test/src/test_common.c', + 'test/src/test_euler.c', 'test/src/tests.c', + 'test/src/test_struct.c', ) test_exe = executable('tests',
Improve tags docs
@@ -50,15 +50,19 @@ _CBOR_NODISCARD CBOR_EXPORT uint64_t cbor_tag_value(const cbor_item_t *item); /** Set the tagged item * * @param item A tag - * @param tagged_item[incref] The item to tag + * @param tagged_item The item to tag. Its reference count will be be increased + * by one. */ CBOR_EXPORT void cbor_tag_set_item(cbor_item_t *item, cbor_item_t *tagged_item); /** Build a new tag * - * @param item[incref] The tagee + * @param item The item to tag. Its reference count will be be increased by + * one. * @param value Tag value - * @return **new** tag item + * @return Reference to the new tag item. The item's reference count is + * initialized to one. + * @return `NULL` if memory allocation fails */ _CBOR_NODISCARD CBOR_EXPORT cbor_item_t *cbor_build_tag(uint64_t value, cbor_item_t *item);
doc: fix macro name OSSL_STORE_INFO_X509 doesn't exist. It should be OSSL_STORE_INFO_CERT. Fixes
@@ -58,7 +58,7 @@ other encoding is undefined. * here just one example */ switch (OSSL_STORE_INFO_get_type(info)) { - case OSSL_STORE_INFO_X509: + case OSSL_STORE_INFO_CERT: /* Print the X.509 certificate text */ X509_print_fp(stdout, OSSL_STORE_INFO_get0_CERT(info)); /* Print the X.509 certificate PEM output */
RTX5: removed compiler warning when Timers are not used
@@ -225,7 +225,7 @@ static const osMessageQueueAttr_t os_timer_mq_attr = { #else extern void osRtxTimerThread (void *argument); - void osRtxTimerThread (void *argument) {} + void osRtxTimerThread (void *argument) { (void)argument; } #endif // ((OS_TIMER_THREAD_STACK_SIZE != 0) && (OS_TIMER_CB_QUEUE != 0))
Fix Pass:setBlendMode/setMaterial;
@@ -173,7 +173,7 @@ static int l_lovrPassSetAlphaToCoverage(lua_State* L) { static int l_lovrPassSetBlendMode(lua_State* L) { Pass* pass = luax_checktype(L, 1, Pass); - BlendMode mode = lua_isnoneornil(L, 2) ? BLEND_NONE : luax_checkenum(L, 1, BlendMode, NULL); + BlendMode mode = lua_isnoneornil(L, 2) ? BLEND_NONE : luax_checkenum(L, 2, BlendMode, NULL); BlendAlphaMode alphaMode = luax_checkenum(L, 3, BlendAlphaMode, "alphamultiply"); lovrPassSetBlendMode(pass, mode, alphaMode); return 0; @@ -240,7 +240,7 @@ static int l_lovrPassSetDepthClamp(lua_State* L) { static int l_lovrPassSetMaterial(lua_State* L) { Pass* pass = luax_checktype(L, 1, Pass); - Material* material = luax_checktype(L, 2, Material); + Material* material = luax_totype(L, 2, Material); lovrPassSetMaterial(pass, material); return 0; }
Don't start TLP/RTO before handshake finishes
@@ -6065,7 +6065,8 @@ void ngtcp2_conn_set_loss_detection_timer(ngtcp2_conn *conn) { } it = ngtcp2_rtb_head(&pktns->rtb); - if (ngtcp2_ksl_it_end(&it)) { + if (ngtcp2_ksl_it_end(&it) || + !(conn->flags & NGTCP2_CONN_FLAG_HANDSHAKE_COMPLETED)) { if (rcs->loss_detection_timer) { ngtcp2_log_info(&conn->log, NGTCP2_LOG_EVENT_RCV, "loss detection timer canceled");
Fix travis error when executing openssl config script This is probably perl which comes with precise is too old. Upgrading travis build to use trusty fixes the issue.
+dist: trusty language: cpp compiler: - clang - gcc -sudo: false +sudo: required addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.8 - - george-edison55-precise-backports packages: - g++-5 - clang-3.8
Force tinyara_head.bin creation for Artik05x boards
@@ -15,12 +15,14 @@ choice config ARCH_BOARD_ARTIK053 bool "Samsung ARTIK-053 Starter Kit" depends on ARCH_CHIP_S5JT200 + select SAMSUNG_NS2 ---help--- Samsung ARTIK-053 Starter Kit based on S5JT200 IoT WiFi MCU config ARCH_BOARD_SIDK_S5JT200 bool "Samsung S5JT200 sidk board" depends on ARCH_CHIP_S5JT200 + select SAMSUNG_NS2 select ARCH_HAVE_BUTTONS select ARCH_HAVE_IRQBUTTONS ---help---
process: fix install permission of test script
@@ -9,7 +9,7 @@ add_plugin ( configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/testapp.sh" "${CMAKE_BINARY_DIR}/bin/process-testapp.sh" COPYONLY) install ( - FILES "${CMAKE_BINARY_DIR}/bin/process-testapp.sh" + PROGRAMS "${CMAKE_BINARY_DIR}/bin/process-testapp.sh" DESTINATION "${TARGET_TOOL_EXEC_FOLDER}" COMPONENT elektra-tests)
Minor enhancement of a comment.
@@ -231,7 +231,7 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES # Architecture of target platform. Supported values are: 'x86' and 'x86_64'. # # TINYSPLINE_PLATFORM -# Platform specific identifier, e. g. 'linux-x86_64'. +# Platform (target platform) specific identifier, e. g. 'linux-x86_64'. ############################################################################### if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(TINYSPLINE_PLATFORM_NAME "linux" CACHE INTERNAL "")
peview: Add hex for timestamp on Win10
@@ -545,10 +545,26 @@ VOID PvpSetPeImageTimeStamp( RtlSecondsSince1970ToTime(PvMappedImage.NtHeaders->FileHeader.TimeDateStamp, &time); PhLargeIntegerToLocalSystemTime(&systemTime, &time); + if (WindowsVersion >= WINDOWS_10) + { + // "the timestamp to be a hash of the resulting binary" + // https://devblogs.microsoft.com/oldnewthing/20180103-00/?p=97705 + string = PhFormatDateTime(&systemTime); + PhSwapReference(&string, PhFormatString( + L"%s (%lx)", + string->Buffer, + PvMappedImage.NtHeaders->FileHeader.TimeDateStamp + )); + PhSetDialogItemText(WindowHandle, IDC_TIMESTAMP, string->Buffer); + PhDereferenceObject(string); + } + else + { string = PhFormatDateTime(&systemTime); PhSetDialogItemText(WindowHandle, IDC_TIMESTAMP, string->Buffer); PhDereferenceObject(string); } +} VOID PvpSetPeImageBaseAddress( _In_ HWND WindowHandle
Increase the wait time for ppc jobs again
@@ -30,7 +30,7 @@ matrix: before_script: &common-before - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=POWER8 NUM_THREADS=32" script: - - travis_wait 40 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE + - travis_wait 50 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE - make -C test $COMMON_FLAGS $BTYPE - make -C ctest $COMMON_FLAGS $BTYPE - make -C utest $COMMON_FLAGS $BTYPE @@ -104,7 +104,7 @@ matrix: - sudo apt-get update - sudo apt-get install gcc-9 gfortran-9 -y script: - - travis_wait 40 make QUIET_MAKE=1 BINARY=64 USE_OPENMP=1 CC=gcc-9 FC=gfortran-9 + - travis_wait 50 make QUIET_MAKE=1 BINARY=64 USE_OPENMP=1 CC=gcc-9 FC=gfortran-9 - make -C test $COMMON_FLAGS $BTYPE - make -C ctest $COMMON_FLAGS $BTYPE - make -C utest $COMMON_FLAGS $BTYPE @@ -121,7 +121,7 @@ matrix: - sudo apt-get update - sudo apt-get install gcc-9 gfortran-9 -y script: - - travis_wait 40 make QUIET_MAKE=1 BUILD_BFLOAT16=1 BINARY=64 USE_OPENMP=1 CC=gcc-9 FC=gfortran-9 + - travis_wait 50 make QUIET_MAKE=1 BUILD_BFLOAT16=1 BINARY=64 USE_OPENMP=1 CC=gcc-9 FC=gfortran-9 - make -C test $COMMON_FLAGS $BTYPE - make -C ctest $COMMON_FLAGS $BTYPE - make -C utest $COMMON_FLAGS $BTYPE
fatfs: Fix undefined ssize member of FATFS struct
@@ -224,13 +224,17 @@ esp_err_t esp_vfs_fat_info(const char* base_path, } uint64_t total_sectors = ((uint64_t)(fs->n_fatent - 2)) * fs->csize; uint64_t free_sectors = ((uint64_t)free_clusters) * fs->csize; + WORD sector_size = FF_MIN_SS; // 512 +#if FF_MAX_SS != FF_MIN_SS + sector_size = fs->ssize; +#endif // Assuming the total size is < 4GiB, should be true for SPI Flash if (out_total_bytes != NULL) { - *out_total_bytes = total_sectors * fs->ssize; + *out_total_bytes = total_sectors * sector_size; } if (out_free_bytes != NULL) { - *out_free_bytes = free_sectors * fs->ssize; + *out_free_bytes = free_sectors * sector_size; } return ESP_OK; }
Normalize _bt_findsplitloc() argument names. Oversight in commit
@@ -1050,7 +1050,7 @@ extern Buffer _bt_getstackbuf(Relation rel, BTStack stack, BlockNumber child); /* * prototypes for functions in nbtsplitloc.c */ -extern OffsetNumber _bt_findsplitloc(Relation rel, Page page, +extern OffsetNumber _bt_findsplitloc(Relation rel, Page origpage, OffsetNumber newitemoff, Size newitemsz, IndexTuple newitem, bool *newitemonleft);
You can declare things without attributes.
@@ -191,7 +191,7 @@ TABLE OF CONTENTS: 3.3. Declarations: decl: attrs ("var" | "const" | "generic") decllist - attrs: ("extern" | "pkglocal" | "$noret")+ + attrs: ("extern" | "pkglocal" | "$noret")* decllist: declbody ("," declbody)* declbody: declcore ["=" expr] declcore: name [":" type]
Refactor macro-spanning if in sha256.c
@@ -665,9 +665,11 @@ int mbedtls_sha256_finish( mbedtls_sha256_context *ctx, MBEDTLS_PUT_UINT32_BE( ctx->state[5], output, 20 ); MBEDTLS_PUT_UINT32_BE( ctx->state[6], output, 24 ); + int truncated = 0; #if defined(MBEDTLS_SHA224_C) - if( ctx->is224 == 0 ) + truncated = ctx->is224; #endif + if( !truncated ) MBEDTLS_PUT_UINT32_BE( ctx->state[7], output, 28 ); return( 0 );
Remove support for polling for kernel routes. Both the Linux and BSD backends have supported async notifications for a long time.
@@ -490,6 +490,12 @@ main(int argc, char **argv) goto fail; } + rc = kernel_setup_socket(1); + if(rc < 0 || kernel_socket < 0) { + perror("Couldn't setup kernel socket"); + goto fail; + } + if(local_server_port >= 0) { local_server_socket = tcp_server_socket(local_server_port, 1); if(local_server_socket < 0) { @@ -585,11 +591,8 @@ main(int argc, char **argv) timeval_minus(&tv, &tv, &now); FD_SET(protocol_socket, &readfds); maxfd = MAX(maxfd, protocol_socket); - if(kernel_socket < 0) kernel_setup_socket(1); - if(kernel_socket >= 0) { FD_SET(kernel_socket, &readfds); maxfd = MAX(maxfd, kernel_socket); - } if(local_server_socket >= 0 && num_local_sockets < MAX_LOCAL_SOCKETS) { FD_SET(local_server_socket, &readfds); @@ -615,7 +618,7 @@ main(int argc, char **argv) if(exiting) break; - if(kernel_socket >= 0 && FD_ISSET(kernel_socket, &readfds)) { + if(FD_ISSET(kernel_socket, &readfds)) { struct kernel_filter filter = {0}; filter.route = kernel_route_notify; filter.addr = kernel_addr_notify; @@ -690,10 +693,7 @@ main(int argc, char **argv) if(rc < 0) fprintf(stderr, "Warning: couldn't check exported routes.\n"); kernel_routes_changed = kernel_addr_changed = 0; - if(kernel_socket >= 0) kernel_dump_time = now.tv_sec + roughly(300); - else - kernel_dump_time = now.tv_sec + roughly(30); } if(timeval_compare(&check_neighbours_timeout, &now) < 0) {