message
stringlengths
6
474
diff
stringlengths
8
5.22k
[tcp] remove extra printf
@@ -994,7 +994,6 @@ status_t tcp_connect(tcp_socket_t **handle, uint32_t addr, uint16_t port) { // XXX add some entropy to try to better randomize things lk_bigtime_t t = current_time_hires(); - printf("%lld\n", t); rand_add_entropy(&t, sizeof(t)); // set up the socket for outgoing connections
[github][ci] add qemu-virt-m68k-test to the build matrix
@@ -84,6 +84,9 @@ jobs: - project: pc-x86-64-test toolchain: x86_64-elf-7.5.0-Linux-x86_64 debug: 2 + - project: qemu-virt-m68k-test + toolchain: m68k-elf-7.5.0-Linux-x86_64 + debug: 2 # build some in release mode (DEBUG=0) - project: qemu-virt-arm32-test toolchain: arm-eabi-7.5.0-Linux-x86_64
fix overly restrictive assertion
@@ -688,6 +688,6 @@ mi_page_t* _mi_segment_page_alloc(size_t block_size, mi_segments_tld_t* tld, mi_ page = mi_segment_large_page_alloc(tld, os_tld); else page = mi_segment_huge_page_alloc(block_size,tld,os_tld); - mi_assert_expensive(mi_segment_is_valid(_mi_page_segment(page))); + mi_assert_expensive(page == NULL || mi_segment_is_valid(_mi_page_segment(page))); return page; }
nxos/base/drivers/i2c: Supress unused variable warning. The comment indicates that this read operation is intentional, so keep it. Instead just cast to void to suppress: base/drivers/i2c.c:410:16: error: variable 'dummy' set but not used [-Werror=unused-but-set-variable] 410 | volatile U32 dummy; | ^~~~~
@@ -417,6 +417,7 @@ static void i2c_isr(void) { * interrupt handler to be called again. */ dummy = *AT91C_TC0_SR; + (void)dummy; for (sensor=0; sensor<NXT_N_SENSORS; sensor++) { const nx__sensors_pins *pins = nx__sensors_get_pins(sensor);
fixes possible segfault by wrong argument type (see for details)
@@ -4641,7 +4641,7 @@ void DeRestPluginPrivate::checkSensorButtonEvent(Sensor *sensor, const deCONZ::A if (dt > 0 && dt < 500) { - DBG_Printf(DBG_INFO, "[INFO] - Button %u %s, discard too fast event (dt = %d) %s\n", buttonMap.button, qPrintable(cmd), dt, qPrintable(sensor->modelId())); + DBG_Printf(DBG_INFO, "[INFO] - Button %u %s, discard too fast event (dt = %d) %s\n", buttonMap.button, qPrintable(cmd), (int)dt, qPrintable(sensor->modelId())); break; } }
tests/run-perfbench.py: Skip complex tests if target doesn't enable it.
@@ -77,13 +77,17 @@ def run_benchmark_on_target(target, script): return -1, -1, 'CRASH: %r' % err def run_benchmarks(target, param_n, param_m, n_average, test_list): + skip_complex = run_feature_test(target, 'complex') != 'complex' skip_native = run_feature_test(target, 'native_check') != '' for test_file in sorted(test_list): print(test_file + ': ', end='') # Check if test should be skipped - skip = skip_native and test_file.find('viper_') != -1 + skip = ( + skip_complex and test_file.find('bm_fft') != -1 + or skip_native and test_file.find('viper_') != -1 + ) if skip: print('skip') continue
Update: NAR_language.py: allow starting with generic tokenization, which needs to introduce word token combinations first to make it recognize words, making it slightly less data-efficient but more general
import NAR import json +import sys NAR.AddInput("*volume=100") #NAL truth functions @@ -234,7 +235,7 @@ def newSentence(sentence): global words, localist_tokens if " " not in sentence: localist_tokens = True - if localist_tokens: + if localist_tokens and not "genericTokenization" in sys.argv: words = sentence.split(" ") else: words = findSequences(sentence)
mbedtls: Fix Z->s in mbedtls_mpi_exp_mod() Z->s should never be zero, only 1 or -1. Added additional checks for X, Y and M args to correctly set Z->s. Closes: Closes: Closes:
@@ -359,6 +359,18 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi* Z, const mbedtls_mpi* X, const mbedtls_mpi mbedtls_mpi *Rinv; /* points to _Rinv (if not NULL) othwerwise &RR_new */ mbedtls_mpi_uint Mprime; + if (mbedtls_mpi_cmp_int(M, 0) <= 0 || (M->p[0] & 1) == 0) { + return MBEDTLS_ERR_MPI_BAD_INPUT_DATA; + } + + if (mbedtls_mpi_cmp_int(Y, 0) < 0) { + return MBEDTLS_ERR_MPI_BAD_INPUT_DATA; + } + + if (mbedtls_mpi_cmp_int(Y, 0) == 0) { + return mbedtls_mpi_lset(Z, 1); + } + if (hw_words * 32 > 4096) { return MBEDTLS_ERR_MPI_NOT_ACCEPTABLE; } @@ -392,13 +404,24 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi* Z, const mbedtls_mpi* X, const mbedtls_mpi start_op(RSA_START_MODEXP_REG); /* X ^ Y may actually be shorter than M, but unlikely when used for crypto */ - MBEDTLS_MPI_CHK( mbedtls_mpi_grow(Z, m_words) ); + if ((ret = mbedtls_mpi_grow(Z, m_words)) != 0) { + esp_mpi_release_hardware(); + goto cleanup; + } wait_op_complete(RSA_START_MODEXP_REG); mem_block_to_mpi(Z, RSA_MEM_Z_BLOCK_BASE, m_words); esp_mpi_release_hardware(); + // Compensate for negative X + if (X->s == -1 && (Y->p[0] & 1) != 0) { + Z->s = -1; + MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(Z, M, Z)); + } else { + Z->s = 1; + } + cleanup: if (_Rinv == NULL) { mbedtls_mpi_free(&Rinv_new);
more optimize code
@@ -16099,21 +16099,6 @@ prebuild_temp_table(Relation rel, RangeVar *tmpname, DistributedBy *distro, rel->rd_rel->relhasindex) cs->buildAoBlkdir = true; - if (RelationIsAoCols(rel)) - { - ListCell *lc; - - foreach(lc, opts) - { - DefElem *de = lfirst(lc); - - cs->options = lappend(cs->options, de); - } - if (useExistingColumnAttributes) - col_encs = RelationGetUntransformedAttributeOptions(rel); - } - else - { cs->options = opts; if (RelationIsAoRows(rel)) @@ -16129,7 +16114,9 @@ prebuild_temp_table(Relation rel, RangeVar *tmpname, DistributedBy *distro, */ cs->options = build_ao_rel_storage_opts(cs->options, rel); } - } + + if (RelationIsAoCols(rel) && useExistingColumnAttributes) + col_encs = RelationGetUntransformedAttributeOptions(rel); for (attno = 0; attno < tupdesc->natts; attno++) {
Work CI-CD Add missing triggers configs to yaml. Add missing templates. ***NO_CI***
+trigger: none +pr: none + +# add nf-tools repo to resources (for Azure Pipelines templates) +resources: + repositories: + - repository: templates + type: github + name: nanoframework/nf-tools + endpoint: nanoframework + - repository: esp32_idf + type: github + name: espressif/esp-idf + endpoint: nanoframework + ref: refs/tags/v4.3.1 + # scheduled build schedules: - cron: "50 28 * * *"
libhfuzz: make libraries more backwards-compatible with the honggfuzz binary
@@ -71,9 +71,9 @@ static bool initializeCovFeedback(void) { if (fstat(_HF_COV_BITMAP_FD, &st) == -1) { return false; } - if (st.st_size != sizeof(feedback_t)) { - LOG_W("Size of the feedback structure mismatch: st.size != sizeof(feedback_t) (%zu != " - "%zu). Link your fuzzed binaries with the newest honggfuzz and hfuzz-clang(++)", + if ((size_t)st.st_size < sizeof(feedback_t)) { + LOG_W("Size of the feedback structure mismatch: st.size < sizeof(feedback_t) (%zu < " + "%zu). Build your honggfuzz binary from newer sources", (size_t)st.st_size, sizeof(feedback_t)); return false; }
Report SkylakeX as Haswell if compiler does not support AVX512 ... or make was invoked with NO_AVX512=1
@@ -91,6 +91,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <unistd.h> #endif +#if (( defined(__GNUC__) && __GNUC__ > 6 && defined(__AVX2__)) || (defined(__clang__) && __clang_major__ >= 6)) +#else +#define NO_AVX512 +#endif /* #define FORCE_P2 */ /* #define FORCE_KATMAI */ /* #define FORCE_COPPERMINE */ @@ -327,6 +331,20 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #ifdef FORCE_SKYLAKEX +#ifdef NO_AVX512 +#define FORCE +#define FORCE_INTEL +#define ARCHITECTURE "X86" +#define SUBARCHITECTURE "HASWELL" +#define ARCHCONFIG "-DHASWELL " \ + "-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \ + "-DL2_SIZE=262144 -DL2_LINESIZE=64 " \ + "-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \ + "-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \ + "-DFMA3" +#define LIBNAME "haswell" +#define CORENAME "HASWELL" +#else #define FORCE #define FORCE_INTEL #define ARCHITECTURE "X86" @@ -340,6 +358,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define LIBNAME "skylakex" #define CORENAME "SKYLAKEX" #endif +#endif #ifdef FORCE_ATOM #define FORCE
remove commented out bits in favor of calling add_repo_file()
@@ -180,29 +180,6 @@ foreach my $distro (@distros) { my $isSrcRepo=0; add_repo_file("$tmp_dir/OpenHPC.local.repo",$micro,$base_release,$release,$distro,$isSrcRepo); -### my $repoFile="$tmp_dir/OpenHPC.local.repo"; -### -### print "Adding [base] repofile contents -> $repoFile\n"; -### -### File::Copy::copy("repo.base.in","$repoFile") || die "Unable to copy repo.base.in\n"; -### if($micro) { -### print "Appending [update] repo\n"; -### open (BASE, ">>","$repoFile") || die "Unable to append to repo file\n"; -### open (UPDATE,"<","repo.update.in") || die "Unable to access repo.update.in\n"; -### print BASE <UPDATE>; -### close BASE; -### close UPDATE; -### } -### - # Update version strings in .repo file - -### my $file_update = path($repoFile); -### my $contents = $file_update->slurp_utf8; -### $contents =~ s/\@VERSION_MINOR\@/$base_release/g; -### $contents =~ s/\@VERSION_MICRO\@/$release/g; -### $contents =~ s/\@DISTRO\@/$distro/g; -### $file_update->spew_utf8( $contents ); - # Copy make_repo.sh utility print "Adding make_repo.sh utility\n"; File::Copy::copy("make_repo.sh","$tmp_dir") || die "Unable to copy make_repo.sh\n";
options/linux: Implement the utmpx family as musl does
#include <bits/ensure.h> +#include <stddef.h> +#include <errno.h> #include <utmpx.h> void updwtmpx(const char *, const struct utmpx *) { - __ensure(!"Not implemented"); - __builtin_unreachable(); + // Empty as musl does } void endutxent(void) { - __ensure(!"Not implemented"); - __builtin_unreachable(); + // Empty as musl does } void setutxent(void) { - __ensure(!"Not implemented"); - __builtin_unreachable(); + // Empty as musl does } struct utmpx *getutxent(void) { - __ensure(!"Not implemented"); - __builtin_unreachable(); + // return NULL as musl does + return NULL; } struct utmpx *pututxline(const struct utmpx *) { - __ensure(!"Not implemented"); - __builtin_unreachable(); + // return NULL as musl does + return NULL; } int utmpxname(const char *) { - __ensure(!"Not implemented"); - __builtin_unreachable(); + // return -1 as musl does + errno = ENOSYS; + return -1; }
HV: switch launch LaaG with OVMF by default OVMF will open source for V1.2, so enable launch LaaG with OVMF.
@@ -102,16 +102,22 @@ acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge \ -s 3,virtio-blk,/home/clear/uos/uos.img \ -s 4,virtio-net,tap0 \ -s 7,virtio-rnd \ + --ovmf ./OVMF.fd \ $logger_setting \ --mac_seed $mac_seed \ - -k /usr/lib/kernel/default-iot-lts2018 \ - -B "root=/dev/vda3 rw rootwait maxcpus=$2 nohpet console=tty0 console=hvc0 \ - console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \ - consoleblank=0 tsc=reliable i915.avail_planes_per_pipe=$4 \ - i915.enable_hangcheck=0 i915.nuclear_pageflip=1 i915.enable_guc_loading=0 \ - i915.enable_guc_submission=0 i915.enable_guc=0" $vm_name + $vm_name } +#add following cmdline to grub.cfg and update kernel +#when launching LaaG by OVMF +#rw rootwait maxcpus=1 nohpet console=tty0 console=hvc0 +#console=ttyS0 no_timer_check ignore_loglevel +#log_buf_len=16M consoleblank=0 +#tsc=reliable i915.avail_planes_per_pipe="64 448 8" +#i915.enable_hangcheck=0 i915.nuclear_pageflip=1 +#i915.enable_guc_loading=0 +#i915.enable_guc_submission=0 i915.enable_guc=0 + # offline SOS CPUs except BSP before launch UOS for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do online=`cat $i/online`
Show all suggestions if no word is selected
@@ -223,7 +223,7 @@ class EditorViewController: UIViewController, SyntaxTextViewDelegate, InputAssis func updateSuggestions() { guard let selectedWord = textView.contentTextView.currentWord, !selectedWord.isEmpty else { - self.suggestions = [] + self.suggestions = EditorViewController.suggestions return inputAssistant.reloadData() }
fuzz: pthread_setname_np is not available with many OSes
@@ -632,12 +632,6 @@ static void* fuzz_threadNew(void* arg) { unsigned int fuzzNo = ATOMIC_POST_INC(hfuzz->threads.threadsActiveCnt); LOG_I("Launched new fuzzing thread, no. #%" PRId32, fuzzNo); - char tname[16]; - snprintf(tname, sizeof(tname), "HFUZZ-%" PRId32, fuzzNo); - if (pthread_setname_np(pthread_self(), tname) != 0) { - PLOG_W("pthread_setname_np(pthread_self(), '%s') failed", tname); - } - run_t run = { .global = hfuzz, .pid = 0,
encoding/json: Remove unnecessary reads when parsing This caused the library to skip some characters after parsing an object from a list. When it encountered a character it didn't expect the library returned an error. We don't need to consume white space here because it is done after returning from this function.
@@ -494,8 +494,7 @@ json_internal_read_object(struct json_buffer *jb, } else if (c == ',') { state = await_attr; } else if (c == '}') { - c = jb->jb_read_next(jb); - goto good_parse; + return 0; } else { return JSON_ERR_BADTRAIL; } @@ -503,10 +502,6 @@ json_internal_read_object(struct json_buffer *jb, } } - good_parse: - /* in case there's another object following, consume trailing WS */ - while (isspace((unsigned char) jb->jb_read_next(jb))) { - } return 0; }
Disable heap reflection by default since reflected processes don't include port heaps
@@ -36,7 +36,7 @@ VOID PhAddDefaultSettings( PhpAddIntegerSetting(L"EnableCycleCpuUsage", L"1"); PhpAddIntegerSetting(L"EnableImageCoherencySupport", L"0"); PhpAddIntegerSetting(L"EnableInstantTooltips", L"0"); - PhpAddIntegerSetting(L"EnableHeapReflection", L"1"); + PhpAddIntegerSetting(L"EnableHeapReflection", L"0"); PhpAddIntegerSetting(L"EnableHeapMemoryTagging", L"0"); PhpAddIntegerSetting(L"EnableKph", L"0"); PhpAddIntegerSetting(L"EnableKphWarnings", L"1");
work on physics stuff
@@ -1445,6 +1445,14 @@ factory.register(0x141829CE0, "Client::Game::Camera", "Client::Game::CameraBase" factory.register(0x14182B780, "Client::Graphics::Culling::OcclusionCullingManager", "Client::Graphics::Singleton", {}) factory.register(0x14182B790, "Client::Graphics::Streaming::StreamingManager_Client::Graphics::JobSystem_Client::Graphics::Streaming::StreamingManager::StreamingJob", "Client::Graphics::Singleton", {}) factory.register(0x14182B798, "Client::Graphics::Streaming::StreamingManager", "Client::Graphics::Singleton", {}) +factory.register(0x14182DD60, "Client::Graphics::Physics::BonePhysicsModule", "", { + 0: "dtor", + 0x141139250: "ctor", + 0x1411393D0: "Initialize", +}) +factory.register(0x1418324B0, "Client::Graphics::Physics::BoneSimulator", "", { + 0x141159DC0: "ctor", +}) factory.register(0x1418334C8, "Component::Log::LogModule", "Client::System::Common::NonCopyable", {}) factory.register(0x1418791E0, "Client::Game::Gimmick::GimmickEventHandler", "Client::Game::Event::LuaEventHandler", {}) factory.register(0x14187A2A0, "Client::Game::Gimmick::GimmickRect", "Client::Game::Gimmick::GimmickEventHandler", {})
extmod/modbuiltins/Speaker: add wait function Allow a user to pause the program until a background sound completes.
#include "py/obj.h" #include "py/runtime.h" #include "py/mpconfig.h" +#include "py/mphal.h" #include "modbuiltins.h" #include "pberror.h" typedef struct _builtins_Speaker_obj_t { mp_obj_base_t base; uint8_t volume; - uint8_t foo; + uint8_t foo; // DELETEME } builtins_Speaker_obj_t; // pybricks.builtins.Speaker.__init__/__new__ @@ -50,6 +51,21 @@ STATIC mp_obj_t builtins_Speaker_stop(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(builtins_Speaker_stop_obj, builtins_Speaker_stop); +// pybricks.builtins.Speaker.wait +STATIC mp_obj_t builtins_Speaker_wait(mp_obj_t self_in) { + builtins_Speaker_obj_t *self = MP_OBJ_TO_PTR(self_in); + + // DELETEME + bool busy = self->foo * 0; + + // Wait for a background sound to finish + while (busy) { + mp_hal_delay_ms(10); + } + return mp_const_none; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_1(builtins_Speaker_wait_obj, builtins_Speaker_wait); + // pybricks.builtins.Speaker.say STATIC mp_obj_t builtins_Speaker_say(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { @@ -121,6 +137,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(builtins_Speaker_play_obj, 0, builtins_Speaker // dir(pybricks.builtins.Speaker) STATIC const mp_rom_map_elem_t builtins_Speaker_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_busy ), MP_ROM_PTR(&builtins_Speaker_busy_obj) }, + { MP_ROM_QSTR(MP_QSTR_wait ), MP_ROM_PTR(&builtins_Speaker_wait_obj) }, { MP_ROM_QSTR(MP_QSTR_beep ), MP_ROM_PTR(&builtins_Speaker_beep_obj) }, { MP_ROM_QSTR(MP_QSTR_play ), MP_ROM_PTR(&builtins_Speaker_play_obj) }, { MP_ROM_QSTR(MP_QSTR_say ), MP_ROM_PTR(&builtins_Speaker_say_obj ) },
CI: Force Wasmer version 0.15.0
@@ -108,7 +108,7 @@ jobs: - name: Install Wasienv run: curl https://raw.githubusercontent.com/wasienv/wasienv/master/install.sh | sh - name: Install Wasmer - run: curl https://get.wasmer.io -sSfL | sh + run: curl https://get.wasmer.io -sSfL | sh -s --version 0.15.0 - name: Run CMake run: | source $HOME/.wasienv/wasienv.sh
If buffer overflow remove the oldest message instead of rejecting new message
@@ -19,12 +19,16 @@ char mngr_message_available(void) { } void mngr_set(module_t* module, msg_t* msg) { - if ((module_msg_available+1 > MSG_BUFFER_SIZE) || (module->message_available+1 > MSG_BUFFER_SIZE)) { - // This new message doesn't fit into buffer, don't save it - return; - } + if ((module_msg_available+1 < MSG_BUFFER_SIZE) || (module->message_available+1 < MSG_BUFFER_SIZE)) { module_msg_mngr[module_msg_available++] = module; module->msg_stack[module->message_available++] = msg; + } else { + // out of buffer. remove the oldest message and add this new one. + mngr_t trash; + mngr_get_msg(0, 0, &trash); + module_msg_mngr[module_msg_available++] = module; + module->msg_stack[module->message_available++] = msg; + } } void mngr_get_msg(int module_index,int msg_index, mngr_t* chunk) {
Fix restart cookie on wasm;
@@ -21,6 +21,8 @@ typedef struct { static void emscriptenLoop(void*); #endif +static Variant cookie; + int main(int argc, char** argv) { if (argc > 1 && (!strcmp(argv[1], "--version") || !strcmp(argv[1], "-v"))) { lovrPlatformOpenConsole(); @@ -32,8 +34,6 @@ int main(int argc, char** argv) { int status; bool restart; - Variant cookie; - cookie.type = TYPE_NIL; do { lovrPlatformSetTime(0.); @@ -124,8 +124,13 @@ static void emscriptenLoop(void* arg) { lua_State* T = context->T; if (luax_resume(T, 0) != LUA_YIELD) { - bool restart = lua_type(T, -1) == LUA_TSTRING && !strcmp(lua_tostring(T, -1), "restart"); - int status = lua_tonumber(T, -1); + bool restart = lua_type(T, 1) == LUA_TSTRING && !strcmp(lua_tostring(T, 1), "restart"); + int status = lua_tonumber(T, 1); + luax_checkvariant(T, 2, &cookie); + if (cookie.type == TYPE_OBJECT) { + cookie.type = TYPE_NIL; + memset(&cookie.value, 0, sizeof(cookie.value)); + } lua_close(context->L); emscripten_cancel_main_loop();
new tarball hieracrhy
@@ -84,7 +84,7 @@ rm -rf %{buildroot} %debug_package %{nil} %install -cd build +cd beegfs_client_module/build echo "mkdir RPM_BUILD_ROOT (${RPM_BUILD_ROOT})" mkdir -p ${RPM_BUILD_ROOT} make RELEASE_PATH=${RPM_BUILD_ROOT}/opt/beegfs/src/client \
apps/system/critmon/Makefile: Stack size and priority reversed.
# Stack Monitor Application -CONFIG_SYSTEM_CRITMONITOR_PRIORITY ?= 2048 -CONFIG_SYSTEM_CRITMONITOR_STACKSIZE ?= SCHED_DAEMON_PRIORITY_DEFAULT +CONFIG_SYSTEM_CRITMONITOR_PRIORITY ?= SCHED_PRIORITY_DEFAULT +CONFIG_SYSTEM_CRITMONITOR_STACKSIZE ?= 2048 PRIORITY = $(CONFIG_SYSTEM_CRITMONITOR_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_CRITMONITOR_STACKSIZE)
add make targets: common, discord, github, orka
@@ -2,17 +2,23 @@ CC ?= gcc OBJDIR := obj LIBDIR := lib -SRC := $(wildcard \ +COMMON_SRC := $(wildcard \ curl-websocket.c \ http-common.c \ orka-utils.c \ - github-*.cpp \ - discord-*.cpp \ - orka-*.cpp \ ntl.c json-*.c) -_OBJS := $(filter %.o,$(SRC:.cpp=.o) $(SRC:.c=.o)) -OBJS := $(addprefix $(OBJDIR)/, $(_OBJS)) + +DISCORD_SRC := $(wildcard discord-*.cpp) +GITHUB_SRC := $(wildcard github-*.cpp) +ORKA_SRC := $(wildcard orka-*.cpp) + +COMMON_OBJS := $(COMMON_SRC:%=$(OBJDIR)/%.o) +DISCORD_OBJS := $(DISCORD_SRC:%=$(OBJDIR)/%.o) +GITHUB_OBJS := $(GITHUB_SRC:%=$(OBJDIR)/%.o) +ORKA_OBJS := $(ORKA_SRC:%=$(OBJDIR)/%.o) + +OBJS := $(COMMON_OBJS) $(DISCORD_OBJS) $(GITHUB_OBJS) $(ORKA_OBJS) BOT_SRC := $(wildcard bots/bot-*.cpp) BOT_EXES := $(patsubst %.cpp, %.exe, $(BOT_SRC)) @@ -20,7 +26,6 @@ BOT_EXES := $(patsubst %.cpp, %.exe, $(BOT_SRC)) TEST_SRC := $(wildcard test/test-*.cpp test/test-*.c) TEST_EXES := $(filter %.exe, $(TEST_SRC:.cpp=.exe) $(TEST_SRC:.c=.exe)) - LIBDISCORD_CFLAGS := -I./ LIBDISCORD_LDFLAGS := -L./$(LIBDIR) -ldiscord -lcurl @@ -55,7 +60,13 @@ PREFIX ?= /usr/local .PHONY : all mkdir install clean purge -all : mkdir $(OBJS) $(LIBDISCORD_SLIB) bot +all : mkdir common discord github orka $(LIBDISCORD_SLIB) bot + +common: mkdir $(COMMON_OBJS) +discord: mkdir $(DISCORD_OBJS) +github: mkdir $(GITHUB_OBJS) +orka: mkdir $(ORKA_OBJS) + bot: $(BOT_EXES) test: all $(TEST_EXES) @@ -63,13 +74,14 @@ test: all $(TEST_EXES) mkdir : mkdir -p $(OBJDIR) $(LIBDIR) -$(OBJDIR)/%.o : %.c +$(OBJDIR)/%.c.o : %.c $(CC) $(CFLAGS) $(LIBS_CFLAGS) -c -o $@ $< -$(OBJDIR)/%.o: %.cpp +$(OBJDIR)/%.cpp.o: %.cpp $(CXX) $(CXXFLAGS) $(LIBS_CFLAGS) -c -o $@ $< %.exe : %.c $(CC) $(CFLAGS) $(LIBS_CFLAGS) -o $@ $< $(LIBS_LDFLAGS) + %.exe: %.cpp $(CXX) $(CXXFLAGS) $(LIBS_CFLAGS) -o $@ $< $(LIBS_LDFLAGS)
Add missing nothrow specifier to new operator as code suggests
@@ -165,9 +165,9 @@ extern "C" celix_status_t bundleActivator_create(celix_bundle_context_t *context int status = CELIX_SUCCESS; \ \ BundleActivatorData* data = nullptr; \ - data = new BundleActivatorData{}; \ + data = new (std::nothrow) BundleActivatorData{}; \ if (data != nullptr) { \ - data->mng = std::shared_ptr<celix::dm::DependencyManager>{new celix::dm::DependencyManager{context}}; \ + data->mng = std::shared_ptr<celix::dm::DependencyManager>{new (std::nothrow) celix::dm::DependencyManager{context}}; \ } \ \ if (data == nullptr || data->mng == nullptr) { \
hslua-module-zip: fix tests Do not create a new file on each run.
@@ -19,16 +19,18 @@ return { test('archive with file', function () system.with_tmpdir('archive', function (tmpdir) + system.with_wd(tmpdir, function () local filename = 'greetings.txt' local fh = io.open(filename, 'w') fh:write('Hi Mom!\n') fh:close() assert.are_equal( - type(zip.create(tmpdir .. '/' .. filename)), + type(zip.create{filename}), 'userdata' ) end) end) + end) }, group 'extract' {
Add lte_check hostname size before memcpy for cert map lookup
@@ -228,6 +228,7 @@ int s2n_conn_find_name_matching_certs(struct s2n_connection *conn) } const char *name = conn->server_name; struct s2n_blob hostname_blob = { .data = (uint8_t *) (uintptr_t) name, .size = strlen(name) }; + lte_check(hostname_blob.size, S2N_MAX_SERVER_NAME); char normalized_hostname[S2N_MAX_SERVER_NAME + 1] = { 0 }; memcpy_check(normalized_hostname, hostname_blob.data, hostname_blob.size); struct s2n_blob normalized_name = { .data = (uint8_t *) normalized_hostname, .size = hostname_blob.size };
qcow: Clarify bad magic error message Previously, if you mapped a raw file using user:qcow, it would display an error message saying "bad magic" with a stale errno message. Now make it clear that this may be expected if it's a raw file.
@@ -319,7 +319,7 @@ static int qcow2_probe(struct bdev *bdev, int dirfd, const char *pathname) goto err; } if (be32toh(head.magic) != QCOW_MAGIC) { - perror("bad magic"); + tcmu_warn("not qcow: will treat as raw: %s", pathname); goto err; } if (be32toh(head.version) < 2) {
Document requirement for an erlang compiler.
@@ -10,6 +10,7 @@ Dependencies * CMake ([CMake build system](https://cmake.org/)) is required to build AtomVM. * gperf ([GNU Perfect Hash Function Generator](https://www.gnu.org/software/gperf/manual/gperf.html)) is required to build AtomVM. +* erlc ([erlang compiler](https://www.erlang.org/)) is required to build AtomVM * zlib ([zlib compression and decompression library](https://zlib.net/)) is optionally needed to run standard BEAM files (without uncompressed literals extension). * gcov and lcov are optionally required to generate coverage report (make coverage).
router_readconfig: avoid use after free found by Coverity
@@ -1096,6 +1096,7 @@ router_readconfig(router *orig, if (router_yylex_init(&lptr) != 0) { logerr("lex init failed\n"); router_free(ret); + return NULL; } /* copies buf due to modifications, we need orig for error reporting */ router_yy_scan_string(buf, lptr);
adds and corrects some raft comments
@@ -1952,7 +1952,10 @@ _raft_crop(void) } } -/* _raft_pop_roe(): pop the next [(list effects) event] pair of the queue +/* _raft_pop_roe(): pop the next [~ event] off the queue. +** +** effects are no longer stored on u3A->roe; the head of +** each pair is always null. */ static u3_weak _raft_pop_roe(void) @@ -1973,17 +1976,16 @@ _raft_pop_roe(void) return ovo; } -/* _raft_poke(): Peel one ovum off u3A->roe and poke Arvo with it. +/* _raft_poke(): poke Arvo with the next queued event. */ static u3_weak _raft_poke(void) { u3_weak rus; - // XX what is this condition? + // defer event processing until storage is initialized // if ( 0 == u3Z->lug_u.len_d ) { - fprintf(stderr, "_raft_poke ret early\r\n"); return u3_none; }
remove unneeded mkdir from sdr_transceiver_emb/app/Makefile
@@ -8,7 +8,6 @@ WDSP_URL = https://github.com/g0orx/wdsp/archive/$(WDSP_TAG).tar.gz all: sdr-transceiver-emb $(WDSP_TAR): - mkdir -p $(@D) curl -L $(WDSP_URL) -o $@ $(WDSP_DIR): $(WDSP_TAR)
Documentation change only: correction to uHttpClientGetRequest()/uHttpClientHeadRequest(). The pSize field in the uHttpClientGetRequest()/uHttpClientHeadRequest() functions doesn't need to remain valid until the callback is called (i.e. the non-blocking case) since the callback is given its own responseSize number.
@@ -339,8 +339,8 @@ int32_t uHttpClientPostRequest(uHttpClientContext_t *pContext, * * Only one HTTP request, of any kind, may be outstanding at a time. * - * IMPORTANT: see warning below about the validity of the pResponseBody, pSize - * and pContentType pointers. + * IMPORTANT: see warning below about the validity of the pResponseBody and + * pContentType pointers. * * Chunked or multi-part content is not handled here: should you wish to * handle such content you will need to do the re-assembly yourself. @@ -366,9 +366,7 @@ int32_t uHttpClientPostRequest(uHttpClientContext_t *pContext, * on return, in the blocking case, the amount of * data copied to pResponseBody (in the non-blocking * case the callback function is instead given the - * amount of data returned). As for pResponseBody, - * this MUST REMAIN VALID until pResponseCallback - * is called for the non-blocking case. + * amount of data returned). * @param[out] pContentType a place to put the content type of the response, * for example "application/text". In the non-blocking * case this storage MUST REMAIN VALID until @@ -397,8 +395,7 @@ int32_t uHttpClientGetRequest(uHttpClientContext_t *pContext, * * Only one HTTP request, of any kind, may be outstanding at a time. * - * IMPORTANT: see warning below about the validity of the pResponseHead - * and pSize pointers. + * IMPORTANT: see warning below about the validity of the pResponseHead pointer. * * @param[in] pContext a pointer to the internal HTTP context * structure that was originally returned by @@ -416,9 +413,7 @@ int32_t uHttpClientGetRequest(uHttpClientContext_t *pContext, * on return, in the blocking case, the amount of * data copied to pResponseHead (in the non-blocking * case the callback function is instead given the - * amount of data returned). As for pResponseHead, - * this MUST REMAIN VALID until pResponseCallback - * is called for the non-blocking case. + * amount of data returned). * @return in the blocking case the HTTP status code or * negative error code; in the non-blocking case * zero or negative error code. If
invert target check
# each directory represents a target TARGETS := $(sort $(notdir $(shell sh -c 'find src/targets/ -type d'))) -TARGET := $(strip $(foreach dir,$(TARGETS),$(findstring $(dir),$(MAKECMDGOALS)))) +TARGET := $(strip $(foreach dir,$(MAKECMDGOALS),$(findstring $(dir),$(TARGETS)))) ifeq ($(TARGET),) # default to build AWv2
Feat:Add MA510 log function include path
@@ -26,6 +26,9 @@ boatLogConfig.h defines options for compiling. #include "boattypes.h" #include "qflog_utils.h" +/* MA510 log function Include ----------------------------------------------------------*/ +#include "odm_ght_log.h" + //! BOAT LOG LEVEL DEFINITION //! Log level is used to control the detail of log output. //! 3 types of detail level can be specified in BoatLog():
fix(Kconfig): change the type of LV_FS_STDIO_LETTER from string to int
@@ -881,7 +881,8 @@ menu "LVGL configuration" config LV_USE_FS_STDIO bool "File system on top of stdio API" config LV_FS_STDIO_LETTER - string "Set an upper cased letter on which the drive will accessible (e.g. 'A' i.e. 65 )" + int "Set an upper cased letter on which the drive will accessible (e.g. 'A' i.e. 65 )" + default 0 depends on LV_USE_FS_STDIO config LV_FS_STDIO_PATH string "Set the working directory"
expect_continuation_of_headers efficiency fix If a frame is going to make the request exceed H2O_MAX_REQLEN, avoid allocating the memory for it, and reject the stream right away, instead of doing the alloc and memcpy.
@@ -392,11 +392,11 @@ static ssize_t expect_continuation_of_headers(h2o_http2_conn_t *conn, const uint return H2O_HTTP2_ERROR_PROTOCOL; } + if (conn->_headers_unparsed->size + frame.length <= H2O_MAX_REQLEN) { h2o_buffer_reserve(&conn->_headers_unparsed, frame.length); memcpy(conn->_headers_unparsed->bytes + conn->_headers_unparsed->size, frame.payload, frame.length); conn->_headers_unparsed->size += frame.length; - if (conn->_headers_unparsed->size <= H2O_MAX_REQLEN) { if ((frame.flags & H2O_HTTP2_FRAME_FLAG_END_HEADERS) != 0) { conn->_read_expect = expect_default; if (stream->state == H2O_HTTP2_STREAM_STATE_RECV_HEADERS) {
export: mruby -> ruby
@@ -678,7 +678,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - script: [lua, moon, fennel, mruby, js, wren, squirrel] + script: [lua, moon, fennel, ruby, js, wren, squirrel] steps: - name: Download Windows XP artifact
output: allow instance name up to 32 bytes
@@ -113,7 +113,7 @@ struct flb_output_plugin { */ struct flb_output_instance { uint64_t mask_id; /* internal bitmask for routing */ - char name[16]; /* numbered name (cpu -> cpu.0) */ + char name[32]; /* numbered name (cpu -> cpu.0) */ char *alias; /* alias name for the instance */ int flags; /* inherit flags from plugin */ struct flb_output_plugin *p; /* original plugin */
workflows: add available labels 'long-term' add 'long-term' to the workflows readme.
| ok-to-merge | run mergebot and merge (rebase) current PR | | ci/integration-docker-ok | integration test is able to build docker image | | ci/integration-gcp-ok | integration test is able to run on GCP | +| long-term | long running pull request, don't close |
bricks/stm32: disable array and bytearray movehub fw size -1800
#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0) #define MICROPY_PY_ASYNC_AWAIT (0) #define MICROPY_MULTIPLE_INHERITANCE (0) -#define MICROPY_PY_BUILTINS_BYTEARRAY (1) +#define MICROPY_PY_ARRAY (0) +#define MICROPY_PY_BUILTINS_BYTEARRAY (0) #define MICROPY_PY_BUILTINS_MEMORYVIEW (0) #define MICROPY_PY_BUILTINS_ENUMERATE (1) #define MICROPY_PY_BUILTINS_FILTER (0)
network/lwIP: fix reachable time kconfig fix reachable time kconfig which is mapping to anycast.
#endif #ifdef CONFIG_NET_IPv6_ND_REACHABLE_TIME -#define LWIP_ND6_MAX_ANYCAST_DELAY_TIME CONFIG_NET_IPv6_ND_REACHABLE_TIME +#define LWIP_ND6_REACHABLE_TIME CONFIG_NET_IPv6_ND_REACHABLE_TIME #endif #ifdef CONFIG_NET_IPv6_ND_RETRANS_TIMER #define LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS CONFIG_NET_RANDOMIZE_INITIAL_LOCAL_PORTS #endif +#ifdef CONFIG_NFILE_DESCRIPTORS #define LWIP_SOCKET_OFFSET CONFIG_NFILE_DESCRIPTORS +#endif +#ifdef CONFIG_NSOCKET_DESCRIPTORS #define MEMP_NUM_NETCONN CONFIG_NBSDSOCKET_DESCRIPTORS #define MEMP_NUM_RAW_PCB CONFIG_NBSDSOCKET_DESCRIPTORS +#endif #ifdef CONFIG_NET_TCP_KEEPALIVE #define LWIP_TCP_KEEPALIVE CONFIG_NET_TCP_KEEPALIVE #define LWIP_DNS_SECURE CONFIG_NET_DNS_SECURE #endif +#ifdef CONFIG_NET_DNS_MAX_TTL +#define DNS_MAX_TTL CONFIG_NET_DNS_MAX_TTL +#endif + +#ifdef CONFIG_NET_DNS_MAX_RETRIES +#define DNS_MAX_RETRIES CONFIG_NET_DNS_MAX_RETRIES +#endif + #ifdef CONFIG_NET_DNS_LOCAL_HOSTLIST #define DNS_LOCAL_HOSTLIST CONFIG_NET_DNS_LOCAL_HOSTLIST
Fixed 1.3.2 release file size, checksum.
}, "url": "https://github.com/ROBOTIS-GIT/OpenCR/releases/download/1.3.2/opencr_core_1.3.2.tar.bz2", "archiveFileName": "opencr_core_1.3.2.tar.bz2", - "checksum": "SHA-256:3eae31de2a3e0cb321fca97c4bb7c8ce9f5806f9d5644f108b019463de748b5c", - "size": "3141420", + "checksum": "SHA-256:9ed36bcc86666c12292e13d7e82cf9b41f6d4f0a3c804976bf9a338859c46f01", + "size": "4096035", "help": { "online": "http://emanual.robotis.com/docs/en/parts/controller/opencr10/" },
CMSIS-DSP: Update to pdsc so that CMSIS-DSP source is becoming default variant. Update to version number of CMSIS-DSP binary variant since it has not been updated.
@@ -3092,7 +3092,7 @@ and 8-bit Java bytecodes in Jazelle state. </component> <!-- CMSIS-DSP component --> - <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Library" Cversion="1.8.0" isDefaultVariant="true" condition="CMSIS DSP"> + <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Library" Cversion="1.7.0" condition="CMSIS DSP"> <description>CMSIS-DSP Library for Cortex-M, SC000, and SC300</description> <files> <!-- CPU independent --> @@ -3199,7 +3199,7 @@ and 8-bit Java bytecodes in Jazelle state. </files> </component> - <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cversion="1.8.0" condition="CMSIS DSP"> + <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cversion="1.8.0" isDefaultVariant="true" condition="CMSIS DSP"> <description>CMSIS-DSP Library for Cortex-M, SC000, and SC300</description> <files> <!-- CPU independent -->
Added 'Nmap Scripting Engine' to the list of browsers.
@@ -273,6 +273,7 @@ static const char *browsers[][2] = { {"XoviBot", "Crawlers"}, {"X-CAD-SE", "Crawlers"}, {"Safeassign", "Crawlers"}, + {"Nmap Scripting Engine", "Crawlers"}, /* Podcast fetchers */ {"Downcast", "Podcasts"},
Add wernerd/GoRTP
@@ -348,4 +348,7 @@ ALLOW yt/jaeger/plugin -> vendor/github.com/spf13/viper ALLOW yt/jaeger/plugin -> vendor/github.com/gorilla ALLOW yt/jaeger/plugin -> vendor/github.com/gogo +# CONTRIB-1496 RTP/RTCP stack for Go. responsible: rmcf@ +ALLOW yabs/telephony/platform/internal/rtp -> vendor/github.com/wernerd/GoRTP + DENY .* -> vendor/
Fix incomplete BIO_dup_state() error check BIO_dup_state() returns an error code <= 0 according to my analysis tool and the documentation. Currently only == 0 is checked. Fix it by changing the check condition. CLA: trivial
@@ -886,7 +886,7 @@ BIO *BIO_dup_chain(BIO *in) /* This will let SSL_s_sock() work with stdin/stdout */ new_bio->num = bio->num; - if (!BIO_dup_state(bio, (char *)new_bio)) { + if (BIO_dup_state(bio, (char *)new_bio) <= 0) { BIO_free(new_bio); goto err; }
linux/arch: remove TODO
@@ -351,9 +351,6 @@ bool arch_archInit(honggfuzz_t* hfuzz) { } LOG_D("Glibc version:'%s', OK", gversion); hfuzz->linux.useClone = false; - - /* TODO - REMOVE */ - hfuzz->linux.useClone = true; break; }
filter: precompute order correction
#define M_PI_F 3.14159265358979323846f +// equation is 1 / sqrtf(powf(2, 1.0f / ORDER) - 1); +#define ORDER1_CORRECTION 1 +#define ORDER2_CORRECTION 1.55377397403f +#define ORDER3_CORRECTION 1.9614591767f + // calculates the coefficient for lpf filter, times in the same units float lpfcalc(float sampleperiod, float filtertime) { float ga = 1.0f - sampleperiod / filtertime; @@ -46,8 +51,7 @@ void filter_lp_pt1_init(filter_lp_pt1 *filter, filter_state_t *state, uint8_t co } void filter_lp_pt1_coeff(filter_lp_pt1 *filter, float hz) { - const float cutoff = 1 / sqrtf(powf(2, 1.0f / 1.0f) - 1); - const float rc = 1 / (2 * cutoff * M_PI_F * hz); + const float rc = 1 / (2 * ORDER1_CORRECTION * M_PI_F * hz); filter->alpha = state.looptime / (rc + state.looptime); } @@ -63,8 +67,7 @@ void filter_lp_pt2_init(filter_lp_pt2 *filter, filter_state_t *state, uint8_t co } void filter_lp_pt2_coeff(filter_lp_pt2 *filter, float hz) { - const float cutoff = 1 / sqrtf(powf(2, 1.0f / 2.0f) - 1); - const float rc = 1 / (2 * cutoff * M_PI_F * hz); + const float rc = 1 / (2 * ORDER2_CORRECTION * M_PI_F * hz); filter->alpha = state.looptime / (rc + state.looptime); } @@ -81,8 +84,7 @@ void filter_lp_pt3_init(filter_lp_pt3 *filter, filter_state_t *state, uint8_t co } void filter_lp_pt3_coeff(filter_lp_pt3 *filter, float hz) { - const float cutoff = 1 / sqrtf(powf(2, 1.0f / 3.0f) - 1); - const float rc = 1 / (2 * cutoff * M_PI_F * hz); + const float rc = 1 / (2 * ORDER3_CORRECTION * M_PI_F * hz); filter->alpha = state.looptime / (rc + state.looptime); }
Added Joseph to the TSC members, and updated Nick's affiliation.
@@ -108,8 +108,9 @@ represents the project at ASWF TAC meetings. * Larry Gritz - Sony Pictures ImageWorks * Peter Hillman - Weta Digital, Ltd. * Kimball Thurston - Weta Digital, Ltd. -* Nick Porcino - Oculus +* Nick Porcino - Pixar Animation Studios * Christina Tempelaar-Lietz - Epic Games +* Joseph Goldstone - ARRI * John Mertic - The Linux Foundation ### TSC Meetings
add pt3 to osd
@@ -940,11 +940,12 @@ void osd_display() { "NONE", " PT1", " PT2", + " PT3", }; osd_menu_select(4, 4, "PASS 1 TYPE"); if (osd_menu_select_enum(18, 4, profile.filter.gyro[0].type, filter_type_labels)) { - profile.filter.gyro[0].type = osd_menu_adjust_int(profile.filter.gyro[0].type, 1, 0, FILTER_LP_PT2); + profile.filter.gyro[0].type = osd_menu_adjust_int(profile.filter.gyro[0].type, 1, 0, FILTER_LP_PT3); osd_state.reboot_fc_requested = 1; } @@ -955,7 +956,7 @@ void osd_display() { osd_menu_select(4, 6, "PASS 2 TYPE"); if (osd_menu_select_enum(18, 6, profile.filter.gyro[1].type, filter_type_labels)) { - profile.filter.gyro[1].type = osd_menu_adjust_int(profile.filter.gyro[1].type, 1, 0, FILTER_LP_PT2); + profile.filter.gyro[1].type = osd_menu_adjust_int(profile.filter.gyro[1].type, 1, 0, FILTER_LP_PT3); osd_state.reboot_fc_requested = 1; }
xml parser BUGFIX restore parser after skipping attributes Fixes cesnet/netopeer2#915
@@ -340,7 +340,11 @@ lydxml_data_check_opaq(struct lyd_xml_ctx *lydctx, const struct lysc_node **snod return LY_SUCCESS; } - if ((*snode)->nodetype & (LYD_NODE_TERM | LYS_LIST)) { + if (!((*snode)->nodetype & (LYD_NODE_TERM | LYD_NODE_INNER))) { + /* nothing to check */ + return LY_SUCCESS; + } + /* backup parser */ prev_status = xmlctx->status; pprefix = xmlctx->prefix; @@ -364,7 +368,7 @@ lydxml_data_check_opaq(struct lyd_xml_ctx *lydctx, const struct lysc_node **snod if (lys_value_validate(NULL, *snode, xmlctx->value, xmlctx->value_len, LY_VALUE_XML, &xmlctx->ns)) { *snode = NULL; } - } else { + } else if ((*snode)->nodetype == LYS_LIST) { /* skip content */ LY_CHECK_GOTO(ret = lyxml_ctx_next(xmlctx), restore); @@ -372,6 +376,12 @@ lydxml_data_check_opaq(struct lyd_xml_ctx *lydctx, const struct lysc_node **snod /* invalid list, parse as opaque if it missing/has invalid some keys */ *snode = NULL; } + } else { + /* if there is a non-WS value, it cannot be parsed as an inner node */ + assert(xmlctx->status == LYXML_ELEM_CONTENT); + if (!xmlctx->ws_only) { + *snode = NULL; + } } restore: @@ -385,20 +395,6 @@ restore: xmlctx->name = pname; xmlctx->name_len = pname_len; xmlctx->in->current = prev_current; - } else if ((*snode)->nodetype & LYD_NODE_INNER) { - /* skip attributes */ - while (xmlctx->status == LYXML_ATTRIBUTE) { - LY_CHECK_RET(lyxml_ctx_next(xmlctx)); - LY_CHECK_RET(lyxml_ctx_next(xmlctx)); - } - - /* if there is a non-WS value, it cannot be parsed as an inner node */ - assert(xmlctx->status == LYXML_ELEM_CONTENT); - if (!xmlctx->ws_only) { - *snode = NULL; - } - - } return ret; }
[Kernel] Update Kconfig to fix memory heap option.
@@ -5,7 +5,8 @@ config RT_NAME_MAX range 2 32 default 8 help - Each kernel object, such as thread, timer, semaphore etc, has a name, the RT_NAME_MAX is the maximal size of this object name. + Each kernel object, such as thread, timer, semaphore etc, has a name, + the RT_NAME_MAX is the maximal size of this object name. config RT_ALIGN_SIZE int "Alignment size for CPU architecture data access" @@ -13,10 +14,25 @@ config RT_ALIGN_SIZE help Alignment size for CPU architecture data access + choice + prompt "The maximal level value of priority of thread" + default RT_THREAD_PRIORITY_32 + + config RT_THREAD_PRIORITY_8 + bool "8" + + config RT_THREAD_PRIORITY_32 + bool "32" + + config RT_THREAD_PRIORITY_256 + bool "256" + endchoice + config RT_THREAD_PRIORITY_MAX - int "The maximal level value of priority of thread" - range 8 256 - default 32 + int + default 8 if RT_THREAD_PRIORITY_8 + default 32 if RT_THREAD_PRIORITY_32 + default 256 if RT_THREAD_PRIORITY_256 config RT_TICK_PER_SECOND int "Tick frequency, Hz" @@ -35,7 +51,8 @@ config RT_USING_OVERFLOW_CHECK bool "Using stack overflow checking" default y help - Enable thread stack overflow checking. The stack overflow is checking when each thread switch. + Enable thread stack overflow checking. The stack overflow is checking when + each thread switch. config RT_DEBUG_INIT int "Enable system initialization informat print" @@ -55,7 +72,8 @@ config RT_USING_HOOK bool "Enable system hook" default y help - Enable the hook function when system running, such as idle thread hook, thread context switch etc. + Enable the hook function when system running, such as idle thread hook, + thread context switch etc. config IDLE_THREAD_STACK_SIZE int "The stack size of idle thread" @@ -65,7 +83,8 @@ config RT_USING_TIMER_SOFT bool "Enable software timer with a timer thread" default n help - the timeout function context of soft-timer is under a high priority timer thread. + the timeout function context of soft-timer is under a high priority timer + thread. if RT_USING_TIMER_SOFT config RT_TIMER_THREAD_PRIO @@ -123,19 +142,31 @@ menu "Memory Management" help Using memory heap object to manage dynamic memory heap. - config RT_USING_HEAP - bool "Using dynamic memory management" - default y + choice + prompt "Dynamic Memory Management" + default RT_USING_SMALL_MEM - if RT_USING_HEAP + config RT_USING_NOHEAP + bool "Disable Heap" config RT_USING_SMALL_MEM - bool "The memory management for small memory" + bool "Small Memory Algorithm" config RT_USING_SLAB - bool "Using SLAB memory management for large memory" + bool "SLAB Algorithm for large memory" + if RT_USING_MEMHEAP + config RT_USING_MEMHEAP_AS_HEAP + bool "Use all of memheap objects as heap" endif + endchoice + + config RT_USING_HEAP + bool + default n if RT_USING_NOHEAP + default y if RT_USING_SMALL_MEM + default y if RT_USING_SLAB + default y if RT_USING_MEMHEAP_AS_HEAP endmenu
Add --help as an option
<b>gpcheckcat</b> <b>-l</b> -<b>gpcheckcat</b> <b>-?</b> +<b>gpcheckcat</b> <b>-? | --help</b> </codeblock> </section> <section id="section3"> <pd>The user connecting to Greenplum Database.</pd> </plentry> <plentry> - <pt>-? (help)</pt> + <pt>-? | --help</pt> <pd>Displays the online help.</pd> </plentry> <plentry>
Move sles iwc job downstream from compile
@@ -398,10 +398,10 @@ jobs: plan: - aggregate: - get: gpdb_src - #passed: [compile_gpdb_sles11] + passed: [compile_gpdb_sles11] - get: bin_gpdb resource: bin_gpdb_sles11 - #passed: [compile_gpdb_sles11] + passed: [compile_gpdb_sles11] trigger: true - get: sles-gpdb-dev-11-beta - task: ic_gpdb @@ -796,15 +796,11 @@ jobs: plan: - aggregate: - get: gpdb_src - #passed: [icw_planner_sles11] passed: [compile_gpdb_sles11] - get: gpaddon_src passed: [compile_gpdb_sles11] - get: bin_gpdb resource: bin_gpdb_sles11 - # passed: - # - icw_gporca_sles11 - # - icw_planner_sles11 passed: [compile_gpdb_sles11] trigger: true - get: sles-gpdb-dev-11-beta @@ -820,14 +816,14 @@ jobs: bin_gpdb: rc_bin_gpdb params: INSTALL_SCRIPT_SRC: gpdb_src/gpAux/addon/license/installer-header-sles-gpdb.sh - INSTALLER_ZIP: packaged_gpdb/greenplum-db-@GP_VERSION@-sles11-x86_64.zip + INSTALLER_ZIP: packaged_gpdb/greenplum-db-@GP_VERSION@-build-1-sles11-x86_64.zip ADD_README_INSTALL: true - put: installer_sles11_gpdb_rc params: - file: packaged_gpdb/greenplum-db-*-sles11-x86_64.zip + file: packaged_gpdb/greenplum-db-*-build-1-sles11-x86_64.zip - put: installer_sles11_gpdb_rc_md5 params: - file: packaged_gpdb/greenplum-db-*-sles11-x86_64.zip.md5 + file: packaged_gpdb/greenplum-db-*-build-1-sles11-x86_64.zip.md5 - put: qautils_sles11_tarball params: file: rc_bin_gpdb/QAUtils-sles11-x86_64.tar.gz
fftw.spec: fix typo & enable sse2/avx/avx2
@@ -72,10 +72,10 @@ rm -f config.cache for i in %{precision_list} ; do LOOPBASEFLAGS=${BASEFLAGS} - if [[ "${i} == "single" || "${i} == "double" ]]; then + if [[ "${i}" == "single" || "${i}" == "double" ]]; then # taken from https://src.fedoraproject.org/rpms/fftw/blob/master/f/fftw.spec %ifarch x86_64 - LOOPBASEFLAGS="${LOOPBASEFLAGS} --enable-sse2 --enable-avx" + LOOPBASEFLAGS="${LOOPBASEFLAGS} --enable-sse2 --enable-avx --enable-avx2" %endif %ifarch aarch64 LOOPBASEFLAGS="${LOOPBASEFLAGS} --enable-neon"
Release semaphore only if valid command
@@ -920,7 +920,7 @@ espi_parse_received(esp_recv_t* rcv) { } else { esp.msg->i++; /* Number of continue calls */ } - } + /* * When the command is finished, * release synchronization semaphore @@ -931,6 +931,7 @@ espi_parse_received(esp_recv_t* rcv) { } } } +} #if !ESP_CFG_INPUT_USE_PROCESS || __DOXYGEN__ /**
board/nipperkin/thermal.c: Format with clang-format BRANCH=none TEST=none
@@ -103,8 +103,7 @@ static const struct fan_step fan_step_table[] = { #define NUM_FAN_LEVELS ARRAY_SIZE(fan_step_table) -BUILD_ASSERT(ARRAY_SIZE(fan_step_table) == - ARRAY_SIZE(fan_step_table)); +BUILD_ASSERT(ARRAY_SIZE(fan_step_table) == ARRAY_SIZE(fan_step_table)); int fan_table_to_rpm(int fan, int *temp) { @@ -135,8 +134,7 @@ int fan_table_to_rpm(int fan, int *temp) break; } } else if (temp[TEMP_SENSOR_CHARGER] > prev_tmp[TEMP_SENSOR_CHARGER] || - temp[TEMP_SENSOR_MEMORY] - > prev_tmp[TEMP_SENSOR_MEMORY] || + temp[TEMP_SENSOR_MEMORY] > prev_tmp[TEMP_SENSOR_MEMORY] || temp[TEMP_SENSOR_SOC] > prev_tmp[TEMP_SENSOR_SOC]) { for (i = current_level; i < NUM_FAN_LEVELS; i++) { if ((temp[TEMP_SENSOR_CHARGER] > @@ -167,15 +165,12 @@ int fan_table_to_rpm(int fan, int *temp) void board_override_fan_control(int fan, int *tmp) { - if (chipset_in_state(CHIPSET_STATE_ON | - CHIPSET_STATE_ANY_SUSPEND)) { + if (chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND)) { fan_set_rpm_mode(FAN_CH(fan), 1); - fan_set_rpm_target(FAN_CH(fan), - fan_table_to_rpm(fan, tmp)); + fan_set_rpm_target(FAN_CH(fan), fan_table_to_rpm(fan, tmp)); } } - struct chg_curr_step { int on; int off; @@ -188,7 +183,6 @@ static const struct chg_curr_step chg_curr_table[] = { { .on = 70, .off = 69, .curr_ma = 1500 }, }; - #define NUM_CHG_CURRENT_LEVELS ARRAY_SIZE(chg_curr_table) int charger_profile_override(struct charge_state_data *curr) @@ -200,7 +194,6 @@ int charger_profile_override(struct charge_state_data *curr) static int current_level; static int prev_tmp; - if (!(curr->batt.flags & BATT_FLAG_RESPONSIVE)) return 0; @@ -214,12 +207,13 @@ int charger_profile_override(struct charge_state_data *curr) if (chipset_in_state(CHIPSET_STATE_ON)) { if (chg_temp_c < prev_tmp) { - if ((chg_temp_c <= chg_curr_table[current_level].off) - && (current_level > 0)) + if ((chg_temp_c <= chg_curr_table[current_level].off) && + (current_level > 0)) current_level -= 1; } else if (chg_temp_c > prev_tmp) { - if ((chg_temp_c >= chg_curr_table[current_level + 1].on) - && (current_level < NUM_CHG_CURRENT_LEVELS - 1)) + if ((chg_temp_c >= + chg_curr_table[current_level + 1].on) && + (current_level < NUM_CHG_CURRENT_LEVELS - 1)) current_level += 1; }
wireless/gs2200m: Fix freeing uninitialized memory Add initialize local variable and check the buffer is allocated before free().
@@ -846,6 +846,8 @@ static int recvfrom_request(int fd, FAR struct gs2200m_s *priv, gs2200m_printf("%s: start (req->max_buflen=%d) \n", __func__, req->max_buflen); + memset(&rmsg, 0, sizeof(rmsg)); + /* Check if this socket exists. */ usock = gs2200m_socket_get(priv, req->usockid); @@ -864,7 +866,6 @@ static int recvfrom_request(int fd, FAR struct gs2200m_s *priv, goto prepare; } - memset(&rmsg, 0, sizeof(rmsg)); rmsg.buf = calloc(1, req->max_buflen); ASSERT(rmsg.buf); @@ -953,7 +954,10 @@ err_out: gs2200m_printf("%s: *** end ret=%d \n", __func__, ret); + if (rmsg.buf) + { free(rmsg.buf); + } return ret; }
bn/bn_mont.c: improve readability of post-condition code.
@@ -130,15 +130,14 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) */ ap = &(r->d[nl]); + carry -= bn_sub_words(rp, ap, np, nl); /* - * |v| is one if |ap| - |np| underflowed or zero if it did not. Note |v| - * cannot be -1. That would imply the subtraction did not fit in |nl| words, - * and we know at most one subtraction is needed. + * |carry| is -1 if |ap| - |np| underflowed or zero if it did not. Note + * |carry| cannot be 1. That would imply the subtraction did not fit in + * |nl| words, and we know at most one subtraction is needed. */ - v = bn_sub_words(rp, ap, np, nl) - carry; - v = 0 - v; for (i = 0; i < nl; i++) { - rp[i] = (v & ap[i]) | (~v & rp[i]); + rp[i] = (carry & ap[i]) | (~carry & rp[i]); ap[i] = 0; } bn_correct_top(r);
OcMachoLib: Clearify assumptions in InternalGetExternalRelocationByOffset().
@@ -87,7 +87,9 @@ InternalGetExternalRelocationByOffset ( ASSERT (Context != NULL); MachoContext = (OC_MACHO_CONTEXT *)Context; - + // + // Assumption: 64-bit. + // if ((MachoContext->SymbolTable == NULL) && !InternalRetrieveSymtabs64 (MachoContext)) { return NULL; @@ -104,9 +106,14 @@ InternalGetExternalRelocationByOffset ( // // A section-based relocation entry can be skipped for absolute // symbols. + // Assumption: Not i386. // - if ((((UINT32)Relocation->Address & MACH_RELOC_SCATTERED) == 0) - && (Relocation->Extern == 0) + if (((UINT32)Relocation->Address & MACH_RELOC_SCATTERED) != 0) { + ASSERT (FALSE); + continue; + } + + if ((Relocation->Extern == 0) && (Relocation->Address == MACH_RELOC_ABSOLUTE)) { continue; }
Update .semaphore/semaphore.yml
@@ -61,7 +61,7 @@ blocks: jobs: - name: FV Test matrix commands: - - " make check-wireguard" + - make check-wireguard - make fv FV_BATCHES_TO_RUN="${SEMAPHORE_JOB_INDEX}" FV_NUM_BATCHES=${SEMAPHORE_JOB_COUNT} parallelism: 3 epilogue:
Fix for change request
-// #include <aos/aos.h> #include "driver/ledc.h" #include <hal/soc/pwm.h> #include "math.h" #define DEFAULT_LEDC_CHANNEL_DUTY_DEPTH LEDC_TIMER_10_BIT #define LEDC_CHANNEL_MAX_DUTY (pow(2, DEFAULT_LEDC_CHANNEL_DUTY_DEPTH) - 1) -int8_t slots[4] = {0, 0, 0, 0}; +static int8_t slots[4] = {0, 0, 0, 0}; static int8_t get_available_slot() { @@ -82,17 +81,16 @@ int32_t hal_pwm_init(pwm_dev_t *pwm) */ ledc_channel_config_t ledc_channel = { - .channel = slot_idx, - .duty = LEDC_CHANNEL_MAX_DUTY * config.duty_cycle, - .gpio_num = pwm->port, - .speed_mode = DEFAULT_LEDC_SPEED_MODE, - .timer_sel = slot_idx}; + .channel = slot_idx, // channel index + .duty = LEDC_CHANNEL_MAX_DUTY * config.duty_cycle, // channel duty, + .gpio_num = pwm->port, // gpio number, + .speed_mode = DEFAULT_LEDC_SPEED_MODE, // speed mode, + .timer_sel = slot_idx // timer index + }; // Set LED Controller with previously prepared configuration ret = ledc_channel_config(&ledc_channel); - // LOG("ledc channel duty: %d", ledc_channel.duty); - slots[slot_idx] = ledc_channel.gpio_num; return ret;
Test SSL_shutdown() with async writes As well as SSL_shutdown() itself this excercises the async write paths in ssl3_dispatch_alert().
@@ -8148,6 +8148,82 @@ static int test_shutdown(int tst) return testresult; } +/* + * Test that sending close_notify alerts works correctly in the case of a + * retryable write failure. + */ +static int test_async_shutdown(void) +{ + SSL_CTX *cctx = NULL, *sctx = NULL; + SSL *clientssl = NULL, *serverssl = NULL; + int testresult = 0; + BIO *bretry = BIO_new(bio_s_always_retry()), *tmp = NULL; + + if (!TEST_ptr(bretry)) + goto end; + + if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(), + TLS_client_method(), + 0, 0, + &sctx, &cctx, cert, privkey))) + goto end; + + if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, + NULL))) + goto end; + + if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE))) + goto end; + + /* Close write side of clientssl */ + if (!TEST_int_eq(SSL_shutdown(clientssl), 0)) + goto end; + + tmp = SSL_get_wbio(serverssl); + if (!TEST_true(BIO_up_ref(tmp))) { + tmp = NULL; + goto end; + } + SSL_set0_wbio(serverssl, bretry); + bretry = NULL; + + /* First server shutdown should fail because of a retrable write failure */ + if (!TEST_int_eq(SSL_shutdown(serverssl), -1) + || !TEST_int_eq(SSL_get_error(serverssl, -1), SSL_ERROR_WANT_WRITE)) + goto end; + + /* Second server shutdown should fail for the same reason */ + if (!TEST_int_eq(SSL_shutdown(serverssl), -1) + || !TEST_int_eq(SSL_get_error(serverssl, -1), SSL_ERROR_WANT_WRITE)) + goto end; + + SSL_set0_wbio(serverssl, tmp); + tmp = NULL; + + /* Third server shutdown should send close_notify */ + if (!TEST_int_eq(SSL_shutdown(serverssl), 0)) + goto end; + + /* Fourth server shutdown should read close_notify from client and finish */ + if (!TEST_int_eq(SSL_shutdown(serverssl), 1)) + goto end; + + /* Client should also successfully fully shutdown */ + if (!TEST_int_eq(SSL_shutdown(clientssl), 1)) + goto end; + + testresult = 1; + end: + SSL_free(serverssl); + SSL_free(clientssl); + SSL_CTX_free(sctx); + SSL_CTX_free(cctx); + BIO_free(bretry); + BIO_free(tmp); + + return testresult; +} + #if !defined(OPENSSL_NO_TLS1_2) || !defined(OSSL_NO_USABLE_TLS1_3) static int cert_cb_cnt; @@ -10580,6 +10656,7 @@ int setup_tests(void) ADD_ALL_TESTS(test_ssl_get_shared_ciphers, OSSL_NELEM(shared_ciphers_data)); ADD_ALL_TESTS(test_ticket_callbacks, 20); ADD_ALL_TESTS(test_shutdown, 7); + ADD_TEST(test_async_shutdown); ADD_ALL_TESTS(test_incorrect_shutdown, 2); ADD_ALL_TESTS(test_cert_cb, 6); ADD_ALL_TESTS(test_client_cert_cb, 2);
tutorial: update mainnet location
@@ -120,11 +120,11 @@ module.exports = { plugins: [ new UrbitShipPlugin(urbitrc), new webpack.DefinePlugin({ - 'process.env.TUTORIAL_HOST': JSON.stringify('~hastuc-dibtux'), + 'process.env.TUTORIAL_HOST': JSON.stringify('~difmex-passed'), 'process.env.TUTORIAL_GROUP': JSON.stringify('beginner-island'), - 'process.env.TUTORIAL_CHAT': JSON.stringify('chat-1704'), - 'process.env.TUTORIAL_BOOK': JSON.stringify('book-9695'), - 'process.env.TUTORIAL_LINKS': JSON.stringify('link-2827'), + 'process.env.TUTORIAL_CHAT': JSON.stringify('introduce-yourself-7010'), + 'process.env.TUTORIAL_BOOK': JSON.stringify('guides-9684'), + 'process.env.TUTORIAL_LINKS': JSON.stringify('community-articles-2143'), }) // new CleanWebpackPlugin(),
parallel-libs/mfem: build with fPIC
@@ -67,6 +67,7 @@ module load superlu_dist make config \ PREFIX=%{install_path} \ + CXXFLAGS="-O3 -fPIC" \ MFEM_USE_MPI=YES \ MFEM_USE_LAPACK=NO \ HYPRE_OPT=-I$HYPRE_INC HYPRE_LIB="-L$HYPRE_LIB -lHYPRE" \
Fix tinyalsa issues during testing Set apb flags, nbytes, curbyte before enque
@@ -480,6 +480,9 @@ int pcm_writei(struct pcm *pcm, const void *data, unsigned int frame_count) #ifdef CONFIG_AUDIO_MULTI_SESSION bufdesc.session = pcm->session; #endif + apb->nbytes = nbytes; + apb->curbyte = 0; + apb->flags = 0; bufdesc.numbytes = apb->nbytes; bufdesc.u.pBuffer = apb; if (ioctl(pcm->fd, AUDIOIOC_ENQUEUEBUFFER, (unsigned long)&bufdesc) < 0) { @@ -559,6 +562,10 @@ int pcm_readi(struct pcm *pcm, void *data, unsigned int frame_count) /* Copy data to user buffer */ memcpy(data, apb->samp, apb->nbytes); /* Enque buffer for next read opertion */ + nbytes = apb->nbytes; + apb->nbytes = 0; + apb->curbyte = 0; + apb->flags = 0; bufdesc.u.pBuffer = apb; if (ioctl(pcm->fd, AUDIOIOC_ENQUEUEBUFFER, (unsigned long)&bufdesc) < 0) { return oops(pcm, errno, "failed to enque buffer after read"); @@ -567,7 +574,7 @@ int pcm_readi(struct pcm *pcm, void *data, unsigned int frame_count) return oops(pcm, EINTR, "Recieved unexpected msg (id = %d) while waiting for deque message from kernel", msg.msgId); } - return pcm_bytes_to_frames(pcm, apb->nbytes); + return pcm_bytes_to_frames(pcm, nbytes); } /** Writes audio samples to PCM. @@ -1056,6 +1063,7 @@ int pcm_prepare(struct pcm *pcm) int pcm_start(struct pcm *pcm) { struct audio_buf_desc_s bufdesc; + struct ap_buffer_s *apb; if (pcm == NULL) { return -EINVAL; @@ -1078,7 +1086,11 @@ int pcm_start(struct pcm *pcm) for (pcm->bufPtr = 0; pcm->bufPtr < CONFIG_AUDIO_NUM_BUFFERS; pcm->bufPtr++) #endif { - bufdesc.u.pBuffer = pcm->pBuffers[pcm->bufPtr]; + apb = pcm->pBuffers[pcm->bufPtr]; + apb->nbytes = 0; + apb->curbyte = 0; + apb->flags = 0; + bufdesc.u.pBuffer = apb; if (ioctl(pcm->fd, AUDIOIOC_ENQUEUEBUFFER, (unsigned long)&bufdesc) < 0) { return oops(pcm, errno, "AUDIOIOC_ENQUEUEBUFFER ioctl failed"); }
Client cannot include SRT in its transport parameters
@@ -288,6 +288,13 @@ int ngtcp2_decode_transport_params(ngtcp2_transport_params *params, p += sizeof(uint16_t); break; case NGTCP2_TRANSPORT_PARAM_STATELESS_RESET_TOKEN: + switch (exttype) { + case NGTCP2_TRANSPORT_PARAMS_TYPE_ENCRYPTED_EXTENSIONS: + case NGTCP2_TRANSPORT_PARAMS_TYPE_NEW_SESSION_TICKET: + break; + default: + return NGTCP2_ERR_MALFORMED_TRANSPORT_PARAM; + } flags |= 1u << NGTCP2_TRANSPORT_PARAM_STATELESS_RESET_TOKEN; if (ngtcp2_get_uint16(p) != sizeof(params->stateless_reset_token)) { return NGTCP2_ERR_MALFORMED_TRANSPORT_PARAM; @@ -297,15 +304,8 @@ int ngtcp2_decode_transport_params(ngtcp2_transport_params *params, return NGTCP2_ERR_MALFORMED_TRANSPORT_PARAM; } - /* TODO draft-05 allows client to send stateless_reset_token. - Just ignore it for now. */ - switch (exttype) { - case NGTCP2_TRANSPORT_PARAMS_TYPE_ENCRYPTED_EXTENSIONS: - case NGTCP2_TRANSPORT_PARAMS_TYPE_NEW_SESSION_TICKET: memcpy(params->stateless_reset_token, p, sizeof(params->stateless_reset_token)); - break; - } p += sizeof(params->stateless_reset_token); break;
Fix crypto/dso/dso_vms.c In the "Stop raising ERR_R_MALLOC_FAILURE in most places" commit, some fixes of this file weren't done quite right, leading to a symbol being undeclared depending on building circumstances.
@@ -106,9 +106,12 @@ static int vms_load(DSO *dso) # pragma pointer_size save # pragma pointer_size 32 # endif /* __INITIAL_POINTER_SIZE == 64 */ +# endif /* __INITIAL_POINTER_SIZE && defined + * _ANSI_C_SOURCE */ DSO_VMS_INTERNAL *p = NULL; +# if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE # if __INITIAL_POINTER_SIZE == 64 # pragma pointer_size restore # endif /* __INITIAL_POINTER_SIZE == 64 */
py/repl: Use mp_load_method_protected to prevent leaking of exceptions. This patch fixes the possibility of a crash of the REPL when tab-completing an object which raises an exception when its attributes are accessed. See issue
@@ -158,7 +158,7 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print // lookup will fail return 0; } - mp_load_method_maybe(obj, q, dest); + mp_load_method_protected(obj, q, dest, true); obj = dest[0]; // attribute, method, or MP_OBJ_NULL if nothing found if (obj == MP_OBJ_NULL) { @@ -180,7 +180,7 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print size_t d_len; const char *d_str = (const char*)qstr_data(q, &d_len); if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) { - mp_load_method_maybe(obj, q, dest); + mp_load_method_protected(obj, q, dest, true); if (dest[0] != MP_OBJ_NULL) { if (match_str == NULL) { match_str = d_str; @@ -234,7 +234,7 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print size_t d_len; const char *d_str = (const char*)qstr_data(q, &d_len); if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) { - mp_load_method_maybe(obj, q, dest); + mp_load_method_protected(obj, q, dest, true); if (dest[0] != MP_OBJ_NULL) { int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len; if (gap < 2) {
[catboost/gpu] remove profiling from PowVector unittest
@@ -320,9 +320,6 @@ Y_UNIT_TEST_SUITE(TTransformTest) { auto tmp = TStripeBuffer<float>::Create(mapping); tmp.Write(exponents); - TCudaProfiler profiler(EProfileMode::ImplicitLabelSync); - const auto guard = profiler.Profile("PowVector"); - PowVector(tmp, base); TVector<float> gpuPow;
doc: add some rules related to language extensions This patch adds some rules related to language extensions.
@@ -3310,3 +3310,47 @@ The number of bytes in an object is implementation-defined, according to J.3.13 item 2 in C99. For ACRN hypervisor, char is 1 byte, short is 2 bytes, int is 4 bytes, long is 8 bytes, and long long is not used. +Language Extensions +******************* + + +LE-01: Use of inline Assembly language in C Code is allowed +=========================================================== + +This feature refers to section 6.45 in GCC 7.3 Manual. + +LE-02: Use of type attribute 'aligned' is allowed +================================================= + +This feature refers to section 6.33.1 in GCC 7.3 Manual. + +LE-03: Use of type attribute 'packed' is allowed +================================================ + +This feature refers to section 6.33.1 in GCC 7.3 Manual. + +LE-04: Use of builtin-type '__builtin_va_list' is allowed +========================================================= + +This feature refers to section 6.20 in GCC 7.3 Manual. + +LE-05: Use of builtin-function '__builtin_va_arg' is allowed +============================================================ + +This feature refers to section 6.20 in GCC 7.3 Manual. + +LE-06: Use of builtin-function '__builtin_va_start' is allowed +============================================================== + +This feature refers to section 6.20 in GCC 7.3 Manual. + +LE-07: Use of builtin-function '__builtin_va_end' is allowed +============================================================ + +This feature refers to section 6.20 in GCC 7.3 Manual. + +LE-08: Use of builtin-function '__builtin_offsetof' is allowed +============================================================== + +This feature refers to section 6.51 in GCC 7.3 Manual. +
better adding of _estimator_type
@@ -1730,6 +1730,9 @@ class CatBoost(_CatBoostBase): class CatBoostClassifier(CatBoost): + + _estimator_type = 'classifier' + """ Implementation of the scikit-learn API for CatBoost classification. @@ -2087,7 +2090,6 @@ class CatBoostClassifier(CatBoost): if key not in not_params and value is not None: params[key] = value - self._estimator_type = 'classifier' super(CatBoostClassifier, self).__init__(params) @property @@ -2355,6 +2357,9 @@ class CatBoostClassifier(CatBoost): class CatBoostRegressor(CatBoost): + + _estimator_type = 'regressor' + """ Implementation of the scikit-learn API for CatBoost regression. @@ -2454,7 +2459,6 @@ class CatBoostRegressor(CatBoost): if key not in not_params and value is not None: params[key] = value - self._estimator_type = 'regressor' super(CatBoostRegressor, self).__init__(params) def fit(self, X, y=None, cat_features=None, sample_weight=None, baseline=None, use_best_model=None,
dm: virtio-gpio: avoid flood messages in virtio_irq_evt_notify To avoid flood messages in virtio_irq_evt_notify.
@@ -1221,7 +1221,7 @@ static void virtio_irq_evt_notify(void *vdev, struct virtio_vq_info *vq) { /* The front-end driver does not make a kick, just avoid warning */ - WPRINTF(("%s", "virtio gpio irq_evt_notify\n")); + DPRINTF(("%s", "virtio gpio irq_evt_notify\n")); } static void
Add hsig files for Haskell
@@ -42,7 +42,7 @@ lang_spec_t langs[] = { { "groovy", { "groovy", "gtmpl", "gpp", "grunit", "gradle" } }, { "haml", { "haml" } }, { "handlebars", { "hbs" } }, - { "haskell", { "hs", "lhs" } }, + { "haskell", { "hs", "hsig", "lhs" } }, { "haxe", { "hx" } }, { "hh", { "h" } }, { "html", { "htm", "html", "shtml", "xhtml" } },
bootloader_support: Adds better logs for virtual efuses Close
@@ -313,6 +313,10 @@ esp_err_t esp_flash_encrypt_enable(void) ESP_LOGI(TAG, "Flash encryption completed"); +#if CONFIG_EFUSE_VIRTUAL + ESP_LOGW(TAG, "Flash encryption not really completed. Must disable virtual efuses"); +#endif + return err; }
Added additional deb packaging distros.
-name: .deb packaging +name: arm64 .deb packaging on: workflow_dispatch: @@ -21,6 +21,14 @@ jobs: distro: ubuntu20.04 - arch: aarch64 distro: ubuntu22.04 + - arch: aarch64 + distro: jessie + - arch: aarch64 + distro: stretch + - arch: aarch64 + distro: buster + - arch: aarch64 + distro: bullseye steps: - uses: actions/[email protected]
plugins types BUGFIX empty dynamic value leak
@@ -1311,7 +1311,7 @@ ly_type_store_boolean(const struct ly_ctx *ctx, const struct lysc_type *type, co */ static LY_ERR ly_type_store_empty(const struct ly_ctx *ctx, const struct lysc_type *type, const char *value, size_t value_len, - uint32_t UNUSED(options), LY_PREFIX_FORMAT UNUSED(format), void *UNUSED(prefix_data), uint32_t hints, + uint32_t options, LY_PREFIX_FORMAT UNUSED(format), void *UNUSED(prefix_data), uint32_t hints, const struct lysc_node *UNUSED(ctx_node), struct lyd_value *storage, struct ly_err_item **err) { /* check hints */ @@ -1328,7 +1328,11 @@ ly_type_store_empty(const struct ly_ctx *ctx, const struct lysc_type *type, cons } } - LY_CHECK_RET(lydict_insert(ctx, "", 0, &storage->canonical)); + if (options & LY_TYPE_STORE_DYNAMIC) { + LY_CHECK_RET(lydict_insert_zc(ctx, (char *)value, &storage->canonical)); + } else { + LY_CHECK_RET(lydict_insert(ctx, value, value_len, &storage->canonical)); + } storage->ptr = NULL; storage->realtype = type;
snap_env: Fixing typo in condition for if statement
@@ -148,7 +148,7 @@ while [ -z "$SETUP_DONE" ]; do ####### checking path to PSLSE (only if simulation is enabled) # Note: SIMULATOR is defined via snap_config - if [ $SIMULATOR != "nosim" ]; then + if [ "$SIMULATOR" != "nosim" ]; then echo "=====Simulation setup: Setting up PSLSE version==========" if [ "$FPGACARD" == "N250SP" ]; then PSLVER="9"
add option to build with thread sanitizer
@@ -19,6 +19,7 @@ option(MI_BUILD_SHARED "Build shared library" ON) option(MI_BUILD_STATIC "Build static library" ON) option(MI_BUILD_OBJECT "Build object library" ON) option(MI_BUILD_TESTS "Build test executables" ON) +option(MI_DEBUG_TSAN "Build with thread sanitizer (needs clang)" OFF) option(MI_CHECK_FULL "Use full internal invariant checking in DEBUG mode (deprecated, use MI_DEBUG_FULL instead)" OFF) include("cmake/mimalloc-config-version.cmake") @@ -133,6 +134,16 @@ if(MI_USE_CXX MATCHES "ON") endif() endif() +if(MI_DEBUG_TSAN MATCHES "ON") + if(CMAKE_C_COMPILER_ID MATCHES "Clang") + message(STATUS "Build with thread sanitizer (MI_DEBUG_TSAN=ON)") + list(APPEND mi_cflags -fsanitize=thread -g) + list(APPEND CMAKE_EXE_LINKER_FLAGS -fsanitize=thread) + else() + message(WARNING "Can only use thread sanitizer with clang (MI_DEBUG_TSAN=ON but ignored)") + endif() +endif() + # Compiler flags if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU") list(APPEND mi_cflags -Wall -Wextra -Wno-unknown-pragmas -fvisibility=hidden)
config: allow for grace to be set to -1 for a clean shutdown
@@ -47,7 +47,12 @@ struct flb_config { int is_shutting_down; /* is the service shutting down ? */ int is_running; /* service running ? */ double flush; /* Flush timeout */ - int grace; /* Maximum grace time on shutdown */ + + /* + * Maximum grace time on shutdown. If set to -1, the engine will + * shutdown when all remaining tasks are flushed + */ + int grace; int grace_count; /* Count of grace shutdown tries */ flb_pipefd_t flush_fd; /* Timer FD associated to flush */ int convert_nan_to_null; /* convert null to nan ? */
rails mode: read initial escape_html from active_support
@@ -1071,6 +1071,8 @@ rails_set_encoder(VALUE self) { rb_undef_method(encoding, "use_standard_json_time_format="); rb_define_module_function(encoding, "use_standard_json_time_format=", rails_use_standard_json_time_format, 1); + pv = rb_iv_get(encoding, "@escape_html_entities_in_json"); + escape_html = Qtrue == pv; rb_undef_method(encoding, "escape_html_entities_in_json="); rb_define_module_function(encoding, "escape_html_entities_in_json=", rails_escape_html_entities_in_json, 1);
printer json BUGFIX handle hint masks
@@ -410,11 +410,14 @@ json_print_attribute(struct jsonpr_ctx *pctx, const struct lyd_node_opaq *node, for (attr = node->attr; attr; attr = attr->next) { json_print_member2(pctx, &node->node, attr->format, &attr->name, 0); - if (attr->hints & (LYD_VALHINT_BOOLEAN | LYD_VALHINT_DECNUM)) { + if (attr->hints & (LYD_VALHINT_STRING | LYD_VALHINT_OCTNUM | LYD_VALHINT_HEXNUM | LYD_VALHINT_NUM64)) { + json_print_string(pctx->out, attr->value); + } else if (attr->hints & (LYD_VALHINT_BOOLEAN | LYD_VALHINT_DECNUM)) { ly_print_(pctx->out, "%s", attr->value[0] ? attr->value : "null"); } else if (attr->hints & LYD_VALHINT_EMPTY) { ly_print_(pctx->out, "[null]"); } else { + /* unknown value format with no hints, use universal string */ json_print_string(pctx->out, attr->value); } LEVEL_PRINTED;
Add test for SCOPE_LOG_LEVEL=trace
@@ -89,6 +89,21 @@ ERR+=$? endtest +# +# trace log level +# + +starttest trace_level_test + +SCOPE_LOG_LEVEL=trace ldscope ps -ef +if [ $? -ne 0 ]; then + ERR+=1 +fi + +evaltest + +endtest + unset SCOPE_PAYLOAD_ENABLE unset SCOPE_PAYLOAD_HEADER
remove hexadecimal from readme
@@ -4,7 +4,7 @@ KadNode is a small and decentralized DNS resolver that can use existing public k KadNode can intercept .p2p domain queries on the systems level and resolve them using a decentralized network. [TLS](https://de.wikipedia.org/wiki/Transport_Layer_Security) authentication can be used to make sure the correct IP address was found, before it is passed to the browser or any other application. -Supported are also domains consisting of public keys represented as hexadecimal characters. :-) +Supported are also domains consisting of public keys represented as characters. :-) ## Features:
Leaf: Fix bug in `splitArrayParentsOther`
@@ -120,6 +120,11 @@ TEST (leaf, splitArrayParentsOther) CppKeySet arrays; tie (arrays, ignore) = splitArrayParentsOther (input); compare_keyset (expected, arrays); + + input = CppKeySet{ 10, keyNew (PREFIX "key", KEY_END), KS_END }; + expected = input.dup (); + tie (ignore, input) = splitArrayParentsOther (input); + compare_keyset (expected, input); } TEST (leaf, increaseArrayIndices)
DmveEnum is changed according to specification
21. November 2019: v1.6.3 - added attribute 'uninit' to <memory> element to replace deprecated 'init' attribute + - DmveEnum is changed according to specification 05. November 2019: v1.6.2 - added <accessportV1> and <accessportV2> to describe CoreSight access port parameters. <xs:restriction base="xs:token"> <xs:enumeration value="NO_MVE"/> <xs:enumeration value="MVE"/> - <xs:enumeration value="MVE_SP_FP"/> - <xs:enumeration value="MVE_DP_FP"/> - <xs:enumeration value="0"/> - <xs:enumeration value="1"/> - <xs:enumeration value="2"/> - <xs:enumeration value="3"/> + <xs:enumeration value="FP_MVE"/> <xs:enumeration value="*"/> </xs:restriction> </xs:simpleType>
have unified consistency about error code setting Tinyara uses get_errno and set_errno. So I modified the logic consistently for the error code
* to sem_trywait(). * * Return Value: - * Zero (OK) is returned on success. A negated errno value is returned on - * failure. -ETIMEDOUT is returned on the timeout condition. + * Zero (OK) is returned on success. + * On failure, -1 (ERROR) is returned and the errno + * is set appropriately: + * + * ETIMEDOUT The semaphore could not be locked before the specified timeout + * (delay) expired. + * ENOMEM Out of memory * ****************************************************************************/ + int sem_tickwait(FAR sem_t *sem, systime_t start, uint32_t delay) { FAR struct tcb_s *rtcb = (FAR struct tcb_s *)g_readytorun.head; irqstate_t flags; systime_t elapsed; - int ret; + int ret = ERROR; DEBUGASSERT(sem != NULL && up_interrupt_context() == false && rtcb->waitdog == NULL); @@ -129,7 +135,8 @@ int sem_tickwait(FAR sem_t *sem, systime_t start, uint32_t delay) rtcb->waitdog = wd_create(); if (!rtcb->waitdog) { - return -ENOMEM; + set_errno(ENOMEM); + return ret; } /* We will disable interrupts until we have completed the semaphore @@ -141,7 +148,6 @@ int sem_tickwait(FAR sem_t *sem, systime_t start, uint32_t delay) */ flags = irqsave(); - /* Try to take the semaphore without waiting. */ ret = sem_trywait(sem); @@ -158,7 +164,6 @@ int sem_tickwait(FAR sem_t *sem, systime_t start, uint32_t delay) if (delay == 0) { /* Return the errno from sem_trywait() */ - ret = -get_errno(); goto errout_with_irqdisabled; } @@ -166,7 +171,7 @@ int sem_tickwait(FAR sem_t *sem, systime_t start, uint32_t delay) elapsed = clock_systimer() - start; if (/* elapsed >= (UINT32_MAX / 2) || */ elapsed >= delay) { - ret = -ETIMEDOUT; + set_errno(ETIMEDOUT); goto errout_with_irqdisabled; } @@ -179,11 +184,6 @@ int sem_tickwait(FAR sem_t *sem, systime_t start, uint32_t delay) /* Now perform the blocking wait */ ret = sem_wait(sem); - if (ret < 0) { - /* Return the errno from sem_wait() */ - - ret = -get_errno(); - } /* Stop the watchdog timer */
Be aggressive with setting SO_NOSIGPIPE on BSD/Apple.
@@ -139,6 +139,19 @@ static int janet_stream_close(void *p, size_t s) { return 0; } + +static void nosigpipe(JSock s) { +#ifdef SO_NOSIGPIPE + int enable = 1; + if (setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, &enable, sizeof(int)) < 0) { + JSOCKCLOSE(s); + janet_panic("setsockopt(SO_NOSIGPIPE) failed"); + } +#else + (void) s; +#endif +} + /* * Event loop */ @@ -308,6 +321,7 @@ static size_t janet_loop_event(size_t index) { JSock connfd = accept(fd, NULL, NULL); if (JSOCKVALID(connfd)) { /* Made a new connection socket */ + nosigpipe(connfd); JanetStream *stream = make_stream(connfd, JANET_STREAM_READABLE | JANET_STREAM_WRITABLE); Janet streamv = janet_wrap_abstract(stream); JanetFunction *handler = jlfd->data.read_accept.handler; @@ -497,18 +511,6 @@ static struct addrinfo *janet_get_addrinfo(Janet *argv, int32_t offset) { * C Funs */ -static void nosigpipe(JSock s) { -#ifdef SO_NOSIGPIPE - int enable = 1; - if (setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, &enable, sizeof(int)) < 0) { - JSOCKCLOSE(s); - janet_panic("setsockopt(SO_NOSIGPIPE) failed"); - } -#else - (void) s; -#endif -} - static Janet cfun_net_connect(int32_t argc, Janet *argv) { janet_fixarity(argc, 2);
Include mcuboot_config.h from sign_key.h to fix MCUBOOT_HW_KEY compilation
#include <stddef.h> #include <stdint.h> +/* mcuboot_config.h is needed for MCUBOOT_HW_KEY to work */ +#include "mcuboot_config/mcuboot_config.h" + #ifdef __cplusplus extern "C" { #endif
sub shm CHANGE better message if a callback times out
@@ -184,8 +184,9 @@ sr_shmsub_notify_finish_wrunlock(sr_sub_shm_t *sub_shm, size_t shm_struct_size, } /* event timeout */ + sr_errinfo_new(cb_err_info, SR_ERR_TIME_OUT, NULL, "Callback event \"%s\" with ID %u processing timed out.", + sr_ev2str(sub_shm->event), sub_shm->request_id); sub_shm->event = SR_SUB_EV_ERROR; - sr_errinfo_new(cb_err_info, SR_ERR_TIME_OUT, NULL, "Callback event processing timed out."); } else { /* other error */ SR_ERRINFO_COND(&err_info, __func__, ret);
logs.c: Include <android/log.h> if building for Android
#include "logs.h" #include "init.h" #include <stdarg.h> +#ifdef ANDROID +#include <android/log.h> +#endif //---------------------------------------------------------------------------- static const char * const log_prefix="LIBGL: "; //----------------------------------------------------------------------------
os/Makefile.unix: Verify undefined symbols in common binary Check for undefined symbols in common binary and print error message.
@@ -464,6 +464,12 @@ ifeq ($(CONFIG_BUILD_2PASS),y) $(Q) $(MAKE) -C $(LOADABLE_APPDIR) TOPDIR="$(TOPDIR)" LOADABLEDIR="${LOADABLE_APPDIR}" LIBRARIES_DIR="$(LIBRARIES_DIR)" USERLIBS="$(USERLIBS)" all KERNEL=n ifeq ($(CONFIG_SUPPORT_COMMON_BINARY),y) $(Q) $(LD) -r -o $(OUTBIN_DIR)/$(CONFIG_COMMON_BINARY_NAME) -T $(TOPDIR)/binfmt/libelf/gnu-elf.ld -L $(LIBRARIES_DIR) --start-group $(COMMONLIBS) $(LIBGCC) --end-group $$(cat $(OUTBIN_DIR)/lib_symbols.txt) + $(Q) if [ "`nm -u $(OUTBIN_DIR)/$(CONFIG_COMMON_BINARY_NAME) | wc -l`" != "0" ]; then \ + echo "Undefined Symbols in Common binary"; \ + nm -u -l $(OUTBIN_DIR)/$(CONFIG_COMMON_BINARY_NAME); \ + rm $(OUTBIN_DIR)/$(CONFIG_COMMON_BINARY_NAME); \ + exit 1; \ + fi $(Q) $(STRIP) -g -o $(OUTBIN_DIR)/$(CONFIG_COMMON_BINARY_NAME) $(OUTBIN_DIR)/$(CONFIG_COMMON_BINARY_NAME) $(Q) $(OBJCOPY) --remove-section .comment $(OUTBIN_DIR)/$(CONFIG_COMMON_BINARY_NAME) endif
dpdk: bump to DPDK 17.02
@@ -24,13 +24,14 @@ DPDK_MLX5_PMD ?= n B := $(DPDK_BUILD_DIR) I := $(DPDK_INSTALL_DIR) -DPDK_VERSION ?= 16.11 -PKG_SUFFIX ?= vpp5 +DPDK_VERSION ?= 17.02 +PKG_SUFFIX ?= vpp1 DPDK_BASE_URL ?= http://fast.dpdk.org/rel DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL) DPDK_16.07_TARBALL_MD5_CKSUM := 690a2bb570103e58d12f9806e8bf21be DPDK_16.11_TARBALL_MD5_CKSUM := 06c1c577795360719d0b4fafaeee21e9 +DPDK_17.02_TARBALL_MD5_CKSUM := 6b9f7387c35641f4e8dbba3e528f2376 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION) ifneq (,$(findstring clang,$(CC)))
regex: header to be used only if FLB_HAVE_REGEX is set
#ifndef FLB_REGEX_H #define FLB_REGEX_H +#include <fluent-bit/flb_info.h> + +#ifdef FLB_HAVE_REGEX + #include <fluent-bit/flb_compat.h> #include <stdlib.h> @@ -56,3 +60,5 @@ int flb_regex_destroy(struct flb_regex *r); void flb_regex_exit(); #endif + +#endif
physmem: fix bug in detection of cross page boundary allocations
@@ -85,8 +85,8 @@ unix_physmem_alloc_aligned (vlib_main_t * vm, vlib_physmem_region_index_t idx, /* Make sure allocation does not span DMA physical chunk boundary. */ hi_offset = lo_offset + n_bytes - 1; - if ((lo_offset >> pr->log2_page_size) == - (hi_offset >> pr->log2_page_size)) + if (((pointer_to_uword (pr->heap) + lo_offset) >> pr->log2_page_size) == + ((pointer_to_uword (pr->heap) + hi_offset) >> pr->log2_page_size)) break; /* Allocation would span chunk boundary, queue it to be freed as soon as
[CUDA] Skip corrupt kernels in opencl.kernels
@@ -134,6 +134,9 @@ void pocl_add_kernel_annotations(llvm::Module *module) nvvm_annotations = module->getOrInsertNamedMetadata("nvvm.annotations"); for (auto K = md_kernels->op_begin(); K != md_kernels->op_end(); K++) { + if (!(*K)->getOperand(0)) + continue; + llvm::ConstantAsMetadata *cam = llvm::dyn_cast<llvm::ConstantAsMetadata>((*K)->getOperand(0).get()); if (!cam) @@ -176,6 +179,9 @@ void pocl_gen_local_mem_args(llvm::Module *module) // Loop over kernels for (auto K = md_kernels->op_begin(); K != md_kernels->op_end(); K++) { + if (!(*K)->getOperand(0)) + continue; + llvm::ConstantAsMetadata *cam = llvm::dyn_cast<llvm::ConstantAsMetadata>((*K)->getOperand(0).get()); if (!cam) @@ -193,7 +199,8 @@ void pocl_gen_local_mem_args(llvm::Module *module) { // Check for local memory pointer llvm::Type *arg_type = arg->getType(); - if (arg_type->getPointerAddressSpace() == POCL_ADDRESS_SPACE_LOCAL) + if (arg_type->isPointerTy() && + arg_type->getPointerAddressSpace() == POCL_ADDRESS_SPACE_LOCAL) { has_local_args = true; @@ -252,7 +259,7 @@ void pocl_gen_local_mem_args(llvm::Module *module) { // No change to other arguments arguments.push_back(&*arg); - argument_types.push_back(arg->getType()); + argument_types.push_back(arg_type); } }