message
stringlengths
6
474
diff
stringlengths
8
5.22k
Use correct recursive mutex for env and regular mutex for tz
@@ -375,9 +375,9 @@ void esp_newlib_locks_init(void) extern _lock_t __sinit_lock; __sinit_lock = (_lock_t) &s_common_recursive_mutex; extern _lock_t __env_lock_object; - __env_lock_object = (_lock_t) &s_common_mutex; + __env_lock_object = (_lock_t) &s_common_recursive_mutex; extern _lock_t __tz_lock_object; - __tz_lock_object = (_lock_t) &s_common_recursive_mutex; + __tz_lock_object = (_lock_t) &s_common_mutex; #elif defined(CONFIG_IDF_TARGET_ESP32S2) /* Newlib 3.0.0 is used in ROM, the following lock symbols are defined: */ extern _lock_t __sinit_recursive_mutex;
Solved typo in README.
@@ -484,7 +484,7 @@ Usually the developer is the same who does the fork, but it may be possible that Follow these steps to build and install **METACALL** manually. ``` sh -$ git clone https://github.com/metacall/core +$ git clone https://github.com/metacall/core.git $ cd metacall $ mkdir build $ cd build
motorcontrol: add position integral control
@@ -471,7 +471,9 @@ time_run_status_t time_run_status[] = { // Persistent PID related variables for each motor count_t count_err_integral[PBDRV_CONFIG_NUM_MOTOR_CONTROLLER]; +count_t count_err_prev[PBDRV_CONFIG_NUM_MOTOR_CONTROLLER]; ustime_t maneuver_started[PBDRV_CONFIG_NUM_MOTOR_CONTROLLER]; +ustime_t time_prev[PBDRV_CONFIG_NUM_MOTOR_CONTROLLER]; ustime_t time_paused[PBDRV_CONFIG_NUM_MOTOR_CONTROLLER]; ustime_t time_stopped[PBDRV_CONFIG_NUM_MOTOR_CONTROLLER]; @@ -504,10 +506,12 @@ void control_update(pbio_port_t port){ time_stopped[idx] = 0; time_run_status[idx] = TIME_RUNNING; debug_trajectory(port); + time_prev[idx] = maneuver_started[idx]; + count_err_prev[idx] = 0; } // Declare current time, positions, rates, and their reference value and error - ustime_t time_now, time_ref; + ustime_t time_now, time_ref, time_loop; count_t count_now, count_ref, count_err; rate_t rate_now, rate_ref, rate_err; int32_t duty; @@ -541,10 +545,16 @@ void control_update(pbio_port_t port){ // TODO: translate stalled detection - // Calculate duty signal - duty = ((settings->pid_kp*count_err + settings->pid_ki*count_err_integral[idx] + settings->pid_kd*rate_err)*PBIO_DUTY_PCT_TO_ABS)/PID_PRESCALE; + // Integrate position error + if (time_run_status[idx] == TIME_RUNNING) { + time_loop = time_now - time_prev[idx]; + count_err_integral[idx] += count_err_prev[idx]*time_loop; + } + count_err_prev[idx] = count_err; + time_prev[idx] = time_now; - // TODO: translate integrate position error + // Calculate duty signal + duty = (settings->pid_kp*count_err + ((settings->pid_ki*(count_err_integral[idx]/US_PER_MS))/MS_PER_SECOND) + settings->pid_kd*rate_err)/(PID_PRESCALE/PBIO_DUTY_PCT_TO_ABS); // Check if we are at the target and standing still. if (time_ref >= traject->time_end && count_ref - settings->tolerance <= count_now && count_now <= count_ref + settings->tolerance && rate_now == 0) {
libhfuzz: make write function taking const buf
@@ -40,7 +40,7 @@ static inline bool readFromFdAll(int fd, uint8_t * buf, size_t len) return (readFromFd(fd, buf, len) == (ssize_t) len); } -static bool writeToFd(int fd, uint8_t * buf, size_t len) +static bool writeToFd(int fd, const uint8_t * buf, size_t len) { size_t writtenSz = 0; while (writtenSz < len) { @@ -66,8 +66,8 @@ void HF_ITER(uint8_t ** buf_ptr, size_t * len_ptr) static bool initialized = false; if (initialized == true) { - uint8_t z = 'A'; - if (writeToFd(_HF_PERSISTENT_FD, &z, sizeof(z)) == false) { + static const uint8_t readyTag = 'A'; + if (writeToFd(_HF_PERSISTENT_FD, &readyTag, sizeof(readyTag)) == false) { fprintf(stderr, "readFromFdAll() failed\n"); _exit(1); }
add section on where to find verilog
@@ -88,6 +88,9 @@ For example: Note: You need to specify all the make variables once again to match what the build gave to run the assembly tests or the benchmarks or the binaries if you are using the make option. +Finally, in the ``generated-src/<...>-<package>-<config>/`` directory resides all of the collateral and Verilog source files for the build/simulation. +Specifically, the SoC top-level (``TOP``) Verilog file is denoted with ``*.top.v`` while the ``TestHarness`` file is denoted with ``*.harness.v``. + FPGA Accelerated Simulation --------------------------- FireSim enables simulations at 1000x-100000x the speed of standard software simulation.
admin/nagios: oddball init script for sles+arm
@@ -291,6 +291,9 @@ exit 0 %{_unitdir}/%{pname}.service %ifarch aarch64 /lib/systemd/system/nagios.service +%if 0%{?sles_version} || 0%{?suse_version} +/etc/init.d/nagios +%endif %else /etc/init.d/nagios %endif
SOVERSION bump to version 5.5.14
@@ -45,7 +45,7 @@ set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_ # with backward compatible change and micro version is connected with any internal change of the library. set(SYSREPO_MAJOR_SOVERSION 5) set(SYSREPO_MINOR_SOVERSION 5) -set(SYSREPO_MICRO_SOVERSION 13) +set(SYSREPO_MICRO_SOVERSION 14) set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}.${SYSREPO_MICRO_SOVERSION}) set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
feat: list_to_json() should work
@@ -1045,18 +1045,10 @@ to_json(char *str, size_t len, void *p_field) /* @todo this needs to be tested */ int -list_to_json(char *str, size_t len, void *p_field) +list_to_json(char *str, size_t len, void *p_fields) { - dati **fields = *(dati ***)p_field; - size_t size = ntl_length((void**)fields); - if (0 == size) return snprintf(str, len, "[]"); - - char fmt[256] = "["; - for (size_t i=0; i < size; ++i) { - strncat(fmt, "F ", sizeof(fmt)-1); - } - strncat(fmt, "]", sizeof(fmt)-1); - ERR("%s", fmt); + dati **fields = *(dati ***)p_fields; + return ntl_to_buf(buf, size, (void**)fields, NULL, &to_json); } } // namespace field
Fix incorrect struct type in list initialization. This looks like a copy-paste error. The code is only run during development so this is not a live issue. Found with -fsanitize=address.
@@ -506,7 +506,7 @@ bldCfgParseDependReconcile(const BldCfgOptionDependRaw *const optDependRaw, cons static List * bldCfgParseOptionDeprecate(Yaml *const yaml) { - List *result = lstNewP(sizeof(BldCfgOptionCommandRaw), .comparator = lstComparatorStr); + List *result = lstNewP(sizeof(BldCfgOptionDeprecateRaw), .comparator = lstComparatorStr); MEM_CONTEXT_TEMP_BEGIN() {
Avoid partial header reads Use net_recv_all() to avoid partial reads for the "meta" header (this would break the whole stream).
#include <libavformat/avformat.h> #include <libavutil/time.h> +#include <SDL2/SDL_assert.h> #include <SDL2/SDL_events.h> #include <SDL2/SDL_mutex.h> #include <SDL2/SDL_thread.h> @@ -30,11 +31,13 @@ static int read_packet(void *opaque, uint8_t *buf, int buf_size) { // the previous PTS read is now for the current frame decoder->pts = decoder->next_pts; - // FIXME what if only part of the header is available? - ret = net_recv(decoder->video_socket, header, HEADER_SIZE); + ret = net_recv_all(decoder->video_socket, header, HEADER_SIZE); if (ret <= 0) return ret; + // no partial read (net_recv_all()) + SDL_assert_release(ret == HEADER_SIZE); + // read the PTS for the next frame decoder->next_pts = buffer_read64be(header); remaining = buffer_read32be(&header[8]);
voxel: change USB_C0_DP_HPD GPIO define define USB_C0_DP_HPD to GPIO60 BRANCH=none TEST=make buildall
@@ -140,7 +140,7 @@ GPIO(EC_I2C7_EEPROM_SDA, PIN(B, 2), GPIO_INPUT) GPIO(EC_BATT_PRES_ODL, PIN(E, 1), GPIO_INPUT) /* Physical HPD pins are not needed on EC as these are configured by PMC */ -GPIO(USB_C0_DP_HPD, PIN(F, 3), GPIO_INPUT) +GPIO(USB_C0_DP_HPD, PIN(6, 0), GPIO_INPUT) GPIO(USB_C1_DP_HPD, PIN(7, 0), GPIO_INPUT) /* Alternate functions GPIO definitions */
Configurations/10-main.conf: add back /WX to VC-WIN32. We had /WX (treat warnings as errors) in VC-WIN32 for long time. At some point it was somehow omitted. It's argued that it allows to keep better focus on new code, which motivates the comeback...
@@ -1281,7 +1281,7 @@ sub vms_info { inherit_from => [ "BASE_Windows" ], template => 1, cc => "cl", - cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE", + cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS", defines => add(sub { my @defs = (); unless ($disabled{"zlib-dynamic"}) { my $zlib = @@ -1380,6 +1380,7 @@ sub vms_info { # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE' inherit_from => [ "VC-noCE-common", asm("x86_asm"), sub { $disabled{shared} ? () : "uplink_common" } ], + cflags => add("-WX"), as => sub { vc_win32_info()->{as} }, asflags => sub { vc_win32_info()->{asflags} }, asoutflag => sub { vc_win32_info()->{asoutflag} },
Use long command-line options In addition to the short form (e.g. "-p"), add the long form ("--port").
#include "scrcpy.h" +#include <getopt.h> #include <unistd.h> #include <libavformat/avformat.h> #include <SDL2/SDL.h> @@ -12,9 +13,14 @@ struct args { Uint16 maximum_size; }; -int parse_args(struct args *args, int argc, char *argv[]) { +static int parse_args(struct args *args, int argc, char *argv[]) { + static const struct option long_options[] = { + {"port", required_argument, NULL, 'p'}, + {"max-size", required_argument, NULL, 'm'}, + {NULL, 0, NULL, 0 }, + }; int c; - while ((c = getopt(argc, argv, "p:m:")) != -1) { + while ((c = getopt_long(argc, argv, "p:m:", long_options, NULL)) != -1) { switch (c) { case 'p': { char *endptr;
Try to help debugging failure on MacOS
@@ -1205,8 +1205,18 @@ static int create_ssdp_sock_v6( __FILE__, __LINE__, "Error in setsockopt() IPV6_JOIN_GROUP (join multicast " - "group): %s\n", - errorBuffer); + "group): %s.\n" + "SSDP_IPV6_LINKLOCAL = %s,\n" + "ipv6mr_interface = %u,\n" + "ipv6mr_multiaddr[0,1,2,3] = " + "0x%08X:0x%08X:0x%08X:0x%08X\n", + errorBuffer, + SSDP_IPV6_LINKLOCAL, + ssdpMcastAddr.ipv6mr_interface, + ssdpMcastAddr.ipv6mr_multiaddr.__in6_u.__u6_addr32[0], + ssdpMcastAddr.ipv6mr_multiaddr.__in6_u.__u6_addr32[1], + ssdpMcastAddr.ipv6mr_multiaddr.__in6_u.__u6_addr32[2], + ssdpMcastAddr.ipv6mr_multiaddr.__in6_u.__u6_addr32[3]); ret = UPNP_E_SOCKET_ERROR; goto error_handler; }
Switch deprecation method for MD4
@@ -46,13 +46,14 @@ typedef struct MD4state_st { unsigned int num; } MD4_CTX; # endif - -DEPRECATEDIN_3_0(int MD4_Init(MD4_CTX *c)) -DEPRECATEDIN_3_0(int MD4_Update(MD4_CTX *c, const void *data, size_t len)) -DEPRECATEDIN_3_0(int MD4_Final(unsigned char *md, MD4_CTX *c)) -DEPRECATEDIN_3_0(unsigned char *MD4(const unsigned char *d, size_t n, - unsigned char *md)) -DEPRECATEDIN_3_0(void MD4_Transform(MD4_CTX *c, const unsigned char *b)) +# ifndef OPENSSL_NO_DEPRECATED_3_0 +OSSL_DEPRECATEDIN_3_0 int MD4_Init(MD4_CTX *c); +OSSL_DEPRECATEDIN_3_0 int MD4_Update(MD4_CTX *c, const void *data, size_t len); +OSSL_DEPRECATEDIN_3_0 int MD4_Final(unsigned char *md, MD4_CTX *c); +OSSL_DEPRECATEDIN_3_0 unsigned char *MD4(const unsigned char *d, size_t n, + unsigned char *md); +OSSL_DEPRECATEDIN_3_0 void MD4_Transform(MD4_CTX *c, const unsigned char *b); +# endif # ifdef __cplusplus }
fix GITHUB_REPOSITORY for https clones
@@ -32,7 +32,7 @@ $(shell echo -n $(VERSION) > cli/VERSION) # github repostiory name; i.e. criblio/appscope # set automatically in CI so don't overwrite that -GITHUB_REPOSITORY ?= $(shell git config --get remote.origin.url | cut -d: -f2 | sed 's/\.git$$//') +GITHUB_REPOSITORY ?= $(shell git config --get remote.origin.url | cut -d: -f2 | sed -e 's/^\/\///' -e 's/\.git$$//') # architectures we build for # `uname -m` values; not Docker platform values like `amd64` or `arm64`
nat lb mapping command existed array out of bounds(VPP-979)
@@ -726,7 +726,8 @@ int nat44_add_del_lb_static_mapping (ip4_address_t e_addr, u16 e_port, kv.key = m_key.as_u64; kv.value = m - sm->static_mappings; clib_bihash_add_del_8_8(&sm->static_mapping_by_local, &kv, 1); - locals[i].prefix = locals[i - 1].prefix + locals[i].probability; + locals[i].prefix = (i == 0) ? locals[i].probability :\ + (locals[i - 1].prefix + locals[i].probability); vec_add1 (m->locals, locals[i]); m_key.port = clib_host_to_net_u16 (locals[i].port); kv.key = m_key.as_u64;
fixed error in oversized_flags test
@@ -451,15 +451,16 @@ test_mongoc_platform_truncate (int drop) { mongoc_handshake_t *md; bson_t doc = BSON_INITIALIZER; + bson_iter_t iter; char *undropped; + char *expected; char big_string[HANDSHAKE_MAX_SIZE]; int handshake_remaining_space; /* Need to know how much space storing fields in our BSON will take * so that we can make our platform string the correct length here */ - int handshake_bson_size = 84; - + int handshake_bson_size = 163; _reset_handshake (); md = _mongoc_handshake_get (); @@ -488,14 +489,14 @@ test_mongoc_platform_truncate (int drop) (strlen (md->os_type) + strlen (md->os_name) + strlen (md->os_version) + strlen (md->os_architecture) + strlen (md->driver_name) + strlen (md->driver_version) + strlen (md->compiler_info) + - strlen (md->flags) + sizeof (*md) + handshake_bson_size); + strlen (md->flags) + handshake_bson_size); /* adjust remaining space depending on which combination of * flags/compiler_info we want to test dropping */ if (drop == 2) { handshake_remaining_space += strlen (md->flags) + strlen (md->compiler_info); - undropped = ""; + undropped = bson_strdup_printf ("%s", ""); } else if (drop == 1) { handshake_remaining_space += strlen (md->flags); undropped = bson_strdup_printf ("%s", md->compiler_info); @@ -513,11 +514,12 @@ test_mongoc_platform_truncate (int drop) * dropped the flags correctly, instead of truncating anything */ ASSERT_CMPUINT32 (doc.len, <, (uint32_t) HANDSHAKE_MAX_SIZE); - bson_iter_t iter; bson_iter_init_find (&iter, &doc, "platform"); - ASSERT_CMPSTR (bson_iter_utf8 (&iter, NULL), - bson_strdup_printf ("%s%s", big_string, undropped)); + expected = bson_strdup_printf ("%s%s", big_string, undropped); + ASSERT_CMPSTR (bson_iter_utf8 (&iter, NULL), expected); + bson_free (expected); + bson_free (undropped); bson_destroy (&doc); /* So later tests don't have "aaaaa..." as the md platform string */ _reset_handshake ();
add nopswdcap flag to Jenkins images
@@ -205,6 +205,6 @@ parallel "Build Ubuntu 16.04" : { buildLinuxManagedImage("ubuntu", "Build RHEL 8" : { buildLinuxManagedImage("rhel", "8") }, "Build Windows 2016 SGX1" : { buildWindowsManagedImage("win2016", "ws2016-SGX", "SGX1") }, "Build Windows 2016 SGX1FLC DCAP" : { buildWindowsManagedImage("win2016", "ws2016-SGX-DCAP", "SGX1FLC") }, - "Build Windows 2016 nonSGX" : { buildWindowsManagedImage("win2016", "ws2016-nonSGX", "SGX1FLC-NoDriver") }, - "Build Windows 2019 SGX1" : { buildWindowsManagedImage("win2019", "ws2019-SGX", "SGX1-NoDriver") }, - "Build Windows 2019 SGX1FLC DCAP" : { buildWindowsManagedImage("win2019", "ws2019-SGX-DCAP", "SGX1FLC-NoDriver") } + "Build Windows 2016 nonSGX" : { buildWindowsManagedImage("win2016", "ws2016-nonSGX", "SGX1FLC-NoPSWDCAP") }, + "Build Windows 2019 SGX1" : { buildWindowsManagedImage("win2019", "ws2019-SGX", "SGX1-NoPSWDCAP") }, + "Build Windows 2019 SGX1FLC DCAP" : { buildWindowsManagedImage("win2019", "ws2019-SGX-DCAP", "SGX1FLC-NoPSWDCAP") }
xpath BUGFIX prefix resolution module
@@ -3357,8 +3357,8 @@ warn_equality_value(struct lyxp_expr *exp, struct lyxp_set *set, uint16_t val_ex type = ((struct lysc_node_leaf *)scnode)->type; if (type->basetype != LY_TYPE_IDENT) { - rc = type->plugin->store(set->ctx, type, value, strlen(value), LY_TYPE_OPTS_SCHEMA, - lys_resolve_prefix, (void *)type->dflt_mod, LYD_XML, NULL, NULL, NULL, NULL, &err); + rc = type->plugin->store(set->ctx, type, value, strlen(value), LY_TYPE_OPTS_SCHEMA, lys_resolve_prefix, + (void *)set->local_mod, LYD_XML, NULL, NULL, NULL, NULL, &err); if (err) { LOGWRN(set->ctx, "Invalid value \"%s\" which does not fit the type (%s).", value, err->msg); @@ -3840,7 +3840,7 @@ xpath_derived_(struct lyxp_set **args, struct lyxp_set *set, int options, int se /* store args[1] as ident */ rc = val->realtype->plugin->store(set->ctx, val->realtype, args[1]->val.str, strlen(args[1]->val.str), - LY_TYPE_OPTS_STORE, lys_resolve_prefix, (void *)sleaf->dflt_mod, + LY_TYPE_OPTS_STORE, lys_resolve_prefix, (void *)set->local_mod, set->format, (struct lyd_node *)leaf, set->tree, &data, NULL, &err); } else { meta = args[0]->val.meta[i].meta;
sysdeps/managarm: Split IS_TTY into message
@@ -4082,37 +4082,24 @@ int sys_flock(int fd, int opts) { int sys_isatty(int fd) { SignalGuard sguard; - HelAction actions[3]; - globalQueue.trim(); - managarm::posix::CntRequest<MemoryAllocator> req(getSysdepsAllocator()); - req.set_request_type(managarm::posix::CntReqType::IS_TTY); + managarm::posix::IsTtyRequest<MemoryAllocator> req(getSysdepsAllocator()); req.set_fd(fd); - frg::string<MemoryAllocator> ser(getSysdepsAllocator()); - req.SerializeToString(&ser); - actions[0].type = kHelActionOffer; - actions[0].flags = kHelItemAncillary; - actions[1].type = kHelActionSendFromBuffer; - actions[1].flags = kHelItemChain; - actions[1].buffer = ser.data(); - actions[1].length = ser.size(); - actions[2].type = kHelActionRecvInline; - actions[2].flags = 0; - HEL_CHECK(helSubmitAsync(getPosixLane(), actions, 3, - globalQueue.getQueue(), 0, 0)); - - auto element = globalQueue.dequeueSingle(); - auto offer = parseSimple(element); - auto send_req = parseSimple(element); - auto recv_resp = parseInline(element); + auto [offer, sendReq, recvResp] = exchangeMsgsSync( + getPosixLane(), + helix_ng::offer( + helix_ng::sendBragiHeadOnly(req, getSysdepsAllocator()), + helix_ng::recvInline() + ) + ); - HEL_CHECK(offer->error); - HEL_CHECK(send_req->error); - HEL_CHECK(recv_resp->error); + HEL_CHECK(offer.error()); + HEL_CHECK(sendReq.error()); + HEL_CHECK(recvResp.error()); managarm::posix::SvrResponse<MemoryAllocator> resp(getSysdepsAllocator()); - resp.ParseFromArray(recv_resp->data, recv_resp->length); + resp.ParseFromArray(recvResp.data(), recvResp.length()); if(resp.error() == managarm::posix::Errors::NO_SUCH_FD) { return EBADF; }else{
get-gcp-jwt: sot -> jot, moar vertical Since we only have one JWT (the thing we produce is an "access token", not a JWT), we can just call it jot.
;< =key:rsa bind:m read-private-key ;< kid=@t bind:m (read-setting %private-key-id) ;< aud=@t bind:m (read-setting %token-uri) -=/ sot=@t +=/ jot=@t %: make-jwt key kid iss 'https://www.googleapis.com/auth/cloud-platform' aud now.bowl == ;< p=[access-token=@t expires-at=@da] bind:m - (get-access-token sot aud now.bowl) + (get-access-token jot aud now.bowl) (pure:m !>(p)) :: ++ read-setting |= key=term =/ m (strand @t) ^- form:m ;< has=? bind:m - (scry:strandio ? /gx/settings-store/has-entry/gcp-store/[key]/noun) + %+ scry:strandio ? + /gx/settings-store/has-entry/gcp-store/[key]/noun ?. has (strand-fail:strandio %no-setting key ~) ;< =data:settings bind:m
perf-tools/dimemas: autoload boost in modulefile
@@ -94,6 +94,9 @@ module-whatis "URL %{url}" set version %{version} +# Require boost +depends-on boost + prepend-path PATH %{install_path}/bin prepend-path MANPATH %{install_path}/share/man prepend-path INCLUDE %{install_path}/include
rexecd: fix compile warning rexecd.c:196:9: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized]
@@ -176,6 +176,7 @@ int main(int argc, FAR char **argv) memset(&addr, 0, sizeof(addr)); switch (family) { + default: case AF_INET: ((FAR struct sockaddr_in *)&addr)->sin_family = AF_INET; ((FAR struct sockaddr_in *)&addr)->sin_port = REXECD_PORT;
Tests: Remove unused macro
using namespace std; using namespace kdb; -#define BUFFER_LENGTH 4096 - #define succeed_if(x, y) \ do \ { \
doc: document disabled test
@@ -8,6 +8,8 @@ tests/shell/shell_recorder/mathcheck.esr for INI (hard-coded ni) doc/help/kdb-get.md for INI src/bindings/swig/ruby/tests/CMakeLists.txt disabled testruby_tools_plugindatabase.rb in commit 87d1a4f1ec19a0cf86b877e6d2eb9e1d124d96ee +scripts/jenkins/Jenkinsfile disabled buildint openwrt packages in c0ffb72e10e6e145989b61bad8a36e4a77450acf + ### Jenkins We disabled the tests
Prevent overflow in unlikely seed generation * Prevent overflow in unlikely seed generation Fixes * Explicitly make constant a UINT64_C
@@ -86,6 +86,9 @@ static cyclic_group_t groups[] = {{// 2^8 + 1 // Check whether an integer is coprime with (p - 1) static int check_coprime(uint64_t check, const cyclic_group_t *group) { + if (check == 0 || check == 1) { + return NOT_COPRIME; + } for (unsigned i = 0; i < group->num_prime_factors; i++) { if (group->prime_factors[i] > check && !(group->prime_factors[i] % check)) { @@ -106,17 +109,25 @@ static uint32_t find_primroot(const cyclic_group_t *group, aesrand_t *aes) { uint32_t candidate = (uint32_t)((aesrand_getword(aes) & 0xFFFFFFFF) % group->prime); - if (candidate == 0) { - ++candidate; - } + uint64_t retv = 0; + + // The maximum primitive root we can return needs to be small enough such + // that there is no overflow when multiplied by any element in the largest + // group in ZMap, which currently has p = 2^{32} + 15. + const uint64_t max_root = (UINT64_C(1) << 32) - 14; + + // Repeatedly find a generator until we hit one that is small enough. For + // the largest group, we have a very low probability of ever executing this + // loop more than once, and for small groups it will only execute once. + do { + // Find an element that is coprime in the additive group while (check_coprime(candidate, group) != COPRIME) { - ++candidate; - // special case where we need to restart check from begin - if (candidate >= group->prime) { - candidate = 1; - } + candidate += 1; + candidate %= group->prime; } - uint64_t retv = isomorphism(candidate, group); + // Given a coprime element, apply the isomorphism. + retv = isomorphism(candidate, group); + } while (retv > max_root); return retv; }
test-suite: loop mpi4py tests over python families (#606)(#627)
@@ -15,13 +15,13 @@ NODES=2 TASKS=8 ARGS=8 -module load mpi4py +module load $python_module_prefix-mpi4py -@test "[dev-tools/mpi4py] python hello world ($rm/$LMOD_FAMILY_COMPILER/$LMOD_FAMILY_MPI)" { +@test "[dev-tools/$python-mpi4py] python hello world ($rm/$LMOD_FAMILY_COMPILER/$LMOD_FAMILY_MPI)" { if [ ! -s helloworld.py ];then flunk "helloworld.py does not exist" fi - run_mpi_binary "python helloworld.py" $ARGS $NODES $TASKS + run_mpi_binary "${_python} helloworld.py" $ARGS $NODES $TASKS assert_success }
Add documentation on platform specific checks
+Intro +===== + +This directory contains a few sets of files that are used for +configuration in diverse ways: + + *.conf Target platform configurations, please read + 'Configurations of OpenSSL target platforms' for more + information. + *.tmpl Build file templates, please read 'Build-file + programming with the "unified" build system' as well + as 'Build info files' for more information. + *.pm Helper scripts / modules for the main `Configure` + script. See 'Configure helper scripts for more + information. + + Configurations of OpenSSL target platforms ========================================== @@ -672,3 +689,23 @@ else, end it like this: ""; # Make sure no lingering values end up in the Makefile -} + + +Configure helper scripts +======================== + +Configure uses helper scripts in this directory: + +Checker scripts +--------------- + +These scripts are per platform family, to check the integrity of the +tools used for configuration and building. The checker script used is +either {build_platform}-{build_file}-checker.pm or +{build_platform}-checker.pm, where {build_platform} is the second +'build_scheme' list element from the configuration target data, and +{build_file} is 'build_file' from the same target data. + +If the check succeeds, the script is expected to end with a non-zero +expression. If the check fails, the script can end with a zero, or +with a `die`.
[make][flags] remove -finline, which apparently does nothing Been carrying this flag around for years but from sleuthing around in the compiler it seems to only exist as the opposite to -fno-inline which has an actual effect. Only reason -finline would do anything would be to cancel a previous -fno-inline switch.
@@ -55,7 +55,7 @@ CONFIGHEADER := $(BUILDDIR)/config.h GLOBAL_INCLUDES := $(BUILDDIR) $(addsuffix /include,$(LKINC)) GLOBAL_OPTFLAGS ?= $(ARCH_OPTFLAGS) -GLOBAL_COMPILEFLAGS := -g -finline -include $(CONFIGHEADER) +GLOBAL_COMPILEFLAGS := -g -include $(CONFIGHEADER) GLOBAL_COMPILEFLAGS += -W -Wall -Wno-multichar -Wno-unused-parameter -Wno-unused-function -Wno-unused-label -Werror=return-type -Wno-nonnull-compare GLOBAL_COMPILEFLAGS += -fno-common GLOBAL_CFLAGS := --std=gnu11 -Werror-implicit-function-declaration -Wstrict-prototypes -Wwrite-strings
fixed PMEM with SAVEID loading
@@ -2799,13 +2799,14 @@ static void tick(Console* console) console->showGameMenu = true; memcpy(&tic->cart, console->embed.file, sizeof(tic_cartridge)); + + tic_api_reset(tic); + setStudioMode(TIC_RUN_MODE); console->embed.yes = false; console->skipStart = false; studioRomLoaded(); - tic_api_reset(tic); - printLine(console); commandDone(console); console->active = true;
Testing: Use the HAVE_JPEG env var to include extra files
@@ -64,6 +64,15 @@ tigge_af_ecmwf.grib2 tigge_cf_ecmwf.grib2 " +set +u +# Check HAVE_JPEG is defined and is equal to 1 +if [ "x$HAVE_JPEG" != x ]; then + if [ $HAVE_JPEG -eq 1 ]; then + # Include files which have messages with grid_jpeg packing + files="jpeg.grib2 multi.grib2 reduced_gaussian_surface_jpeg.grib2 v.grib2 "$files + fi +fi + for file in $files; do if [ -f ${data_dir}/$file ]; then ${tools_dir}/grib_dump -Da ${data_dir}/$file > $temp 2>&1
Alternate way to add debug menu
#include "Image.h" #include <spdlog/spdlog.h> +#include <mhook-lib/mhook.h> -void UnlockMenuPatch(Image* apImage) +void HookIsFinal(void* a, uint64_t* b, char* c) +{ + (*b)++; + if (c) + *c = 0; +} + +using TRegisterScriptFunction = void(void* a, uint64_t hash, uint64_t hash2, void* func); +TRegisterScriptFunction* RealRegisterScriptFunction = nullptr; + +void HookRegisterScriptFunction(void* a, uint64_t hash, uint64_t hash2, void* func) { - uint8_t* pAddress = nullptr; + if (hash == 0x7515013363B1C987ull) + func = &HookIsFinal; + RealRegisterScriptFunction(a, hash, hash2, func); +} + +void UnlockMenuPatch(Image* apImage) +{ if (apImage->version == Image::MakeVersion(1, 4)) { - pAddress = reinterpret_cast<uint8_t*>(apImage->base_address + 0x207c4b); + RealRegisterScriptFunction = reinterpret_cast<TRegisterScriptFunction*>(apImage->base_address + 0x224C70); } else { @@ -16,10 +33,6 @@ void UnlockMenuPatch(Image* apImage) return; } - DWORD oldProtect = 0; - VirtualProtect(pAddress, 8, PAGE_EXECUTE_WRITECOPY, &oldProtect); - *pAddress = 0; - VirtualProtect(pAddress, 8, oldProtect, nullptr); - + Mhook_SetHook(reinterpret_cast<void**>(&RealRegisterScriptFunction), &HookRegisterScriptFunction); spdlog::info("\tUnlock menu patch: success"); }
fix: add c++ directive to orka-utils.h
#include <stddef.h> #include <stdint.h> +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + char* orka_load_whole_file(const char filename[], size_t *len); int orka_iso8601_to_unix_ms(char *timestamp, size_t len, void *p_data);
Be a bit more careful in the test of address changes at the client.
@@ -830,7 +830,7 @@ int quic_client(const char* ip_address_text, int server_port, const char * sni, ret = picoquic_prepare_packet(cnx_client, current_time, send_buffer, sizeof(send_buffer), &send_length, &x_to, &x_to_length, &x_from, &x_from_length); - if (migration_started){ + if (migration_started && force_migration == 3){ if (address_updated) { if (picoquic_compare_addr((struct sockaddr *)&x_from, (struct sockaddr *)&client_address) != 0) { fprintf(F_log, "Dropping packet sent from wrong address\n");
Fix installation on Haiku
PREFIX?=/usr/local -INCLUDEDIR=$(PREFIX)/include -BINDIR=$(PREFIX)/bin -LIBDIR=$(PREFIX)/lib +INCLUDEDIR?=$(PREFIX)/include +BINDIR?=$(PREFIX)/bin +LIBDIR?=$(PREFIX)/lib JANET_BUILD?="\"$(shell git log --pretty=format:'%h' -n 1)\"" CLIBS=-lm JANET_TARGET=build/janet JANET_LIBRARY=build/libjanet.so JANET_STATIC_LIBRARY=build/libjanet.a -JANET_PATH?=$(PREFIX)/lib/janet +JANET_PATH?=$(LIBDIR)/janet MANPATH?=$(PREFIX)/share/man/man1/ -PKG_CONFIG_PATH?=$(PREFIX)/lib/pkgconfig +PKG_CONFIG_PATH?=$(LIBDIR)/pkgconfig DEBUGGER=gdb CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -Isrc/conf -fpic -O2 -fvisibility=hidden \ @@ -54,6 +54,7 @@ else ifeq ($(UNAME), Linux) endif # For other unix likes, add flags here! ifeq ($(UNAME), Haiku) + LDCONFIG:= LDFLAGS=-Wl,--export-dynamic endif
Setup: Fix 32bit install
@@ -31,6 +31,9 @@ BOOLEAN SetupExtractBuild( ULONG64 currentLength = 0; mz_zip_archive zip_archive = { 0 }; PPH_STRING extractPath = NULL; + SYSTEM_INFO info; + + GetNativeSystemInfo(&info); #ifdef PH_BUILD_API ULONG resourceLength; @@ -69,7 +72,7 @@ BOOLEAN SetupExtractBuild( fileName = PhConvertUtf8ToUtf16(zipFileStat.m_filename); - if (USER_SHARED_DATA->NativeProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { if (PhStartsWithString2(fileName, L"x32\\", TRUE)) continue; @@ -115,7 +118,7 @@ BOOLEAN SetupExtractBuild( if (PhFindStringInString(fileName, 0, L"usernotesdb.xml") != -1) continue; - if (USER_SHARED_DATA->NativeProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { if (PhStartsWithString2(fileName, L"x32\\", TRUE)) continue;
Add missing examples into examples.cfg
@@ -76,6 +76,8 @@ test-bit@test @nonic @psa ctr=off test-bool@test @nonic @psa ctr=off test-checksum@test @nonic ctr=off test-const-entries@test @nonic ctr=off +test-const-entries-lpm@test @nonic ctr=off +test-const-entries-ternary@test @nonic ctr=off test-control-in-out@test @nonic ctr=off test-default-action@test @nonic @psa ctr=off test-digest@test @nonic @psa @digesttest x_digestdummy @@ -117,6 +119,8 @@ test-bit2 @nic @psa ctr=off test-bool @nic @psa ctr=off test-checksum @nic ctr=off test-const-entries @nic ctr=off +test-const-entries-lpm @nic ctr=off +test-const-entries-ternary @nic ctr=off test-control-in-out @nic ctr=off test-enum @nic @psa ctr=off test-exit @nic @psa ctr=off
Make server responsive for read
@@ -2272,7 +2272,13 @@ int Handler::write_streams() { } if (ndatalen > 0) { - break; + // TODO Returning from here instead of break decreases + // performance, but it decreases "hidden RTT" increase because + // server is unable to read socket timely if it is busy to + // write packets here. + auto ep = static_cast<Endpoint *>(path.path.local.user_data); + ev_io_start(loop_, &ep->wev); + return 0; } } }
acl-plugin: tm: avoid hash calculation dependency on a memory store operation A small store into a middle of a larger structure that was subsequently loaded for calculating the bihash key was noticeably impacting the performance.
@@ -605,7 +605,15 @@ multi_acl_match_get_applied_ace_index (acl_main_t * am, int is_ip6, fa_5tuple_t *pkey++ = *pmatch++ & *pmask++; *pkey++ = *pmatch++ & *pmask++; - kv_key->pkt.mask_type_index_lsb = mask_type_index; + /* + * The use of temporary variable convinces the compiler + * to make a u64 write, avoiding the stall on crc32 operation + * just a bit later. + */ + fa_packet_info_t tmp_pkt = kv_key->pkt; + tmp_pkt.mask_type_index_lsb = mask_type_index; + kv_key->pkt.as_u64 = tmp_pkt.as_u64; + int res = clib_bihash_search_inline_2_48_8 (&am->acl_lookup_hash, &kv, &result);
publish: fetch notebooks on mount
@@ -41,6 +41,7 @@ export default class PublishApp extends React.Component { this.subscription = new Subscription(this.store, this.api, channel); this.subscription.start(); + this.api.fetchNotebooks(); } componentWillUnmount() {
graph-view: fixed issues with scrying for parent hash
^- (unit hash:store) ?~ index ~ ?~ t.index ~ + =/ lngth=@ (dec (lent index)) + =/ ind=index:store `(list atom)`(scag lngth `(list atom)`index) =/ parent=node:store %+ scry-for node:store %+ weld /node/(scot %p ship)/[term] - (index-to-path t.index) + (index-to-path ind) hash.post.parent :: ++ index-to-path
DOCS: Document OSSL_STORE_INFO_PUBKEY in doc/man3/OSSL_STORE_INFO.pod Fixes
@@ -166,7 +166,11 @@ Key parameters. =item OSSL_STORE_INFO_PKEY -A private/public key of some sort. +A keypair or just a private key (possibly with key parameters). + +=item OSSL_STORE_INFO_PUBKEY + +A public key (possibly with key parameters). =item OSSL_STORE_INFO_CERT
ENCODE -> DECODE
@@ -1481,9 +1481,14 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const * audio->ep_in_as_intf_num = 0; usbd_edpt_close(rhport, audio->ep_in); -#if !CFG_TUD_AUDIO_ENABLE_ENCODING // Clear FIFOs, since data is no longer valid +#if !CFG_TUD_AUDIO_ENABLE_ENCODING tu_fifo_clear(&audio->ep_in_ff); +#else + for (uint8_t cnt = 0; cnt < audio->n_tx_supp_ff; cnt++) + { + tu_fifo_clear(&audio->tx_supp_ff[cnt]); + } #endif // Invoke callback - can be used to stop data sampling @@ -1491,14 +1496,6 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const * audio->ep_in = 0; // Necessary? - // Clear support FIFOs if used -#if CFG_TUD_AUDIO_ENABLE_ENCODING - for (uint8_t cnt = 0; cnt < audio->n_tx_supp_ff; cnt++) - { - tu_fifo_clear(&audio->tx_supp_ff[cnt]); - } -#endif - } #endif @@ -1508,9 +1505,14 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const * audio->ep_out_as_intf_num = 0; usbd_edpt_close(rhport, audio->ep_out); -#if !CFG_TUD_AUDIO_ENABLE_ENCODING // Clear FIFOs, since data is no longer valid +#if !CFG_TUD_AUDIO_ENABLE_DECODING tu_fifo_clear(&audio->ep_out_ff); +#else + for (uint8_t cnt = 0; cnt < audio->n_rx_supp_ff; cnt++) + { + tu_fifo_clear(&audio->rx_supp_ff[cnt]); + } #endif // Invoke callback - can be used to stop data sampling @@ -1518,14 +1520,6 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const * audio->ep_out = 0; // Necessary? - // Clear support FIFOs if used -#if CFG_TUD_AUDIO_ENABLE_DECODING - for (uint8_t cnt = 0; cnt < audio->n_rx_supp_ff; cnt++) - { - tu_fifo_clear(&audio->rx_supp_ff[cnt]); - } -#endif - // Close corresponding feedback EP #if CFG_TUD_AUDIO_ENABLE_FEEDBACK_EP usbd_edpt_close(rhport, audio->ep_fb);
Remove boomerang properties member from model struct.
@@ -2126,7 +2126,6 @@ typedef struct int pshotno; // 7-1-2005 now every enemy can have their own "knife" projectile int star; // 7-1-2005 now every enemy can have their own "ninja star" projectiles int bomb; // New projectile type for exploding bombs/grenades/dynamite - s_boomerang_props boomerang_prop; int flash; // Now each entity can have their own flash int bflash; // Flash that plays when an attack is blocked s_dust dust; //Spawn entity during certain actions.
cr50_rma_open: fix version check BRANCH=none TEST=script works with a cr50 running 0.6.2
@@ -468,13 +468,13 @@ class RMAOpen(object): raise ValueError('%s does not have RMA support. Update to at ' 'least %s' % (version, rma_support)) - def _running_version_is_older(self, comp_ver): - """Returns True if running version is older than comp_ver.""" - comp_ver_fields = [int(field) for field in comp_ver.split('.')] + def _running_version_is_older(self, target_ver): + """Returns True if running version is older than target_ver.""" + target_ver_fields = [int(field) for field in target_ver.split('.')] for i, field in enumerate(self.running_ver_fields): - if field < int(comp_ver_fields[i]): - return True + if field > int(target_ver_fields[i]): return False + return True def device_matches_devid(self, devid, device): """Return True if the device matches devid.
Fix Host: validation for .local hostnames.
@@ -206,7 +206,7 @@ _papplClientProcessHTTP( client->host_port = client->system->port; } - ptr = strrchr(client->host_field, '.'); + ptr = strstr(client->host_field, ".local"); if (!isdigit(client->host_field[0] & 255) && client->host_field[0] != '[' && strcmp(client->host_field, client->system->hostname) && strcmp(client->host_field, "localhost") && (!ptr || (strcmp(ptr, ".local") && strcmp(ptr, ".local.")))) {
Disable cpputest's build-in memory_leak_detection completely when ASAN is enabled.
@@ -29,8 +29,8 @@ if (ENABLE_ADDRESS_SANITIZER) set(CMAKE_C_FLAGS "-DCPPUTEST_MEM_LEAK_DETECTION_DISABLED -fsanitize=address -fno-omit-frame-pointer ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "-DCPPUTEST_MEM_LEAK_DETECTION_DISABLED -fsanitize=address -fno-omit-frame-pointer ${CMAKE_CXX_FLAGS}") else () - set(CMAKE_C_FLAGS "-lasan -fsanitize=address -fno-omit-frame-pointer ${CMAKE_C_FLAGS}") - set(CMAKE_CXX_FLAGS "-lasan -fsanitize=address -fno-omit-frame-pointer ${CMAKE_CXX_FLAGS}") + set(CMAKE_C_FLAGS "-DCPPUTEST_MEM_LEAK_DETECTION_DISABLED -lasan -fsanitize=address -fno-omit-frame-pointer ${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "-DCPPUTEST_MEM_LEAK_DETECTION_DISABLED -lasan -fsanitize=address -fno-omit-frame-pointer ${CMAKE_CXX_FLAGS}") endif () endif()
espcoredump: fix error reported for blank partition
@@ -301,7 +301,10 @@ esp_err_t esp_core_dump_image_get(size_t* out_addr, size_t *out_size) uint32_t *dw = (uint32_t *)core_data; *out_size = *dw; spi_flash_munmap(core_data_handle); - if ((*out_size < sizeof(uint32_t)) || (*out_size > core_part->size)) { + if (*out_size == 0xFFFFFFFF) { + ESP_LOGD(TAG, "Blank core dump partition!"); + return ESP_ERR_INVALID_SIZE; + } else if ((*out_size < sizeof(uint32_t)) || (*out_size > core_part->size)) { ESP_LOGE(TAG, "Incorrect size of core dump image: %d", *out_size); return ESP_ERR_INVALID_SIZE; }
Use "raycasting" for determining focus for floating windows Floating containers and their surfaces are ordered in "raised last". This is used to detect the topmost surface and thus the focus.
@@ -151,10 +151,10 @@ struct sway_container *container_find_child(struct sway_container *container, return NULL; } -static void surface_at_view(struct sway_container *con, double lx, double ly, +static struct sway_container *surface_at_view(struct sway_container *con, double lx, double ly, struct wlr_surface **surface, double *sx, double *sy) { if (!sway_assert(con->view, "Expected a view")) { - return; + return NULL; } struct sway_view *view = con->view; double view_sx = lx - view->x + view->geometry.x; @@ -184,7 +184,9 @@ static void surface_at_view(struct sway_container *con, double lx, double ly, *sx = _sx; *sy = _sy; *surface = _surface; + return con; } + return NULL; } /** @@ -354,46 +356,16 @@ static bool surface_is_popup(struct wlr_surface *surface) { struct sway_container *container_at(struct sway_workspace *workspace, double lx, double ly, struct wlr_surface **surface, double *sx, double *sy) { - struct sway_container *c; - // Focused view's popups - struct sway_seat *seat = input_manager_current_seat(input_manager); - struct sway_container *focus = seat_get_focused_container(seat); - bool is_floating = focus && container_is_floating_or_child(focus); - // Focused view's popups - if (focus && focus->view) { - surface_at_view(focus, lx, ly, surface, sx, sy); - if (*surface && surface_is_popup(*surface)) { - return focus; - } - *surface = NULL; - } - // If focused is floating, focused view's non-popups - if (focus && focus->view && is_floating) { - // only switch to unfocused container if focused container has no menus open - bool has_subsurfaces = wl_list_length(&focus->view->surface->subsurfaces) > 0; - c = floating_container_at(lx, ly, surface, sx, sy); - if (!has_subsurfaces && c && c->view && *surface && c != focus) { - return c; - } + struct sway_container *c = NULL; - surface_at_view(focus, lx, ly, surface, sx, sy); - if (*surface) { - return focus; - } - *surface = NULL; - } - // Floating (non-focused) - if ((c = floating_container_at(lx, ly, surface, sx, sy))) { + // First cast a ray to handle floating windows + for (int i = workspace->floating->length - 1; i >= 0; --i) { + struct sway_container *cn = workspace->floating->items[i]; + if (cn->view && (c = surface_at_view(cn, lx, ly, surface, sx, sy))) { return c; } - // If focused is tiling, focused view's non-popups - if (focus && focus->view && !is_floating) { - surface_at_view(focus, lx, ly, surface, sx, sy); - if (*surface) { - return focus; - } - *surface = NULL; } + // Tiling (non-focused) if ((c = tiling_container_at(&workspace->node, lx, ly, surface, sx, sy))) { return c;
ExtendedNotifications: Improve logfile performance, Add environment string path support, Add relative path support
* file logging * * Copyright (C) 2010 wj32 + * Copyright (C) 2021 dmex * * This file is part of Process Hacker. * @@ -38,14 +39,23 @@ VOID FileLogInitialization( { NTSTATUS status; PPH_STRING fileName; + PPH_STRING directory; fileName = PhaGetStringSetting(SETTING_NAME_LOG_FILENAME); if (!PhIsNullOrEmptyString(fileName)) { + fileName = PH_AUTO(PhExpandEnvironmentStrings(&fileName->sr)); + + if (PhDetermineDosPathNameType(fileName->Buffer) == RtlPathTypeRelative) + { + directory = PH_AUTO(PhGetApplicationDirectory()); + fileName = PH_AUTO(PhConcatStringRef2(&directory->sr, &fileName->sr)); + } + status = PhCreateFileStream( &LogFileStream, - fileName->Buffer, + PhGetString(fileName), FILE_GENERIC_WRITE, FILE_SHARE_READ, FILE_OPEN_IF, @@ -72,12 +82,39 @@ VOID NTAPI LoggedCallback( PPH_LOG_ENTRY logEntry = Parameter; if (logEntry) + { + PPH_STRING datetimeString; + PPH_STRING messageString; + SIZE_T returnLength; + PH_FORMAT format[4]; + WCHAR formatBuffer[0x100]; + + datetimeString = PhaFormatDateTime(NULL); + messageString = PH_AUTO_T(PH_STRING, PhFormatLogEntry(logEntry)); + + // %s: %s\r\n + PhInitFormatSR(&format[0], datetimeString->sr); + PhInitFormatS(&format[1], L": "); + PhInitFormatSR(&format[2], messageString->sr); + PhInitFormatS(&format[3], L"\r\n"); + + if (PhFormatToBuffer(format, RTL_NUMBER_OF(format), formatBuffer, sizeof(formatBuffer), &returnLength)) + { + PH_STRINGREF messageSr; + + messageSr.Buffer = formatBuffer; + messageSr.Length = returnLength - sizeof(UNICODE_NULL); + + PhWriteStringAsUtf8FileStream(LogFileStream, &messageSr); + } + else { PhWriteStringFormatAsUtf8FileStream( LogFileStream, L"%s: %s\r\n", - PhaFormatDateTime(NULL)->Buffer, - PH_AUTO_T(PH_STRING, PhFormatLogEntry(logEntry))->Buffer + PhGetString(datetimeString), + PhGetString(messageString) ); } } +}
Add dcd_edpt_iso_xfer() to dcd_template.c
*/ #include "tusb_option.h" +#include "common/tusb_fifo.h" #if CFG_TUSB_MCU == OPT_MCU_NONE @@ -104,6 +105,16 @@ bool dcd_edpt_xfer (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t return false; } +// Submit a transfer where is managed by FIFO, When complete dcd_event_xfer_complete() is invoked to notify the stack +bool dcd_edpt_iso_xfer (uint8_t rhport, uint8_t ep_addr, tu_fifo_t * ff, uint16_t total_bytes) +{ + (void) rhport; + (void) ep_addr; + (void) ff; + (void) total_bytes; + return false; +} + // Stall endpoint void dcd_edpt_stall (uint8_t rhport, uint8_t ep_addr) {
Another homebridge-install log tweak
@@ -67,6 +67,10 @@ function logInstallVersion { echo "UPDATE_VERSION_HB_LIB = $UPDATE_VERSION_HB_LIB" >> "$LOG_DIR/LOG_HOMEBRIDGE_INSTALL_$LOGFILE_DATE" echo "UPDATE_VERSION_NPM = $UPDATE_VERSION_NPM" >> "$LOG_DIR/LOG_HOMEBRIDGE_INSTALL_$LOGFILE_DATE" echo "UPDATE_VERSION_NODE = $UPDATE_VERSION_NODE" >> "$LOG_DIR/LOG_HOMEBRIDGE_INSTALL_$LOGFILE_DATE" + LOG_VER_NODEJS= + LOG_VER_NPM= + LOG_VER_HOMEBRIDGE= + LOG_VER_HOMEBRIDGE_HUE= fi if [[ "$1" = "nodejs" ]]; then
Fix, add Get for ScoreFunction print Note: mandatory check (NEED_CHECK) was skipped
@@ -510,7 +510,7 @@ void NCatboostOptions::TCatBoostOptions::SetNotSpecifiedOptionsToDefaults() { if (ObliviousTreeOptions->ScoreFunction != EScoreFunction::Correlation && ObliviousTreeOptions->ScoreFunction != EScoreFunction::NewtonCorrelation) { CB_ENSURE(BoostingOptions->BoostingType == EBoostingType::Plain, - "Score function " << ObliviousTreeOptions->ScoreFunction << " can't be used with ordered boosting"); + "Score function " << ObliviousTreeOptions->ScoreFunction.Get() << " can't be used with ordered boosting"); } if (ObliviousTreeOptions->GrowPolicy == EGrowPolicy::Lossguide) {
Close socket request will abort tcp write/connect When tcp write/connect is running, close socket request will abort it and continue to delete netconn and close tcp. Do not immediately return after aborting tcp write/connect. Otherwise, tcp close requeset will block and tcp write/connect will crash.
@@ -1085,12 +1085,6 @@ lwip_netconn_do_delconn(void *m) } else #endif /* LWIP_NETCONN_FULLDUPLEX */ { - if (!(state != NETCONN_CONNECT || IN_NONBLOCKING_CONNECT(msg->conn))) { - msg->err = ERR_INPROGRESS; - NETCONN_SET_SAFE_ERR(msg->conn, ERR_INPROGRESS); - LWIP_DEBUGF(API_MSG_DEBUG, ("netconn error:ERR_INPROGRESS\n")); - return; - } /* Drain and delete mboxes */ netconn_drain(msg->conn);
lv_objx_templ: create 'Add/remove functions' section
@@ -47,7 +47,7 @@ static bool lv_templ_design(lv_obj_t * templ, const area_t * mask, lv_design_mod *-----------------*/ /** - * Create a template objects + * Create a template object * @param par pointer to an object, it will be the parent of the new template * @param copy pointer to a template object, if not NULL then the new object will be copied from it * @return pointer to the created template @@ -111,6 +111,15 @@ bool lv_templ_signal(lv_obj_t * templ, lv_signal_t sign, void * param) return valid; } +/*====================== + * Add/remove functions + *=====================*/ + +/* + * New object specific "add" or "remove" functions come here + */ + + /*===================== * Setter functions *====================*/
Update deprecated.html fix def name TILE_SYSTEMLENGTH
@@ -389,7 +389,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); <p><a class="anchor" id="_deprecated000052"></a> </p> <dl> <dt>Member <a class="el" href="vdp_8h.html#a52e41f780a406576cb0c48a63586c57b">TILE_SYSTEM_LENGHT</a> </dt> -<dd>Use TILE_SYSTEMLENGTH instead. </dd> +<dd>Use TILE_SYSTEM_LENGTH instead. </dd> </dl> <p><a class="anchor" id="_deprecated000066"></a> </p> <dl>
jenkins: do not test if file exists
@@ -1227,13 +1227,9 @@ def withPermissions(listOfFiles, perm, cl) { echo "Entering withPermissions" permissionsMap = [:] listOfFiles.each { - if(fileExists(it)) { def permOld = getPermissions(it) permissionsMap[it] = permOld setPermissions(it, perm) - } else { - error "File $it does not exist. Can not set permissions" - } } try { cl()
remove dev-time modifications to manage.c
@@ -1830,8 +1830,6 @@ u3m_boot(c3_c* dir_c) if ( c3n == nuu_o ) { u3j_ream(); u3n_ream(); - // TODO: remove me before PR - u3m_reclaim(); return u3A->eve_d; } else { @@ -1926,4 +1924,3 @@ u3m_pack(void) return (u3a_open(u3R) - pre_w); } -
added min/max timestamp to status display
@@ -162,11 +162,16 @@ static long int eapolm32e3count; static long int eapolm34e3count; static long int eapolm34e4count; + static uint64_t timestampstart; +static uint64_t timestampmin; +static uint64_t timestampmax; + static uint32_t eapoltimeoutvalue; static uint64_t ncvalue; static int essidsvalue; + static int nmealen; static bool ignoreieflag; @@ -324,7 +329,7 @@ return true; /*===========================================================================*/ static void printcontentinfo() { -if(nmeacount > 0) printf("NMEA sentence .........................: %ld\n", nmeacount); +if(nmeacount > 0) printf("NMEA sentence..........................: %ld\n", nmeacount); if(endianess == 0) printf("endianess..............................: little endian\n"); else printf("endianess..............................: big endian\n"); if(rawpacketcount > 0) printf("packets inside.........................: %ld\n", rawpacketcount); @@ -387,6 +392,19 @@ return; /*===========================================================================*/ static void printlinklayerinfo() { +static struct timeval tvmin; +static struct timeval tvmax; +static char timestringmin[32]; +static char timestringmax[32]; + +tvmin.tv_sec = timestampmin /1000000; +tvmin.tv_usec = timestampmin %1000000; +strftime(timestringmin, 32, "%d.%m.%Y %H:%M:%S", localtime(&tvmin.tv_sec)); +tvmax.tv_sec = timestampmax /1000000; +tvmax.tv_usec = timestampmax %1000000; +strftime(timestringmax, 32, "%d.%m.%Y %H:%M:%S", localtime(&tvmax.tv_sec)); +printf("timestamp minimum .....................: %s\n", timestringmin); +printf("timestamp maximum .....................: %s\n", timestringmax); if(dltlinktype == DLT_IEEE802_11_RADIO) printf("link layer header type.................: DLT_IEEE802_11_RADIO (%d)\n", dltlinktype); if(dltlinktype == DLT_IEEE802_11) printf("link layer header type.................: DLT_IEEE802_11 (%d)\n", dltlinktype); if(dltlinktype == DLT_PPI) printf("link layer header type.................: DLT_PPI (%d)\n", dltlinktype); @@ -2076,6 +2094,9 @@ static avs_t *avs; static fcs_t *fcs; static uint32_t crc; +if(timestampmin == 0) timestampmin = captimestamp; +if(timestampmin > captimestamp) timestampmin = captimestamp; +if(timestampmax < captimestamp) timestampmax = captimestamp; if(captimestamp == 0) { captimestamp = timestampstart;
runtime: fix a bug where the scheduler could steal from runqueues before they were initialized
#include "defs.h" +static pthread_barrier_t init_barrier; + static int runtime_init_thread(void) { int ret; @@ -43,6 +45,7 @@ static void *pthread_entry(void *data) ret = runtime_init_thread(); BUG_ON(ret); + pthread_barrier_wait(&init_barrier); sched_start(); /* never reached unless things are broken */ @@ -54,18 +57,23 @@ static void *pthread_entry(void *data) * runtime_init - starts the runtime * @main_fn: the first function to run as a thread * @arg: an argument to @main_fn - * @cores: the number of cores to use + * @cores: the number of threads to use * * Does not return if successful, otherwise return < 0 if an error. */ -int runtime_init(thread_fn_t main_fn, void *arg, unsigned int cores) +int runtime_init(thread_fn_t main_fn, void *arg, unsigned int threads) { pthread_t tid[NCPU]; int ret, i; - if (cores < 1) + if (threads < 1) return -EINVAL; + if (pthread_barrier_init(&init_barrier, NULL, threads) == -1) { + log_err("pthread_barrier_init() failed, ret = %d", -errno); + return -errno; + } + ret = base_init(); if (ret) { log_err("base_init() failed, ret = %d", ret); @@ -86,7 +94,7 @@ int runtime_init(thread_fn_t main_fn, void *arg, unsigned int cores) /* point of no return starts here */ - for (i = 1; i < cores; i++) { + for (i = 1; i < threads; i++) { ret = pthread_create(&tid[i], NULL, pthread_entry, NULL); BUG_ON(ret); } @@ -97,6 +105,7 @@ int runtime_init(thread_fn_t main_fn, void *arg, unsigned int cores) ret = thread_spawn_main(main_fn, arg); BUG_ON(ret); + pthread_barrier_wait(&init_barrier); sched_start(); /* never reached unless things are broken */
Update fpgaRegisterEvent comments Specify that flags argument will be used to represent vector ID in case of user interrupts
@@ -83,6 +83,10 @@ fpga_result fpgaDestroyEventHandle(fpga_event_handle *event_handle); * The event_handle points to an OS specific mechanism for event notification. * An event_handle is associated with only a single event. * + * In case of user interrupts, the flags parameter will be used to specify + * the vector ID. The value of the flags parameter indicates the vector ID, + * no bit encoding is used. + * * @todo define if calling fpgaRegisterEvent multiple times with the * same event_handle is an error condition or if it is silently ignored. *
Prefix function names with elektra
@@ -13,10 +13,10 @@ class CSupport(Support): raise Exception("invalid keyname " + key) def getfuncname(self, key): - return "get"+self.funcname(key) + return "elektraGet"+self.funcname(key) def setfuncname(self, key): - return "set"+self.funcname(key) + return "elektraSet"+self.funcname(key) def funcpretty(self, key): return ''.join(x for x in key.title() if not x == '/' and not x == '_')
Trivial typo fix in README.
@@ -177,9 +177,9 @@ Issues: opened (around 15). Specifically, I see failures to start NSH in the windows so they come up blank. All other behaviors seem normal. Most likely, some NxTerm resource allocation is failing silently and leaving - things in an unusable. The board I am using has 128Mb of SDRAM so I - can't believe that memory is the limiting factor. These are, however, - RAM-backed windows and will use significant amounts of memory. + things in an unusable state. The board I am using has 128Mb of SDRAM + so I can't believe that memory is the limiting factor. These are, + however, RAM-backed windows and will use significant amounts of memory. The primary issue is that the number of windows should probably be managed in some way to assure that the end-user does not experience odd behaviors when resource usage is high.
fix of anticipation
@@ -114,6 +114,7 @@ Decision Decision_RealizeGoal(Event *goal, long currentTime) postcon_c->anticipation_operation_id[i] = decision.operationID; IN_DEBUG( printf("ANTICIPATE future=%ld variance=%ld\n", bestImp.occurrenceTimeOffset,bestImp.variance); ) stampID--; + break; } } //EMD anticipation
apps/nshlib/README.txt: Clarify arguments to the mkrd command.
@@ -797,8 +797,8 @@ o mkrd [-m <minor>] [-s <sector-size>] <nsectors> Create a ramdisk consisting of <nsectors>, each of size <sector-size> (or 512 bytes if <sector-size> is not specified. - The ramdisk will be registered as /dev/ram<n> (if <n> is not - specified, mkrd will attempt to register the ramdisk as + The ramdisk will be registered as /dev/ram<minor>. If <minor> is + not specified, mkrd will attempt to register the ramdisk as /dev/ram0. Example:
Benchmarks: Opmphm: fix format for ssize_t
@@ -1005,7 +1005,7 @@ static void benchmarkPrintAllKeySetShapes (void) { printf ("%s\n", keyName (key)); } - printf ("\n ======================== size %li ========================\n\n", ksGetSize (ks)); + printf ("\n ======================== size %zd ========================\n\n", ksGetSize (ks)); } ksDel (ks); }
Fix warning C6287
@@ -383,12 +383,13 @@ VOID PvPeProperties( // EH continuation page { BOOLEAN has_ehcont = FALSE; + if (PvMappedImage.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { if (NT_SUCCESS(PhGetMappedImageLoadConfig32(&PvMappedImage, &config32)) && RTL_CONTAINS_FIELD(config32, config32->Size, GuardEHContinuationCount)) { - if (config32->GuardEHContinuationCount && config32->GuardEHContinuationCount) + if (config32->GuardEHContinuationCount) has_ehcont = TRUE; } } @@ -397,7 +398,7 @@ VOID PvPeProperties( if (NT_SUCCESS(PhGetMappedImageLoadConfig64(&PvMappedImage, &config64)) && RTL_CONTAINS_FIELD(config64, config64->Size, GuardEHContinuationCount)) { - if (config64->GuardEHContinuationCount && config64->GuardEHContinuationCount) + if (config64->GuardEHContinuationCount) has_ehcont = TRUE; } }
CMSIS-DSP: Update to the README Additional info about the compilation defines for FFT tables and the Python configuration script.
@@ -119,18 +119,18 @@ Some new compilations symbols have been introduced to avoid including all the ta If no new symbol is defined, everything will behave as usual. If ARM_DSP_CONFIG_TABLES is defined then the new symbols will be taken into account. -Then you can select all FFT tables or all interpolation tables by defining following compilation symbols: +It is strongly suggested to use the new Python script cmsisdspconfig.py to generate the -D options to use on the compiler command line. -* ARM_ALL_FFT_TABLES : All FFT tables are included -* ARM_ALL_FAST_TABLES : All interpolation tables are included + pip install streamlit + streamlit run cmsisdspconfig.py -If more control is required, there are other symbols but it is not always easy to know which ones need to be enabled for a given use case. - -If you use cmake, it is easy since high level options are defined and they will select the right compilation symbols. If you don't use cmake, you can just look at fft.cmake to see which compilation symbols are needed. +If you use cmake, it is also easy since high level options are defined and they will select the right compilation symbols. For instance, if you want to use the arm_rfft_fast_f32, in fft.cmake you'll see an option RFFT_FAST_F32_32. -We see that following symbols need to be enabled : +If you don't use cmake nor the Python script, you can just look at fft.cmake or interpol.cmake in Source to see which compilation symbols are needed. + +We see, for arm_rfft_fast_f32, that the following symbols need to be enabled : * ARM_TABLE_TWIDDLECOEF_F32_16 * ARM_TABLE_BITREVIDX_FLT_16
cheza: Enable RTC EC/host command BRANCH=none TEST='rtc' command in ec console and 'ectool rtcget' in ap console Commit-Ready: ChromeOS CL Exonerator Bot Tested-by: Philip Chen
#define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP +/* RTC */ +#define CONFIG_CMD_RTC +#define CONFIG_HOSTCMD_RTC + /* Sensors */ #define CONFIG_ACCELGYRO_BMI160 #define CONFIG_ACCEL_INTERRUPTS
out_http: fix leak on exception (CID 183993)
@@ -251,6 +251,7 @@ struct flb_out_http *flb_http_conf_create(struct flb_output_instance *ins, if (sentry->last_pos == len) { /* Missing value */ flb_error("[out_http] missing header value"); + flb_free(header); flb_utils_split_free(split); flb_http_conf_destroy(ctx); return NULL;
VERSION bump to version 1.1.19
@@ -44,7 +44,7 @@ set(CMAKE_C_FLAGS_PACKAGE "-g -O2 -DNDEBUG") # micro version is changed with a set of small changes or bugfixes anywhere in the project. set(LIBNETCONF2_MAJOR_VERSION 1) set(LIBNETCONF2_MINOR_VERSION 1) -set(LIBNETCONF2_MICRO_VERSION 18) +set(LIBNETCONF2_MICRO_VERSION 19) set(LIBNETCONF2_VERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION}.${LIBNETCONF2_MICRO_VERSION}) # Version of the library
[firechip] Update legacy firechip config
@@ -201,8 +201,6 @@ class FireSimCVA6Config extends Config( //*********************************************************************************/ class FireSimMulticlockRocketConfig extends Config( new chipyard.config.WithTileFrequency(6400.0) ++ //lol - new WithDefaultFireSimBridges ++ - new WithDefaultMemModel ++ - new WithFireSimConfigTweaks ++ - new chipyard.DividedClockRocketConfig) + new freechips.rocketchip.subsystem.WithRationalRocketTiles ++ // Add rational crossings between RocketTile and uncore + new FireSimRocketConfig)
Include deprecated SYS_F_xxx codes
@@ -159,6 +159,34 @@ typedef struct err_state_st { # define ERR_GET_REASON(l) (int)( (l) & 0xFFFL) # define ERR_FATAL_ERROR(l) (int)( (l) & ERR_R_FATAL) +# if !OPENSSL_API_3 +# define SYS_F_FOPEN 0 +# define SYS_F_CONNECT 0 +# define SYS_F_GETSERVBYNAME 0 +# define SYS_F_SOCKET 0 +# define SYS_F_IOCTLSOCKET 0 +# define SYS_F_BIND 0 +# define SYS_F_LISTEN 0 +# define SYS_F_ACCEPT 0 +# define SYS_F_WSASTARTUP 0 +# define SYS_F_OPENDIR 0 +# define SYS_F_FREAD 0 +# define SYS_F_GETADDRINFO 0 +# define SYS_F_GETNAMEINFO 0 +# define SYS_F_SETSOCKOPT 0 +# define SYS_F_GETSOCKOPT 0 +# define SYS_F_GETSOCKNAME 0 +# define SYS_F_GETHOSTBYNAME 0 +# define SYS_F_FFLUSH 0 +# define SYS_F_OPEN 0 +# define SYS_F_CLOSE 0 +# define SYS_F_IOCTL 0 +# define SYS_F_STAT 0 +# define SYS_F_FCNTL 0 +# define SYS_F_FSTAT 0 +# define SYS_F_SENDFILE 0 +# endif + /* reasons */ # define ERR_R_SYS_LIB ERR_LIB_SYS/* 2 */ # define ERR_R_BN_LIB ERR_LIB_BN/* 3 */
Update widget width computation
@@ -191,6 +191,7 @@ void Widget_ExecUpdateLayout( LCUI_Widget w ) ctx->current = node->data; if( ctx->current->computed_style.position != SV_STATIC && ctx->current->computed_style.position != SV_RELATIVE ) { + Widget_AddState( ctx->current, WSTATE_LAYOUTED ); continue; } switch( ctx->current->computed_style.display ) {
board/mushu/board.h: Format with clang-format BRANCH=none TEST=none
#define CONFIG_HOST_INTERFACE_ESPI #undef CONFIG_CMD_MFALLOW - #undef CONFIG_UART_TX_BUF_SIZE #define CONFIG_UART_TX_BUF_SIZE 4096 /* Keyboard features */ #define CONFIG_PWM_KBLIGHT - /* Sensors */ /* BMI160 Base accel/gyro */ #define CONFIG_ACCELGYRO_BMI160 @@ -174,12 +172,7 @@ enum sensor_id { SENSOR_COUNT, }; -enum pwm_channel { - PWM_CH_KBLIGHT, - PWM_CH_FAN, - PWM_CH_FAN2, - PWM_CH_COUNT -}; +enum pwm_channel { PWM_CH_KBLIGHT, PWM_CH_FAN, PWM_CH_FAN2, PWM_CH_COUNT }; enum fan_channel { FAN_CH_0 = 0, @@ -212,7 +205,6 @@ enum battery_type { BATTERY_TYPE_COUNT, }; - #undef PD_OPERATING_POWER_MW #define PD_OPERATING_POWER_MW 15000 #undef PD_MAX_POWER_MW
Don't write out a bad OID If we don't have OID data for an object then we should fail if we are asked to encode the ASN.1 for that OID. Fixes
@@ -528,6 +528,8 @@ static int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype, otmp = (ASN1_OBJECT *)*pval; cont = otmp->data; len = otmp->length; + if (cont == NULL || len == 0) + return -1; break; case V_ASN1_NULL:
[Readme] Duplicate of media_player_color param
@@ -142,7 +142,6 @@ A partial list of parameters are below. See the config file for a complete list. | `vsync`<br> `gl_vsync` | Set vsync for OpenGL or Vulkan | | `media_player` | Show media player metadata | | `media_player_name` | Set main media player DBus service name without the `org.mpris.MediaPlayer2` part, like `spotify`, `vlc`, `audacious` or `cantata`. Defaults to `spotify`. | -| `media_player_color` | Change color of media player text | | `font_scale_media_player` | Change size of media player text relative to font_size | | `io_read`<br> `io_write` | Show non-cached IO read/write, in MiB/s | | `pci_dev` | Select GPU device in multi-gpu setups |
added lacking Out specializations
@@ -94,6 +94,26 @@ void Out<IRemoteAddr>(IOutputStream& out, const IRemoteAddr& addr) { PrintAddr<true>(out, addr); } +template <> +void Out<NAddr::TAddrInfo>(IOutputStream& out, const NAddr::TAddrInfo& addr) { + PrintAddr<true>(out, addr); +} + +template <> +void Out<NAddr::TIPv4Addr>(IOutputStream& out, const NAddr::TIPv4Addr& addr) { + PrintAddr<true>(out, addr); +} + +template <> +void Out<NAddr::TIPv6Addr>(IOutputStream& out, const NAddr::TIPv6Addr& addr) { + PrintAddr<true>(out, addr); +} + +template <> +void Out<NAddr::TOpaqueAddr>(IOutputStream& out, const NAddr::TOpaqueAddr& addr) { + PrintAddr<true>(out, addr); +} + void NAddr::PrintHost(IOutputStream& out, const IRemoteAddr& addr) { PrintAddr<false>(out, addr); }
added ESSID to device info list
@@ -1026,6 +1026,7 @@ for(zeigermac = aplist; zeigermac < aplistptr; zeigermac++) fprintf(fh_deviceinfo, "\t"); for(p = 0; p < zeigermac->enrolleelen; p++) fprintf(fh_deviceinfo, "%02x", zeigermac->enrollee[p]); } + fwritedeviceinfostr(zeigermac->essidlen, zeigermac->essid, fh_deviceinfo); fprintf(fh_deviceinfo, "\n"); deviceinfocount++; }
added missing PyImathMatrix22.cpp to Makefile.am, for the autotools build.
@@ -19,6 +19,7 @@ libPyImath_la_SOURCES = PyImath.cpp \ PyImathFixedArray.cpp \ PyImathFrustum.cpp \ PyImathLine.cpp \ + PyImathMatrix22.cpp \ PyImathMatrix33.cpp \ PyImathMatrix44.cpp \ PyImathPlane.cpp \
api: fix memcpy argument in oc_rep_encoder_create_map Copy the size of the struct and not the size of the pointer to struct
@@ -1172,7 +1172,7 @@ oc_rep_encoder_create_map(CborEncoder *encoder, CborEncoder *mapEncoder, CborEncoder prevMapEncoder; memcpy(&prevMapEncoder, mapEncoder, sizeof(prevMapEncoder)); CborEncoder prevEncoder; - memcpy(&prevEncoder, encoder, sizeof(encoder)); + memcpy(&prevEncoder, encoder, sizeof(prevEncoder)); CborError err = oc_rep_encoder_create_map_internal(encoder, mapEncoder, length); if (err == CborErrorOutOfMemory) { @@ -1181,7 +1181,7 @@ oc_rep_encoder_create_map(CborEncoder *encoder, CborEncoder *mapEncoder, return err; } memcpy(mapEncoder, &prevMapEncoder, sizeof(prevMapEncoder)); - memcpy(encoder, &prevEncoder, sizeof(encoder)); + memcpy(encoder, &prevEncoder, sizeof(prevEncoder)); return oc_rep_encoder_create_map_internal(encoder, mapEncoder, length); } return err;
mark as yet unreleased
@@ -14,4 +14,4 @@ Torres Porres \, Derek Kwan and Matt Barber; #X text 26 135 FOLLOWING DEVELOPERS: Hans-Christoph Steiner (2005-2013) and Fred Jan Kraan (dec/2014 - feb/2016); #X text 26 67 VERSION: 0.3-beta-3, f 57; -#X text 26 84 RELEASE_DATE: 2017 \, july 3rd, f 57; +#X text 26 84 RELEASE_DATE: unreleased, f 57;
mcu/nrf5340: Fix uart device names
@@ -88,7 +88,7 @@ static const struct nrf5340_uart_cfg os_bsp_uart1_cfg = { }; #endif #if MYNEWT_VAL(UART_2) -static struct uart_dev os_bsp_uart0; +static struct uart_dev os_bsp_uart2; static const struct nrf5340_uart_cfg os_bsp_uart2_cfg = { .suc_pin_tx = MYNEWT_VAL(UART_2_PIN_TX), .suc_pin_rx = MYNEWT_VAL(UART_2_PIN_RX), @@ -97,7 +97,7 @@ static const struct nrf5340_uart_cfg os_bsp_uart2_cfg = { }; #endif #if MYNEWT_VAL(UART_3) -static struct uart_dev os_bsp_uart0; +static struct uart_dev os_bsp_uart3; static const struct nrf5340_uart_cfg os_bsp_uart3_cfg = { .suc_pin_tx = MYNEWT_VAL(UART_3_PIN_TX), .suc_pin_rx = MYNEWT_VAL(UART_3_PIN_RX),
Correct string size for classes and strings
@@ -419,7 +419,7 @@ char *setToString(Value value) { char *classToString(Value value) { ObjClass *klass = AS_CLASS(value); - char *classString = malloc(sizeof(char) * (klass->name->length + 6)); + char *classString = malloc(sizeof(char) * (klass->name->length + 7)); memcpy(classString, "<cls ", 5); memcpy(classString + 5, klass->name->chars, klass->name->length); memcpy(classString + 5 + klass->name->length, ">", 1); @@ -429,7 +429,7 @@ char *classToString(Value value) { char *instanceToString(Value value) { ObjInstance *instance = AS_INSTANCE(value); - char *instanceString = malloc(sizeof(char) * (instance->klass->name->length + 11)); + char *instanceString = malloc(sizeof(char) * (instance->klass->name->length + 12)); memcpy(instanceString, "<", 1); memcpy(instanceString + 1, instance->klass->name->chars, instance->klass->name->length); memcpy(instanceString + 1 + instance->klass->name->length, " instance>", 10);
Save unit tests output to file Seperate output of different script stages
import tests_config import os import commands +import sys script_path = os.path.dirname(os.path.realpath(__file__)) @@ -22,7 +23,7 @@ if not os.path.isdir(main_UT_dir + "ocf_env" + os.sep + "ocf"): try: os.makedirs(main_UT_dir + "ocf_env" + os.sep + "ocf") except Exception: - print "Cannot crate ocf_env/ocf directory!" + print "Cannot create ocf_env/ocf directory!" status, output = commands.getstatusoutput("cp " + main_tested_dir +\ "inc" + os.sep + "*" + " " + main_UT_dir + "ocf_env" + os.sep + "ocf") @@ -39,8 +40,29 @@ if not os.path.isdir(build_dir): try: os.makedirs(build_dir) except Exception: - print "Cannot crate build directory!" + print "Cannot create build directory!" -status, output = commands.getstatusoutput("cd " + build_dir + " && cmake .. && make && make test") +cmake_status, cmake_output = commands.getstatusoutput("cd " + build_dir + " && cmake ..") +print cmake_output +with open('cmake.output', 'w') as f: + f.write(cmake_output) -print output +if cmake_status != 0: + with open('tests.output', 'w') as f: + f.write("Cmake step failed! More details in cmake.output.") + sys.exit(1) + +make_status, make_output = commands.getstatusoutput("cd " + build_dir + " && make") +print make_output +with open('make.output', 'w') as f: + f.write(make_output) + +if make_status != 0: + with open('tests.output', 'w') as f: + f.write("Make step failed! More details in make.output.") + sys.exit(1) + +test_status, test_output = commands.getstatusoutput("cd " + build_dir + " && make test") +print test_output +with open('tests.output', 'w') as f: + f.write(test_output)
GRIB2 v30 is now official
# This gets updated twice a year by WMO. # See https://community.wmo.int/activity-areas/wmo-codes/manual-codes/latest-version -constant tablesVersionLatestOfficial = 29 : edition_specific; +constant tablesVersionLatestOfficial = 30 : edition_specific; # If this is different from the official version, then it is the pre-operational version constant tablesVersionLatest = 30 : edition_specific;
added detection of EAP-SIM (GSM Subscriber Modules) Authentication
@@ -315,7 +315,7 @@ if((accesspointhdliste = calloc((APHDLISTESIZEMAX +1), APHDL_SIZE)) == NULL) return true; } /*===========================================================================*/ -void printmacdir(uint8_t *mac1, uint8_t *mac2, uint8_t tods, uint8_t fromds, uint8_t eapcode, char *infostring) +void printmaceapcode(uint8_t *mac1, uint8_t *mac2, uint8_t tods, uint8_t fromds, uint8_t eapcode, char *infostring) { int m; time_t t = time(NULL); @@ -400,12 +400,10 @@ if((idlen > 0) && (idlen <= 256)) { memset(&idstring, 0, 258); memcpy(idstring, eapidentity->identity, idlen); - printmacdir(mac1, mac2, tods, fromds, eapcode, idstring); + printmaceapcode(mac1, mac2, tods, fromds, eapcode, idstring); } return; } - -/*===========================================================================*/ /*===========================================================================*/ int getwpskey(eapext_t *eapext) { @@ -1423,6 +1421,20 @@ while(1) continue; } + /* power save */ + if((macf->type == MAC_TYPE_DATA) && ((macf->subtype == MAC_ST_NULL)|| (macf->subtype == MAC_ST_QOSNULL))) + { + if((macf->to_ds == 1) && (macf->from_ds == 0) && (macf->power == 0)) + { + if(checkapstahds(macf->addr1.addr, macf->addr2.addr) == false) + { + if(disassocflag == true) + send_deauthentication(MAC_ST_DISASSOC, WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, macf->addr2.addr, macf->addr1.addr); + } + } + continue; + } + if((macf->type != MAC_TYPE_DATA) || (macl +LLC_SIZE > pkh->len)) continue; @@ -1437,6 +1449,7 @@ while(1) } continue; } + /* check handshake frames */ if((ntohs(((llc_t*)payload)->type) == LLC_TYPE_AUTH)) { @@ -1535,7 +1548,15 @@ while(1) printidentity(macf->addr1.addr, macf->addr2.addr, macf->to_ds, macf->from_ds, eapext->eapcode, eapext); } else if(eapext->eaptype == EAP_TYPE_EXPAND) + { + if(wantstatusflag == true) handlewps(macf->addr1.addr, macf->addr2.addr, macf->to_ds, macf->from_ds, eapext); + } + else if(eapext->eaptype == EAP_TYPE_SIM) + { + if(wantstatusflag == true) + printmac(macf->addr1.addr, macf->addr2.addr, macf->to_ds, macf->from_ds, "EAP-SIM (GSM Subscriber Modules) Authentication"); + } pcap_dump((u_char *) pcapout, pkh, h80211); pcap_dump_flush(pcapout); continue;
Remove logically dead code Reported by coverity check.
@@ -2486,16 +2486,6 @@ keep_going: /* We will come back to here until there is goto keep_going; } - if (addr_cur == NULL) - { - /* - * Ooops, no more addresses. An appropriate error - * message is already set up, so just set the right - * status. - */ - goto error_return; - } - /* Remember current address for possible error msg */ memcpy(&conn->raddr.addr, addr_cur->ai_addr, addr_cur->ai_addrlen);
[readme] vsync opengl and vulkan explanation
@@ -80,10 +80,23 @@ A partial list of parameters are below. See the config file for a complete list. | `output_file` | Define name and location of the output file (Required for logging) | | `font_file` | Change default font (set location to .TTF/.OTF file ) | | `log_duration` | Set amount of time the logging will run for (in seconds) | +| `vsync`<br> `gl_vsync | Set vsync for OpenGL or Vulkan | + +Example: `MANGOHUD_CONFIG=cpu_temp,gpu_temp,position=top-right,height=500,font_size=32` Note: Width and Height are set automatically based on the font_size, but can be overridden. +## Vsync +### OpenGL Vsync +- `-1` = Adaptive sync +- `0` = Off +- `1` = On + +### Vulkan Vsync +- `0` = Adaptive VSync +- `1` = Off +- `2` = Mailbox (VSync with uncapped FPS) +- `3` = On -Example: `MANGOHUD_CONFIG=cpu_temp,gpu_temp,position=top-right,height=500,font_size=32` ## Keybindings
Fix missing symbols on x86 Android.
@@ -18,7 +18,6 @@ IF (ARCH_I386 OR ARCH_X86_64) IF (OS_WINDOWS) SRCS( multiword_64_64_cl_i386_mmx.cc - crc32c_sse4.cc ) ELSEIF(OS_ANDROID AND ARCH_I386) # 32-bit Android has some problems with register allocation, so we fall back to default implementation @@ -43,9 +42,12 @@ IF (ARCH_I386 OR ARCH_X86_64) multiword_128_64_gcc_amd64_sse2.cc multiword_64_64_gcc_amd64_asm.cc ) - SRC_CPP_SSE4( - crc32c_sse4.cc - ) + ENDIF() + + IF (OS_WINDOWS) + SRCS(crc32c_sse4.cc) + ELSE() + SRC_CPP_SSE4(crc32c_sse4.cc) ENDIF() ENDIF ()
config_map: always set linked list on multiple property
@@ -452,6 +452,17 @@ int flb_config_map_set(struct mk_list *properties, struct mk_list *map, void *co mk_list_foreach(m_head, map) { m = mk_list_entry(m_head, struct flb_config_map, _head); + /* + * If the map type allows multiple entries, the user context is a pointer + * for a linked list. We just point their structure to our pre-processed + * list of entries. + */ + if (m->flags & FLB_CONFIG_MAP_MULT) { + m_list = (struct mk_list **) (base + m->offset); + *m_list = m->value.mult; + continue; + } + /* * If no default value exists or the map will not write to the user * context.. skip it. @@ -470,14 +481,6 @@ int flb_config_map_set(struct mk_list *properties, struct mk_list *map, void *co continue; } - /* - * If the map type allows multiple entries, the user context is a pointer - * for a linked list. We just point their structure to our pre-processed - * list of entries. - */ - if (m->flags & FLB_CONFIG_MAP_MULT) { - continue; - } /* All the following steps are direct writes to the user context */ if (m->type == FLB_CONFIG_MAP_STR) {
clean up unused variables and unreachable statements
@@ -323,9 +323,11 @@ int get_vendor(void){ int get_cputype(int gettype){ int eax, ebx, ecx, edx; +/* int extend_family, family; int extend_model, model; int type, stepping; +*/ int feature = 0; cpuid(1, &eax, &ebx, &ecx, &edx); @@ -428,7 +430,8 @@ int get_cacheinfo(int type, cache_info_t *cacheinfo){ cpuid(0, &cpuid_level, &ebx, &ecx, &edx); if (cpuid_level > 1) { - int numcalls =0 ; + int numcalls; + cpuid(2, &eax, &ebx, &ecx, &edx); numcalls = BITMASK(eax, 0, 0xff); //FIXME some systems may require repeated calls to read all entries info[ 0] = BITMASK(eax, 8, 0xff); @@ -1637,7 +1640,6 @@ int get_cpuname(void){ else return CPUTYPE_BARCELONA; } - break; case 10: // Zen3 if(support_avx()) #ifndef NO_AVX2 @@ -2193,7 +2195,6 @@ int get_coretype(void){ else return CORE_NEHALEM; #endif - break; case 7: if (model == 10)
rand_unix.c: correct include guard comments
@@ -81,7 +81,8 @@ static uint64_t get_timer_bits(void); # define OSSL_POSIX_TIMER_OKAY # endif # endif -#endif /* defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) */ +#endif /* (defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_SYS_VXWORKS)) + || defined(__DJGPP__) */ #if defined(OPENSSL_RAND_SEED_NONE) /* none means none. this simplifies the following logic */ @@ -851,4 +852,5 @@ static uint64_t get_timer_bits(void) # endif return time(NULL); } -#endif /* defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) */ +#endif /* (defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_SYS_VXWORKS)) + || defined(__DJGPP__) */
tests/rtdl: Remove the workarounds for and
@@ -50,10 +50,8 @@ static int callback(struct dl_phdr_info *info, size_t size, void *data) { if (contains(LDSO_PATTERN, info->dlpi_name)) found->found_ldso++; - // Temporarily disable this to work around issue #579. - // if (!strcmp("", info->dlpi_name)) - // found->found_self++; - found->found_self = 1; + if (!strcmp("", info->dlpi_name)) + found->found_self++; assert(info->dlpi_phdr); return 0; @@ -85,8 +83,7 @@ int main() { assert(!dl_iterate_phdr(callback, &found)); assert(found.found_ldso == 1); assert(found.found_self == 1); - // Temporary workaround for issue #585. - // assert(found.found_foo == 1); + assert(found.found_foo == 1); assert(found.found_foo > 0); assert(found.found_bar == 1);
fixed spec file to get it working
@@ -24,6 +24,7 @@ RFC 2362 with a few noted exceptions (see the RELEASE.NOTES for details). %build +./autogen.sh ./configure make %{?_smp_mflags} @@ -45,7 +46,7 @@ make %{?_smp_mflags} %files %defattr(-,root,root,-) -%doc AUTHORS CREDITS FAQ INSTALL LICENSE LICENSE.mrouted README README.config README.config.jp README.debug RELEASE.NOTES TODO +%doc AUTHORS CREDITS LICENSE LICENSE.mrouted RELEASE.NOTES %config %{_sysconfdir}/pimd.conf %{_initrddir}/%{name} %{_sbindir}/%{name}
closer to osu value circle size
@@ -13,7 +13,8 @@ class DiffCalculator: self.time_preempt = self.ar() def cs(self): - return 54.4 - 4.48 * self.diff["CircleSize"] + print(self.diff["CircleSize"]) + return 23.05 - (self.diff["CircleSize"] - 7) * 4.4825 # 54.4 - 4.48 * self.diff["CircleSize"] def od(self): o = self.diff["OverallDifficulty"]
Tweak uninstall docs
@@ -114,19 +114,19 @@ scratch. The procedure is as follows: 1.2 Execute `python setup.py clean` -2. Delete installed python files +2. Delete built/installed python files -2.1 Execute `rm -r build/`, deleting the python build directory +2.1 Execute `rm -r build/` to delete the python build directory -2.2 Execute `rm pyccl/ccl_wrap.c pyccl/ccllib.py`, deleting the autogenerated swig files +2.2 Execute `rm pyccl/ccl_wrap.c pyccl/ccllib.py` to delete the autogenerated swig files -2.3 Check your `~/.local/` directory for any pyccl files, and delete them. +2.3 Check your `~/.local/lib` directory for any pyccl files (they will be in one of the python directories), and delete them. -2.4 Similarly for files in your `/usr/lib/` and `/usr/local/lib` +2.4 Similarly for files in your `/usr/lib/` and `/usr/local/lib` directories 2.5 Still not working? You can exectute `python setup.py install [args] --record files.txt`. -`files.txt` will have a list of all files written when calling the install script with -arguments `args`. Perhaps there are files somwhere else on your system! +The file `files.txt` will contain a list of all files written when calling the install script with +arguments `args`. Perhaps there are files somewhere else on your system! 3. You can now reinstall the package in the normal way, starting with the C code and then the python code.
Debugging: Print info in debug mode
@@ -198,6 +198,11 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len) mdata = grib_handle_of_accessor(a)->buffer->data; mdata += grib_byte_offset(owner); + /* Note: In the definitions, flagbit numbers go from 7 to 0 (the bit_index), while WMO convention is from 1 to 8 */ + if (a->context->debug) { + /* Print bit positions from 1 (MSB) */ + fprintf(stderr, "ECCODES DEBUG Setting bit %d in %s to %d\n", 8 - ac->bit_index, owner->name, (*val > 0) ); + } grib_set_bit(mdata, 7 - ac->bit_index, *val > 0); *len = 1;
added warning to not use macchanger
@@ -7896,6 +7896,7 @@ printf("%s %s (C) %s ZeroBeat\n" " hcxdumptool may not work as expected on virtual NETLINK interfaces\n" " do not report issues related to iw\n" " do not run hcxdumptool in combination with tools (channel hopper), that take access to the interface (except: tshark, wireshark, tcpdump)\n" + " do not use tools like machcanger, because hcxdumptool run its own MAC space\n" " stop all this services (e.g.: wpa_supplicant.service, NetworkManager.service) that take access to the interface\n" "\n" "short options:\n"