message
stringlengths
6
474
diff
stringlengths
8
5.22k
clay: fix tests
file-store=~ *ford-cache:fusion == - =/ [res=vase nub=state:ford:fusion] (get-nave:ford %mime) + =/ [res=vase nub=state:ford:fusion] (build-nave:ford %mime) ;: weld %+ expect-eq !>(*mime) :: %+ expect-eq !> (~(gas in *(set path)) /mar/mime/hoon ~) - !> dez:(~(got by vases.cache.nub) /mar/mime/hoon) + !> dez:(~(got by files.cache.nub) /mar/mime/hoon) == :: ++ test-mar-udon ^- tang file-store=~ *ford-cache:fusion == - =/ [res=vase nub=state:ford:fusion] (get-nave:ford %udon) + =/ [res=vase nub=state:ford:fusion] (build-nave:ford %udon) ;: weld %+ expect-eq !>(*@t) :: %+ expect-eq !> (~(gas in *(set path)) /mar/udon/hoon /lib/cram/hoon ~) - !> dez:(~(got by vases.cache.nub) /mar/udon/hoon) + !> dez:(~(got by files.cache.nub) /mar/udon/hoon) == :: ++ test-cast-html-mime ^- tang file-store=~ *ford-cache:fusion == - =/ [res=vase nub=state:ford:fusion] (get-cast:ford %html %mime) + =/ [res=vase nub=state:ford:fusion] (build-cast:ford %html %mime) %+ expect-eq (slam res !>('<html></html>')) !> `mime`[/text/html 13 '<html></html>'] :: %+ expect-eq !> (~(gas in *(set path)) /gen/hello/hoon ~) - !> dez:(~(got by vases.cache.nub) /gen/hello/hoon) + !> dez:(~(got by files.cache.nub) /gen/hello/hoon) == :: ++ test-lib-strandio ^- tang /lib/strand/hoon /sur/spider/hoon == - !> dez:(~(got by vases.cache.nub) /lib/strandio/hoon) + !> dez:(~(got by files.cache.nub) /lib/strandio/hoon) == :: :: |utilities: helper functions for testing
ipfix-export: fix the warning message for uninitialized variable Type: fix
@@ -349,8 +349,8 @@ vnet_ipfix_exp_send_buffer (vlib_main_t *vm, ipfix_exporter_t *exp, vlib_frame_t *f; ipfix_set_header_t *s; ipfix_message_header_t *h; - ip4_header_t *ip4; - ip6_header_t *ip6; + ip4_header_t *ip4 = 0; + ip6_header_t *ip6 = 0; void *ip; udp_header_t *udp; int ip_len;
openamp/libmetal: support other arch sim host Add support for x86, arm and arm64 host. Tested on M2 mac.
ifeq ($(CONFIG_OPENAMP),y) ifeq ($(CONFIG_ARCH), sim) +ifeq ($(CONFIG_HOST_ARM64), y) +LIBMETAL_ARCH = aarch64 +else ifeq ($(CONFIG_HOST_ARM), y) +LIBMETAL_ARCH = arm +else ifeq ($(CONFIG_HOST_X86), y) +LIBMETAL_ARCH = x86 +else LIBMETAL_ARCH = x86_64 +endif else ifeq ($(CONFIG_ARCH), risc-v) LIBMETAL_ARCH = riscv else
fix make line
@@ -89,7 +89,7 @@ chmod 644 db/installdb db/prepsql db/upgradedb %configure \ --bindir=%{_sbindir} \ --sysconfdir=%{_sysconfdir}/nagios -make %{?_smp_mflags} +make %{?_smp_mflags} all DESTDIR=%{?buildroot} %install rm -rf %{buildroot} @@ -99,7 +99,7 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/ndoutils mkdir -p %{buildroot}%{_libdir}/nagios/brokers # Nagios 4 support + common components -%make_install DESTDIR=%{?buildroot} +%make_install # Nagios 2 support (override) %if 0%{?rhel} == 5
zephyr/emul/emul_bmi160.c: Format with clang-format BRANCH=none TEST=none
@@ -714,8 +714,8 @@ static int bmi160_emul_handle_read(uint8_t *regs, struct i2c_emul *emul, bmi_emul_state_to_reg(emul, acc_shift, gyr_shift, BMI160_ACC_X_L_G, BMI160_GYR_X_L_G, - BMI160_SENSORTIME_0, - acc_off_en, gyr_off_en); + BMI160_SENSORTIME_0, acc_off_en, + gyr_off_en); } break; case BMI160_FIFO_LENGTH_0: @@ -739,14 +739,11 @@ static int bmi160_emul_handle_read(uint8_t *regs, struct i2c_emul *emul, } /** Registers backed in NVM by BMI160 */ -const int bmi160_nvm_reg[] = {BMI160_NV_CONF, - BMI160_OFFSET_ACC70, - BMI160_OFFSET_ACC70 + 1, - BMI160_OFFSET_ACC70 + 2, - BMI160_OFFSET_GYR70, - BMI160_OFFSET_GYR70 + 1, - BMI160_OFFSET_GYR70 + 2, - BMI160_OFFSET_EN_GYR98}; +const int bmi160_nvm_reg[] = { + BMI160_NV_CONF, BMI160_OFFSET_ACC70, BMI160_OFFSET_ACC70 + 1, + BMI160_OFFSET_ACC70 + 2, BMI160_OFFSET_GYR70, BMI160_OFFSET_GYR70 + 1, + BMI160_OFFSET_GYR70 + 2, BMI160_OFFSET_EN_GYR98 +}; /** Confguration of BMI160 */ struct bmi_emul_type_data bmi160_emul = {
[CLI] Fix output format of gettx
@@ -41,6 +41,10 @@ func (b *InOutTxBody) String() string { return toString(b) } +func (t *InOutTx) String() string { + return toString(t) +} + func (t *InOutTxInBlock) String() string { return toString(t) }
stdlib.system: simplify output capture logic
package noarch import ( - "io" "math" "math/rand" "os" @@ -362,29 +361,11 @@ func System(str []byte) int32 { re := regexp.MustCompile(`[^\s"']+|([^\s"']*"([^"]*)"[^\s"']*)+|'([^']*)`) args := re.FindAllString(input, -1) cmd := exec.Command(args[0], args[1:]...) - var stdout, stderr []byte - var errStdout, errStderr error - // These are unused in integration tests, so silence "declared but unused" - // errors during integration testing. - _ = stdout - _ = stderr - _ = errStdout - _ = errStderr + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr - stdoutIn, _ := cmd.StdoutPipe() - stderrIn, _ := cmd.StderrPipe() - cmd.Start() - - go func() { - stdout, errStdout = capture(os.Stdout, stdoutIn) - }() - - go func() { - stderr, errStderr = capture(os.Stderr, stderrIn) - }() - - err := cmd.Wait() + err := cmd.Run() if err != nil { if strings.HasPrefix(err.Error(), "exit status ") { @@ -474,35 +455,6 @@ func atof(str []byte) (float64, int) { return 0, 0 } -// The capture function is used by noarch.System to imitate -// the behavior of C's system(3) instead of golang's exec by -// grabbing command output as it is generated and displays -// it rather than displaying it after execution completes. -func capture(w io.Writer, r io.Reader) ([]byte, error) { - var out []byte - buf := make([]byte, 1024, 1024) - for { - n, err := r.Read(buf[:]) - if n > 0 { - d := buf[:n] - out = append(out, d...) - _, err := w.Write(d) - if err != nil { - return out, err - } - } - if err != nil { - // io.EOF is not actually an error - if err == io.EOF { - err = nil - } - return out, err - } - } - panic(true) - return nil, nil -} - // transpiling "atexit" var AtexitFuncs []func()
Fix use after scope exit on connection validate 0-RTT tests Since the context is passed to the connection, it needs to be alive as long as all the server side connections. The solution to this is to allocate the variable before even the registration is opened
@@ -547,6 +547,9 @@ ListenerFailSendResumeCallback( void QuicTestValidateConnection() { +#ifndef QUIC_DISABLE_0RTT_TESTS + QuicServerSendResumeState ListenerContext; +#endif MsQuicRegistration Registration(true); TEST_TRUE(Registration.IsValid()); @@ -935,7 +938,6 @@ void QuicTestValidateConnection() QuicAddr ServerLocalAddr; TEST_QUIC_SUCCEEDED(MyListener.GetLocalAddr(ServerLocalAddr)); - QuicServerSendResumeState ListenerContext; MyListener.Context = &ListenerContext; { @@ -947,7 +949,7 @@ void QuicTestValidateConnection() MsQuicConnection Connection(Registration); TEST_QUIC_SUCCEEDED(Connection.GetInitStatus()); TEST_QUIC_SUCCEEDED(Connection.StartLocalhost(ClientConfiguration, ServerLocalAddr)); - TEST_TRUE(ListenerContext.ListenerAcceptEvent.WaitTimeout(1000)); + TEST_TRUE(ListenerContext.ListenerAcceptEvent.WaitTimeout(2000)); } // @@ -959,8 +961,8 @@ void QuicTestValidateConnection() MsQuicConnection Connection(Registration); TEST_QUIC_SUCCEEDED(Connection.GetInitStatus()); TEST_QUIC_SUCCEEDED(Connection.StartLocalhost(ClientConfiguration, ServerLocalAddr)); - TEST_TRUE(ListenerContext.ListenerAcceptEvent.WaitTimeout(1000)); - TEST_TRUE(ListenerContext.HandshakeCompleteEvent.WaitTimeout(1000)); // Wait for server to get connected + TEST_TRUE(ListenerContext.ListenerAcceptEvent.WaitTimeout(2000)); + TEST_TRUE(ListenerContext.HandshakeCompleteEvent.WaitTimeout(2000)); // Wait for server to get connected } // @@ -972,8 +974,8 @@ void QuicTestValidateConnection() MsQuicConnection Connection(Registration); TEST_QUIC_SUCCEEDED(Connection.GetInitStatus()); TEST_QUIC_SUCCEEDED(Connection.StartLocalhost(ClientConfiguration, ServerLocalAddr)); - TEST_TRUE(ListenerContext.ListenerAcceptEvent.WaitTimeout(1000)); - TEST_TRUE(Connection.HandshakeCompleteEvent.WaitTimeout(1000)); // Wait for client to get connected + TEST_TRUE(ListenerContext.ListenerAcceptEvent.WaitTimeout(2000)); + TEST_TRUE(Connection.HandshakeCompleteEvent.WaitTimeout(2000)); // Wait for client to get connected // // TODO: add test case to validate ConnectionSendResumptionTicket:
Remove logo with addition of GitHub dark theme Currently when viewing the README in dark mode the logo looks pretty awful. Until i can find a better way to select a logo based on the theme, i'll have to remove it for now.
-<p align="center"> - <a href="https://dictu-lang.com"> - <img src="docs/assets/images/dictu-logo/dictu-light-png-8x.png" alt="Dictu logo" width="560px"> - </a> -</p> - --------------------------------------------------------------------------------- - -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ab84059049bd4ba7b7b8c1fcfaac4ea5)](https://app.codacy.com/manual/jasonhall96686/Dictu?utm_source=github.com&utm_medium=referral&utm_content=Jason2605/Dictu&utm_campaign=Badge_Grade_Dashboard) -[![CI](https://github.com/Jason2605/Dictu/workflows/CI/badge.svg)](https://github.com/Jason2605/Dictu/actions) +# Dictu *What is Dictu?* Dictu is a very simple dynamically typed programming language @@ -19,6 +10,9 @@ Dictu means `simplistic` in Latin. ### Dictu documentation Documentation for Dictu can be found [here](https://dictu-lang.com/) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ab84059049bd4ba7b7b8c1fcfaac4ea5)](https://app.codacy.com/manual/jasonhall96686/Dictu?utm_source=github.com&utm_medium=referral&utm_content=Jason2605/Dictu&utm_campaign=Badge_Grade_Dashboard) +[![CI](https://github.com/Jason2605/Dictu/workflows/CI/badge.svg)](https://github.com/Jason2605/Dictu/actions) + ## Running Dictu Dictu currently has two options when building, there is a CMakeLists file included so the build files can be generated with CMake or there is an included makefile for users that are more familiar with that.
style(c_compiler) Make compile_c_file and compile_titan more consistent Now both only receive the input file names and the output is always implicit.
@@ -16,7 +16,10 @@ else c_compiler.CFLAGS_SHARED = "-fPIC -shared" end -function c_compiler.compile_c_file(c_filename, so_filename) +function c_compiler.compile_c_file(c_filename) + local name, ext = util.split_ext(c_filename) + assert(ext == "c") + local so_filename = name .. ".so" local args = { c_compiler.CC, c_compiler.CFLAGS_BASE, @@ -42,7 +45,6 @@ function c_compiler.compile_titan(filename, input) local name, ext = util.split_ext(filename) assert(ext == "titan") local c_filename = name .. ".c" - local so_filename = name .. ".so" local modname = string.gsub(name, "/", "_") local code, errors = coder.generate(filename, input, modname) @@ -51,7 +53,7 @@ function c_compiler.compile_titan(filename, input) local ok, err = util.set_file_contents(c_filename, code) if not ok then return nil, {err} end - return c_compiler.compile_c_file(c_filename, so_filename) + return c_compiler.compile_c_file(c_filename) end return c_compiler
fix precise matrix inv
@@ -478,7 +478,7 @@ glm_mat4_inv_precise(mat4 mat, mat4 dest) { #if defined( __SSE__ ) || defined( __SSE2__ ) glm_mat4_inv_precise_sse2(mat, dest); #else - glm_mat4_inv_precise(mat, dest); + glm_mat4_inv(mat, dest); #endif }
dump: prepare for version 2
@@ -92,20 +92,17 @@ int serialise (std::ostream & os, ckdb::Key *, ckdb::KeySet * ks) return 1; } -int unserialise (std::istream & is, ckdb::Key * errorKey, ckdb::KeySet * ks) +static int decodeLine (std::istream & is, ckdb::Key * parentKey, ckdb::KeySet * ks, std::string & line, ckdb::Key ** curPtr) { - ckdb::Key * cur = nullptr; + ckdb::Key * cur = *curPtr; std::vector<char> namebuffer (4048); std::vector<char> valuebuffer (4048); - std::string line; std::string command; size_t nrKeys; size_t namesize; size_t valuesize; - while (std::getline (is, line)) - { std::stringstream ss (line); ss >> command; @@ -115,7 +112,7 @@ int unserialise (std::istream & is, ckdb::Key * errorKey, ckdb::KeySet * ks) ss >> version; if (version != "1") { - ELEKTRA_SET_INSTALLATION_ERRORF (errorKey, "Wrong version detected in dumpfile: %s", version.c_str ()); + ELEKTRA_SET_INSTALLATION_ERRORF (parentKey, "Wrong version detected in dumpfile: %s", version.c_str ()); return -1; } } @@ -184,19 +181,62 @@ int unserialise (std::istream & is, ckdb::Key * errorKey, ckdb::KeySet * ks) } else if (command == "ksEnd") { - break; + return 1; } else { ELEKTRA_SET_VALIDATION_SYNTACTIC_ERRORF ( - errorKey, + parentKey, "Unknown command detected in dumpfile: %s.\nMaybe the file is not in dump configuration file format? " "Try to remount with another plugin (eg. ini, ni, etc.)", command.c_str ()); return -1; } + + *curPtr = cur; + + return 0; } - return 1; + +int unserialiseVersion1 (std::istream & is, ckdb::Key * parentKey, ckdb::KeySet * ks, const std::string & firstLine) +{ + ckdb::Key * cur = nullptr; + std::string line = firstLine; + + do + { + int ret = decodeLine (is, parentKey, ks, line, &cur); + + if (ret == -1) + { + return ELEKTRA_PLUGIN_STATUS_ERROR; + } + + if (ret == 1) + { + break; + } + } while (std::getline (is, line)); + + return ELEKTRA_PLUGIN_STATUS_SUCCESS; +} + +int unserialise (std::istream & is, ckdb::Key * parentKey, ckdb::KeySet * ks) +{ + std::string line; + + if (std::getline (is, line)) + { + if (line == "kdbOpen 2") + { + // not implemented + return -1; + } + + return unserialiseVersion1 (is, parentKey, ks, line); + } + + return ELEKTRA_PLUGIN_STATUS_SUCCESS; } class pipebuf : public std::streambuf
Fix SceIofilemgrForDriver function nids
@@ -2715,11 +2715,13 @@ modules: ksceVfsDeleteVfs: 0x9CBFA725 ksceVfsFreeVnode: 0x21D57633 ksceVfsGetNewNode: 0xD60B5C63 + ksceVfsLockMnt: 0x6B3CA9F7 ksceVfsMount: 0xB62DE9A6 ksceVfsNodeSetEventFlag: 0x6048F245 ksceVfsNodeWaitEventFlag: 0xAA45010B ksceVfsOpDecodePathElem: 0xF7DAC0F5 ksceVfsOpDevctl: 0xB07B307D + ksceVfsUnlockMnt: 0xDC2D8BCE ksceVfsUnmount: 0x9C7E7B76 ksceVopChstat: 0x1974FA92 ksceVopClose: 0x40944C2E @@ -2740,8 +2742,6 @@ modules: ksceVopRmdir: 0x1D551105 ksceVopSync: 0x9CD96406 ksceVopWrite: 0x9A68378D - kvfsLockMnt: 0x6B3CA9F7 - kvfsUnlockMnt: 0xDC2D8BCE SceJpeg: nid: 0x00000044 libraries:
mangle: update slowness factors
@@ -836,16 +836,16 @@ void mangle_mangleContent(run_t* run, unsigned slow_factor) { } uint64_t changesCnt = run->global->mutate.mutationsPerRun; - /* Give it a good shake-up if it's a slow input */ + /* Give it a good shake-up, if it's a slow input */ switch (slow_factor) { - case 0 ... 2: + case 0 ... 5: changesCnt = util_rndGet(1, run->global->mutate.mutationsPerRun); break; - case 3 ... 4: + case 6 ... 10: changesCnt = (run->global->mutate.mutationsPerRun > 5) ? run->global->mutate.mutationsPerRun : 5; break; - case 5 ... 10: + case 11 ... 15: changesCnt = (run->global->mutate.mutationsPerRun > 10) ? run->global->mutate.mutationsPerRun : 10;
doc: fix review comment
## Problem -Only the plugin `dump` and `quickdump` are able to represent any KeySet +Only plugins like `dump` and `quickdump` are able to represent any KeySet (as they are designed to do so). Limitations of any other storage plugins are: - that not every structure of configuration is allowed.
travis: try and avoid autotools kicking in
@@ -14,8 +14,8 @@ matrix: compiler: gcc script: - # workaround git not retaining mtimes and bison/flex not being uptodate - - touch conffile.yy.c conffile.tab.c conffile.tab.h + # workaround git not retaining mtimes and bison/flex/auto not being uptodate + - touch conffile.yy.c conffile.tab.c conffile.tab.h configure Makefile.in - ./configure || cat config.log - make CFLAGS="-O3 -Wall -Werror -Wshadow -pipe" check
Update Luos version number for release 2.1.1
"name": "Luos", "keywords": "robus,network,microservice,luos,operating system,os,embedded,communication,service,ST", "description": "Luos turns your embedded system into services like microservices architecture does it in software.", - "version": "2.1.0", + "version": "2.1.1", "authors": { "name": "Luos", "url": "https://luos.io"
[software] Calculate stack based on linker script
@@ -53,8 +53,7 @@ _reset_vector: li x29, 0 li x30, 0 li x31, 0 - la sp, tcdm_start_address_reg // load stack top from peripheral register - lw sp, 0(sp) + la sp, __stack_start // load stack csrr a0, mhartid // get hart id #ifdef TOP4_STACK srli t0, a0, 4 // id / 16
Further optimizations of pake set_password implementation
@@ -274,19 +274,19 @@ psa_status_t psa_pake_set_password_key( psa_pake_operation_t *operation, if( ( usage & PSA_KEY_USAGE_DERIVE ) == 0 ) return( PSA_ERROR_NOT_PERMITTED ); + if( operation->password != NULL ) + return( PSA_ERROR_BAD_STATE ); + status = psa_get_and_lock_key_slot_with_policy( password, &slot, PSA_KEY_USAGE_DERIVE, PSA_ALG_JPAKE ); if( status != PSA_SUCCESS ) return( status ); - if( operation->password != NULL ) - return( PSA_ERROR_BAD_STATE ); - operation->password = mbedtls_calloc( 1, slot->key.bytes ); if( operation->password == NULL ) { - status = psa_unlock_key_slot( slot ); + psa_unlock_key_slot( slot ); return( PSA_ERROR_INSUFFICIENT_MEMORY ); } memcpy( operation->password, slot->key.data, slot->key.bytes ); @@ -388,14 +388,14 @@ static psa_status_t psa_pake_ecjpake_setup( psa_pake_operation_t *operation ) operation->password, operation->password_len ); - if( ret != 0 ) - return( mbedtls_ecjpake_to_psa_error( ret ) ); - mbedtls_platform_zeroize( operation->password, operation->password_len ); mbedtls_free( operation->password ); operation->password = NULL; operation->password_len = 0; + if( ret != 0 ) + return( mbedtls_ecjpake_to_psa_error( ret ) ); + operation->state = PSA_PAKE_STATE_READY; return( PSA_SUCCESS ); @@ -445,14 +445,8 @@ static psa_status_t psa_pake_output_internal( if( operation->state == PSA_PAKE_STATE_SETUP ) { status = psa_pake_ecjpake_setup( operation ); if( status != PSA_SUCCESS ) - { - mbedtls_platform_zeroize( operation->password, operation->password_len ); - mbedtls_free( operation->password ); - operation->password = NULL; - operation->password_len = 0; return( status ); } - } if( operation->state != PSA_PAKE_STATE_READY && operation->state != PSA_PAKE_OUTPUT_X1_X2 && @@ -659,14 +653,8 @@ static psa_status_t psa_pake_input_internal( { status = psa_pake_ecjpake_setup( operation ); if( status != PSA_SUCCESS ) - { - mbedtls_platform_zeroize( operation->password, operation->password_len ); - mbedtls_free( operation->password ); - operation->password = NULL; - operation->password_len = 0; return( status ); } - } if( operation->state != PSA_PAKE_STATE_READY && operation->state != PSA_PAKE_INPUT_X1_X2 &&
framework/st_things: Added missed-out mutex lock and unlock in ping. Shared variables such as 'mutex_ping_list' and 'mutex_state' weren't locked before access in check_ping_thread() and unset_mask respectively. This patch addresses the problem.
@@ -651,8 +651,10 @@ static void check_ping_thread(things_ping_s *ping) return; } + pthread_mutex_lock(&mutex_ping_list); if (list == NULL) { THINGS_LOG_V(TAG, "OICPing Module is not initialized."); + pthread_mutex_unlock(&mutex_ping_list); return; } @@ -674,6 +676,8 @@ static void check_ping_thread(things_ping_s *ping) } } + pthread_mutex_unlock(&mutex_ping_list); + THINGS_LOG_D(TAG, "Exit."); } @@ -747,6 +751,7 @@ static void unset_mask(things_ping_s *ping, ping_state_e state) return; } + pthread_mutex_lock(&ping->mutex_state); THINGS_LOG_D(TAG, "(B) bit_mask_state = 0x%X", ping->bit_mask_state); if (state != PING_ST_INIT) { ping->bit_mask_state &= (~state); @@ -754,6 +759,8 @@ static void unset_mask(things_ping_s *ping, ping_state_e state) ping->bit_mask_state = state; } THINGS_LOG_D(TAG, "(A) bit_mask_state = 0x%X", ping->bit_mask_state); + pthread_mutex_unlock(&ping->mutex_state); + THINGS_LOG_D(TAG, "Exit."); }
Updated code lite to properly add LD_LIBRARY_PATH is set if libdirs is set
end, -- source files are handled at the leaves onleaf = function(node, depth) - local excludesFromBuild = {} for cfg in project.eachconfig(prj) do local cfgname = codelite.cfgname(cfg) _p(depth, '<File Name="%s"/>', node.relpath) end end, - }, false, 1) + }, true) end function m.dependencies(prj) local pauseexec = iif(prj.kind == "ConsoleApp", "yes", "no") local isguiprogram = iif(prj.kind == "WindowedApp", "yes", "no") local isenabled = iif(cfg.flags.ExcludeFromBuild, "no", "yes") + local ldPath = '' + + for _, libdir in ipairs(cfg.libdirs) do + ldPath = ldPath .. ":" .. project.getrelative(cfg.project, libdir) + end + if ldPath == nil or ldPath == '' then _x(3, '<General OutputFile="%s" IntermediateDirectory="%s" Command="%s" CommandArguments="%s" UseSeparateDebugArgs="%s" DebugArguments="%s" WorkingDirectory="%s" PauseExecWhenProcTerminates="%s" IsGUIProgram="%s" IsEnabled="%s"/>', targetname, objdir, command, cmdargs, useseparatedebugargs, debugargs, workingdir, pauseexec, isguiprogram, isenabled) + else + ldPath = string.sub(ldPath, 2) + _x(3, '<General OutputFile="%s" IntermediateDirectory="%s" Command="LD_LIBRARY_PATH=%s %s" CommandArguments="%s" UseSeparateDebugArgs="%s" DebugArguments="%s" WorkingDirectory="%s" PauseExecWhenProcTerminates="%s" IsGUIProgram="%s" IsEnabled="%s"/>', + targetname, objdir, ldPath, command, cmdargs, useseparatedebugargs, debugargs, workingdir, pauseexec, isguiprogram, isenabled) + end end function m.environment(cfg)
ACRN:DM: Fix the bug introduced by Fix the bug introduced by There had a typo that added the "&" by mistake. Acked-by: Wang, Yu1
@@ -1817,7 +1817,7 @@ pci_xhci_insert_event(struct pci_xhci_vdev *xdev, int erdp_idx; rts = &xdev->rtsregs; - if (&rts->erstba_p == NULL) { + if (rts->erstba_p == NULL) { UPRINTF(LFTL, "Invalid Event Ring Segment Table base address!\r\n"); return -EINVAL; }
Defend against writing beyond the end of the payload in _libssh2_transport_read().
@@ -478,8 +478,12 @@ int _libssh2_transport_read(LIBSSH2_SESSION * session) /* copy the data from index 5 to the end of the blocksize from the temporary buffer to the start of the decrypted buffer */ + if (blocksize - 5 <= total_num) { memcpy(p->wptr, &block[5], blocksize - 5); p->wptr += blocksize - 5; /* advance write pointer */ + } else { + return LIBSSH2_ERROR_OUT_OF_BOUNDARY; + } } /* init the data_num field to the number of bytes of @@ -555,7 +559,13 @@ int _libssh2_transport_read(LIBSSH2_SESSION * session) /* if there are bytes to copy that aren't decrypted, simply copy them as-is to the target buffer */ if(numbytes > 0) { + + if (numbytes <= total_num - (p->wptr - p->payload)) { memcpy(p->wptr, &p->buf[p->readidx], numbytes); + } + else { + return LIBSSH2_ERROR_OUT_OF_BOUNDARY; + } /* advance the read pointer */ p->readidx += numbytes;
Fix about window debug version, Update about window text
* about dialog * * Copyright (C) 2010-2016 wj32 + * Copyright (C) 2017 dmex * * This file is part of Process Hacker. * @@ -48,7 +49,7 @@ static INT_PTR CALLBACK PhpAboutDlgProc( PhCenterWindow(hwndDlg, GetParent(hwndDlg)); -#if (PHAPP_VERSION_REVISION != 0) +#if (PHAPP_VERSION_REVISION != 0x0D06F00D) appName = PhFormatString( L"Process Hacker %u.%u.%u", PHAPP_VERSION_MAJOR, @@ -67,12 +68,11 @@ static INT_PTR CALLBACK PhpAboutDlgProc( PhDereferenceObject(appName); SetDlgItemText(hwndDlg, IDC_CREDITS, - L" Installer by XhmikosR\n" L"Thanks to:\n" - L" dmex\n" - L" Donors - thank you for your support!\n" - L" <a href=\"http://forum.sysinternals.com\">Sysinternals Forums</a>\n" - L" <a href=\"http://www.reactos.org\">ReactOS</a>\n" + L" <a href=\"https://github.com/wj32\">wj32</a> - Wen Jia Liu\n" + L" <a href=\"https://github.com/dmex\">dmex</a> - Steven G\n" + L" <a href=\"https://github.com/xhmikosr\">XhmikosR</a>\n" + L" Donors - thank you for your support!\n\n" L"Process Hacker uses the following components:\n" L" <a href=\"http://www.minixml.org\">Mini-XML</a> by Michael Sweet\n" L" <a href=\"http://www.pcre.org\">PCRE</a>\n"
workflows/manually_compile_check_image: refactor with job matrix
@@ -5,79 +5,14 @@ on: [workflow_dispatch] jobs: generate-centos-image: - # GitHub Actions doesn't have CentOS VM provided - runs-on: ubuntu-18.04 - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - # Because "Build and push" step `context` field can't be subdir, - # we need to copy files needed by dockerfile to root dir of the project - - name: Copy context for docker build - run: | - cp -r .github/workflows/docker . - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: . - file: ./docker/Dockerfile-compilation-testing-centos8.2 - platforms: linux/amd64 - push: true - tags: runetest/compilation-testing:centos8.2 + # Run all steps in the compilation testing containers + strategy: + matrix: + os: [ubuntu18.04, centos8.2, alinux2] - generate-ubuntu-image: # GitHub Actions doesn't have CentOS VM provided runs-on: ubuntu-18.04 - steps: - - name: Checkout code - uses: actions/checkout@v2 - - # Because "Build and push" step `context` field can't be subdir, - # we need to copy files needed by dockerfile to root dir of the project - - name: Copy context for docker build - run: | - cp -r .github/workflows/docker . - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: . - file: ./docker/Dockerfile-compilation-testing-ubuntu18.04 - platforms: linux/amd64 - push: true - tags: runetest/compilation-testing:ubuntu18.04 - - generate-alinux-image: - # Run on self-hosted runner on alibaba cloud - runs-on: [self-hosted, SGX2] - steps: - name: Checkout code uses: actions/checkout@v2 @@ -98,7 +33,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./docker/Dockerfile-compilation-testing-alinux2 + file: ./docker/Dockerfile-compilation-testing-${{ matrix.os }} platforms: linux/amd64 push: true - tags: runetest/compilation-testing:alinux2 + tags: runetest/compilation-testing:${{ matrix.os }}
arm/imx6ull: fixed rebooting after watchdog timeout
@@ -199,26 +199,6 @@ dcd_ddr: .word SWAP(0x82180000) .word SWAP(0x021b0890) .word SWAP(0x00400000) - .word SWAP(0x021b001c) - .word SWAP(0x02008032) - .word SWAP(0x021b001c) - .word SWAP(0x00008033) - .word SWAP(0x021b001c) - .word SWAP(0x00048031) - .word SWAP(0x021b001c) - .word SWAP(0x15208030) - .word SWAP(0x021b001c) - .word SWAP(0x04008040) - .word SWAP(0x021b0020) - .word SWAP(0x00000800) - .word SWAP(0x021b0818) - .word SWAP(0x00000227) - .word SWAP(0x021b0004) - .word SWAP(0x0002552d) - .word SWAP(0x021b0404) - .word SWAP(0x00011006) - .word SWAP(0x021b001c) - .word SWAP(0x00000000) dcd_end: @@ -235,6 +215,41 @@ _cpy4: _start: cpsid aif, #SYS_MODE + /* check if reset was caused by watch dog */ + ldr r1, =0x20d8008 + ldr r0, [r1] + tst r0, #0x10 + /* skip mdscr register config */ + bne mdscr_skip + ldr r1, =0x21b001c + ldr r0, =0x2008032 + str r0, [r1] + ldr r0, =0x8033 + str r0, [r1] + ldr r0, =0x48031 + str r0, [r1] + ldr r0, =0x15208030 + str r0, [r1] + ldr r0, =0x4008040 + str r0, [r1] + ldr r1, =0x21b0020 + ldr r0, =0x800 + str r0, [r1] + +mdscr_skip: + ldr r1, =0x21b0818 + ldr r0, =0x227 + str r0, [r1] + ldr r1, =0x21b0004 + ldr r0, =0x2552d + str r0, [r1] + ldr r1, =0x21b0404 + ldr r0, =0x11006 + str r0, [r1] + ldr r1, =0x21b001c + ldr r0, =0x0 + str r0, [r1] + /* Enable PMU cycle counter */ mrc p15, 0, r0, c9, c12, 0 orr r0, #0x7
profile: add smart audio define
@@ -206,8 +206,16 @@ const profile_t default_profile = { }, .serial = { +#ifdef RX_USART .rx = RX_USART, - .smart_audio = -1, +#else + .rx = USART_PORT_INVALID, +#endif +#ifdef SMART_AUDIO_USART + .smart_audio = SMART_AUDIO_USART, +#else + .smart_audio = USART_PORT_INVALID, +#endif }, .rate = {
Avoid pointer casting by slicing. It's a bit cleaner to do it this way.
@@ -16,14 +16,13 @@ const cstrconv = {buf } const cstrconvp = {p - var i, base + var len - i = 0 - base = (p : intptr) - while (base + i : byte#)# != 0 - i++ + len = 1 + while p[:len][len -1] != 0 + len++ ;; - -> p[:i] + -> p[:len-1] } const cstrlen = {buf
remove nokogiri gem dependency from gem build time
require 'zip' require 'singleton' -require 'nokogiri' module AndroidTools @@ -249,6 +248,7 @@ class MavenDepsExtractor end def extract_packages + require 'nokogiri' packages = [] @manifests.each do |m| doc = File.open(m) { |f| Nokogiri::XML(f) }
stream reuse, test with connection drops.
@@ -213,6 +213,24 @@ for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do fi done +# dropconn.drop.net make the server drop the connection. +echo "> query a11.more.net a12.more.net dropconn.drop.net a14.more.net a15.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a11.more.net A IN a12.more.net A IN dropconn.drop.net A IN a14.more.net A IN a15.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +# cannot really check outfile, because it may or may not have answers depending +# on how fast the other server responds or the drop happens, but there are +# a bunch of connection drops, whilst resolving the other queries. + + # timeouts at the end. (so that the server is not marked as failed for # the other tests). echo "> query q1.drop.net."
Ignore deleted files in rsync to test/repo. Deleted files are showing up in git ls-files (added 57d78092) but they don't actually exist on disk. If there is someway to exclude deleted files from ls-files then I can't find it, so just tell rsync to ignore missing files.
@@ -388,8 +388,8 @@ eval trim( executeTest( "git -C ${strBackRestBase} ls-files -c --others --exclude-standard |" . - " rsync -rtW --out-format=\"\%n\" --delete --exclude=repo.manifest ${strBackRestBase}/" . - " --files-from=- ${strRepoCachePath}")))); + " rsync -rtW --out-format=\"\%n\" --delete --ignore-missing-args --exclude=repo.manifest" . + " ${strBackRestBase}/ --files-from=- ${strRepoCachePath}")))); if (@stryModifiedList > 0) {
closed \tt bracket
@@ -65,7 +65,7 @@ This note describes how to install {\tt CCL} (Section \ref{sec:install}), its fu \section{Installation} \label{sec:install} \subsection{Dependencies} -{\tt CCL} requires the GNU Scientific Library \tt{GSL}\footnote{\url{https://www.gnu.org/software/gsl/}}, {\tt GSL-2.1} or higher. +{\tt CCL} requires the GNU Scientific Library {\ttGSL}\footnote{\url{https://www.gnu.org/software/gsl/}}, {\tt GSL-2.1} or higher. \subsection{Installation Procedure} {\tt CCL} can be installed through an {\tt autotools}-generated configuration file. UNIX users should be familiar with the process: navigate to the directory containing the library and type \begin{verbatim}
platformio build fix
@@ -314,7 +314,7 @@ M3Result PreserveRegisterIfOccupied (IM3Compilation o, u8 i_registerType) u8 type = GetStackBottomType (o, stackIndex); // and point to a exec slot - u16 slot; + u16 slot = c_slotUnused; _ (AllocateSlots (o, & slot, type)); o->wasmStack [stackIndex] = slot;
Passing correct arg to cn_tree_max_depth() to avoid assert cn_tree_max_depth() takes fanout as arg. Passing log base 2 of fanout can lead to an assert.
@@ -1201,7 +1201,7 @@ cn_open( " kb %lu%c/%lu vb %lu%c/%lu %s%s%s%s%s%s", cn->cn_kvdb_alias, cn->cn_kvsname, (ulong)cnid, cn->cp->fanout, cn->cp->pfx_len, cn->cp->pfx_pivot, - ctx.ckmk_node_level_max, cn_tree_max_depth(ilog2(cn->cp->fanout)), + ctx.ckmk_node_level_max, cn_tree_max_depth(cn->cp->fanout), ksz >> (kshift * 10), *kszsuf, kcnt, vsz >> (vshift * 10), *vszsuf, vcnt, rp->mclass_policy,
docs: update description of bcc python BPF()
@@ -1449,6 +1449,7 @@ The `debug` flags control debug output, and can be or'ed together: - `DEBUG_PREPROCESSOR = 0x4` pre-processor result - `DEBUG_SOURCE = 0x8` ASM instructions embedded with source - `DEBUG_BPF_REGISTER_STATE = 0x10` register state on all instructions in addition to DEBUG_BPF +- `DEBUG_BTF = 0x20` print the messages from the `libbpf` library. Examples:
Configure, build.info: make it possible to use variables in indexes That will make it possible to assign different goals for translation units depending on need.
@@ -1742,11 +1742,19 @@ if ($builder eq "unified") { my $value = ''; my $value_rest = shift; + if ($ENV{CONFIGURE_DEBUG_VARIABLE_EXPAND}) { + print STDERR + "DEBUG[\$expand_variables] Parsed '$value_rest' into:\n" + } while ($value_rest =~ /(?<!\\)${variable_re}/) { $value .= $`; $value .= $variables{$1}; $value_rest = $'; } + if ($ENV{CONFIGURE_DEBUG_VARIABLE_EXPAND}) { + print STDERR + "DEBUG[\$expand_variables] ... '$value$value_rest'\n"; + } return $value . $value_rest; }; @@ -1899,26 +1907,31 @@ if ($builder eq "unified") { }, qr/^\s*ORDINALS\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/, - => sub { push @{$ordinals{$1}}, tokenize($expand_variables->($2)) + => sub { push @{$ordinals{$expand_variables->($1)}}, + tokenize($expand_variables->($2)) if !@skip || $skip[$#skip] > 0 }, qr/^\s*SOURCE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/ - => sub { push @{$sources{$1}}, tokenize($expand_variables->($2)) + => sub { push @{$sources{$expand_variables->($1)}}, + tokenize($expand_variables->($2)) if !@skip || $skip[$#skip] > 0 }, qr/^\s*SHARED_SOURCE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/ - => sub { push @{$shared_sources{$1}}, + => sub { push @{$shared_sources{$expand_variables->($1)}}, tokenize($expand_variables->($2)) if !@skip || $skip[$#skip] > 0 }, qr/^\s*INCLUDE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/ - => sub { push @{$includes{$1}}, tokenize($expand_variables->($2)) + => sub { push @{$includes{$expand_variables->($1)}}, + tokenize($expand_variables->($2)) if !@skip || $skip[$#skip] > 0 }, - qr/^\s*DEFINE\[((?:\\.|[^\\\]])*)\]\s*=\s*(.*)\s*$/ - => sub { push @{$defines{$1}}, tokenize($expand_variables->($2)) + qr/^\s*DEFINE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/ + => sub { push @{$defines{$expand_variables->($1)}}, + tokenize($expand_variables->($2)) if !@skip || $skip[$#skip] > 0 }, qr/^\s*DEPEND\[((?:\\.|[^\\\]])*)\]\s*=\s*(.*)\s*$/ - => sub { push @{$depends{$1}}, tokenize($expand_variables->($2)) + => sub { push @{$depends{$expand_variables->($1)}}, + tokenize($expand_variables->($2)) if !@skip || $skip[$#skip] > 0 }, qr/^\s*GENERATE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/ - => sub { push @{$generate{$1}}, $2 + => sub { push @{$generate{$expand_variables->($1)}}, $2 if !@skip || $skip[$#skip] > 0 }, qr/^\s*(?:#.*)?$/ => sub { }, "OTHERWISE" => sub { die "Something wrong with this line:\n$_\nat $sourced/$f" },
util: support ec_parse_panicinfo to parse RV32i BRANCH=none TEST=emerge-asurada ec-utils && cros deploy $DUT ec-utils && /usr/sbin/ec_parse_panicinfo < x.eccrash
@@ -94,6 +94,35 @@ static int parse_panic_info_nds32(const struct panic_data *pdata) return 0; } +static int parse_panic_info_rv32i(const struct panic_data *pdata) +{ + uint32_t *regs, mcause, mepc; + + regs = (uint32_t *)pdata->riscv.regs; + mcause = pdata->riscv.mcause; + mepc = pdata->riscv.mepc; + + printf("=== EXCEPTION: MCAUSE=%x ===\n", mcause); + printf("S11 %08x S10 %08x S9 %08x S8 %08x\n", + regs[0], regs[1], regs[2], regs[3]); + printf("S7 %08x S6 %08x S5 %08x S4 %08x\n", + regs[4], regs[5], regs[6], regs[7]); + printf("S3 %08x S2 %08x S1 %08x S0 %08x\n", + regs[8], regs[9], regs[10], regs[11]); + printf("T6 %08x T5 %08x T4 %08x T3 %08x\n", + regs[12], regs[13], regs[14], regs[15]); + printf("T2 %08x T1 %08x T0 %08x A7 %08x\n", + regs[16], regs[17], regs[18], regs[19]); + printf("A6 %08x A5 %08x A4 %08x A3 %08x\n", + regs[20], regs[21], regs[22], regs[23]); + printf("A2 %08x A1 %08x A0 %08x TP %08x\n", + regs[24], regs[25], regs[26], regs[27]); + printf("GP %08x RA %08x SP %08x MEPC %08x\n", + regs[28], regs[29], regs[30], mepc); + + return 0; +} + int parse_panic_info(const struct panic_data *pdata) { /* @@ -118,6 +147,8 @@ int parse_panic_info(const struct panic_data *pdata) return parse_panic_info_cm(pdata); case PANIC_ARCH_NDS32_N8: return parse_panic_info_nds32(pdata); + case PANIC_ARCH_RISCV_RV32I: + return parse_panic_info_rv32i(pdata); default: fprintf(stderr, "Unknown architecture (%d).\n", pdata->arch); break;
Disable legacy time cluster handling
@@ -1242,7 +1242,7 @@ void DeRestPluginPrivate::apsdeDataIndication(const deCONZ::ApsDataIndication &i break; case TIME_CLUSTER_ID: - handleTimeClusterIndication(ind, zclFrame); + if (!DEV_TestStrict()) { handleTimeClusterIndication(ind, zclFrame); } break; case WINDOW_COVERING_CLUSTER_ID: @@ -4304,6 +4304,8 @@ void DeRestPluginPrivate::checkSensorNodeReachable(Sensor *sensor, const deCONZ: updated = true; } + if (!DEV_TestStrict()) + { if (sensor->type() == QLatin1String("ZHATime") && !sensor->mustRead(READ_TIME)) { std::vector<quint16>::const_iterator ci = sensor->fingerPrint().inClusters.begin(); @@ -4325,6 +4327,7 @@ void DeRestPluginPrivate::checkSensorNodeReachable(Sensor *sensor, const deCONZ: } } } + } else { if (item && item->toBool()) @@ -8126,6 +8129,8 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const SensorFi } } } + if (!DEV_TestStrict()) + { else if (*ci == TIME_CLUSTER_ID) { if (sensorNode.modelId() == QLatin1String("Thermostat")) // eCozy @@ -8139,6 +8144,7 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const SensorFi } } } + } sensorNode.setNeedSaveDatabase(true); @@ -9877,6 +9883,8 @@ void DeRestPluginPrivate::updateSensorNode(const deCONZ::NodeEvent &event) bool updated = false; const QDateTime epoch = QDateTime(QDate(2000, 1, 1), QTime(0, 0), Qt::UTC); + if (!DEV_TestStrict()) + { for (;ia != enda; ++ia) { if (ia->id() == 0x0000) // Time (utc, in UTC) @@ -9939,6 +9947,7 @@ void DeRestPluginPrivate::updateSensorNode(const deCONZ::NodeEvent &event) } } } + } if (updated) { i->updateStateTimestamp(); @@ -11078,6 +11087,8 @@ bool DeRestPluginPrivate::processZclAttributes(Sensor *sensorNode) } } + if (!DEV_TestStrict()) + { if (sensorNode->mustRead(READ_TIME) && tNow > sensorNode->nextReadTime(READ_TIME)) { DBG_Printf(DBG_INFO, " >>> %s sensor %s: exec READ_TIME\n", qPrintable(sensorNode->type()), qPrintable(sensorNode->name())); @@ -11110,6 +11121,7 @@ bool DeRestPluginPrivate::processZclAttributes(Sensor *sensorNode) processed++; } } + } return (processed > 0); } @@ -16792,6 +16804,8 @@ void DeRestPlugin::idleTimerFired() } } + if (!DEV_TestStrict()) + { if (*ci == TIME_CLUSTER_ID) { if (!sensorNode->mustRead(READ_TIME)) @@ -16808,7 +16822,7 @@ void DeRestPlugin::idleTimerFired() } } } - + } } DBG_Printf(DBG_INFO_L2, "Force read attributes for %s SensorNode %s\n", qPrintable(sensorNode->type()), qPrintable(sensorNode->name()));
when exceed max reass, frag packet can't get reass. adding bihash,it can rewrite new hash value. so need to delete hash after compare hash value.
@@ -228,7 +228,7 @@ nat_ip4_reass_find_or_create (ip4_address_t src, ip4_address_t dst, dlist_elt_t *oldest_elt, *elt; dlist_elt_t *per_reass_list_head_elt; u32 oldest_index, elt_index; - clib_bihash_kv_16_8_t kv; + clib_bihash_kv_16_8_t kv, value; k.src.as_u32 = src.as_u32; k.dst.as_u32 = dst.as_u32; @@ -273,13 +273,19 @@ nat_ip4_reass_find_or_create (ip4_address_t src, ip4_address_t dst, clib_dlist_addtail (srm->ip4_reass_lru_list_pool, srm->ip4_reass_head_index, oldest_index); - kv.key[0] = k.as_u64[0]; - kv.key[1] = k.as_u64[1]; + kv.key[0] = reass->key.as_u64[0]; + kv.key[1] = reass->key.as_u64[1]; + if (!clib_bihash_search_16_8 (&srm->ip4_reass_hash, &kv, &value)) + { + if (value.value == (reass - srm->ip4_reass_pool)) + { if (clib_bihash_add_del_16_8 (&srm->ip4_reass_hash, &kv, 0)) { reass = 0; goto unlock; } + } + } nat_ip4_reass_get_frags_inline (reass, bi_to_drop); }
config_format: use 'compat' interface
#include <fluent-bit/flb_log.h> #include <fluent-bit/flb_mem.h> #include <fluent-bit/flb_kv.h> +#include <fluent-bit/flb_compat.h> + #include <monkey/mk_core.h> #include <ctype.h> #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> - #ifndef _MSC_VER #include <glob.h> #endif
Fix inconsistent "defined()" operator usage which causes compile warnings if undefined.
#include <ngtcp2/ngtcp2.h> -#if defined HAVE_BSWAP_64 || HAVE_DECL_BSWAP_64 +#if defined(HAVE_BSWAP_64) || (defined(HAVE_DECL_BSWAP_64) && HAVE_DECL_BSWAP_64 > 0) # define ngtcp2_bswap64 bswap_64 #else /* !HAVE_BSWAP_64 */ # define ngtcp2_bswap64(N) \ ((uint64_t)(ntohl((uint32_t)(N))) << 32 | ntohl((uint32_t)((N) >> 32))) #endif /* !HAVE_BSWAP_64 */ -#if defined HAVE_BE64TOH || HAVE_DECL_BE64TOH +#if defined(HAVE_BE64TOH) || (defined(HAVE_DECL_BE64TOH) && HAVE_DECL_BE64TOH > 0) # define ngtcp2_ntohl64(N) be64toh(N) # define ngtcp2_htonl64(N) htobe64(N) #else /* !HAVE_BE64TOH */ -# if defined WORDS_BIGENDIAN +# if defined(WORDS_BIGENDIAN) # define ngtcp2_ntohl64(N) (N) # define ngtcp2_htonl64(N) (N) # else /* !WORDS_BIGENDIAN */
After parsing load colors make sure it has a size of 3
@@ -162,6 +162,10 @@ parse_load_color(const char *str) trim(token); load_colors.push_back(std::stoi(token, NULL, 16)); } + while (load_colors.size() != 3) { + load_colors.push_back(std::stoi("FFFFFF" , NULL, 16)); + } + return load_colors; }
servo: definition for malloc on stm32 ports For now, this is to ensure that the stm32 builds continue to compile while developing for EV3.
#include "lib/utils/pyexec.h" #include "lib/utils/interrupt_char.h" +// FIXME: Decide whether or not to pre-allocate +// memory for logging instead or just disable +// logging altogether on some constrained ports. +void *malloc(size_t n) { + return m_malloc(n); +} +void free(void *p) { + m_free(p); +} + static char *stack_top; #if MICROPY_ENABLE_GC static char heap[PYBRICKS_HEAP_KB * 1024];
Define QUIC transport error code using macro QUIC transport error code is 62-bit value and ANSI C does not like it in enum.
@@ -277,25 +277,20 @@ typedef enum ngtcp2_pkt_type { NGTCP2_PKT_SHORT = 0x70 } ngtcp2_pkt_type; -#if defined(__cplusplus) && __cplusplus >= 201103L -typedef enum ngtcp2_transport_error : int { -#else -typedef enum ngtcp2_transport_error { -#endif - NGTCP2_NO_ERROR = 0x0u, - NGTCP2_INTERNAL_ERROR = 0x1u, - NGTCP2_SERVER_BUSY = 0x2u, - NGTCP2_FLOW_CONTROL_ERROR = 0x3u, - NGTCP2_STREAM_LIMIT_ERROR = 0x4u, - NGTCP2_STREAM_STATE_ERROR = 0x5u, - NGTCP2_FINAL_SIZE_ERROR = 0x6u, - NGTCP2_FRAME_ENCODING_ERROR = 0x7u, - NGTCP2_TRANSPORT_PARAMETER_ERROR = 0x8u, - NGTCP2_PROTOCOL_VIOLATION = 0xau, - NGTCP2_INVALID_MIGRATION = 0xcu, - NGTCP2_CRYPTO_BUFFER_EXCEEDED = 0xdu, - NGTCP2_CRYPTO_ERROR = 0x100u -} ngtcp2_transport_error; +/* QUIC transport error code. */ +#define NGTCP2_NO_ERROR 0x0u +#define NGTCP2_INTERNAL_ERROR 0x1u +#define NGTCP2_SERVER_BUSY 0x2u +#define NGTCP2_FLOW_CONTROL_ERROR 0x3u +#define NGTCP2_STREAM_LIMIT_ERROR 0x4u +#define NGTCP2_STREAM_STATE_ERROR 0x5u +#define NGTCP2_FINAL_SIZE_ERROR 0x6u +#define NGTCP2_FRAME_ENCODING_ERROR 0x7u +#define NGTCP2_TRANSPORT_PARAMETER_ERROR 0x8u +#define NGTCP2_PROTOCOL_VIOLATION 0xau +#define NGTCP2_INVALID_MIGRATION 0xcu +#define NGTCP2_CRYPTO_BUFFER_EXCEEDED 0xdu +#define NGTCP2_CRYPTO_ERROR 0x100u #if defined(__cplusplus) && __cplusplus >= 201103L typedef enum ngtcp2_path_validation_result : int {
allowed pasting palette < 16 colors
@@ -612,19 +612,15 @@ static void removeWhiteSpaces(char* str) } bool fromClipboard(void* data, s32 size, bool flip, bool remove_white_spaces) -{ - if(data) { if(tic_sys_clipboard_has()) { char* clipboard = tic_sys_clipboard_get(); - if(clipboard) - { if (remove_white_spaces) removeWhiteSpaces(clipboard); - bool valid = strlen(clipboard) == size * 2; + bool valid = strlen(clipboard) <= size * 2; if(valid) tic_tool_str2buf(clipboard, (s32)strlen(clipboard), data, flip); @@ -632,8 +628,6 @@ bool fromClipboard(void* data, s32 size, bool flip, bool remove_white_spaces) return valid; } - } - } return false; }
PKG_USING_TFM: Use TFM package macro instead RT_USING_TFM was duplicate macro. Remove it.
* 2010-05-02 Aozima update CMSIS to 130 * 2017-08-02 XiaoYang porting to LPC54608 bsp * 2019-08-05 Magicoe porting to LPC55S69-EVK bsp - * 2020-01-01 Karl Add RT_USING_TFM support + * 2020-01-01 Karl Add PKG_USING_TFM support */ #include <rthw.h> @@ -59,7 +59,7 @@ void rt_hw_board_init() SCB->VTOR = (0x10000000 & NVIC_VTOR_MASK); #else /* VECT_TAB_FLASH */ -#ifdef RT_USING_TFM +#ifdef PKG_USING_TFM /* Set the Vector Table base location at 0x00020000 when RTT with TF-M*/ SCB->VTOR = (0x00020000 & NVIC_VTOR_MASK); #else @@ -68,7 +68,7 @@ void rt_hw_board_init() #endif #endif -#ifndef RT_USING_TFM +#ifndef PKG_USING_TFM /* This init has finished in secure side of TF-M */ BOARD_BootClockPLL150M(); #endif
interface: do not wait for deletion before navigation Fixes urbit/landscape#706
@@ -24,9 +24,9 @@ export function DeleteGroup(props: { return; } if(props.owner) { - await props.api.groups.deleteGroup(ship, name); + props.api.groups.deleteGroup(ship, name); } else { - await props.api.groups.leaveGroup(ship, name); + props.api.groups.leaveGroup(ship, name); } history.push('/'); };
deterministic archives
@@ -41,7 +41,15 @@ ifeq ($(BUILDTYPE), MacOSX) MACPORTS?=1 endif -ARFLAGS ?= r + +ifeq ($(BUILDTYPE), Linux) + # as the defaults changed on most Linux distributions + # explicitly specify non-deterministic archives to not break make + ARFLAGS ?= rsU +else + ARFLAGS ?= rs +endif + # Paths
Force tile sizes to be less than INT_MAX bytes, in line with the maximum dimensions of data windows
@@ -902,7 +902,7 @@ Header::sanityCheck (bool isTiled, bool isMultipartFile) const const TileDescription &tileDesc = tileDescription(); - if (tileDesc.xSize <= 0 || tileDesc.ySize <= 0) + if (tileDesc.xSize <= 0 || tileDesc.ySize <= 0 || tileDesc.xSize > INT_MAX || tileDesc.ySize > INT_MAX ) throw IEX_NAMESPACE::ArgExc ("Invalid tile size in image header."); if (maxTileWidth > 0 &&
Fix sslapitest when compiled with no-tls1_2
@@ -477,6 +477,7 @@ end: } #endif +#ifndef OPENSSL_NO_TLS1_2 static int full_early_callback(SSL *s, int *al, void *arg) { int *ctr = arg; @@ -559,6 +560,7 @@ end: return testresult; } +#endif static int execute_test_large_message(const SSL_METHOD *smeth, const SSL_METHOD *cmeth, int read_ahead) @@ -1568,7 +1570,9 @@ int test_main(int argc, char *argv[]) #ifndef OPENSSL_NO_TLS1_3 ADD_TEST(test_keylog_no_master_key); #endif +#ifndef OPENSSL_NO_TLS1_2 ADD_TEST(test_early_cb); +#endif testresult = run_tests(argv[0]);
Changed "path" to "directory" in configure summary. The "directory" is more specific term, similar to "file".
@@ -7,10 +7,11 @@ cat << END Configuration summary: - unit bin path: "$NXT_BINDIR" - unit sbin path: "$NXT_SBINDIR" - unit modules path: "$NXT_MODULES" - unit state path: "$NXT_STATE" + unit bin directory: "$NXT_BINDIR" + unit sbin directory: "$NXT_SBINDIR" + unit modules directory: "$NXT_MODULES" + unit state directory: "$NXT_STATE" + unit pid file: "$NXT_PID" unit log file: "$NXT_LOG"
smatrix: removing liquid.internal.h include in example
-// -// smatrix_example.c -// - +// test sparse matrix operations #include <stdlib.h> #include <stdio.h> #include <getopt.h> #include <math.h> - -#include "liquid.internal.h" +#include "liquid.h" int main(int argc, char*argv[]) {
sixtop example: remove obsolete z1 configuration
/************* Other system configuration **************/ /*******************************************************/ -#if CONTIKI_TARGET_Z1 -/* Save some space to fit the limited RAM of the z1 */ -#define UIP_CONF_TCP 0 -#define QUEUEBUF_CONF_NUM 2 -#define NETSTACK_MAX_ROUTE_ENTRIES 2 -#define NBR_TABLE_CONF_MAX_NEIGHBORS 2 -#define UIP_CONF_ND6_SEND_NA 0 -#define SICSLOWPAN_CONF_FRAG 0 - -#if WITH_SECURITY -/* Note: on sky or z1 in cooja, crypto operations are done in S/W and - * cannot be accommodated in normal slots. Use 65ms slots instead, and - * a very short 6TiSCH minimal schedule length */ -#define TSCH_CONF_DEFAULT_TIMESLOT_LENGTH 65000 -#define TSCH_SCHEDULE_CONF_DEFAULT_LENGTH 2 -#endif /* WITH_SECURITY */ - -#endif /* CONTIKI_TARGET_Z1 */ - #if CONTIKI_TARGET_CC2538DK || CONTIKI_TARGET_ZOUL || \ CONTIKI_TARGET_OPENMOTE_CC2538 #define TSCH_CONF_HW_FRAME_FILTERING 0
Fix binary backward compatibility to celix 2.1
@@ -302,7 +302,7 @@ void celix_dependencyManager_destroyInfos(celix_dependency_manager_t *manager, c celix_status_t dependencyManager_create(bundle_context_pt context, celix_dependency_manager_t **out) { celix_status_t status = CELIX_SUCCESS; - celix_dependency_manager_t *manager = celix_private_dependencyManager_create(context); + celix_dependency_manager_t *manager = celix_bundleContext_getDependencyManager(context); if (manager != NULL) { *out = manager; } else { @@ -312,7 +312,6 @@ celix_status_t dependencyManager_create(bundle_context_pt context, celix_depende } void dependencyManager_destroy(celix_dependency_manager_t *manager) { - celix_private_dependencyManager_destroy(manager); } celix_status_t dependencyManager_add(celix_dependency_manager_t *manager, celix_dm_component_t *component) {
vere: account for scry callback bugfix The addition of ~ was, indeed, in error. See also
@@ -645,7 +645,7 @@ static void _ames_lane_scry_cb(void* vod_p, u3_noun nun) { u3_panc* pac_u = vod_p; - u3_weak las = u3r_at(15, nun); //TODO why [~ %noun ~ lane] + u3_weak las = u3r_at(7, nun); // if scry fails, remember we can't scry, and just inject the packet // @@ -1065,7 +1065,7 @@ static void _ames_prot_scry_cb(void* vod_p, u3_noun nun) { u3_ames* sam_u = vod_p; - u3_weak ver = u3r_at(15, nun); //TODO nun is [~ %noun ~ x] now? + u3_weak ver = u3r_at(7, nun); if (u3_none == ver) { // assume protocol version 0
provisioning/warewulf-vnfs: include langpack for centos8; otherwise users will see setlocale warnings
zlib tar less gzip which util-linux openssh-clients openssh-server dhclient pciutils vim-minimal shadow-utils - strace cronie crontabs cpio wget redhat-release" -+ strace cronie crontabs cpio wget redhat-release hostname grub2-common" ++ strace cronie crontabs cpio wget redhat-release hostname grub2-common glibc-langpack-en" # vim:filetype=sh:syntax=sh:expandtab:ts=4:sw=4:
hardcode number of threads to 8 for ppc and add a backup method to get AOMP_PROC.
@@ -33,6 +33,9 @@ CUDABIN=${CUDABIN:-$CUDA/bin} AOMP_CMAKE=${AOMP_CMAKE:-cmake} AOMP_PROC=`uname -p` +if [ "$AOMP_PROC" == "unknown" ] ; then + AOMP_PROC=`uname -a | awk '{print $(NF-1)}'` +fi AOMP_STANDALONE_BUILD=${AOMP_STANDALONE_BUILD:-1} @@ -80,7 +83,10 @@ export GFXLIST NUM_THREADS= if [ ! -z `which "getconf"` ]; then NUM_THREADS=$(`which "getconf"` _NPROCESSORS_ONLN) - if [ "$AOMP_PROC" == "ppc64le" ] || [ "$AOMP_PROC" == "aarch64" ] ; then + if [ "$AOMP_PROC" == "ppc64le" ] ; then + NUM_THREADS=8 + fi + if [ "$AOMP_PROC" == "aarch64" ] ; then NUM_THREADS=$(( NUM_THREADS / 4)) fi fi
audio: add lock in audio_send_digit
@@ -2052,8 +2052,10 @@ int audio_send_digit(struct audio *a, char key) else if (a->tx.cur_key && a->tx.cur_key != KEYCODE_REL) { /* Key release */ info("audio: send DTMF digit end: '%c'\n", a->tx.cur_key); + lock_write_get(a->tx.lock); err = telev_send(a->telev, telev_digit2code(a->tx.cur_key), true); + lock_rel(a->tx.lock); } a->tx.cur_key = key;
Add note to comment for int64 typedef.
@@ -27,7 +27,7 @@ should be created. See the CheckPoint type difference between 9.5 and 9.6 as an Types from src/include/c.h ***********************************************************************************************************************************/ -// int64 type +// int64 type. The definition in c.h is more complicated but here we can rely on stdint.h for the correct type. // --------------------------------------------------------------------------------------------------------------------------------- #if PG_VERSION > PG_VERSION_MAX
Check if LED4 and CAN are enabled in main.
@@ -446,7 +446,9 @@ int main(void) __enable_irq(); soft_reset: + #if defined(MICROPY_HW_LED4) led_state(LED_IR, 0); + #endif led_state(LED_RED, 1); led_state(LED_GREEN, 1); led_state(LED_BLUE, 1); @@ -475,7 +477,9 @@ soft_reset: pin_init0(); extint_init0(); timer_init0(); + #if MICROPY_HW_ENABLE_CAN can_init0(); + #endif i2c_init0(); spi_init0(); uart_init0();
net socket documentation clarification in FAQ
@@ -195,12 +195,15 @@ All Lua callbacks are called by C wrapper functions within the NodeMCU libraries * If you are running out of memory, then you might not be correctly clearing down Registry entries. One example is as above where you are setting up timers but not unregistering them. Another occurs in the following code fragment. The `on()` function passes the socket to the connection callback as it's first argument `sck`. This is local variable in the callback function, and it also references the same socket as the upvalue `srv`. So functionally `srv` and `sck` are interchangeable. So why pass it as an argument? Normally garbage collecting a socket will automatically unregister any of its callbacks, but if you use a socket as an upvalue in the callback, the socket is now referenced through the Register, and now it won't be GCed because it is referenced. Catch-22 and a programming error, not a bug. +Example of wrong upvalue usage in the callback: ```Lua srv:on("connection", function(sck, c) - svr:send(reply) + svr:send(reply) -- should be 'sck' instead of 'srv' end) ``` +Examples of correct callback implementations can be found in the [net socket documentation](modules/net.md#netsocketon). + * One way to check the registry is to use the construct `for k,v in pairs(debug.getregistry()) do print (k,v) end` to track the registry size. If this is growing then you've got a leak. ### How do I track globals
opal-prd: Fix memory leak in is-fsp-system check
@@ -255,6 +255,7 @@ static void pr_log_daemon_init(void) /* Check service processor type */ static bool is_fsp_system(void) { + bool fsp_system = true; char *path; int rc; @@ -264,7 +265,11 @@ static bool is_fsp_system(void) return false; } - return access(path, F_OK) ? false : true; + if (access(path, F_OK)) + fsp_system = false; + + free(path); + return fsp_system; } /**
Number of bins change on keyboard tracking when hit apply
@@ -144,7 +144,7 @@ QvisHistogramPlotWindow::CreateWindowContents() hgLayout->addWidget(numBinsLabel, 0, 0); numBins = new QSpinBox(central); - numBins->setKeyboardTracking(false); + numBins->setKeyboardTracking(true); numBins->setMinimum(2); numBins->setMaximum(1000); numBins->setSingleStep(1);
Change the TextBenchMarkTest name to be proper
@@ -233,9 +233,9 @@ public: BENCHMARK_F(CoreText, CTFrameDrawComplete); -class CTFrameDrawYuge : public TextBenchmarkBase { +class CTFrameDrawHuge : public TextBenchmarkBase { public: - CTFrameDrawYuge() { + CTFrameDrawHuge() { CTParagraphStyleSetting setting; CTTextAlignment alignment = kCTCenterTextAlignment; setting.spec = kCTParagraphStyleSpecifierAlignment; @@ -277,7 +277,7 @@ private: woc::AutoCF<CTFrameRef> m_frame; }; -BENCHMARK_F(CoreText, CTFrameDrawYuge); +BENCHMARK_F(CoreText, CTFrameDrawHuge); class CTLineDrawBase : public TextBenchmarkBase { public:
Add an option for 512 byte requests to host_exerciser
@@ -84,6 +84,7 @@ typedef enum { HOSTEXE_CLS_1 = 0x0, HOSTEXE_CLS_2 = 0x1, HOSTEXE_CLS_4 = 0x2, + HOSTEXE_CLS_8 = 0x3, } hostexe_req_len; @@ -292,6 +293,7 @@ const std::map<std::string, uint32_t> he_req_cls_len= { { "cl_1", HOSTEXE_CLS_1}, { "cl_2", HOSTEXE_CLS_2}, { "cl_4", HOSTEXE_CLS_4}, + { "cl_8", HOSTEXE_CLS_8}, }; const std::map<std::string, uint32_t> he_test_mode = { @@ -323,7 +325,7 @@ public: ->transform(CLI::CheckedTransformer(he_modes))->default_val("lpbk"); // Cache line - app_.add_option("--cls", he_req_cls_len_, "number of CLs per request{cl_1, cl_2, cl_4}") + app_.add_option("--cls", he_req_cls_len_, "number of CLs per request{cl_1, cl_2, cl_4, cl_8}") ->transform(CLI::CheckedTransformer(he_req_cls_len))->default_val("cl_1"); // Configures test rollover or test termination
[mechanics_io] fix record to file in verbose mode
@@ -2878,7 +2878,8 @@ class Hdf5(): log(simulation.computeOneStep, with_timer)() - if verbose and (k % self._output_frequency == 0) or (k == 1): + if (k % self._output_frequency == 0) or (k == 1): + if verbose: print_verbose ('output in hdf5 file at step ', k) log(self.outputDynamicObjects, with_timer)()
Small fixes merge from v2.
@@ -288,7 +288,7 @@ static void CreateMesh() vbInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT; vbInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; VmaMemoryRequirements vbMemReq = {}; - vbMemReq.usage = VMA_MEMORY_USAGE_CPU_TO_GPU; + vbMemReq.usage = VMA_MEMORY_USAGE_CPU_ONLY; VkMappedMemoryRange stagingVertexBufferMem; VkBuffer stagingVertexBuffer = VK_NULL_HANDLE; ERR_GUARD_VULKAN( vmaCreateBuffer(g_hAllocator, &vbInfo, &vbMemReq, &stagingVertexBuffer, &stagingVertexBufferMem, nullptr) ); @@ -298,6 +298,8 @@ static void CreateMesh() memcpy(pVbData, vertices, vertexBufferSize); vmaUnmapMemory(g_hAllocator, &stagingVertexBufferMem); + // No need to flush stagingVertexBuffer memory because CPU_ONLY memory is always HOST_COHERENT. + vbInfo.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; vbMemReq.usage = VMA_MEMORY_USAGE_GPU_ONLY; ERR_GUARD_VULKAN( vmaCreateBuffer(g_hAllocator, &vbInfo, &vbMemReq, &g_hVertexBuffer, nullptr, nullptr) ); @@ -309,7 +311,7 @@ static void CreateMesh() ibInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT; ibInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; VmaMemoryRequirements ibMemReq = {}; - ibMemReq.usage = VMA_MEMORY_USAGE_CPU_TO_GPU; + ibMemReq.usage = VMA_MEMORY_USAGE_CPU_ONLY; VkMappedMemoryRange stagingIndexBufferMem; VkBuffer stagingIndexBuffer = VK_NULL_HANDLE; ERR_GUARD_VULKAN( vmaCreateBuffer(g_hAllocator, &ibInfo, &ibMemReq, &stagingIndexBuffer, &stagingIndexBufferMem, nullptr) ); @@ -319,6 +321,8 @@ static void CreateMesh() memcpy(pIbData, indices, indexBufferSize); vmaUnmapMemory(g_hAllocator, &stagingIndexBufferMem); + // No need to flush stagingIndexBuffer memory because CPU_ONLY memory is always HOST_COHERENT. + ibInfo.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT; ibMemReq.usage = VMA_MEMORY_USAGE_GPU_ONLY; ERR_GUARD_VULKAN( vmaCreateBuffer(g_hAllocator, &ibInfo, &ibMemReq, &g_hIndexBuffer, nullptr, nullptr) ); @@ -469,7 +473,7 @@ static void CreateTexture(uint32_t sizeX, uint32_t sizeY) stagingImageInfo.samples = VK_SAMPLE_COUNT_1_BIT; stagingImageInfo.flags = 0; VmaMemoryRequirements stagingImageMemReq = {}; - stagingImageMemReq.usage = VMA_MEMORY_USAGE_CPU_TO_GPU; + stagingImageMemReq.usage = VMA_MEMORY_USAGE_CPU_ONLY; VkImage stagingImage = VK_NULL_HANDLE; VkMappedMemoryRange stagingImageMem; ERR_GUARD_VULKAN( vmaCreateImage(g_hAllocator, &stagingImageInfo, &stagingImageMemReq, &stagingImage, &stagingImageMem, nullptr) ); @@ -504,6 +508,8 @@ static void CreateTexture(uint32_t sizeX, uint32_t sizeY) vmaUnmapMemory(g_hAllocator, &stagingImageMem); + // No need to flush stagingImage memory because CPU_ONLY memory is always HOST_COHERENT. + VkImageCreateInfo imageInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO }; imageInfo.imageType = VK_IMAGE_TYPE_2D; imageInfo.extent.width = sizeX;
common/wireless.c: Format with clang-format BRANCH=none TEST=none
@@ -34,13 +34,11 @@ static int suspend_flags = CONFIG_WIRELESS_SUSPEND; static void wireless_enable(int flags) { #ifdef WIRELESS_GPIO_WLAN - gpio_set_level(WIRELESS_GPIO_WLAN, - flags & EC_WIRELESS_SWITCH_WLAN); + gpio_set_level(WIRELESS_GPIO_WLAN, flags & EC_WIRELESS_SWITCH_WLAN); #endif #ifdef WIRELESS_GPIO_WWAN - gpio_set_level(WIRELESS_GPIO_WWAN, - flags & EC_WIRELESS_SWITCH_WWAN); + gpio_set_level(WIRELESS_GPIO_WWAN, flags & EC_WIRELESS_SWITCH_WWAN); #endif #ifdef WIRELESS_GPIO_BLUETOOTH @@ -57,7 +55,6 @@ static void wireless_enable(int flags) !(flags & EC_WIRELESS_SWITCH_WLAN_POWER)); #endif /* CONFIG_WLAN_POWER_ACTIVE_LOW */ #endif - } static int wireless_get(void) @@ -134,8 +131,7 @@ static enum ec_status wireless_enable_cmd(struct host_cmd_handler_args *args) args->response_size = sizeof(*r); return EC_RES_SUCCESS; } -DECLARE_HOST_COMMAND(EC_CMD_SWITCH_ENABLE_WIRELESS, - wireless_enable_cmd, +DECLARE_HOST_COMMAND(EC_CMD_SWITCH_ENABLE_WIRELESS, wireless_enable_cmd, EC_VER_MASK(0) | EC_VER_MASK(1)); static int command_wireless(int argc, char **argv) @@ -164,6 +160,5 @@ static int command_wireless(int argc, char **argv) return EC_SUCCESS; } -DECLARE_CONSOLE_COMMAND(wireless, command_wireless, - "[now [suspend]]", +DECLARE_CONSOLE_COMMAND(wireless, command_wireless, "[now [suspend]]", "Get/set wireless flags");
pbio/tacho: Read absolute count during reset. When resetting to the absolute value, it is helpful to know which value it was set to. This will be used by the servo in subsequent commits.
@@ -42,19 +42,18 @@ static pbio_error_t pbio_tacho_reset_count(pbio_tacho_t *tacho, int32_t reset_co return PBIO_SUCCESS; } -static pbio_error_t pbio_tacho_reset_count_to_abs(pbio_tacho_t *tacho) { +static pbio_error_t pbio_tacho_reset_count_to_abs(pbio_tacho_t *tacho, int32_t *abs_count) { - int32_t abs_count; - pbio_error_t err = pbdrv_counter_get_abs_count(tacho->counter, &abs_count); + pbio_error_t err = pbdrv_counter_get_abs_count(tacho->counter, abs_count); if (err != PBIO_SUCCESS) { return err; } if (tacho->direction == PBIO_DIRECTION_COUNTERCLOCKWISE) { - abs_count = -abs_count; + *abs_count = -*abs_count; } - return pbio_tacho_reset_count(tacho, abs_count); + return pbio_tacho_reset_count(tacho, *abs_count); } static pbio_error_t pbio_tacho_setup(pbio_tacho_t *tacho, uint8_t counter_id, pbio_direction_t direction, fix16_t gear_ratio) { @@ -75,7 +74,8 @@ static pbio_error_t pbio_tacho_setup(pbio_tacho_t *tacho, uint8_t counter_id, pb } // Reset count to absolute value if supported - err = pbio_tacho_reset_count_to_abs(tacho); + int32_t abs_count; + err = pbio_tacho_reset_count_to_abs(tacho, &abs_count); if (err == PBIO_ERROR_NOT_SUPPORTED) { // If not available, set it to 0 err = pbio_tacho_reset_count(tacho, 0); @@ -141,7 +141,8 @@ pbio_error_t pbio_tacho_get_angle(pbio_tacho_t *tacho, int32_t *angle) { pbio_error_t pbio_tacho_reset_angle(pbio_tacho_t *tacho, int32_t reset_angle, bool reset_to_abs) { if (reset_to_abs) { - return pbio_tacho_reset_count_to_abs(tacho); + int32_t abs_count; + return pbio_tacho_reset_count_to_abs(tacho, &abs_count); } else { return pbio_tacho_reset_count(tacho, pbio_math_mul_i32_fix16(reset_angle, tacho->counts_per_degree)); }
rpz-triggers, fix that after cname an nsdname or nsip trigger has cname rrsets prepended by the iterator.
@@ -2479,6 +2479,10 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, qstate->return_rcode = FLAGS_GET_RCODE(forged_response->rep->flags); qstate->return_msg = forged_response; next_state(iq, FINISHED_STATE); + if(!iter_prepend(iq, qstate->return_msg, qstate->region)) { + log_err("rpz, prepend rrsets: out of memory"); + return error_response(qstate, id, LDNS_RCODE_SERVFAIL); + } return 0; } } @@ -3039,7 +3043,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq, qstate->return_msg = forged_response; next_state(iq, FINISHED_STATE); if(!iter_prepend(iq, qstate->return_msg, qstate->region)) { - log_err("rpz, prepend rrsets: out of memory"); + log_err("rpz after cname, prepend rrsets: out of memory"); return error_response(qstate, id, LDNS_RCODE_SERVFAIL); } qstate->return_msg->qinfo = qstate->qinfo;
UIModule GPose/Idle Cam Functions
@@ -2883,6 +2883,10 @@ classes: 66: GetLogFilterConfig 68: EnableCutsceneInputMode 69: DisableCutsceneInputMode + 75: EnterGPose + 76: ExitGPose + 78: EnterIdleCam + 79: ExitIdleCam 88: ShowEurekaHud 89: HideEurekaHud 95: OpenMycInfo
Updated style of timer
++ prep |= old=(unit tim=@da) ^- (quip move _this) - =/ lismov/(list move) %+ weld - `(list move)`[ost.bol %connect / [~ /'~timer'] %timer]~ - `(list move)`[ost.bol %poke /timer [our.bol %launch] [%noun [%timer /tile '/~timer/js/tile.js']]]~ - :- lismov + =/ launchnoun [%noun [%timer /tile '/~timer/js/tile.js']] + :- + :~ + [ost.bol %connect / [~ /'~timer'] %timer] + [ost.bol %poke /timer [our.bol %launch] launchnoun] + == ?~ old this %= this =/ str/@t +.jon ?: =(str 'start') =/ data/@da (add now.bol ~s10) - :- %+ weld - `(list move)`(send-tile-diff [%s (scot %da data)]) - `(list move)`[ost.bol %wait /timer data]~ - this(tim data) + :_ this(tim data) + [[ost.bol %wait /timer data] (send-tile-diff [%s (scot %da data)])] ?: =(str 'stop') - :- %+ weld - `(list move)`(send-tile-diff [%s '']) - `(list move)`[ost.bol %rest /timer tim]~ - this(tim *@da) + :_ this(tim *@da) + [[ost.bol %rest /timer tim] (send-tile-diff [%s ''])] [~ this] :: ++ poke-handle-http-request %- (require-authorization:app ost.bol move this) |= =inbound-request:http-server ^- (quip move _this) - =+ request-line=(parse-request-line url.request.inbound-request) - =+ back-path=(flop site.request-line) + =/ request-line (parse-request-line url.request.inbound-request) + =/ back-path (flop site.request-line) =/ name=@t - =+ back-path=(flop site.request-line) + =/ back-path (flop site.request-line) ?~ back-path '' i.back-path
net/ping: Fix wrong conditional compile. common part not run when LWIP_IPV6 is enabled.
@@ -289,11 +289,10 @@ static void nu_ping_prepare_echo(int family, struct icmp_echo_hdr *iecho, u16_t if (family == AF_INET6) { icmp_hdrlen = sizeof(struct icmp6_echo_hdr); } else -#else +#endif { icmp_hdrlen = sizeof(struct icmp_echo_hdr); } -#endif ICMPH_CODE_SET(iecho, 0); iecho->id = PING_ID; ++g_ping_seq_num;
APPS/cmp.c: Move warning on overlong section name to make it effective again Fixes
@@ -2001,14 +2001,14 @@ static const char *prev_item(const char *opt, const char *end) while (beg != opt && beg[-1] != ',' && !isspace(beg[-1])) beg--; len = end - beg; - if (len > SECTION_NAME_MAX) + if (len > SECTION_NAME_MAX) { + CMP_warn2("using only first %d characters of section name starting with \"%s\"", + SECTION_NAME_MAX, opt_item); len = SECTION_NAME_MAX; + } strncpy(opt_item, beg, len); opt_item[SECTION_NAME_MAX] = '\0'; /* avoid gcc v8 O3 stringop-truncation */ opt_item[len] = '\0'; - if (len > SECTION_NAME_MAX) - CMP_warn2("using only first %d characters of section name starting with \"%s\"", - SECTION_NAME_MAX, opt_item); while (beg != opt && (beg[-1] == ',' || isspace(beg[-1]))) beg--; return beg;
integration: Add test for dns.
@@ -104,6 +104,28 @@ func TestMain(m *testing.M) { os.Exit(ret) } +func TestDns(t *testing.T) { + dnsCmd := &command{ + name: "Start dns gadget", + cmd: "$KUBECTL_GADGET dns -n test-ns", + expectedRegexp: `test-pod\s+OUTGOING\s+microsoft.com`, + startAndStop: true, + } + + commands := []*command{ + dnsCmd, + { + name: "Run pod which interacts with dns", + cmd: "kubectl run --restart=Never --image=praqma/network-multitool -n test-ns test-pod -- sh -c 'while true; do nslookup microsoft.com; done'", + expectedRegexp: "pod/test-pod created", + }, + waitUntilTestPodReady, + deleteTestPod, + } + + runCommands(commands, t) +} + func TestExecsnoop(t *testing.T) { execsnoopCmd := &command{ name: "Start execsnoop gadget",
resgroup: workaround invalid cpu.cfs_quota_us. CGroup promises that cfs_quota_us will never be 0, however on centos6 we ever noticed that it has the value 0.
@@ -1188,7 +1188,11 @@ initCpu(void) int64 cfs_quota_us; int64 shares; - if (parent_cfs_quota_us < 0LL) + /* + * CGroup promises that cfs_quota_us will never be 0, however on centos6 + * we ever noticed that it has the value 0. + */ + if (parent_cfs_quota_us <= 0LL) { /* * parent cgroup is unlimited, calculate gpdb's limitation based on @@ -1383,10 +1387,6 @@ ResGroupOps_Bless(void) /* read cpu rate limit of parent cgroup */ parent_cfs_quota_us = readInt64(RESGROUP_ROOT_ID, BASETYPE_PARENT, comp, "cpu.cfs_quota_us"); - if (parent_cfs_quota_us == 0LL) - CGROUP_CONFIG_ERROR("invalid parent cpu.cfs_quota_us value: " - INT64_FORMAT, - parent_cfs_quota_us); } /* Initialize the OS group */ @@ -1879,8 +1879,6 @@ ResGroupOps_ConvertCpuUsageToPercent(int64 usage, int64 duration) Assert(usage >= 0LL); Assert(duration > 0LL); - /* CGroup promises that cfs_quota_us will never be 0 */ - Assert(parent_cfs_quota_us != 0); /* There should always be at least one core on the system */ Assert(ncores > 0);
mtd/progmem: fix incorrect range of cache invalidatation on erase up_progmem_erasepage() is invalidating too small range of data cache. We should invalidate whole region of block unit which might be different with page size. This fixes the smart and smartfs malfunctioning when block and page units different.
@@ -129,12 +129,12 @@ ssize_t up_progmem_erasepage(size_t page) s5j_sflash_enable_wp(); /* Invalidate cache */ - arch_invalidate_dcache(addr, addr + up_progmem_pagesize(page)); + arch_invalidate_dcache(addr, addr + up_progmem_blocksize()); /* Restore IRQs */ irqrestore(irqs); - return up_progmem_pagesize(page); + return up_progmem_blocksize(); } ssize_t up_progmem_ispageerased(size_t page)
Dont early skip on successful picoquit_ct test
@@ -68,9 +68,7 @@ script: - if [ "$CHECK" == "cppcheck" ]; then cppcheck --project=compile_commands.json --quiet; fi - ${EXTRA} make - ulimit -c unlimited -S - - ./picoquic_ct -n -r && RESULT=$? - # Early out if the program exited successfully - - if [[ ${RESULT} == 0 ]]; then exit 0; fi; - - ./picohttp_ct -n -r && RESULT=$? - - if [[ ${RESULT} == 0 ]]; then exit 0; fi; - - for i in $(find ./ -maxdepth 1 -name 'core*' -print); do gdb $(pwd)/picoquic_ct core* -ex "thread apply all bt" -ex "set pagination 0" -batch; done; + - ./picoquic_ct -n -r && QUICRESULT=$? + - ./picohttp_ct -n -r && HTTPRESULT=$? + - if [[ ${QUICRESULT} != 0 ]]; then for i in $(find ./ -maxdepth 1 -name 'core*' -print); do gdb $(pwd)/picoquic_ct core* -ex "thread apply all bt" -ex "set pagination 0" -batch; done; fi; + - if [[ ${HTTPRESULT} != 0 ]]; then for i in $(find ./ -maxdepth 1 -name 'core*' -print); do gdb $(pwd)/picohttp_ct core* -ex "thread apply all bt" -ex "set pagination 0" -batch; done; fi;
harness: increase the default test timeout
@@ -14,8 +14,8 @@ from tests import Test from harness import Harness RAW_TEST_OUTPUT_FILENAME = Harness.RAW_FILE_NAME -DEFAULT_TEST_TIMEOUT = datetime.timedelta(seconds=360) -DEFAULT_BOOT_TIMEOUT = datetime.timedelta(seconds=240) +DEFAULT_TEST_TIMEOUT = datetime.timedelta(seconds=600) +DEFAULT_BOOT_TIMEOUT = datetime.timedelta(seconds=300) AFTER_FINISH_TIMEOUT = datetime.timedelta(seconds=30) TEST_NO_OUTPUT_LINE = '[Error: could not read output from test]\n' TEST_TIMEOUT_LINE = '[Error: test timed out]\n'
Add name string to types
@@ -44,11 +44,11 @@ extern __attribute__((noreturn)) void error(const char* str, ...); #define INTERFACE(X) X INTERFACE -typedef const struct typeid_s { int size; } TYPEID; +typedef const struct typeid_s { int size; const char* name; } TYPEID; #define TYPEID2(T) (T ## _TYPEID) #define TYPEID(T) (*({ extern TYPEID T ## _TYPEID; &T ## _TYPEID; })) -#define DEF_TYPEID(T) TYPEID T ## _TYPEID = { sizeof(struct T) }; +#define DEF_TYPEID(T) TYPEID T ## _TYPEID = { .size = sizeof(struct T), .name = "" #T ""}; #define SET_TYPEID(T, x) (TYPE_CHECK(struct T*, x)->INTERFACE.TYPEID = &TYPEID(T)) #define SIZEOF(x) ((x)->TYPEID->size)
py/vm: Use enum names instead of magic numbers in multi-opcode dispatch.
@@ -1270,10 +1270,10 @@ yield: } else if (ip[-1] < MP_BC_STORE_FAST_MULTI + 16) { fastn[MP_BC_STORE_FAST_MULTI - (mp_int_t)ip[-1]] = POP(); DISPATCH(); - } else if (ip[-1] < MP_BC_UNARY_OP_MULTI + 7) { + } else if (ip[-1] < MP_BC_UNARY_OP_MULTI + MP_UNARY_OP_NUM_BYTECODE) { SET_TOP(mp_unary_op(ip[-1] - MP_BC_UNARY_OP_MULTI, TOP())); DISPATCH(); - } else if (ip[-1] < MP_BC_BINARY_OP_MULTI + 36) { + } else if (ip[-1] < MP_BC_BINARY_OP_MULTI + MP_BINARY_OP_NUM_BYTECODE) { mp_obj_t rhs = POP(); mp_obj_t lhs = TOP(); SET_TOP(mp_binary_op(ip[-1] - MP_BC_BINARY_OP_MULTI, lhs, rhs));
revert merge mistake
@@ -537,7 +537,7 @@ sctp_ctlinput(int cmd, struct sockaddr *sa, void *vip) #else inner_ip->ip_len, #endif - ntohs(icmp->icmp_nextmtu)); + (uint32_t)ntohs(icmp->icmp_nextmtu)); #if defined(__Userspace__) if (stcb && upcall_socket == NULL && !(stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE)) {
Safely initialize manifest object. Using a designated initializer is safer than zeroing the struct. It is also better for debugging because Valgrind should be able to detect access to areas that are not initialized due to alignment.
@@ -366,18 +366,19 @@ manifestNewInternal(void) { FUNCTION_TEST_VOID(); - // Create object - Manifest *this = memNew(sizeof(Manifest)); - this->memContext = memContextCurrent(); - - // Create lists - this->dbList = lstNewP(sizeof(ManifestDb), .comparator = lstComparatorStr); - this->fileList = lstNewP(sizeof(ManifestFile), .comparator = lstComparatorStr); - this->linkList = lstNewP(sizeof(ManifestLink), .comparator = lstComparatorStr); - this->pathList = lstNewP(sizeof(ManifestPath), .comparator = lstComparatorStr); - this->ownerList = strLstNew(); - this->referenceList = strLstNew(); - this->targetList = lstNewP(sizeof(ManifestTarget), .comparator = lstComparatorStr); + Manifest *this = memNewRaw(sizeof(Manifest)); + + *this = (Manifest) + { + .memContext = memContextCurrent(), + .dbList = lstNewP(sizeof(ManifestDb), .comparator = lstComparatorStr), + .fileList = lstNewP(sizeof(ManifestFile), .comparator = lstComparatorStr), + .linkList = lstNewP(sizeof(ManifestLink), .comparator = lstComparatorStr), + .pathList = lstNewP(sizeof(ManifestPath), .comparator = lstComparatorStr), + .ownerList = strLstNew(), + .referenceList = strLstNew(), + .targetList = lstNewP(sizeof(ManifestTarget), .comparator = lstComparatorStr), + }; FUNCTION_TEST_RETURN(this); }
lua API for SoundData:append
@@ -9,7 +9,23 @@ static int l_lovrSoundDataGetBlob(lua_State* L) { return 1; } +static int l_lovrSoundDataAppend(lua_State* L) { + SoundData* soundData = luax_checktype(L, 1, SoundData); + Blob* blob = luax_totype(L, 2, Blob); + SoundData* sound = luax_totype(L, 2, SoundData); + lovrAssert(blob || sound, "Invalid blob appended"); + size_t appendedSamples = false; + if (sound) { + appendedSamples = lovrSoundDataStreamAppendSound(soundData, sound); + } else if (blob) { + appendedSamples = lovrSoundDataStreamAppendBlob(soundData, blob); + } + lua_pushinteger(L, appendedSamples); + return 1; +} + const luaL_Reg lovrSoundData[] = { { "getBlob", l_lovrSoundDataGetBlob }, + { "append", l_lovrSoundDataAppend }, { NULL, NULL } };
Update: Shell.c allow for events only consisting of a numeric ID, don't treat them as performing a fixed amount of inference cycles command
@@ -182,7 +182,7 @@ int Shell_ProcessInput(char *line) MOTOR_BABBLING_CHANCE = MOTOR_BABBLING_CHANCE_INITIAL; } else - if(strspn(line, "0123456789")) + if(strspn(line, "0123456789") && strlen(line) == strspn(line, "0123456789")) { unsigned int steps; sscanf(line, "%u", &steps);
improve error codes: translate kdb.kdb.KeyInvalidName to ENOENT
@@ -61,6 +61,8 @@ def _mock_process_context_and_run(process_context, func, args, kwargs): try: return func(*args, **kwargs) + except kdb.kdb.KeyInvalidName: + raise OSError(errno.ENOENT) except kdb.Exception as e: exception_message = str(e).lower()
sixtop: fix typos in error messages
@@ -150,7 +150,7 @@ sixp_input(const uint8_t *buf, uint16_t len, const linkaddr_t *src_addr) } if(sixp_pkt_parse(buf, len, &pkt) < 0) { - LOG_ERR("6P: sixp_input() fails because off a malformed 6P packet\n"); + LOG_ERR("6P: sixp_input() fails because of a malformed 6P packet\n"); return; } @@ -324,7 +324,7 @@ sixp_output(sixp_pkt_type_t type, sixp_pkt_code_t code, uint8_t sfid, if(trans == NULL) { LOG_ERR("6P: sixp_output() fails because of no transaction [peer_addr:"); LOG_ERR_LLADDR((const linkaddr_t *)dest_addr); - LOG_ERR_("\n"); + LOG_ERR_("]\n"); return -1; } else if(sixp_trans_get_state(trans) != SIXP_TRANS_STATE_RESPONSE_RECEIVED) {
hw/mcu/dialog: Provide generic names for CMAC sections We do not want to rely on section names used in Dialog's libraries. Instead, we provide generic "placeholders" for firmware image and CMAC RAM and it's up to CMAC driver to load proper symbols into these sections.
@@ -66,10 +66,7 @@ SECTIONS *(.text) *(.text.*) - __cmac_fw_area_start = .; - KEEP(*(.cmi_fw_area*)) - __cmac_fw_area_end = .; - . = ALIGN(4); + *(.libcmac.rom) KEEP(*(.init)) KEEP(*(.fini)) @@ -195,14 +192,10 @@ SECTIONS __bss_end__ = .; } > RAM - .cmac_ram (NOLOAD) : + .cmac (NOLOAD) : { . = ALIGN(0x400); - __cmac_ram_section_start__ = .; - cmac_fw_addr = .; - . += (__cmac_fw_area_end - __cmac_fw_area_start); - . = ALIGN(0x400); - __cmac_ram_section_end__ = . - 1; + *(.libcmac.ram) } > RAM /* Heap starts after BSS */
[chore] Remove duplicated code
@@ -1036,7 +1036,6 @@ func Query(contractAddress []byte, bs *state.BlockState, cdb ChainAccessor, cont err = dbErr } }() - ce.setCountHook(queryMaxInstLimit) ce.call(queryMaxInstLimit, nil) contexts[ctx.service] = nil
h2olog: remove C-like comments first to parse D files accurately
@@ -108,8 +108,11 @@ probe_decl = r'(?:\bprobe\s+(?:[a-zA-Z0-9_]+)\s*\([^\)]*\)\s*;)' d_decl = r'(?:\bprovider\s*(?P<provider>[a-zA-Z0-9_]+)\s*\{(?P<probes>(?:%s|%s)*)\})' % ( probe_decl, whitespace) +def strip_c_comments(s): + return re.sub('//.*?\n|/\*.*?\*/', '', s, flags=re_flags) + def parse_d(context: dict, path: Path, allow_probes: set = None, block_probes: set = None): - content = path.read_text() + content = strip_c_comments(path.read_text()) matched = re.search(d_decl, content, flags=re_flags) provider = matched.group('provider')
Set and initialiase number of entries in a vtable
@@ -118,6 +118,8 @@ InternalConstructVtablePrelinked64 ( } Vtable->Name = MachoGetSymbolName64 (MachoContext, VtableSymbol); + Vtable->NumEntries = 0; + // // Initialize the VTable by entries. // @@ -145,6 +147,8 @@ InternalConstructVtablePrelinked64 ( Vtable->Entries[Index].Address = 0; Vtable->Entries[Index].Name = NULL; } + + ++Vtable->NumEntries; } return TRUE;
Remove dead code CID
@@ -1073,8 +1073,6 @@ char *h2o_configurator_get_cmd_path(const char *cmd) /* obtain root */ if ((root = getenv("H2O_ROOT")) == NULL) { root = H2O_TO_STR(H2O_ROOT); - if (root == NULL) - goto ReturnOrig; } /* build full-path and return */
Fix runas command memory leak
@@ -2501,7 +2501,7 @@ NTSTATUS RunAsCreateProcessThread( if (filePathString = PhSearchFilePath(command->Buffer, L".exe")) PhMoveReference(&commandLine, filePathString); else - commandLine = command; // HACK (dmex) + PhSetReference(&commandLine, command); memset(&startupInfo, 0, sizeof(STARTUPINFOEX)); startupInfo.StartupInfo.cb = sizeof(STARTUPINFOEX); @@ -2625,6 +2625,11 @@ CleanupExit: PhDereferenceObject(commandLine); } + if (command) + { + PhDereferenceObject(command); + } + return status; } @@ -2764,6 +2769,7 @@ INT_PTR CALLBACK PhpRunFileWndProc( { if (Button_GetCheck(context->RunAsInstallerCheckboxHandle) == BST_CHECKED) { + PhReferenceObject(commandString); status = PhCreateThread2(RunAsCreateProcessThread, commandString); } else
Try running tests in separate job
@@ -5,15 +5,27 @@ image: ubuntu:18.04 # Install needed tools before_script: - apt-get update - - apt-get install -y autoconf build-essential libtool yasm wget git libtool-bin libc6-dbg valgrind + - apt-get install -y autoconf build-essential libtool yasm wget git libtool-bin valgrind # Build kvazaar and run tests -build-and-test: +build-kvazaar: stage: build script: - ./autogen.sh - ./configure --enable-werror - make --jobs=2 V=1 + artifacts: + paths: + - src/kvazaar + - src/.libs + +run-tests: + stage: test + script: - bash .travis-install.bash + - ./autogen.sh + - ./configure - PATH="${HOME}/bin:${PATH}" KVAZAAR_OVERRIDE_angular_pred=generic KVAZAAR_OVERRIDE_sao_band_ddistortion=generic KVAZAAR_OVERRIDE_sao_edge_ddistortion=generic KVAZAAR_OVERRIDE_calc_sao_edge_dir=generic make check + +
Update pdf doc with better links
@@ -94,7 +94,8 @@ systems. This document provides a specification of SBP framing and the payload structures of the messages currently used with Swift devices. SBP client libraries in a variety of programming languages are available -at~\url{http://docs.swiftnav.com/wiki/SwiftNav_Binary_Protocol}. +at~\url{https://github.com/swift-nav/libsbp} and support information +for sbp is available at~\url{https://support.swiftnav.com/customer/en/portal/articles/2492810-swift-binary-protocol}. \end{large}
sgemm_direct_skylakex: fix regression. The `#if defined(SKYLAKEX) || defined (COOPERLAKE)` from that commit was before #include "common.h" so caused the compiled function to be empty, returning garbage results for qualifying sgemm's on those architectures. Closes
-#if defined(SKYLAKEX) || defined (COOPERLAKE) /* the direct sgemm code written by Arjan van der Ven */ #include <immintrin.h> #include "common.h" + +#if defined(SKYLAKEX) || defined (COOPERLAKE) /* * "Direct sgemm" code. This code operates directly on the inputs and outputs * of the sgemm call, avoiding the copies, memory realignments and threading,
Parse interop server hostname from requests
@@ -25,6 +25,11 @@ if [ "$ROLE" == "client" ]; then TEST_PARAMS="$CLIENT_PARAMS -o /downloads" TEST_PARAMS="$TEST_PARAMS -X /logs/keys.log" + SERVER_HOST=`echo $REQUESTS | cut -f3 -d'/' | cut -f1 -d':'` + PORT=`echo $REQUESTS | cut -f3 -d'/' | cut -f2 -d':'` + + echo "Hostname: $SERVER_HOST, port: $PORT" + echo "Requests: " $REQUESTS for REQ in $REQUESTS; do FILE=`echo $REQ | cut -f4 -d'/'` @@ -48,12 +53,12 @@ if [ "$ROLE" == "client" ]; then L1="/logs/first_log.txt" L2="/logs/second_log.txt" rm *.bin - /picoquicdemo $TEST_PARAMS server 443 $FILE1 > $L1 + /picoquicdemo $TEST_PARAMS $SERVER_HOST $PORT $FILE1 > $L1 if [ $? != 0 ]; then RET=1 echo "First call to picoquicdemo failed" else - /picoquicdemo $TEST_PARAMS server 443 $FILE2 > $L2 + /picoquicdemo $TEST_PARAMS $SERVER_HOST $PORT $FILE2 > $L2 if [ $? != 0 ]; then RET=1 echo "Second call to picoquicdemo failed" @@ -64,14 +69,14 @@ if [ "$ROLE" == "client" ]; then CFILE=`echo $CREQ | cut -f4 -d'/'` CFILEX="/$CFILE" MCLOG="/logs/mc-$CFILE.txt" - /picoquicdemo $TEST_PARAMS server 443 $CFILEX > $MCLOG + /picoquicdemo $TEST_PARAMS $SERVER_HOST $PORT $CFILEX > $MCLOG if [ $? != 0 ]; then RET=1 echo "Call to picoquicdemo failed" fi done else - /picoquicdemo $TEST_PARAMS server 443 $FILELIST > /logs/client.log + /picoquicdemo $TEST_PARAMS $SERVER_HOST $PORT $FILELIST > /logs/client.log fi elif [ "$ROLE" == "server" ]; then TEST_PARAMS="$SERVER_PARAMS -k /certs/priv.key"
Use the two-operand form of DCBT on all PPC970 regardless of OS There seems to be no advantage to the three-operand form used in the earliest GotoBLAS kernels, and it causes compilation problems on other than the previously special-cased platforms as well
@@ -241,7 +241,7 @@ static inline int blas_quickdivide(blasint x, blasint y){ #define HAVE_PREFETCH #endif -#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8) || defined(POWER9) || ( defined(PPC970) && ( defined(OS_DARWIN) || defined(OS_FREEBSD) ) ) +#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8) || defined(POWER9) || defined(PPC970) #define DCBT_ARG 0 #else #define DCBT_ARG 8
pcre2-dev -> libpcre2-dev
@@ -11,7 +11,7 @@ jobs: run: | sudo apt-get update -y sudo apt-get install -y apache2-dev libcjose-dev libssl-dev check pkg-config - sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev pcre2-dev + sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libpcre2-dev - name: Configure run: | ./autogen.sh
arm: argument type for unw_init_local2 I tried to build libunwind for arm target and got a build error. Type for "uc" argument is inconsistent between unw_init_local2 and unw_init_local_common. From Mon Sep 17 00:00:00 2001 From: Guillaume Blanc Date: Tue, 22 Aug 2017 16:46:20 +0200 Subject: [PATCH] arm: Fix unw_init_local2 argument type
@@ -59,7 +59,7 @@ unw_init_local (unw_cursor_t *cursor, unw_context_t *uc) } PROTECTED int -unw_init_local2 (unw_cursor_t *cursor, ucontext_t *uc, int flag) +unw_init_local2 (unw_cursor_t *cursor, unw_context_t *uc, int flag) { if (!flag) {