message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Add parameters for EMAG8180 DYNAMIC_ARCH support with cmake | @@ -332,6 +332,29 @@ if (DEFINED CORE AND CMAKE_CROSSCOMPILING AND NOT (${HOST_OS} STREQUAL "WINDOWSS
set(ZGEMM_UNROLL_M 4)
set(ZGEMM_UNROLL_N 4)
set(SYMV_P 16)
+ elseif ("${TCORE}" STREQUAL "EMAG8180")
+ file(APPEND ${TARGET_CONF_TEMP}
+ "#define ARMV8\n"
+ "#define L1_CODE_SIZE\t32768\n"
+ "#define L1_CODE_LINESIZE\t64\n"
+ "#define L1_CODE_ASSOCIATIVE\t4\n"
+ "#define L1_DATA_SIZE\t32768\n"
+ "#define L1_DATA_LINESIZE\t64\n"
+ "#define L1_DATA_ASSOCIATIVE\t4\n"
+ "#define L2_SIZE\t5262144\n"
+ "#define L2_LINESIZE\t64\n"
+ "#define L2_ASSOCIATIVE\t8\n"
+ "#define DTB_DEFAULT_ENTRIES\t64\n"
+ "#define DTB_SIZE\t4096\n")
+ set(SGEMM_UNROLL_M 16)
+ set(SGEMM_UNROLL_N 4)
+ set(DGEMM_UNROLL_M 8)
+ set(DGEMM_UNROLL_N 4)
+ set(CGEMM_UNROLL_M 8)
+ set(CGEMM_UNROLL_N 4)
+ set(ZGEMM_UNROLL_M 4)
+ set(ZGEMM_UNROLL_N 4)
+ set(SYMV_P 16)
elseif ("${TCORE}" STREQUAL "POWER6")
file(APPEND ${TARGET_CONF_TEMP}
"#define L1_DATA_SIZE 32768\n"
|
dm/VBS-U: implement write callback of notify cfg
virtio_notify_cfg_write is called when guest driver performs virtqueue
kick by writing the notificaiton register of the virtqueue.
Acked-by: Eddie Dong | @@ -1340,7 +1340,31 @@ static void
virtio_notify_cfg_write(struct pci_vdev *dev, uint64_t offset, int size,
uint64_t value)
{
- /* TODO: to be implemented */
+ struct virtio_base *base = dev->arg;
+ struct virtio_vq_info *vq;
+ struct virtio_ops *vops;
+ const char *name;
+ uint64_t idx;
+
+ idx = offset / VIRTIO_MODERN_NOTIFY_OFF_MULT;
+ vops = base->vops;
+ name = vops->name;
+
+ if (idx >= vops->nvq) {
+ fprintf(stderr,
+ "%s: queue %lu notify out of range\r\n", name, idx);
+ return;
+ }
+
+ vq = &base->queues[idx];
+ if (vq->notify)
+ (*vq->notify)(DEV_STRUCT(base), vq);
+ else if (vops->qnotify)
+ (*vops->qnotify)(DEV_STRUCT(base), vq);
+ else
+ fprintf(stderr,
+ "%s: qnotify queue %lu: missing vq/vops notify\r\n",
+ name, idx);
}
static uint32_t
|
net/ipv4_input: Set IPv4 flag at the same place as ipv6_input
Set IPv4 flag before processing ipforward, otherwise the ICMP packet responded by ipforward may sometimes be regarded as IPv6. | @@ -184,6 +184,12 @@ int ipv4_input(FAR struct net_driver_s *dev)
dev->d_len -= llhdrlen;
+ /* Make sure that all packet processing logic knows that there is an IPv4
+ * packet in the device buffer.
+ */
+
+ IFF_SET_IPv4(dev->d_flags);
+
/* Check the size of the packet. If the size reported to us in d_len is
* smaller the size reported in the IP header, we assume that the packet
* has been corrupted in transit. If the size of d_len is larger than the
@@ -354,12 +360,6 @@ int ipv4_input(FAR struct net_driver_s *dev)
goto drop;
}
- /* Make sure that all packet processing logic knows that there is an IPv4
- * packet in the device buffer.
- */
-
- IFF_SET_IPv4(dev->d_flags);
-
/* Now process the incoming packet according to the protocol. */
switch (ipv4->proto)
|
net/can: add support of iob input | @@ -132,7 +132,7 @@ const uint8_t len_to_can_dlc[65] =
****************************************************************************/
/****************************************************************************
- * Name: can_input
+ * Name: can_in
*
* Description:
* Handle incoming packet input
@@ -151,7 +151,7 @@ const uint8_t len_to_can_dlc[65] =
*
****************************************************************************/
-int can_input(struct net_driver_s *dev)
+static int can_in(struct net_driver_s *dev)
{
FAR struct can_conn_s *conn = NULL;
int ret = OK;
@@ -197,4 +197,47 @@ int can_input(struct net_driver_s *dev)
return ret;
}
+/****************************************************************************
+ * Name: can_input
+ *
+ * Description:
+ * Handle incoming packet input
+ *
+ * Input Parameters:
+ * dev - The device driver structure containing the received packet
+ *
+ * Returned Value:
+ * OK The packet has been processed and can be deleted
+ * -EAGAIN There is a matching connection, but could not dispatch the packet
+ * yet. Useful when a packet arrives before a recv call is in
+ * place.
+ *
+ * Assumptions:
+ * This function can be called from an interrupt.
+ *
+ ****************************************************************************/
+
+int can_input(FAR struct net_driver_s *dev)
+{
+ FAR uint8_t *buf;
+ int ret;
+
+ if (dev->d_iob != NULL)
+ {
+ buf = dev->d_buf;
+
+ /* Set the device buffer to l2 */
+
+ dev->d_buf = &dev->d_iob->io_data[CONFIG_NET_LL_GUARDSIZE -
+ NET_LL_HDRLEN(dev)];
+ ret = can_in(dev);
+
+ dev->d_buf = buf;
+
+ return ret;
+ }
+
+ return netdev_input(dev, can_in, false);
+}
+
#endif /* CONFIG_NET && CONFIG_NET_CAN */
|
Use SOL_UDP instead of IPPROTO_UDP | @@ -646,7 +646,7 @@ void picoquic_socks_cmsg_format(
#ifdef IPV6_DONTFRAG
if (!is_null) {
int* pval = (int*)cmsg_format_header_return_data_ptr(msg, &last_cmsg,
- &control_length, IPPROTO_IPV6, IPV6_DONTFRAG, sizeof(int));
+ &control_length, SOL_IPV6, IPV6_DONTFRAG, sizeof(int));
if (pval != NULL) {
*pval = 1;
}
@@ -660,7 +660,7 @@ void picoquic_socks_cmsg_format(
#if defined(UDP_SEGMENT)
if (!is_null && send_msg_size > 0 && send_msg_size < message_length) {
uint16_t* pval = (uint16_t*)cmsg_format_header_return_data_ptr(msg, &last_cmsg,
- &control_length, IPPROTO_UDP, UDP_SEGMENT, sizeof(uint16_t));
+ &control_length, SOL_UDP, UDP_SEGMENT, sizeof(uint16_t));
if (pval != NULL) {
*pval = (uint16_t)send_msg_size;
}
|
Remove Windows from ruby build | @@ -236,37 +236,19 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [windows-latest, macos-latest]
+ os: [macos-latest]
ruby: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1']
- exclude:
- - os: windows-latest
- ruby: '2.3'
steps:
- uses: actions/checkout@v3
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- - uses: egor-tensin/setup-mingw@v2
- if: matrix.os == 'windows-latest'
-
- - name: Install System Tools
- shell: bash
- run: |
- if [ "$RUNNER_OS" == "Windows" ]; then
- choco install swig ninja
- fi
- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
- - name: Configure CMake (Windows)
- if: matrix.os == 'windows-latest'
- shell: powershell
- working-directory: ${{runner.workspace}}/build
- run: cmake $env:GITHUB_WORKSPACE -G "Ninja"
-
- - name: Configure CMake (All)
+ - name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: CXXFLAGS=-Wno-reserved-user-defined-literal cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DTINYSPLINE_ENABLE_RUBY=True
|
perf-tools/msr-safe: correct kmod package name for SLE | @@ -47,7 +47,11 @@ Allows safer access to model specific registers (MSRs)
Summary: msr-safe slurm spank plugin
Group: Development/Libraries
Requires: %{pname}%{PROJ_DELIM}
+%if 0%{?sles_version} || 0%{?suse_version}
+Requires: %{pname}%{PROJ_DELIM}-kmp-default
+%else
Requires: kmod-%{pname}%{PROJ_DELIM}
+%endif
BuildRequires: slurm%{PROJ_DELIM}
BuildRequires: slurm-devel%{PROJ_DELIM}
|
Use =* in ++veri:dawn for easy network reference | ::
?~ net.point
[%| %not-keyed]
+ =* net u.net.point
:: boot keys must match the contract
::
- ?. =(pub:ex:cub pass.u.net.point)
+ ?. =(pub:ex:cub pass.net)
[%| %key-mismatch]
:: life must match the contract
::
- ?. =(lyf.seed life.u.net.point)
+ ?. =(lyf.seed life.net)
[%| %life-mismatch]
:: the boot life must be greater than and discontinuous with
:: the last seen life (per the sponsor)
::
?: ?& ?=(^ live)
?| ?=(%| breach.u.live)
- (lte life.u.net.point life.u.live)
+ (lte life.net life.u.live)
== ==
[%| %already-booted]
:: produce the sponsor for vere
::
- ~? !has.sponsor.u.net.point
- [%no-sponsorship-guarantees-from who.sponsor.u.net.point]
- [%& who.sponsor.u.net.point]
+ ~? !has.sponsor.net
+ [%no-sponsorship-guarantees-from who.sponsor.net]
+ [%& who.sponsor.net]
==
--
-- ::
|
ci test formatting action | @@ -10,7 +10,7 @@ jobs:
- run: echo '${{ toJSON(github) }}'
update-formatting:
continue-on-error: true
- if: github.event.issue.pull_request && github.event.issue.user.login == github.event.pull_request.user.login
+ if: github.event.issue.user.login == 'embeddedt'
runs-on: ubuntu-latest
steps:
- uses: khan/pull-request-comment-trigger@bb03972cc9f423111f3b5a23fcc9fd32741acabb
|
Fix errors in the "Pyto Screenshots" target | @implementation ExtensionsInitializer
+#if !SCREENSHOTS
-(void) initialize_pil {
init_pil();
}
init_biopython();
}
#endif
+#endif
@end
|
fix(c_compiler) Add dirname | @@ -3,10 +3,6 @@ local util = require "titan-compiler.util"
local c_compiler = {}
-c_compiler.LUA_SOURCE_PATH = "lua/src/"
-c_compiler.CFLAGS = "--std=c99 -O2 -Wall -fPIC"
-c_compiler.CC = "cc"
-
local function shell(cmd)
local p = io.popen(cmd)
out = p:read("*a")
@@ -14,6 +10,11 @@ local function shell(cmd)
return out
end
+c_compiler.DIRNAME = shell("dirname " .. arg[0]):gsub("\n*$", "")
+c_compiler.LUA_SOURCE_PATH = c_compiler.DIRNAME .. "/lua/src/"
+c_compiler.CFLAGS = "--std=c99 -O2 -Wall -fPIC"
+c_compiler.CC = "cc"
+
local UNAME = shell("uname -s")
local SHARED
|
Update some metadata in Russian translation | #
msgid ""
msgstr ""
-"Project-Id-Version: goaccess 1.4\n"
+"Project-Id-Version: goaccess 1.5.6\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-03-29 21:11-0500\n"
-"PO-Revision-Date: 2020-06-25 17:14+0300\n"
+"PO-Revision-Date: 2022-04-21 10:17+0300\n"
"Last-Translator: Artyom Karlov <[email protected]>\n"
"Language-Team: \n"
"Language: ru\n"
|
Fix VmaSmallVector::push_back | @@ -4301,8 +4301,9 @@ VmaSmallVector<T, AllocatorT, N>::VmaSmallVector(size_t count, const AllocatorT&
template<typename T, typename AllocatorT, size_t N>
void VmaSmallVector<T, AllocatorT, N>::push_back(const T& src)
{
- resize(m_Count + 1);
- data()[m_Count] = src;
+ const size_t newIndex = size();
+ resize(newIndex + 1);
+ data()[newIndex] = src;
}
template<typename T, typename AllocatorT, size_t N>
|
sysdeps/linux: Implement sys_sync and friends | @@ -720,4 +720,22 @@ int sys_dup(int fd, int flags, int *newfd) {
return 0;
}
+void sys_sync() {
+ do_syscall(NR_sync);
+}
+
+int sys_fsync(int fd) {
+ auto ret = do_syscall(NR_fsync, fd);
+ if (int e = sc_error(ret); e)
+ return e;
+ return 0;
+}
+
+int sys_fdatasync(int fd) {
+ auto ret = do_syscall(NR_fdatasync, fd);
+ if (int e = sc_error(ret); e)
+ return e;
+ return 0;
+}
+
} // namespace mlibc
|
Fix Jenkins Linux AVX2 build | @@ -33,7 +33,7 @@ pipeline {
export CXX=clang++-9
mkdir build_rel
cd build_rel
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DISA_NONE=ON ..
+ cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON -DISA_NONE=ON ..
make install package -j1
'''
}
|
an end to end test for the "critical" attribute
We push an image so that resource is big enough that the test isn't racy | @@ -37,6 +37,12 @@ hosts:
[399, { "link" => "</index.txt.gz>; rel=preload" }, [] ]
end
proxy.reverse.url: http://127.0.0.1:$upstream_port
+ /mruby-critical:
+ mruby.handler: |
+ Proc.new do |env|
+ [399, { "link" => "</halfdome.jpg?1>; rel=preload, </halfdome.jpg?2>; rel=preload, </halfdome.jpg?3>; rel=preload; critical," }, [] ]
+ end
+ proxy.reverse.url: http://127.0.0.1:$upstream_port
/assets:
file.dir: @{[DOC_ROOT]}
EOT
@@ -65,6 +71,10 @@ EOT
my $resp = `nghttp $opts -n --stat '$proto://127.0.0.1:$port/mruby/sleep-and-respond?sleep=1'`;
like $resp, qr{\nid\s*responseEnd\s.*\s/index\.txt\.gz\n.*\s/mruby/sleep-and-respond}is;
};
+ subtest 'push-critical' => sub {
+ my $resp = `nghttp $opts -n --stat '$proto://127.0.0.1:$port/mruby-critical/sleep-and-respond?sleep=1'`;
+ like $resp, qr{\nid\s*responseEnd\s.*\s/halfdome\.jpg\?3\n.*\s/halfdome\.jpg\?[12]\n.*\s/halfdome\.jpg\?[12]\n.*\s/mruby-critical/sleep-and-respond}is;
+ };
};
subtest 'h2 direct' => sub {
|
Allow running single test | @@ -100,6 +100,7 @@ specDir = "core/spec/"
parser = argparse.ArgumentParser()
parser.add_argument("--exec", metavar="<interpreter>", default="../build/wasm3")
+parser.add_argument("--test", metavar="<source:line>")
parser.add_argument("--show-logs", action="store_true")
parser.add_argument("--skip-crashes", action="store_true")
parser.add_argument("-v", "--verbose", action="store_true")
@@ -109,6 +110,9 @@ parser.add_argument("file", nargs='*')
args = parser.parse_args()
#sys.argv = sys.argv[:1]
+if args.test:
+ args.show_logs = True
+
stats = dotdict(total_run=0, skipped=0, failed=0, crashed=0, success=0, missing=0)
def runInvoke(test):
@@ -147,11 +151,8 @@ def runInvoke(test):
actual = "<No Result>"
if actual == "error no operation ()":
- if not args.silent:
- warning(f"{test.source} [{test.action.field}] => not implemented")
+ actual = "<Not Implemented>"
stats.missing += 1
- stats.failed += 1
- return
# Prepare the expected result
expect = None
@@ -176,13 +177,7 @@ def runInvoke(test):
else:
expect = "<Unknown>"
- if actual == expect:
- stats.success += 1
- else:
- stats.failed += 1
- if args.silent: return
- if args.skip_crashes and actual == "<Crashed>": return
-
+ def showTestResult():
print(" ----------------------")
print(f"Test: {ansi.HEADER}{test.source}{ansi.ENDC} -> {' '.join(cmd)}")
#print(f"RetCode: {wasm3.returncode}")
@@ -191,6 +186,17 @@ def runInvoke(test):
if args.show_logs and len(output):
print(f"Log:")
print(output)
+
+ if actual == expect:
+ stats.success += 1
+ if args.test:
+ showTestResult()
+ else:
+ stats.failed += 1
+ if args.silent: return
+ if args.skip_crashes and actual == "<Crashed>": return
+
+ showTestResult()
#sys.exit(1)
if not os.path.isdir(coreDir):
@@ -230,6 +236,9 @@ for fn in jsonFiles:
test.type == "assert_return_canonical_nan" or
test.type == "assert_return_arithmetic_nan"):
+ if args.test and test.source != args.test:
+ continue
+
if args.verbose:
print(f"Checking {test.source}")
|
dec_sse2: remove HE8uv_SSE2
with gcc-4.8, clang-4.0.1/5 this is no faster (actually up to 2x slower)
than the code generated for memset (0x01010... * dst[-1]). shuffles in
sse4 recover a bit, but performance is still down. | @@ -1127,15 +1127,6 @@ static void VE8uv_SSE2(uint8_t* dst) { // vertical
}
}
-static void HE8uv_SSE2(uint8_t* dst) { // horizontal
- int j;
- for (j = 0; j < 8; ++j) {
- const __m128i values = _mm_set1_epi8(dst[-1]);
- _mm_storel_epi64((__m128i*)dst, values);
- dst += BPS;
- }
-}
-
// helper for chroma-DC predictions
static WEBP_INLINE void Put8x8uv_SSE2(uint8_t v, uint8_t* dst) {
int j;
@@ -1224,7 +1215,6 @@ WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitSSE2(void) {
VP8PredChroma8[0] = DC8uv_SSE2;
VP8PredChroma8[1] = TM8uv_SSE2;
VP8PredChroma8[2] = VE8uv_SSE2;
- VP8PredChroma8[3] = HE8uv_SSE2;
VP8PredChroma8[4] = DC8uvNoTop_SSE2;
VP8PredChroma8[5] = DC8uvNoLeft_SSE2;
VP8PredChroma8[6] = DC8uvNoTopLeft_SSE2;
|
BugID:24656372:add readme for app\legacy and board\legacy ;board | @@ -432,9 +432,11 @@ static void I2C1_init()
void board_network_init(void)
{
#ifndef WITH_SAL
+#if AOS_NET_WITH_ETH
/*enable ethernet*/
MX_ETH_Init();
lwip_tcpip_init();
+#endif
#endif
hw_start_hal();
|
kernel_shutdown*: refactor, don't assume the kernel lock is held, schedule storage_sync to run from runqueue if it is not held | @@ -367,32 +367,39 @@ closure_function(1, 1, void, sync_complete,
status, s)
{
vm_exit(bound(code));
+ closure_finish();
}
-extern boolean shutting_down;
-void kernel_shutdown(int status)
+closure_function(1, 0, void, do_storage_sync,
+ status_handler, completion)
{
- shutting_down = true;
- if (root_fs) {
- storage_sync(closure(heap_general(&heaps), sync_complete, status));
- kern_unlock();
- runloop();
- }
- vm_exit(status);
+ storage_sync(bound(completion));
+ closure_finish();
}
+extern boolean shutting_down;
void kernel_shutdown_ex(status_handler completion)
{
shutting_down = true;
if (root_fs) {
+ if (this_cpu_has_kernel_lock()) {
storage_sync(completion);
kern_unlock();
+ } else {
+ enqueue_irqsafe(runqueue, closure(heap_locked(&heaps),
+ do_storage_sync, completion));
+ }
runloop();
}
- apply(completion, 0);
+ apply(completion, STATUS_OK);
while(1);
}
+void kernel_shutdown(int status)
+{
+ kernel_shutdown_ex(closure(heap_locked(&heaps), sync_complete, status));
+}
+
u64 total_processors = 1;
#ifdef SMP_ENABLE
|
* ejdb2_dart_test minors | @@ -27,7 +27,7 @@ void main() async {
await db.put('mycoll', {'foo': 'baz'});
final list = await db.createQuery('@mycoll/*').execute(limit: 1).toList();
- print(list);
+ assert(list.length == 1);
var first = await db.createQuery('@mycoll/*').first();
assert(first != null);
|
hypercall: do not allow hypercall from UOS except trusty
only trusty related hypercall will come from UOS, others should come from VM0
Acked-by: Eddie Dong | @@ -57,6 +57,12 @@ int vmcall_vmexit_handler(struct vcpu *vcpu)
return -1;
}
+ if (!is_vm0(vm) && hypcall_id != HC_WORLD_SWITCH &&
+ hypcall_id != HC_INITIALIZE_TRUSTY) {
+ pr_err("hypercall %d is only allowed from VM0!\n", hypcall_id);
+ return -1;
+ }
+
/* Dispatch the hypercall handler */
switch (hypcall_id) {
case HC_GET_API_VERSION:
|
Update papplClientGetForm to parse GET form data from the options (Issue | @@ -24,7 +24,7 @@ static char *get_cookie(pappl_client_t *client, const char *name, char *buffer,
//
-// 'papplClientGetForm()' - Get POST form data from the web client.
+// 'papplClientGetForm()' - Get GET/POST form data from the web client.
//
int // O - Number of form variables read
@@ -44,6 +44,29 @@ papplClientGetForm(
http_state_t initial_state; // Initial HTTP state
+ if (!client || !form)
+ {
+ if (form)
+ *form = NULL;
+
+ return (0);
+ }
+
+ if (client->operation == HTTP_STATE_GET)
+ {
+ // Copy form data from the request URI...
+ if (!client->options)
+ {
+ *form = NULL;
+ return (0);
+ }
+
+ strlcpy(body, client->options, sizeof(body));
+ body_size = strlen(body);
+ content_type = "application/x-www-form-urlencoded";
+ }
+ else
+ {
// Read up to 2MB of data from the client...
*form = NULL;
initial_state = httpGetState(client->http);
@@ -61,6 +84,7 @@ papplClientGetForm(
// Flush remaining data...
if (httpGetState(client->http) == initial_state)
httpFlush(client->http);
+ }
// Parse the data in memory...
bodyend = body + body_size;
|
nimble/ll: Fix advertising set termination
When using extended advertising PDUs it is possible that AUX_ADV_IND
was dropped due to being scheduled too late. If that happen for
last event (due to duration or max events count) set wouldn't be
terminated. | @@ -3118,10 +3118,12 @@ ble_ll_adv_done(struct ble_ll_adv_sm *advsm)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
if (advsm->duration &&
advsm->adv_pdu_start_time >= advsm->adv_end_time) {
- /* Legacy PDUs need to be stop here, for ext adv it will be stopped when
- * AUX is done.
+ /* Legacy PDUs need to be stop here.
+ * For ext adv it will be stopped when AUX is done (unless it was
+ * dropped so check if AUX is active here as well).
*/
- if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+ if ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) ||
+ !advsm->aux_active) {
ble_ll_adv_sm_stop_timeout(advsm);
}
@@ -3137,10 +3139,12 @@ ble_ll_adv_done(struct ble_ll_adv_sm *advsm)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
if (advsm->events_max && (advsm->events >= advsm->events_max)) {
- /* Legacy PDUs need to be stop here, for ext adv it will be stopped when
- * AUX is done.
+ /* Legacy PDUs need to be stop here.
+ * For ext adv it will be stopped when AUX is done (unless it was
+ * dropped so check if AUX is active here as well).
*/
- if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+ if ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) ||
+ !advsm->aux_active) {
ble_ll_adv_sm_stop_limit_reached(advsm);
}
|
out_azure: use new upstream prototype for tls handling | @@ -175,7 +175,7 @@ struct flb_azure *flb_azure_conf_create(struct flb_output_instance *ins,
ctx->host,
ctx->port,
FLB_IO_TLS,
- &ins->tls);
+ ins->tls);
if (!upstream) {
flb_plg_error(ctx->ins, "cannot create Upstream context");
flb_azure_conf_destroy(ctx);
|
Improve dependencies in README
Document server and client dependencies separately, to avoid unneeded
packages installation when building using the prebuilt server.
Also remove "zip", since it's only used for building a portable version
(which is not documented in README). | @@ -43,10 +43,13 @@ Install the required packages from your package manager (here, for Debian):
# runtime dependencies
sudo apt install ffmpeg libsdl2-2.0.0
-# build dependencies
-sudo apt install make gcc openjdk-8-jdk pkg-config meson zip \
+# client build dependencies
+sudo apt install make gcc pkg-config meson \
libavcodec-dev libavformat-dev libavutil-dev \
libsdl2-dev
+
+# server build dependencies
+sudo apt install openjdk-8-jdk
```
#### Windows
@@ -71,12 +74,11 @@ project. From an MSYS2 terminal, install the required packages:
pacman -S mingw-w64-x86_64-SDL2 \
mingw-w64-x86_64-ffmpeg
-# build dependencies
+# client build dependencies
pacman -S mingw-w64-x86_64-make \
mingw-w64-x86_64-gcc \
mingw-w64-x86_64-pkg-config \
- mingw-w64-x86_64-meson \
- zip
+ mingw-w64-x86_64-meson
```
Java (>= 7) is not available in MSYS2, so if you plan to build the server,
@@ -96,8 +98,8 @@ Use [Homebrew] to install the packages:
# runtime dependencies
brew install sdl2 ffmpeg
-# build dependencies
-brew install gcc pkg-config meson zip
+# client build dependencies
+brew install gcc pkg-config meson
```
Java (>= 7) is not available in Homebrew, so if you plan to build the server,
|
examples/log_dump: change lldbg to printf
After the addition of log_dump start and stop, we no longer
need to use lldbg to avoid saving log_dump command output to
the compressed logs. | @@ -61,7 +61,7 @@ int log_dump_main(int argc, char *argv[])
printf("This Log Should NOT be saved!!!\n");
sleep(1);
- lldbg("\n********************* LOG DUMP START *********************\n");
+ printf("\n********************* LOG DUMP START *********************\n");
if (START_LOGDUMP_SAVE(fd) < 0) {
printf("Failed to start log dump, errno %d\n", get_errno());
@@ -79,11 +79,11 @@ int log_dump_main(int argc, char *argv[])
while (ret > 0) {
ret = READ_LOGDUMP(fd, buf, sizeof(buf));
for (int i = 0; i < ret; i++) {
- lldbg_noarg("%c", buf[i]);
+ printf("%c", buf[i]);
}
}
- lldbg("\n********************* LOG DUMP END ***********************\n");
+ printf("\n********************* LOG DUMP END ***********************\n");
CLOSE_LOGDUMP(fd);
|
vnet: remove unused field
It is not used and just confuses people... | @@ -715,8 +715,6 @@ typedef struct
/* this swif is unnumbered, use addresses on unnumbered_sw_if_index... */
u32 unnumbered_sw_if_index;
- u32 link_speed;
-
/* VNET_SW_INTERFACE_TYPE_HARDWARE. */
u32 hw_if_index;
|
ports: use non-yielding broadcast under spinlock | @@ -169,7 +169,7 @@ void port_put(port_t *p, int destroy)
if (p->refs) {
if (destroy)
/* Wake receivers up */
- proc_threadBroadcastYield(&p->threads);
+ proc_threadBroadcast(&p->threads);
hal_spinlockClear(&p->spinlock);
proc_lockClear(&port_common.port_lock);
|
Verify connection ID in SSR and VN packets | @@ -1893,6 +1893,8 @@ static int conn_recv_handshake_pkt(ngtcp2_conn *conn, const uint8_t *pkt,
return NGTCP2_ERR_PROTO;
}
} else {
+ switch (hd.type) {
+ case NGTCP2_PKT_SERVER_CLEARTEXT:
if (conn->flags & NGTCP2_CONN_FLAG_CONN_ID_NEGOTIATED) {
if (conn->conn_id != hd.conn_id) {
return NGTCP2_ERR_PROTO;
@@ -1901,16 +1903,16 @@ static int conn_recv_handshake_pkt(ngtcp2_conn *conn, const uint8_t *pkt,
conn->flags |= NGTCP2_CONN_FLAG_CONN_ID_NEGOTIATED;
conn->conn_id = hd.conn_id;
}
-
- switch (hd.type) {
- case NGTCP2_PKT_SERVER_CLEARTEXT:
break;
case NGTCP2_PKT_SERVER_STATELESS_RETRY:
- if (conn->strm0->last_rx_offset != 0) {
+ if (conn->strm0->last_rx_offset != 0 || conn->conn_id != hd.conn_id) {
return NGTCP2_ERR_PROTO;
}
break;
case NGTCP2_PKT_VERSION_NEGOTIATION:
+ if (conn->conn_id != hd.conn_id) {
+ return NGTCP2_ERR_PROTO;
+ }
rv = conn_on_version_negotiation(conn, &hd, pkt, pktlen);
if (rv != 0) {
return rv;
|
Add retries to MQTT connect in OTA agent tests | /* Test network header include. */
#include IOT_TEST_NETWORK_HEADER
+/* Test framework includes. */
+#include "aws_test_utils.h"
+
/* Configuration for this test. */
#include "aws_test_ota_config.h"
/**
* @brief Configuration for this test group.
*/
+#define otatestMQTT_RETRIES_START_MS ( 250 )
+#define otatestMQTT_RETRIES_MAX ( 7 )
#define otatestMAX_LOOP_MEM_LEAK_CHECK ( 1 )
#define otatestSHUTDOWN_WAIT pdMS_TO_TICKS( 10000 )
#define otatestAGENT_INIT_WAIT 10000
@@ -185,10 +190,13 @@ TEST_SETUP( Full_OTA_AGENT )
connectInfo.clientIdentifierLength = sizeof( clientcredentialIOT_THING_NAME ) - 1;
/* Connect to the broker. */
- connectStatus = IotMqtt_Connect( &networkInfo,
+ RETRY_EXPONENTIAL( connectStatus = IotMqtt_Connect( &networkInfo,
&connectInfo,
otatestAGENT_INIT_WAIT,
- &xMQTTClientHandle );
+ &xMQTTClientHandle ),
+ IOT_MQTT_SUCCESS,
+ otatestMQTT_RETRIES_START_MS,
+ otatestMQTT_RETRIES_MAX );
TEST_ASSERT_EQUAL_INT_MESSAGE(
IOT_MQTT_SUCCESS, connectStatus,
|
If status line not set for some reason, set it. | @@ -12597,6 +12597,9 @@ static apr_status_t wsgi_header_filter(ap_filter_t *f, apr_bucket_brigade *b)
/* Output status line. */
+ if (!r->status_line)
+ r->status_line = ap_get_status_line(r->status);
+
vec1[0].iov_base = (void *)"Status:";
vec1[0].iov_len = strlen("Status:");
vec1[1].iov_base = (void *)" ";
|
Remove non-existing args from the sample
Remove deprecated parameters from bash_profile | @@ -8,8 +8,8 @@ then
ip link set $WLANDEV down
iw dev $WLANDEV set type monitor
ip link set $WLANDEV up
- hcxdumptool --gpio_button=4 --gpio_statusled=17 -i $WLANDEV -o $ARCHIVNAME.pcapng --poweroff --filterlist=blacklistown --filtermode=1 --give_up_ap_attacks=100000 --give_up_deauthentications=100000
-# hcxdumptool --gpio_button=4 --gpio_statusled=17 -i $WLANDEV -o $ARCHIVNAME.pcapng --tot=1440 --filterlist=blacklistown --filtermode=1 --disable_ap_attacks --disable_deauthentications -t 120
+ hcxdumptool --gpio_button=4 --gpio_statusled=17 -i $WLANDEV -o $ARCHIVNAME.pcapng --poweroff --filterlist_ap=blacklistown --filtermode=1
+# hcxdumptool --gpio_button=4 --gpio_statusled=17 -i $WLANDEV -o $ARCHIVNAME.pcapng --tot=1440 --filterlist_ap=blacklistown --filtermode=1 --disable_ap_attacks --disable_deauthentications -t 120
hcxret=$?
if [ $hcxret -eq 2 ]
then
|
[Cita][#1193]protocol add cita | @@ -45,6 +45,11 @@ add_subdirectory(boatquorum)
set(PROTOS ${PROTOS} $<TARGET_OBJECTS:boatquorum-obj>)
endif()
+if(BOAT_PROTOCOL_USE_CITA)
+add_subdirectory(boatcita)
+set(PROTOS ${PROTOS} $<TARGET_OBJECTS:boatcita-obj>)
+endif()
+
add_library(protocol_obj OBJECT ${PROTOS})
target_link_libraries(protocol_obj ${PROTOS})
|
bufr_compare should fail if passed index files | @@ -167,7 +167,9 @@ int grib_tool(int argc, char **argv)
dump_file=stdout;
}
- if (is_index_file(global_options.infile->name) &&
+ /* ECC-926: Currently only GRIB indexing works. Disable the through_index if BUFR, GTS etc */
+ if (global_options.mode == MODE_GRIB &&
+ is_index_file(global_options.infile->name) &&
( global_options.infile_extra && is_index_file(global_options.infile_extra->name))) {
global_options.through_index=1;
return grib_tool_index(&global_options);
|
add __opencl_c_program_scope_global_variables to cl_offline_compiler | @@ -149,8 +149,8 @@ if [ -e "${CL_DEV_INFO}" ]; then
if [[ "$CL_DEVICE_VERSION" =~ "PoCL" ]] && [ "$CL_IS_30" = "true" ]; then
if [[ "$CL_DEVICE_VERSION" =~ "basic" ]] || [[ "$CL_DEVICE_VERSION" =~ "pthread" ]]; then
- CL_EXT_DEFS="${CL_EXT_DEFS} -D__opencl_c_named_address_space_builtins=1 -D__opencl_c_int64=1 -D__opencl_c_atomic_order_acq_rel=1 -D__opencl_c_atomic_order_seq_cst=1 -D__opencl_c_atomic_scope_device=1"
- CL_EXTS="${CL_EXTS},+__opencl_c_named_address_space_builtins,+__opencl_c_int64,+__opencl_c_atomic_order_acq_rel,+__opencl_c_atomic_order_seq_cst,+__opencl_c_atomic_scope_device"
+ CL_EXT_DEFS="${CL_EXT_DEFS} -D__opencl_c_named_address_space_builtins=1 -D__opencl_c_int64=1 -D__opencl_c_atomic_order_acq_rel=1 -D__opencl_c_atomic_order_seq_cst=1 -D__opencl_c_atomic_scope_device=1 -D__opencl_c_program_scope_global_variables=1 "
+ CL_EXTS="${CL_EXTS},+__opencl_c_named_address_space_builtins,+__opencl_c_int64,+__opencl_c_atomic_order_acq_rel,+__opencl_c_atomic_order_seq_cst,+__opencl_c_atomic_scope_device,+__opencl_c_program_scope_global_variables"
fi
fi
|
docs: add Orca logo | -# Orca: a bot framework for Discord etc.
-
-[](https://discord.gg/2jfycwXVM3)
+<div align="center">
+ <br />
+ <p>
+ <a href="https://cee-studio.github.io/orca"><img src="https://raw.githubusercontent.com/cee-studio/orca-docs/541187418158067130f13e151d25ed2eafb8df52/docs/source/images/logo-light.svg" width="546" alt="orca" style="background-color:red;" /></a>
+ </p>
+ <br />
+ <p>
+ <a href="https://discord.gg/2jfycwXVM3"><img src="https://img.shields.io/discord/562694099887587338?color=5865F2&logo=discord&logoColor=white" alt="Discord server" /></a>
+ </p>
+</div>
**Please give a star if you like this project.**
@@ -10,8 +17,6 @@ Easy to use, easy to deploy, easy to debug way to build reliable Discord bots.
### Design
-The primary design goals are:
-
- easy to use for the end users: we use multi-threading and
synchronous IO to support concurrency so you only need to focus on
the logic. We carefully craft the library to use computing
@@ -128,7 +133,7 @@ valgrind your-bot.exe
## Contributions are welcome!
Check our Discord API's development [Roadmap](docs/DISCORD_ROADMAP.md) and [Coding Guidelines](docs/CODING_GUIDELINES.md) to get started
-If you are not familiar with git and are not comformtable with creating pull requests without introducing merge
+If you are not familiar with git and are not comfortable with creating pull requests without introducing merge
commits, please check our [Commit Guidelines](docs/COMMIT_GUIDELINES.md).
Keywords:
|
doc: fixed a formatting issue in the Qt-GUI README | @@ -102,4 +102,3 @@ If you want to add a new key to the database you can choose a namespace in the l
After entering the key information, you can view it in the list view. Just click on the namespace you chose and select the key.
-
|
Handle OPENBLAS_LOOPS and OPENBLAS_TEST options | @@ -72,13 +72,17 @@ int main(int argc, char *argv[]){
FLOAT *a,*work;
FLOAT wkopt[4];
blasint *ipiv;
- blasint m, i, j, info,lwork;
+ blasint m, i, j, l, info,lwork;
int from = 1;
int to = 200;
int step = 1;
+ int loops = 1;
- double time1;
+ double time1,timeg;
+
+ char *p;
+ char btest = 'I';
argc--;argv++;
@@ -86,6 +90,9 @@ int main(int argc, char *argv[]){
if (argc > 0) { to = MAX(atol(*argv), from); argc--; argv++;}
if (argc > 0) { step = atol(*argv); argc--; argv++;}
+ if ((p = getenv("OPENBLAS_TEST"))) btest=*p;
+
+ if ((p = getenv("OPENBLAS_LOOPS"))) loops=*p;
fprintf(stderr, "From : %3d To : %3d Step = %3d\n", from, to, step);
@@ -124,32 +131,41 @@ int main(int argc, char *argv[]){
fprintf(stderr, " SIZE FLops Time Lwork\n");
for(m = from; m <= to; m += step){
-
+ timeg = 0.;
fprintf(stderr, " %6d : ", (int)m);
- GETRF (&m, &m, a, &m, ipiv, &info);
+ for (l = 0; l < loops; l++) {
+ if (btest == 'F') begin();
+ GETRF (&m, &m, a, &m, ipiv, &info);
+ if (btest == 'F') {
+ end();
+ timeg += getsec();
+ }
if (info) {
fprintf(stderr, "Matrix is not singular .. %d\n", info);
exit(1);
}
- begin();
+ if (btest == 'I') begin();
lwork = -1;
GETRI(&m, a, &m, ipiv, wkopt, &lwork, &info);
lwork = (blasint)wkopt[0];
GETRI(&m, a, &m, ipiv, work, &lwork, &info);
- end();
+ if (btest == 'I') end();
if (info) {
fprintf(stderr, "failed compute inverse matrix .. %d\n", info);
exit(1);
}
- time1 = getsec();
+ if (btest == 'I')
+ timeg += getsec();
+ } // loops
+ time1 = timeg/(double)loops;
fprintf(stderr,
" %10.2f MFlops : %10.2f Sec : %d\n",
COMPSIZE * COMPSIZE * (4.0/3.0 * (double)m * (double)m *(double)m - (double)m *(double)m + 5.0/3.0* (double)m) / time1 * 1.e-6,time1,lwork);
|
Remove assertion because it might fail | @@ -160,9 +160,8 @@ static int rob_write_data(ngtcp2_rob *rob, uint64_t offset, const uint8_t *data,
ngtcp2_rob_data_del(d, rob->mem);
return rv;
}
- } else if (d->range.begin + rob->chunk <= offset) {
- assert(0);
}
+
n = ngtcp2_min(len, d->range.begin + rob->chunk - offset);
memcpy(d->begin + (offset - d->range.begin), data, n);
offset += n;
|
Fix more warnings in tests. | @@ -99,7 +99,7 @@ interpolation_cubic_natural_single_point(CuTest *tc)
___SETUP___
tsBSpline spline = ts_bspline_init();
tsBSpline point = ts_bspline_init();
- tsReal ctrlp[3] = { -5.0, 5.0, 3.2 };
+ tsReal ctrlp[3] = { (tsReal) -5.0, (tsReal) 5.0, (tsReal) 3.2 };
___GIVEN___
C(ts_bspline_new(1, 3, 0, TS_CLAMPED, &point, &status))
@@ -285,7 +285,9 @@ interpolation_catmull_rom_same_point(CuTest *tc)
___SETUP___
tsBSpline spline = ts_bspline_init();
tsBSpline point = ts_bspline_init();
- tsReal ctrlp[6] = { 1.0, 2.0, 1.1, 2.0, 1.0, 2.1 };
+ tsReal ctrlp[6] = { (tsReal) 1.0, (tsReal) 2.0,
+ (tsReal) 1.1, (tsReal) 2.0,
+ (tsReal) 1.0, (tsReal) 2.1 };
___GIVEN___
C(ts_bspline_new(1, 2, 0, TS_CLAMPED, &point, &status))
|
update library existence tests for mpiP | @@ -58,15 +58,27 @@ rpm=mpiP-$LMOD_FAMILY_COMPILER-$LMOD_FAMILY_MPI${DELIM}
fi
}
-@test "[$testname] Verify static library is available in ${PKG}_LIB ($LMOD_FAMILY_COMPILER/$LMOD_FAMILY_MPI)" {
+@test "[$testname] Verify static library is not present in ${PKG}_LIB ($LMOD_FAMILY_COMPILER/$LMOD_FAMILY_MPI)" {
LIB=${PKG}_LIB
if [ -z ${!LIB} ];then
flunk "${PKG}_LIB directory not defined"
fi
- if [ ! -e ${!LIB}/${library}.a ];then
- flunk "${library}.a does not exist when expecting it"
+ if [ -e ${!LIB}/${library}.a ];then
+ flunk "${library}.a exists but not expecting it"
+ fi
+}
+
+@test "[$testname] Verify dynamic library is available in ${PKG}_LIB ($LMOD_FAMILY_COMPILER/$LMOD_FAMILY_MPI)" {
+ LIB=${PKG}_LIB
+
+ if [ -z ${!LIB} ];then
+ flunk "${PKG}_LIB directory not defined"
+ fi
+
+ if [ ! -e ${!LIB}/${library}.so ];then
+ flunk "${library}.so does not exist when expecting it"
fi
}
|
Try MACOSX_DEPLOYMENT_TARGET=10.12 | @@ -12,7 +12,7 @@ env:
global:
- LUAROCKS=2.3.0
# For LuaJIT 2.1, see https://github.com/LuaJIT/LuaJIT/commit/8961a92dd1607108760694af3486b4434602f8be
- - MACOSX_DEPLOYMENT_TARGET=10.4
+ - MACOSX_DEPLOYMENT_TARGET=10.12
matrix:
- WITH_LUA_ENGINE=Lua LUA=lua5.3
- WITH_LUA_ENGINE=LuaJIT LUA=luajit2.1
|
Hooked up a remote terminal, it runs but doesn't work yet. | @@ -68,6 +68,7 @@ data Cmd
= CmdNew New Opts
| CmdRun Run Opts
| CmdBug Bug
+ | CmdCon Word16
deriving (Show)
--------------------------------------------------------------------------------
@@ -270,6 +271,13 @@ bugCmd = fmap CmdBug
$ progDesc "Parse all data in event log"
)
+conCmd :: Parser Cmd
+conCmd = do
+ port <- argument auto ( metavar "PORT"
+ <> help "Port of terminal server"
+ )
+ pure (CmdCon port)
+
allFx :: Parser Bug
allFx = do
bPierPath <- strArgument (metavar "PIER" <> help "Path to pier")
@@ -286,3 +294,6 @@ cmd = subparser
<> command "bug" ( info (bugCmd <**> helper)
$ progDesc "Run a debugging sub-command."
)
+ <> command "con" ( info (conCmd <**> helper)
+ $ progDesc "Connect a terminal to a running urbit."
+ )
|
BugID:23251508: Fix DNS compile issue | @@ -1178,7 +1178,7 @@ dns_check_entry(u8_t i)
break;
case DNS_STATE_ASKING:
if (--entry->tmr == 0) {
- if (++entry->retries == DNS_MAX_RETRIES) {
+ if (++entry->retries == DNS_MAX_RETRIES * num_dns) {
if (dns_backupserver_available(entry)
#if LWIP_DNS_SUPPORT_MDNS_QUERIES
&& !entry->is_mdns
@@ -1186,11 +1186,14 @@ dns_check_entry(u8_t i)
) {
entry->tmr = 1;
entry->retries = 0;
-
+ } else {
LWIP_DEBUGF(DNS_DEBUG, ("dns_check_entry: \"%s\": timeout\n", entry->name));
+ /* call specified callback function if provided */
dns_call_found(i, NULL);
+ /* flush this entry */
entry->state = DNS_STATE_UNUSED;
break;
+ }
} else {
entry->tmr = 1 << entry->retries;
/**
@@ -1245,7 +1248,6 @@ dns_check_entry(u8_t i)
break;
}
}
-}
/**
* Call dns_check_entry for each entry in dns_table - check all entries.
|
papi: add method to retrieve field options
Sample usage:
cls.MEMIF_DEFAULT_BUFFER_SIZE = cls.vapi.vpp.get_field_options(
'memif_create', 'buffer_size')['default']
Type: improvement | @@ -686,6 +686,15 @@ class VPPApiClient:
n[1]['avg'], n[1]['max'])
return s
+ def get_field_options(self, msg, fld_name):
+ # when there is an option, the msgdef has 3 elements.
+ # ['u32', 'ring_size', {'default': 1024}]
+ for _def in self.messages[msg].msgdef:
+ if isinstance(_def, list) and \
+ len(_def) == 3 and \
+ _def[1] == fld_name:
+ return _def[2]
+
def _call_vpp(self, i, msgdef, service, **kwargs):
"""Given a message, send the message and await a reply.
|
Relax a KASSERT to allow the timer to be stopped when it is about
to be running off.
Thanks to Timo Voelker for finding and reporting the bug and
suggesting a fix. | #if defined(__FreeBSD__) && !defined(__Userspace__)
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctputil.c 362173 2020-06-14 09:50:00Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctputil.c 362277 2020-06-17 15:27:45Z tuexen $");
#endif
#include <netinet/sctp_os.h>
@@ -1799,7 +1799,7 @@ sctp_timeout_handler(void *t)
#endif
/* sanity checks... */
- KASSERT(tmr->self == tmr,
+ KASSERT(tmr->self == NULL || tmr->self == tmr,
("sctp_timeout_handler: tmr->self corrupted"));
KASSERT(SCTP_IS_TIMER_TYPE_VALID(tmr->type),
("sctp_timeout_handler: invalid timer type %d", tmr->type));
|
shapito: track stats of all cache allocations | @@ -14,6 +14,7 @@ struct shapito_cache
pthread_spinlock_t lock;
int count;
int count_allocated;
+ int total_allocated;
int limit;
int limit_size;
shapito_stream_t *list;
@@ -25,6 +26,7 @@ shapito_cache_init(shapito_cache_t *cache)
cache->list = NULL;
cache->count = 0;
cache->count_allocated = 0;
+ cache->total_allocated = 0;
cache->limit = 100;
cache->limit_size = 10 * 1024;
pthread_spin_init(&cache->lock, PTHREAD_PROCESS_PRIVATE);
@@ -70,6 +72,7 @@ shapito_cache_pop(shapito_cache_t *cache)
return stream;
}
cache->count_allocated++;
+ cache->total_allocated++;
pthread_spin_unlock(&cache->lock);
shapito_stream_t *stream;
@@ -103,11 +106,13 @@ shapito_cache_push(shapito_cache_t *cache, shapito_stream_t *stream)
}
static inline void
-shapito_cache_stat(shapito_cache_t *cache, int *count, int *count_allocated)
+shapito_cache_stat(shapito_cache_t *cache, int *count, int *count_allocated,
+ int *total_allocated)
{
pthread_spin_lock(&cache->lock);
*count = cache->count;
*count_allocated = cache->count_allocated;
+ *total_allocated = cache->total_allocated;
pthread_spin_unlock(&cache->lock);
}
|
Replace tinyspline.js and tinyspline.wasm with variables. | @@ -324,11 +324,15 @@ set(TINYSPLINE_PLATFORM
# TINYSPLINE_CXX_LIBRARY_OUTPUT_NAME
# Output name of the C++ library without prefix/postfix.
#
+# TINYSPLINE_JS_LIBRARY_OUTPUT_NAME
+# Output name of the JavaScript library without prefix/postfix.
+#
# TINYSPLINE_<LANG>_CMAKE_TARGET
# CMake build target of binding <LANG>.
###############################################################################
set(TINYSPLINE_C_LIBRARY_OUTPUT_NAME "tinyspline")
set(TINYSPLINE_CXX_LIBRARY_OUTPUT_NAME "tinysplinecxx")
+set(TINYSPLINE_JS_LIBRARY_OUTPUT_NAME "tinyspline")
set(TINYSPLINE_CSHARP_CMAKE_TARGET "tinysplinecsharp" CACHE INTERNAL "")
set(TINYSPLINE_DLANG_CMAKE_TARGET "tinysplinedlang" CACHE INTERNAL "")
set(TINYSPLINE_GO_CMAKE_TARGET "tinysplinego" CACHE INTERNAL "")
@@ -920,13 +924,13 @@ if(TINYSPLINE_ENABLE_CXX)
COMMENT "Generating Javascript Interface (C++)"
COMMAND "${CMAKE_C_COMPILER}"
--bind
- -o tinyspline.js
+ -o ${TINYSPLINE_JS_LIBRARY_OUTPUT_NAME}.js
-Wl,--whole-archive $<TARGET_FILE_NAME:${TINYSPLINE_JS_CMAKE_TARGET}>
-Wl,--no-whole-archive
WORKING_DIRECTORY "${TINYSPLINE_OUTPUT_DIRECTORY}"
BYPRODUCTS
- "${TINYSPLINE_OUTPUT_DIRECTORY}/tinyspline.js"
- "${TINYSPLINE_OUTPUT_DIRECTORY}/tinyspline.wasm")
+ "${TINYSPLINE_OUTPUT_DIRECTORY}/${TINYSPLINE_JS_LIBRARY_OUTPUT_NAME}.js"
+ "${TINYSPLINE_OUTPUT_DIRECTORY}/${TINYSPLINE_JS_LIBRARY_OUTPUT_NAME}.wasm")
endif()
target_include_directories(tinysplinecxx PUBLIC
|
Update LCUIWidget_RefreshStyle() | @@ -250,5 +250,7 @@ void LCUIWidget_Update( void )
void LCUIWidget_RefreshStyle( void )
{
- Widget_AddTaskForChildren( LCUIWidget_GetRoot(), WTT_REFRESH_STYLE );
+ LCUI_Widget root = LCUIWidget_GetRoot();
+ Widget_UpdateStyle( root, TRUE );
+ Widget_AddTaskForChildren( root, WTT_REFRESH_STYLE );
}
|
Changed Geo Location panel display default to show only if db is provided (LIBMAXMINDDB). | @@ -410,6 +410,14 @@ verify_panels (void) {
if (str_inarray ("CACHE_STATUS", conf.ignore_panels, ignore_panel_idx) < 0)
remove_module (CACHE_STATUS);
}
+#ifdef HAVE_GEOLOCATION
+#ifdef HAVE_LIBMAXMINDDB
+ if (!conf.geoip_database && ignore_panel_idx < TOTAL_MODULES) {
+ if (str_inarray ("GEO_LOCATION", conf.ignore_panels, ignore_panel_idx) < 0)
+ remove_module (GEO_LOCATION);
+ }
+#endif
+#endif
}
/* Build an array of available modules (ignores listed panels).
|
iniparser: change sprintf to snprintf
snprintf replaces banned unsecure sprintf
Zeroing of last byte added after snprintf | @@ -502,6 +502,7 @@ static int iniparser_add_entry(
} else {
strncpy(longkey, sec, sizeof(longkey));
}
+ longkey[sizeof(longkey)-1] = 0;
/* Add (key,val) to dictionary */
return dictionary_set(d, longkey, val);
@@ -925,7 +926,8 @@ dictionary * iniparser_new(char *ininame)
if (sscanf(where, "[%[^]]", sec)==1) {
/* Valid section name */
- strcpy(sec, strlwc(sec, lc_key));
+ strncpy(sec, strlwc(sec, lc_key), sizeof(sec));
+ sec[sizeof(sec)-1] = 0;
if (iniparser_add_entry(d, sec, NULL, NULL) != 0) {
dictionary_del(d);
fclose(ini);
@@ -936,7 +938,8 @@ dictionary * iniparser_new(char *ininame)
|| sscanf (where, "%[^=] = %[^;#]", key, val) == 2) {
char crop_key[ASCIILINESZ+1];
- strcpy(key, strlwc(strcrop(key, crop_key), lc_key));
+ strncpy(key, strlwc(strcrop(key, crop_key), lc_key), sizeof(key));
+ key[sizeof(key)-1] = 0;
/*
* sscanf cannot handle "" or '' as empty value,
* this is done here
@@ -944,7 +947,8 @@ dictionary * iniparser_new(char *ininame)
if (!strcmp(val, "\"\"") || !strcmp(val, "''")) {
val[0] = (char)0;
} else {
- strcpy(val, strcrop(val, crop_key));
+ strncpy(val, strcrop(val, crop_key), sizeof(val));
+ val[sizeof(val)-1] = 0;
}
if (iniparser_add_entry(d, sec, key, val) != 0) {
dictionary_del(d);
|
more notes on windows overriding | @@ -286,9 +286,13 @@ the [shell](https://stackoverflow.com/questions/43941322/dyld-insert-libraries-i
### Override on Windows
-<span id="override_on_windows">Overriding on Windows</span> is robust but requires that you link your program explicitly with
+<span id="override_on_windows">Overriding on Windows</span> is robust and has the
+particular advantage to be able to redirect all malloc/free calls that go through
+the (dynamic) C runtime allocator, including those from other DLL's or libraries.
+
+The overriding on Windows requires that you link your program explicitly with
the mimalloc DLL and use the C-runtime library as a DLL (using the `/MD` or `/MDd` switch).
-Moreover, you need to ensure the `mimalloc-redirect.dll` (or `mimalloc-redirect32.dll`) is available
+Also, the `mimalloc-redirect.dll` (or `mimalloc-redirect32.dll`) must be available
in the same folder as the main `mimalloc-override.dll` at runtime (as it is a dependency).
The redirection DLL ensures that all calls to the C runtime malloc API get redirected to
mimalloc (in `mimalloc-override.dll`).
@@ -303,8 +307,9 @@ is also recommended to also override the `new`/`delete` operations (by including
The environment variable `MIMALLOC_DISABLE_REDIRECT=1` can be used to disable dynamic
overriding at run-time. Use `MIMALLOC_VERBOSE=1` to check if mimalloc was successfully redirected.
-(Note: in principle, it is possible to patch existing executables
-that are linked with the dynamic C runtime (`ucrtbase.dll`) by just putting the `mimalloc-override.dll` into the import table (and putting `mimalloc-redirect.dll` in the same folder)
+(Note: in principle, it is possible to even patch existing executables without any recompilation
+if they are linked with the dynamic C runtime (`ucrtbase.dll`) -- just put the `mimalloc-override.dll`
+into the import table (and put `mimalloc-redirect.dll` in the same folder)
Such patching can be done for example with [CFF Explorer](https://ntcore.com/?page_id=388)).
|
[DFS] Fix the ramfs issue. | @@ -311,12 +311,13 @@ int dfs_ramfs_getdents(struct dfs_fd *file,
struct dfs_ramfs *ramfs;
dirent = (struct ramfs_dirent *)file->data;
- if (dirent != &(ramfs->root))
- return -EINVAL;
ramfs = dirent->fs;
RT_ASSERT(ramfs != RT_NULL);
+ if (dirent != &(ramfs->root))
+ return -EINVAL;
+
/* make integer count */
count = (count / sizeof(struct dirent));
if (count == 0)
|
fix(hid): Clear all matching usages, not just first.
* If various events get dropped, we can end up with duplicate
codes in our report, so tweak to ensure we look for all matches
and clear them when we have a keycode released. | @@ -55,7 +55,9 @@ int zmk_hid_unregister_mod(zmk_mod_t modifier) {
continue; \
} \
keyboard_report.body.keys[idx] = val; \
+ if (val) { \
break; \
+ } \
}
#define TOGGLE_CONSUMER(match, val) \
@@ -64,7 +66,9 @@ int zmk_hid_unregister_mod(zmk_mod_t modifier) {
continue; \
} \
consumer_report.body.keys[idx] = val; \
+ if (val) { \
break; \
+ } \
}
int zmk_hid_implicit_modifiers_press(zmk_mod_flags_t implicit_modifiers) {
|
ci: Run the mirror workflow on generic workers
No need to bottleneck on the self hosted worker(s) when this is a light
job. | @@ -12,7 +12,7 @@ concurrency:
jobs:
yocto-mirror:
name: Yocto Git Mirror
- runs-on: [self-hosted, Linux]
+ runs-on: ubuntu-latest
steps:
- uses: agherzan/git-mirror-me-action@11f54c7186724daafbe5303b5075954f1a19a63e
env:
|
[catboost] remove one TODO and add another | #error "sorry, not expected to work on 32-bit platform"
#endif
+// TODO(yazevnul): current implementation invokes `Get<PrimitiveType>ArrayRegion` with `mode=0`
+// which which asks JRE to make a copy of array [1] and then we invoke
+// `Release<PrimitiveType>ArrayElements` with `mode=0` which asks JRE to copy elements back and free
+// the buffer. In most of the cases we have no need to copy elements back (because we don't change
+// them), and in some cases we can use that and avoid alocation of our own arrays.
+//
+// [1] https://docs.oracle.com/javase/6/docs/technotes/guides/jni/spec/functions.html
+
#define Y_BEGIN_JNI_API_CALL() \
try {
@@ -274,7 +282,6 @@ JNIEXPORT jint JNICALL Java_ai_catboost_CatBoostJNI_catBoostModelPredict__J_3F_3
numericFeatureCount)
: TConstArrayRef<float>();
Y_SCOPE_EXIT(jenv, jnumericFeatures, numericFeatures) {
- // TODO(yazevnul): what is the last argument meaning?
if (numericFeatures) {
jenv->ReleaseFloatArrayElements(
jnumericFeatures,
|
v2.0.49 landed | -ejdb2 (2.0.49) UNRELEASED; urgency=medium
+ejdb2 (2.0.49) testing; urgency=medium
* Added ability to specify array of primary key values in `/=:?` query clause.
- -- Anton Adamansky <[email protected]> Sun, 17 May 2020 01:18:43 +0700
+ -- Anton Adamansky <[email protected]> Sun, 17 May 2020 01:21:02 +0700
ejdb2 (2.0.48) testing; urgency=medium
|
FIX: main_zk is not set yet in arcus_zk_client_init() | @@ -396,7 +396,7 @@ arcus_zk_client_init(zk_info_t *zinfo)
// ZK client ping period is recv_timeout / 3.
arcus_conf.logger->log(EXTENSION_LOG_INFO, NULL,
"ZooKeeper client initialized. (ZK session timeout=%d sec)\n",
- zoo_recv_timeout(main_zk->zh)/1000);
+ zoo_recv_timeout(zinfo->zh)/1000);
return 0;
}
|
handle new findings of find-doc-nits on fn typedefs w/ extra space | @@ -84,7 +84,7 @@ OSSL_CMP_CTX_set1_senderNonce
int OSSL_CMP_CTX_set1_proxyName(OSSL_CMP_CTX *ctx, const char *name);
int OSSL_CMP_CTX_set_proxyPort(OSSL_CMP_CTX *ctx, int port);
#define OSSL_CMP_DEFAULT_PORT 80
- typedef BIO (*OSSL_cmp_http_cb_t) (OSSL_CMP_CTX *ctx, BIO *hbio,
+ typedef BIO *(*OSSL_cmp_http_cb_t)(OSSL_CMP_CTX *ctx, BIO *hbio,
unsigned long detail);
int OSSL_CMP_CTX_set_http_cb(OSSL_CMP_CTX *ctx, OSSL_cmp_http_cb_t cb);
int OSSL_CMP_CTX_set_http_cb_arg(OSSL_CMP_CTX *ctx, void *arg);
|
Update: minor fix in NLP channel | #Can "parse" English with roughly the following structure to Narsese:
#...[[[adj] subject] ... [adv] predicate] ... [adj] object ... [prep adj object2] conj
+import re
import sys
import time
import subprocess
@@ -75,7 +76,7 @@ outputs = []
def output(negated, text, replaceQuestionWords=True, command=False):
if replaceQuestionWords:
for x in questionwords:
- text = text.replace(x, "?1")
+ text = re.sub(r'[^\W]'+text+"[^\W]", '?1', text)
if command or text.startswith("//"):
print(text) #direct print
else:
@@ -87,7 +88,6 @@ def output(negated, text, replaceQuestionWords=True, command=False):
def outputFinish():
global conditional_appeared
- #print("//HHHHHSADHSHASDHASDHASDAH"+str(outputs) + " " + str(conditional_appeared))
if len(outputs) == 2 and conditional_appeared:
punctuation = outputs[1][-1]
print(("<" + outputs[1][:-1] + " ==> " + outputs[0][:-1] + ">"+punctuation).replace("?1", "$1"))
|
OSSL_STORE_open_ex(): Prevent spurious error: unregistered scheme=file | @@ -114,13 +114,17 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
scheme = schemes[i];
OSSL_TRACE1(STORE, "Looking up scheme %s\n", scheme);
#ifndef OPENSSL_NO_DEPRECATED_3_0
+ ERR_set_mark();
if ((loader = ossl_store_get0_loader_int(scheme)) != NULL) {
+ ERR_clear_last_mark();
no_loader_found = 0;
if (loader->open_ex != NULL)
loader_ctx = loader->open_ex(loader, uri, libctx, propq,
ui_method, ui_data);
else
loader_ctx = loader->open(loader, uri, ui_method, ui_data);
+ } else {
+ ERR_pop_to_mark();
}
#endif
if (loader == NULL
|
Try to do a `stack build` in CI. | language: nix
nix: 2.1.3
+cache:
+ directories:
+ - $HOME/.ghc
+ - $HOME/.cabal
+ - $HOME/.stack
+ - $TRAVIS_BUILD_DIR/.stack-work
+
install:
- - nix-env -iA cachix -f https://cachix.org/api/v1/install
before_install:
- git lfs pull
+ # King Haskell
+ # Using compiler above sets CC to an invalid value, so unset it
+ - unset CC
+ - CABALARGS=""
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin:/opt/alex/$ALEXVER/bin:/opt/happy/$HAPPYVER/bin:$HOME/.cabal/bin:$PATH
+ - | # Install stack
+ mkdir -p ~/.local/bin
+ # travis_retry curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
+ travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
+ # Use the more reliable S3 mirror of Hackage
+ mkdir -p $HOME/.cabal
+ echo 'remote-repo: hackage.haskell.org:http://hackage.fpcomplete.com/' > $HOME/.cabal/config
+ echo 'remote-repo-cache: $HOME/.cabal/packages' >> $HOME/.cabal/config
+
+install:
+ - nix-env -iA cachix -f https://cachix.org/api/v1/install
+
+ # King Haskell
+ - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ - SAVED_OPTIONS=$(set +o)
+ - set -ex
+ - stack --no-terminal --install-ghc build king --only-dependencies
+ - eval "$SAVED_OPTIONS"
+
script:
- cachix use urbit2
- ./sh/cachix || true
@@ -16,6 +46,12 @@ script:
- sh/ci-tests
+ # King Haskell
+ - export PATH="${PATH}:$(pwd)/bin"
+ - stack build --fast --copy-bins --local-bin-path ./bin
+ # otool -L ./bin/king-linux64-demo
+ - mv bin/king release/king-linux64-demo
+
deploy:
- skip_cleanup: true
provider: gcs
|
IP FIB dump - incorrect table-ID for deag paths | @@ -242,7 +242,7 @@ fib_api_path_encode (const fib_route_path_encode_t * api_rpath,
fib_api_path_copy_next_hop (api_rpath, out);
if (~0 == api_rpath->rpath.frp_sw_if_index &&
- !ip46_address_is_zero(&api_rpath->rpath.frp_addr))
+ ip46_address_is_zero(&api_rpath->rpath.frp_addr))
{
if ((DPO_PROTO_IP6 == api_rpath->rpath.frp_proto) ||
(DPO_PROTO_IP4 == api_rpath->rpath.frp_proto))
|
fix bug that wrap mode not disabled in none-QIO mode | @@ -211,12 +211,12 @@ void bootloader_enable_qio_mode(void)
if (i == NUM_CHIPS - 1) {
ESP_LOGI(TAG, "Enabling default flash chip QIO");
}
-#if CONFIG_IDF_TARGET_ESP32S2BETA
- spi_flash_wrap_set(FLASH_WRAP_MODE_DISABLE);
-#endif
enable_qio_mode(chip_data[i].read_status_fn,
chip_data[i].write_status_fn,
chip_data[i].status_qio_bit);
+#if CONFIG_IDF_TARGET_ESP32S2BETA
+ spi_flash_wrap_set(FLASH_WRAP_MODE_DISABLE);
+#endif
}
static esp_err_t enable_qio_mode(read_status_fn_t read_status_fn,
|
reverse commit on htif: need to parse args for verilator | @@ -121,6 +121,7 @@ int main(int argc, char** argv)
FILE * vcdfile = NULL;
uint64_t start = 0;
#endif
+ char ** htif_argv = NULL;
int verilog_plusargs_legal = 1;
while (1) {
@@ -242,6 +243,10 @@ done_processing:
usage(argv[0]);
return 1;
}
+ int htif_argc = 1 + argc - optind;
+ htif_argv = (char **) malloc((htif_argc) * sizeof (char *));
+ htif_argv[0] = argv[0];
+ for (int i = 1; optind < argc;) htif_argv[i++] = argv[optind++];
if (verbose)
fprintf(stderr, "using random seed %u\n", random_seed);
@@ -264,8 +269,8 @@ done_processing:
#endif
jtag = new remote_bitbang_t(rbb_port);
- dtm = new dtm_t(argc, argv);
- tsi = new tsi_t(argc, argv);
+ dtm = new dtm_t(htif_argc, htif_argv);
+ tsi = new tsi_t(htif_argc, htif_argv);
signal(SIGTERM, handle_sigterm);
@@ -346,5 +351,6 @@ done_processing:
if (tsi) delete tsi;
if (jtag) delete jtag;
if (tile) delete tile;
+ if (htif_argv) free(htif_argv);
return ret;
}
|
hal/armv7a-zynq7000: add software reset | @@ -514,6 +514,16 @@ static int _zynq_getDevRst(int dev, unsigned int *state)
}
+static void zynq_softRst(void)
+{
+ _zynq_slcrUnlock();
+ *(zynq_common.slcr + slcr_pss_rst_ctrl) |= 0x1;
+ _zynq_slcrLock();
+
+ __builtin_unreachable();
+}
+
+
/* TODO */
void hal_wdgReload(void)
{
@@ -578,7 +588,7 @@ int hal_platformctl(void *ptr)
break;
case pctl_reboot:
- /* TODO */
+ zynq_softRst();
break;
default:
|
touch_sensor: fixed timer period | @@ -427,7 +427,7 @@ esp_err_t touch_pad_set_filter_period(uint32_t new_period_ms)
esp_err_t ret = ESP_OK;
xSemaphoreTake(rtc_touch_mux, portMAX_DELAY);
ESP_GOTO_ON_ERROR(esp_timer_stop(s_touch_pad_filter->timer), err, TOUCH_TAG, "failed to stop the timer");
- ESP_GOTO_ON_ERROR(esp_timer_start_periodic(s_touch_pad_filter->timer, new_period_ms), err, TOUCH_TAG, "failed to start the timer");
+ ESP_GOTO_ON_ERROR(esp_timer_start_periodic(s_touch_pad_filter->timer, new_period_ms * 1000), err, TOUCH_TAG, "failed to start the timer");
s_touch_pad_filter->period = new_period_ms;
err:
xSemaphoreGive(rtc_touch_mux);
@@ -479,7 +479,8 @@ esp_err_t touch_pad_filter_start(uint32_t filter_period_ms)
goto err_no_mem;
}
s_touch_pad_filter->period = filter_period_ms;
- esp_timer_start_periodic(s_touch_pad_filter->timer, filter_period_ms);
+ touch_pad_filter_cb(NULL); // Trigger once immediately to get the initial raw value
+ esp_timer_start_periodic(s_touch_pad_filter->timer, filter_period_ms * 1000);
}
xSemaphoreGive(rtc_touch_mux);
|
Fix running Shortcuts with spaces in the name | @@ -4,15 +4,7 @@ Taken from https://stackoverflow.com/a/25580545/7515957
from json import dumps
-try:
- from urllib import urlencode, unquote
- from urlparse import urlparse, parse_qsl, ParseResult
-except ImportError:
- # Python 3 fallback
- from urllib.parse import (
- urlencode, unquote, urlparse, parse_qsl, ParseResult
- )
-
+from urllib.parse import (urlencode, unquote, quote, urlparse, parse_qsl, ParseResult)
def add_url_params(url, params):
""" Add GET params to provided URL being aware of existing.
@@ -45,7 +37,7 @@ def add_url_params(url, params):
)
# Converting URL argument to proper query string
- encoded_get_args = urlencode(parsed_get_args, doseq=False)
+ encoded_get_args = urlencode(parsed_get_args, doseq=True, quote_via=quote)
# Creating new parsed result object based on provided with new
# URL arguments. Same thing happens inside of urlparse.
new_url = ParseResult(
@@ -53,4 +45,5 @@ def add_url_params(url, params):
parsed_url.params, encoded_get_args, parsed_url.fragment
).geturl()
+ print(new_url)
return new_url
|
SSIM: harmonize the function suffix | @@ -109,7 +109,7 @@ static double SSIMGet_C(const uint8_t* src1, int stride1,
//------------------------------------------------------------------------------
-static uint32_t AccumulateSSE(const uint8_t* src1,
+static uint32_t AccumulateSSE_C(const uint8_t* src1,
const uint8_t* src2, int len) {
int i;
uint32_t sse2 = 0;
@@ -138,7 +138,7 @@ WEBP_TSAN_IGNORE_FUNCTION void VP8SSIMDspInit(void) {
VP8SSIMGetClipped = SSIMGetClipped_C;
VP8SSIMGet = SSIMGet_C;
- VP8AccumulateSSE = AccumulateSSE;
+ VP8AccumulateSSE = AccumulateSSE_C;
if (VP8GetCPUInfo != NULL) {
#if defined(WEBP_USE_SSE2)
if (VP8GetCPUInfo(kSSE2)) {
|
mmapstorage: fix kdbSet on empty keyset, limit meta ksReference, skip ksRewind and rewind raw | #include <errno.h>
#include <stdio.h> // fopen()
//#include <stdlib.h> // exit()
+#include <limits.h> // SSIZE_MAX
#include <sys/mman.h> // mmap()
#include <sys/stat.h> // stat()
#include <sys/types.h> // ftruncate ()
@@ -416,13 +417,15 @@ static void writeKeySet (MmapHeader * mmapHeader, KeySet * keySet, KeySet * dest
mappedMetaKey = dynArray->mappedKeyArray[find ((Key *)metaKey, dynArray)];
ELEKTRA_LOG_WARNING ("mappedMetaKey: %p", (void *)mappedMetaKey);
newMeta->array[metaKeyIndex] = mappedMetaKey;
+ if (mappedMetaKey->ksReference < SSIZE_MAX)
++(mappedMetaKey->ksReference);
++metaKeyIndex;
}
newMeta->array[oldMeta->size] = 0;
newMeta->alloc = oldMeta->alloc;
newMeta->size = oldMeta->size;
- ksRewind (newMeta);
+ newMeta->cursor = 0;
+ newMeta->current = 0;
metaKsPtr += (newMeta->alloc) * SIZEOF_KEY_PTR;
}
ELEKTRA_LOG_WARNING ("INSERT META INTO REAL KEY, HERE IS THE META KS:");
@@ -456,7 +459,8 @@ static void writeKeySet (MmapHeader * mmapHeader, KeySet * keySet, KeySet * dest
ksPtr->array[keySet->size] = 0;
ksPtr->alloc = keySet->alloc;
ksPtr->size = keySet->size;
- ksRewind (ksPtr);
+ ksPtr->cursor = 0;
+ ksPtr->current = 0;
// m_output_keyset (ksPtr);
}
@@ -474,10 +478,13 @@ static void elektraMmapstorageWrite (char * mappedRegion, KeySet * keySet, MmapH
if (keySet->size < 1)
{
// TODO: review mpranj
+ char * ksArrayPtr = (((char *)ksPtr) + SIZEOF_KEYSET);
+
memcpy (ksPtr, keySet, SIZEOF_KEYSET);
ksPtr->flags = keySet->flags | KS_FLAG_MMAP;
- ksPtr->array = 0;
- ksPtr->alloc = 0;
+ ksPtr->array = (Key **)ksArrayPtr;
+ ksPtr->array[0] = 0;
+ ksPtr->alloc = keySet->alloc;
ksPtr->size = 0;
ksPtr->cursor = 0;
ksPtr->current = 0;
@@ -613,12 +620,12 @@ int elektraMmapstorageGet (Plugin * handle, KeySet * returned, Key * parentKey)
// ksClear (returned);
mmapToKeySet (mappedRegion, returned);
- ksRewind (returned);
- Key * cur;
- while ((cur = ksNext (returned)) != 0)
- {
- keyIncRef (cur);
- }
+// ksRewind (returned);
+// Key * cur;
+// while ((cur = ksNext (returned)) != 0)
+// {
+// keyIncRef (cur);
+// }
// m_output_keyset (returned);
fclose (fp);
|
RTX5: updated implementation version of CMSIS-RTOS1 | #define osCMSIS 0x20001U ///< API version (main[31:16].sub[15:0])
-#define osCMSIS_RTX 0x50001U ///< RTOS identification and version (main[31:16].sub[15:0])
+#define osCMSIS_RTX 0x50003U ///< RTOS identification and version (main[31:16].sub[15:0])
-#define osKernelSystemId "RTX V5.1" ///< RTOS identification string
+#define osKernelSystemId "RTX V5.3" ///< RTOS identification string
#define osFeature_MainThread 0 ///< main thread 1=main can be thread, 0=not available
#define osFeature_Signals 31U ///< maximum number of Signal Flags available per thread
|
BugID:16855090:[makefile] COAP_COMM conflicts with DEV_BIND feature | @@ -38,6 +38,7 @@ $(call Conflict_Relation, FEATURE_SUPPORT_TLS, FEATURE_SUPPORT_ITLS)
$(call Conflict_Relation, FEATURE_COAP_COMM_ENABLED, FEATURE_ALCS_ENABLED)
$(call Conflict_Relation, FEATURE_COAP_COMM_ENABLED, FEATURE_WIFI_AWSS_ENABLED)
$(call Conflict_Relation, FEATURE_COAP_COMM_ENABLED, FEATURE_SDK_ENHANCE)
+$(call Conflict_Relation, FEATURE_COAP_COMM_ENABLED, FEATURE_DEV_BIND_ENABLED)
# 'Opt1 = y' requires 'Opt2 = y' as mandantory support
#
|
Fix MSVC warning C4505 for VmaCreateStringCopy | @@ -3256,6 +3256,7 @@ static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char
return VMA_NULL;
}
+#if VMA_STATS_STRING_ENABLED
static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr, size_t strLen)
{
if (srcStr != VMA_NULL)
@@ -3267,6 +3268,7 @@ static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char
}
return VMA_NULL;
}
+#endif // VMA_STATS_STRING_ENABLED
static void VmaFreeString(const VkAllocationCallbacks* allocs, char* str)
{
|
fix mbedtls/psa status code mismatch | @@ -4865,8 +4865,9 @@ static psa_status_t psa_generate_derived_ecc_key_weierstrass_helper(
mbedtls_mpi N;
mbedtls_mpi k;
mbedtls_mpi diff_N_2;
- int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
- psa_status_t status;
+ /* ret variable is used by MBEDTLS_MPI_CHK macro */
+ int ret = 0;
+ psa_status_t status = PSA_SUCCESS;
mbedtls_mpi_init( &k );
mbedtls_mpi_init( &N );
@@ -4879,18 +4880,15 @@ static psa_status_t psa_generate_derived_ecc_key_weierstrass_helper(
if( grp_id == MBEDTLS_ECP_DP_NONE )
{
- ret = PSA_ERROR_INVALID_ARGUMENT;
+ status = PSA_ERROR_INVALID_ARGUMENT;
goto cleanup;
}
mbedtls_ecp_group ecp_group;
mbedtls_ecp_group_init( &ecp_group );
- if( ( status = mbedtls_ecp_group_load( &ecp_group, grp_id ) ) != 0 )
- {
- ret = status;
+ if( ( status = mbedtls_to_psa_error( mbedtls_ecp_group_load( &ecp_group, grp_id ) ) ) != 0 )
goto cleanup;
- }
/* N is the boundary of the private key domain. */
MBEDTLS_MPI_CHK( mbedtls_mpi_copy( &N, &ecp_group.N ) );
@@ -4902,15 +4900,12 @@ static psa_status_t psa_generate_derived_ecc_key_weierstrass_helper(
*data = mbedtls_calloc( 1, m_bytes );
if( *data == NULL )
{
- ret = PSA_ERROR_INSUFFICIENT_MEMORY;
+ status = PSA_ERROR_INSUFFICIENT_MEMORY;
goto cleanup;
}
/* 1. Draw a byte string of length ceiling(m/8) bytes. */
if ( ( status = psa_key_derivation_output_bytes( operation, *data, m_bytes ) ) != 0 )
- {
- ret = status;
goto cleanup;
- }
/* 2. If m is not a multiple of 8 */
if (m % 8)
@@ -4941,17 +4936,17 @@ static psa_status_t psa_generate_derived_ecc_key_weierstrass_helper(
/* 5. Output k + 1 as the private key. */
MBEDTLS_MPI_CHK( mbedtls_mpi_add_int( &k, &k, 1));
MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &k, *data, m_bytes) );
-
- ret = 0;
cleanup:
- if (ret) {
+ if( ret )
+ status = mbedtls_to_psa_error( ret );
+ if (status) {
mbedtls_free( *data );
*data = NULL;
}
mbedtls_mpi_free( &k );
mbedtls_mpi_free( &N );
mbedtls_mpi_free( &diff_N_2 );
- return( ret );
+ return( status );
}
#endif
|
peview: Fix updating MaxSizeUnit setting | @@ -160,10 +160,16 @@ static VOID PhpGeneralPageSave(
//PhSetStringSetting2(L"SearchEngine", &PhaGetDlgItemText(WindowHandle, IDC_SEARCHENGINE)->sr);
+ if (ComboBox_GetCurSel(GetDlgItem(WindowHandle, IDC_MAXSIZEUNIT)) != PhGetIntegerSetting(L"MaxSizeUnit"))
+ {
+ PhSetIntegerSetting(L"MaxSizeUnit", ComboBox_GetCurSel(GetDlgItem(WindowHandle, IDC_MAXSIZEUNIT)));
+ RestartRequired = TRUE;
+ }
+
if (!PhEqualString(PhaGetDlgItemText(WindowHandle, IDC_DBGHELPSEARCHPATH), PhaGetStringSetting(L"DbgHelpSearchPath"), TRUE))
{
PhSetStringSetting2(L"DbgHelpSearchPath", &(PhaGetDlgItemText(WindowHandle, IDC_DBGHELPSEARCHPATH)->sr));
- //RestartRequired = TRUE;
+ RestartRequired = TRUE;
}
//SetSettingForLvItemCheck(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_WARNINGS, L"EnableWarnings");
|
HW: Fixing indirect read to NVME PCIe root complex | @@ -182,7 +182,7 @@ begin
end if;
if mmx_d_i.rd_strobe = '1' then
rd_pending_q <= '1';
- if mmx_d_i.addr(11 downto 8 ) = x"2" then
+ if mmx_d_i.addr(17 downto 16 ) = "11" then
addr_32b_q <= true;
else
addr_32b_q <= false;
|
Add hold-tap to sidebar. | module.exports = {
someSidebar: {
- "Getting Started": ["intro", "hardware", "faq", "user-setup","customization", "bond-reset"],
+ "Getting Started": [
+ "intro",
+ "hardware",
+ "faq",
+ "user-setup",
+ "customization",
+ "bond-reset",
+ ],
Features: [
"feature/keymaps",
"feature/displays",
@@ -11,6 +18,7 @@ module.exports = {
"behavior/key-press",
"behavior/layers",
"behavior/misc",
+ "behavior/hold-tap",
"behavior/mod-tap",
"behavior/reset",
"behavior/lighting",
|
zephyr/emul/emul_isl923x.c: Format with clang-format
BRANCH=none
TEST=none | @@ -160,8 +160,7 @@ void isl923x_emul_set_manufacturer_id(const struct emul *emulator,
data->manufacturer_id_reg = manufacturer_id;
}
-void isl923x_emul_set_device_id(const struct emul *emulator,
- uint16_t device_id)
+void isl923x_emul_set_device_id(const struct emul *emulator, uint16_t device_id)
{
struct isl923x_emul_data *data = emulator->data;
|
[CI] GH Action runs on paging-demo branch | @@ -4,9 +4,9 @@ name: axle CI
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
- branches: [ master, uefi-bootloader, build-in-ci, rust-support ]
+ branches: [ master, uefi-bootloader, build-in-ci, rust-support, paging-demo ]
pull_request:
- branches: [ master, uefi-bootloader, build-in-ci, rust-support ]
+ branches: [ master, uefi-bootloader, build-in-ci, rust-support, paging-demo ]
# Allows running the workflow manually from the Actions tab
workflow_dispatch:
|
Substitute npm coap client for libcoap in the vagrant image bootstrapping script | @@ -7,7 +7,7 @@ sudo apt install -y --no-install-recommends \
libc6:i386 libstdc++6:i386 libncurses5:i386 libz1:i386 \
build-essential doxygen git wget unzip python-serial rlwrap npm \
default-jdk ant srecord python-pip iputils-tracepath uncrustify \
- mosquitto mosquitto-clients valgrind \
+ mosquitto mosquitto-clients valgrind libcoap-1-0-bin \
smitools snmp snmp-mibs-downloader \
python-magic linux-image-extra-virtual openjdk-8-jdk
@@ -64,10 +64,6 @@ source ${HOME}/.bashrc
# Create Cooja shortcut
echo "#!/bin/bash\nant -Dbasedir=${COOJA} -f ${COOJA}/build.xml run" > ${HOME}/cooja && chmod +x ${HOME}/cooja
-# Install coap-cli
-sudo npm install coap-cli -g
-sudo ln -s /usr/bin/nodejs /usr/bin/node
-
# Docker
curl -fsSL get.docker.com -o get-docker.sh
sudo sh get-docker.sh
|
Update RHEL package location (again).
This changed (again) upstream so update the file paths. | @@ -961,10 +961,10 @@ eval
"mkdir /root/package-src && " .
"wget -q -O /root/package-src/pgbackrest-conf.patch " .
"'https://git.postgresql.org/gitweb/?p=pgrpms.git;a=blob_plain;hb=refs/heads/master;" .
- "f=rpm/redhat/master/non-common/pgbackrest/master/pgbackrest-conf.patch' && " .
+ "f=rpm/redhat/master/common/pgbackrest/master/pgbackrest-conf.patch' && " .
"wget -q -O /root/package-src/pgbackrest.spec " .
"'https://git.postgresql.org/gitweb/?p=pgrpms.git;a=blob_plain;hb=refs/heads/master;" .
- "f=rpm/redhat/master/non-common/pgbackrest/master/pgbackrest.spec'\"");
+ "f=rpm/redhat/master/common/pgbackrest/master/pgbackrest.spec'\"");
# Create build directories
$oStorageBackRest->pathCreate($strBuildPath, {bIgnoreExists => true, bCreateParent => true});
|
test without psxe patch | @@ -128,7 +128,7 @@ C interfaces, and can interface with ordering tools such as Scotch.
%patch0 -p1
%patch1 -p1
%if %{compiler_family} == intel
-%patch2 -p1
+#%patch2 -p1
%endif
%build
|
convert http1client.c to timerwheel | @@ -144,11 +144,10 @@ int fill_body(h2o_iovec_t *reqbuf)
}
static void http1_write_req_chunk_done(void *sock_, size_t written, int done);
-static h2o_timeout_t post_body_timeout;
struct st_timeout_ctx {
h2o_socket_t *sock;
- h2o_timeout_entry_t _timeout;
+ h2o_timerwheel_timer_t _timeout;
};
static void timeout_cb(h2o_timeout_entry_t *entry)
{
@@ -172,8 +171,9 @@ static void http1_write_req_chunk_done(void *sock_, size_t written, int done)
tctx = h2o_mem_alloc(sizeof(*tctx));
memset(tctx, 0, sizeof(*tctx));
tctx->sock = sock;
- tctx->_timeout.cb = timeout_cb;
- h2o_timeout_link(client->ctx->loop, &post_body_timeout, &tctx->_timeout);
+ h2o_timerwheel_init_timer(&tctx->_timeout, timeout_cb);
+ uint64_t expire = h2o_now(client->ctx->loop) + delay_interval_ms;
+ h2o_timerwheel_add_timer(&client->ctx->loop->_timerwheel, &tctx->_timeout, expire);
}
}
@@ -198,8 +198,9 @@ static h2o_http1client_head_cb on_connect(h2o_http1client_t *client, const char
tctx = h2o_mem_alloc(sizeof(*tctx));
memset(tctx, 0, sizeof(*tctx));
tctx->sock = client->sock;
- tctx->_timeout.cb = timeout_cb;
- h2o_timeout_link(client->ctx->loop, &post_body_timeout, &tctx->_timeout);
+ h2o_timerwheel_init_timer(&tctx->_timeout, timeout_cb);
+ uint64_t expire = h2o_now(client->ctx->loop) + delay_interval_ms;
+ h2o_timerwheel_add_timer(&client->ctx->loop->_timerwheel, &tctx->_timeout, expire);
}
return on_head;
@@ -273,8 +274,6 @@ int main(int argc, char **argv)
ctx.loop = h2o_evloop_create();
#endif
- h2o_timeout_init(ctx.loop, &post_body_timeout, delay_interval_ms);
-
queue = h2o_multithread_create_queue(ctx.loop);
h2o_multithread_register_receiver(queue, ctx.getaddr_receiver, h2o_hostinfo_getaddr_receiver);
h2o_timeout_init(ctx.loop, &io_timeout, 5000); /* 5 seconds */
|
Code format with astyle. | @@ -51,8 +51,7 @@ typedef struct font_header_bin {
uint8_t padding;
} font_header_bin_t;
-typedef struct cmap_table_bin
-{
+typedef struct cmap_table_bin {
uint32_t data_offset;
uint32_t range_start;
uint16_t range_length;
@@ -101,8 +100,7 @@ lv_font_t * lv_font_load(const char * font_name)
success = lvgl_load_font(&file, font);
}
- if (!success)
- {
+ if(!success) {
LV_LOG_WARN("Error loading font file: %s\n", font_name);
lv_font_free(font);
font = NULL;
@@ -270,8 +268,7 @@ static bool load_cmaps_tables(lv_fs_file_t *fp, lv_font_fmt_txt_dsc_t * font_dsc
lv_font_fmt_txt_cmap_t * cmap = (lv_font_fmt_txt_cmap_t *) & (font_dsc->cmaps[i]);
switch(cmap_table[i].format_type) {
- case 0:
- {
+ case 0: {
uint8_t ids_size = sizeof(uint8_t) * cmap_table[i].data_entries_count;
uint8_t * glyph_id_ofs_list = lv_mem_alloc(ids_size);
@@ -293,8 +290,7 @@ static bool load_cmaps_tables(lv_fs_file_t *fp, lv_font_fmt_txt_dsc_t * font_dsc
cmap->glyph_id_ofs_list = NULL;
break;
case 1:
- case 3:
- {
+ case 3: {
uint32_t list_size = sizeof(uint16_t) * cmap_table[i].data_entries_count;
uint16_t * unicode_list = (uint16_t *) lv_mem_alloc(list_size);
@@ -305,8 +301,7 @@ static bool load_cmaps_tables(lv_fs_file_t *fp, lv_font_fmt_txt_dsc_t * font_dsc
return false;
}
- if (cmap_table[i].format_type == 1)
- {
+ if(cmap_table[i].format_type == 1) {
uint16_t * buf = lv_mem_alloc(sizeof(uint16_t) * cmap->list_length);
cmap->type = LV_FONT_FMT_TXT_CMAP_SPARSE_FULL;
@@ -316,8 +311,7 @@ static bool load_cmaps_tables(lv_fs_file_t *fp, lv_font_fmt_txt_dsc_t * font_dsc
return false;
}
}
- else
- {
+ else {
cmap->type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY;
cmap->glyph_id_ofs_list = NULL;
}
|
BugID:17711858: Update vfs directory reference for example/yts | NAME := yts
$(NAME)_SOURCES := main.c
-$(NAME)_COMPONENTS := testcase rhino.test log rhino.vfs yloop hal
+$(NAME)_COMPONENTS := testcase rhino.test log kernel.fs.vfs yloop hal
$(NAME)_CFLAGS += -Wall -Werror -Wno-unused-variable
ifneq (,$(findstring linux, $(BUILD_STRING)))
-$(NAME)_COMPONENTS += network.lwip netmgr 3rdparty.experimental.fs.fatfs middleware.common
+$(NAME)_COMPONENTS += network.lwip network.umesh dda netmgr 3rdparty.experimental.fs.fatfs middleware.common
GLOBAL_LDFLAGS += -lreadline -lncurses
GLOBAL_DEFINES += CONFIG_AOS_MESHYTS DEBUG YTS_LINUX
@@ -14,3 +14,4 @@ else
$(NAME)_COMPONENTS += cli
endif
+GLOBAL_INCLUDES += ./
|
bmi270: set to osr4 mode | #define BMI270_GYRO_CONF_ODR3200 0x0D // set gyro sample rate to 3200hz
#define BMI270_GYRO_CONF_ODR6400 0x0e // set gyro sample rate to 6400hz
#define BMI270_GYRO_CONF_ODR12800 0x0f // set gyro sample rate to 12800hz
-#define BMI270_GYRO_CONF_BWP 0x02 // set gyro filter in normal mode
+#define BMI270_GYRO_CONF_BWP 0x00 // set gyro filter in osr4 mode
#define BMI270_GYRO_CONF_NOISE_PERF 0x01 // set gyro in high performance noise mode
#define BMI270_GYRO_CONF_FILTER_PERF 0x01 // set gyro in high performance filter mode
|
[Mempool] Fix name resolving for validation | @@ -427,7 +427,7 @@ func (mp *MemPool) removeOnBlockArrival(block *types.Block) error {
account := tx.GetBody().GetAccount()
recipient := tx.GetBody().GetRecipient()
if tx.HasNameAccount() {
- account = mp.getAddress(account)
+ account = mp.getOwner(account) // it's for the case that tx sender is named smart contract
}
if tx.HasNameRecipient() {
recipient = mp.getAddress(recipient)
@@ -493,7 +493,16 @@ func (mp *MemPool) verifyTx(tx types.Transaction) error {
}
return nil
}
+
func (mp *MemPool) getAddress(account []byte) []byte {
+ return mp.getNameDest(account, false)
+}
+
+func (mp *MemPool) getOwner(account []byte) []byte {
+ return mp.getNameDest(account, true)
+}
+
+func (mp *MemPool) getNameDest(account []byte, owner bool) []byte {
if mp.testConfig {
return account
}
@@ -512,8 +521,11 @@ func (mp *MemPool) getAddress(account []byte) []byte {
mp.Error().Str("for name", string(account)).Msgf("failed to open contract %s", types.AergoName)
return nil
}
+ if owner {
return name.GetOwner(scs, account)
}
+ return name.GetAddress(scs, account)
+}
func (mp *MemPool) nextBlockVersion() int32 {
return mp.cfg.Hardfork.Version(mp.bestBlockNo + 1)
|
Make viewconf more TSCH-friendly | #include "os/net/mac/framer/frame802154.h"
#include "os/net/mac/tsch/tsch.h"
#include "os/net/mac/tsch/tsch-conf.h"
+#include "os/net/mac/tsch/tsch-schedule.h"
#include "os/net/ipv6/uip-nd6.h"
#include "os/net/ipv6/uipopt.h"
#include "os/net/queuebuf.h"
##### "CONTIKI_VERSION_STRING": ________________ CONTIKI_VERSION_STRING
##### "IEEE802154_PANID":_______________________ IEEE802154_PANID
##### "FRAME802154_VERSION":____________________ FRAME802154_VERSION
-##### "RF_CHANNEL": ____________________________ RF_CHANNEL
+#if MAC_CONF_WITH_TSCH
##### "TSCH_DEFAULT_HOPPING_SEQUENCE": _________ TSCH_DEFAULT_HOPPING_SEQUENCE
##### "TSCH_JOIN_HOPPING_SEQUENCE": ____________ TSCH_JOIN_HOPPING_SEQUENCE
+##### "TSCH_EB_PERIOD": ________________________ TSCH_EB_PERIOD
+##### "TSCH_MAX_EB_PERIOD": ____________________ TSCH_MAX_EB_PERIOD
##### "TSCH_CONF_DEFAULT_TIMESLOT_LENGTH": _____ TSCH_CONF_DEFAULT_TIMESLOT_LENGTH
+##### "TSCH_SCHEDULE_DEFAULT_LENGTH": __________ TSCH_SCHEDULE_DEFAULT_LENGTH
+#else /* MAC_CONF_WITH_TSCH */
+##### "RF_CHANNEL": ____________________________ RF_CHANNEL
+#endif /*MAC_CONF_WITH_TSCH */
##### "QUEUEBUF_NUM": __________________________ QUEUEBUF_CONF_NUM
##### "NBR_TABLE_MAX_NEIGHBORS": _______________ NBR_TABLE_CONF_MAX_NEIGHBORS
##### "NETSTACK_MAX_ROUTE_ENTRIES": ____________ NETSTACK_MAX_ROUTE_ENTRIES
|
[CUDA] Deal with phi and constant gep in address space update | #include "llvm/Target/TargetOptions.h"
#include "llvm/Transforms/Utils/Cloning.h"
+#include <set>
+
// TODO: Should these be proper passes?
void pocl_add_kernel_annotations(llvm::Module *module);
void pocl_fix_constant_address_space(llvm::Module *module);
@@ -158,11 +160,17 @@ void pocl_add_kernel_annotations(llvm::Module *module)
}
}
-void pocl_update_users_address_space(llvm::Value *inst)
+void pocl_update_users_address_space(llvm::Value *inst,
+ std::set<llvm::Value*> visited = {})
{
+ visited.insert(inst);
+
std::vector<llvm::Value*> users(inst->users().begin(), inst->users().end());
for (auto U = users.begin(); U != users.end(); U++)
{
+ if (visited.count(*U))
+ continue;
+
if (auto bitcast = llvm::dyn_cast<llvm::BitCastInst>(*U))
{
llvm::Type *src_type = bitcast->getSrcTy();
@@ -185,7 +193,7 @@ void pocl_update_users_address_space(llvm::Value *inst)
bitcast->replaceAllUsesWith(new_bitcast);
bitcast->eraseFromParent();
- pocl_update_users_address_space(new_bitcast);
+ pocl_update_users_address_space(new_bitcast, visited);
}
else if (auto gep = llvm::dyn_cast<llvm::GetElementPtrInst>(*U))
{
@@ -198,7 +206,42 @@ void pocl_update_users_address_space(llvm::Value *inst)
gep->replaceAllUsesWith(new_gep);
gep->eraseFromParent();
- pocl_update_users_address_space(new_gep);
+ pocl_update_users_address_space(new_gep, visited);
+ }
+ else if (auto phi = llvm::dyn_cast<llvm::PHINode>(*U))
+ {
+ unsigned addrspace = inst->getType()->getPointerAddressSpace();
+ llvm::Type *old_type = phi->getType();
+ llvm::Type *new_type =
+ old_type->getPointerElementType()->getPointerTo(addrspace);
+
+ unsigned num_inc = phi->getNumIncomingValues();
+ llvm::PHINode *new_phi = llvm::PHINode::Create(new_type, num_inc);
+ for (unsigned i = 0; i < num_inc; i++)
+ {
+ new_phi->addIncoming(phi->getIncomingValue(i),
+ phi->getIncomingBlock(i));
+ }
+
+ new_phi->insertAfter(phi);
+ phi->replaceAllUsesWith(new_phi);
+ phi->eraseFromParent();
+
+ pocl_update_users_address_space(new_phi, visited);
+ }
+ else if (auto const_expr = llvm::dyn_cast<llvm::ConstantExpr>(*U))
+ {
+ if (const_expr->getOpcode() == llvm::Instruction::GetElementPtr)
+ {
+ llvm::Constant *ptr = const_expr->getOperand(0);
+ auto ops = const_expr->operands();
+ std::vector<llvm::Value*> indices(ops.begin()+1, ops.end());
+ llvm::Constant *new_const_gep =
+ llvm::ConstantExpr::getGetElementPtr(NULL, ptr, indices);
+ const_expr->replaceAllUsesWith(new_const_gep);
+
+ pocl_update_users_address_space(new_const_gep, visited);
+ }
}
}
}
|
hv: lapic: remove union apic_lvt
Since it's unused. | @@ -27,75 +27,6 @@ union apic_icr {
} bits;
};
-union apic_lvt {
- uint32_t value;
- union {
- struct {
- uint32_t vector:8;
- uint32_t rsvd_1:4;
- uint32_t delivery_status:1;
- uint32_t rsvd_2:3;
- uint32_t mask:1;
- uint32_t mode:2;
- uint32_t rsvd_3:13;
- } timer;
- struct {
- uint32_t vector:8;
- uint32_t delivery_mode:3;
- uint32_t rsvd_1:1;
- uint32_t delivery_status:1;
- uint32_t rsvd_2:3;
- uint32_t mask:1;
- uint32_t rsvd_3:15;
- } cmci;
- struct {
- uint32_t vector:8;
- uint32_t delivery_mode:3;
- uint32_t rsvd_1:1;
- uint32_t delivery_status:1;
- uint32_t polarity:1;
- uint32_t remote_irr:1;
- uint32_t trigger_mode:1;
- uint32_t mask:1;
- uint32_t rsvd_2:15;
- } lint;
- struct {
- uint32_t vector:8;
- uint32_t rsvd_1:4;
- uint32_t delivery_status:1;
- uint32_t rsvd_2:3;
- uint32_t mask:1;
- uint32_t rsvd_3:15;
- } error;
- struct {
- uint32_t vector:8;
- uint32_t delivery_mode:3;
- uint32_t rsvd_1:1;
- uint32_t delivery_status:1;
- uint32_t rsvd_2:3;
- uint32_t mask:1;
- uint32_t rsvd_3:15;
- } pmc;
- struct {
- uint32_t vector:8;
- uint32_t delivery_mode:3;
- uint32_t rsvd_1:1;
- uint32_t delivery_status:1;
- uint32_t rsvd_2:3;
- uint32_t mask:1;
- uint32_t rsvd_3:15;
- } thermal;
- struct {
- uint32_t vector:8;
- uint32_t rsvd_1:4;
- uint32_t delivery_status:1;
- uint32_t rsvd_2:3;
- uint32_t mask:1;
- uint32_t rsvd_3:15;
- } common;
- } bits;
-};
-
union lapic_base_msr {
uint64_t value;
struct {
|
Suppress annoying messages in GC mode. | @@ -1613,10 +1613,12 @@ u3a_sweep(void)
u3a_print_memory("maximum", u3R->all.max_w);
}
#else
+#if 0
u3a_print_memory("available", (tot_w - pos_w));
u3a_print_memory("allocated", pos_w);
u3a_print_memory("volatile", caf_w);
#endif
+#endif
#endif
u3a_print_memory("leaked", leq_w);
u3a_print_memory("weaked", weq_w);
|
util/build_with_clang: More boards successfully compile
BRANCH=none
TEST=./util/build_with_clang.py
Code-Coverage: Zoss | @@ -28,10 +28,12 @@ BOARDS_THAT_COMPILE_SUCCESSFULLY_WITH_CLANG = [
# Boards that use CHIP:=stm32 and *not* CHIP_FAMILY:=stm32f0
# git grep --name-only 'CHIP:=stm32' | xargs grep -L 'CHIP_FAMILY:=stm32f0' | sed 's#board/\(.*\)/build.mk#"\1",#'
"baklava",
+ "bellis",
"discovery",
"gingerbread",
"hatch_fp",
"hyperdebug",
+ "munna",
"nocturne_fp",
"nucleo-f411re",
"nucleo-g431rb",
@@ -45,19 +47,30 @@ BOARDS_THAT_COMPILE_SUCCESSFULLY_WITH_CLANG = [
# git grep --name-only 'CHIP:=stm32' | xargs grep -L 'CHIP_FAMILY:=stm32f0' | sed 's#board/\(.*\)/build.mk#"\1",#'
"bland",
"c2d2",
+ "cerise",
"coffeecake",
+ "damu",
"dingdong",
"discovery-stm32f072",
"don",
"duck",
"eel",
"elm",
+ "fennel",
"fluffy",
"fusb307bgevb",
"gelatin",
"hammer",
"hoho",
+ "jacuzzi",
+ "juniper",
+ "kakadu",
+ "kappa",
+ "katsu",
+ "krane",
+ "kukui",
"magnemite",
+ "makomo",
"masterball",
"minimuffin",
"moonball",
@@ -73,9 +86,11 @@ BOARDS_THAT_COMPILE_SUCCESSFULLY_WITH_CLANG = [
"servo_v4p1",
"staff",
"star",
+ "stern",
"tigertail",
"twinkie",
"wand",
+ "willow",
"zed",
"zinger",
# Boards that use CHIP:=mchp
@@ -274,26 +289,10 @@ RISCV_BOARDS = [
]
BOARDS_THAT_FAIL_WITH_CLANG = [
- # Boards that use CHIP:=stm32 and *not* CHIP_FAMILY:=stm32f0
- "bellis", # overflows flash
- "munna", # overflows flash
# Boards that use CHIP:=stm32 *and* CHIP_FAMILY:=stm32f0
"burnet", # overflows flash
- "cerise", # overflows flash
"chocodile_vpdmcu", # compilation error: b/254710459
- "damu", # overflows flash
- "fennel", # overflows flash
- "jacuzzi", # overflows flash
- "juniper", # overflows flash
- "kakadu", # overflows flash
- "kappa", # overflows flash
- "katsu", # overflows flash
"kodama", # overflows flash
- "krane", # overflows flash
- "kukui", # overflows flash
- "makomo", # overflows flash
- "stern", # overflows flash
- "willow", # overflows flash
# Boards that use CHIP:=npcx
"garg", # overflows flash
"mushu", # overflows flash
|
.travis.yml: osx: Explicitly install autoconf and friends.
Not needed with Travis, but needed with Github Actions. | @@ -115,6 +115,7 @@ jobs:
- PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
install:
- brew install pkgconfig || true
+ - brew install autoconf automake libtool
script:
- make ${MAKEOPTS} -C mpy-cross
- make ${MAKEOPTS} -C ports/unix submodules
|
enclave-tls: shutdown SSL session when TLS cleanup
Fixes: | @@ -18,8 +18,10 @@ tls_wrapper_err_t openssl_tls_cleanup(tls_wrapper_ctx_t *ctx)
openssl_ctx_t *ssl_ctx = (openssl_ctx_t *)ctx->tls_private;
if (ssl_ctx != NULL) {
- if (ssl_ctx->ssl != NULL)
+ if (ssl_ctx->ssl != NULL) {
+ SSL_shutdown(ssl_ctx->ssl);
SSL_free(ssl_ctx->ssl);
+ }
if (ssl_ctx->sctx != NULL)
SSL_CTX_free(ssl_ctx->sctx);
}
|
input: adjust score based on refs | @@ -508,7 +508,7 @@ static inline int input_skipFactor(run_t* run, dynfile_t* dynfile, int* speed_fa
{
/* If the input wasn't source of other inputs so far, make it less likely to be tested */
- penalty += HF_CAP((2 - (int)dynfile->refs) * 3, -15, 10);
+ penalty += HF_CAP((1 - (int)dynfile->refs) * 3, -30, 5);
}
{
|
ASE: Initialize sock_msg to 0 | @@ -485,8 +485,9 @@ void update_fme_dfh(struct buffer_t *umas)
static void *start_socket_srv(void *args)
{
- int res = 0; int err_cnt = 0;
- int sock_msg;
+ int res = 0;
+ int err_cnt = 0;
+ int sock_msg = 0;
errno_t err;
int sock_fd;
struct sockaddr_un saddr;
|
jni: fix plugin name | @@ -65,7 +65,7 @@ kdb plugin-info -c classname=org/libelektra/plugin/Echo,classpath=.:/usr/share/j
You can also mount plugins (see [open issues](https://issues.libelektra.org/3881)):
```sh
-kdb mount -c classname=elektra/plugin/PropertiesStorage,classpath=.:/usr/share/java/jna.jar:/usr/share/java/libelektra.jar,print= file.properties /jni jni classname=elektra/plugin/PropertiesStorage,classpath=.:/usr/share/java/jna.jar:/usr/share/java/libelektra.jar,print=
+kdb mount -c classname=org/libelektra/plugin/PropertiesStorage,classpath=.:/usr/share/java/jna.jar:/usr/share/java/libelektra.jar,print= file.properties /jni jni classname=org/libelektra/plugin/PropertiesStorage,classpath=.:/usr/share/java/jna.jar:/usr/share/java/libelektra.jar,print=
```
## Compiling the Plugin
|
Allow WaitLatch() to be used without a latch.
Due to flaws in commit using WaitLatch() without
WL_LATCH_SET could cause an assertion failure or crash. Repair.
While here, also add a check that the latch we're switching to belongs
to this backend, when changing from one latch to another.
Discussion: | @@ -924,7 +924,22 @@ ModifyWaitEvent(WaitEventSet *set, int pos, uint32 events, Latch *latch)
if (events == WL_LATCH_SET)
{
+ if (latch && latch->owner_pid != MyProcPid)
+ elog(ERROR, "cannot wait on a latch owned by another process");
set->latch = latch;
+ /*
+ * On Unix, we don't need to modify the kernel object because the
+ * underlying pipe is the same for all latches so we can return
+ * immediately. On Windows, we need to update our array of handles,
+ * but we leave the old one in place and tolerate spurious wakeups if
+ * the latch is disabled.
+ */
+#if defined(WAIT_USE_WIN32)
+ if (!latch)
+ return;
+#else
+ return;
+#endif
}
#if defined(WAIT_USE_EPOLL)
@@ -1386,7 +1401,7 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,
/* There's data in the self-pipe, clear it. */
drainSelfPipe();
- if (set->latch->is_set)
+ if (set->latch && set->latch->is_set)
{
occurred_events->fd = PGINVALID_SOCKET;
occurred_events->events = WL_LATCH_SET;
@@ -1536,7 +1551,7 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,
/* There's data in the self-pipe, clear it. */
drainSelfPipe();
- if (set->latch->is_set)
+ if (set->latch && set->latch->is_set)
{
occurred_events->fd = PGINVALID_SOCKET;
occurred_events->events = WL_LATCH_SET;
@@ -1645,7 +1660,7 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,
/* There's data in the self-pipe, clear it. */
drainSelfPipe();
- if (set->latch->is_set)
+ if (set->latch && set->latch->is_set)
{
occurred_events->fd = PGINVALID_SOCKET;
occurred_events->events = WL_LATCH_SET;
@@ -1812,7 +1827,7 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,
if (!ResetEvent(set->latch->event))
elog(ERROR, "ResetEvent failed: error code %lu", GetLastError());
- if (set->latch->is_set)
+ if (set->latch && set->latch->is_set)
{
occurred_events->fd = PGINVALID_SOCKET;
occurred_events->events = WL_LATCH_SET;
|
[cmake] fix bug in exclude files | @@ -53,17 +53,19 @@ function(get_sources COMPONENT)
# Check if some sources are to be excluded from build
foreach(_FILE IN LISTS source_EXCLUDE)
- if(${CMAKE_VERSION} VERSION_GREATER "3.12.0")
- file(GLOB _GFILE CONFIGURE_DEPENDS ${_FILE})
- else()
- file(GLOB _GFILE ${_FILE})
- endif()
-
- if(_GFILE)
- list(REMOVE_ITEM SOURCES_FILES ${_GFILE})
- else()
- message(WARNING "file to be excluded NOT FOUND : ${_FILE}")
- endif()
+ # if(${CMAKE_VERSION} VERSION_GREATER "3.12.0")
+ # file(GLOB _GFILE CONFIGURE_DEPENDS ${_FILE})
+ # else()
+ # file(GLOB _GFILE ${_FILE})
+ # endif()
+ # MESSAGE("_GFILE::" ${_GFILE})
+ # MESSAGE("SOURCES_FILES::" ${SOURCES_FILES})
+ # if(_GFILE)
+ # list(REMOVE_ITEM SOURCES_FILES ${_GFILE})
+ # else()
+ # message(WARNING "file to be excluded NOT FOUND : ${_FILE}")
+ #endif()
+ list(REMOVE_ITEM SOURCES_FILES ${_FILE})
endforeach()
set(${COMPONENT}_SRCS ${SOURCES_FILES} PARENT_SCOPE)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.