message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Remove unnecessary disabling of interrupts in clock_seconds() | @@ -145,19 +145,7 @@ clock_update(void)
unsigned long
clock_seconds(void)
{
- bool interrupts_disabled;
- uint32_t secs_now;
-
- interrupts_disabled = ti_lib_int_master_disable();
-
- secs_now = ti_lib_aon_rtc_sec_get();
-
- /* Re-enable interrupts */
- if(!interrupts_disabled) {
- ti_lib_int_master_enable();
- }
-
- return (unsigned long)secs_now;
+ return (unsigned long)ti_lib_aon_rtc_sec_get();
}
/*---------------------------------------------------------------------------*/
void
|
build: fix crypto_native compile flags check
Type: fix | if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
list(APPEND VARIANTS "slm\;-march=silvermont")
list(APPEND VARIANTS "hsw\;-march=haswell")
- if(compiler_flag_march_skylake_avx512 AND compiler_flag_mprefer_vector_width)
+ if(compiler_flag_march_skylake_avx512 AND compiler_flag_mprefer_vector_width_256)
list(APPEND VARIANTS "skx\;-march=skylake-avx512 -mprefer-vector-width=256")
endif()
- if(compiler_flag_march_icelake_client AND compiler_flag_mprefer_vector_width)
+ if(compiler_flag_march_icelake_client AND compiler_flag_mprefer_vector_width_512)
list(APPEND VARIANTS "icl\;-march=icelake-client -mprefer-vector-width=512")
endif()
set (COMPILE_FILES aes_cbc.c aes_gcm.c)
|
output: moving function to the right place to fix warning of implicit declaration | @@ -766,6 +766,21 @@ void flb_output_net_default(const char *host, const int port,
}
}
+/* Add thread pool for output plugin if configured with workers */
+int flb_output_enable_multi_threading(struct flb_output_instance *ins, struct flb_config *config)
+{
+ /* Multi-threading enabled ? (through 'workers' property) */
+ if (ins->tp_workers > 0) {
+ if(flb_output_thread_pool_create(config, ins) != 0) {
+ flb_output_instance_destroy(ins);
+ return -1;
+ }
+ flb_output_thread_pool_start(ins);
+ }
+
+ return 0;
+}
+
/* Return an instance name or alias */
const char *flb_output_name(struct flb_output_instance *ins)
{
@@ -979,21 +994,6 @@ int flb_output_init_all(struct flb_config *config)
return 0;
}
-/* Add thread pool for output plugin if configured with workers */
-int flb_output_enable_multi_threading(struct flb_output_instance *ins, struct flb_config *config)
-{
- /* Multi-threading enabled ? (through 'workers' property) */
- if (ins->tp_workers > 0) {
- if(flb_output_thread_pool_create(config, ins) != 0) {
- flb_output_instance_destroy(ins);
- return -1;
- }
- flb_output_thread_pool_start(ins);
- }
-
- return 0;
-}
-
/* Assign an Configuration context to an Output */
void flb_output_set_context(struct flb_output_instance *ins, void *context)
{
|
chat: pin unread notice on mobile
Fixes urbit/landscape#106. | @@ -17,7 +17,7 @@ export const UnreadNotice = (props) => {
}
return (
- <Box style={{ left: '0px' }}
+ <Box style={{ left: '0px', top: '0px' }}
p='4'
width='100%'
position='absolute'
@@ -34,7 +34,7 @@ export const UnreadNotice = (props) => {
borderRadius='1'
border='1'
borderColor='blue'>
- <Text flexShrink='0' display='block' cursor='pointer' onClick={onClick}>
+ <Text flexShrink='1' textOverflow='ellipsis' whiteSpace='pre' overflow='hidden' display='block' cursor='pointer' onClick={onClick}>
{unreadCount} new messages since{' '}
{datestamp && (
<>
@@ -48,6 +48,7 @@ export const UnreadNotice = (props) => {
color='blue'
cursor='pointer'
textAlign='right'
+ flexShrink='0'
onClick={dismissUnread}>
Mark as Read
</Text>
|
mesh/ci: fix MESH_EST_0216 | @@ -1043,7 +1043,7 @@ test cases:
- - P SSC[1-<node_num>] C +MESHSET:MLAYER,OK
- - MSSC SSC[1-<node_num>] mesh -T
- - P SSC[1-<node_num>] C +MESH:START,OK
- - - DELAY 60
+ - - DELAY <delay_time>
- - ''
- - VALUE <tree_node_num> <node_num>
- - R PC_COM L OK
|
Allow superfluous height for 1-tile-wide images
Currently used here and there for small, icon-like tiles, it seems. | @@ -131,9 +131,12 @@ int main(int argc, char *argv[])
if (png_options.trim)
opts.trim = png_options.trim;
-
- if (raw_image->width % 8 || raw_image->height % 8) {
- errx(1, "Input PNG file %s not sized correctly. The image's width and height must be multiples of 8.",
+ if (raw_image->width % 8) {
+ errx(1, "Input PNG file %s not sized correctly. The image's width must be a multiple of 8.",
+ opts.infile);
+ }
+ if (raw_image->width / 8 > 1 && raw_image->height % 8) {
+ errx(1, "Input PNG file %s not sized correctly. If the image is more than 1 tile wide, its height must be a multiple of 8.",
opts.infile);
}
|
Remove the test case which has been covered | @@ -8907,23 +8907,6 @@ run_test "TLS 1.3 m->G AES_128_GCM_SHA256 , RSA_PSS_RSAE_SHA256" \
-c "mbedtls_ssl_tls13_process_certificate_verify() returned 0" \
-c "HTTP/1.0 200 OK"
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL
-requires_config_enabled MBEDTLS_DEBUG_C
-requires_config_enabled MBEDTLS_SSL_CLI_C
-requires_config_enabled MBEDTLS_X509_RSASSA_PSS_SUPPORT
-requires_config_disabled MBEDTLS_USE_PSA_CRYPTO
-requires_gnutls_next
-run_test "TLS 1.3 m->G AES_128_GCM_SHA256 , RSA_PKCSV15_SHA256" \
- "$G_NEXT_SRV_RSA --disable-client-cert --priority=NORMAL:+CIPHER-ALL:+SHA256:+GROUP-SECP256R1:+ECDHE-ECDSA:+AEAD:+SIGN-RSA-SHA256:-VERS-ALL:+VERS-TLS1.3:%NO_TICKETS:%DISABLE_TLS13_COMPAT_MODE" \
- "$P_CLI debug_level=4 force_version=tls1_3 server_name=localhost force_ciphersuite=TLS1-3-AES-128-GCM-SHA256" \
- 0 \
- -s "Ephemeral EC Diffie-Hellman parameters" \
- -c "ECDH curve: x25519" \
- -c "server hello, chosen ciphersuite: ( 1301 ) - TLS1-3-AES-128-GCM-SHA256" \
- -c "Certificate Verify: Signature algorithm ( 0804 )" \
- -c "mbedtls_ssl_tls13_process_certificate_verify() returned 0" \
- -c "HTTP/1.0 200 OK"
-
# Test heap memory usage after handshake
requires_config_enabled MBEDTLS_MEMORY_DEBUG
requires_config_enabled MBEDTLS_MEMORY_BUFFER_ALLOC_C
|
correct fg,bg,cs defaults so will work with Xresources and default is gruvbox | @@ -105,8 +105,8 @@ static const char *colorname[] = {
"#ebdbb2",
[255] = 0,
/* more colors can be added after 255 to use with DefaultXX */
- "black", /* 256 -> bg */
- "white", /* 257 -> fg */
+ "#282828", /* 256 -> bg */
+ "#ebdbb2", /* 257 -> fg */
"#add8e6", /* 258 -> cursor */
};
@@ -115,9 +115,9 @@ static const char *colorname[] = {
* Default colors (colorname index)
* foreground, background, cursor, reverse cursor
*/
-unsigned int defaultfg = 15;
-unsigned int defaultbg = 0;
-static unsigned int defaultcs = 15;
+unsigned int defaultfg = 257;
+unsigned int defaultbg = 256;
+static unsigned int defaultcs = 258;
static unsigned int defaultrcs = 0;
/*
|
Create a make size-symbols target for fine grained footprint | # where this file is located.
#
-.PHONY: build-components menuconfig defconfig all build clean all_binaries check-submodules size size-components size-files list-components
+.PHONY: build-components menuconfig defconfig all build clean all_binaries check-submodules size size-components size-files size-symbols list-components
MAKECMDGOALS ?= all
all: all_binaries
@@ -32,6 +32,7 @@ help:
@echo "make clean - Remove all build output"
@echo "make size - Display the static memory footprint of the app"
@echo "make size-components, size-files - Finer-grained memory footprints"
+ @echo "make size-symbols - Per symbol memory footprint. Requires COMPONENT=<component>"
@echo "make erase_flash - Erase entire flash contents"
@echo "make monitor - Run idf_monitor tool to monitor serial output from app"
@echo "make simple_monitor - Monitor serial output on terminal console"
@@ -463,6 +464,13 @@ size-files: $(APP_ELF)
size-components: $(APP_ELF)
$(PYTHON) $(IDF_PATH)/tools/idf_size.py --archives $(APP_MAP)
+size-symbols: $(APP_ELF)
+ifndef COMPONENT
+ $(error "ERROR: Please enter the component to look symbols for, e.g. COMPONENT=heap")
+else
+ $(PYTHON) $(IDF_PATH)/tools/idf_size.py --archive_details lib$(COMPONENT).a $(APP_MAP)
+endif
+
# NB: this ordering is deliberate (app-clean & bootloader-clean before
# _config-clean), so config remains valid during all component clean
# targets
|
Re-enabling test-compiling all Lua files during CI | @@ -29,3 +29,8 @@ script:
- if [ "$OS" = "linux" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/ci-build-linux.sh; fi
- if [ "$OS" = "windows" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/ci-build-windows-ms.sh; fi
- if [ "$OS" = "linux" -a "$TRAVIS_PULL_REQUEST" != "false" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/pr-build.sh; fi
+- cd "$TRAVIS_BUILD_DIR"
+- echo "checking:"
+- find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 echo
+- find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 $LUACC -p
+# - if [ "$OS" = "linux" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/run-luacheck.sh || true ; fi
|
xive: Bump table sizes in direct mode
Until the simulator is fixed, we need to use direct mode and
KVM loves allocating LOTs of VPs | #define EQ_PER_PAGE (0x10000 / 32) // Use sizeof ?
#define IND_EQ_TABLE_SIZE ((MAX_EQ_COUNT / EQ_PER_PAGE) * 8)
#else
-#define MAX_EQ_COUNT (4 * 1024)
+#define MAX_EQ_COUNT (4 * 1024 * 64)
#define EQT_SIZE (MAX_EQ_COUNT * 32)
#endif
#define VP_PER_PAGE (0x10000 / 64) // Use sizeof ?
#define IND_VP_TABLE_SIZE ((MAX_VP_COUNT / VP_PER_PAGE) * 8)
#else
-#define MAX_VP_ORDER 12 /* 4k */
+#define MAX_VP_ORDER 13 /* 8k */
#define MAX_VP_COUNT (1ul << MAX_VP_ORDER)
#define VPT_SIZE (MAX_VP_COUNT * 64)
#endif
|
fix include dir | @@ -55,6 +55,8 @@ endif()
add_library(iotivity-port INTERFACE)
+target_include_directories(iotivity-port INTERFACE BEFORE ${PORT_DIR})
+
target_sources(iotivity-port INTERFACE
${PORT_DIR}/abort.c
${PORT_DIR}/clock.c
@@ -71,10 +73,6 @@ target_sources(iotivity-port INTERFACE
)
endif()
-target_include_directories(iotivity-port INTERFACE
- ${PORT_DIR}
-)
-
if(UNIX)
target_link_libraries(iotivity-port INTERFACE pthread m)
endif()
|
Fix Cmake dependency for wifi connect task | @@ -94,7 +94,6 @@ target_sources(
"${afr_ports_dir}/ble/aws_ble_hal_common_gap.c"
"${afr_ports_dir}/ble/aws_ble_hal_gap.c"
"${afr_ports_dir}/ble/aws_ble_hal_gatt_server.c"
- "${AFR_DEMOS_DIR}/wifi_provisioning/aws_wifi_connect_task.c"
)
target_include_directories(
AFR::ble::mcu_port
@@ -162,6 +161,7 @@ else()
set(
extra_exe_sources
"${AFR_DEMOS_DIR}/ble/iot_ble_numericComparison.c"
+ "${AFR_DEMOS_DIR}/wifi_provisioning/aws_wifi_connect_task.c"
${NETWORK_MANAGER_SOURCES}
)
endif()
|
Delay OSError until the library is used | @@ -919,7 +919,19 @@ mongocrypt_setopt_crypto_hooks (mongocrypt_t *crypt,
# export PYMONGOCRYPT_LIB='/path/to/libmongocrypt.so'
_path = os.path.join(
os.path.dirname(os.path.realpath(__file__)), 'mongocrypt')
+try:
lib = ffi.dlopen(os.environ.get('PYMONGOCRYPT_LIB', _path))
+except OSError as exc:
+ # dlopen raises OSError when the library cannot be found.
+ # Delay the error until the library is actually used.
+ class _Library(object):
+ def __init__(self, error):
+ self._error = error
+
+ def __getattr__(self, name):
+ raise self._error
+
+ lib = _Library(exc)
if PY3:
|
Add arm for encoding an entire call.
Clean up printfs. | ::
/- ethereum
=, ^ethereum
+=, keccak:crypto
=, mimes:html
::
+|%
+::
+:: encoding
+::
:: ABI spec used for reference:
:: https://ethereum.gitbooks.io/frontier-guide/content/abi.html
::
-|%
+++ encode-call
+ |= [fun=@t das=(list data)]
+ ^- tape
+ ::TODO should this check to see if the data matches the function signature?
+ =- (weld - (encode-args das))
+ %+ scag 8
+ (render-hex-bytes 32 (keccak-256 (as-octs fun)))
+::
+++ encode-args
+ :> encode list of arguments.
::
-++ encode-params
- :> encode list of parameters
|= das=(list data)
^- tape
(encode-data [%array-n das])
?. =(t hol) (weld nes t)
:: calculate byte offset of data we need to reference.
=/ ofs/@ud
- =- ~& [%full -]
- (div - 2) :: two hex digits per byte.
+ =- (div - 2) :: two hex digits per byte.
%+ add led :: count head, and
%- lent %- zing :: count all tail data
(scag i tas) :: preceding ours.
- ~& [%offset-at i ofs `@ux`ofs]
=+ ref=^$(dat [%uint ofs])
:: shouldn't hit this unless we're sending over 2gb of data?
~| [%weird-ref-lent (lent ref)]
|
Add reschedule to metadata hash init | @@ -1092,9 +1092,11 @@ static inline void _ocf_init_collision_entry(struct ocf_cache *cache,
static void ocf_metadata_hash_init_collision(struct ocf_cache *cache)
{
unsigned int i;
+ unsigned int step = 0;
for (i = 0; i < cache->device->collision_table_entries; i++) {
_ocf_init_collision_entry(cache, i);
+ OCF_COND_RESCHED_DEFAULT(step);
}
}
|
options/ansi: Do not dispose() files on exit() | @@ -431,7 +431,6 @@ namespace {
if(int e = it->flush(); e)
mlibc::infoLogger() << "mlibc warning: Failed to flush file before exit()"
<< frg::endlog;
- it->dispose();
}
}
} global_stdio_guard;
|
config_tools: delete the old board file when the new board file is imported successfully.
delete the old board file when the new board file is imported successfully. | @@ -132,19 +132,17 @@ export default {
let filepath = ''
if (useNewFile) {
filepath = this.newFilePath
- if (filepath !== this.currentSelectedBoard) {
- configurator.removeFile(this.currentSelectedBoard)
- .catch((err) => alert(`${err}`))
- }
} else {
filepath = this.currentSelectedBoard
}
if (filepath.length > 0) {
configurator.loadBoard(filepath)
- .then(({scenarioJSONSchema, boardInfo}) => {
+ .then(async ({scenarioJSONSchema, boardInfo}) => {
this.$emit('boardUpdate', boardInfo, scenarioJSONSchema);
let boardFileNewPath = this.WorkingFolder + boardInfo.name;
- // Todo: use rust command writeBoard to fix bugs.
+ if (useNewFile && filepath !== this.currentSelectedBoard) {
+ await configurator.removeFile(this.currentSelectedBoard)
+ }
configurator.writeFile(boardFileNewPath, boardInfo.content)
.then(() => configurator.addHistory('Board', boardFileNewPath))
.then(() => this.getBoardHistory())
|
Proper fix for issue EDNS OPT can have no rdata | @@ -449,10 +449,16 @@ ldns_pkt2buffer_wire_compress(ldns_buffer *buffer, const ldns_pkt *packet, ldns_
, ldns_buffer_export(edns_buf));
ldns_buffer_free(edns_buf);
}
- ldns_rr_push_rdf(edns_rr, edns_rdf ? edns_rdf : packet->_edns_data);
+ if (edns_rdf)
+ ldns_rr_push_rdf(edns_rr, edns_rdf);
+ else if (packet->_edns_data)
+ ldns_rr_push_rdf(edns_rr, packet->_edns_data);
(void)ldns_rr2buffer_wire_compress(buffer, edns_rr, LDNS_SECTION_ADDITIONAL, compression_data);
- /* take the edns rdata back out of the rr before we free rr */
- if (!edns_rdf)
+ /* if the rdata of the OPT came from packet->_edns_data
+ * we need to take it back out of the edns_rr before we free it
+ * so packet->_edns_data doesn't get freed
+ */
+ if (!edns_rdf && packet->_edns_data)
(void)ldns_rr_pop_rdf (edns_rr);
ldns_rr_free(edns_rr);
}
|
Add debug info for deserialization errors in rapidjson serial. | #include <rapidjson/document.h>
#include <rapidjson/stringbuffer.h>
#include <rapidjson/writer.h>
+#include <rapidjson/error/en.h>
#include <sstream>
@@ -471,9 +472,14 @@ value rapid_json_serial_impl_deserialize(serial_impl_handle handle, const char *
return NULL;
}
- if (document->Parse(buffer, size - 1).HasParseError() == true)
+ rapidjson::ParseResult parse_result = document->Parse(buffer, size - 1);
+
+ if (parse_result.IsError() == true)
{
- log_write("metacall", LOG_LEVEL_ERROR, "Invalid parsing of document (%s) in RapidJSON implementation", buffer);
+ const RAPIDJSON_ERROR_CHARTYPE * error_message = rapidjson::GetParseError_En(parse_result.Code());
+
+ log_write("metacall", LOG_LEVEL_ERROR, "Invalid parsing of document (%s) in RapidJSON implementation: %s at %" PRIuS,
+ buffer, error_message, parse_result.Offset());
delete document;
|
ci: use ci build flags in ci_build_apps.py | @@ -17,6 +17,14 @@ from idf_build_apps import LOGGER, App, build_apps, find_apps, setup_logging
from idf_build_apps.constants import SUPPORTED_TARGETS
from idf_ci_utils import IDF_PATH, PytestApp, get_pytest_cases, get_ttfw_app_paths
+CI_ENV_VARS = {
+ 'EXTRA_CFLAGS': '-Werror -Werror=deprecated-declarations -Werror=unused-variable '
+ '-Werror=unused-but-set-variable -Werror=unused-function',
+ 'EXTRA_CXXFLAGS': '-Werror -Werror=deprecated-declarations -Werror=unused-variable '
+ '-Werror=unused-but-set-variable -Werror=unused-function -Wstrict-prototypes',
+ 'LDGEN_CHECK_MAPPING': '1',
+}
+
def get_pytest_apps(
paths: List[str],
@@ -157,7 +165,8 @@ def main(args: argparse.Namespace) -> None:
if abs_extra_preserve_dir == abs_app_dir or abs_extra_preserve_dir in abs_app_dir.parents:
app.preserve = True
- ret_code = build_apps(
+ sys.exit(
+ build_apps(
apps,
parallel_count=args.parallel_count,
parallel_index=args.parallel_index,
@@ -170,8 +179,7 @@ def main(args: argparse.Namespace) -> None:
ignore_warning_file=args.ignore_warning_file,
copy_sdkconfig=args.copy_sdkconfig,
)
-
- sys.exit(ret_code)
+ )
if __name__ == '__main__':
@@ -276,8 +284,21 @@ if __name__ == '__main__':
default=os.path.join(IDF_PATH, '.gitlab', 'ci', 'default-build-test-rules.yml'),
help='default build test rules config file',
)
+ parser.add_argument(
+ '--skip-setting-flags',
+ action='store_true',
+ help='by default this script would set the build flags exactly the same as the CI ones. '
+ 'Set this flag to use your local build flags.',
+ )
arguments = parser.parse_args()
setup_logging(arguments.verbose)
+
+ # skip setting flags in CI
+ if not arguments.skip_setting_flags and not os.getenv('CI_JOB_ID'):
+ for _k, _v in CI_ENV_VARS.items():
+ os.environ[_k] = _v
+ LOGGER.info(f'env var {_k} set to "{_v}"')
+
main(arguments)
|
Enable kph error dialogs for debug builds | @@ -1127,7 +1127,6 @@ VOID PhpShowKphError(
_In_opt_ NTSTATUS Status
)
{
-#ifndef DEBUG
if (Status == STATUS_NO_SUCH_FILE)
{
PhShowError2(
@@ -1167,7 +1166,6 @@ VOID PhpShowKphError(
);
}
}
-#endif
}
VOID PhInitializeKph(
@@ -1203,7 +1201,7 @@ VOID PhInitializeKph(
{
if (latestBuildNumber != PhOsVersion.dwBuildNumber)
{
- if (KphParametersExists(PhGetStringOrDefault(kphServiceName, KPH_DEVICE_SHORT_NAME)))
+ if (KphParametersExists(PhGetString(kphServiceName)))
{
if (PhShowMessage(
NULL,
@@ -1215,7 +1213,7 @@ VOID PhInitializeKph(
return;
}
- if (NT_SUCCESS(KphResetParameters(PhGetStringOrDefault(kphServiceName, KPH_DEVICE_SHORT_NAME))))
+ if (NT_SUCCESS(KphResetParameters(PhGetString(kphServiceName))))
{
PhSetIntegerSetting(L"KphBuildNumber", PhOsVersion.dwBuildNumber);
}
@@ -1236,7 +1234,7 @@ VOID PhInitializeKph(
parameters.CreateDynamicConfiguration = TRUE;
if (NT_SUCCESS(status = KphConnect2Ex(
- PhGetStringOrDefault(kphServiceName, KPH_DEVICE_SHORT_NAME),
+ PhGetString(kphServiceName),
KPH_DEVICE_SHORT_NAME,
kphFileName->Buffer,
¶meters
|
Disable blocking crash for stability commit. | :: ~| mask.bus
=+ jon=(apex:musk bus q.pro)
?~ jon
- :: ?: fab
- :: [p.pro [%10 [%live %1 %constant-stop] q.pro]]
- :: [p.pro [%10 [%live %1 %constant-stop-fab] q.pro]]
+ ?: fab
+ [p.pro [%10 [%live %1 %constant-stop] q.pro]]
+ [p.pro [%10 [%live %1 %constant-stop-fab] q.pro]]
:: ~_ (dunk '%constant-blocked-type')
:: ~| [%constant-stopped-gene gen]
:: ~| [%constant-stopped-mask mask.bus]
:: ~| [%constant-stopped-formula `@p`(mug q.pro) q.pro]
- ~| %constant-folding-stopped
- !!
+ :: ~| %constant-folding-stopped
+ :: !!
?: ?=($| -.u.jon)
- :: ?: fab
- :: [p.pro [%10 [%live %1 %constant-block] q.pro]]
- :: [p.pro [%10 [%live %1 %constant-block-fab] q.pro]]
+ ?: fab
+ [p.pro [%10 [%live %1 %constant-block] q.pro]]
+ [p.pro [%10 [%live %1 %constant-block-fab] q.pro]]
:: ~_ (dunk '%constant-blocked-type')
:: ~| [%constant-blocked-gene gen]
:: ~| [%constant-blocked-mask mask.bus]
:: ~| [%constant-blocked-formula `@p`(mug q.pro) q.pro]
- ~| %constant-folding-blocked
- !!
+ :: ~| %constant-folding-blocked
+ :: !!
:: [p.pro [%10 [%live %1 %constant-nonblocked] %1 p.u.jon]]
[p.pro %1 p.u.jon]
::
|
Add Elbrus e2k architecture support | @@ -617,6 +617,10 @@ $(KDIR)zgemm_beta$(TSUFFIX).$(SUFFIX) : $(KERNELDIR)/$(ZGEMM_BETA)
$(KDIR)xgemm_beta$(TSUFFIX).$(SUFFIX) : $(KERNELDIR)/$(XGEMM_BETA)
$(CC) $(CFLAGS) -c -DXDOUBLE -DCOMPLEX $< -o $@
+ifeq ($(ARCH), E2K)
+USE_TRMM = 1
+endif
+
ifeq ($(BUILD_BFLOAT16), 1)
|
Add comptime error test. | (assert (= (constantly) (constantly)) "comptime 1")
(assert-error "arity issue in macro" (eval '(each [])))
+(assert-error "comptime issue" (eval '(comptime (error "oops"))))
(with [f (file/temp)]
(file/write f "foo\n")
|
Update data.yml
temporarily comment out Device vtables | @@ -1070,9 +1070,9 @@ classes:
Client::Graphics::Kernel::Device:
instances:
- ea: 0x141F11600
- vtbls:
+# vtbls:
#fail - ea: 0x1417DA950
- base: Client::Graphics::Singleton
+# base: Client::Graphics::Singleton
funcs:
#fail 0x140313040: ctor
0x14032A770: Initialize
@@ -1085,7 +1085,7 @@ classes:
0x14033A150: PrepareModel
0x1403D3BE0: Draw_cmd
Client::Graphics::Kernel::Device::ImmediateContext:
- vtbls:
+# vtbls:
#fail - ea: 0x14173A7C0
funcs:
0x140335760: ProcessCommands
|
Send write attributes request to Philips Hue devices only when sensor search is active
Prevent stallation of APS queues. | @@ -8856,7 +8856,11 @@ void DeRestPluginPrivate::delayedFastEnddeviceProbe()
return;
}
- if (sensor->modelId().startsWith(QLatin1String("RWL02"))) // Hue dimmer switch
+ if (findSensorsState != FindSensorsActive)
+ {
+ // do nothing
+ }
+ else if (sensor->modelId().startsWith(QLatin1String("RWL02"))) // Hue dimmer switch
{
// Stop the Hue dimmer from touchlinking when holding the On button.
deCONZ::ZclAttribute attr(0x0031, deCONZ::Zcl16BitBitMap, "mode", deCONZ::ZclReadWrite, false);
|
[ARB] Forgot to copy the fix to ATTRIB, OUTPUT and PARAM variables | @@ -2484,6 +2484,20 @@ void parseToken(sCurStatus* curStatusPtr, int vertex, char **error_msg, struct s
free(tok);
FAIL("Cannot redefine variable");
}
+
+ if (!strcmp(tok, "half")) {
+ // Special case for the 'half' keyword
+ pushArray((sArray*)curStatusPtr->curValue.newVar.var, strdup("gl4es_half"));
+
+ // Hopefully this doesn't make a free-after-free in case of error (though it shouldn't)
+ int ret;
+ khint_t varIdx = kh_put(variables, curStatusPtr->varsMap, tok, &ret);
+ if (ret < 0) {
+ FAIL("Unknown error");
+ }
+ kh_val(curStatusPtr->varsMap, varIdx) = curStatusPtr->curValue.newVar.var;
+ }
+
pushArray((sArray*)curStatusPtr->curValue.newVar.var, tok);
curStatusPtr->curValue.newVar.state = 1;
break; }
|
shm mod BUGFIX instid dependencies may be a union
Fixes | @@ -235,8 +235,13 @@ sr_shmmod_collect_instid_deps_data(sr_main_shm_t *main_shm, sr_dep_t *shm_deps,
/* extract module names from all the existing instance-identifiers */
for (j = 0; j < set->number; ++j) {
assert(set->set.d[j]->schema->nodetype & (LYS_LEAF | LYS_LEAFLIST));
- val_str = sr_ly_leaf_value_str(set->set.d[j]);
+ /* it can be a union and a non-instid value stored */
+ if (((struct lyd_node_leaf_list *)set->set.d[j])->value_type != LY_TYPE_INST) {
+ continue;
+ }
+ /* get target module name from the value */
+ val_str = sr_ly_leaf_value_str(set->set.d[j]);
mod_name = sr_get_first_ns(val_str);
ly_mod = ly_ctx_get_module(ly_ctx, mod_name, NULL, 1);
free(mod_name);
|
fix bone parity | ++ process-ack-message
|= [=message-num ok=?]
^+ peer-core
- :: if even bone, ack is on "subscription update" message; no-op
+ :: if odd bone, ack is on "subscription update" message; no-op
::
- ?: =(0 (end 0 1 bone))
+ ?: =(1 (end 0 1 bone))
peer-core
- :: odd bone; is this bone a nack-trace bone?
+ :: even bone; is this bone a nack-trace bone?
::
?: =(1 (end 0 1 (rsh 0 1 bone)))
:: nack-trace bone; assume .ok, clear nack from |message-still
|
sdl/hints: fix build when using SDL2 2.0.10 | @@ -57,6 +57,19 @@ package sdl
#if !(SDL_VERSION_ATLEAST(2,0,1))
#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE ""
#define SDL_HINT_VIDEO_HIGHDPI_DISABLED ""
+#endif
+
+#if !(SDL_VERSION_ATLEAST(2,0,10))
+#define SDL_HINT_MOUSE_TOUCH_EVENTS ""
+#endif
+
+#if SDL_VERSION_ATLEAST(2,0,10)
+
+#if defined(WARN_OUTDATED)
+#pragma message("SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH has been removed in SDL 2.0.10")
+#endif
+#define SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH "" // For compatibility
+
#endif
*/
import "C"
@@ -111,6 +124,7 @@ const (
HINT_RENDER_LOGICAL_SIZE_MODE = C.SDL_HINT_RENDER_LOGICAL_SIZE_MODE // specifies a variable controlling the scaling policy for SDL_RenderSetLogicalSize
HINT_MOUSE_NORMAL_SPEED_SCALE = C.SDL_HINT_MOUSE_NORMAL_SPEED_SCALE // specifies a variable setting the speed scale for mouse motion, in floating point, when the mouse is not in relative mode
HINT_MOUSE_RELATIVE_SPEED_SCALE = C.SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE // specifies a variable setting the scale for mouse motion, in floating point, when the mouse is in relative mode
+ HINT_MOUSE_TOUCH_EVENTS = C.SDL_HINT_MOUSE_TOUCH_EVENTS // specifies a variable to control whether mouse events should generate synthetic touch events
HINT_TOUCH_MOUSE_EVENTS = C.SDL_HINT_TOUCH_MOUSE_EVENTS // specifies a variable controlling whether touch events should generate synthetic mouse events
HINT_WINDOWS_INTRESOURCE_ICON = C.SDL_HINT_WINDOWS_INTRESOURCE_ICON // specifies a variable to specify custom icon resource id from RC file on Windows platform
HINT_WINDOWS_INTRESOURCE_ICON_SMALL = C.SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL // specifies a variable to specify custom icon resource id from RC file on Windows platform
|
[Changelog] my part of the Changelog | @@ -36,7 +36,7 @@ Main changes:
* [numerics] ConvexQP is a new class of problem for solving QP over convex set giving
the projection onto the set. New solvers for frictional contact problems have been
- added based on a succesive approximations by convexification.
+ added based on a successive approximations by convexification.
* [numerics] new solvers for frictional contact problems based on the Panagiotopoulos
approach (alternating normal and tangent problems)
@@ -48,8 +48,15 @@ Main changes:
* [numerics] add functionalities and test in NumericsMatrix for sparse storage
+ * [numerics] make more solvers storage-agnostic.
+ * [numerics] remove LinearSystem (superseded by NM_gesv)
+ * [numerics] add better error management: see the example in numerics/swig/numerics.i
+ Instead of exiting, the library can now handle fatal error and return
+ more gracefully
+
+ * [numerics] PATHVI is now supported
|
RhodesLib: fix iOS JSON issue | @@ -207,7 +207,47 @@ private:
}
-(NSString*) executeRubyMethodWithJSON:(NSString*)full_class_name method_name:(NSString*)method_name paramaters_in_json:(NSString*)paramaters_in_json {
- return nil;
+ /*rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+ rho::ruby::IObject* cpp_param = NULL;
+ if (paramaters_in_json != nil) {
+ cpp_param = rr->convertJSON_to_Objects([paramaters_in_json UTF8String]);
+ }
+ rho::ruby::IObject* cpp_object = rr->executeRubyMethod([full_class_name UTF8String], [method_name UTF8String], cpp_param);
+ rho::ruby::IString* res_str= NULL;
+ if (cpp_object != NULL) {
+ res_str = rr->convertObject_to_JSON(cpp_object);
+ }
+ NSString* res_ns_str = nil;
+ if (res_str != NULL) {
+ res_ns_str = [NSString stringWithUTF8String:res_str->getUTF8()];
+ }
+ if (cpp_param != NULL) {
+ cpp_param->release();
+ }
+ if (cpp_object != NULL) {
+ cpp_object->release();
+ }
+ if (res_str != NULL) {
+ res_str->release();
+ }
+ return res_ns_str;
+ */
+ rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+ const char* params_in_j = NULL;
+ if (paramaters_in_json != nil) {
+ params_in_j =[paramaters_in_json UTF8String];
+ }
+ rho::ruby::IString* res_str = rr->executeRubyMethodWithJSON([full_class_name UTF8String], [method_name UTF8String], params_in_j);
+
+ NSString* str_ns_result = nil;
+ if (res_str != NULL) {
+ const char* res_str_cstr = res_str->getUTF8();
+ if (res_str_cstr != NULL) {
+ str_ns_result = [NSString stringWithUTF8String:res_str_cstr];
+ }
+ res_str->release();
+ }
+ return str_ns_result;
}
|
Test ieee/ieee64 -> long and back | #include <stdio.h>
#include <assert.h>
+#include <float.h>
#include "grib_api_internal.h"
@@ -48,11 +49,58 @@ double p(double ref1,double ref2)
}
#endif
+/* generate a random floating point number from min to max */
+double randfrom(double min, double max)
+{
+ double range = (max - min);
+ double div = RAND_MAX / range;
+ return min + (rand() / div);
+}
+void test_doubles(ieee_to_long_proc ieee_to_long, long_to_ieee_proc long_to_ieee)
+{
+ const double tolerance = 1e-7;
+ const double increment = 1;
+ const double max_value = 10 * 1000 * 1000;
+ const double min_value = -max_value;
+ double d = max_value;
+ int num_errors = 0;
+ int num_trials = 0;
+ double max_reldiff = -DBL_MAX;
+
+ while (d > min_value) {
+ double start = randfrom(0.7,1) * d;
+ unsigned long a = ieee_to_long(start);
+ double end = long_to_ieee(a);
+ num_trials++;
+ if (start != 0.0) {
+ double reldiff = fabs(end - start)/start;
+ if (reldiff > tolerance) {
+ printf("Error: %.10f (diff=%.10f)\n", start, reldiff);
+ num_errors ++;
+ } else {
+ printf("Success: %.10f (diff=%.10f)\n", start, reldiff);
+ }
+ if (reldiff > max_reldiff) max_reldiff = reldiff;
+ }
+ d -= increment;
+ }
+ printf("trials = %d, errors = %d\n", num_trials,num_errors);
+ printf("max reldiff = %g\n", max_reldiff);
+}
+
int main(int argc, char *argv[])
{
#if 1
unsigned long i = 0;
+ //printf("Test doubles with grib_ieee_to_long/grib_long_to_ieee...\n");
+ //test_doubles(grib_ieee_to_long, grib_long_to_ieee);
+ printf("Test doubles with grib_ieee64_to_long/grib_long_to_ieee64...\n");
+ test_doubles(grib_ieee64_to_long, grib_long_to_ieee64);
+
+ printf("Test doubles. Done\n");
+ return 0;
+///////////////////////
test(3242539564, grib_ieee_to_long, grib_long_to_ieee);
assert(grib_ieee_to_long(grib_long_to_ieee(i)) == i);
|
Feat:adapt random function | #define GENERATE_KEY_REPEAT_TIMES 100
+BOAT_RESULT BoatRandom(BUINT8 *output, BUINT32 outputLen, void *rsvd)
+{
+ BOAT_RESULT result = BOAT_SUCCESS;
+
+ (void)rsvd;
+ qapi_fibo_random_data_get(outputLen,output);
+
+ return result;
+}
BOAT_RESULT BoatSignature(BoatWalletPriKeyCtx prikeyCtx,
|
Fix USDT semaphore address calculation for position independent executables (resolves
Fix USDT semaphore address calculation for position independent executables | @@ -444,7 +444,7 @@ int bcc_resolve_global_addr(int pid, const char *module, const uint64_t address,
mod.start == 0x0)
return -1;
- *global = mod.start + mod.file_offset + address;
+ *global = mod.start - mod.file_offset + address;
return 0;
}
|
py/vm: Don't do unnecessary updates of ip and sp variables.
Neither the ip nor sp variables are used again after the execution of the
RAISE_VARARGS opcode, so they don't need to be updated. | @@ -1118,7 +1118,7 @@ unwind_return:
ENTRY(MP_BC_RAISE_VARARGS): {
MARK_EXC_IP_SELECTIVE();
- mp_uint_t unum = *ip++;
+ mp_uint_t unum = *ip;
mp_obj_t obj;
if (unum == 2) {
mp_warning("exception chaining not supported");
@@ -1139,7 +1139,7 @@ unwind_return:
RAISE(obj);
}
} else {
- obj = POP();
+ obj = TOP();
}
obj = mp_make_raise_obj(obj);
RAISE(obj);
|
perf counters: export names | perf_counter_t perf_counters[PERF_COUNTER_MAX];
+static const char *perf_counter_names[PERF_COUNTER_MAX] = {
+ "PERF_COUNTER_TOTAL",
+ "PERF_COUNTER_GYRO",
+ "PERF_COUNTER_CONTROL",
+ "PERF_COUNTER_RX",
+ "PERF_COUNTER_OSD",
+ "PERF_COUNTER_MISC",
+ "PERF_COUNTER_BLACKBOX",
+ "PERF_COUNTER_DEBUG",
+};
+
static uint32_t perf_counter_start_time[PERF_COUNTER_MAX];
static uint32_t loop_counter = 0;
@@ -60,6 +71,9 @@ cbor_result_t cbor_encode_perf_counters(cbor_value_t *enc) {
for (uint32_t i = 0; i < PERF_COUNTER_MAX; i++) {
CBOR_CHECK_ERROR(res = cbor_encode_map_indefinite(enc));
+ CBOR_CHECK_ERROR(res = cbor_encode_str(enc, "name"));
+ CBOR_CHECK_ERROR(res = cbor_encode_str(enc, perf_counter_names[i]));
+
CBOR_CHECK_ERROR(res = cbor_encode_str(enc, "min"));
ENCODE_CYCLES(perf_counters[i].min)
|
shell - Don't register NULL command.
A command entry with all-fields-null was getting registered. This
made subsequently registered commands inaccessible. | @@ -219,16 +219,14 @@ static const struct shell_cmd os_commands[] = {
{ NULL, NULL, NULL },
};
-#define SHELL_OS_NUM_CMDS (sizeof os_commands / sizeof os_commands[0])
-
void
shell_os_register(void)
{
+ const struct shell_cmd *cmd;
int rc;
- int i;
- for (i = 0; i < SHELL_OS_NUM_CMDS; i++) {
- rc = shell_cmd_register(os_commands + i);
+ for (cmd = os_commands; cmd->sc_cmd != NULL; cmd++) {
+ rc = shell_cmd_register(cmd);
SYSINIT_PANIC_ASSERT_MSG(
rc == 0, "Failed to register OS shell commands");
}
|
clear local namespace | @@ -209,7 +209,7 @@ class Cosmology(object):
if list(pars)[0] == "cosmo":
vars()[name] = func
del background, boltzmann, bcm, cls, correlations, covariances, \
- pk2d, power, tracers, halos, nl_pt
+ neutrinos, pk2d, power, tk3d, tracers, halos, nl_pt
def __init__(
self, Omega_c=None, Omega_b=None, h=None, n_s=None,
|
Remove SCT extension from allowed encrypted extensions | @@ -118,9 +118,6 @@ int s2n_server_encrypted_extensions_parse(struct s2n_connection *conn, struct s2
case TLS_EXTENSION_ALPN:
GUARD(s2n_recv_server_alpn(conn, &extension));
break;
- case TLS_EXTENSION_SCT_LIST:
- GUARD(s2n_recv_server_sct_list(conn, &extension));
- break;
case TLS_EXTENSION_MAX_FRAG_LEN:
GUARD(s2n_recv_server_max_fragment_length(conn, &extension));
break;
@@ -132,6 +129,7 @@ int s2n_server_encrypted_extensions_parse(struct s2n_connection *conn, struct s2
case TLS_EXTENSION_SESSION_TICKET:
case TLS_EXTENSION_SUPPORTED_VERSIONS:
case TLS_EXTENSION_KEY_SHARE:
+ case TLS_EXTENSION_SCT_LIST:
S2N_ERROR(S2N_ERR_BAD_MESSAGE);
break;
}
|
[net][sal] Improve ioctl interface to support for socketfd operations | @@ -35,7 +35,9 @@ int dfs_net_getsocket(int fd)
static int dfs_net_ioctl(struct dfs_fd* file, int cmd, void* args)
{
- return -EIO;
+ int socket = (int) file->data;
+
+ return sal_ioctlsocket(socket, cmd, args);
}
static int dfs_net_read(struct dfs_fd* file, void *buf, size_t count)
|
Sanitizer: Update blacklist for latest `libstdc++` | # ========
# We ignore warnings about member calls on addresses, which do not point to an object of type `_Sp_counted_base`.
# It looks like this problem is caused by either `yaml-cpp` or `libstdc++`.
-src:.*include/c\+\+/6/bits/shared_ptr_base.h
+src:.*include/c\+\+/.+/bits/shared_ptr_base.h
# memory leaks reported by asan due to xerces interfaces, no issue according to valgrind
src:*xerces/*.cpp
|
Valgrind: Delete rule for removed plugin | fun:_ZNSsC1EPKcRKSaIcE
...
}
-{
- <insert_a_suppression_name_here>
- Memcheck:Leak
- match-leak-kinds: all
- ...
- obj:*libbotan*
- ...
-}
{
<insert_a_suppression_name_here>
Memcheck:Leak
|
FPS drawing in own function so that it can be called from outside in case aglSwapBuffers is not called by the client. | @@ -1231,12 +1231,7 @@ __attribute__((visibility("default"))) void gl4es_pre_swap()
}
}
-#ifdef AMIGAOS4
-void amiga_post_swap()
-#else
-__attribute__((visibility("default"))) void gl4es_post_swap()
-#endif
-{
+void show_fps() {
if (globals4es.showfps)
{
// framerate counter
@@ -1267,6 +1262,16 @@ __attribute__((visibility("default"))) void gl4es_post_swap()
}
last_frame = now;
}
+}
+
+
+#ifdef AMIGAOS4
+void amiga_post_swap()
+#else
+__attribute__((visibility("default"))) void gl4es_post_swap()
+#endif
+{
+ show_fps();
// If drawing in fbo, rebind it...
if (globals4es.usefbo) {
|
Remove use of memcpy in sim.c | #include "mark.h"
#include "sim.h"
+#if 0
+ORCA_FORCE_STATIC_INLINE void stupid_memcpy(char* restrict dest,
+ char* restrict src, size_t sz) {
+ for (size_t i = 0; i < sz; ++i) {
+ dest[i] = src[i];
+ }
+}
+#define ORCA_MEMCPY(_dest, _src, _sz) memcpy(_dest, _src, _sz)
+#endif
+
//////// Utilities
static Glyph const indexed_glyphs[] = {
@@ -508,9 +518,15 @@ BEGIN_DUAL_PHASE_1(loop)
Glyph buff[15];
Glyph* gs = gbuffer + y * width + x + 1;
Glyph hopped = *gs;
- memcpy(buff, gs + 1, len - 1);
+ // ORCA_MEMCPY(buff, gs + 1, len - 1);
+ for (Usz i = 0; i < len - 1; ++i) {
+ buff[i] = gs[i + 1];
+ }
buff[len - 1] = hopped;
- memcpy(gs, buff, len);
+ // ORCA_MEMCPY(gs, buff, len);
+ for (Usz i = 0; i < len; ++i) {
+ gs[i] = buff[i];
+ }
for (Usz i = 0; i < len; ++i) {
STUN(0, (Isz)i + 1);
}
|
stm32/mpconfigport.h: Enable lwIP concurrency protection mechanism. | @@ -357,6 +357,11 @@ static inline mp_uint_t disable_irq(void) {
#define MICROPY_THREAD_YIELD()
#endif
+// The LwIP interface must run at a raised IRQ priority
+#define MICROPY_PY_LWIP_ENTER uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+#define MICROPY_PY_LWIP_REENTER irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+#define MICROPY_PY_LWIP_EXIT restore_irq_pri(irq_state);
+
// We need an implementation of the log2 function which is not a macro
#define MP_NEED_LOG2 (1)
|
Sprites export with wrong palette | @@ -288,7 +288,7 @@ static s32 writeGifData(const tic_mem* tic, u8* dst, const u8* src, s32 width, s
if(palette)
{
- const tic_rgb* pal = tic->ram.vram.palette.colors;
+ const tic_rgb* pal = tic->cart.palette.colors;
for(s32 i = 0; i < TIC_PALETTE_SIZE; i++, pal++)
palette[i].r = pal->r, palette[i].g = pal->g, palette[i].b = pal->b;
|
Print description of LOCKTAG_RESOURCE_QUEUE in DescribeLockTag(). | @@ -1262,6 +1262,11 @@ DescribeLockTag(StringInfo buf, const LOCKTAG *tag)
tag->locktag_field3,
tag->locktag_field4);
break;
+ case LOCKTAG_RESOURCE_QUEUE:
+ appendStringInfo(buf,
+ _("resource queue %u"),
+ tag->locktag_field1);
+ break;
default:
appendStringInfo(buf,
_("unrecognized locktag type %d"),
|
keep rsaRemoved and rsaAdded strictly reverse order | @@ -288,16 +288,13 @@ celix_status_t topologyManager_rsaRemoved(void * handle, service_reference_pt re
topology_manager_pt manager = (topology_manager_pt) handle;
remote_service_admin_service_t *rsa = (remote_service_admin_service_t *) service;
- celixThreadMutex_lock(&manager->rsaListLock);
- arrayList_removeElement(manager->rsaList, rsa);
- celixThreadMutex_unlock(&manager->rsaListLock);
+ celixThreadMutex_lock(&manager->exportedServicesLock);
- if (celixThreadMutex_lock(&manager->exportedServicesLock) == CELIX_SUCCESS) {
- hash_map_iterator_pt iter = hashMapIterator_create(manager->exportedServices);
+ hash_map_iterator_pt exportedSvcIter = hashMapIterator_create(manager->exportedServices);
- while (hashMapIterator_hasNext(iter)) {
+ while (hashMapIterator_hasNext(exportedSvcIter)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+ hash_map_entry_pt entry = hashMapIterator_nextEntry(exportedSvcIter);
service_reference_pt key = hashMapEntry_getKey(entry);
hash_map_pt exports = hashMapEntry_getValue(entry);
@@ -326,19 +323,18 @@ celix_status_t topologyManager_rsaRemoved(void * handle, service_reference_pt re
hashMap_remove(manager->exportedServices, key);
hashMap_destroy(exports, false, false);
- hashMapIterator_destroy(iter);
- iter = hashMapIterator_create(manager->exportedServices);
- }
+ hashMapIterator_destroy(exportedSvcIter);
+ exportedSvcIter = hashMapIterator_create(manager->exportedServices);
}
- hashMapIterator_destroy(iter);
- celixThreadMutex_unlock(&manager->exportedServicesLock);
}
+ hashMapIterator_destroy(exportedSvcIter);
- if (celixThreadMutex_lock(&manager->importedServicesLock) == CELIX_SUCCESS) {
- hash_map_iterator_pt iter = hashMapIterator_create(manager->importedServices);
+ celixThreadMutex_lock(&manager->importedServicesLock);
- while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+ hash_map_iterator_pt importedSvcIter = hashMapIterator_create(manager->importedServices);
+
+ while (hashMapIterator_hasNext(importedSvcIter)) {
+ hash_map_entry_pt entry = hashMapIterator_nextEntry(importedSvcIter);
hash_map_pt imports = hashMapEntry_getValue(entry);
import_registration_t *import = hashMap_get(imports, rsa);
@@ -353,9 +349,14 @@ celix_status_t topologyManager_rsaRemoved(void * handle, service_reference_pt re
}
}
}
- hashMapIterator_destroy(iter);
+ hashMapIterator_destroy(importedSvcIter);
+
+ celixThreadMutex_lock(&manager->rsaListLock);
+ arrayList_removeElement(manager->rsaList, rsa);
+ celixThreadMutex_unlock(&manager->rsaListLock);
+
celixThreadMutex_unlock(&manager->importedServicesLock);
- }
+ celixThreadMutex_unlock(&manager->exportedServicesLock);
celix_logHelper_log(manager->loghelper, CELIX_LOG_LEVEL_INFO, "TOPOLOGY_MANAGER: Removed RSA");
|
Fix EIP 1191 | @@ -216,9 +216,9 @@ void getEthAddressStringFromBinary(uint8_t *address, uint8_t *out,
hashDigit = hashDigit & 0x0f;
}
if ((hashDigit > 7) && (tmp[i] > '9')) {
- out[i] = tmp[i] - 'a' + 'A';
+ out[i] = tmp[offset + i] - 'a' + 'A';
} else {
- out[i] = tmp[i];
+ out[i] = tmp[offset + i];
}
}
out[40] = '\0';
|
[mod_authn_ldap] fix crash (fixes
(thx mgottinger)
fix crash due to uninitialized memory during config parsing
x-ref:
"Broken LDAP authentication on lighttpd 1.4.56" | @@ -232,7 +232,7 @@ SETDEFAULTS_FUNC(mod_authn_ldap_set_defaults) {
buffer *b;
*(const buffer **)&b = cpv->v.b;
mod_authn_add_scheme(srv, b);
- ldc = malloc(sizeof(plugin_config_ldap));
+ ldc = calloc(1, sizeof(plugin_config_ldap));
force_assert(ldc);
ldc->errh = srv->errh;
ldc->auth_ldap_hostname = b->ptr;
|
Reset uid/gid on shared memory segment if client starts first. | @@ -652,6 +652,10 @@ svm_map_region (svm_map_region_args_t * a)
return (0);
}
+ /* Reset ownership in case the client started first */
+ if (fchown (svm_fd, a->uid, a->gid) < 0)
+ clib_unix_warning ("segment chown [ok if client starts first]");
+
time_left = 20;
while (1)
{
|
vere: add ames counters for filtered packets
Track the amount of packets we drop for mismatching protocol version or
invalid mug hash. | c3_o see_o; // can scry
c3_o fit_o; // filtering active
c3_y ver_y; // protocol version
+ c3_d vet_d; // version mismatches filtered
+ c3_d mut_d; // invalid mugs filtered
c3_d foq_d; // forward queue size
c3_d fow_d; // forwarded count
c3_d fod_d; // forwards dropped count
@@ -664,9 +666,13 @@ _ames_recv_cb(uv_udp_t* wax_u,
&& (sam_u->ver_y != (0x7 & *((c3_w*)buf_u->base))) )
{
pas_o = c3n;
- //TODO counter
//TODO unless sender is our sponsee (transitively?)
//TODO how does this interact with forwards?
+
+ sam_u->vet_d++;
+ if ( 0 == (sam_u->vet_d % 100) ) {
+ u3l_log("ames: %" PRIu64 " dropped for version mismatch\n", sam_u->vet_d);
+ }
}
if (c3y == pas_o) {
@@ -693,7 +699,10 @@ _ames_recv_cb(uv_udp_t* wax_u,
//
if ( hed_u.mug_l != _ca_mug_body(nrd_i - 4, bod_y) ) {
pas_o = c3n;
- //TODO counter?
+ sam_u->mut_d++;
+ if ( 0 == (sam_u->mut_d % 100) ) {
+ u3l_log("ames: %" PRIu64 " dropped for invalid mug\n", sam_u->mut_d);
+ }
}
// if we can scry, we might want to forward statelessly
//
|
Better packing for vm's catch entries. | @@ -38,9 +38,9 @@ typedef enum {
typedef struct lily_vm_catch_entry_ {
lily_call_frame *call_frame;
- int code_pos;
uint32_t call_frame_depth;
- lily_catch_kind catch_kind : 32;
+ uint16_t code_pos;
+ lily_catch_kind catch_kind : 16;
union {
lily_jump_link *jump_entry;
|
fix the misleading usage text | @@ -35,12 +35,11 @@ static void usage(void)
printf(R"(h2olog (v%s)
Usage: h2olog -p PID
h2olog quic -p PID
- h2olog quic -t event_type -p PID
- h2olog quic -v -s response_header_name -p PID
+ h2olog quic -s response_header_name -p PID
Other options:
- -h Shows this help and exit.
- -d Shows debugging information.
- -w <file> Write output to <file> instead of stdout.
+ -h Print this help and exit
+ -d Print debugging information
+ -w Path to write the output (default: stdout)
)",
VERSION);
return;
|
Update device-request.md
Changed the checkboxes and added the switch to the list. | @@ -19,14 +19,15 @@ assignees: ''
- Product name: The device name as shown on the product or package.
- Manufacturer: As per deCONZ GUI Basic cluster.
- Model identifier: As per deCONZ GUI Basic cluster.
-- Device type:
- - [ ] Light
- - [ ] Lock
- - [ ] Remote
- - [ ] Sensor
- - [ ] Siren
- - [ ] Thermostat
- - [ ] Other:
+- Device type : Please remove all unrelated device types.
+ - Light
+ - Lock
+ - Remote
+ - Sensor
+ - Siren
+ - Switch
+ - Thermostat
+ - Other:
<!--
Please refer to https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/Request-Device-Support
|
handle missing css/js files for initial startup | /= js
/^ octs
/; as-octs:mimes:html
- /: /===/app/write/js/index /js/
+ /| /: /===/app/write/js/index /js/
+ /~ *octs
+ ==
::
/= css
/^ octs
/; as-octs:mimes:html
- /: /===/app/write/css/index /css/
+ /| /: /===/app/write/css/index /css/
+ /~ *octs
+ ==
::
|%
::
|
Travis: Add server/client example test | @@ -49,3 +49,6 @@ script:
# Now build ngtcp2 examples and test
- make
- make check
+ - make gen-certificate
+ - ./examples/server localhost 4433 cert/server.key cert/server.crt &
+ - ./examples/client localhost 4433
|
soc(esp32): Expose SOC_DPORT_WORKAROUND_DIS_INTERRUPT_LVL for all ECO versions
It fixes a build issue when ESP32_ECO3_CACHE_LOCK_FIX=y
Closes | #if SOC_CAPS_ECO_VER < 2
#define SOC_DPORT_WORKAROUND 1
-#define SOC_DPORT_WORKAROUND_DIS_INTERRUPT_LVL (5U)
#endif // SOC_CAPS_ECO_VER < 2
+#define SOC_DPORT_WORKAROUND_DIS_INTERRUPT_LVL (5U)
/*-------------------------- ADC CAPS ----------------------------------------*/
/**
|
Indicate that scrcpy also works over TCP/IP | # scrcpy
This application provides display and control of Android devices connected on
-USB. It does not require any _root_ access. It works on _GNU/Linux_, _Windows_
-and _MacOS_.
+USB (or [over TCP/IP][article-tcpip]). It does not require any _root_ access.
+It works on _GNU/Linux_, _Windows_ and _MacOS_.
@@ -346,5 +346,8 @@ Read the [developers page].
## Articles
-- [Introducing scrcpy](https://blog.rom1v.com/2018/03/introducing-scrcpy/)
-- [Scrcpy now works wirelessly](https://www.genymotion.com/blog/open-source-project-scrcpy-now-works-wirelessly/)
+- [Introducing scrcpy][article-intro]
+- [Scrcpy now works wirelessly][article-tcpip]
+
+[article-intro]: https://blog.rom1v.com/2018/03/introducing-scrcpy/
+[article-tcpip]: https://www.genymotion.com/blog/open-source-project-scrcpy-now-works-wirelessly/
|
Update rockspec with missing files | @@ -26,11 +26,14 @@ build = {
["titan-compiler.ast"] = "titan-compiler/ast.lua",
["titan-compiler.checker"] = "titan-compiler/checker.lua",
["titan-compiler.coder"] = "titan-compiler/coder.lua",
+ ["titan-compiler.driver"] = "titan-compiler/driver.lua",
["titan-compiler.lexer"] = "titan-compiler/lexer.lua",
+ ["titan-compiler.location"] = "titan-compiler/location.lua",
["titan-compiler.parser"] = "titan-compiler/parser.lua",
["titan-compiler.pretty"] = "titan-compiler/pretty.lua",
["titan-compiler.symtab"] = "titan-compiler/symtab.lua",
["titan-compiler.syntax_errors"] = "titan-compiler/syntax_errors.lua",
+ ["titan-compiler.typedecl"] = "titan-compiler/typedecl.lua",
["titan-compiler.types"] = "titan-compiler/types.lua",
["titan-compiler.util"] = "titan-compiler/util.lua",
},
|
Prevent doubled entries in queue for read and write ZCL attributes | @@ -5123,6 +5123,26 @@ bool DeRestPluginPrivate::readAttributes(RestNodeBase *restNode, quint8 endpoint
}
DBG_Printf(DBG_INFO_L2, "]\n");
+ // check duplicates
+ for (const TaskItem &t0 : tasks)
+ {
+ if (t0.taskType != task.taskType ||
+ t0.req.dstAddress() != task.req.dstAddress() ||
+ t0.req.clusterId() != task.req.clusterId() ||
+ t0.req.dstEndpoint() != task.req.dstEndpoint() ||
+ t0.zclFrame.commandId() != task.zclFrame.commandId() ||
+ t0.zclFrame.manufacturerCode() != task.zclFrame.manufacturerCode())
+ {
+ continue;
+ }
+
+ if (t0.zclFrame.payload() == task.zclFrame.payload())
+ {
+ DBG_Printf(DBG_INFO, "discard read attributes of 0x%016llX cluster: 0x%04X (already in queue)\n", restNode->address().ext(), clusterId);
+ return false;
+ }
+ }
+
{ // ZCL frame
QDataStream stream(&task.req.asdu(), QIODevice::WriteOnly);
stream.setByteOrder(QDataStream::LittleEndian);
@@ -5243,6 +5263,27 @@ bool DeRestPluginPrivate::writeAttribute(RestNodeBase *restNode, quint8 endpoint
}
}
+ // check duplicates
+ for (const TaskItem &t0 : tasks)
+ {
+ if (t0.taskType != task.taskType ||
+ t0.req.dstAddress() != task.req.dstAddress() ||
+ t0.req.clusterId() != task.req.clusterId() ||
+ t0.req.dstEndpoint() != task.req.dstEndpoint() ||
+ t0.zclFrame.commandId() != task.zclFrame.commandId() ||
+ t0.zclFrame.manufacturerCode() != task.zclFrame.manufacturerCode())
+ {
+ continue;
+ }
+
+ if (t0.zclFrame.payload() == task.zclFrame.payload())
+ {
+ DBG_Printf(DBG_INFO, "discard write attribute of 0x%016llX cluster: 0x%04X: 0x%04X (already in queue)\n", restNode->address().ext(), clusterId, attribute.id());
+ return false;
+ }
+ }
+
+
{ // ZCL frame
QDataStream stream(&task.req.asdu(), QIODevice::WriteOnly);
stream.setByteOrder(QDataStream::LittleEndian);
|
Test SipHash Performance | @@ -130,6 +130,8 @@ uint64_t siphash24(const void *data, size_t len, uint64_t iv_key[2]) {
#if defined(DEBUG) && DEBUG == 1
#include <stdio.h>
+#include <time.h>
+
void bscrypt_test_siphash(void) {
uint64_t result =
siphash24("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e",
@@ -137,6 +139,15 @@ void bscrypt_test_siphash(void) {
fprintf(stderr, "===================================\n");
fprintf(stderr, "SipHash simple test %s\n",
(result == 0xa129ca6149be45e5ULL) ? "passed" : "FAILED");
+ clock_t start;
+ start = clock();
+ for (size_t i = 0; i < 100000; i++) {
+ __asm__ volatile("" ::: "memory");
+ result = siphash24("The quick brown fox jumps over the lazy dog ", 43,
+ SIPHASH_DEFAULT_KEY);
+ }
+ fprintf(stderr, "bscrypt 100K SipHash: %lf\n",
+ (double)(clock() - start) / CLOCKS_PER_SEC);
fprintf(stderr, "===================================\n");
}
|
OcAppleEventLib: Fix click timings | @@ -47,8 +47,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define MIN_POINTER_POLL_PERIOD 10
#define MAX_POINTER_POLL_PERIOD 80
-#define MAX_CLICK_DURATION 748 // 374 for 2 ms
-#define MAX_DOUBLE_CLICK_SPEED 148 // 74 for 2 ms
+#define MAX_CLICK_DURATION 148 // 74 for 2 ms
+#define MAX_DOUBLE_CLICK_SPEED 748 // 374 for 2 ms
#define MAX_POLL_DURATION ((MAX_UINT32 / 10000) / MAX_DOUBLE_CLICK_SPEED)
|
pick OIDC_SET_COOKIE_APPEND over ext passed in to oidc_util_set_cookie | @@ -997,13 +997,12 @@ void oidc_util_set_cookie(request_rec *r, const char *cookieName,
headerString = apr_psprintf(r->pool, "%s; %s", headerString,
OIDC_COOKIE_FLAG_HTTP_ONLY);
- if (ext != NULL)
- headerString = apr_psprintf(r->pool, "%s; %s", headerString, ext);
-
appendString = oidc_util_set_cookie_append_value(r, c);
if (appendString != NULL)
headerString = apr_psprintf(r->pool, "%s; %s", headerString,
appendString);
+ else if (ext != NULL)
+ headerString = apr_psprintf(r->pool, "%s; %s", headerString, ext);
/* sanity check on overall cookie value size */
if (strlen(headerString) > OIDC_COOKIE_MAX_SIZE) {
|
gh-actions: disable clang-3.9 build
An update to libstdc++ seems to have broken it. | @@ -265,9 +265,9 @@ jobs:
# - version: "3.8"
# distro: ubuntu-16.04
# arch_flags: -mavx2
- - version: "3.9"
- distro: ubuntu-18.04
- arch_flags: -mavx2
+ # - version: "3.9"
+ # distro: ubuntu-18.04
+ # arch_flags: -mavx2
# - version: "4.0"
# distro: ubuntu-18.04
# arch_flags: -mavx2
|
[Rust] View dispatches left-clicks to its sub-elements | @@ -90,6 +90,11 @@ impl UIElement for View {
if let Some(cb) = maybe_cb {
(cb)(self);
}
+
+ let mut elems_containing_mouse = &mut *self.sub_elements_containing_mouse.borrow_mut();
+ for elem in elems_containing_mouse {
+ elem.handle_left_click();
+ }
}
fn handle_superview_resize(&self, superview_size: Size) {
|
admin/ohpc-filesystem: sles splits elf binary dependency scanning; add setting
for _elflib_exclude_path | @@ -59,6 +59,7 @@ install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/rpm
%{__cat} <<EOF > %{buildroot}//usr/lib/rpm/fileattrs/ohpc.attr
%%__ohpc_provides /usr/lib/rpm/ohpc-find-provides
%%__ohpc_requires /usr/lib/rpm/ohpc-find-requires %%{buildroot} %{OHPC_HOME}
+
%%__ohpc_path ^%{OHPC_HOME}
%%__elf_exclude_path ^%{OHPC_HOME}
@@ -66,6 +67,12 @@ install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/rpm
%%__ohpc_flags magic_and_path
EOF
+%if 0%{?sles_version} || 0%{?suse_version}
+%{__cat} <<EOF >> %{buildroot}//usr/lib/rpm/fileattrs/ohpc.attr
+%%__elflib_exclude_path ^%{OHPC_HOME}
+EOF
+%endif
+
%files
%dir /opt/ohpc/
|
blackbox: use FSSP_MSPS_FRAME | @@ -134,8 +134,8 @@ void blackbox_update() {
if ((loop_counter % (uint32_t)((1000000.0f / LOOPTIME)) == 0)) {
smart_port_payload_t payload = {
- .frame_id = FSSP_DATA_FRAME,
- .value_id = 0x0830,
+ .frame_id = FSSP_MSPS_FRAME,
+ .value_id = 0x5000,
.value = 0x1337,
};
|
Have RISCV pass wait_field on yield-wait, setting to 0. | @@ -327,12 +327,13 @@ void yield(void) {
if (__yield_check_tasks()) {
return;
} else {
- register uint32_t a1 asm ("a0") = 1; // yield-wait
+ register uint32_t a0 asm ("a0") = 1; // yield-wait
+ register uint32_t wait_field asm ("a1") = 0; // yield result ptr
asm volatile (
"li a5, 0\n"
"ecall\n"
:
- : "r" (a0)
+ : "r" (a0), "r" (wait_field)
: "memory", "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7",
"t0", "t1", "t2", "t3", "t4", "t5", "t6", "ra"
);
|
Improve MCU CGEN freq setting for LimeSDRmini | @@ -149,16 +149,10 @@ uint8_t SetFrequencyCGEN(float_type freq)
float_type intpart;
//VCO frequency selection according to F_CLKH
{
- uint8_t iHdiv;
- for(iHdiv = 255; iHdiv; --iHdiv)
- {
+ uint8_t iHdiv_high = 2.9e9/2 / freq;
+ uint8_t iHdiv_low = 2.0e9/2 / freq + 0.5;
+ uint8_t iHdiv = (iHdiv_low + iHdiv_high)/2;
dFvco = 2 * (iHdiv) * freq;
- if (dFvco >= 2e9 && dFvco <= 2.9e9)
- goto VCO_FOUND;
- }
- return 3;//lime::ReportError(-2, "SetFrequencyCGEN(%g MHz) - cannot deliver requested frequency", freq / 1e6);
-VCO_FOUND:
- //dFvco = vcoFreqs[vcoCnt / 2];
Modify_SPI_Reg_bits(DIV_OUTCH_CGEN, iHdiv - 1);
}
//Integer division
|
YAML Benchmark: Reorder code | BUILD_DIRECTORY="@CMAKE_BINARY_DIR@"
SOURCE_DIRECTORY="@CMAKE_SOURCE_DIR@"
-KDB_COMMAND="@CMAKE_BINARY_DIR@/bin/kdb"
-export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib"
+KDB_COMMAND="$BUILD_DIRECTORY/bin/kdb"
PLUGINS=(yamlcpp yanlr yambi yawn yaypeg)
DATA_DIRECTORY="benchmarks/data"
BENCHMARK_TOOL="$BUILD_DIRECTORY/bin/benchmark_plugingetset"
@@ -19,8 +18,8 @@ INPUT_FILES=(
generated.yaml
)
INPUT_URL="https://raw.githubusercontent.com/sanssecours/rawdata/master/YAML"
+export LD_LIBRARY_PATH="$BUILD_DIRECTORY/lib"
-trap cleanup EXIT INT QUIT TERM
cleanup() {
rm -rf "$DATA_DIRECTORY"
@@ -117,6 +116,8 @@ benchmark() {
done
}
+trap cleanup EXIT INT QUIT TERM
+
check_environment
download_input
compare_plugin_output
|
raspberrypi.conf: Have the ability to overwrite SERIAL_CONSOLE | @@ -7,7 +7,7 @@ DEFAULTTUNE ?= "arm1176jzfshf"
require conf/machine/include/tune-arm1176jzf-s.inc
include conf/machine/include/rpi-base.inc
-SERIAL_CONSOLE = "115200 ttyAMA0"
+SERIAL_CONSOLE ?= "115200 ttyAMA0"
UBOOT_MACHINE = "rpi_config"
VC4_CMA_SIZE_raspberrypi ?= "cma-64"
|
builtin: Don't do direct grabs of the vm's msgbuf. | @@ -1094,7 +1094,7 @@ void lily_builtin_File_write(lily_state *s)
if (to_write->class_id == LILY_ID_STRING)
fputs(to_write->value.string->string, inner_file);
else {
- lily_msgbuf *msgbuf = lily_mb_flush(s->vm_buffer);
+ lily_msgbuf *msgbuf = lily_msgbuf_get(s);
lily_mb_add_value(msgbuf, s, to_write);
fputs(lily_mb_raw(msgbuf), inner_file);
}
@@ -1805,7 +1805,7 @@ void lily_builtin_List_join(lily_state *s)
if (lily_arg_count(s) == 2)
delim = lily_arg_string_raw(s, 1);
- lily_msgbuf *vm_buffer = lily_mb_flush(s->vm_buffer);
+ lily_msgbuf *vm_buffer = lily_msgbuf_get(s);
if (lv->num_values) {
int i, stop = lv->num_values - 1;
|
Return LDFLAGS setting to build/platform/python for Windows
Unlike ELF platforms, Windows requires .lib for dynamic linking. So PYMODULEs shall be linked against PythonXX.lib to work with PythonXX.dll which is the code of the Python program on Windows. | @@ -54,9 +54,13 @@ IF (USE_SYSTEM_PYTHON)
DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON sbr:629042628)
ENDIF()
CFLAGS(GLOBAL "/I$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include")
+ LDFLAGS("/LIBPATH:$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/libs")
ENDIF()
ELSEIF (NOT USE_ARCADIA_PYTHON)
CFLAGS(GLOBAL $PYTHON_FLAGS)
+ IF (OS_WINDOWS)
+ LDFLAGS_FIXED($PYTHON_LDFLAGS $PYTHON_LIBRARIES)
+ ENDIF()
ENDIF()
END()
|
Add test coverage for HTTP/2 CONNECT | @@ -22,6 +22,8 @@ my $quic_port = empty_port({
host => "127.0.0.1",
proto => "udp",
});
+my $one_shot_upstream = empty_port();
+my $g2 = one_shot_http_upstream("It works!", $one_shot_upstream);
my $server = spawn_h2o(<< "EOT");
listen:
type: quic
@@ -35,11 +37,45 @@ hosts:
"/":
proxy.connect:
- "+127.0.0.1:$origin_port"
+ - "+127.0.0.1:$one_shot_upstream"
proxy.timeout.io: 2000
EOT
my $ok_resp = qr{HTTP/[^ ]+ 200\s}m;
+subtest "h2get-connect" => sub {
+ my ($stderr,$stdout) = run_with_h2get_simple($server, <<"EOS");
+ req = {
+ ":method" => "CONNECT",
+ ":authority" => "127.0.0.1:$one_shot_upstream",
+ }
+ h2g.send_headers(req, 1, END_HEADERS)
+ while true
+ f = h2g.read(-1)
+ if f.type == "WINDOW_UPDATE" then
+ next
+ elsif f.type == "HEADERS" then
+ break
+ else
+ puts "got #{f.type} failed"
+ exit 1
+ end
+ end
+ h2g.send_data(1, 0, "It doesn't have to be HTTP!")
+ f = h2g.read(-1)
+ puts f.payload
+ if f.type != "DATA" then
+ puts "Frame type failed"
+ end
+ f = h2g.read(-1)
+ if f.type != "DATA" then
+ puts "Frame type failed"
+ end
+EOS
+ like $stdout, qr/It works!/s, "Response from origin";
+ unlike $stdout, qr/Failed/s, "Received expected frames";
+};
+
subtest "curl-h1" => sub {
subtest "basic", sub {
my $content = `curl --http1.1 -p -x 127.0.0.1:$server->{port} --silent -v --show-error http://127.0.0.1:$origin_port/echo 2>&1`;
|
workflow/unlock: simpler loop | @@ -59,12 +59,10 @@ static void _get_mnemonic_passphrase(char* passphrase_out)
{
char mnemonic_passphrase[SET_PASSWORD_MAX_PASSWORD_LENGTH] = {0};
char mnemonic_passphrase_repeat[SET_PASSWORD_MAX_PASSWORD_LENGTH] = {0};
- bool equal = false;
- while (!equal) {
+ while (true) {
password_enter("Enter\nmnemonic passphrase", mnemonic_passphrase);
password_enter("Confirm\nmnemonic passphrase", mnemonic_passphrase_repeat);
- equal = STREQ(mnemonic_passphrase, mnemonic_passphrase_repeat);
- if (equal) {
+ if (STREQ(mnemonic_passphrase, mnemonic_passphrase_repeat)) {
snprintf(passphrase_out, SET_PASSWORD_MAX_PASSWORD_LENGTH, "%s", mnemonic_passphrase);
break;
}
|
Utility: Extend documentation of `elektraReplace` | @@ -114,8 +114,11 @@ static inline ssize_t occurrences (char const * const text, char const * const p
/**
* @internal
*
- * @brief This function returns a new string replacing every occurrence of `pattern`
- * in `text` with `replacement`.
+ * @brief This function returns a newly allocated string replacing every occurrence of
+ * `pattern` in `text` with `replacement`.
+ *
+ * If the function was unable to allocate memory for the new string, then it will
+ * return `NULL` instead.
*
* @pre The parameter `text` must not be `NULL`.
* @pre The parameter `pattern` must not be `NULL` or an empty string.
|
tcmu-runner: add possible 12 and 16 bytes CDB debuginfo support. | @@ -286,14 +286,41 @@ static int generic_handle_cmd(struct tcmu_device *dev,
}
}
-#define TCMU_CDB_MAX_LEN 10 /* TODO: is 10 bytes for now */
+#define TCMU_CDB_MAX_LEN 16 /* 16 bytes for now */
static void tcmu_cdb_debug_info(const struct tcmulib_cmd *cmd)
{
- int i, n;
+ int i, n, bytes;
char buf[3 * TCMU_CDB_MAX_LEN + 1];
- bool short_cdb = cmd->cdb[0] <= 0x1f;
+ uint8_t group_code = cmd->cdb[0] >> 5;
- for (i = 0, n = 0; i < (short_cdb ? 6 : 10); i++) {
+ switch (group_code) {
+ case 0: /*000b for 6 bytes commands */
+ bytes = 6;
+ break;
+ case 1: /*001b for 10 bytes commands */
+ case 2: /*010b for 10 bytes commands */
+ bytes = 10;
+ break;
+ case 3: /*011b Reserved ? */
+ if (cmd->cdb[0] == 0x7f)
+ bytes = 7 + cmd->cdb[7];
+ else
+ bytes = 6;
+ break;
+ case 4: /*100b for 16 bytes commands */
+ bytes = 16;
+ break;
+ case 5: /*101b for 12 bytes commands */
+ bytes = 12;
+ break;
+ case 6: /*110b Vendor Specific */
+ case 7: /*111b Vendor Specific */
+ default:
+ /* TODO: */
+ bytes = 6;
+ }
+
+ for (i = 0, n = 0; i < bytes; i++) {
n += sprintf(buf + n, "%x ", cmd->cdb[i]);
}
sprintf(buf + n, "\n");
|
[telemetry] add project path information | @@ -17,7 +17,8 @@ luos_telemetry = {"telemetry_type": "luos_engine_build",
"unix_time": env.get("UNIX_TIME"),
"platform": env.get("PIOPLATFORM"),
"mcu": env.get("BOARD_MCU"),
- "f_cpu": env.get("BOARD_F_CPU")}
+ "f_cpu": env.get("BOARD_F_CPU"),
+ "project_path": env.get("PROJECT_DIR")}
try:
luos_telemetry["framework"] = env.get("PIOFRAMEWORK")[0]
|
WebPAnimDecoderNewInternal: validate bitstream before alloc
this avoids large allocations with corrupt files due to the canvas size | @@ -87,11 +87,19 @@ WebPAnimDecoder* WebPAnimDecoderNewInternal(
int abi_version) {
WebPAnimDecoderOptions options;
WebPAnimDecoder* dec = NULL;
+ WebPBitstreamFeatures features;
if (webp_data == NULL ||
WEBP_ABI_IS_INCOMPATIBLE(abi_version, WEBP_DEMUX_ABI_VERSION)) {
return NULL;
}
+ // Validate the bitstream before doing expensive allocations. The demuxer may
+ // be more tolerant than the decoder.
+ if (WebPGetFeatures(webp_data->bytes, webp_data->size, &features) !=
+ VP8_STATUS_OK) {
+ return NULL;
+ }
+
// Note: calloc() so that the pointer members are initialized to NULL.
dec = (WebPAnimDecoder*)WebPSafeCalloc(1ULL, sizeof(*dec));
if (dec == NULL) goto Error;
|
driverless.c: free an allocated memory, use MAX_OUTPUT_LEN | #include <cupsfilters/ipp.h>
#include <cupsfilters/ppdgenerator.h>
+#define MAX_OUTPUT_LEN 8192
+
static int debug = 0;
static int job_canceled = 0;
static void cancel_job(int sig);
@@ -554,7 +556,13 @@ list_printers (int mode, int reg_type_no, int isFax)
while ((bytes = cupsFileGetLine(fp, buffer, sizeof(buffer))) > 0)
{
- ippfind_output = (char *)malloc(8192*(sizeof(char)));
+ ippfind_output = (char *)malloc(MAX_OUTPUT_LEN*(sizeof(char)));
+ if (ippfind_output == NULL)
+ {
+ exit_status = 1;
+ goto error;
+ }
+
ptr = buffer;
while (ptr && !isalnum(*ptr & 255)) ptr ++;
@@ -566,9 +574,11 @@ list_printers (int mode, int reg_type_no, int isFax)
ptr ++;
} else
continue;
- snprintf(ippfind_output,8191,"%s",ptr);
+ snprintf(ippfind_output, MAX_OUTPUT_LEN, "%s", ptr);
cupsArrayAdd(service_uri_list_ipps,ippfind_output);
+ free(ippfind_output);
+ ippfind_output = NULL;
}
/*
* Copy the rest of the file
@@ -585,7 +595,13 @@ list_printers (int mode, int reg_type_no, int isFax)
fp = cupsFileStdin();
while ((bytes = cupsFileGetLine(fp, buffer, sizeof(buffer))) > 0)
{
- ippfind_output = (char *)malloc(8192*(sizeof(char)));
+ ippfind_output = (char *)malloc(MAX_OUTPUT_LEN*(sizeof(char)));
+ if (ippfind_output == NULL)
+ {
+ exit_status = 1;
+ goto error;
+ }
+
ptr = buffer;
while (ptr && !isalnum(*ptr & 255)) ptr ++;
@@ -597,8 +613,11 @@ list_printers (int mode, int reg_type_no, int isFax)
ptr ++;
} else
continue;
- snprintf(ippfind_output,8191,"%s",ptr);
+ snprintf(ippfind_output, MAX_OUTPUT_LEN, "%s", ptr);
cupsArrayAdd(service_uri_list_ipp,ippfind_output);
+
+ free(ippfind_output);
+ ippfind_output = NULL;
}
/*
* Copy the rest of the file
|
Update: Cycle.c: check for operator directly in ProcessInputBeliefEvents, instead of taking term apart after construction | @@ -250,18 +250,17 @@ void Cycle_ProcessInputBeliefEvents(long currentTime)
for(int len2=0; len2<MAX_SEQUENCE_LEN; len2++)
{
Event *precondition = FIFO_GetKthNewestSequence(&belief_events, k, len2);
- if(precondition != NULL && precondition->type != EVENT_TYPE_DELETED)
- {
- Term precond = Narsese_GetPreconditionWithoutOp(&precondition->term); //a or (&/,a,op)
- for(int i=0; i<COMPOUND_TERM_SIZE_MAX; i++)
+ if(len2 > 0)
{
- if(Narsese_isOperator(precond.atoms[i]))
+ Event *potential_op = FIFO_GetKthNewestSequence(&belief_events, k+len2, 0);
+ if(potential_op != NULL && potential_op->type != EVENT_TYPE_DELETED && Narsese_isOperation(&potential_op->term))
{
- goto NoReinforce; //if there is an op in a, then a longer sequ has also, try different k
+ break;
}
}
+ if(precondition != NULL && precondition->type != EVENT_TYPE_DELETED)
+ {
Cycle_ReinforceLink(precondition, &postcondition);
- NoReinforce:;
}
}
}
|
sse2: AltiVec implementations of simde_mm_load_{pd,si128} | @@ -2680,6 +2680,8 @@ simde_mm_load_pd (simde_float64 const mem_addr[HEDLEY_ARRAY_PARAM(2)]) {
#if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
r_.neon_u32 = vld1q_u32(HEDLEY_REINTERPRET_CAST(uint32_t const*, mem_addr));
+ #elif defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+ r_.altivec_f64 = vec_ld(0, HEDLEY_REINTERPRET_CAST(SIMDE_POWER_ALTIVEC_VECTOR(double) const*, mem_addr));
#else
r_ = *SIMDE_ALIGN_CAST(simde__m128d_private const*, mem_addr);
#endif
@@ -2742,7 +2744,13 @@ simde_mm_load_si128 (simde__m128i const* mem_addr) {
return _mm_load_si128(HEDLEY_REINTERPRET_CAST(__m128i const*, mem_addr));
#elif defined(SIMDE_ARM_NEON_A32V7_NATIVE)
simde__m128i_private r_;
+
+ #if defined(SIMDE_POWER_ALTIVEC_P5_NATIVE)
+ r_.altivec_i32 = vec_ld(0, HEDLEY_REINTERPRET_CAST(SIMDE_POWER_ALTIVEC_VECTOR(int) const*, mem_addr));
+ #else
r_.neon_i32 = vld1q_s32((int32_t const*) mem_addr);
+ #endif
+
return simde__m128i_from_private(r_);
#else
return *mem_addr;
|
Rust: Add release notes entry for crate publishing | @@ -147,6 +147,7 @@ you up to date with the multi-language support provided by Elektra.
- Add the `elektra-sys` crate which contains raw bindings to libelektra for Rust. _(Philipp Gackstatter)_
- Add the `elektra` crate which contains safe wrapper methods for the raw bindings. The crate contains bindings for the low-level API, which means that the data types `Key` and `KeySet` can now safely be used from Rust. The Rust version of the API has been designed to take advantage of Rust's type system and to be in accordance with the memory safety of Rust. For instance, the Key has been divided into `StringKey` and `BinaryKey`, to prevent type mismatches at compile time. With the binding for `KDB`, one can take advantage of the elektra ecosystem from Rust. See the [Readme](../../src/bindings/rust/README.md) for more. _(Philipp Gackstatter)_
+- The [elektra](https://crates.io/crates/elektra) and [elektra-sys](https://crates.io/crates/elektra-sys) crates have been published to crates.io for easier usage. _(Philipp Gackstatter)_
### <<Binding3>>
|
Upgrade setup-python to v4 | @@ -217,7 +217,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- - uses: actions/setup-python@v3
+ - uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
@@ -548,7 +548,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- - uses: actions/setup-python@v3
+ - uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
|
Fix flaky test_dist_train* | @@ -3444,9 +3444,9 @@ def run_dist_train(cmd, output_file_switch='--eval-file'):
hosts.write('localhost:' + str(port1) + '\n')
hosts.close()
- worker_0 = yatest.common.execute((CATBOOST_PATH, 'run-worker', '--node-port', str(port0), ), wait=False)
- worker_1 = yatest.common.execute((CATBOOST_PATH, 'run-worker', '--node-port', str(port1), ), wait=False)
- while worker_0.std_out == '' or worker_1.std_out == '':
+ yatest.common.execute((CATBOOST_PATH, 'run-worker', '--node-port', str(port0), ), wait=False)
+ yatest.common.execute((CATBOOST_PATH, 'run-worker', '--node-port', str(port1), ), wait=False)
+ while pm.is_port_free(port0) or pm.is_port_free(port1):
time.sleep(1)
eval_1_path = yatest.common.test_output_path('test_1.eval')
|
config-tools: clean up the vm names which do not exist
Clean up vm_name of vuart and/or VM_NAME of IVSHMEM which is not defined in
//vm/name while loading scenario XML.
Rviewed-by: Junjie Mao | @@ -37,6 +37,15 @@ def main(scenario):
schema_path=scenario_xml_schema_path,
)
pipeline.run(obj)
+
+ # Clean up the VM_NAME and/or vm_name which does not exist
+ etree = obj.get("scenario_etree").getroot()
+ vmNames = [name.text for name in etree.findall(".//vm/name")]
+ for name in etree.findall(".//IVSHMEM_VM/VM_NAME") + \
+ etree.findall(".//vuart_connection/endpoint/vm_name"):
+ if name.text not in vmNames:
+ name.text = ""
+
result = tostring(obj.get("scenario_etree").getroot())
result = result.decode()
result = convert_result({
|
Add no-strict-aliasing to STHAL CFLAGS. | @@ -395,7 +395,7 @@ BOOTLOADER_OBJS: FIRMWARE_OBJS
FIRMWARE_OBJS:
$(MAKE) -C $(CMSIS_DIR) BUILD=$(BUILD)/$(CMSIS_DIR) CFLAGS="$(CFLAGS) -fno-strict-aliasing"
- $(MAKE) -C $(STHAL_DIR) BUILD=$(BUILD)/$(STHAL_DIR)
+ $(MAKE) -C $(STHAL_DIR) BUILD=$(BUILD)/$(STHAL_DIR) CFLAGS="$(CFLAGS) -fno-strict-aliasing"
$(MAKE) -C $(MICROPY_DIR)/stmhal BUILD=$(BUILD)/$(MICROPY_DIR) BOARD=$(TARGET) QSTR_DEFS=$(OMV_QSTR_DEFS)
$(MAKE) -C $(WINC1500_DIR) BUILD=$(BUILD)/$(WINC1500_DIR)
$(MAKE) -C $(OMV_DIR) BUILD=$(BUILD)/$(OMV_DIR)
|
Homebridge script: delete config.json during homebridge reset | @@ -207,6 +207,7 @@ function checkHomebridge {
pkill homebridge
sleep 5
rm -rf /home/$MAINUSER/.homebridge/persist
+ rm -rf /home/$MAINUSER/.homebridge/config.json
fi
## check if apikey already exist or create a new apikey for homebridge apps
|
Fix potential fault at createDoubleObject
Resolves
Add additional check to `hi_malloc` for `r->str` when len equals to
SIZE_MAX. | @@ -221,6 +221,9 @@ static void *createIntegerObject(const redisReadTask *task, long long value) {
static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len) {
redisReply *r, *parent;
+ if (len == SIZE_MAX) // Prevents hi_malloc(0) if len equals to SIZE_MAX
+ return NULL;
+
r = createReplyObject(REDIS_REPLY_DOUBLE);
if (r == NULL)
return NULL;
|
hoon: revise leap:docs and apse:docs
when +apse sees a link, it presume that the following a batch comment,
and stops parsing so that it can be picked up by apex:docs next
this required a change to +leap, which has been rewritten to pretty much
look like +gap but stop parsing when encountering doccords. | ++ apse
%+ knee *whiz |. ~+
;~ pose
- ::TODO: if there is a $link then interpret it as the start
- ::of a prefix comment instead of postfix
- ::TODO consider special casing $%
- ::;~(less (exit ;~(plug (plus en-link) col ace)) (exit line))
- ;~(pfix into step line)
+ ;~(less ;~(plug into step en-link col ace) ;~(pfix into step line))
::
(easy *whiz)
==
::
++ leap :: whitespace w/o docs
%+ cold ~
- %- plus
;~ plug
- (star ace)
;~ pose
- ;~(plug (just '\0a') (star ace))
- ;~ plug col col
- ;~(less ;~(pose larg smol) ;~(plug (star prn) (just '\0a')))
- ==
+ (just '\0a')
+ ;~(plug gah ;~(pose gah skip))
+ skip
==
+ (star ;~(pose skip gah))
==
::
:: +smol: 2 aces then summary, 4 aces then paragraphs.
==
==
::
- ::
++ rant
|* sec=rule
%- star
(plus (ifix [into (just '\0a')] sec))
==
::
+ ++ skip :: non-doccord comment
+ ;~ plug
+ col col
+ ;~(less ;~(pose larg smol) ;~(plug (star prn) (just '\0a')))
+ ==
+ ::
++ null (cold ~ (star ace))
++ text (pick line code)
++ teyt (pick line ;~(pfix step code))
;~(pfix jump loaf)
==
==
+ ::TODO consider special casing $%
++ boba :: +$ arms
%+ knee [q=*term r=*help s=*hoon] |. ~+
%+ cook
|
boot_serial: espressif: change CRC call for esp chips general compatibility | #elif __ESPRESSIF__
#include <bootloader_utility.h>
#include <esp_rom_sys.h>
-#include <rom/crc.h>
+#include <esp_crc.h>
#include <endian.h>
#include <mbedtls/base64.h>
#else
@@ -732,8 +732,8 @@ boot_serial_output(void)
crc = crc16_itu_t(crc, data, len);
#elif __ESPRESSIF__
/* For ESP32 it was used the CRC API in rom/crc.h */
- crc = ~crc16_be(~CRC16_INITIAL_CRC, (uint8_t *)bs_hdr, sizeof(*bs_hdr));
- crc = ~crc16_be(~crc, (uint8_t *)data, len);
+ crc = ~esp_crc16_be(~CRC16_INITIAL_CRC, (uint8_t *)bs_hdr, sizeof(*bs_hdr));
+ crc = ~esp_crc16_be(~crc, (uint8_t *)data, len);
#else
crc = crc16_ccitt(CRC16_INITIAL_CRC, bs_hdr, sizeof(*bs_hdr));
crc = crc16_ccitt(crc, data, len);
@@ -819,7 +819,7 @@ boot_serial_in_dec(char *in, int inlen, char *out, int *out_off, int maxout)
#ifdef __ZEPHYR__
crc = crc16_itu_t(CRC16_INITIAL_CRC, out, len);
#elif __ESPRESSIF__
- crc = ~crc16_be(~CRC16_INITIAL_CRC, (uint8_t *)out, len);
+ crc = ~esp_crc16_be(~CRC16_INITIAL_CRC, (uint8_t *)out, len);
#else
crc = crc16_ccitt(CRC16_INITIAL_CRC, out, len);
#endif
|
Fix operator 'in/not in' default weekdays
Issue | @@ -389,7 +389,8 @@ RuleCondition::RuleCondition() :
RuleCondition::RuleCondition(const QVariantMap &map) :
m_prefix(nullptr),
m_suffix(nullptr),
- m_num(0)
+ m_num(0),
+ m_weekDays(127) // default all days enabled
{
bool ok;
m_address = map["address"].toString();
|
docs: update a description about dependencies | @@ -42,7 +42,8 @@ For project status update, please visit [BoAT Project Status Update Reports](htt
### Dependencies
-BoAT is tested with following dependencies. The dependent softwares with lower version probably work well but are not tested.
+BoAT is tested with the following dependencies:
+(The dependent software with a lower version will most likely work well but are not tested).
#### General
In general, following dependencies are required:
|
Update index_board_ESP8266_Boards.html
fix blynk server address | <block type="blynk_server">
<value name="server_add">
<shadow type="text">
- <field name="TEXT">blynk-cloud.com</field>
+ <field name="TEXT">116.62.49.166</field>
</shadow>
</value>
<value name="auth_key">
<block type="blynk_smartconfig">
<value name="server_add">
<shadow type="text">
- <field name="TEXT">blynk-cloud.com</field>
+ <field name="TEXT">116.62.49.166</field>
</shadow>
</value>
<value name="auth_key">
</value>
<value name="server">
<shadow type="math_number">
- <field name="NUM">blynk-cloud.com</field>
+ <field name="NUM">116.62.49.166</field>
</shadow>
</value>
</block>
<block type="blynk_AP_config_2">
<value name="server">
<shadow type="math_number">
- <field name="NUM">blynk-cloud.com</field>
+ <field name="NUM">116.62.49.166</field>
</shadow>
</value>
</block>
|
fix xcat install guide names | @@ -74,7 +74,7 @@ for mirroring the OpenHPC repositories with rsync can be found in the
* [Latest version of 'ohpc-release' for EL7](https://github.com/openhpc/ohpc/releases/download/v1.3.GA/ohpc-release-1.3-1.el7.x86_64.rpm) (md5sum=d5139cf3aa83d095e6851628e8a684fa)
* [Install Guide (with Warewulf + PBS Professional)](https://github.com/openhpc/ohpc/releases/download/v1.3.4.GA/Install_guide-CentOS7-Warewulf-PBSPro-1.3.4-x86_64.pdf)
* [Install Guide (with Warewulf + Slurm)](https://github.com/openhpc/ohpc/releases/download/v1.3.4.GA/Install_guide-CentOS7-Warewulf-SLURM-1.3.4-x86_64.pdf)
-* [Install Guide (with xCAT + Slurm)](https://github.com/openhpc/ohpc/releases/download/v1.3.4.GA/Install_guide-CentOS7-xCAT-SLURM-1.3.4-x86_64.pdf)
+* [Install Guide (with xCAT (Stateless) + Slurm)](https://github.com/openhpc/ohpc/releases/download/v1.3.4.GA/Install_guide-CentOS7-xCAT-Stateless-SLURM-1.3.4-x86_64.pdf)
* [Install Guide (with xCAT (Stateful) + Slurm)](https://github.com/openhpc/ohpc/releases/download/v1.3.4.GA/Install_guide-CentOS7-xCAT-Stateful-SLURM-1.3.4-x86_64.pdf)
* [Tar Archive](http://build.openhpc.community/dist/1.3.4/OpenHPC-1.3.4.CentOS_7.x86_64.tar) mirror of yum repository (md5sum=55ccd2092782c31b339cf77cc3955a39)
|
Optimize after asyncify | @@ -24,20 +24,19 @@ Input module:
)
Asyncify command:
- wasm-opt async.wasm -O3 --asyncify -o asyncified.wasm
+ wasm-opt async.wasm --asyncify -O3 -o asyncified.wasm
"""
# WebAssembly binary
WASM = base64.b64decode("""
AGFzbQEAAAABDANgAABgAX8AYAABfwImAwNlbnYGYmVmb3JlAAADZW52BXNsZWVwAAEDZW52BWFm
- dGVyAAADBwYAAQABAAIFBAEBAQEGCwJ/AUEAC38BQQALB4QBBwZtZW1vcnkCAARtYWluAAMVYXN5
- bmNpZnlfc3RhcnRfdW53aW5kAAQUYXN5bmNpZnlfc3RvcF91bndpbmQABRVhc3luY2lmeV9zdGFy
- dF9yZXdpbmQABhRhc3luY2lmeV9zdG9wX3Jld2luZAAHEmFzeW5jaWZ5X2dldF9zdGF0ZQAICvcB
- Bo8BAQF/An8CfyMAQQJGBEAjASMBKAIAQXxqNgIAIwEoAgAoAgAhAAsgAEULQQEjABsEQBAAQQAj
- AEEBRg0BGgsgAEEBRkEBIwAbBEBB0A8QAUEBIwBBAUYNARoLIABBAkZBASMAGwRAEAJBAiMAQQFG
- DQEaCw8LIQAjASgCACAANgIAIwEjASgCAEEEajYCAAsZAEEBJAAgACQBIwEoAgAjASgCBEsEQAAL
- CxUAQQAkACMBKAIAIwEoAgRLBEAACwsZAEECJAAgACQBIwEoAgAjASgCBEsEQAALCxUAQQAkACMB
- KAIAIwEoAgRLBEAACwsEACMACw==
+ dGVyAAADBgUAAQABAgUEAQEBAQYLAn8BQQALfwFBAAsHhAEHBm1lbW9yeQIABG1haW4AAxVhc3lu
+ Y2lmeV9zdGFydF91bndpbmQABBRhc3luY2lmeV9zdG9wX3Vud2luZAAFFWFzeW5jaWZ5X3N0YXJ0
+ X3Jld2luZAAGFGFzeW5jaWZ5X3N0b3BfcmV3aW5kAAUSYXN5bmNpZnlfZ2V0X3N0YXRlAAcK3gEF
+ jAEBAX8CfyMAQQJGBEAjASMBKAIAQXxqNgIAIwEoAgAoAgAhAAsgAEVBASMAGwRAEABBACMAQQFG
+ DQEaCyAAQQFGQQEjABsEQEHQDxABQQEjAEEBRg0BGgsgAEECRkEBIwAbBEAQAkECIwBBAUYNARoL
+ DwshACMBKAIAIAA2AgAjASMBKAIAQQRqNgIACxkAQQEkACAAJAEjASgCACMBKAIESwRAAAsLFQBB
+ ACQAIwEoAgAjASgCBEsEQAALCxkAQQIkACAAJAEjASgCACMBKAIESwRAAAsLBAAjAAs=
""")
# Init asyncio
|
BugID:21997451:[example]fix compile issue when ota enabled | #include "linkkit/wifi_provision_api.h"
#include "linkkit/infra/infra_compat.h"
#include "linkkit/infra/infra_defs.h"
+#include "linkkit/wrappers/wrappers.h"
#ifdef CSP_LINUXHOST
#include <signal.h>
@@ -51,10 +52,10 @@ void print_heap()
#if defined(ENABLE_AOS_OTA)
static ota_service_t *ota_get_device_info(void)
{
- char product_key[PRODUCT_KEY_LEN + 1] = {0};
- char device_name[DEVICE_NAME_LEN + 1] = {0};
- char device_secret[DEVICE_SECRET_LEN + 1] = {0};
- char product_secret[PRODUCT_SECRET_LEN + 1] = {0};
+ char product_key[IOTX_PRODUCT_KEY_LEN + 1] = {0};
+ char device_name[IOTX_DEVICE_NAME_LEN + 1] = {0};
+ char device_secret[IOTX_DEVICE_SECRET_LEN + 1] = {0};
+ char product_secret[IOTX_PRODUCT_SECRET_LEN + 1] = {0};
HAL_GetProductSecret(product_secret);
HAL_GetProductKey(product_key);
HAL_GetDeviceName(device_name);
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.