message
stringlengths
6
474
diff
stringlengths
8
5.22k
support splitting for jstyle tests
@@ -450,6 +450,8 @@ def onadd_check(unit, *args): test_dir = unit.resolve(os.path.join(unit.path())) test_timeout = '' + fork_mode = '' + if check_type in ["PEP8", "PYFLAKES", "PY_FLAKES", "PEP8_2", "PYFLAKES_2"]: script_rel_path = "py.lint.pylint" elif check_type in ["PEP8_3", "PYFLAKES_3"]: @@ -468,6 +470,7 @@ def onadd_check(unit, *args): flat_args[1] = allowed_levels[check_level] script_rel_path = "java.style" test_timeout = '120' + fork_mode = unit.get('TEST_FORK_MODE') or '' elif check_type == "gofmt": script_rel_path = check_type go_files = flat_args[1:] @@ -487,7 +490,7 @@ def onadd_check(unit, *args): 'TEST-DATA': '', 'SPLIT-FACTOR': '', 'TEST_PARTITION': 'SEQUENTIAL', - 'FORK-MODE': '', + 'FORK-MODE': fork_mode, 'FORK-TEST-FILES': '', 'SIZE': 'SMALL', 'TAG': '', @@ -497,6 +500,7 @@ def onadd_check(unit, *args): 'PYTHON-PATHS': '', 'FILES': serialize_list(flat_args[1:]) } + data = dump_test(unit, test_record) if data: unit.set_property(["DART_DATA", data])
Don't warn on missing field initializers
@@ -40,7 +40,7 @@ export REDIS_TEST_CONFIG CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') OPTIMIZATION?=-O3 -WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings +WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers DEBUG_FLAGS?= -g -ggdb REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) REAL_LDFLAGS=$(LDFLAGS)
doc: remove duplicate release note entries
@@ -180,11 +180,6 @@ you up to date with the multi-language support provided by Elektra. - Improved documentation for module keymeta in Elektra Core. _(@lawli3t)_ - Improved documentation for module keytest in Elektra Core. _(@lawli3t)_ - Improved documentation for module keyset in Elektra Core. _(@lawli3t)_ -- Improved documentation for module kdb in Elektra Core. _(@lawli3t)_ -- Improved documentation for module key in Elektra Core. _(@lawli3t)_ -- Improved documentation for module keymeta in Elektra Core. _(@lawli3t)_ -- Improved documentation for module keyname in Elektra Core. _(@lawli3t)_ -- Improved documentation for module keyset in Elektra Core. _(@lawli3t)_ ## Tests
[TCE] disable fp16/loopvec It's too fragile, needs to be figured out why it works sometimes and somtimes not.
@@ -42,20 +42,20 @@ set_tests_properties( "tce/fp16/repl" ENVIRONMENT "POCL_DEVICES=ttasim;POCL_TTASIM0_PARAMETERS=${CMAKE_SOURCE_DIR}/tools/data/test_machine_fp16.adf;POCL_WORK_GROUP_METHOD=repl" DEPENDS "pocl_version_check") -add_test_pocl(NAME "tce/fp16/loopvec" COMMAND "fp16_host" EXPECTED_OUTPUT "expected_out.txt") +# add_test_pocl(NAME "tce/fp16/loopvec" COMMAND "fp16_host" EXPECTED_OUTPUT "expected_out.txt") -set_tests_properties( "tce/fp16/loopvec" - PROPERTIES - COST 40.0 - PROCESSORS 1 - LABELS "tce;tta;ttasim;half" - ENVIRONMENT "POCL_DEVICES=ttasim;POCL_TTASIM0_PARAMETERS=${CMAKE_SOURCE_DIR}/tools/data/test_machine_fp16.adf;POCL_WORK_GROUP_METHOD=loopvec" - DEPENDS "pocl_version_check") +#set_tests_properties( "tce/fp16/loopvec" +# PROPERTIES +# COST 40.0 +# PROCESSORS 1 +# LABELS "tce;tta;ttasim;half" +# ENVIRONMENT "POCL_DEVICES=ttasim;POCL_TTASIM0_PARAMETERS=${CMAKE_SOURCE_DIR}/tools/data/test_machine_fp16.adf;POCL_WORK_GROUP_METHOD=loopvec" +# DEPENDS "pocl_version_check") #if(LLVM_OLDER_THAN_6_0) # TODO: Produces wrong results also with LLVM 7 now. It seems to be very # fragile to IR changes. - set_property(TEST "tce/fp16/loopvec" - APPEND PROPERTY WILL_FAIL 1) +# set_property(TEST "tce/fp16/loopvec" +# APPEND PROPERTY WILL_FAIL 1) #endif()
sort output from repoquery
@@ -18,9 +18,9 @@ if [ -e /etc/redhat-release ];then # query repo for ohpc packages if [ -z "$skip" ];then - repoquery -qa $options --queryformat='%{Name} %{Version} %{URL} %{Group} %{Summary}\n' | grep -e "-ohpc\b" >> ${logfile}.all + repoquery -qa $options --queryformat='%{Name} %{Version} %{URL} %{Group} %{Summary}\n' | grep -e "-ohpc\b" | sort >> ${logfile}.all else - repoquery -qa $options --queryformat='%{Name} %{Version} %{URL} %{Group} %{Summary}\n' | grep -e "-ohpc\b" | egrep -v $skip >> ${logfile}.all + repoquery -qa $options --queryformat='%{Name} %{Version} %{URL} %{Group} %{Summary}\n' | grep -e "-ohpc\b" | egrep -v $skip | sort >> ${logfile}.all fi info=`repoquery -q $options --queryformat='%{Name} %{Version} %{URL} %{Group} %{Summary}\n' ohpc-release`
in_tail: initialize mult_parsers list before parsing properties if not initialized, any error during the parsing of options will cause the *mult_destroy function to segfault.
@@ -57,6 +57,8 @@ int flb_tail_mult_create(struct flb_tail_config *ctx, ctx->multiline_flush = 1; } + mk_list_init(&ctx->mult_parsers); + /* Get firstline parser */ tmp = flb_input_get_property("parser_firstline", ins); if (!tmp) { @@ -70,7 +72,6 @@ int flb_tail_mult_create(struct flb_tail_config *ctx, } ctx->mult_parser_firstline = parser; - mk_list_init(&ctx->mult_parsers); /* Read all multiline rules */ mk_list_foreach(head, &ins->properties) {
Fix cube winding;
@@ -779,32 +779,32 @@ void lovrGraphicsBox(DrawMode mode, Material* material, mat4 transform) { float data[] = { // Front -.5, -.5, -.5, 0, 0, -1, 0, 0, - .5, -.5, -.5, 0, 0, -1, 1, 0, -.5, .5, -.5, 0, 0, -1, 0, 1, + .5, -.5, -.5, 0, 0, -1, 1, 0, .5, .5, -.5, 0, 0, -1, 1, 1, // Right .5, .5, -.5, 1, 0, 0, 0, 1, - .5, -.5, -.5, 1, 0, 0, 0, 0, .5, .5, .5, 1, 0, 0, 1, 1, + .5, -.5, -.5, 1, 0, 0, 0, 0, .5, -.5, .5, 1, 0, 0, 1, 0, // Back .5, -.5, .5, 0, 0, 1, 0, 0, - -.5, -.5, .5, 0, 0, 1, 1, 0, .5, .5, .5, 0, 0, 1, 0, 1, + -.5, -.5, .5, 0, 0, 1, 1, 0, -.5, .5, .5, 0, 0, 1, 1, 1, // Left -.5, .5, .5, -1, 0, 0, 0, 1, - -.5, -.5, .5, -1, 0, 0, 0, 0, -.5, .5, -.5, -1, 0, 0, 1, 1, + -.5, -.5, .5, -1, 0, 0, 0, 0, -.5, -.5, -.5, -1, 0, 0, 1, 0, // Bottom -.5, -.5, -.5, 0, -1, 0, 0, 0, - -.5, -.5, .5, 0, -1, 0, 0, 1, .5, -.5, -.5, 0, -1, 0, 1, 0, + -.5, -.5, .5, 0, -1, 0, 0, 1, .5, -.5, .5, 0, -1, 0, 1, 1, // Adjust @@ -813,8 +813,8 @@ void lovrGraphicsBox(DrawMode mode, Material* material, mat4 transform) { // Top -.5, .5, -.5, 0, 1, 0, 0, 1, - .5, .5, -.5, 0, 1, 0, 1, 1, -.5, .5, .5, 0, 1, 0, 0, 0, + .5, .5, -.5, 0, 1, 0, 1, 1, .5, .5, .5, 0, 1, 0, 1, 0 };
added more typecheck tests for ipairs
@@ -366,7 +366,7 @@ describe("Pallene type checker", function() ]], "missing control variable in for-in loop") end) - it("checks the arguments of ipairs.", function() + it("checks loops with ipairs.", function() assert_error([[ export function fn() for i: integer in ipairs() do @@ -382,6 +382,22 @@ describe("Pallene type checker", function() end end ]], "type error: function expects 1 argument(s) but received 2") + + assert_error([[ + export function fn() + for i, x, z in ipairs({1, 2}) do + local k = z + end + end + ]], "type error: expected function type (any, any) -> (any, any, any) but found function type (any, any) -> (any, any) in loop iterator") + + assert_error([[ + export function fn() + for i in ipairs({1, 2}) do + local k = z + end + end + ]], "type error: expected function type (any, any) -> (any) but found function type (any, any) -> (any, any) in loop iterator") end)
utils: fix log format specifier (CID 304433)
@@ -154,7 +154,7 @@ int flb_utils_set_daemon(struct flb_config *config) } /* Our last STDOUT messages */ - flb_info("switching to background mode (PID=%lu)", getpid()); + flb_info("switching to background mode (PID=%ld)", (long) getpid()); fclose(stderr); fclose(stdout);
vlib: Fix packet tracing Type: fix Fixes:
@@ -145,7 +145,7 @@ vlib_trace_buffer (vlib_main_t * vm, (struct vlib_trace_main_t *) tm); } - //vlib_trace_next_frame (vm, r, next_index); + vlib_trace_next_frame (vm, r, next_index); pool_get (tm->trace_buffer_pool, h);
DESERIALIZER: Small bugfix in the deser_process()
@@ -443,7 +443,8 @@ static int deser_process(const OSSL_PARAM params[], void *arg) * that's the case, we do this extra check. */ if (deser == NULL && ctx->start_input_type != NULL - && strcasecmp(ctx->start_input_type, deser_inst->input_type) != 0) + && strcasecmp(ctx->start_input_type, + new_deser_inst->input_type) != 0) continue; /*
SOVERSION bump to version 7.11.12
@@ -73,7 +73,7 @@ set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_ # with backward compatible change and micro version is connected with any internal change of the library. set(SYSREPO_MAJOR_SOVERSION 7) set(SYSREPO_MINOR_SOVERSION 11) -set(SYSREPO_MICRO_SOVERSION 11) +set(SYSREPO_MICRO_SOVERSION 12) set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}.${SYSREPO_MICRO_SOVERSION}) set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
BugID:18959339: canopen coponent aos.mk should add version and summary info
@@ -2,6 +2,8 @@ NAME := canopen ifeq ($(CANOPEN),canfestival) $(NAME)_MBINS_TYPE := kernel +$(NAME)_VERSION := 3.0 +$(NAME)_SUMMARY := canfestival canopen stack $(NAME)_SOURCES := src/dcf.c $(NAME)_SOURCES += src/emcy.c
Cirrus: Install `checkbashisms` on macOS
@@ -73,6 +73,8 @@ mac_task: yaep yajl yaml-cpp + - > # Try to install `checkbashisms` (The file server that hosts the package is unfortunately quite unreliable.) + brew install checkbashisms || >&2 printf 'Warning: Unable to install `checkbashims`\n' - > # Start D-Bus session bus brew services start dbus - | # Install Python
generate vdso-offset.h as a dependency for unix_machine.o, add to CLEANFILES
@@ -184,7 +184,7 @@ VDSO_DEPS= $(patsubst %.o,%.d,$(VDSO_OBJS)) OBJDUMPFLAGS= -d -S DEPFILES+= $(VDSO_DEPS) -CLEANFILES+= $(foreach f,gitversion.c frame.inc kernel.dis kernel.elf bin/kernel.img src/unix/ftrace.* $(ARCHDIR)/ftrace.*,$(OBJDIR)/$f) $(VDSO_OBJDIR)/vdso.so $(VDSO_OBJDIR)/vdso-image.c $(VDSO_OBJS) $(VDSO_DEPS) +CLEANFILES+= $(foreach f,gitversion.c frame.inc kernel.dis kernel.elf bin/kernel.img src/unix/ftrace.* $(ARCHDIR)/ftrace.*,$(OBJDIR)/$f) $(VDSO_OBJDIR)/vdso.so $(VDSO_OBJDIR)/vdso-image.c $(VDSO_OBJDIR)/vdso-offset.h $(VDSO_OBJS) $(VDSO_DEPS) CLEANDIRS+= $(foreach d,output/platform output src vdso/src/$(ARCH) vdso/src vdso vendor vendor/lwip vendor/lwip/src platform,$(OBJDIR)/$d) OBJCOPYFLAGS = -S -O binary @@ -277,7 +277,9 @@ $(VDSO_OBJDIR)/vdso-image.c: contgen $(VDSOGEN) $(VDSO_OBJDIR)/vdso.so $(VDSO_OBJDIR)/vdso-offset.h: $(VDSO_OBJDIR)/vdso.so $(OBJDUMP) -t $(VDSO_OBJDIR)/vdso.so | grep __vdso_rt_sigreturn | sed "s/^\([[:xdigit:]]*\) .*/#define VDSO_OFFSET_RT_SIGRETURN 0x\1/" > $@ -$(PROG-kernel.elf): linker_script $(VDSO_OBJDIR)/vdso-image.c $(VDSO_OBJDIR)/vdso-offset.h +$(OBJDIR)/src/$(ARCH)/unix_machine.o: $(VDSO_OBJDIR)/vdso-offset.h + +$(PROG-kernel.elf): linker_script $(VDSO_OBJDIR)/vdso-image.c $(KERNEL): $(PROG-kernel.elf) $(call cmd,objcopy)
Fix few cases where annotation was not properly applied
@@ -51,6 +51,9 @@ SHARED_PTR_TEMPLATE = """ """ POLYMORPHIC_SHARED_PTR_TEMPLATE = SHARED_PTR_TEMPLATE + """ +%pragma(java) jniclassclassmodifiers="@com.carto.utils.DontObfuscate public class" +%typemap(javaclassmodifiers) $CLASSNAME$ "@com.carto.utils.DontObfuscate public class" + %{ #include "components/ClassRegistry.h" #include "components/Director.h" @@ -131,11 +134,6 @@ VALUE_TEMPLATE_TEMPLATE = """ %template($TYPE$) $CLASSNAME$; """ -DONT_OBFUSCATE_TEMPLATE = """ -%pragma(java) jniclassclassmodifiers="@com.carto.utils.DontObfuscate public class" -%typemap(javaclassmodifiers) $CLASSNAME$ "@com.carto.utils.DontObfuscate public class" -""" - STANDARD_EQUALS_TEMPLATE = """ """ @@ -285,8 +283,6 @@ def transformSwigFile(sourcePath, outPath, headerDirs): javaClass = match.group(2).strip().split(".")[-1] javaDescriptor = "Lcom/carto/%s;" % match.group(2).strip().replace('.', '/') args = { 'CLASSNAME': match.group(1).strip(), 'TYPE': javaClass, 'DESCRIPTOR': javaDescriptor } - if directors_module: - lines_out += applyTemplate(DONT_OBFUSCATE_TEMPLATE, args) lines_out += applyTemplate(SHARED_PTR_TEMPLATE, args) continue @@ -301,8 +297,6 @@ def transformSwigFile(sourcePath, outPath, headerDirs): code = class_code.get(className, []) code += applyTemplate(POLYMORPHIC_SHARED_PTR_CODE_TEMPLATE, args) class_code[className] = code - if directors_module: - lines_out += applyTemplate(DONT_OBFUSCATE_TEMPLATE, args) lines_out += applyTemplate(POLYMORPHIC_SHARED_PTR_TEMPLATE, args) continue
groups: remove fixed height from s3 error portal
@@ -167,7 +167,6 @@ export const ChatInput = React.forwardRef( boxShadow="0px 0px 0px 3px" zIndex={3} fontSize={0} - height="75px" width="250px" padding={3} justifyContent="center"
Added files for show-cap and delete-pcd to list of items to be built
@@ -659,11 +659,13 @@ if((ASCIIDOCTOR_FOUND OR A2X_FOUND) AND LNX_BUILD) ${ROOT}/Documentation/ipmctl/Support_and_Maintenance/ipmctl-dump-support-data.txt ${ROOT}/Documentation/ipmctl/Support_and_Maintenance/ipmctl-help.txt ${ROOT}/Documentation/ipmctl/Support_and_Maintenance/ipmctl-modify-device.txt + ${ROOT}/Documentation/ipmctl/Support_and_Maintenance/ipmctl-show-cap.txt ${ROOT}/Documentation/ipmctl/Support_and_Maintenance/ipmctl-show-firmware.txt ${ROOT}/Documentation/ipmctl/Support_and_Maintenance/ipmctl-show-host.txt ${ROOT}/Documentation/ipmctl/Support_and_Maintenance/ipmctl-show-preferences.txt ${ROOT}/Documentation/ipmctl/Support_and_Maintenance/ipmctl-update-firmware.txt ${ROOT}/Documentation/ipmctl/Support_and_Maintenance/ipmctl-version.txt + ${ROOT}/Documentation/ipmctl/Debug/ipmctl-delete-pcd.txt ${ROOT}/Documentation/ipmctl/Debug/ipmctl-dump-debug-log.txt ${ROOT}/Documentation/ipmctl/Debug/ipmctl-inject-error.txt ${ROOT}/Documentation/ipmctl/Debug/ipmctl-start-diagnostic.txt @@ -696,11 +698,13 @@ if((ASCIIDOCTOR_FOUND OR A2X_FOUND) AND LNX_BUILD) ${OUTPUT_DIR}/manpage/ipmctl-dump-support-data.1.gz ${OUTPUT_DIR}/manpage/ipmctl-help.1.gz ${OUTPUT_DIR}/manpage/ipmctl-modify-device.1.gz + ${OUTPUT_DIR}/manpage/ipmctl-show-cap.1.gz ${OUTPUT_DIR}/manpage/ipmctl-show-firmware.1.gz ${OUTPUT_DIR}/manpage/ipmctl-show-host.1.gz ${OUTPUT_DIR}/manpage/ipmctl-show-preferences.1.gz ${OUTPUT_DIR}/manpage/ipmctl-update-firmware.1.gz ${OUTPUT_DIR}/manpage/ipmctl-version.1.gz + ${OUTPUT_DIR}/manpage/ipmctl-delete-pcd.1.gz ${OUTPUT_DIR}/manpage/ipmctl-dump-debug-log.1.gz ${OUTPUT_DIR}/manpage/ipmctl-inject-error.1.gz ${OUTPUT_DIR}/manpage/ipmctl-start-diagnostic.1.gz
fix to use dcs_end_size with dcs_start use dcs_start_size instead of dcs_end_size.
@@ -64,7 +64,7 @@ sixel_penetrate( - dcs_start_size - dcs_end_size; for (pos = 0; pos < nwrite; pos += splitsize) { - output->fn_write((char *)dcs_start, dcs_end_size, output->priv); + output->fn_write((char *)dcs_start, dcs_start_size, output->priv); output->fn_write(((char *)output->buffer) + pos, nwrite - pos < splitsize ? nwrite - pos: splitsize, output->priv);
Docs: Add just another CPU PM entry to the sample closes
@@ -15,6 +15,7 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "CpuPlug", 0x00003000) External (_SB_.PR00, DeviceObj) External (_PR_.PR00, DeviceObj) External (_SB_.SCK0.CP00, DeviceObj) + External (_SB_.SCK0.PR00, DeviceObj) If (CondRefOf (\_SB.CPU0)) { Scope (\_SB.CPU0) { @@ -90,4 +91,19 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "CpuPlug", 0x00003000) } } } + + If (CondRefOf (\_SB.SCK0.PR00)) { + Scope (\_SB.SCK0.PR00) { + Method (_DSM, 4, NotSerialized) { + If (LEqual (Arg2, Zero)) { + Return (Buffer (One) { 0x03 }) + } + + Return (Package (0x02) { + "plugin-type", + One + }) + } + } + } }
HV: change wake vector to accommodate abl 1820HF1release MRB bootloader is switched to ABL ver 1820HF1_release, so change platform acpi info accordingly to support system S3. Acked-by: Eddie Dong
@@ -52,8 +52,8 @@ const struct acpi_info host_acpi_info = { .wake_vector_32 = (uint32_t *)0x7A86BBDCUL, .wake_vector_64 = (uint64_t *)0x7A86BBE8UL #else - .wake_vector_32 = (uint32_t *)0x7AEDCEFCUL, - .wake_vector_64 = (uint64_t *)0x7AEDCF08UL + .wake_vector_32 = (uint32_t *)0x7AFDCEFCUL, + .wake_vector_64 = (uint64_t *)0x7AFDCF08UL #endif } };
Move stage-packages into main part.
@@ -36,7 +36,7 @@ parts: plugin: autotools configflags: [--with-name-prefix=] source: . + stage-packages: [libavahi-client] build-packages: [cura-engine, libavahi-client-dev, libgnutls28-dev, libjpeg-dev, libmupdf-dev, libopenjp2-7-dev, libpng-dev, zlib1g-dev] -stage-packages: [libavahi-client]
lacp: correctly set is_mp_safe for VL_API_SW_INTERFACE_LACP_DUMP Need to add msg_id_base to the index Type: fix
@@ -125,8 +125,7 @@ lacp_plugin_api_hookup (vlib_main_t * vm) lm->msg_id_base = setup_message_id_table (); /* Mark these APIs as mp safe */ - am->is_mp_safe[VL_API_SW_INTERFACE_LACP_DUMP] = 1; - am->is_mp_safe[VL_API_SW_INTERFACE_LACP_DETAILS] = 1; + am->is_mp_safe[lm->msg_id_base + VL_API_SW_INTERFACE_LACP_DUMP] = 1; return 0; }
Fix shlibloadtest to properly execute the dso_ref test
@@ -121,6 +121,7 @@ static int test_lib(void) switch (test_type) { case JUST_CRYPTO: + case DSO_REFTEST: if (!TEST_true(shlib_load(path_crypto, &cryptolib))) goto end; break; @@ -134,10 +135,6 @@ static int test_lib(void) || !TEST_true(shlib_load(path_crypto, &cryptolib))) goto end; break; - case DSO_REFTEST: - if (!TEST_true(shlib_load(path_crypto, &cryptolib))) - goto end; - break; } if (test_type != JUST_CRYPTO && test_type != DSO_REFTEST) { @@ -210,6 +207,7 @@ static int test_lib(void) switch (test_type) { case JUST_CRYPTO: + case DSO_REFTEST: if (!TEST_true(shlib_close(cryptolib))) goto end; break; @@ -223,10 +221,6 @@ static int test_lib(void) || !TEST_true(shlib_close(cryptolib))) goto end; break; - case DSO_REFTEST: - if (!TEST_true(shlib_close(cryptolib))) - goto end; - break; } result = 1; @@ -247,7 +241,7 @@ int setup_tests(void) } else if (strcmp(p, "-just_crypto") == 0) { test_type = JUST_CRYPTO; } else if (strcmp(p, "-dso_ref") == 0) { - test_type = JUST_CRYPTO; + test_type = DSO_REFTEST; } else { TEST_error("Unrecognised argument"); return 0;
mispec: don't use %f The additional reporting, while nice, prevents the use of mispec on integer-only builds
@@ -117,8 +117,8 @@ M.runNextPending = function() M.succeeded = M.total - M.failed local elapsedSeconds = (tmr.now() - M.startTime) / 1000 / 1000 print(string.format( - '\n\nCompleted in %.2f seconds.\nSuccess rate is %.1f%% (%d failed out of %d).', - elapsedSeconds, 100 * M.succeeded / M.total, M.failed, M.total)) + '\n\nCompleted in %d seconds; %d failed out of %d.', + elapsedSeconds, M.failed, M.total)) M.pending = nil M.queuedEventuallyCount = nil end
Fix horizontal offsetting regression
@@ -323,7 +323,7 @@ namespace carto { double n = std::floor((mapPos.getX() + Const::HALF_WORLD_SIZE) / Const::WORLD_SIZE); if (n != 0) { mapPos.setX(mapPos.getX() - n * Const::WORLD_SIZE); - _horizontalLayerOffsetDir = static_cast<int>(n); + _horizontalLayerOffsetDir = -static_cast<int>(n); cameraChanged(); }
options/linux: These ptrace constants are abi specific, grab them from an abi-bits header
#ifndef _SYS_PTRACE_H #define _SYS_PTRACE_H +#include <abi-bits/ptrace.h> #include <stdint.h> #define PTRACE_TRACEME 0 #define PT_TRACE_ME PTRACE_TRACEME -#define PTRACE_PEEKTEXT 1 -#define PTRACE_PEEKDATA 2 -#define PTRACE_PEEKUSER 3 -#define PTRACE_POKETEXT 4 -#define PTRACE_POKEDATA 5 -#define PTRACE_CONT 7 -#define PTRACE_KILL 8 -#define PTRACE_SINGLESTEP 9 -#define PTRACE_GETREGS 14 -#define PTRACE_SETREGS 15 -#define PTRACE_ATTACH 16 -#define PTRACE_DETACH 17 -#define PTRACE_GETFPXREGS 18 -#define PTRACE_SETFPXREGS 19 -#define PTRACE_GETFPREGS 20 -#define PTRACE_SYSCALL 24 -#define PTRACE_SETOPTIONS 0x4200 -#define PTRACE_GETEVENTMSG 0x4201 -#define PTRACE_GETSIGINFO 0x4202 -#define PTRACE_SETSIGINFO 0x4203 -#define PTRACE_GETREGSET 0x4204 -#define PTRACE_SETREGSET 0x4205 -#define PTRACE_SEIZE 0x4206 -#define PTRACE_INTERRUPT 0x4207 -#define PTRACE_LISTEN 0x4208 -#define PTRACE_PEEKSIGINFO 0x4209 -#define PTRACE_GETSIGMASK 0x420A -#define PTRACE_SETSIGMASK 0x420B -#define PTRACE_SECCOMP_GET_FILTER 0x420C - #define PT_READ_I PTRACE_PEEKTEXT #define PT_READ_D PTRACE_PEEKDATA #define PT_READ_U PTRACE_PEEKUSER #define PT_GETSIGINFO PTRACE_GETSIGINFO #define PT_SETSIGINFO PTRACE_SETSIGINFO -#define PTRACE_CE_O_TRACESYSGOOD 0x00000001 -#define PTRACE_O_TRACEFORK 0x00000002 -#define PTRACE_O_TRACEVFORK 0x00000004 -#define PTRACE_O_TRACECLONE 0x00000008 -#define PTRACE_O_TRACEEXEC 0x00000010 -#define PTRACE_O_TRACEVFORKDONE 0x00000020 -#define PTRACE_O_TRACEEXIT 0x00000040 -#define PTRACE_O_TRACESECCOMP 0x00000080 -#define PTRACE_O_EXITKILL 0x00100000 -#define PTRACE_O_SUSPEND_SECCOMP 0x00200000 -#define PTRACE_O_MASK 0x003000ff - -#define PTRACE_EVENT_FORK 1 -#define PTRACE_EVENT_VFORK 2 -#define PTRACE_EVENT_CLONE 3 -#define PTRACE_EVENT_EXEC 4 -#define PTRACE_EVENT_VFORK_DONE 5 -#define PTRACE_EVENT_EXIT 6 -#define PTRACE_EVENT_SECCOMP 7 - -#define PTRACE_PEEKSIGINFO_SHARED 1 - #ifdef __cplusplus extern "C" { #endif
scripts: fix reformat-c for newer clang-format version strings
@@ -15,7 +15,7 @@ CLANG_FORMAT=$(command -v clang-format-$REQUIRED_VERSION || command -v clang-for if [ -n "$CLANG_FORMAT" ]; then LOCATION="$CLANG_FORMAT" VERSION=$("$CLANG_FORMAT" --version 2> /dev/null) - MAJOR_VERSION=$(printf '%s' "$VERSION" | sed -E 's/.* ([0-9]+)\.[0-9].[0-9][ -].*/\1/') + MAJOR_VERSION=$(printf '%s' "$VERSION" | sed -E 's/.* ([0-9]+)\.[0-9].[0-9][ -]?.*/\1/') if [ "${MAJOR_VERSION:-0}" -ne $REQUIRED_VERSION ]; then unset CLANG_FORMAT fi
Refactor sched_gettcb tc Add waitpid to make sure that child task should be terminated after sched_gettcb tc
@@ -325,14 +325,18 @@ static void tc_sched_waitpid(void) */ static void tc_sched_sched_gettcb(void) { - struct tcb_s *st_tcb; - pid_t child_pid; - child_pid = task_create("tc_gettcb", SCHED_PRIORITY_DEFAULT, CONFIG_USERMAIN_STACKSIZE, function_wait, (char * const *)NULL); - st_tcb = sched_gettcb(child_pid); + struct tcb_s *tcb; + pid_t pid; + int stat_loc; + + pid = task_create("tc_gettcb", SCHED_PRIORITY_DEFAULT, CONFIG_USERMAIN_STACKSIZE, function_wait, (char * const *)NULL); + TC_ASSERT_NEQ("task_create", pid, ERROR); - TC_ASSERT_NOT_NULL("sched_gettcb", st_tcb); - TC_ASSERT_EQ("sched_gettcb", st_tcb->pid, child_pid); + tcb = sched_gettcb(pid); + TC_ASSERT_NOT_NULL("sched_gettcb", tcb); + TC_ASSERT_EQ("sched_gettcb", tcb->pid, pid); + waitpid(pid, &stat_loc, 0); TC_SUCCESS_RESULT(); }
Document the long removed OPAL_REGISTER_OPAL_EXCEPTION_HANDLER call I'm pretty sure this was removed in one of our first ever service packs. Fixes:
@@ -61,7 +61,7 @@ The OPAL API is the interface between an Operating System and OPAL. | :ref:`OPAL_GET_COMPLETION_TOKEN_STATUS` | 21 | Never | | Never | | | | | | Implemented | +---------------------------------------------+--------------+------------------------+----------+-----------------+ -| :ref:`OPAL_REGISTER_OPAL_EXCEPTION_HANDLER` | 22 | v1.0 (Initial Release) | POWER8 | | +| :ref:`OPAL_REGISTER_OPAL_EXCEPTION_HANDLER` | 22 | v1.0 (Initial Release) | | Removed | +---------------------------------------------+--------------+------------------------+----------+-----------------+ | :ref:`OPAL_PCI_EEH_FREEZE_STATUS` | 23 | v1.0 (Initial Release) | POWER8 | | +---------------------------------------------+--------------+------------------------+----------+-----------------+ @@ -386,6 +386,8 @@ removed and no longer supported. +---------------------------------------------+-------+-----------------------+-----------------------+ | :ref:`OPAL_OLD_I2C_REQUEST` | 106 | v4.0 | v4.0 | +---------------------------------------------+-------+-----------------------+-----------------------+ +| :ref:`OPAL_REGISTER_OPAL_EXCEPTION_HANDLER` | 22 | v1.0 Initial Release | :ref:`skiboot-5.0` | ++---------------------------------------------+-------+-----------------------+-----------------------+ | :ref:`OPAL_PCI_SET_HUB_TCE_MEMORY` | 11 | pre-v1.0 | :ref:`skiboot-5.2.0` | +---------------------------------------------+-------+-----------------------+-----------------------+ | :ref:`OPAL_PCI_SET_PHB_TCE_MEMORY` | 12 | pre-v1.0 | :ref:`skiboot-5.2.0` | @@ -416,6 +418,36 @@ OPAL_OLD_I2C_REQUEST Never used. Only existing briefly in the :ref:`skiboot-4.0` development cycle. + +.. _OPAL_REGISTER_OPAL_EXCEPTION_HANDLER: + +OPAL_REGISTER_OPAL_EXCEPTION_HANDLER +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. code-block:: c + + #define OPAL_REGISTER_OPAL_EXCEPTION_HANDLER 22 + + + int64_t opal_register_exc_handler(uint64_t opal_exception __unused, + uint64_t handler_address __unused, + uint64_t glue_cache_line __unused); + + +This call existed for a very short period of time and only ever worked with Big +Endian host operating systems. The idea was that OPAL would handle HMIs and +an OS could (if it chose to) register a handler for them. This call is not +required since the introduction of :ref:`OPAL_HANDLE_HMI` and all machines that +ever shipped without :ref:`OPAL_HANDLE_HMI` have a firmware update that +supports it. For IBM Tuleta machines, this was FW810.20 (released Oct 2014) +that had :ref:`OPAL_HANDLE_HMI` support. + +This call was removed in :ref:`skiboot-5.0` and now just +returns :ref:`OPAL_UNSUPPORTED`. + +Use of the :ref:`OPAL_HANDLE_HMI` call was introduced in Linux 3.17. + + .. _OPAL_PCI_SET_HUB_TCE_MEMORY: OPAL_PCI_SET_HUB_TCE_MEMORY
config: initialize ref to storage input plugin
@@ -120,11 +120,7 @@ struct flb_config *flb_config_init() /* Flush */ config->flush = FLB_CONFIG_FLUSH_SECS; -#if defined FLB_HAVE_FLUSH_PTHREADS - config->flush_method = FLB_FLUSH_PTHREADS; -#elif defined FLB_HAVE_FLUSH_LIBCO config->flush_method = FLB_FLUSH_LIBCO; -#endif config->daemon = FLB_FALSE; config->init_time = time(NULL); config->kernel = flb_kernel_info(); @@ -140,6 +136,7 @@ struct flb_config *flb_config_init() config->cio = NULL; config->storage_path = NULL; + config->storage_input_plugin = NULL; #ifdef FLB_HAVE_SQLDB mk_list_init(&config->sqldb_list);
Install C/C++ libraries in TravisCI.
@@ -27,8 +27,11 @@ install: script: - if [ "$TRAVIS_OS_NAME" == "windows" ] && [ "$CC" == "gcc" ]; then cmake -G "Visual Studio 15 2017" -A Win32 .; fi; - if [ "$TRAVIS_OS_NAME" == "windows" ] && [ "$CC" == "clang" ]; then cmake -G "Visual Studio 15 2017" -A x64 .; fi; + - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cmake -DCMAKE_INSTALL_PREFIX=C:/tinyspline .; fi; - if [ "$TRAVIS_OS_NAME" != "windows" ]; then cmake .; fi; - cmake --build . + - cmake --build . --target install + - if [ "$TRAVIS_OS_NAME" == "windows" ]; then set PATH=C:/tinyspline/bin;%PATH%; fi; - cmake --build . --target tests jobs:
Use OPENSSL_secure_clear_free in STORE file_load
@@ -1037,10 +1037,10 @@ static OSSL_STORE_INFO *file_load_try_repeat(OSSL_STORE_LOADER_CTX *ctx, return result; } -static void pem_free_flag(void *pem_data, int secure) +static void pem_free_flag(void *pem_data, int secure, size_t num) { if (secure) - OPENSSL_secure_free(pem_data); + OPENSSL_secure_clear_free(pem_data, num); else OPENSSL_free(pem_data); } @@ -1243,9 +1243,9 @@ static OSSL_STORE_INFO *file_load(OSSL_STORE_LOADER_CTX *ctx, ctx->errcnt++; endloop: - pem_free_flag(pem_name, (ctx->flags & FILE_FLAG_SECMEM) != 0); - pem_free_flag(pem_header, (ctx->flags & FILE_FLAG_SECMEM) != 0); - pem_free_flag(data, (ctx->flags & FILE_FLAG_SECMEM) != 0); + pem_free_flag(pem_name, (ctx->flags & FILE_FLAG_SECMEM) != 0, 0); + pem_free_flag(pem_header, (ctx->flags & FILE_FLAG_SECMEM) != 0, 0); + pem_free_flag(data, (ctx->flags & FILE_FLAG_SECMEM) != 0, len); } while (matchcount == 0 && !file_eof(ctx) && !file_error(ctx)); /* We bail out on ambiguity */
bin: new storage path option -b/--storage_path
@@ -121,7 +121,7 @@ static void flb_help(int rc, struct flb_config *config) printf("Usage: fluent-bit [OPTION]\n\n"); printf("%sAvailable Options%s\n", ANSI_BOLD, ANSI_RESET); - printf(" -b --buf_path=PATH\tspecify a buffering path\n"); + printf(" -b --storage_path=PATH\tspecify a storage buffering path\n"); printf(" -c --config=FILE\tspecify an optional configuration file\n"); #ifdef FLB_HAVE_FORK printf(" -d, --daemon\t\trun Fluent Bit in background mode\n"); @@ -584,8 +584,7 @@ int main(int argc, char **argv) #ifndef _WIN32 /* Setup long-options */ static const struct option long_opts[] = { - { "buf_path", required_argument, NULL, 'b' }, - { "buf_workers", required_argument, NULL, 'B' }, + { "storage_path", required_argument, NULL, 'b' }, { "config", required_argument, NULL, 'c' }, #ifdef FLB_HAVE_FORK { "daemon", no_argument , NULL, 'd' }, @@ -651,13 +650,13 @@ int main(int argc, char **argv) /* Parse the command line options */ while ((opt = getopt_long(argc, argv, - "b:B:c:df:i:m:o:R:F:p:e:" + "b:c:df:i:m:o:R:F:p:e:" "t:l:vqVhL:HP:s:S", long_opts, NULL)) != -1) { switch (opt) { case 'b': - config->buffer_path = flb_strdup(optarg); + config->storage_path = flb_strdup(optarg); break; case 'c': cfg_file = flb_strdup(optarg);
bump urbit version number to 0.7.3
@@ -236,7 +236,7 @@ endforeach incdir = include_directories('include/') conf_data = configuration_data() -conf_data.set('URBIT_VERSION', '"0.7.2"') +conf_data.set('URBIT_VERSION', '"0.7.3"') conf_data.set('U3_MEMORY_DEBUG', get_option('gc')) conf_data.set('U3_CPU_DEBUG', get_option('prof')) conf_data.set('U3_EVENT_TIME_DEBUG', get_option('event-time'))
The libacvp metadata query is working!
@@ -1081,7 +1081,7 @@ static ACVP_RESULT compare_phone_numbers(ACVP_OE_PHONE_LIST *phone_list, tmp_ptr = phone_list; while (tmp_ptr) { phone_list_len++; - tmp_ptr = phone_list->next; + tmp_ptr = tmp_ptr->next; } if (phone_list_len != json_array_get_count(candidate_phones)) { @@ -2277,11 +2277,11 @@ static ACVP_RESULT acvp_oe_metadata_parse_vendor_contacts(ACVP_CTX *ctx, } /* Parse the Emails (if it exists)*/ - rv = acvp_oe_metadata_parse_emails(ctx, obj, &person->emails); + rv = acvp_oe_metadata_parse_emails(ctx, contact_obj, &person->emails); if (ACVP_SUCCESS != rv) return rv; /* Parse the Phone Numbers (if it exists)*/ - rv = acvp_oe_metadata_parse_phone_numbers(ctx, obj, &person->phone_numbers); + rv = acvp_oe_metadata_parse_phone_numbers(ctx, contact_obj, &person->phone_numbers); if (ACVP_SUCCESS != rv) return rv; }
Update README.md Replaced broken link.
@@ -57,7 +57,7 @@ Themis is open source, Apache 2 Licensed. 4. Type 'make install' and you're done (in most of the cases). 5. Visit [our wiki](https://github.com/cossacklabs/themis/wiki) for the documentation specific to your language of choice and take a look at docs/examples for examples. -It is a really good idea to [go the long way and read the docs](https://github.com/cossacklabs/themis/wiki/3.1-Building-and-installing), but Fortune helps the brave. +It is a really good idea to [go the long way and read the docs](https://github.com/cossacklabs/themis/wiki/Building-and-installing), but Fortune helps the brave. # Languages
[io] vview: first draft ok without contact forces
@@ -799,19 +799,24 @@ class IOReader(VTKPythonAlgorithmBase): t = info.Get(vtk.vtkStreamingDemandDrivenPipeline.UPDATE_TIME_STEP()) id_t = numpy.searchsorted(self._times, t, side='right') - 1 + if id_t < len(self._indices)-1: self._id_t_m = range(self._indices[id_t], - self._indices[min(id_t+1, len(self._indices)-1)]) + self._indices[id_t+1]) + else: + self._id_t_m = [self._indices[id_t]] self._time = self._times[id_t] self._index = id_t id_t_cf = numpy.searchsorted(self._cf_times, t, side='right') - 1 + if id_t_cf < len(self._cf_indices)-1: self._id_t_m_cf = range(self._cf_indices[id_t_cf], - self._cf_indices[min(id_t_cf+1, - len(self._cf_indices)-1)]) + self._cf_indices[id_t_cf+1]) + else: + self._id_t_m_cf = [self._cf_indices[id_t_cf]] self.pos_data = self._idpos_data[self._id_t_m, :] self.velo_data = self._ivelo_data[self._id_t_m, :] - self.cf_data = self._icf_data[self._id_t_m_cf, :] + #self.cf_data = self._icf_data[self._id_t_m_cf, :] vtk_pos_data = dsa.numpyTovtkDataArray(self.pos_data) vtk_pos_data.SetName('pos_data') @@ -819,12 +824,12 @@ class IOReader(VTKPythonAlgorithmBase): vtk_velo_data = dsa.numpyTovtkDataArray(self.velo_data) vtk_pos_data.SetName('velo_data') - vtk_cf_data = dsa.numpyTovtkDataArray(self.cf_data) - vtk_cf_data.SetName('cf_data') + #vtk_cf_data = dsa.numpyTovtkDataArray(self.cf_data) + #vtk_cf_data.SetName('cf_data') output.GetFieldData().AddArray(vtk_pos_data) output.GetFieldData().AddArray(vtk_velo_data) - output.GetFieldData().AddArray(vtk_cf_data) + #output.GetFieldData().AddArray(vtk_cf_data) return 1
fix cook error.
(print cmd) (def res (os/shell cmd)) (unless (zero? res) - (error "command exited with status " res))) + (error (string "command exited with status " res)))) (defn- rm "Remove a directory and all sub directories."
replay most recent event too
@@ -953,10 +953,12 @@ _sist_rest() u3A->ent_d = c3_max(las_d + 1ULL, old_d); } - if ( cur_d == u3Z->lug_u.len_d ) { + if ( u3A->ent_d == old_d ) { // Nothing in the log that was not also in the checkpoint. // - c3_assert(u3A->ent_d == old_d); + // XX: reinstate this assertion + // + //c3_assert ( cur_d == u3Z->lug_u.len_d ); if ( las_d + 1 != old_d ) { uL(fprintf(uH, "checkpoint and log disagree! las:%" PRIu64 " old:%" PRIu64 "\n", las_d + 1, old_d));
runtime: bug fix for kthread detaching
@@ -146,6 +146,13 @@ static bool steal_work(struct kthread *l, struct kthread *r) if (th) l->rq[l->rq_head++] = th; + else if (l->rq_head != l->rq_tail) { + /* handle the case where net_run -> kthread_detach -> rcu_detach + * leads to a thread being added to the runqueue (but not returned + * here) */ + th = l->rq[l->rq_head]; + } + spin_unlock(&r->lock); STAT(THREADS_STOLEN) += th != NULL ? 1 : 0; return th != NULL;
Add PhGetThreadIsIoPending
@@ -982,6 +982,32 @@ PhSetThreadBreakOnTermination( ); } +FORCEINLINE +NTSTATUS +PhGetThreadIsIoPending( + _In_ HANDLE ThreadHandle, + _Out_ PBOOLEAN IsIoPending + ) +{ + NTSTATUS status; + ULONG isIoPending; + + status = NtQueryInformationThread( + ThreadHandle, + ThreadIsIoPending, + &isIoPending, + sizeof(ULONG), + NULL + ); + + if (NT_SUCCESS(status)) + { + *IsIoPending = !!isIoPending; + } + + return status; +} + /** * Gets time information for a thread. *
libnet: don't install arp cache entries for IP 0.0.0.0
@@ -73,6 +73,11 @@ struct netif *arp_filter_netif(struct pbuf *p, struct netif *netif, uint16_t typ ip_addr_t ip; IPADDR2_COPY(&ip, &hdr->sipaddr); + /* don't store any IPs */ + if (ip_addr_cmp(&st->netif.ip_addr, IP_ADDR_ANY)) { + return netif; + } + uint64_t hwaddr = 0; if (etharp_find_addr(netif, &ip, (struct eth_addr **)&hwaddr, (const ip4_addr_t **)&hwaddr) != -1) {
Add assert to prevent global being set by MIR
@@ -1543,6 +1543,7 @@ grib_handle* grib_util_set_spec2(grib_handle* h, if (expandBoundingBox) { int e = grib_set_long(outh, "expandedBoundingBox", 1); Assert(e == 0); + Assert(!global_grid); /* ECC-576: "global" should not be set */ } if ( (*err = check_geometry(outh, spec, data_values_count, global_grid)) != GRIB_SUCCESS)
travis: cut some log verbosity just the tar bits.
@@ -11,7 +11,7 @@ compiler: install: - sudo apt-get update -y - sudo apt-get install -y build-essential automake1.11 autoconf libevent-dev libseccomp-dev git tar wget libio-socket-ssl-perl - - wget https://www.openssl.org/source/openssl-1.1.0g.tar.gz && tar xzvf openssl-1.1.0g.tar.gz + - wget https://www.openssl.org/source/openssl-1.1.0g.tar.gz && tar xzf openssl-1.1.0g.tar.gz - cd openssl-1.1.0g && ./config -Wl,--enable-new-dtags,-rpath,'$(LIBRPATH)' && make && sudo make install && openssl version && cd ../ - rm -rf openssl-1.1.0g && rm openssl-1.1.0g.tar.gz*
sse4.1: add NEON implementation of _mm_extract_epi8 This commit includes a fix when the selector is greater than 15.
@@ -497,10 +497,12 @@ simde_mm_dp_ps (simde__m128 a, simde__m128 b, const int imm8) { SIMDE__FUNCTION_ATTRIBUTES int32_t simde_mm_extract_epi8 (simde__m128i a, const int imm8) { - return a.u8[imm8]; + return a.u8[imm8&15]; } #if defined(SIMDE_SSE4_1_NATIVE) && !defined(SIMDE_BUG_GCC_BAD_MM_EXTRACT_EPI8) # define simde_mm_extract_epi8(a, imm8) _mm_extract_epi8(a.n, imm8) +#elif defined(SIMDE_SSE4_1_NEON) +# define simde_mm_extract_epi8(a, imm8) (int32_t)((uint8_t)vgetq_lane_s8(a.neon_i8, imm8)) #endif #if defined(simde_mm_extract_epi32)
dojo: add missing nu-sole-id compatability Forgotten code.
:: ++ on-arvo |= [=wire =sign-arvo] - ?> ?=([@ *] wire) - =/ =session (~(got by hoc) i.wire) - =/ he-full ~(. he hid i.wire ~ session) + ^- (quip card:agent:gall _..on-init) + ?> ?=([@ @ *] wire) + =/ =id [(slav %p i.wire) i.t.wire] + =/ =session (~(got by hoc) id) + =/ he-full ~(. he hid id ~ session) =^ moves state =< he-abet ?+ +<.sign-arvo ~|([%dojo-bad-take +<.sign-arvo] !!) - %writ (he-writ:he-full t.wire +>.sign-arvo) - %http-response (he-http-response:he-full t.wire +>.sign-arvo) + %writ (he-writ:he-full t.t.wire +>.sign-arvo) + %http-response (he-http-response:he-full t.t.wire +>.sign-arvo) == [moves ..on-init] :: if dojo fails unexpectedly, kill whatever each session is working on
libhfcommon: use map_hassemaphore
@@ -392,6 +392,10 @@ uint8_t* files_mapFileShared(const char* fileName, off_t* fileSz, int* fd) { */ mmapflags |= MAP_NOSYNC; #endif /* defined(MAP_NOSYNC) */ +#if defined(MAP_HASSEMAPHORE) + /* We use mutexes, so.. */ + mmapflags |= MAP_HASSEMAPHORE; +#endif /* defined(MAP_HASSEMAPHORE) */ if ((buf = mmap(NULL, st.st_size, PROT_READ, mmapflags, *fd, 0)) == MAP_FAILED) { PLOG_W("Couldn't mmap() the '%s' file", fileName); close(*fd);
Experimental HFile object should raise AttributeError if fileno is unavailable
@@ -94,7 +94,7 @@ cdef class HFile(object): if isinstance(self.name, int): return self.name else: - raise OSError('fileno not available') + raise AttributeError('fileno not available') def __enter__(self): return self
check for either vmlinuz or vmlinux.gz
--- a/bin/wwbootstrap 2017-10-10 13:17:14.000000000 -0700 -+++ b/bin/wwbootstrap 2017-10-10 13:54:07.000000000 -0700 ++++ b/bin/wwbootstrap 2017-10-10 14:24:24.000000000 -0700 +@@ -153,8 +153,8 @@ + + mkpath("$tmpdir/initramfs"); + +-if (! -f "$opt_chroot/boot/vmlinuz-$opt_kversion") { +- &eprint("Can't locate the boot kernel: ". $opt_chroot ."/boot/vmlinuz-$opt_kversion\n"); ++if (! -f "$opt_chroot/boot/vmlinuz-$opt_kversion" && -f "$opt_chroot/boot/vmlinux-$opt_kversion.gz") { ++ &eprint("Can't locate the boot kernel\n"); + exit 1; + } + # Attempt to gunzip the kernel, aarch64 kernels are compressed and iPXE can't boot gzip compressed kernels.
Fix missing break in AUC creation for GPU
@@ -550,6 +550,7 @@ namespace NCatboostCuda { result.emplace_back(new TCpuFallbackMetric(MakeMultiClassAucMetric(metricType, params, i), metricDescription)); } } + break; } case ELossFunction::Kappa: { if (approxDim == 1) {
Added return code handling to setting system date/time and timezone
@@ -1730,17 +1730,17 @@ int DeRestPluginPrivate::modifyConfig(const ApiRequest &req, ApiResponse &rsp) queSaveDb(DB_CONFIG, DB_SHORT_SAVE_DELAY); changed = true; #ifdef ARCH_ARM -#ifdef Q_OS_LINUX - //set timezone under gnu linux - //command = "echo '" + timezone.toStdString() + "' | sudo tee /etc/timezone"; - //system(command.c_str()); - - //command = "sudo dpkg-reconfigure -f noninteractive tzdata"; - //system(command.c_str()); + int rc = 0; - setenv("TZ", timezone.toStdString(), 1); + rc = setenv("TZ", ":" + timezone.toStdString(), 1); tzset(); -#endif + + if (rc != 0) + { + rsp.list.append(errorToMap(ERR_INTERNAL_ERROR, QString("/config/timezone"), QString("Error setting timezone"))); + rsp.httpStatus = HttpStatusServiceUnavailable; + return REQ_READY_SEND; + } #endif } @@ -1793,7 +1793,7 @@ int DeRestPluginPrivate::modifyConfig(const ApiRequest &req, ApiResponse &rsp) */ #ifdef ARCH_ARM -#ifdef Q_OS_LINUX + int ret = 0; std::string date = map["utc"].toString().toStdString(); time_t mytime = time(0); @@ -1810,15 +1810,22 @@ int DeRestPluginPrivate::modifyConfig(const ApiRequest &req, ApiResponse &rsp) DBG_Printf(DBG_INFO, "%d-%d-%dT%d:%d:%d\n", tm_ptr->tm_year,tm_ptr->tm_mon,tm_ptr->tm_mday,tm_ptr->tm_hour,tm_ptr->tm_min,tm_ptr->tm_sec); const struct timeval tv = {mktime(tm_ptr), 0}; - settimeofday(&tv, 0); + ret = settimeofday(&tv, 0); + } + + if (ret != 0) + { + rsp.list.append(errorToMap(ERR_INTERNAL_ERROR, QString("/config/utc"), QString("Error setting date and time"))); + rsp.httpStatus = HttpStatusServiceUnavailable; + return REQ_READY_SEND; } -#endif #endif QVariantMap rspItem; QVariantMap rspItemState; rspItemState["/config/utc"] = map["utc"]; rspItem["success"] = rspItemState; rsp.list.append(rspItem); + } if (map.contains("timeformat")) // optional
Zephyr: herobrine: Remove display.dts from variant Remove display.dts from Villager and hoglin. BRANCH=none TEST=zmake testall
@@ -13,7 +13,6 @@ def register_variant(project_name, extra_dts_overlays=(), extra_kconfig_files=() dts_overlays=[ # Common to all projects. here / "adc.dts", - here / "display.dts", here / "common.dts", here / "i2c.dts", here / "interrupts.dts", @@ -34,6 +33,7 @@ def register_variant(project_name, extra_dts_overlays=(), extra_kconfig_files=() register_variant( project_name="herobrine", extra_dts_overlays=[ + here / "display.dts", here / "battery_herobrine.dts", here / "gpio.dts", here / "motionsense.dts",
pac_hssi_config: use constants and a dictionary. Use the predefined constants for nios soft functions, and use a dictionary to map a parameter integer to a string in order to cleanup duplicate code.
@@ -888,29 +888,25 @@ def eeprom_fxn(args, skl): print "" +PARAMS_DICT = { + 0: "CTLE", + 1: "VGA", + 2: "DCGAIN", + 3: "1st POST", + 4: "2nd POST", + 5: "1st PRE", + 6: "2nd PRE", + 7: "VOD" +} + + def eqwrite_fxn(args, skl): chan = int(args.channel, 16) param = int(args.parameter, 16) value = int(args.value, 16) - val = skl.nios_soft_fn(0x9, chan, param, value) - if (param == 0): - msg = "CTLE" - elif (param == 1): - msg = "VGA" - elif (param == 2): - msg = "DCGAIN" - elif (param == 3): - msg = "1st POST" - elif (param == 4): - msg = "2nd POST" - elif (param == 5): - msg = "1st PRE" - elif (param == 6): - msg = "2nd PRE" - elif (param == 7): - msg = "VOD" - else: - msg = "Unknown Paramter" + val = skl.nios_soft_fn(skl.NIOS_TX_EQ_WRITE, chan, param, value) + + msg = PARAMS_DICT.get(param, "Unknown Paramter") msg = "WRITE Channel %i - %s" % (chan, msg) print "eqwrite(C=0x%01X,P=0x%02X) <- 0x%02X (%s)" % ( chan, param, value, msg) @@ -919,25 +915,9 @@ def eqwrite_fxn(args, skl): def eqread_fxn(args, skl): chan = int(args.channel, 16) param = int(args.parameter, 16) - val = skl.nios_soft_fn(0xa, chan, param) - if (param == 0): - msg = "CTLE" - elif (param == 1): - msg = "VGA" - elif (param == 2): - msg = "DCGAIN" - elif (param == 3): - msg = "1st POST" - elif (param == 4): - msg = "2nd POST" - elif (param == 5): - msg = "1st PRE" - elif (param == 6): - msg = "2nd PRE" - elif (param == 7): - msg = "VOD" - else: - msg = "Unknown Paramter" + val = skl.nios_soft_fn(skl.NIOS_TX_EQ_READ, chan, param) + + msg = PARAMS_DICT.get(param, "Unknown Paramter") msg = "READ Channel %i - %s" % (chan, msg) print "eqread(C=0x%01X,P=0x%02X) -> 0x%02X (%s)" % (chan, param, val, msg)
travis.yml: add arch s390x target
@@ -36,6 +36,10 @@ matrix: arch: arm64 compiler: gcc env: CONFIG_OPTS="--strict-warnings" + - os: linux + arch: s390x + compiler: gcc + env: CONFIG_OPTS="--strict-warnings" - os: linux-ppc64le sudo: false compiler: clang
log test exception as soon as possible to make logs better issue:DEVTOOLS-5100
@@ -471,6 +471,8 @@ def pytest_runtest_makereport(item, call): longrepr = item._repr_failure_py(excinfo, style=item.config.option.tbstyle) for rwhen, key, content in item._report_sections: sections.append(("Captured std%s %s" % (key, rwhen), content)) + if outcome == "failed": + yatest_logger.error(longrepr) return _pytest.runner.TestReport(item.nodeid, item.location, keywords, outcome, longrepr, when, sections, duration) def logreport(report, result):
some code outline filter optimizations
@@ -1246,21 +1246,18 @@ static void updateSidebarCode(Code* code) updateEditor(code); } -static bool isFilterMatch(const char* buffer, const char* filter) +static bool isFilterMatch(const char* buffer, s32 size, const char* filter) { - while(*buffer) - { - if(tolower(*buffer) == tolower(*filter)) + while(size--) + if(tolower(*buffer++) == tolower(*filter)) filter++; - buffer++; - } return *filter == 0; } -static void drawFilterMatch(Code *code, s32 x, s32 y, const char* orig, const char* filter) +static void drawFilterMatch(Code *code, s32 x, s32 y, const char* orig, s32 size, const char* filter) { - while(*orig) + while(size--) { bool match = tolower(*orig) == tolower(*filter); u8 color = match ? tic_color_orange : tic_color_white; @@ -1292,20 +1289,13 @@ static void initSidebarMode(Code* code) if(items) { - char buffer[STUDIO_TEXT_BUFFER_WIDTH]; for(const tic_outline_item *it = items, *end = items + size; it != end ; ++it) { if(code->state[it->pos - code->src].syntax == SyntaxType_COMMENT) continue; - { - s32 len = MIN(it->size, sizeof(buffer) - 1); - memcpy(buffer, it->pos, len); - buffer[len] = '\0'; - } - const char* filter = code->popup.text; - if(*filter && !isFilterMatch(buffer, filter)) + if(*filter && !isFilterMatch(it->pos, it->size, filter)) continue; s32 last = code->sidebar.size++; @@ -1991,15 +1981,9 @@ static void drawSidebarBar(Code* code, s32 x, s32 y) tic_api_rect(code->tic, rect.x - 1, rect.y + (code->sidebar.index - code->sidebar.scroll) * STUDIO_TEXT_HEIGHT, rect.w + 1, TIC_FONT_HEIGHT + 2, tic_color_red); - char orig[STUDIO_TEXT_BUFFER_WIDTH]; for(const tic_outline_item* ptr = code->sidebar.items, *end = ptr + code->sidebar.size; - ptr < end; ptr++, y += STUDIO_TEXT_HEIGHT) - { - s32 len = MIN(ptr->size, sizeof(orig) - 1); - memcpy(orig, ptr->pos, len); - orig[len] = '\0'; - drawFilterMatch(code, x, y, orig, filter); - } + ptr != end; ptr++, y += STUDIO_TEXT_HEIGHT) + drawFilterMatch(code, x, y, ptr->pos, ptr->size, filter); } else {
fix cuda ccbin auto-detection on windows
@@ -28,7 +28,7 @@ toolchain("cuda") -- set toolset set_toolset("cu", "nvcc", "clang") set_toolset("culd", "nvcc") - set_toolset("cu-ccbin", "$(env CXX)", "$(env CC)", "clang", "gcc") + set_toolset("cu-ccbin", "$(env CXX)", "$(env CC)") -- bind msvc environments, because nvcc will call cl.exe on_load(function (toolchain)
Flesh out channel_depth_spec
RSpec.describe Magick::Image, "#channel_depth" do - it "works" do - image = described_class.new(20, 20) - - expect { image.channel_depth }.not_to raise_error - expect { image.channel_depth(Magick::RedChannel) }.not_to raise_error - expect { image.channel_depth(Magick::RedChannel, Magick::BlueChannel) }.not_to raise_error - expect { image.channel_depth(Magick::GreenChannel, Magick::OpacityChannel) }.not_to raise_error - expect { image.channel_depth(Magick::MagentaChannel, Magick::CyanChannel) }.not_to raise_error - expect { image.channel_depth(Magick::CyanChannel, Magick::BlackChannel) }.not_to raise_error - expect { image.channel_depth(Magick::GrayChannel) }.not_to raise_error - expect { image.channel_depth(2) }.to raise_error(TypeError) - expect(image.channel_depth(Magick::RedChannel)).to be_kind_of(Integer) + it "returns the depth for the given channel" do + image = build_image + + depth = image.channel_depth(Magick::RedChannel) + + expect(depth).to eq(16) + end + + it "returns the depth for all channels when no arguments are passed" do + image = build_image + + depth = image.channel_depth + + expect(depth).to eq(16) + end + + it "raises an error when the wrong type of argument is passed" do + image = build_image + + expect { image.channel_depth("test") } + .to raise_error(TypeError, "argument must be a ChannelType value (String given)") end end
libhfnetdriver: correct number of arguments for libfuzzer
@@ -218,7 +218,7 @@ __attribute__((weak)) int HonggfuzzNetDriverArgsForServer( if (strcmp(argv[i], "--") == 0) { *server_argc = argc - i; *server_argv = &argv[i]; - return argc - i; + return i; } }
bugfix: variable missing in assign_test
@@ -26,9 +26,9 @@ assign_test: artifacts: paths: - components/idf_test/*/CIConfigs - - $EXAMPLE_CONFIG_OUTPUT_PATH - - $TEST_APP_CONFIG_OUTPUT_PATH - - $COMPONENT_UT_CONFIG_OUTPUT_PATH + - $EXAMPLE_TEST_DIR/test_configs + - $CUSTOM_TEST_DIR/test_configs + - $COMPONENT_UT_OUTPUT_DIR/test_configs - build_examples/artifact_index.json - build_test_apps/artifact_index.json - build_component_ut/artifact_index.json
BugID:18631099:add esp32sram for 2 core;esp32devkitc no sram;dir kernel
extern int vfs_init(void); extern int vfs_device_init(void); +#ifdef AOS_LOOP +#include "aos/yloop.h" +extern aos_loop_t aos_loop_init(void); +#endif extern int aos_kv_init(void); extern void ota_service_init(void); extern void dumpsys_cli_init(void);
test dtls only for FreeBSD
@@ -41,10 +41,14 @@ if [ "$unamestr" != "Linux" ]; then runtest "../examples/tneat" "-L" fi +if [ "$unamestr" == "FreeBSD" ]; then + retcode=0 + runtest "../examples/tneat" "-v" "1" "-P" "../examples/prop_sctp_dtls.json" "interop.fh-muenster.de" +fi + if [ "$unamestr" == "Linux" ] || [ "$unamestr" == "FreeBSD" ]; then retcode=0 runtest "../examples/client_http_get" "-P" "../examples/prop_tcp_security.json" "-p" "443" "-v" "1" "www.fh-muenster.de" - runtest "../examples/tneat" "-v" "1" "-P" "../examples/prop_sctp_dtls.json" "interop.fh-muenster.de" runtest "../examples/tneat" "-v" "1" "-L" "-n" "1024" "-P" "../examples/prop_sctp.json" fi
docs(README): add INTERNALS.md under links section
@@ -192,11 +192,12 @@ $ valgrind ./myBot.out ## Links +- [Discord Server](https://discord.gg/2jfycwXVM3) - [Documentation](https://cee-studio.github.io/orca/) - [Building your first bot](docs/BUILDING_A_BOT.md) -- [Contributing](docs/CONTRIBUTING.md) -- [Discord Server](https://discord.gg/2jfycwXVM3) - [Debbuging with SaiphC](docs/SAIPHC.md) +- [Internals](docs/INTERNALS.md) +- [Contributing](docs/CONTRIBUTING.md) ## Contributing Check our [Contributing Guidelines](docs/CONTRIBUTING.md) to get started! If you are here for the Discord API, please check our [Discord API Roadmap](docs/DISCORD_ROADMAP.md).
correct gyro rotation tmotorf7
#define GYRO_SPI_PORT SPI_PORT1 #define GYRO_NSS PIN_A4 #define GYRO_INT PIN_C4 -#define SENSOR_ROTATE_90_CCW +#define SENSOR_ROTATE_90_CW #define GYRO_ID_1 0x68 #define GYRO_ID_2 0x73 #define GYRO_ID_3 0x78
Don't block main thread while checking for Python executables
@@ -195,7 +195,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, SyntaxTextVi } private func pythonExecutableMenuWillOpen(_ menu: NSMenu) { - + DispatchQueue.global().async { var executables = [String : URL]() let bundledPythonPipe = Pipe() @@ -275,11 +275,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, SyntaxTextVi } } + DispatchQueue.main.async { menu.items = [] for pythonVersion in [bundledPythonVersion, systemPythonVersion, python2BrewVersion, python3BrewVersion] { if let version = pythonVersion { - let menuItem = MenuItem(title: version, action: #selector(changePythonExecutable(_:)), keyEquivalent: "") + let menuItem = MenuItem(title: version, action: #selector(self.changePythonExecutable(_:)), keyEquivalent: "") menuItem.target = self menuItem.value = executables[version]?.path @@ -293,6 +294,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, SyntaxTextVi } } } + } + } // MARK: - Menu delegate
move from DDR3/4_USED to SDRAM_USED
done done done - if [[ "$DDR3_USED" == "TRUE" || "$DDR4_USED" == "TRUE" ]];then echo -e "$del\ntesting DDR" + if [[ "$DDR3_USED" == "TRUE" || "$DDR4_USED" == "TRUE" || "$SDRAM_USED" == "TRUE" ]]; then echo -e "$del\ntesting DDR" for num64 in 1 5 63 64;do # 1..64 for align in 4096 1024 256 64; do # must be mult of 64 for num4k in 0 1 3 7; do # 1=6sec, 7=20sec
[protobuf] revert "print bytes as string" patch
@@ -2475,7 +2475,7 @@ void TextFormat::Printer::PrintFieldValue(const Message& message, printer->PrintString(*value_to_print, generator); } else { GOOGLE_DCHECK_EQ(field->type(), FieldDescriptor::TYPE_BYTES); - printer->PrintString(*value_to_print, generator); + printer->PrintBytes(*value_to_print, generator); } break; }
Correctly demangle lambdas with multiple params. Previously only the last argument was retained.
@@ -6923,13 +6923,7 @@ __demangle_tree::__parse_unnamed_type_name(const char* first, const char* last) } else { - while (first[0] && first[0] != 'E') - { - const char *old = first; - first = __parse_type(first, last); - if (first == old) - break; - } + first = __parse_bare_function_type(first, last); if (first[0] == 'E') ++first; else
remove cmake options CMAKE_C_COMPILER CMAKE_CXX_COMPILER, and LLVM_ENABLE_ASSERTIONS
@@ -72,7 +72,7 @@ fi COMPILERS="-DCMAKE_C_COMPILER=$GCCLOC -DCMAKE_CXX_COMPILER=$GXXLOC" GFXSEMICOLONS=`echo $GFXLIST | tr ' ' ';' ` -MYCMAKEOPTS="-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_RPATH=$AOMP_INSTALL_DIR/lib:$AOMP_INSTALL_DIR/hcc/lib -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$INSTALL_HCC -DLLVM_ENABLE_ASSERTIONS=ON -DHSA_AMDGPU_GPU_TARGET=$GFXSEMICOLONS $COMPILERS -DHSA_HEADER_DIR=$AOMP_INSTALL_DIR/hsa/include -DHSA_LIBRARY_DIR=$AOMP_INSTALL_DIR/hsa/lib -DCLANG_ANALYZER_ENABLE_Z3_SOLVER=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF" +MYCMAKEOPTS="-DROCM_ROOT=$AOMP_INSTALL_DIR -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_RPATH=$AOMP_INSTALL_DIR/lib:$AOMP_INSTALL_DIR/hcc/lib -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$INSTALL_HCC -DHSA_AMDGPU_GPU_TARGET=$GFXSEMICOLONS -DHSA_HEADER_DIR=$AOMP_INSTALL_DIR/hsa/include -DHSA_LIBRARY_DIR=$AOMP_INSTALL_DIR/hsa/lib -DCLANG_ANALYZER_ENABLE_Z3_SOLVER=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF" # -DLLVM_TARGETS_TO_BUILD=$TARGETS_TO_BUILD # For now build hcc with ROCDL. because using the AOMP libdevice @@ -122,6 +122,7 @@ if [ ! -z `which "getconf"` ]; then fi fi + if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then # When build_hcc.sh is run with no args, start fresh and clean out the build directory. echo
Add shortcut for small-size gemv_n with increments of one
@@ -202,6 +202,11 @@ void CNAME(enum CBLAS_ORDER order, if (alpha == ZERO) return; + if (trans == 0 && incx == 1 && incy == 1 && m*n < 2304 *GEMM_MULTITHREAD_THRESHOLD) { + GEMV_N(m, n, 0, alpha, a, lda, x, incx, y, incy, buffer); + return; + } + IDEBUG_START; FUNCTION_PROFILE_START();
volteer: Remove DisplayPort HPD GPIOs This function is already handled by the AP's internal mux, and the GPIOs were already unused. TEST=make buildall BRANCH=none
@@ -141,10 +141,6 @@ GPIO(EC_I2C7_EEPROM_SDA, PIN(B, 2), GPIO_INPUT) /* Battery signals */ GPIO(EC_BATT_PRES_ODL, PIN(E, 1), GPIO_INPUT) -/* Physical HPD pins are not needed on EC as these are configured by PMC */ -GPIO(USB_C0_DP_HPD, PIN(F, 3), GPIO_INPUT) -GPIO(USB_C1_DP_HPD, PIN(7, 0), GPIO_INPUT) - /* Alternate functions GPIO definitions */ ALTERNATE(PIN_MASK(B, BIT(5) | BIT(4)), 0, MODULE_I2C, (GPIO_INPUT | GPIO_SEL_1P8V)) /* I2C0 */ ALTERNATE(PIN_MASK(9, BIT(0) | BIT(2) | BIT(1)), 0, MODULE_I2C, 0) /* I2C1 SCL / I2C2 */
Actually pass the right pointer to the pdfio_error_cb function.
@@ -709,7 +709,7 @@ convert_text( } // Create a temporary PDF file... - if ((pdf = pdfioFileCreateTemporary(d->tempfile, sizeof(d->tempfile), "1.7", &p->media, &p->crop, pdfio_error_cb, &document)) == NULL) + if ((pdf = pdfioFileCreateTemporary(d->tempfile, sizeof(d->tempfile), "1.7", &p->media, &p->crop, pdfio_error_cb, p)) == NULL) { cupsFileClose(fp); return (false); @@ -1539,7 +1539,7 @@ prepare_documents( size_to_rect(&options->media, &p.media, &p.crop); - if ((p.pdf = pdfioFileCreateTemporary(outfile, outsize, "1.7", &p.media, &p.crop, pdfio_error_cb, NULL)) == NULL) + if ((p.pdf = pdfioFileCreateTemporary(outfile, outsize, "1.7", &p.media, &p.crop, pdfio_error_cb, &p)) == NULL) return (false); // Loop through the input documents to count pages, etc. @@ -1569,7 +1569,7 @@ prepare_documents( goto done; } - if ((d->pdf = pdfioFileOpen(d->pdf_filename, pdfio_password_cb, &document, pdfio_error_cb, &document)) == NULL) + if ((d->pdf = pdfioFileOpen(d->pdf_filename, pdfio_password_cb, &document, pdfio_error_cb, &p)) == NULL) goto done; d->first_page = page;
h2olog: remove "const" for move semantics (thanks to
@@ -136,7 +136,7 @@ static void show_process(pid_t pid) infof("Attaching pid=%d (%s)", pid, cmdline); } -static const std::string join_str(const std::string &sep, const std::vector<std::string> &strs) +static std::string join_str(const std::string &sep, const std::vector<std::string> &strs) { std::string s; for (auto iter = strs.cbegin(); iter != strs.cend(); ++iter) { @@ -148,7 +148,7 @@ static const std::string join_str(const std::string &sep, const std::vector<std: return s; } -static const std::vector<std::string> split_str(char delim, const std::string &s) +static std::vector<std::string> split_str(char delim, const std::string &s) { std::vector<std::string> tokens; std::size_t from = 0;
cmake: removed hardcoded names for top level configuration
@@ -24,6 +24,7 @@ option(MI_DEBUG_UBSAN "Build with undefined-behavior sanitizer (needs clan option(MI_CHECK_FULL "Use full internal invariant checking in DEBUG mode (deprecated, use MI_DEBUG_FULL instead)" OFF) option(MI_INSTALL_TOPLEVEL "Install directly into $CMAKE_INSTALL_PREFIX instead of PREFIX/lib/mimalloc-version" OFF) +include(GNUInstallDirs) include("cmake/mimalloc-config-version.cmake") set(mi_sources @@ -208,9 +209,9 @@ endif() # ----------------------------------------------------------------------------- if (MI_INSTALL_TOPLEVEL) - set(mi_install_libdir "lib") - set(mi_install_incdir "include") - set(mi_install_cmakedir "cmake") + set(mi_install_libdir "${CMAKE_INSTALL_LIBDIR}") + set(mi_install_incdir "${CMAKE_INSTALL_INCLUDEDIR}") + set(mi_install_cmakedir "${CMAKE_INSTALL_LIBDIR}/cmake/mimalloc") else() set(mi_install_libdir "lib/mimalloc-${mi_version}") set(mi_install_incdir "include/mimalloc-${mi_version}")
out_stackdriver: release pattern on exception (CID 305802)
@@ -193,14 +193,20 @@ void add_http_request_field(struct http_request_field *http_request, */ static void validate_latency(msgpack_object_str latency_in_payload, struct http_request_field *http_request) { - flb_sds_t pattern = flb_sds_create("^\\s*\\d+(.\\d+)?\\s*s\\s*$"); + int i = 0; + int j = 0; + int status = 0; char extract_latency[32]; + flb_sds_t pattern; struct flb_regex *regex; - int status = 0; - int i = 0, j = 0; + pattern = flb_sds_create("^\\s*\\d+(.\\d+)?\\s*s\\s*$"); + if (!pattern) { + return; + } if (latency_in_payload.size > sizeof(extract_latency)) { + flb_sds_destroy(pattern); return; }
fixed handling of damaged frames in case we have only one BEACON inside
@@ -2379,6 +2379,8 @@ clientinfoptr = reassociationrequestptr +CAPABILITIESREQSTA_SIZE; clientinfolen = reassociationrequestlen -CAPABILITIESREQSTA_SIZE; if(clientinfolen < (int)IETAG_SIZE) return; if(gettags(clientinfolen, clientinfoptr, &tags) == false) return; +if(tags.essidlen == 0) return; +if(tags.essid[0] == 0) return; if(aplistptr >= aplist +maclistmax) { aplistnew = realloc(aplist, (maclistmax +MACLIST_MAX) *MACLIST_SIZE); @@ -2451,6 +2453,8 @@ clientinfoptr = associationrequestptr +CAPABILITIESSTA_SIZE; clientinfolen = associationrequestlen -CAPABILITIESSTA_SIZE; if(clientinfolen < (int)IETAG_SIZE) return; if(gettags(clientinfolen, clientinfoptr, &tags) == false) return; +if(tags.essidlen == 0) return; +if(tags.essid[0] == 0) return; if(aplistptr >= aplist +maclistmax) { aplistnew = realloc(aplist, (maclistmax +MACLIST_MAX) *MACLIST_SIZE); @@ -2538,6 +2542,8 @@ static tags_t tags; proberequestdirectedcount++; if(proberequestlen < (int)IETAG_SIZE) return; if(gettags(proberequestlen, proberequestptr, &tags) == false) return; +if(tags.essidlen == 0) return; +if(tags.essid[0] == 0) return; if(aplistptr >= aplist +maclistmax) { aplistnew = realloc(aplist, (maclistmax +MACLIST_MAX) *MACLIST_SIZE); @@ -2591,6 +2597,8 @@ static tags_t tags; proberequestcount++; if(proberequestlen < (int)IETAG_SIZE) return; if(gettags(proberequestlen, proberequestptr, &tags) == false) return; +if(tags.essidlen == 0) return; +if(tags.essid[0] == 0) return; if(aplistptr >= aplist +maclistmax) { aplistnew = realloc(aplist, (maclistmax +MACLIST_MAX) *MACLIST_SIZE); @@ -2627,6 +2635,8 @@ apinfoptr = proberesponseptr +CAPABILITIESAP_SIZE; apinfolen = proberesponselen -CAPABILITIESAP_SIZE; if(proberesponselen < (int)IETAG_SIZE) return; if(gettags(apinfolen, apinfoptr, &tags) == false) return; +if(tags.essidlen == 0) return; +if(tags.essid[0] == 0) return; if(aplistptr >= aplist +maclistmax) { aplistnew = realloc(aplist, (maclistmax +MACLIST_MAX) *MACLIST_SIZE); @@ -2672,6 +2682,8 @@ apinfoptr = beaconptr +CAPABILITIESAP_SIZE; apinfolen = beaconlen -CAPABILITIESAP_SIZE; if(beaconlen < (int)IETAG_SIZE) return; if(gettags(apinfolen, apinfoptr, &tags) == false) return; +if(tags.essidlen == 0) return; +if(tags.essid[0] == 0) return; if(aplistptr >= aplist +maclistmax) { aplistnew = realloc(aplist, (maclistmax +MACLIST_MAX) *MACLIST_SIZE);
out_stackdriver: gce: fix code style
static int fetch_metadata(struct flb_upstream *ctx, char *uri, - char *payload) { + char *payload) +{ int ret; int ret_code; size_t b_sent; @@ -87,10 +88,12 @@ static int fetch_metadata(struct flb_upstream *ctx, char *uri, /* Cleanup */ flb_http_client_destroy(c); flb_upstream_conn_release(metadata_conn); + return ret_code; } -int gce_metadata_read_token(struct flb_stackdriver *ctx) { +int gce_metadata_read_token(struct flb_stackdriver *ctx) +{ int ret; flb_sds_t uri = flb_sds_create(FLB_STD_METADATA_SERVICE_ACCOUNT_URI); flb_sds_t payload = flb_sds_create_size(4096); @@ -117,7 +120,8 @@ int gce_metadata_read_token(struct flb_stackdriver *ctx) { return 0; } -int gce_metadata_read_zone(struct flb_stackdriver *ctx) { +int gce_metadata_read_zone(struct flb_stackdriver *ctx) +{ int ret; int i; int j; @@ -142,11 +146,13 @@ int gce_metadata_read_zone(struct flb_stackdriver *ctx) { break; } } + if (part != 3) { flb_error("[out_stackdriver] wrong format of zone response"); flb_sds_destroy(payload); return -1; } + zone = flb_sds_create_size(flb_sds_len(payload) - i); j = 0; while (i != flb_sds_len(payload)) { @@ -157,10 +163,12 @@ int gce_metadata_read_zone(struct flb_stackdriver *ctx) { ctx->zone = flb_sds_create(zone); flb_sds_destroy(zone); flb_sds_destroy(payload); + return 0; } -int gce_metadata_read_project_id(struct flb_stackdriver *ctx) { +int gce_metadata_read_project_id(struct flb_stackdriver *ctx) +{ int ret; flb_sds_t payload = flb_sds_create_size(4096); @@ -175,7 +183,8 @@ int gce_metadata_read_project_id(struct flb_stackdriver *ctx) { return 0; } -int gce_metadata_read_instance_id(struct flb_stackdriver *ctx) { +int gce_metadata_read_instance_id(struct flb_stackdriver *ctx) +{ int ret; flb_sds_t payload = flb_sds_create_size(4096);
crypto: tutorial - minor improvement
@@ -177,6 +177,10 @@ sudo kdb umount user/test ## Configuration Value Encryption/Decryption +So far we learned how to encrypt and decrypt entrie configuration files. +Sometimes we only want to protect a smaller subset of configuration values in a bigger configuration setting. +For this reason the `crypto` plugin was developed. + The `crypto` plugin is actually a family of plugins and comes with three different providers: 1. `crypto_gcrypt` using `libgcrypt`, @@ -240,10 +244,12 @@ kdb setmeta user/test/password crypto/encrypt 1 kdb file user/test/password | xargs cat kdb set user/test/password 1234 #> Set string to "1234" +kdb set user/test/config "I am not encrypted" +#> Create a new key user/test/config with string "I am not encrypted" kdb file user/test/password | xargs cat ``` -To disable encryption, we can run: +To disable encryption on `user/test/password`, we can run: ```sh kdb setmeta user/test/password crypto/encrypt 0 @@ -254,6 +260,7 @@ kdb file user/test/password | xargs cat To clean up the environment we run: ```sh +kdb rm user/test/config kdb rm user/test/password kdb rm /sw/elektra/kdb/#0/current/plugins sudo kdb umount user/test
asurada: config EC_ENTERING_RW BRANCH=none TEST=in EC RO, EC_ENTERING_RW=0 in EC RW, EC_ENTERING_RW=1
@@ -81,6 +81,7 @@ GPIO(EN_PP5000_USB_A0_VBUS, PIN(B, 7), GPIO_OUT_LOW) GPIO(EC_BATT_PRES_ODL, PIN(C, 0), GPIO_INPUT) GPIO(BC12_DET_EN, PIN(J, 5), GPIO_OUT_LOW) /* EN_USB_C0_BC12_DET */ GPIO(EN_EC_ID_ODL, PIN(H, 5), GPIO_ODR_LOW) +GPIO(ENTERING_RW, PIN(C, 5), GPIO_OUT_LOW) /* EC_ENTERING_RW */ /* I2C pins - Alternate function below configures I2C module on these pins */ GPIO(I2C_A_SCL, PIN(B, 3), GPIO_INPUT) /* I2C_CHG_BATT_SCL */ @@ -143,7 +144,6 @@ UNIMPLEMENTED_GPIO(USB_A0_FAULT_ODL, PIN(A, 7)) /* TODO: ACOK_OD in P1 */ UNIMPLEMENTED_GPIO(EC_GPE5, PIN(E, 5)) UNIMPLEMENTED_GPIO(CHARGER_PROCHOT_ODL, PIN(C, 3)) -UNIMPLEMENTED_GPIO(ENTERING_RW, PIN(C, 5)) /* EC_ENTERING_RW */ UNIMPLEMENTED_GPIO(USB_C0_FRS_EN, PIN(H, 3)) UNIMPLEMENTED_GPIO(PG_MT6315_GPU_ODL, PIN(H, 6)) UNIMPLEMENTED_GPIO(USB_C0_MUX_INT_L, PIN(G, 3))
Update examples/rectangle to use typealias keyword. This corrects one of the problems that were mentioned in
-- Please refer to the LICENSE and AUTHORS files for details -- SPDX-License-Identifier: MIT --- The following program demonstrates using table types in Pallene. +typealias rectangle = { width: float, height: float } -type rectangle = { width: float, height: float } - --- The find_area() function accepts a rectangle object. It evaluates the area --- and returns it. function find_area(r: rectangle): float local result = r.width * r.height return result
Rename predicates in module/paths
[image] (unmarshal image load-image-dict)) -(defn- check-. [x] (if (string/has-prefix? "." x) x)) -(defn- not-check-. [x] (unless (or (string/has-prefix? "/" x) (string/has-prefix? "." x)) x)) -(defn- check-/ [x] (if (string/has-prefix? "/" x) x)) +(defn- check-relative [x] (if (string/has-prefix? "." x) x)) +(defn- check-is-dep [x] (unless (or (string/has-prefix? "/" x) (string/has-prefix? "." x)) x)) +(defn- check-project-relative [x] (if (string/has-prefix? "/" x) x)) (def module/paths ``` [pre] (or (find-index |(and (string? ($ 0)) (string/has-prefix? pre ($ 0))) module/paths) 0)) (def all-index (find-prefix ".:all:")) - (array/insert module/paths all-index [(string ".:all:" ext) loader check-/]) + (array/insert module/paths all-index [(string ".:all:" ext) loader check-project-relative]) (def sys-index (find-prefix ":sys:")) - (array/insert module/paths sys-index [(string ":sys:/:all:" ext) loader not-check-.]) + (array/insert module/paths sys-index [(string ":sys:/:all:" ext) loader check-is-dep]) (def curall-index (find-prefix ":cur:/:all:")) - (array/insert module/paths curall-index [(string ":cur:/:all:" ext) loader check-.]) + (array/insert module/paths curall-index [(string ":cur:/:all:" ext) loader check-relative]) module/paths) (module/add-paths ":native:" :native) (undef fexists) (undef mod-filter) -(undef check-.) -(undef not-check-.) -(undef check-/) +(undef check-relative) +(undef check-project-relative) +(undef check-is-dep) (def module/loading `Table mapping currently loading modules to true. Used to prevent
log2 is not implemented on Android
#define HAVE_LCHOWN 1 #define HAVE_LINK 1 #define HAVE_LLABS 1 -#define HAVE_LOG2 1 +//RHO +//#define HAVE_LOG2 1 #define HAVE_LSTAT 1 #define HAVE_MALLOC_USABLE_SIZE 1 #define HAVE_MEMALIGN 1
chip/mt8192_scp: fix unknown type errors Fixes unknown type errors such as: chip/mt8192_scp/ipi_chip.h:40:2: error: unknown type name 'uint32_t' uint32_t signaled; BRANCH=none TEST=make BOARD=asurada_scp
#ifndef __CROS_EC_IPI_CHIP_H #define __CROS_EC_IPI_CHIP_H +#include "common.h" + /* * Length of EC version string is at most 32 byte (NULL included), which * also aligns SCP fw_version length.
[components][driver]: spi sd card, remove the extra reinitialization code
@@ -1249,16 +1249,6 @@ static rt_size_t rt_msd_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_siz goto _exit; } - /* config spi to high speed */ - { - struct rt_spi_configuration cfg; - cfg.data_width = 8; - cfg.mode = RT_SPI_MODE_0 | RT_SPI_MSB; /* SPI Compatible Modes 0 */ - cfg.max_hz = msd->max_clock; - - rt_spi_configure(msd->spi_device, &cfg); - } /* config spi */ - /* SINGLE_BLOCK? */ if (size == 1) { @@ -1335,16 +1325,6 @@ static rt_size_t rt_msd_sdhc_read(rt_device_t dev, rt_off_t pos, void *buffer, r goto _exit; } - /* config spi to high speed */ - { - struct rt_spi_configuration cfg; - cfg.data_width = 8; - cfg.mode = RT_SPI_MODE_0 | RT_SPI_MSB; /* SPI Compatible Modes 0 */ - cfg.max_hz = msd->max_clock; - - rt_spi_configure(msd->spi_device, &cfg); - } /* config spi */ - /* SINGLE_BLOCK? */ if (size == 1) { @@ -1422,15 +1402,6 @@ static rt_size_t rt_msd_write(rt_device_t dev, rt_off_t pos, const void *buffer, goto _exit; } - /* config spi to high speed */ - { - struct rt_spi_configuration cfg; - cfg.data_width = 8; - cfg.mode = RT_SPI_MODE_0 | RT_SPI_MSB; /* SPI Compatible Modes 0 */ - cfg.max_hz = msd->max_clock; - - rt_spi_configure(msd->spi_device, &cfg); - } /* config spi */ /* SINGLE_BLOCK? */ if (size == 1) @@ -1550,16 +1521,6 @@ static rt_size_t rt_msd_sdhc_write(rt_device_t dev, rt_off_t pos, const void *bu goto _exit; } - /* config spi to high speed */ - { - struct rt_spi_configuration cfg; - cfg.data_width = 8; - cfg.mode = RT_SPI_MODE_0 | RT_SPI_MSB; /* SPI Compatible Modes 0 */ - cfg.max_hz = msd->max_clock; - - rt_spi_configure(msd->spi_device, &cfg); - } /* config spi */ - /* SINGLE_BLOCK? */ if (size == 1) {
reset: reverse order
void reset_reset(void) { - if (!memory_reset_hww()) { - Abort("Could not reset memory."); - } #ifndef TESTING if (!securechip_update_keys()) { Abort("Could not reset secure chip."); } #endif + if (!memory_reset_hww()) { + Abort("Could not reset memory."); + } }
link libpocl-devices-vulkan.so with -pthread
@@ -30,5 +30,5 @@ endif(MSVC) add_pocl_device_library(pocl-devices-vulkan pocl-vulkan.c pocl-vulkan.h) if(ENABLE_LOADABLE_DRIVERS) - target_link_libraries(pocl-devices-vulkan PRIVATE ${Vulkan_LIBRARY}) + target_link_libraries(pocl-devices-vulkan PRIVATE ${Vulkan_LIBRARY} ${PTHREAD_LIBRARY}) endif()
Correct path for using the ft90x-sdk submodule (BRTSG-FOSS / ft90x-sdk). Default to ft90x-sdk instead of pre-built library.
@@ -3,23 +3,24 @@ CROSS_COMPILE = ft32-elf- SKIP_NANOLIB = 1 # Set to use FT90X prebuilt libraries. -FT90X_PREBUILT_LIBS = 1 +FT90X_PREBUILT_LIBS = 0 ifeq ($(FT90X_PREBUILT_LIBS),1) # If the FT90X toolchain is installed on Windows systems then the SDK # include files and prebuilt libraries are at: %FT90X_TOOLCHAIN%/hardware FT9XX_SDK = $(FT90X_TOOLCHAIN)/hardware +INC += $(FT9XX_SDK)/include else # The submodule BRTSG-FOSS/ft90x-sdk contains header files and source # code for the Bridgetek SDK. This can be used instead of the prebuilt # library. -DEPS_SUBMODULES += hw/mcu/bridgetek/ft9xx/hardware +DEPS_SUBMODULES += hw/mcu/bridgetek/ft9xx/ft90x-sdk # The SDK can be used to load specific files from the Bridgetek SDK. -FT9XX_SDK = hw/mcu/bridgetek/ft9xx/hardware/Source +FT9XX_SDK = hw/mcu/bridgetek/ft9xx/ft90x-sdk/Source +INC += $(TOP)/$(FT9XX_SDK)/include endif # Add include files which are within the TinyUSB directory structure. INC += \ - $(TOP)/hw/mcu/bridgetek/ft9xx/hardware/Source/include \ $(TOP)/$(BOARD_PATH) # Add required C Compiler flags for FT90X.
WinShareConnector: fix missing last access date save
@@ -1118,6 +1118,13 @@ public class SharedDriveConnector extends org.apache.manifoldcf.crawler.connecto fileLengthLong = fileLength; } finally { inputStream.close(); + if (preserveLastAccess && !fileIsDirectory && orgLastAccess != 0L) { + try { + file.setLastAccess(orgLastAccess); + } catch (final Exception e) { + Logging.connectors.warn("Unable to preserve last access date for " + documentIdentifier, e); + } + } } } } else {
readme: fixed header in response to github/markup#1022
- -<img src="doc/criterion-title.png" height="96" alt="Criterion Logo" /> -========= +<h1><img src="doc/criterion-title.png" height="96" alt="Criterion Logo" /></h1> [![Unix Build Status](https://img.shields.io/travis/Snaipe/Criterion/bleeding.svg?label=linux)](https://travis-ci.org/Snaipe/Criterion) [![Windows Build Status](https://img.shields.io/appveyor/ci/Snaipe/Criterion/bleeding.svg?label=windows)](https://ci.appveyor.com/project/Snaipe/Criterion/branch/bleeding)
apps/shell: Add clear command on TASH there was no clear command. Added.
@@ -94,6 +94,7 @@ struct tash_cmd_info_s { ********************************************************************************/ static int tash_help(int argc, char **args); +static int tash_clear(int argc, char **args); static int tash_exit(int argc, char **args); #if defined(CONFIG_BOARDCTL_RESET) static int tash_reboot(int argc, char **argv); @@ -112,6 +113,7 @@ static struct tash_cmd_info_s tash_cmds_info = {PTHREAD_MUTEX_INITIALIZER}; const static tash_cmdlist_t tash_basic_cmds[] = { {"exit", tash_exit, TASH_EXECMD_SYNC}, {"help", tash_help, TASH_EXECMD_SYNC}, + {"clear", tash_clear, TASH_EXECMD_SYNC}, #ifdef CONFIG_TASH_SCRIPT {"sh", tash_script, TASH_EXECMD_SYNC}, #endif @@ -191,6 +193,15 @@ static int tash_help(int argc, char **args) return 0; } +/** @brief Clear the terminal screen and move cursor to top + * @ingroup tash + */ +static int tash_clear(int argc, char **args) +{ + printf("\x1b[1;1H\x1b[2J\n"); + return 0; +} + /** @brief TASH exit function. It cannot be re-launched. * @ingroup tash */
fixed skip maclist
@@ -1504,6 +1504,7 @@ maclistskipcount = 0; while(1) { if((len = fgetline(fh_maclistin, PMKIDEAPOL_BUFFER_LEN, linein)) == -1) break; + if(len < 12) continue; if(len > 17) { p2 = 0; @@ -1518,6 +1519,7 @@ while(1) linein[p2] = 0; len = p2; } + linein[12] = 0; if(getfield(linein, 6, zeiger->mac) != 6) continue; maclistskipcount++; if(maclistskipcount >= maclistskipmax)
dm: fix potential NULL pointer access in virtio_console.c "port->cb" in 'virtio_console_notify_tx()' function maybe NULL when malicious inputs are injected from virtio frondend in guest.
@@ -390,7 +390,7 @@ virtio_console_notify_tx(void *vdev, struct virtio_vq_info *vq) while (vq_has_descs(vq)) { vq_getchain(vq, &idx, iov, 1, flags); - if (port != NULL) + if ((port != NULL) && (port->cb != NULL)) port->cb(port, port->arg, iov, 1); /*
Make wifi settings only available on rpi gateways.
@@ -245,6 +245,12 @@ void DeRestPluginPrivate::initTimezone() /*! Init WiFi parameters if necessary. */ void DeRestPluginPrivate::initWiFi() { + +#if !defined(ARCH_ARMV6) && !defined (ARCH_ARMV7) + gwWifi = QLatin1String("not-available"); + return; +#endif + // only configure for official image if (gwSdImageVersion.isEmpty()) {
sim: Remove extraneous slice reference Clippy suggests that the reference is unnecessary when making a comparison.
@@ -1514,7 +1514,7 @@ fn verify_trailer(flash: &SimMultiFlash, slot: &SlotInfo, true } else if v == 3 { let expected = [erased_val; 16]; - if &copy[24..] != expected { + if copy[24..] != expected { warn!("\"magic\" mismatch at {:#x}", offset); true } else {
remove: MAP_NORESERVE
@@ -73,7 +73,7 @@ extern void *util_Realloc(void *ptr, size_t sz) void *util_MMap(size_t sz) { - void *p = mmap(NULL, sz, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE | MAP_NORESERVE, -1, 0); + void *p = mmap(NULL, sz, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); if (p == MAP_FAILED) { LOG_F("mmap(size='%zu')", sz); }
Update README.rst Hopefully added refs to IoHeat example.
@@ -31,4 +31,4 @@ Expected output :width: 600px :align: center -Contour plot of surface tidal heat flux of Io as a function of its eccentricity and obliquity. Contour units are W/m^2, the vertical line corresponds to Io's observed eccentricity, and the horizontal line is the expected obliquity if Io is in a Cassini state :cite 'BillsRay00'. The orange shaded region corresponds to the observed value of 2-3 W/m^2 :cite 'Veeder14'. +Contour plot of surface tidal heat flux of Io as a function of its eccentricity and obliquity. Contour units are W/m^2, the vertical line corresponds to Io's observed eccentricity, and the horizontal line is the expected obliquity if Io is in a Cassini state :cite:'BillsRay00'. The orange shaded region corresponds to the observed value of 2-3 W/m^2 :cite:'Veeder14'.
Configure: move down the treatment of seed sources Most of all, this is so it doesn't output mysterious text when we're treating the phony config targets LISH, HASH and TABLE
@@ -886,17 +886,6 @@ if (grep { $_ =~ /(^|\s)-Wl,-rpath,/ } ($user{LDLIBS} ? @{$user{LDLIBS}} : ()) "***** any of asan, msan or ubsan\n"; } -if (scalar(@seed_sources) == 0) { - print "Using implicit seed configuration\n"; - push @seed_sources, 'os'; -} -die "Cannot seed with none and anything else" - if scalar(grep { $_ eq 'none' } @seed_sources) > 0 - && scalar(@seed_sources) > 1; -push @{$config{openssl_other_defines}}, - map { (my $x = $_) =~ tr|[\-a-z]|[_A-Z]|; "OPENSSL_RAND_SEED_$x" } - @seed_sources; - my @tocheckfor = (keys %disabled); while (@tocheckfor) { my %new_tocheckfor = (); @@ -940,6 +929,17 @@ if ($target eq "HASH") { print "Configuring OpenSSL version $config{version} ($config{version_num}) "; print "for $target\n"; +if (scalar(@seed_sources) == 0) { + print "Using os-specific seed configuration\n"; + push @seed_sources, 'os'; +} +die "Cannot seed with none and anything else" + if scalar(grep { $_ eq 'none' } @seed_sources) > 0 + && scalar(@seed_sources) > 1; +push @{$config{openssl_other_defines}}, + map { (my $x = $_) =~ tr|[\-a-z]|[_A-Z]|; "OPENSSL_RAND_SEED_$x" } + @seed_sources; + # Backward compatibility? if ($target =~ m/^CygWin32(-.*)$/) { $target = "Cygwin".$1;
Handle awkward special cases in tan/cot32.
@@ -334,12 +334,24 @@ const C : (uint64, uint64, uint64)[257] = [ ] const tan32 = {x : flt32 + /* A rather irritating special rounding case */ + if std.flt32bits(x) == 0xdffd33a4 + -> std.flt32frombits(0xbfd06c8c) + ;; + var r, s (r, s) = tanorcot((x : flt64), true) -> round_down(r, s) } const cot32 = {x : flt32 + /* Two more irritating special cases */ + if std.flt32bits(x) == 0x33de86a9 + -> std.flt32frombits(0x4b134133) + elif std.flt32bits(x) == 0xb3de86a9 + -> std.flt32frombits(0xcb134133) + ;; + var r, s (r, s) = tanorcot((x : flt64), false) -> round_down(r, s)
VCL: Update lcl addr/port from connect session reply msg.
@@ -871,6 +871,10 @@ vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp) session->server_rx_fifo = rx_fifo; session->server_tx_fifo = tx_fifo; session->vpp_handle = mp->handle; + session->lcl_addr.is_ip4 = mp->is_ip4; + clib_memcpy (&session->lcl_addr.ip46, mp->lcl_ip, + sizeof (session->peer_addr.ip46)); + session->lcl_port = mp->lcl_port; session->state = STATE_CONNECT; /* Add it to lookup table */