message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Manual: clarify coercions | @@ -146,11 +146,11 @@ Similarly, arrays of values can store values of varied types
xs[1] = 10
xs[2] = "hello"
-Pallene automatically coerces to and from the `value` type. In addition to
-variable assignments, coercions also occurs in the parameters passed to
-functions and in the values returned from them. You can also use the `as`
-operator for explicit coercions. These coercions between value-compatible types
-are the only place where Pallene does type coercions.
+Pallene automatically coerces to and from the `value` type in parts of the
+program that have type annotations. That is, variable assignments, explicit
+coercions with the `as` operator, and in the parameters and return values of
+functions. These coercions between value-compatible types are the only place
+where Pallene does type coercions.
function insert(xs:{value}, v:value)
xs[#xs+1] = v
|
don't use path 0! | @@ -14,7 +14,7 @@ protoop_arg_t connection_state_changed(picoquic_cnx_t* cnx)
bpf_data *bpfd = get_bpf_data(cnx);
if (bpfd->nb_proposed_snt == 0) {
/* Prepare MP_NEW_CONNECTION_IDs */
- for (uint64_t i = 0; i < MAX_PATHS; i++) {
+ for (uint64_t i = 1; i < MAX_PATHS; i++) {
reserve_mp_new_connection_id_frame(cnx, i);
}
/* And also send add address */
|
Add error message when dep fails to build. | @@ -560,7 +560,7 @@ int main(int argc, const char **argv) {
(do-rule "install-deps")
(do-rule "build")
(do-rule "install"))
- ([err] nil))
+ ([err] (print "Error building git repository dependency: " err))
(os/cd olddir))
(defn install-rule
|
Make the lock in CRYPTO_secure_allocated() a read lock | @@ -212,7 +212,7 @@ int CRYPTO_secure_allocated(const void *ptr)
if (!secure_mem_initialized)
return 0;
- if (!CRYPTO_THREAD_write_lock(sec_malloc_lock))
+ if (!CRYPTO_THREAD_read_lock(sec_malloc_lock))
return 0;
ret = sh_allocated(ptr);
CRYPTO_THREAD_unlock(sec_malloc_lock);
|
nrf/temp: Move module configuration guard.
This patch moves the check for MICROPY_PY_MACHINE_TEMP to come
before the inclusion of nrf_temp.h. The nrf_temp.h depends on
the NRF_TEMP_Type which might not be defined for all nRF devices. | #include "py/nlr.h"
#include "py/runtime.h"
#include "py/mphal.h"
+
+#if MICROPY_PY_MACHINE_TEMP
+
#include "temp.h"
#include "nrf_temp.h"
#define BLUETOOTH_STACK_ENABLED() (ble_drv_stack_enabled())
#endif // BLUETOOTH_SD
-#if MICROPY_PY_MACHINE_TEMP
-
typedef struct _machine_temp_obj_t {
mp_obj_base_t base;
} machine_temp_obj_t;
|
nco: fixing bug with constraining phase for fixed-point phase | /*
- * Copyright (c) 2007 - 2018 Joseph Gaeddert
+ * Copyright (c) 2007 - 2019 Joseph Gaeddert
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -342,13 +342,17 @@ void NCO(_mix_block_down)(NCO() _q,
// constrain phase (or frequency) and convert to fixed-point
uint32_t NCO(_constrain)(float _theta)
{
- // constrain to be in [0,2pi)
- // TODO: make more computationally efficient
- while (_theta >= 2*M_PI) _theta -= 2*M_PI;
- while (_theta <= -2*M_PI) _theta += 2*M_PI;
+ // divide value by 2*pi and compute modulo
+ float p = _theta * 0.159154943091895; // 1/(2 pi) ~ 0.159154943091895
- // 1/(2 pi) ~ 0.159154943091895
- return (uint32_t)round(_theta * (1LLU<<32) * 0.159154943091895);
+ // extract fractional part of p
+ float fpart = p - ((long)p); // fpart is in (-1,1)
+
+ // ensure fpart is in [0,1)
+ if (fpart < 0.) fpart += 1.;
+
+ // map to range of precision needed
+ return (uint32_t)(fpart * 0xffffffff);
}
// compute index for sine look-up table
|
doc: OPAL_PCI_MASK_PE_ERROR was never implemented | @@ -128,7 +128,8 @@ The OPAL API is the interface between an Operating System and OPAL.
+---------------------------------------------+--------------+------------------------+----------+-----------------+
| :ref:`OPAL_PCI_REINIT` | 53 | v1.0 (Initial Release) | POWER8 | |
+---------------------------------------------+--------------+------------------------+----------+-----------------+
-| :ref:`OPAL_PCI_MASK_PE_ERROR` | 54 | v1.0 (Initial Release) | POWER8 | |
+| :ref:`OPAL_PCI_MASK_PE_ERROR` | 54 | Never | | Never |
+| | | | | implemented |
+---------------------------------------------+--------------+------------------------+----------+-----------------+
| :ref:`OPAL_SET_SLOT_LED_STATUS` | 55 | v1.0 (Initial Release) | POWER8 | |
+---------------------------------------------+--------------+------------------------+----------+-----------------+
@@ -403,6 +404,8 @@ removed and no longer supported.
+---------------------------------------------+-------+-----------------------+-----------------------+
| :ref:`OPAL_PCI_FENCE_PHB` | 52 | Never | |
+---------------------------------------------+-------+-----------------------+-----------------------+
+| :ref:`OPAL_PCI_MASK_PE_ERROR` | 54 | Never | |
++---------------------------------------------+-------+-----------------------+-----------------------+
| :ref:`OPAL_PCI_GET_PHB_DIAG_DATA` | 51 | pre-v1.0 | pre-v1.0, with last |
| | | | remnants removed in |
| | | | :ref:`skiboot-6.4` |
@@ -474,6 +477,13 @@ OPAL_PCI_FENCE_PHB
Never implemented.
+.. _OPAL_PCI_MASK_PE_ERROR:
+
+OPAL_PCI_MASK_PE_ERROR
+^^^^^^^^^^^^^^^^^^^^^^
+
+Never implemented.
+
.. _OPAL_PCI_GET_PHB_DIAG_DATA:
OPAL_PCI_GET_PHB_DIAG_DATA
|
libbitstream: remove fall-through switch case
Newer versions of gcc flag fall-through switch cases as warnings,
which become build errors, because we're using -Werror. | @@ -177,8 +177,17 @@ STATIC void *opae_bitstream_parse_metadata(const char *metadata,
// version to 640/650 respectively.
// Allow 640/650 to serve as an alias for 1.
case 650:
+ *version = 1;
+ parsed = opae_bitstream_parse_metadata_v1(root,
+ pr_interface_id);
+ break;
+
case 640:
*version = 1;
+ parsed = opae_bitstream_parse_metadata_v1(root,
+ pr_interface_id);
+ break;
+
case 1:
parsed = opae_bitstream_parse_metadata_v1(root,
pr_interface_id);
|
docs: cp credentials into chroot for aarch/slurm to get munge id created correctly | @@ -142,6 +142,7 @@ both the base OS and EPEL repositories for which mirrors are freely available on
% ohpc_validation_comment Add OpenHPC components to compute instance
\begin{lstlisting}[language=bash,literate={-}{-}1,keywords={},upquote=true]
# Add Slurm client support meta-package
+[sms](*\#*) cp /etc/passwd /etc/group $CHROOT/etc
[sms](*\#*) (*\chrootinstall*) ohpc-slurm-client
# Add Network Time Protocol (NTP) support
|
firpfbchr: removing restriction on channelizer size being even | /*
- * Copyright (c) 2007 - 2020 Joseph Gaeddert
+ * Copyright (c) 2007 - 2022 Joseph Gaeddert
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -67,8 +67,8 @@ FIRPFBCHR() FIRPFBCHR(_create)(unsigned int _M,
TC * _h)
{
// validate input
- if (_M < 2 || _M % 2)
- return liquid_error_config("firpfbchr_%s_create(), number of channels must be greater than 2 and even", EXTENSION_FULL);
+ if (_M < 2)
+ return liquid_error_config("firpfbchr_%s_create(), number of channels must be at least 2", EXTENSION_FULL);
if (_m < 1)
return liquid_error_config("firpfbchr_%s_create(), filter semi-length must be at least 1", EXTENSION_FULL);
|
Avoid initializing StringInfo twice
Libpq messages are constructed using pq_beginmessage(), which
initializes StringInfo object passed to it and pq_endmessage() frees
it. No need for explicit initialization, it must have been an
oversight. | @@ -172,8 +172,6 @@ SendFtsResponse(FtsResponse *response, const char *messagetype)
{
StringInfoData buf;
- initStringInfo(&buf);
-
BeginCommand(messagetype, DestRemote);
pq_beginmessage(&buf, 'T');
|
Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) | @@ -24,7 +24,8 @@ PROJECT(hiredis VERSION "${VERSION}")
# Hiredis requires C99
SET(CMAKE_C_STANDARD 99)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+SET(CMAKE_DEBUG_POSTFIX d) # so debug and optimized can be packaged together
SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples")
|
Test: Disable warning on Clang 7 | @@ -4,9 +4,16 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR})
add_headers (HDR_FILES)
add_cppheaders (HDR_FILES)
+set (CLANG_7_OR_LATER ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" AND NOT (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 7))
+
file (GLOB TESTS
testcpp_*.cpp)
foreach (file ${TESTS})
+
+ if (file MATCHES testcpp_contextual_basic.cpp AND ${CLANG_7_OR_LATER})
+ set_source_files_properties (${file} PROPERTIES COMPILE_FLAGS "-Wno-self-assign-overloaded")
+ endif (file MATCHES testcpp_contextual_basic.cpp AND ${CLANG_7_OR_LATER})
+
get_filename_component (name ${file} NAME_WE)
add_gtest (${name}
LINK_ELEKTRA elektra-kdb
|
Fix test_nsalloc_prefixed_element() to work in builds | @@ -11891,8 +11891,8 @@ START_TEST(test_nsalloc_prefixed_element)
"&en;"
"</pfx:element>";
ExtOption options[] = {
- { "foo", "<!ELEMENT e EMPTY>" },
- { "bar", "<e/>" },
+ { XCS("foo"), "<!ELEMENT e EMPTY>" },
+ { XCS("bar"), "<e/>" },
{ NULL, NULL }
};
int i;
|
rms/slurm: update src url | @@ -32,7 +32,7 @@ URL: https://slurm.schedmd.com/
%global slurm_source_dir %{pname}-%{version}-%{rel}
%endif
-Source: https://github.com/SchedMD/slurm/archive/%{pname}-%{ver_exp}.tar.gz
+Source: https://download.schedmd.com/slurm/%{slurm_source_dir}.tar.bz2
Source1: OHPC_macros
# build options .rpmmacros options change to default action
|
BugID:25714458:modify cli to rm ota cmd from default cmds; core | @@ -29,7 +29,6 @@ static void help_cmd(char *buf, int32_t len, int32_t argc, char **argv);
static void version_cmd(char *buf, int32_t len, int32_t argc, char **argv);
static void reboot_cmd(char *buf, int32_t len, int32_t argc, char **argv);
static void uptime_cmd(char *buf, int32_t len, int32_t argc, char **argv);
-static void ota_cmd(char *buf, int32_t len, int32_t argc, char **argv);
#if (CLI_MINIMUM_MODE <= 0)
@@ -68,7 +67,6 @@ static const struct cli_command_st built_ins[] = {
/*aos_rhino*/
{ "time", "system time", uptime_cmd },
- { "ota", "system ota", ota_cmd },
#ifdef AOS_COMP_DEBUG
#if (RHINO_CONFIG_SYS_STATS > 0)
{ "cpuusage", "show cpu usage", cpuusage_cmd },
@@ -139,11 +137,6 @@ void tftp_ota_thread(void *arg)
cli_task_exit();
}
-static void ota_cmd(char *buf, int32_t len, int32_t argc, char **argv)
-{
- cli_task_create("LOCAL OTA", tftp_ota_thread, 0, 4096, OTA_THREAD_PRIORITY);
-}
-
#if (CLI_MINIMUM_MODE <= 0)
static void echo_cmd(char *buf, int32_t len, int32_t argc, char **argv)
|
[software] Put RO data right after instruction data | @@ -32,17 +32,19 @@ SECTIONS {
. = ALIGN(0x40);
} > l2
- /* Data on L2 */
- .data : {
- . = ALIGN(0x10);
- *(.data)
- } > l2
+ /* RO Data on L2 */
.rodata : {
*(.rodata .rodata.* .gnu.linkonce.r.*)
} > l2
.rodata1 : {
*(.rodata1)
} > l2
+
+ /* Data on L2 */
+ .data : {
+ . = ALIGN(0x10);
+ *(.data)
+ } > l2
.sdata2 : {
*(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
} > l2
|
net/oic: Update dependency to NimBLE packages | @@ -33,9 +33,9 @@ pkg.req_apis:
- stats
pkg.deps.OC_TRANSPORT_GATT:
- - "@apache-mynewt-core/net/nimble/host"
- - "@apache-mynewt-core/net/nimble/host/services/gap"
- - "@apache-mynewt-core/net/nimble/host/services/gatt"
+ - "@apache-mynewt-nimble/nimble/host"
+ - "@apache-mynewt-nimble/nimble/host/services/gap"
+ - "@apache-mynewt-nimble/nimble/host/services/gatt"
pkg.deps.OC_TRANSPORT_IP:
- "@apache-mynewt-core/net/ip/mn_socket"
|
Add default value to ping_interval in fpskeyival function | @@ -507,7 +507,7 @@ print_conn_def (FILE * fp) {
fpopen_obj (fp, sp);
fpskeysval (fp, "url", (conf.ws_url ? conf.ws_url : ""), sp, 0);
fpskeyival (fp, "port", (conf.port ? atoi (conf.port) : 7890), sp, 0);
- fpskeyival (fp, "ping_interval", (conf.ping_interval ? atoi (conf.ping_interval) : ""), sp, 1);
+ fpskeyival (fp, "ping_interval", (conf.ping_interval ? atoi (conf.ping_interval) : 0), sp, 1);
fpclose_obj (fp, sp, 1);
fprintf (fp, "</script>");
|
Fix crash when require loads a malformed lua | @@ -333,6 +333,10 @@ void LuaSandbox::InitializeIOForSandbox(Sandbox& aSandbox)
std::ifstream ifs(absPath);
const std::string cScriptString((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
auto res = cLoadString(cScriptString, "@" + absPath.string(), aThisState, aThisEnv);
+ auto obj = std::get<0>(res);
+ if (obj == sol::nil)
+ return res;
+
sol::function func = std::get<0>(res);
if (func != sol::nil)
{
|
Use test lock path in archive-get test.
The default lock path should fail since the test VM gives ownership of /tmp to root.
For some reason this was not working as expected under u18 but it fails under u20. | @@ -275,6 +275,7 @@ testRun(void)
hrnCfgArgRawZ(argBaseList, cfgOptRepoPath, TEST_PATH_REPO);
hrnCfgArgRawZ(argBaseList, cfgOptStanza, "test1");
hrnCfgArgRawZ(argBaseList, cfgOptArchiveTimeout, "1");
+ hrnCfgArgRawFmt(argBaseList, cfgOptLockPath, "%s/lock", testDataPath());
strLstAddZ(argBaseList, CFGCMD_ARCHIVE_GET);
// -------------------------------------------------------------------------------------------------------------------------
|
media: Conceal PlayerWorker constructor/destructor
PlayerWorker is a singleton.
So its constructor/destructor are private function | @@ -27,14 +27,14 @@ namespace media {
class PlayerWorker : public MediaWorker
{
public:
- PlayerWorker();
- virtual ~PlayerWorker();
static PlayerWorker &getWorker();
void setPlayer(std::shared_ptr<MediaPlayerImpl>);
std::shared_ptr<MediaPlayerImpl> getPlayer();
private:
+ PlayerWorker();
+ virtual ~PlayerWorker();
bool processLoop() override;
private:
|
Detach only synchronized server
Currently client can issue two consequtive sync requests and we will detach
his server connection right after first ReadyForQuery. This seems incorrect. | @@ -743,7 +743,7 @@ static od_frontend_status_t od_frontend_remote_server(od_relay_t *relay,
return OD_SKIP;
/* handle transaction pooling */
- if (is_ready_for_query) {
+ if (is_ready_for_query && od_server_synchronized(server)) {
if ((route->rule->pool == OD_RULE_POOL_TRANSACTION ||
server->offline) &&
!server->is_transaction && !route->id.physical_rep &&
|
out_http: adjust test formatter callback params | @@ -737,6 +737,7 @@ static int cb_http_format_test(struct flb_config *config,
struct flb_input_instance *ins,
void *plugin_context,
void *flush_ctx,
+ int event_type,
const char *tag, int tag_len,
const void *data, size_t bytes,
void **out_data, size_t *out_size)
|
hilbert~ fix | @@ -132,9 +132,10 @@ static void *hilbert_new(t_floatarg f)
void hilbert_tilde_setup(void)
{
- hilbert_class = class_new(gensym("hilbert~"), (t_newmethod)hilbert_new, 0,
+ hilbert_class = class_new(gensym("cyclone/hilbert~"), (t_newmethod)hilbert_new, 0,
sizeof(t_hilbert), CLASS_DEFAULT, A_DEFFLOAT, 0);
class_addmethod(hilbert_class, (t_method)hilbert_dsp, gensym("dsp"), A_CANT, 0);
class_addmethod(hilbert_class, nullfn, gensym("signal"), 0);
class_addmethod(hilbert_class, (t_method) hilbert_clear, gensym("clear"), 0);
+ class_sethelpsymbol(hilbert_class, gensym("hilbert~"));
}
|
Add TEST_TITLE_FMT() macro. | @@ -354,6 +354,14 @@ Test title macro
fflush(stdout); \
} while(0)
+#define TEST_TITLE_FMT(format, ...) \
+ do \
+ { \
+ hrnTestLogPrefix(__LINE__, false); \
+ printf(format "\n", __VA_ARGS__); \
+ fflush(stdout); \
+ } while(0)
+
/***********************************************************************************************************************************
Is this a 64-bit system? If not then it is 32-bit since 16-bit systems are not supported.
***********************************************************************************************************************************/
|
SmbiosTest: Fix warning
closes acidanthera/bugtracker#338 | @@ -46,6 +46,7 @@ STATIC GUID SystemUUID = {0x5BC82C38, 0x4DB6, 0x4883, {0x85, 0x2E, 0xE7, 0x8D, 0
STATIC UINT8 BoardType = 0xA; // Motherboard (BaseBoardTypeMotherBoard)
STATIC UINT8 MemoryFormFactor = 0xD; // SODIMM, 0x9 for DIMM (MemoryFormFactorSodimm)
STATIC UINT8 ChassisType = 0xD; // All in one (MiscChassisTypeAllInOne)
+STATIC UINT32 PlatformFeature = 1;
STATIC OC_SMBIOS_DATA Data = {
.BIOSVendor = NULL, // Do not change BIOS Vendor
.BIOSVersion = "134.0.0.0.0",
@@ -73,7 +74,7 @@ STATIC OC_SMBIOS_DATA Data = {
.FirmwareFeatures = 0xE00FE137,
.FirmwareFeaturesMask = 0xFF1FFF3F,
.ProcessorType = NULL, // Will be calculated automatically
- .PlatformFeature = 1
+ .PlatformFeature = &PlatformFeature
};
EFI_STATUS
|
missed registrator | @@ -9,6 +9,8 @@ namespace NCudaLib {
REGISTER_KERNEL_TEMPLATE(0x001003, TFillBufferKernel, ui32);
REGISTER_KERNEL_TEMPLATE(0x001005, TFillBufferKernel, ui64);
REGISTER_KERNEL_TEMPLATE(0x001011, TFillBufferKernel, bool);
+ REGISTER_KERNEL_TEMPLATE(0x001012, TFillBufferKernel, double);
+ REGISTER_KERNEL_TEMPLATE(0x001013, TFillBufferKernel, i64);
REGISTER_KERNEL_TEMPLATE(0x001006, TMakeSequenceKernel, int);
REGISTER_KERNEL_TEMPLATE(0x001007, TMakeSequenceKernel, ui32);
|
README.md - update badge counter for component updates | #### Community building blocks for HPC systems (v1.3.8)
[ ](https://github.com/openhpc/ohpc/wiki/Component-List-v1.3.8)
-[ ](https://github.com/openhpc/ohpc/releases/tag/v1.3.8.GA)
+[ ](https://github.com/openhpc/ohpc/releases/tag/v1.3.8.GA)
[ ](http://test.openhpc.community:8080/job/1.3.x/view/1.3.8/)
|
CI: clone doxygen theme prior to building doc | @@ -21,6 +21,9 @@ jobs:
- name: Install doxygen
run: |
sudo apt-get install -y doxygen
+ - name: Clone doxygen theme
+ run: |
+ git clone https://github.com/jothepro/doxygen-awesome-css.git ../doxygen-awesome-css
- name: Download & install zydoc
run: |
wget -O zydoc.tar.gz https://github.com/zyantific/zydoc/releases/download/v0.3.0/zydoc_v0.3.0_x86_64-unknown-linux-musl.tar.gz
|
Update ya tool uc | },
"uc": {
"formula": {
- "sandbox_id": 62742305,
+ "sandbox_id": 505682252,
"match": "UC"
},
"executable": {
|
Add _GNU_SOURCE functionality | @@ -4,6 +4,10 @@ License: MIT
Feel free to copy, use and enjoy according to the license provided.
*/
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
// clang-format off
#include "http_response_http1.h"
// clang-format on
|
TSCH: add argument validation in tsch_schedule_add_link()
The purpose is to avoid allocating a meaningless link, which could cause
communication issue with a peer. | @@ -180,6 +180,16 @@ tsch_schedule_add_link(struct tsch_slotframe *slotframe,
struct tsch_link *l = NULL;
if(slotframe != NULL) {
/* We currently support only one link per timeslot in a given slotframe. */
+
+ /* Validation of specified timeslot and channel_offset */
+ if(timeslot > (slotframe->size.val - 1)) {
+ LOG_ERR("! add_link invalid timeslot: %u\n", timeslot);
+ return NULL;
+ } else if(channel_offset > 15) {
+ LOG_ERR("! add_link invalid channel_offset: %u\n", channel_offset);
+ return NULL;
+ }
+
/* Start with removing the link currently installed at this timeslot (needed
* to keep neighbor state in sync with link options etc.) */
tsch_schedule_remove_link_by_timeslot(slotframe, timeslot);
|
Attempt to correct error in tests | @@ -206,9 +206,9 @@ void * lv_mem_alloc(size_t size)
}else{
#if LV_MEM_CUSTOM == 0
/* just a safety check, should always be true */
- if ((uint32_t) alloc > (uint32_t) work_mem) {
- if ((((uint32_t) alloc - (uint32_t) work_mem) + size) > mem_max_size) {
- mem_max_size = ((uint32_t) alloc - (uint32_t) work_mem) + size;
+ if ((uintptr_t) alloc > (uintptr_t) work_mem) {
+ if ((((uintptr_t) alloc - (uintptr_t) work_mem) + size) > mem_max_size) {
+ mem_max_size = ((uintptr_t) alloc - (uintptr_t) work_mem) + size;
}
}
#endif
|
[platform][pc] fix memory map handling in multiboot
The starting address of mmap is off by 4 bytes. | @@ -191,7 +191,7 @@ void platform_init_multiboot_info(void)
}
if (_multiboot_info->flags & MB_INFO_MMAP) {
- memory_map_t *mmap = (memory_map_t *)(uintptr_t)(_multiboot_info->mmap_addr - 4);
+ memory_map_t *mmap = (memory_map_t *)(uintptr_t)_multiboot_info->mmap_addr;
mmap = (void *)((uintptr_t)mmap + KERNEL_BASE);
LTRACEF("memory map:\n");
|
comet self-attestation compiles | ::
=. event-core (on-hear-packet i.rcv-packets.todos)
$(rcv-packets.todos t.rcv-packets.todos)
+ :: we're a comet; send self-attestation packet first
+ ::
+ =? event-core =(%pawn (clan:title our))
+ (send-blob ship (attestation-packet ship life.point))
:: apply outgoing messages
::
=. event-core
[ship message.i.snd-messages.todos]
::
$(snd-messages.todos t.snd-messages.todos)
- :: apply outgoing packet blob
+ :: apply outgoing packet blobs
::
=. event-core
=/ blobs ~(tap in snd-packets.todos)
$(blobs t.blobs)
::
event-core
+ :: +attestation-packet: generate signed self-attestation for .her
+ ::
+ ++ attestation-packet
+ |= [her=ship =her=life]
+ ^- blob
+ ::
+ =/ signed=_+:*open-packet
+ :* ^= public-key pub:ex:crypto-core.ames-state
+ ^= sndr our
+ ^= sndr-life life.ames-state
+ ^= rcvr her
+ ^= rcvr-life her-life
+ ==
+ ::
+ =/ =private-key sec:ex:crypto-core.ames-state
+ =/ =signature (sign-open-packet private-key signed)
+ =/ =open-packet [signature signed]
+ =/ =packet [[our her] encrypted=%.n origin=~ open-packet]
+ ::
+ (encode-packet packet)
::
++ update-known
|= [=ship =point =peer-state]
++ on-vega event-core
:: +enqueue-alien-todo: helper to enqueue a pending request
::
- :: Also requests key and life from Jael on first contact.
+ :: Also requests key and life from Jael on first request.
+ :: On a comet, enqueues self-attestation packet on first request.
::
++ enqueue-alien-todo
|= [=ship mutate=$-(pending-requests pending-requests)]
::
?> ?=([%pump @ @ ~] wire)
[`@p`(slav %p i.t.wire) `@ud`(slav %ud i.t.t.wire)]
+:: +sign-open-packet: sign the contents of an $open-packet
+::
+++ sign-open-packet
+ |= [=private-key signed=_+:*open-packet]
+ ^- signature
+ ::
+ (sign:ed:crypto private-key (jam signed))
:: +verify-signature: use .public-key to verify .signature on .content
::
++ verify-signature
|
Update: configure reasoner before enterting bg knowledge | @@ -192,11 +192,6 @@ BackgroundKnowledge = """
<((<gripper --> [closed]> &/ <bottle --> [equalX]>) &/ ^drop) =/> <mission --> [progressed]>>.
"""
-k=0
-for bg in BackgroundKnowledge.split("\n"):
- bgstr = bg.strip()
- if len(bgstr) > 0:
- NAR.AddInput(bgstr)
NARAddInput("*babblingops=3")
NARAddInput("*motorbabbling=0.3")
NARAddInput("*setopname 1 ^left")
@@ -204,6 +199,13 @@ NARAddInput("*setopname 2 ^right")
NARAddInput("*setopname 3 ^forward")
NARAddInput("*setopname 4 ^pick")
NARAddInput("*setopname 5 ^drop")
+
+k=0
+for bg in BackgroundKnowledge.split("\n"):
+ bgstr = bg.strip()
+ if len(bgstr) > 0:
+ NAR.AddInput(bgstr)
+
while True:
#1. Actively retrieve sensor input
Proximity = scan()
|
Enable GDI handle column reordering | @@ -332,7 +332,7 @@ INT_PTR CALLBACK PhpGdiHandlesDlgProc(
lvHandle = GetDlgItem(hwndDlg, IDC_LIST);
- PhSetListViewStyle(lvHandle, FALSE, TRUE);
+ PhSetListViewStyle(lvHandle, TRUE, TRUE);
PhSetControlTheme(lvHandle, L"explorer");
PhAddListViewColumn(lvHandle, 0, 0, 0, LVCFMT_LEFT, 100, L"Type");
PhAddListViewColumn(lvHandle, 1, 1, 1, LVCFMT_LEFT, 80, L"Handle");
|
Databasae -> Database | </tbody>
</tgroup>
</table>
- <p>You can use the Greenplum Databasae built-in SQL function
+ <p>You can use the Greenplum Database built-in SQL function
<codeph>gp_read_error_log()</codeph> to display formatting errors that are logged
internally. For example, this command displays the error log information for the table
<i>ext_expenses</i>:</p>
|
doc: Tabs to spaces & fix wording | @@ -19,7 +19,7 @@ In this section, we will explain the how to write a language binding for Elektra
### Building
-After setting up our project, we have to add the projects directory to `src/bindings/CMakeLists.txt`.
+To add the subdirectory containing our binding to the build, we have to modify `src/bindings/CMakeLists.txt`.
```cmake
check_binding_included ("our_binding" IS_INCLUDED)
@@ -28,7 +28,9 @@ if (IS_INCLUDED)
endif ()
```
-At first we want to make sure that the build tools and compilers we need for the binding are installed. We can use `find_program (BUILD_TOOL_EXECUTABLE build_tool)` to find our `build_tool` program. The result of the search will be stored in `BUILD_TOOL_EXECUTABLE`, so now we can use an if block to include the bindings in the build, if the program exists or exclude it, if it doesn't.
+At first we want to make sure that the build tools and compilers we need for the binding are installed. We can use `find_program (BUILD_TOOL_EXECUTABLE build_tool)` to find our `build_tool` program. The result of the search will be stored in `BUILD_TOOL_EXECUTABLE`, so now we can use an if block to include the bindings in the build, if the program exists or exclude it, if it doesn't. To do that, we use `add_binding` which adds ours to the list of bindings that will be built. For more provided functions, [see here](../../cmake/Modules/LibAddBinding.cmake).
+
+
If, for example, our bindings only support linking against a dynamic library we can express that, by using the `BUILD_*` variables in if blocks or by passing `ONLY_SHARED` to `add_binding`. You can read more in the [compile doc](../COMPILE.md).
```cmake
|
Fix bufferGetParameteriv return type
void* can be a typo: bufferGetParameteriv() doesn't return any value and its
return value is not used anywhere else. | @@ -292,7 +292,7 @@ GLboolean gl4es_glIsBuffer(GLuint buffer) {
}
-static void* bufferGetParameteriv(glbuffer_t* buff, GLenum value, GLint * data) {
+static void bufferGetParameteriv(glbuffer_t* buff, GLenum value, GLint * data) {
noerrorShim();
switch (value) {
case GL_BUFFER_ACCESS:
|
eps_* now <0 check | @@ -768,15 +768,15 @@ static scs_int validate(const ScsData *d, const ScsCone *k) {
scs_printf("max_iters must be positive\n");
return -1;
}
- if (stgs->eps_abs <= 0) {
+ if (stgs->eps_abs < 0) {
scs_printf("eps_abs tolerance must be positive\n");
return -1;
}
- if (stgs->eps_rel <= 0) {
+ if (stgs->eps_rel < 0) {
scs_printf("eps_rel tolerance must be positive\n");
return -1;
}
- if (stgs->eps_infeas <= 0) {
+ if (stgs->eps_infeas < 0) {
scs_printf("eps_infeas tolerance must be positive\n");
return -1;
}
|
timer: removed downcasting when setting divider
Dividers bigger than 65536 are already handled in ll,
so we shouldnt downcast it. | @@ -156,7 +156,7 @@ esp_err_t timer_set_divider(timer_group_t group_num, timer_idx_t timer_num, uint
TIMER_CHECK(divider > 1 && divider < 65537, DIVIDER_RANGE_ERROR, ESP_ERR_INVALID_ARG);
TIMER_CHECK(p_timer_obj[group_num][timer_num] != NULL, TIMER_NEVER_INIT_ERROR, ESP_ERR_INVALID_ARG);
TIMER_ENTER_CRITICAL(&timer_spinlock[group_num]);
- timer_hal_set_divider(&(p_timer_obj[group_num][timer_num]->hal), (uint16_t) divider);
+ timer_hal_set_divider(&(p_timer_obj[group_num][timer_num]->hal), divider);
TIMER_EXIT_CRITICAL(&timer_spinlock[group_num]);
return ESP_OK;
}
|
chip/ish/config_flash_layout.h: Format with clang-format
BRANCH=none
TEST=none | #define CONFIG_LOADER_MEM_OFF 0
#define CONFIG_LOADER_SIZE 0xC00
-
/* RO/RW images - not relevant for ISH
*/
-#define CONFIG_RO_MEM_OFF (CONFIG_LOADER_MEM_OFF + \
- CONFIG_LOADER_SIZE)
+#define CONFIG_RO_MEM_OFF (CONFIG_LOADER_MEM_OFF + CONFIG_LOADER_SIZE)
#define CONFIG_RO_SIZE (97 * 1024)
#define CONFIG_RW_MEM_OFF CONFIG_RO_MEM_OFF
#define CONFIG_RW_SIZE CONFIG_RO_SIZE
#define CONFIG_BOOT_HEADER_STORAGE_OFF 0
#define CONFIG_BOOT_HEADER_STORAGE_SIZE 0x240
-#define CONFIG_LOADER_STORAGE_OFF (CONFIG_BOOT_HEADER_STORAGE_OFF + \
- CONFIG_BOOT_HEADER_STORAGE_SIZE)
+#define CONFIG_LOADER_STORAGE_OFF \
+ (CONFIG_BOOT_HEADER_STORAGE_OFF + CONFIG_BOOT_HEADER_STORAGE_SIZE)
/* RO image immediately follows the loader image */
-#define CONFIG_RO_STORAGE_OFF (CONFIG_LOADER_STORAGE_OFF + \
- CONFIG_LOADER_SIZE)
+#define CONFIG_RO_STORAGE_OFF (CONFIG_LOADER_STORAGE_OFF + CONFIG_LOADER_SIZE)
/* RW image starts at the beginning of SPI */
#define CONFIG_RW_STORAGE_OFF 0
|
Allow building libcouchbase with external Snappy
Tested-by: Build Bot | @@ -296,7 +296,14 @@ ADD_SUBDIRECTORY(contrib/cbsasl)
ADD_SUBDIRECTORY(contrib/cliopts)
ADD_SUBDIRECTORY(src/ssl)
ADD_SUBDIRECTORY(contrib/lcb-jsoncpp)
+IF(NOT LCB_SNAPPY_LIB)
ADD_SUBDIRECTORY(contrib/snappy)
+ENDIF()
+IF(NOT LCB_SNAPPY_INCLUDE_DIR)
+ INCLUDE_DIRECTORIES(contrib/snappy)
+ELSE()
+ INCLUDE_DIRECTORIES(${LCB_SNAPPY_INCLUDE_DIR})
+ENDIF()
IF(LCB_BUILD_EXAMPLES)
ADD_SUBDIRECTORY(example)
ENDIF()
@@ -316,8 +323,6 @@ FILE(GLOB LCB_JSPARSE_SRC src/jsparse/*.cc)
ADD_LIBRARY(lcb_jsparse OBJECT ${LCB_JSPARSE_SRC})
LCB_CXXUTIL(lcb_jsparse)
-INCLUDE_DIRECTORIES(contrib/snappy)
-
SET(LCB_CORE_OBJS
$<TARGET_OBJECTS:couchbase_select>
$<TARGET_OBJECTS:couchbase_utils>
@@ -336,14 +341,16 @@ SET(LCB_CORE_OBJS
$<TARGET_OBJECTS:lcbcore-cxx>
$<TARGET_OBJECTS:lcb_jsparse>
$<TARGET_OBJECTS:lcb_jsoncpp>
- $<TARGET_OBJECTS:lcb_snappy>
${LCB_DTRACE_OBJECT}
${lcb_plat_objs}
${lcb_ssl_objs})
+IF(NOT LCB_SNAPPY_LIB)
+ LIST (APPEND LCB_CORE_OBJS $<TARGET_OBJECTS:lcb_snappy>)
+ENDIF()
+
ADD_LIBRARY(couchbaseS STATIC ${LCB_CORE_OBJS})
ADD_LIBRARY(couchbase ${_lcb_linkspec} ${LCB_CORE_OBJS} ${PROJECT_BINARY_DIR}/dllversion.rc)
-
# For DTrace implementations which need to gain access to all the *.o files first
# we need to hook the linker command to a custom perl script which will intercept
# the object files passed to the linker, run dtrace on them, and inject the generated
@@ -389,6 +396,9 @@ ENDIF()
IF(LIBPROFILER)
SET(LCB_LINK_DEPS ${LCB_LINK_DEPS} ${LIBPROFILER})
ENDIF()
+IF(LCB_SNAPPY_LIB)
+ SET(LCB_LINK_DEPS ${LCB_LINK_DEPS} ${LCB_SNAPPY_LIB})
+ENDIF()
TARGET_LINK_LIBRARIES(couchbase ${LCB_LINK_DEPS})
TARGET_LINK_LIBRARIES(couchbaseS ${LCB_LINK_DEPS})
|
Formatting fixes, remove commented code | @@ -172,7 +172,6 @@ struct overlay_params {
std::vector<unsigned> cpu_load_color;
std::vector<unsigned> gpu_load_value;
std::vector<unsigned> cpu_load_value;
- //int gpu_load_change, cpu_load_change;
unsigned media_player_color;
unsigned tableCols;
unsigned render_mango;
|
BME280 Lua module - `(config[3] & 0xFC) | BME280_FORCED_MODE` workaround bug fix | @@ -130,8 +130,8 @@ function bme280_startreadout(self, callback, delay, alt)
delay = delay or BME280_SAMPLING_DELAY
if self._isbme then write_reg(self.id, self.addr, BME280_REGISTER_CONTROL_HUM, self._config[2]) end
- write_reg(self.id, self.addr, BME280_REGISTER_CONTROL, math_floor(self._config[3]:byte(1)/4)+ 1)
- -- math_floor(self._config[3]:byte(1)/4)+ 1
+ write_reg(self.id, self.addr, BME280_REGISTER_CONTROL, 4*math_floor(self._config[3]:byte(1)/4)+ 1)
+ -- 4*math_floor(self._config[3]:byte(1)/4)+ 1
-- an awful way to avoid bit operations but calculate (config[3] & 0xFC) | BME280_FORCED_MODE
-- Lua 5.3 integer division // would be more suitable
|
more log_init and rpc_init after dnet fork a new process. | @@ -71,9 +71,6 @@ int xdag_init(int argc, char **argv, int isGui)
printf("%s client/server, version %s.\n", g_progname, XDAG_VERSION);
}
- /* initialize log system */
- if (xdag_log_init()) return -1;
-
g_xdag_run = 1;
xdag_show_state(0);
@@ -162,9 +159,6 @@ int xdag_init(int argc, char **argv, int isGui)
g_xdag_pool = is_pool; // move to here to avoid Data Race
- /* initialize json rpc */
- if(is_rpc && xdag_rpc_service_init(rpc_port)) return -1;
-
g_is_miner = is_miner;
g_is_pool = is_pool;
if (pubaddr && !bindto) {
@@ -184,6 +178,12 @@ int xdag_init(int argc, char **argv, int isGui)
printf("Transport module: ");
if (xdag_transport_start(transport_flags, bindto, n_addrports, addrports)) return -1;
+ /* initialize log system */
+ if (xdag_log_init()) return -1;
+
+ /* initialize json rpc */
+ if(is_rpc && xdag_rpc_service_init(rpc_port)) return -1;
+
if (!is_miner) {
xdag_mess("Reading hosts database...");
if (xdag_netdb_init(pubaddr, n_addrports, addrports)) return -1;
|
pci_bar_init: fix mapping when offset exceeds PAGESIZE | @@ -133,8 +133,9 @@ void pci_bar_init(pci_dev dev, struct pci_bar *b, int bar, bytes offset, bytes l
bytes len = pad(length, PAGESIZE);
b->vaddr = allocate(virtual_page, len);
pci_debug("%s: %p[0x%x] -> 0x%lx[0x%lx]+0x%x\n", __func__, b->vaddr, len, b->addr, b->size, offset);
- map(u64_from_pointer(b->vaddr), b->addr, len, PAGE_DEV_FLAGS, pages);
- b->vaddr += offset;
+ u64 pa = b->addr + offset;
+ map(u64_from_pointer(b->vaddr), pa & ~PAGEMASK, len, PAGE_DEV_FLAGS, pages);
+ b->vaddr += pa & PAGEMASK;
}
}
|
fix the routing of the topology
We need both the source routing AND the default routes | @@ -159,6 +159,17 @@ def setup_client_tun(nodes, id):
print node.cmd('ip route add {} via {} dev tun0'.format(web_addr, tun_addr[:-3]))
+ print node.cmd('ip rule add from 10.1.0.2 table 1')
+ print node.cmd('ip route add 10.1.0.0/24 dev cl-eth0 scope link table 1')
+ print node.cmd('ip route add default via 10.1.0.1 dev cl-eth0 table 1')
+ print node.cmd('ip rule add from 10.1.1.2 table 2')
+ print node.cmd('ip route add 10.1.1.0/24 dev cl-eth1 scope link table 2')
+ print node.cmd('ip route add default via 10.1.1.1 dev cl-eth1 table 2')
+
+ # The two following lines are very important!
+ print node.cmd('ip route add default via 10.1.0.1 dev cl-eth0 metric 100')
+ print node.cmd('ip route add default via 10.1.1.1 dev cl-eth1 metric 101')
+
def setup_server_tun(nodes, id, server_addr):
tun_addr = '10.4.0.1/24'
@@ -185,8 +196,11 @@ def setup_net(net, ip_tun=True, quic_tun=True, gdb=False, tcpdump=False):
setup_server_tun(net, 'vpn', vpn_addr)
if quic_tun and tcpdump:
+ net['cl'].cmd('tcpdump -i cl-eth0 -w cl1.pcap &')
+ net['cl'].cmd('tcpdump -i cl-eth1 -w cl2.pcap &')
net['vpn'].cmd('tcpdump -i tun1 -w tun1.pcap &')
net['r1'].cmd('tcpdump -i r1-eth0 -w r1.pcap &')
+ net['r2'].cmd('tcpdump -i r2-eth0 -w r2.pcap &')
net['vpn'].cmd('tcpdump -i vpn-eth0 -w vpn.pcap &')
net['vpn'].cmd('tcpdump -i vpn-eth1 -w vpn2.pcap &')
sleep(1)
@@ -230,7 +244,7 @@ def teardown_net(net):
def run():
net_cleanup()
- net = Mininet(KiteTopo(bw_a=10, bw_b=25, delay_ms_a=5, delay_ms_b=8, loss_a=0, loss_b=0), link=TCLink)
+ net = Mininet(KiteTopo(bw_a=10, bw_b=25, delay_ms_a=5, delay_ms_b=8, loss_a=0, loss_b=0), link=TCLink, autoStaticArp=True)
net.start()
setup_net(net, ip_tun=True, quic_tun=True, gdb=False, tcpdump=True)
|
update BART references | @@ -17,6 +17,27 @@ Resonance Image Reconstruction using The Berkeley Advanced
Reconstruction Toolbox,
ISMRM Workshop on Data Sampling and Image Reconstruction, Sedona 2016.
+Uecker M.
+Machine Learning Using the BART Toolbox - Implementation of
+a Deep Convolutional Neural Network for Denoising.
+Joint Annual Meeting ISMRM-ESMRMB, Paris 2018,
+In: Proc. Intl. Soc. Mag. Reson. Med. 2018; 26:2802.
+
+Blumenthal M. and Uecker M.
+Deep Deep Learning with BART.
+ISMRM Annual Meeting 2021,
+In: Proc. Intl. Soc. Mag. Reson. Med. 2021; 29:1754.
+
+Luo G, Blumenthal M, Uecker M.
+Using data-driven image priors for image reconstruction with BART.
+ISMRM Annual Meeting 2021,
+In: Proc. Intl. Soc. Mag. Reson. Med. 2021; 29:1756.
+
+Holme HCM and Uecker M.
+Reproducibility meets Software Testing: Automatic Tests
+of Reproducible Publications Using BART.
+ISMRM Annual Meeting 2021,
+In: Proc. Intl. Soc. Mag. Reson. Med. 2021; 29:3768.
|
examples/bind: better compile.sh | @@ -207,13 +207,16 @@ diff -Nur ORIG.bind-9.11.1-P3/bin/named/main.c bind-9.11.1-P3/bin/named/main.c
char *instance = NULL;
diff -Nur ORIG.bind-9.11.1-P3/compile.sh bind-9.11.1-P3/compile.sh
--- ORIG.bind-9.11.1-P3/compile.sh 1970-01-01 01:00:00.000000000 +0100
-+++ bind-9.11.1-P3/compile.sh 2017-07-17 17:20:46.111302279 +0200
-@@ -0,0 +1,5 @@
-+:
++++ bind-9.11.1-P3/compile.sh 2017-07-17 17:30:15.261088082 +0200
+@@ -0,0 +1,8 @@
++#!/bin/sh
+
-+CC=/home/jagger/src/honggfuzz/hfuzz_cc/hfuzz-clang CXX=/home/jagger/src/honggfuzz/hfuzz_cc/hfuzz-clang++ CFLAGS="-fsanitize=address -Wno-logical-not-parentheses -Wno-shift-negative-value -Wno-logical-not-parentheses -g -ggdb -march=skylake -O3" ./configure --prefix=/home/jagger/fuzz/bind/dist/ --disable-threads --without-gssapi --disable-chroot --disable-linux-caps --disable-seccomp --without-libtool --enable-ipv6 --enable-atomic --enable-epoll --with-openssl=no
++set -ex
+
-+#CC=/home/jagger/src/honggfuzz/hfuzz_cc/hfuzz-clang CXX=/home/jagger/src/honggfuzz/hfuzz_cc/hfuzz-clang++ CFLAGS="-fsanitize=memory -Wno-logical-not-parentheses -Wno-shift-negative-value -Wno-logical-not-parentheses -g -ggdb -march=skylake" ./configure --prefix=/home/jagger/fuzz/bind/dist/ --enable-threads --without-gssapi --disable-chroot --disable-linux-caps --disable-seccomp --without-libtool --enable-ipv6 --enable-atomic --enable-epoll --with-openssl=no
++CC=/home/jagger/src/honggfuzz/hfuzz_cc/hfuzz-clang CXX=/home/jagger/src/honggfuzz/hfuzz_cc/hfuzz-clang++ CFLAGS="-fsanitize=address -Wno-logical-not-parentheses -Wno-shift-negative-value -Wno-logical-not-parentheses -g -ggdb -O3" ./configure --prefix=/home/jagger/fuzz/bind/dist/ --disable-threads --without-gssapi --disable-chroot --disable-linux-caps --disable-seccomp --without-libtool --enable-ipv6 --enable-atomic --enable-epoll --with-openssl=no
++
++make clean
++make -j$(nproc)
diff -Nur ORIG.bind-9.11.1-P3/lib/dns/request.c bind-9.11.1-P3/lib/dns/request.c
--- ORIG.bind-9.11.1-P3/lib/dns/request.c 2017-07-07 17:01:52.000000000 +0200
+++ bind-9.11.1-P3/lib/dns/request.c 2017-07-17 17:20:46.111302279 +0200
|
document fastrd tools in readme too | @@ -247,6 +247,13 @@ Compression tools:
--fast-coeff-table <string> : Read custom weights for residual
coefficients from a file instead of using
defaults [default]
+ --fast-rd-sampling : Enable learning data sampling for fast coefficient
+ table generation
+ --fastrd-accuracy-check : Evaluate the accuracy of fast coefficient
+ prediction
+ --fastrd-outdir : Directory to which to output sampled data or accuracy
+ data, into <fastrd-outdir>/0.txt to 50.txt, one file
+ for each QP that blocks were estimated on
--(no-)intra-rdo-et : Check intra modes in rdo stage only until
a zero coefficient CU is found. [disabled]
--(no-)early-skip : Try to find skip cu from merge candidates.
|
ble_mesh: Mark platform related default RNG as 0 | * for some platforms, such as Unix and Linux. For other platforms, you may need
* to provide another PRNG function.
*/
-#define default_RNG_defined 1
+#define default_RNG_defined 0
int default_CSPRNG(uint8_t *dest, unsigned int size);
|
Use 512MB memory by default | @@ -48,7 +48,7 @@ ifdef BMP
CFLAGS += -DBMP
endif
-EMFLAGS = -vga std -D qemu.log -serial file:syslog.log -monitor stdio -d cpu_reset -no-reboot
+EMFLAGS = -vga std -D qemu.log -serial file:syslog.log -monitor stdio -d cpu_reset -no-reboot -m 512m
ifdef debug
EMFLAGS += -s -S
endif
|
Updated RELNOTES for upcoming release. | NSD RELEASE NOTES
-4.3.3 (in development)
+4.3.3
================
FEATURES:
- Follow DNS flag day 2020 advice and
@@ -21,6 +21,7 @@ BUG FIXES:
- Merge PR #121: Increase log level of recreated database from
WARNING to ERR.
- Remove unused space from LIBS on link line.
+ - Updated date in nsd -v output.
4.3.2
|
try variants to foll cppcheck | @@ -2529,10 +2529,10 @@ int picoquic_prepare_probe(picoquic_cnx_t* cnx,
*to_len = probe->peer_addr_len;
}
/* Remember the log address */
- *addr_to_log = (struct sockaddr*)&probe->peer_addr;
+ *addr_to_log = (struct sockaddr*)&(probe->peer_addr);
/* Set the source address */
if (p_addr_from != NULL) {
- *p_addr_from = (struct sockaddr*)&probe->local_addr;
+ *p_addr_from = (struct sockaddr*)(&probe->local_addr);
*from_len = probe->local_addr_len;
}
|
server: Support HTTP HEAD | @@ -375,10 +375,12 @@ void Stream::send_status_response(unsigned int status_code) {
hdr += "\r\n\r\n";
auto v = Buffer{};
- v.buf.resize(hdr.size() + body.size());
+ v.buf.resize(hdr.size() + (htp.method == HTTP_HEAD ? 0 : body.size()));
auto p = std::begin(v.buf);
p = std::copy(std::begin(hdr), std::end(hdr), p);
+ if (htp.method != HTTP_HEAD) {
p = std::copy(std::begin(body), std::end(body), p);
+ }
v.pos = std::begin(v.buf);
streambuf_bytes += v.buf.size();
streambuf.emplace_back(std::move(v));
@@ -415,11 +417,21 @@ int Stream::start_response() {
v.pos = std::begin(v.buf);
streambuf_bytes += v.buf.size();
streambuf.emplace_back(std::move(v));
+
+ switch (htp.method) {
+ case HTTP_HEAD:
+ should_send_fin = true;
+ resp_state = RESP_COMPLETED;
+ close(fd);
+ fd = -1;
+ break;
+ default:
resp_state = RESP_STARTED;
if (buffer_file() != 0) {
return -1;
}
+ }
return 0;
}
|
fixes agent check if agent is locked | @@ -168,8 +168,7 @@ int main(int argc, char** argv) {
if (pairs[0].value) {
if (strcmp(pairs[0].value, REQUEST_VALUE_CHECK) == 0) {
ipc_write(*(con->msgsock), RESPONSE_SUCCESS);
- }
- if (agent_state.lock_state.locked) {
+ } else if (agent_state.lock_state.locked) {
if (strcmp(pairs[0].value, REQUEST_VALUE_UNLOCK) ==
0) { // the agent might be unlocked
agent_handleLock(*(con->msgsock), pairs[13].value,
|
POWER9 Cleanups: Don't force clear SPW bits
SLW force-cleared Special wakeup bits that could hold power management.
However, SLW should expect these bits to be cleared at this point, hence
only read and the report on the SPW bits to find anomalies instead. | @@ -226,19 +226,15 @@ static bool slw_set_overrides_p9(struct proc_chip *chip, struct cpu_thread *c)
int rc;
uint32_t core = pir_to_core_id(c->pir);
- /* Clear special wakeup bits that could hold power mgt */
- rc = xscom_write(chip->id,
+ /* Special wakeup bits that could hold power mgt */
+ rc = xscom_read(chip->id,
XSCOM_ADDR_P9_EC_SLAVE(core, EC_PPM_SPECIAL_WKUP_HYP),
- 0);
+ &tmp);
if (rc) {
log_simple_error(&e_info(OPAL_RC_SLW_SET),
- "SLW: Failed to write EC_PPM_SPECIAL_WKUP_HYP\n");
+ "SLW: Failed to read EC_PPM_SPECIAL_WKUP_HYP\n");
return false;
}
- /* Read back for debug */
- rc = xscom_read(chip->id,
- XSCOM_ADDR_P9_EC_SLAVE(core, EC_PPM_SPECIAL_WKUP_HYP),
- &tmp);
if (tmp)
prlog(PR_WARNING,
"SLW: core %d EC_PPM_SPECIAL_WKUP_HYP read 0x%016llx\n",
|
battery: combine strings to reduce code size
TEST=see kodama's RW flash space shrank by 44 bytes.
BRANCH=kukui | #define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ## args)
#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args)
+#define CUTOFFPRINTS(info) CPRINTS("%s %s", "Battery cut off", info)
/* See config.h for details */
const static int batt_full_factor = CONFIG_BATT_FULL_FACTOR;
@@ -305,9 +306,9 @@ static void pending_cutoff_deferred(void)
rv = board_cut_off_battery();
if (rv == EC_RES_SUCCESS)
- CPRINTS("Battery cut off succeeded.");
+ CUTOFFPRINTS("succeeded.");
else
- CPRINTS("Battery cut off failed!");
+ CUTOFFPRINTS("failed!");
}
DECLARE_DEFERRED(pending_cutoff_deferred);
@@ -329,17 +330,17 @@ static enum ec_status battery_command_cutoff(struct host_cmd_handler_args *args)
p = args->params;
if (p->flags & EC_BATTERY_CUTOFF_FLAG_AT_SHUTDOWN) {
battery_cutoff_state = BATTERY_CUTOFF_STATE_PENDING;
- CPRINTS("Battery cut off at-shutdown is scheduled");
+ CUTOFFPRINTS("at-shutdown is scheduled");
return EC_RES_SUCCESS;
}
}
rv = board_cut_off_battery();
if (rv == EC_RES_SUCCESS) {
- CPRINTS("Battery cut off is successful.");
+ CUTOFFPRINTS("is successful.");
battery_cutoff_state = BATTERY_CUTOFF_STATE_CUT_OFF;
} else {
- CPRINTS("Battery cut off has failed.");
+ CUTOFFPRINTS("has failed.");
}
return rv;
|
Add credentials for dockerup update_latest.yml workflow. | @@ -53,6 +53,12 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
+ - name: Login to Dockerhub
+ uses: docker/login-action@v2
+ with:
+ username: scopeci
+ password: ${{ secrets.SCOPECI_TOKEN }}
+
- name: Pull the Image
run: docker pull cribl/scope:${{ github.event.inputs.version }}
|
ci: fix esp_timer 26 MHz not being assigned to correct runner | @@ -10,7 +10,6 @@ CONFIGS = [
pytest.param('single_core', marks=[pytest.mark.esp32]),
pytest.param('freertos_compliance', marks=[pytest.mark.esp32]),
pytest.param('isr_dispatch_esp32', marks=[pytest.mark.esp32]),
- pytest.param('26mhz_esp32c2', marks=[pytest.mark.esp32c2]),
]
@@ -31,3 +30,18 @@ def test_esp_timer_psram(dut: Dut) -> None:
dut.expect_exact('Press ENTER to see the list of tests')
dut.write('*')
dut.expect_unity_test_output(timeout=240)
+
+
[email protected]
[email protected]_26mhz
[email protected](
+ 'config, baud',
+ [
+ ('26mhz_esp32c2', '74880'),
+ ],
+ indirect=True,
+)
+def test_esp_timer_esp32c2_xtal_26mhz(dut: Dut) -> None:
+ dut.expect_exact('Press ENTER to see the list of tests')
+ dut.write('*')
+ dut.expect_unity_test_output(timeout=240)
|
Fix coverity CID & #1452772- Dereference before NULL check in evp_lib.c | @@ -638,14 +638,14 @@ const OSSL_PROVIDER *EVP_MD_provider(const EVP_MD *md)
int EVP_MD_block_size(const EVP_MD *md)
{
int ok;
- size_t v = md->block_size;
+ size_t v;
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
if (md == NULL) {
EVPerr(EVP_F_EVP_MD_BLOCK_SIZE, EVP_R_MESSAGE_DIGEST_IS_NULL);
return -1;
}
-
+ v = md->block_size;
params[0] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_BLOCK_SIZE, &v);
ok = evp_do_md_getparams(md, params);
@@ -665,14 +665,14 @@ int EVP_MD_pkey_type(const EVP_MD *md)
int EVP_MD_size(const EVP_MD *md)
{
int ok;
- size_t v = md->md_size;
+ size_t v;
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
if (md == NULL) {
EVPerr(EVP_F_EVP_MD_SIZE, EVP_R_MESSAGE_DIGEST_IS_NULL);
return -1;
}
-
+ v = md->md_size;
params[0] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_SIZE, &v);
ok = evp_do_md_getparams(md, params);
|
hw/mcu/dialog: Use proper RCX frequency for os_tick | */
#include <assert.h>
+#include "mcu/da1469x_clock.h"
#include "mcu/da1469x_hal.h"
#include "mcu/cmsis_nvic.h"
#include "hal/hal_os_tick.h"
@@ -163,7 +164,11 @@ os_tick_init(uint32_t os_ticks_per_sec, int prio)
uint32_t primask;
g_hal_os_tick.last_trigger_val = 0;
+#if MYNEWT_VAL_CHOICE(MCU_LPCLK_SOURCE, RCX)
+ g_hal_os_tick.ticks_per_ostick = da1469x_clock_lp_rcx_freq_get() / os_ticks_per_sec;
+#else
g_hal_os_tick.ticks_per_ostick = 32768 / os_ticks_per_sec;
+#endif
g_hal_os_tick.max_idle_ticks = (1UL << 22) / g_hal_os_tick.ticks_per_ostick;
TIMER2->TIMER2_CTRL_REG = 0;
|
Update CMakeLists.txt
Missed a CMAKE option needed for building iOS after the DeviceInfo_* change | @@ -23,6 +23,7 @@ if(BUILD_IOS)
set(TARGET_ARCH "APPLE")
set(IOS True)
set(APPLE True)
+ set (CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)
if(BUILD_SIMULATOR)
set(IOS_PLATFORM "iphonesimulator")
|
lovr.graphics.present idempotence; | @@ -366,6 +366,7 @@ static struct {
bool hasMaterialUpload;
bool hasGlyphUpload;
bool hasReskin;
+ bool presentable;
gpu_device_info device;
gpu_features features;
gpu_limits limits;
@@ -851,6 +852,8 @@ void lovrGraphicsSubmit(Pass** passes, uint32_t count) {
streams[i + 1] = pass->stream;
+ state.presentable |= pass == state.windowPass;
+
switch (pass->info.type) {
case PASS_RENDER:
gpu_render_end(pass->stream);
@@ -1016,9 +1019,10 @@ void lovrGraphicsSubmit(Pass** passes, uint32_t count) {
}
void lovrGraphicsPresent() {
- if (state.window->gpu) {
+ if (state.presentable) {
state.window->gpu = NULL;
state.window->renderView = NULL;
+ state.presentable = false;
gpu_present();
}
}
|
Add Compiler Explorer link. | @@ -48,6 +48,9 @@ implementations using one (or more) of the following:
For an example of a project using SIMDe, see
[LZSSE-SIMDe](https://github.com/nemequ/LZSSE-SIMDe).
+You can [try SIMDe online](https://godbolt.org/z/5gpF97) using Compiler
+Explorer and an amalgamated SIMDe header.
+
## Current Status
[](https://travis-ci.org/nemequ/simde) [](https://ci.appveyor.com/project/quixdb/simde/branch/master) [](https://dev.azure.com/simd-everywhere/SIMDe/_build/latest?definitionId=1&branchName=master)  [](https://codecov.io/gh/nemequ/simde)
|
Add missing #defines in uac2_headset example | @@ -949,7 +949,7 @@ static uint16_t audiod_encode_type_I_pcm(uint8_t rhport, audiod_interface_t* aud
nBytesPerFFToSend = tu_min16(nBytesPerFFToSend, capPerFF);
// Round to full number of samples (flooring)
- nBytesPerFFToSend = (nBytesPerFFToSend / audio->n_channels_per_ff_tx) * audio->n_channels_per_ff_tx;
+ nBytesPerFFToSend = (nBytesPerFFToSend / nBytesToCopy) * nBytesToCopy;
// Encode
void * src;
|
Use CMAKE_SHARED_LINKER_FLAGS to pass MSVC linker option
target_link_libraries does not work here according to issue 2472 | @@ -240,7 +240,7 @@ if (BUILD_SHARED_LIBS AND BUILD_RELAPACK)
if (NOT MSVC)
target_link_libraries(${OpenBLAS_LIBNAME} "-Wl,-allow-multiple-definition")
else()
- target_link_libraries(${OpenBLAS_LIBNAME} "/FORCE:MULTIPLE")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /FORCE:MULTIPLE")
endif()
endif()
|
Fix FS Functional test | @@ -37,8 +37,26 @@ void TestFileCategory(void)
{
UtPrintf("Testing: CFE_FS_GetDefaultMountPoint, CFE_FS_GetDefaultExtension");
- UtAssert_NULL(CFE_FS_GetDefaultMountPoint(CFE_FS_FileCategory_UNKNOWN));
- UtAssert_NULL(CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_UNKNOWN));
+ CFE_FS_GetDefaultMountPoint(CFE_FS_FileCategory_UNKNOWN);
+ CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_UNKNOWN);
+
+ CFE_FS_GetDefaultMountPoint(CFE_FS_FileCategory_DYNAMIC_MODULE);
+ CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_DYNAMIC_MODULE);
+
+ CFE_FS_GetDefaultMountPoint(CFE_FS_FileCategory_BINARY_DATA_DUMP);
+ CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_BINARY_DATA_DUMP);
+
+ CFE_FS_GetDefaultMountPoint(CFE_FS_FileCategory_TEXT_LOG);
+ CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_TEXT_LOG);
+
+ CFE_FS_GetDefaultMountPoint(CFE_FS_FileCategory_SCRIPT);
+ CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_SCRIPT);
+
+ CFE_FS_GetDefaultMountPoint(CFE_FS_FileCategory_TEMP);
+ CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_TEMP);
+
+ CFE_FS_GetDefaultMountPoint(CFE_FS_FileCategory_MAX);
+ CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_MAX);
}
void TestInputFile(void)
|
Improve page balancing when writes are bursty
Extention to the existing slab reallocation model to better cope with eviction patterns that appear in short timeframe bursts.
This means that if more than 25% of the total evictions in the window appear in this slab it becomes a candidate for
needing more pages. | @@ -31,7 +31,15 @@ args = parser.parse_args()
host, port = args.host.split(':')
-def window_check(history, sid, key):
+def window_check_count(history, sid, key):
+ total = 0
+ for window in history['w']:
+ s = window.get(sid)
+ if s and s.get(key):
+ total += s.get(key) > 0 and 1 or 0
+ return total
+
+def window_check_sum(history, sid, key):
total = 0
for window in history['w']:
s = window.get(sid)
@@ -75,14 +83,14 @@ def determine_move(history, diffs, totals):
w[sid]['dirty'] = 1
if slab['evicted_d'] > 0:
w[sid]['dirty'] = 1
- w[sid]['ev'] = 1
+ w[sid]['ev'] = slab['evicted_d'] / totals['evicted_d']
w[sid]['age'] = slab['age']
- age = window_check(history, sid, 'age') / len(history['w'])
+ age = window_check_sum(history, sid, 'age') / len(history['w'])
# if > 2.5 pages free, and not dirty, reassign to global page pool and
# break.
if slab['free_chunks'] > slab['chunks_per_page'] * 2.5:
- if window_check(history, sid, 'dirty') == 0:
+ if window_check_sum(history, sid, 'dirty') == 0:
decision = (sid, 0)
break
@@ -91,9 +99,13 @@ def determine_move(history, diffs, totals):
oldest = (sid, age)
# are we the youngest evicting slab class?
- ev_total = window_check(history, sid, 'ev')
+ ev_total = window_check_count(history, sid, 'ev')
+ ev_total_sum = window_check_sum(history, sid, 'ev') / args.window
window_min = args.window / 2
- if age < youngest[1] and ev_total > window_min:
+ if args.verbose:
+ print("sid {} age {} ev_total {} window_min {} ev_total_sum {}".format(sid, age, ev_total, window_min, ev_total_sum))
+ # If youngest and evicted in more than 50% of the window interval, or more than 25% of the total evictions in the window
+ if age < youngest[1] and ( ev_total > window_min or ev_total_sum > 0.25 ):
youngest = (sid, age)
#if args.verbose:
# print("window: {} range: {}".format(ev_total, window_min))
|
Update lv_kb.h
Changed keyboard map set functions to take 'lv_kb_shift_t' keyboard shift parameter | @@ -68,6 +68,14 @@ enum {
};
typedef uint8_t lv_kb_style_t;
+
+enum {
+ LC_KB_SHIFT_LOWER = 0,
+ LC_KB_SHIFT_UPPER,
+ LC_KB_SHIFT_SYMBOL,
+};
+typedef uint8_t lv_kb_shift_t;
+
/**********************
* GLOBAL PROTOTYPES
**********************/
@@ -108,26 +116,22 @@ void lv_kb_set_cursor_manage(lv_obj_t * kb, bool en);
/**
* Set a new map for the keyboard
* @param kb pointer to a Keyboard object
+ * @param shift keyboard map to alter 'lv_kb_shift_t'
* @param map pointer to a string array to describe the map.
* See 'lv_btnm_set_map()' for more info.
*/
-static inline void lv_kb_set_map(lv_obj_t * kb, const char * map[])
-{
- lv_btnm_set_map(kb, map);
-}
+void lv_kb_set_map(lv_obj_t * kb, lv_kb_shift_t shift, const char * map[]);
/**
* Set the button control map (hidden, disabled etc.) for the keyboard. The
* control map array will be copied and so may be deallocated after this
* function returns.
* @param kb pointer to a keyboard object
+ * @param shift keyboard ctrl map to alter 'lv_kb_shift_t'
* @param ctrl_map pointer to an array of `lv_btn_ctrl_t` control bytes.
* See: `lv_btnm_set_ctrl_map` for more details.
*/
-static inline void lv_kb_set_ctrl_map(lv_obj_t * kb, const lv_btnm_ctrl_t ctrl_map[])
-{
- lv_btnm_set_ctrl_map(kb, ctrl_map);
-}
+void lv_kb_set_ctrl_map(lv_obj_t * kb, lv_kb_shift_t shift, const lv_btnm_ctrl_t ctrl_map[]);
/**
* Set a style of a keyboard
|
Cadillac: simplified the ignition code by removing the timeout logic and resetting controls_allowed = 0 at each init | const int CADILLAC_STEER_MAX = 150; // 1s
-const int CADILLAC_IGNITION_TIMEOUT = 1000000; // 1s
// real time torque limit to prevent controls spamming
// the real time limit is 1500/sec
const int CADILLAC_MAX_RT_DELTA = 75; // max delta torque allowed for real time checks
@@ -11,7 +10,6 @@ const int CADILLAC_DRIVER_TORQUE_FACTOR = 4;
int cadillac_ign = 0;
int cadillac_cruise_engaged_last = 0;
-uint32_t cadillac_ts_ign_last = 0;
int cadillac_rt_torque_last = 0;
int cadillac_desired_torque_last = 0;
uint32_t cadillac_ts_last = 0;
@@ -31,9 +29,8 @@ static void cadillac_rx_hook(CAN_FIFOMailBox_TypeDef *to_push) {
}
// this message isn't all zeros when ignition is on
- if ((addr == 0x160) && (bus_number == 0) && to_push->RDLR) {
- cadillac_ign = 1;
- cadillac_ts_ign_last = TIM2->CNT; // reset timer when ign is received
+ if (addr == 0x160 && bus_number == 0) {
+ cadillac_ign = to_push->RDLR > 0;
}
// enter controls on rising edge of ACC, exit controls on ACC off
@@ -131,15 +128,11 @@ static int cadillac_tx_hook(CAN_FIFOMailBox_TypeDef *to_send) {
}
static void cadillac_init(int16_t param) {
+ controls_allowed = 0;
cadillac_ign = 0;
}
static int cadillac_ign_hook() {
- uint32_t ts = TIM2->CNT;
- uint32_t ts_elapsed = get_ts_elapsed(ts, cadillac_ts_ign_last);
- if (ts_elapsed > CADILLAC_IGNITION_TIMEOUT) {
- cadillac_ign = 0;
- }
return cadillac_ign;
}
|
Add binary collection to releases | @@ -11,4 +11,16 @@ script:
- cmake -DCMAKE_BUILD_TYPE=Release
- make -j2
- cd test
- - ./odyssey_test
+- "./odyssey_test"
+- cd ..
+before_deploy:
+ - tar -zcf odyssey.linux-amd64.$(git rev-parse --short HEAD).tar.gz -C sources odyssey
+deploy:
+ skip_cleanup: true
+ provider: releases
+ api_key:
+ secure: wg142d0buOd42WmPcQyZRFlfpuNAcQV2zhWr3h4hLMd43blgJho/9D13N4fAr/pY83MbZ9Fssp2KX2ukI7jX/mY62Fq8e7vlAeH5gNRxKmDrj8YyRRqCYxugSGmMmmV3iOYGehN32xO54YOnuq8Gi86wzUPS2+oQMIOGer6+xlcwib58ytygUqLQ8wz/fzGbEwTgmuBtI6mroeAEQF6vWqNtfw4wcmchnjiJ3BoJDPa6XyeiMtsPW9wgACHOFWBsf9bsmrxJ56mknyS5jyfltAIU6USGIq4fc0hdfyj4IFMUaBSf8q3mU0rRED4JKv0wihyWwPTwbWJPySWqR1zFDV2VHHj8yMdds3bf4UKE4v6FIfp/r7WQA3GUAibAPbOfcK/WuR2/4nXFYxkJmsJBIht3rKJ+2Tm6MowDlJf95a8qDqT+iG2J2yr2GCLpmeYzLVCsoTDiQP0SahGz9QsHuMoviS4RqT8hYlZSqj1b1LnrZeEvR4FUgkOiqFs4PbevAlBJjyeBex72GTamAsdc2TWbIbDtQ1+Y9pZVRDLaJPOZCrc5LNHLZHj+T2pRuPEEQNRHqvSVAYTOn0t7cUzmXYcM4ggqN0s7ZhQm3aRK0GpUBQhNdWkDWy3b8Mk7rFqZ8GyaNNvBhUlo+Gx/6vfr6MypxEMHKpcAHV1gY+qKapE=
+ file: odyssey.linux-amd64.$(git rev-parse --short HEAD).tar.gz
+ on:
+ repo: yandex/odyssey
+ tags: true
|
add PySide2 imports to vna.py | @@ -31,11 +31,18 @@ from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as Navigatio
from matplotlib.figure import Figure
from matplotlib.ticker import Formatter, FuncFormatter
+try:
from PyQt5.uic import loadUiType
from PyQt5.QtCore import QRegExp, QTimer, QSettings, QDir, Qt
from PyQt5.QtGui import QRegExpValidator
from PyQt5.QtWidgets import QApplication, QMainWindow, QMessageBox, QDialog, QFileDialog, QPushButton, QLabel, QSpinBox
from PyQt5.QtNetwork import QAbstractSocket, QTcpSocket
+except ImportError:
+ from PySide2.QtUiTools import loadUiType
+ from PySide2.QtCore import QRegExp, QTimer, QSettings, QDir, Qt
+ from PySide2.QtGui import QRegExpValidator
+ from PySide2.QtWidgets import QApplication, QMainWindow, QMessageBox, QDialog, QFileDialog, QPushButton, QLabel, QSpinBox
+ from PySide2.QtNetwork import QAbstractSocket, QTcpSocket
Ui_VNA, QMainWindow = loadUiType('vna.ui')
@@ -883,4 +890,4 @@ app = QApplication(sys.argv)
window = VNA()
window.update_tab()
window.show()
-sys.exit(app.exec())
+sys.exit(app.exec_())
|
[OpenGL] Enable color mask
Maybe previous state needs to be restored afterwards? | @@ -499,6 +499,7 @@ static void ImGui_ImplOpenGL3_SetupRenderState(ImDrawData* draw_data, int fb_wid
glDisable(GL_DEPTH_TEST);
glEnable(GL_SCISSOR_TEST);
glDisable(GL_FRAMEBUFFER_SRGB);
+ glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
//#ifdef GL_POLYGON_MODE
if (!g_IsGLES && g_GlVersion >= 200)
|
Avoid signed vs unsigned comparison error.
Introduced by | @@ -150,7 +150,8 @@ static void free_dir(X509_LOOKUP *lu)
static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
{
- int j, len;
+ int j;
+ size_t len;
const char *s, *ss, *p;
if (dir == NULL || !*dir) {
@@ -165,7 +166,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
BY_DIR_ENTRY *ent;
ss = s;
s = p + 1;
- len = (int)(p - ss);
+ len = p - ss;
if (len == 0)
continue;
for (j = 0; j < sk_BY_DIR_ENTRY_num(ctx->dirs); j++) {
|
Fix stats documentation with default socket name | @@ -63,7 +63,7 @@ A new client library can either wrap the C library (libvppapiclient.so) or it ca
```
#!/usr/bin/env python
from vpp_papi.vpp_stats import VPPStats
-stats = VPPStats('/var/run/stats.socks')
+stats = VPPStats('/run/vpp/stats.sock')
dir = stats.ls(['^/if', '/err/ip4-input', '/sys/node/ip4-input'])
counters = stats.dump(dir)
@@ -82,7 +82,7 @@ int main (int argc, char **argv) {
vec_add1(patterns, "^/if");
vec_add1(patterns, "ip4-input");
- int rv = stat_segment_connect("/var/run/stats.sock");
+ int rv = stat_segment_connect(STAT_SEGMENT_SOCKET_FILE);
uint32_t *dir = stat_segment_ls(patterns);
stat_segment_data_t *res = stat_segment_dump(dir);
|
eyre: remove stubbed version text
In replicating a mockup, the residual 'version' for OS1 has overstayed
its welcome as a stub. This commit
removes it. | position: absolute;
bottom: 0;
}
- footer span {
- font-size: 0.875rem;
- }
.mono {
font-family: "Source Code Pro", monospace;
}
==
;footer.absolute.w-100
;div.relative.w-100.tr.tc-ns
- ;span(class "absolute", style "left: 8px; bottom: 8px;")
- ; OS 1
- ;span(class "gray2", style "margin-left: 4px;"): v0.0.1
- ==
;p.pr2.pr0-ns.pb2
;a(href "https://bridge.urbit.org", target "_blank")
;span.dn.dib-ns.pr1:"Open"
|
Fixed format specifier. | @@ -220,7 +220,7 @@ nxt_discovery_module(nxt_task_t *task, nxt_mp_t *mp, nxt_array_t *modules,
{
nxt_log(task, NXT_LOG_NOTICE,
"ignoring %s module with the same "
- "application language version %V %V as in %s",
+ "application language version %V %V as in %V",
name, &module[i].type, &module[i].version,
&module[i].file);
|
Make sure nonce length checks use base algorithm
Nonce length checks are now being used in the oneshot AEAD code as well,
which passes variant algorithms, not the base version, so need to
convert to base if necessary. | @@ -3609,12 +3609,20 @@ exit:
/* AEAD */
/****************************************************************/
-/* Helper to perform common nonce length checks. */
+/* Helper function to get the base algorithm from its variants. */
+static psa_algorithm_t psa_aead_get_base_algorithm( psa_algorithm_t alg )
+{
+ return PSA_ALG_AEAD_WITH_DEFAULT_LENGTH_TAG( alg );
+}
+
+/* Helper function to perform common nonce length checks. */
static psa_status_t psa_aead_check_nonce_length( psa_algorithm_t alg,
size_t nonce_length )
{
+ psa_algorithm_t base_alg = psa_aead_get_base_algorithm( alg );
+
#if defined(MBEDTLS_PSA_BUILTIN_ALG_GCM)
- if( alg == PSA_ALG_GCM )
+ if( base_alg == PSA_ALG_GCM )
{
/* Not checking max nonce size here as GCM spec allows almost
* arbitrarily large nonces. Please note that we do not generally
@@ -3627,7 +3635,7 @@ static psa_status_t psa_aead_check_nonce_length( psa_algorithm_t alg,
}
#endif /* MBEDTLS_PSA_BUILTIN_ALG_GCM */
#if defined(MBEDTLS_PSA_BUILTIN_ALG_CCM)
- if( alg == PSA_ALG_CCM )
+ if( base_alg == PSA_ALG_CCM )
{
if( nonce_length < 7 || nonce_length > 13 )
return( PSA_ERROR_NOT_SUPPORTED );
@@ -3635,7 +3643,7 @@ static psa_status_t psa_aead_check_nonce_length( psa_algorithm_t alg,
else
#endif /* MBEDTLS_PSA_BUILTIN_ALG_CCM */
#if defined(MBEDTLS_PSA_BUILTIN_ALG_CHACHA20_POLY1305)
- if( alg == PSA_ALG_CHACHA20_POLY1305 )
+ if( base_alg == PSA_ALG_CHACHA20_POLY1305 )
{
if( nonce_length != 12 )
return( PSA_ERROR_NOT_SUPPORTED );
@@ -3745,12 +3753,6 @@ exit:
return( status );
}
-/* Helper function to get the base algorithm from its variants. */
-static psa_algorithm_t psa_aead_get_base_algorithm( psa_algorithm_t alg )
-{
- return PSA_ALG_AEAD_WITH_DEFAULT_LENGTH_TAG( alg );
-}
-
/* Set the key for a multipart authenticated operation. */
static psa_status_t psa_aead_setup( psa_aead_operation_t *operation,
int is_encrypt,
|
Remove unused environment string | @@ -3701,11 +3701,12 @@ VOID PhShellOpenKey(
)
{
static PH_STRINGREF regeditKeyNameSr = PH_STRINGREF_INIT(L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit");
- static PH_STRINGREF regeditFileNameSr = PH_STRINGREF_INIT(L"%SystemRoot%\\regedit.exe");
- PPH_STRING lastKey;
+ static PH_STRINGREF regeditFileNameSr = PH_STRINGREF_INIT(L"\\regedit.exe");
HANDLE regeditKeyHandle;
UNICODE_STRING valueName;
+ PPH_STRING lastKey;
PPH_STRING regeditFileName;
+ PH_STRINGREF systemRootString;
if (!NT_SUCCESS(PhCreateKey(
®editKeyHandle,
@@ -3718,28 +3719,25 @@ VOID PhShellOpenKey(
)))
return;
- RtlInitUnicodeString(&valueName, L"LastKey");
lastKey = PhExpandKeyName(KeyName, FALSE);
+ RtlInitUnicodeString(&valueName, L"LastKey");
NtSetValueKey(regeditKeyHandle, &valueName, 0, REG_SZ, lastKey->Buffer, (ULONG)lastKey->Length + sizeof(UNICODE_NULL));
- PhDereferenceObject(lastKey);
-
NtClose(regeditKeyHandle);
+ PhDereferenceObject(lastKey);
// Start regedit. If we aren't elevated, request that regedit be elevated. This is so we can get
- // the consent dialog in the center of the specified window.
+ // the consent dialog in the center of the specified window. (wj32)
- regeditFileName = PhExpandEnvironmentStrings(®editFileNameSr);
-
- if (PhIsNullOrEmptyString(regeditFileName))
- PhMoveReference(®editFileName, PhCreateString(L"regedit.exe"));
+ PhGetSystemRoot(&systemRootString);
+ regeditFileName = PhConcatStringRef2(&systemRootString, ®editFileNameSr);
if (PhGetOwnTokenAttributes().Elevated)
{
- PhShellExecute(hWnd, regeditFileName->Buffer, L"");
+ PhShellExecute(hWnd, regeditFileName->Buffer, NULL);
}
else
{
- PhShellExecuteEx(hWnd, regeditFileName->Buffer, L"", SW_NORMAL, PH_SHELL_EXECUTE_ADMIN, 0, NULL);
+ PhShellExecuteEx(hWnd, regeditFileName->Buffer, NULL, SW_NORMAL, PH_SHELL_EXECUTE_ADMIN, 0, NULL);
}
PhDereferenceObject(regeditFileName);
|
Python: Remove deprecated assertEquals | @@ -321,7 +321,7 @@ class TestBufrFile(unittest.TestCase):
self.assertEqual(msg["bufrHeaderCentre"], 98)
self.assertEqual(msg['count'], i + 1)
self.assertEqual(len(bufr_file.open_messages), 3)
- self.assertEquals(len(bufr_file.open_messages), 0)
+ self.assertEqual(len(bufr_file.open_messages), 0)
def test_message_counting_works(self):
"""The BufrFile is aware of its messages."""
|
Disable LTO on iOS builds, this is a workaround for issues with XCode 11.2/11.3 | @@ -41,8 +41,8 @@ endif(WIN32)
if(IOS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-arc -fmodules -fvisibility=hidden")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fobjc-arc -fmodules -stdlib=libc++ -std=c++11 -ftemplate-depth=1024 -fexceptions -frtti -fvisibility=hidden -fvisibility-inlines-hidden")
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os -flto=thin")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -flto=thin")
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -ObjC")
set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH YES)
|
misc: update header in top-level README | +### <img src="https://github.com/openhpc/ohpc/blob/master/docs/recipes/install/common/figures/ohpc_logo.png" width="170" valign="middle" hspace="5" alt="OpenHPC"/>
----
-
-### OpenHPC: Community building blocks for HPC systems. (v1.3.7)
-
----
+#### Community building blocks for HPC systems (v1.3.7)
[ ](https://github.com/openhpc/ohpc/wiki/Component-List-v1.3.7)
[ ](https://github.com/openhpc/ohpc/releases/tag/v1.3.7.GA)
|
Check element size when parsing tokens. | @@ -207,6 +207,10 @@ next_string(lexer_t *lexer, const char *s)
*lexer->token = STRING_VALUE;
lexer->input = end + 1; /* Skip the closing delimiter. */
+ if(length > DB_MAX_ELEMENT_SIZE - 1) {
+ length = DB_MAX_ELEMENT_SIZE - 1;
+ }
+
memcpy(lexer->value, s, length);
(*lexer->value)[length] = '\0';
@@ -236,6 +240,10 @@ next_token(lexer_t *lexer, const char *s)
*lexer->token = IDENTIFIER;
+ if(length > DB_MAX_ELEMENT_SIZE - 1) {
+ length = DB_MAX_ELEMENT_SIZE - 1;
+ }
+
memcpy(lexer->value, s, length);
(*lexer->value)[length] = '\0';
|
OcBlitLib: Fix VideoFill and VideoToVideo with rotation
Can be tested in the Shell with Builtin text renderer. | @@ -143,8 +143,8 @@ BlitLibVideoFill (
Width = Height;
Height = Tmp;
Tmp = DestinationX;
- DestinationX = DestinationY;
- DestinationY = Configure->Height - Tmp - Height;
+ DestinationX = Configure->Width - DestinationY - Width;
+ DestinationY = Tmp;
} else if (Configure->Rotation == 180) {
//
// Perform -180 rotation.
@@ -158,9 +158,10 @@ BlitLibVideoFill (
Tmp = Width;
Width = Height;
Height = Tmp;
+
Tmp = DestinationX;
- DestinationX = Configure->Width - DestinationY - Width;
- DestinationY = Tmp;
+ DestinationX = DestinationY;
+ DestinationY = Configure->Height - Tmp - Height;
}
WidthInBytes = Width * BYTES_PER_PIXEL;
@@ -555,11 +556,11 @@ BlitLibVideoToVideo (
Width = Height;
Height = Tmp;
Tmp = DestinationX;
- DestinationX = DestinationY;
- DestinationY = Configure->Height - Tmp - Height;
+ DestinationX = Configure->Width - DestinationY - Width;
+ DestinationY = Tmp;
Tmp = SourceX;
- SourceX = SourceY;
- SourceY = Configure->Height - Tmp - Height;
+ SourceX = Configure->Width - SourceY - Width;
+ SourceY = Tmp;
} else if (Configure->Rotation == 180) {
//
// Perform -180 rotation.
@@ -576,11 +577,11 @@ BlitLibVideoToVideo (
Width = Height;
Height = Tmp;
Tmp = DestinationX;
- DestinationX = Configure->Width - DestinationY - Width;
- DestinationY = Tmp;
+ DestinationX = DestinationY;
+ DestinationY = Configure->Height - Tmp - Height;
Tmp = SourceX;
- SourceX = Configure->Width - SourceY - Width;
- SourceY = Tmp;
+ SourceX = SourceY;
+ SourceY = Configure->Height - Tmp - Height;
}
WidthInBytes = Width * BYTES_PER_PIXEL;
|
Update bug_report.md
Added line to keep headers. | @@ -10,6 +10,7 @@ assignees: ''
<!--
- Use this issue template to report a bug in the deCONZ REST-API.
- If you want to report a bug for the Phoscon App, please head over to: https://github.com/dresden-elektronik/phoscon-app-beta
+ - Make sure not to remove any headers and fill the template completely. If you remove the headers, the issue will be auto-closed.
- If you're unsure if the bug fits into this issue tracker, please ask for advise in our Discord chat: https://discord.gg/QFhTxqN
- Please make sure sure you're running the latest version of deCONZ: https://github.com/dresden-elektronik/deconz-rest-plugin/releases
-->
|
Tighten png.INTERLACING type refinement | @@ -965,7 +965,7 @@ pub func decoder.workbuf_len() base.range_ii_u64 {
// 3: log2(y_stride)
// 4: y_stride - y_offset - 1
// 5: y_offset
-pri const INTERLACING : array[8] array[6] base.u8[..= 8] = [
+pri const INTERLACING : array[8] array[6] base.u8[..= 7] = [
[0, 0, 0, 0, 0, 0], // non-interlaced; xy_stride=1, xy_offset=0
[3, 7, 0, 3, 7, 0], // interlace_pass == 1
[3, 3, 4, 3, 7, 0], // interlace_pass == 2
|
hide emu window when on travis | @@ -2709,7 +2709,7 @@ namespace "run" do
throw "You must pass package name" if package_file.nil?
throw "No file to run" if !File.exists?(package_file)
- AndroidTools.run_emulator
+ AndroidTools.run_emulator(:hidden => ENV['TRAVIS'])
AndroidTools.load_app_and_run('-e', File.expand_path(package_file), package_name)
end
@@ -2742,7 +2742,7 @@ namespace "run" do
task :debug => ['run:android:emulator:run']
task :run => ['config:android:emulator'] do
AndroidTools.kill_adb_logcat('-e')
- AndroidTools.run_emulator
+ AndroidTools.run_emulator(:hidden => ENV['TRAVIS'])
apkfile = File.expand_path(File.join $targetdir, $appname + "-debug.apk")
AndroidTools.load_app_and_run('-e', apkfile, $app_package_name)
|
Removed refs to KA library/plugins. | @@ -193,7 +193,7 @@ set(
# Block out Houdini plugins that would load Houdini's UI libraries.
set(
houdini_dso_exclude_pattern
- "HOUDINI_DSO_EXCLUDE_PATTERN={ROP_OpenGL,COP2_GPULighting,COP2_GPUFog,COP2_GPUEnvironment,COP2_GPUZComposite,COP2_EnableGPU,SHOP_OGL,SOP_VDBUI,OBJ_ReLight,VEX_OpRender,KA_H_ROP,ROP_PyPDG}*"
+ "HOUDINI_DSO_EXCLUDE_PATTERN={ROP_OpenGL,COP2_GPULighting,COP2_GPUFog,COP2_GPUEnvironment,COP2_GPUZComposite,COP2_EnableGPU,SHOP_OGL,SOP_VDBUI,OBJ_ReLight,VEX_OpRender,ROP_PyPDG}*"
)
set(
MODULE_DESCRIPTION_ENVIRONMENTS
|
qword: Add sys_getpgrp sysdep | @@ -626,6 +626,14 @@ pid_t sys_getppid() {
return ppid;
}
+pid_t sys_getpgrp(void) {
+ pid_t pgid;
+ asm volatile ("syscall" : "=a"(pgid)
+ : "a"(38), "D"(0)
+ : "rcx", "r11", "rdx");
+ return pgid;
+}
+
#endif // MLIBC_BUILDING_RTDL
} // namespace mlibc
|
Implemented `Get` instances for arrays and maps | @@ -287,14 +287,12 @@ object instances {
def value[F[_]](ptr: Ptr[Array[Pointer]])(implicit
FE: MonadError[F, Throwable]
): F[Value] = {
- val elements = primitive[F](ptr).map { arr =>
- arr.toVector.map(Ptr.fromPrimitive[F])
- }
- // if value_create never fails, make create return a Ptr not in F
- // The alternative (keeping Ptrs in F) requires F to have MonadError
- // so that you can flatMap it to get a Vector[Ptr[_]]
+ val elements = primitive[F](ptr)
+ .flatMap(_.toVector.traverse(Ptr.fromPrimitive[F]))
+ .flatMap(_.traverse(ptr => Ptr.toValue(ptr)(FE)))
+ .map(ArrayValue.apply)
+ .widen[Value]
elements
- ???
}
}
@@ -323,6 +321,7 @@ object instances {
Bindings.instance.metacall_value_to_map(ptr.ptr).take(dataSize.intValue())
tuplePtrs.toVector
.map(Bindings.instance.metacall_value_to_array)
+ .map(_.take(2))
.traverse {
case Array(k, v) => (k, v).pure[F]
case _ =>
@@ -333,7 +332,23 @@ object instances {
def value[F[_]](ptr: Ptr[Array[(Pointer, Pointer)]])(implicit
FE: MonadError[F, Throwable]
- ): F[Value] = ???
+ ): F[Value] = {
+ val elements = primitive[F](ptr)
+ .flatMap(_.toVector.traverse { case (kPtr, vPtr) =>
+ Ptr
+ .fromPrimitive[F](kPtr)
+ .flatMap(kPtr => Ptr.fromPrimitive[F](vPtr).map(vPtr => kPtr -> vPtr))
+ })
+ .flatMap {
+ _.traverse { case (kPtr, vPtr) =>
+ Ptr.toValue(kPtr)(FE).flatMap(k => Ptr.toValue(vPtr)(FE).map(v => k -> v))
+ }
+ }
+ .map(_.toMap)
+ .map(MapValue.apply)
+ .widen[Value]
+ elements
+ }
}
}
|
util/ectool.c: Make sure device_name is NUL terminated
BRANCH=none
TEST=none
Found-by: Coverity Scan
Commit-Ready: Patrick Georgi
Tested-by: Patrick Georgi | @@ -7337,7 +7337,7 @@ int main(int argc, char *argv[])
const struct command *cmd;
int dev = 0;
int interfaces = COMM_ALL;
- char device_name[40] = CROS_EC_DEV_NAME;
+ char device_name[41] = CROS_EC_DEV_NAME;
int rv = 1;
int parse_error = 0;
char *e;
@@ -7374,6 +7374,7 @@ int main(int argc, char *argv[])
break;
case OPT_NAME:
strncpy(device_name, optarg, 40);
+ device_name[40] = '\0';
break;
}
}
|
use road stack instead of heap vector in reel | u3_noun pro = u3k(u3x_at(u3x_sam_3, b));
if ( u3_nul != a ) {
u3j_site sit_u;
+ u3_noun* top;
u3_noun i, t = a;
- c3_w j_w, len_w = 0, all_w = 89, pre_w = 55;
- u3_noun* vec = u3a_malloc(all_w * sizeof(u3_noun));
+ c3_w len_w = 0;
- // stuff list into an array
+ // push list onto road stack
do {
- if ( c3n == u3r_cell(t, &i, &t) ) {
- u3a_free(vec);
- return u3m_bail(c3__exit);
- }
- else {
- if ( len_w == all_w ) {
- // grow vec fib-wise
- all_w += pre_w;
- pre_w = len_w;
- vec = u3a_realloc(vec, all_w * sizeof(u3_noun));
- }
- vec[len_w++] = i;
- }
+ u3x_cell(t, &i, &t);
+ top = (c3_w*) u3a_push(sizeof(u3_noun));
+ *top = i;
+ ++len_w;
} while ( u3_nul != t );
- // now we can iterate backwards
u3j_gate_prep(&sit_u, u3k(b));
- for ( j_w = len_w; j_w > 0; ) {
- pro = u3j_gate_slam(&sit_u, u3nc(u3k(vec[--j_w]), pro));
+ while ( len_w-- > 0 ) {
+ top = u3a_peek(sizeof(u3_noun));
+ u3a_pop(sizeof(u3_noun));
+ pro = u3j_gate_slam(&sit_u, u3nc(u3k(*top), pro));
}
u3j_gate_lose(&sit_u);
- u3a_free(vec);
}
return pro;
}
|
Fix localization of InputSlot/media-source (Issue | @@ -3700,8 +3700,13 @@ _ppdCreateFromIPP(char *buffer, /* I - Filename buffer */
if (!strcmp(sources[j], keyword))
{
snprintf(msgid, sizeof(msgid), "media-source.%s", keyword);
+
+ if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr))
+ if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid)
+ msgstr = keyword;
+
cupsFilePrintf(fp, "*InputSlot %s: \"<</MediaPosition %d>>setpagedevice\"\n", ppdname, j);
- cupsFilePrintf(fp, "*%s.InputSlot %s/%s: \"\"\n", lang->language, ppdname, _cupsLangString(lang, msgid));
+ cupsFilePrintf(fp, "*%s.InputSlot %s/%s: \"\"\n", lang->language, ppdname, msgstr);
break;
}
}
|
Properly record and print cpu number | @@ -165,6 +165,7 @@ struct ftrace_graph_entry {
//unsigned long overrun; /* XXX do we use? */
//unsigned long * retp; /* address of where retaddr sits on the stack */
unsigned long tid;
+ unsigned short cpu;
};
extern void ftrace_stub(unsigned long, unsigned long);
@@ -547,7 +548,7 @@ function_trace(unsigned long ip, unsigned long parent_ip)
goto drop;
func = &(entry->func);
- func->cpu = 0;
+ func->cpu = current_cpu()->id;
func->tid = current->tid;
func->ip = ip;
func->parent_ip = parent_ip;
@@ -654,7 +655,7 @@ function_graph_trace_switch(thread out, thread in)
sw = &(entry->sw);
sw->depth = TRACE_GRAPH_SWITCH_DEPTH;
- sw->cpu = 0;
+ sw->cpu = current_cpu()->id;
sw->tid_in = in ? in->tid : 0;
sw->tid_out = out ? out->tid : 0;
@@ -693,7 +694,7 @@ function_graph_trace_entry(struct ftrace_graph_entry * stack_entry)
graph = &(entry->graph);
graph->ip = stack_entry->func;
graph->duration = 0;
- graph->cpu = 0;
+ graph->cpu = stack_entry->cpu;
graph->depth = stack_entry->depth;
graph->has_child = 1;
graph->tid = stack_entry->tid;
@@ -722,7 +723,7 @@ function_graph_trace_return(struct ftrace_graph_entry * stack_entry)
graph->depth = stack_entry->depth;
graph->ip = stack_entry->func;
graph->duration = (stack_entry->return_ts - stack_entry->entry_ts);
- graph->cpu = 0;
+ graph->cpu = stack_entry->cpu;
graph->has_child = stack_entry->has_child;
graph->flush = graph->has_child; //stack_entry->flush;
graph->tid = stack_entry->tid;
@@ -781,7 +782,7 @@ function_graph_print_entry(struct ftrace_printer * p,
return;
}
- printer_write(p, " %d) ", graph->tid);
+ printer_write(p, " %d) ", graph->cpu);
/* duration */
if (!graph->has_child || graph->duration)
@@ -861,7 +862,7 @@ function_graph_print_header(struct ftrace_printer * p, struct rbuf * rbuf)
{
printer_write(p, "# tracer: function_graph\n");
printer_write(p, "#\n");
- printer_write(p, "# THD DURATION FUNCTION CALLS\n");
+ printer_write(p, "# CPU DURATION FUNCTION CALLS\n");
printer_write(p, "# | | | | | | |\n");
}
@@ -1968,6 +1969,7 @@ prepare_ftrace_return(unsigned long self, unsigned long * parent,
stack_ent->has_child = 0;
//stack_ent->retp = parent;
stack_ent->tid = current ? current->tid : 0;
+ stack_ent->cpu = ci->id;
/* whatever called us has a child */
if (depth > 0) {
|
[CHAIN] in reorg, delete rollbacked tx/block mapping | @@ -219,6 +219,7 @@ func (reorg *reorganizer) rollbackChainState() error {
rollbackBlock
- cdb.latest -= - 1
- gather rollbacked Txs
+ - delete tx/block mapping
*/
func (reorg *reorganizer) rollbackBlock(block *types.Block) {
cdb := reorg.cs.cdb
@@ -227,6 +228,7 @@ func (reorg *reorganizer) rollbackBlock(block *types.Block) {
for _, tx := range block.GetBody().GetTxs() {
reorg.rbTxs[types.ToTxID(tx.GetHash())] = tx
+ cdb.deleteTx(reorg.dbtx, tx)
}
cdb.setLatest(blockNo - 1)
|
Mark tmpl and klass as private | @@ -5,10 +5,7 @@ class Template {
var LEFT_BRACE = "{";
var RIGHT_BRACE = "}";
- init(tmpl, klass) {
- this.tmpl = tmpl;
- this.klass = klass;
- }
+ init(private tmpl, private klass) {}
// render parses the given template and class and
// matches the fields in the class to the template
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.