message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Add influxdb bind points for azure. | @@ -123,6 +123,9 @@ services:
- type: bind
source: ./scope
target: /usr/bin/scope
+ - type: bind
+ source: ./go/influx/db
+ target: /go/influx/db
go_9:
build:
cache_from:
@@ -135,6 +138,9 @@ services:
- type: bind
source: ./scope
target: /usr/bin/scope
+ - type: bind
+ source: ./go/influx/db
+ target: /go/influx/db
go_10:
build:
cache_from:
@@ -147,6 +153,9 @@ services:
- type: bind
source: ./scope
target: /usr/bin/scope
+ - type: bind
+ source: ./go/influx/db
+ target: /go/influx/db
go_11:
build:
cache_from:
@@ -159,6 +168,9 @@ services:
- type: bind
source: ./scope
target: /usr/bin/scope
+ - type: bind
+ source: ./go/influx/db
+ target: /go/influx/db
go_12:
build:
cache_from:
@@ -171,6 +183,9 @@ services:
- type: bind
source: ./scope
target: /usr/bin/scope
+ - type: bind
+ source: ./go/influx/db
+ target: /go/influx/db
go_13:
build:
cache_from:
@@ -183,6 +198,9 @@ services:
- type: bind
source: ./scope
target: /usr/bin/scope
+ - type: bind
+ source: ./go/influx/db
+ target: /go/influx/db
go_14:
build:
cache_from:
@@ -195,6 +213,9 @@ services:
- type: bind
source: ./scope
target: /usr/bin/scope
+ - type: bind
+ source: ./go/influx/db
+ target: /go/influx/db
go_15:
build:
cache_from:
@@ -207,6 +228,9 @@ services:
- type: bind
source: ./scope
target: /usr/bin/scope
+ - type: bind
+ source: ./go/influx/db
+ target: /go/influx/db
java6:
build:
|
Analysis workflow, provide SHELL. | @@ -289,8 +289,8 @@ jobs:
curl -L -k -s -S -o expat-2.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.gz
tar xzf expat-2.2.10.tar.gz
cd expat-2.2.10
- echo "./configure --prefix=\"$prepath/expat\" --exec-prefix=\"$prepath/expat\" --bindir=\"$prepath/expat/bin\" --includedir=\"$prepath/expat/include\" --mandir=\"$prepath/expat/man\" --libdir=\"$prepath/expat/lib\""
- ./configure --prefix="$prepath/expat" --exec-prefix="$prepath/expat" --bindir="$prepath/expat/bin" --includedir="$prepath/expat/include" --mandir="$prepath/expat/man" --libdir="$prepath/expat/lib"
+ echo "./configure SHELL=/usr/bin/sh --prefix=\"$prepath/expat\" --exec-prefix=\"$prepath/expat\" --bindir=\"$prepath/expat/bin\" --includedir=\"$prepath/expat/include\" --mandir=\"$prepath/expat/man\" --libdir=\"$prepath/expat/lib\""
+ ./configure SHELL=/usr/bin/sh --prefix="$prepath/expat" --exec-prefix="$prepath/expat" --bindir="$prepath/expat/bin" --includedir="$prepath/expat/include" --mandir="$prepath/expat/man" --libdir="$prepath/expat/lib"
echo "make"
make
echo "make install"
|
vere: adds lmdb/disk info to cmd | @@ -690,34 +690,6 @@ _stop_on_boot_completed_cb()
u3_king_exit();
}
-// XX move to _cw_info
-//
-static c3_i
-_debug_db_stats(const c3_c* dir_c)
-{
-#if defined(U3_CPU_aarch64) && defined(U3_OS_linux)
- const size_t siz_i = 64424509440;
-#else
- const size_t siz_i = 1099511627776;
-#endif
-
- c3_c* log_c = c3_malloc(10 + strlen(dir_c));
-
- strcpy(log_c, dir_c);
- strcat(log_c, "/.urb/log");
-
- MDB_env* mdb_u = u3_lmdb_init(log_c, siz_i);
-
- if ( mdb_u ) {
- u3_lmdb_stat(mdb_u, stdout);
- u3_lmdb_exit(mdb_u);
- return 0;
- }
- else {
- return 1;
- }
-}
-
/* _cw_serf_fail(): failure stub.
*/
static void
@@ -1028,7 +1000,23 @@ _cw_info(c3_i argc, c3_c* argv[])
c3_c* dir_c = argv[2];
c3_d eve_d = u3m_boot(dir_c);
- fprintf(stderr, "urbit-worker: %s at event %" PRIu64 "\r\n", dir_c, eve_d);
+ fprintf(stderr, "\r\nurbit: %s at event %" PRIu64 "\r\n", dir_c, eve_d);
+
+ {
+ u3_disk_cb cb_u = {0};
+ u3_disk* log_u = u3_disk_init(dir_c, cb_u);
+
+ if ( !log_u ) {
+ fprintf(stderr, "urbit: failed to open event log\r\n");
+ }
+ else {
+ u3_disk_slog(log_u);
+ printf("\n");
+ u3_lmdb_stat(log_u->mdb_u, stdout);
+ u3_disk_exit(log_u);
+ }
+ }
+
u3m_stop();
}
|
ci: Change TF-M log level
Change the log level of TF-M so that the message that the CI is looking
for appears in the output. | @@ -37,6 +37,7 @@ fi
mkdir -p $TFM_BUILD_DIR
cd $TFM_DIR
cmake -B $TFM_BUILD_DIR \
+ -DTFM_SPM_LOG_LEVEL=TFM_SPM_LOG_LEVEL_INFO \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DTFM_TOOLCHAIN_FILE=toolchain_GNUARM.cmake \
-DTFM_PLATFORM=arm/mps2/an521 \
|
bluez5: trivial fix to RDEPENDS | @@ -52,4 +52,4 @@ FILES_${PN}_append_raspberrypi0-wifi = " ${BCM_BT_FIRMWARE}"
SYSTEMD_SERVICE_${PN}_append_raspberrypi0-wifi = " ${BCM_BT_SERVICE}"
-RDEPENDS_${PN}_append_raspebrrypi0-wifi = " udev-rules-rpi"
+RDEPENDS_${PN}_append_raspberrypi0-wifi = " udev-rules-rpi"
|
update version in version checker | @@ -35,7 +35,7 @@ KERNEL_IGNORED_PATTERNS = [
KERNEL_HEADER = [
'/*\n',
- ' * FreeRTOS Kernel V10.4.2\n',
+ ' * FreeRTOS Kernel V10.4.3\n',
' * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n',
' *\n',
' * Permission is hereby granted, free of charge, to any person obtaining a copy of\n',
|
mbedtls: update kconfig help to correct on supported MPI bits | @@ -276,7 +276,7 @@ menu "mbedTLS"
Enable hardware accelerated multiple precision integer operations.
Hardware accelerated multiplication, modulo multiplication,
- and modular exponentiation for up to 4096 bit results.
+ and modular exponentiation for up to SOC_RSA_MAX_BIT_LEN bit results.
These operations are used by RSA.
|
fix ipv6 address format | @@ -238,22 +238,25 @@ const char *str_af( int af ) {
const char *str_addr( const IP *addr ) {
static char addrbuf[FULL_ADDSTRLEN + 1];
char buf[INET6_ADDRSTRLEN + 1];
- uint16_t port;
+ const char *fmt;
+ int port;
switch( addr->ss_family ) {
case AF_INET6:
port = ((IP6 *)addr)->sin6_port;
inet_ntop( AF_INET6, &((IP6 *)addr)->sin6_addr, buf, sizeof(buf) );
+ fmt = "[%s]:%d";
break;
case AF_INET:
port = ((IP4 *)addr)->sin_port;
inet_ntop( AF_INET, &((IP4 *)addr)->sin_addr, buf, sizeof(buf) );
+ fmt = "%s:%d";
break;
default:
return "<invalid address>";
}
- sprintf( addrbuf, "%s:%hu", buf, ntohs( port ) );
+ sprintf( addrbuf, fmt, buf, ntohs( port ) );
return addrbuf;
}
|
Same file name is not permitted overall! | {
"package": {
- "name": "snapshots",
+ "name": "bin",
"repo": "brotli",
"subject": "eustas"
},
- "version": {
- "name": "${TRAVIS_OS_NAME}-${RELEASE_DATE}",
- "desc": "Binary Artifacts (Dev)",
- "released": "${RELEASE_DATE}",
- "gpgSign": false
- },
+ "version": {"name": "snapshot"},
"files": [
{
"includePattern": "brotli.zip",
- "uploadPattern": "brotli.zip",
+ "uploadPattern": "brotli-${TRAVIS_OS_NAME}-${RELEASE_DATE}.zip",
"matrix_params": {"override": 1}
}
],
|
Trying an appveyor fix | <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
- <AdditionalIncludeDirectories>$(SolutionDir)\picoquic;$(SolutionDir)\picohttp;$(SolutionDir)\loglib</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
+ <AdditionalIncludeDirectories>$(SolutionDir)\picoquic;$(SolutionDir)\picohttp;$(SolutionDir)\loglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
- <AdditionalIncludeDirectories>$(SolutionDir)\picoquic;$(SolutionDir)\picohttp;$(SolutionDir)\loglib</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
+ <AdditionalIncludeDirectories>$(SolutionDir)\picoquic;$(SolutionDir)\picohttp;$(SolutionDir)\loglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
|
[chainmaker][#436]modify contratc BoatHlChainmakerTxInit parameters | @@ -75,7 +75,7 @@ static BOAT_RESULT test_contrct_invoke_prepara(BoatHlchainmakerTx *tx_ptr)
}
/* step-3: Chainmaker transaction structure initialization */
- result = BoatHlChainmakerTxInit(g_chaninmaker_wallet_ptr, TEST_CHAINMAKER_CHAIN_ID, TEST_CHAINMAKER_ORG_ID, tx_ptr);
+ result = BoatHlChainmakerTxInit(g_chaninmaker_wallet_ptr, tx_ptr);
if (result != BOAT_SUCCESS)
{
BoatLog(BOAT_LOG_CRITICAL, "test BoatHlChainmakerTxInit() failed.");
@@ -106,7 +106,7 @@ static BOAT_RESULT test_contrct_query_prepara(BoatHlchainmakerTx *tx_ptr)
}
/* step-3: Chainmaker transaction structure initialization */
- result = BoatHlChainmakerTxInit(g_chaninmaker_wallet_ptr, TEST_CHAINMAKER_CHAIN_ID, TEST_CHAINMAKER_ORG_ID, tx_ptr);
+ result = BoatHlChainmakerTxInit(g_chaninmaker_wallet_ptr, tx_ptr);
if (result != BOAT_SUCCESS)
{
BoatLog(BOAT_LOG_CRITICAL, "test BoatHlChainmakerTxInit() failed.");
|
Defer connection close if data is in flight.
h2o may have tried to send a GOAWAY, but it is possible that the socket was
not yet writable.
In this case, the connection close cannot happen now, it must be deferred and
closed in `on_write_complete`, instead. | @@ -1440,7 +1440,7 @@ void do_emit_writereq(h2o_http2_conn_t *conn)
conn->state = H2O_HTTP2_CONN_STATE_IS_CLOSING;
/* fall-thru */
case H2O_HTTP2_CONN_STATE_IS_CLOSING:
- close_connection_now(conn);
+ close_connection(conn);
break;
}
}
|
Allow yet another a.out amdgpu spelling | @@ -61,7 +61,8 @@ $(TESTNAME).exe: $(TESTNAME).$(FILETYPE)
test -f test_omp-host-x86_64-unknown-linux-gnu.o
test -f a.out-openmp-amdgcn-amd-amdhsa && \
cp a.out-openmp-amdgcn-amd-amdhsa a.out-openmp-amdgcn-amd-amdhsa-${AOMP_GPU} || \
- cp a.out-openmp-amdgcn-amd-amdhsa-${AOMP_GPU} a.out-openmp-amdgcn-amd-amdhsa
+ cp a.out-openmp-amdgcn-amd-amdhsa-${AOMP_GPU} a.out-openmp-amdgcn-amd-amdhsa || \
+ cp a-${AOMP_GPU}.out-openmp-amdgcn-amd-amdhsa.out a.out-openmp-amdgcn-amd-amdhsa
DEVICE_LIB_PATH=$(DEVICE_LIB_PATH) $(AOMPHIP)/bin/hipcc -o hiplaunch.exe hiplaunch.cpp -fopenmp
#/opt/rocm/bin/hipcc -o hiplaunch.exe hiplaunch.c -fopenmp # this needs code-obj-v3 fix , ROCm 3.0 ???
# /work/hip-clang-bld/HIP/bin/hipcc -o hiplaunch.exe hiplaunch.c -fopenmp # this needs code-obj-v3 fix , ROCm 3.0 ???
|
port valgrind fix from Neil Wilson | @@ -321,7 +321,7 @@ bool MapVisitor::VisitCallExpr(CallExpr *Call) {
ProbeVisitor::ProbeVisitor(ASTContext &C, Rewriter &rewriter,
set<Decl *> &m, bool track_helpers) :
- C(C), rewriter_(rewriter), m_(m), track_helpers_(track_helpers),
+ C(C), rewriter_(rewriter), m_(m), ctx_(nullptr), track_helpers_(track_helpers),
addrof_stmt_(nullptr), is_addrof_(false) {
const char **calling_conv_regs = get_call_conv();
has_overlap_kuaddr_ = calling_conv_regs == calling_conv_regs_s390x;
|
Clean up gen.writeStatementAssign a little bit | @@ -102,7 +102,7 @@ func (g *gen) writeStatementAssign(b *buffer,
}
depth++
- if op != 0 && rhsExpr != nil && rhsExpr.Effect().Coroutine() {
+ if op != 0 && rhsExpr.Effect().Coroutine() {
if err := g.writeQuestionCall(b, rhsExpr, depth, op == t.IDEqQuestion); err != nil {
return err
}
@@ -122,11 +122,7 @@ func (g *gen) writeStatementAssign(b *buffer,
opName := ""
if lTyp.IsArrayType() {
- if rhsExpr != nil {
b.writes("memcpy(")
- } else {
- b.writes("memset(")
- }
opName, closer = ",", fmt.Sprintf(", sizeof(%s))", lhs)
} else {
@@ -155,7 +151,6 @@ func (g *gen) writeStatementAssign(b *buffer,
b.writes(opName)
}
- if rhsExpr != nil {
if op == 0 {
if rhsExpr.Effect().Coroutine() {
if err := g.writeCoroSuspPoint(b, false); err != nil {
@@ -183,25 +178,10 @@ func (g *gen) writeStatementAssign(b *buffer,
return err
}
- } else if lTyp.IsSliceType() {
- // TODO: don't assume that the slice is a slice of base.u8.
- b.printf("((wuffs_base__slice_u8){})")
- } else if lTyp.IsTableType() {
- // TODO: don't assume that the table is a table of base.u8.
- b.printf("((wuffs_base__table_u8){})")
- } else if lTyp.IsIOType() {
- s := "reader"
- if lTyp.QID()[1] == t.IDIOWriter {
- s = "writer"
- }
- b.printf("((wuffs_base__io_%s){})", s)
- } else {
- b.writeb('0')
- }
b.writes(closer)
b.writes(";\n")
- if op == 0 && rhsExpr != nil {
+ if op == 0 {
if err := g.writeLoadExprDerivedVars(b, rhsExpr); err != nil {
return err
}
|
pkeyutil: check return value reading password | @@ -331,9 +331,18 @@ int pkeyutl_main(int argc, char **argv)
if (passin == NULL) {
/* Get password interactively */
char passwd_buf[4096];
+ int r;
+
BIO_snprintf(passwd_buf, sizeof(passwd_buf), "Enter %s: ", opt);
- EVP_read_pw_string(passwd_buf, sizeof(passwd_buf) - 1,
+ r = EVP_read_pw_string(passwd_buf, sizeof(passwd_buf) - 1,
passwd_buf, 0);
+ if (r < 0) {
+ if (r == -2)
+ BIO_puts(bio_err, "user abort\n");
+ else
+ BIO_puts(bio_err, "entry failed\n");
+ goto end;
+ }
passwd = OPENSSL_strdup(passwd_buf);
if (passwd == NULL) {
BIO_puts(bio_err, "out of memory\n");
|
tests/run-tests: Don't test for --target=unix with "pyb is None".
If we test for unix target, do that explicitly. pyb var will be None
for commands like --list-tests too. | @@ -287,14 +287,14 @@ def run_tests(pyb, tests, args, base_path="."):
skip_tests.add('cmdline/cmd_parsetree.py')
# Some tests shouldn't be run on a PC
- if pyb is None:
+ if args.target == 'unix':
# unix build does not have the GIL so can't run thread mutation tests
for t in tests:
if t.startswith('thread/mutate_'):
skip_tests.add(t)
# Some tests shouldn't be run on pyboard
- if pyb is not None:
+ if args.target != 'unix':
skip_tests.add('basics/exception_chain.py') # warning is not printed
skip_tests.add('micropython/meminfo.py') # output is very different to PC output
skip_tests.add('extmod/machine_mem.py') # raw memory access not supported
|
options/posix: Fix an maybe uninitialized warning | @@ -76,6 +76,9 @@ FILE *popen(const char *command, const char *typestr) {
is_write = true;
} else if (strstr(typestr, "r") != NULL) {
is_write = false;
+ } else {
+ errno = EINVAL;
+ return nullptr;
}
bool cloexec = false;
|
VERSION bump to version 0.12.54 | @@ -34,7 +34,7 @@ set(CMAKE_C_FLAGS_DEBUG "-g -O0")
# set version
set(LIBNETCONF2_MAJOR_VERSION 0)
set(LIBNETCONF2_MINOR_VERSION 12)
-set(LIBNETCONF2_MICRO_VERSION 53)
+set(LIBNETCONF2_MICRO_VERSION 54)
set(LIBNETCONF2_VERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION}.${LIBNETCONF2_MICRO_VERSION})
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION})
|
Audio source: unqueue before playing | @@ -170,6 +170,12 @@ void lovrSourcePlay(Source* source) {
lovrAudioStreamRewind(source->stream);
}
+ // in case we have some queued buffers, make sure to unqueue them before streaming more data into them.
+ ALint processed;
+ alGetSourcei(lovrSourceGetId(source), AL_BUFFERS_PROCESSED, &processed);
+ ALuint buffers[SOURCE_BUFFERS];
+ alSourceUnqueueBuffers(source->id, processed, buffers);
+
lovrSourceStream(source, source->buffers, SOURCE_BUFFERS);
alSourcePlay(source->id);
}
|
Fix logic of state directory existence check. | @@ -64,7 +64,7 @@ main(int argc, /* I - Number of command-line args */
if (i >= argc)
usage(1);
- if (!access(argv[i], R_OK) && !mkdir(argv[i], 0700))
+ if (access(argv[i], R_OK) && mkdir(argv[i], 0700))
{
fprintf(stderr, "ippserver: Unable to access state directory \"%s\": %s\n", argv[i], strerror(errno));
usage(1);
|
Fix VKBindings assert | @@ -99,7 +99,7 @@ std::vector<VKBindInfo> VKBindings::InitializeMods(std::vector<VKBindInfo> aVKBi
}
// insert CET overlay bind info
- assert(m_pOverlay); // overlay must be set before first use!
+ assert(m_cpOverlay); // overlay must be set before first use!
const auto overlayKeyBind { m_cpOverlay->GetBind() };
const auto overlayKeyCodeIt { m_idToBind.find(overlayKeyBind.ID) };
const auto overlayKeyCode { (overlayKeyCodeIt == m_idToBind.cend()) ? (0) : (overlayKeyCodeIt->second) };
|
increment challenges_send | @@ -193,7 +193,7 @@ static struct bob_resource *bob_next_resource( void ) {
return NULL;
}
-static void bob_send_challenge( int sock, const struct bob_resource *resource ) {
+static void bob_send_challenge( int sock, struct bob_resource *resource ) {
uint8_t buf[3 + ECPARAMS_SIZE + CHALLENGE_BIN_LENGTH];
#ifdef DEBUG
char hexbuf[108 + 1];
@@ -213,6 +213,7 @@ static void bob_send_challenge( int sock, const struct bob_resource *resource )
bytes_to_base32hex(hexbuf, sizeof(hexbuf), buf, sizeof(buf))
);
+ resource->challenges_send += 1;
sendto( sock, buf, sizeof(buf), 0, (struct sockaddr*) &resource->addr, sizeof(IP) );
}
@@ -234,6 +235,7 @@ void bob_trigger_auth( void ) {
mbedtls_ecp_keypair *kp = mbedtls_pk_ec( resource->ctx_verify );
char *query = &resource->query[0];
+ // Find new query to authenticate and initialize resource
if( (result = searches_get_auth_target( query, &resource->addr, &bob_trigger_auth )) != NULL ) {
result->state = AUTH_PROGRESS;
|
update-submodule.sh: filter out merge commits
Merge commits contain the Cooja PR number
which creates false references to Contiki-NG
tickets upon merge. | @@ -59,6 +59,9 @@ cd "$module"
commitfile=$(mktemp)
echo -e "Update $module submodule\n\nCommits:" >> "$commitfile"
git --no-pager log --oneline --no-decorate $old..$new >> "$commitfile"
+# Filter out merge commits, they reference the Cooja PR number
+# and create false references to the Contiki-NG PR/issue tracker.
+perl -pi -e 's|^([^M]+)Merge pull request #(.+)\n||sg' "$commitfile"
cd -
# Commit message created, make the commit and remove the temporary file.
|
Fixed issues with codeblocks where they prevented subsequent items from being processed properly.
Codeblocks can now contain newlines. | ?~ hac .
%= .
hac t.hac
- cur [p.i.hac (weld fine q.i.hac)]
+ cur [p.i.hac (concat-code (weld fine q.i.hac))]
==
:: ::
+ ++ concat-code
+ |= a/flow
+ ?~ a a
+ ?. ?=({$pre *} -.i.a) a
+ |-
+ ?~ t.a a
+ ?. ?=({$pre $~} -.i.t.a) a
+ :: add blank line between blocks
+ $(t.a t.t.a, c.i.a (welp c.i.t.a ;/("\0a") c.i.a))
+ ::
++ snap :: capture raw line
=| nap/tape
|- ^+ [nap +>]
?: ?=($code p.cur)
:: add blank line between blocks
::
- =. q.cur
- ?~ q.cur q.cur
- :_(q.cur ;/("\0a"))
- =- +(q.u.lub ~, q.cur (weld - q.cur))
+ =- fold(lub ~, q.cur (weld - q.cur))
%+ turn q.u.lub
|= tape ^- mars
:: each line is text data with its newline
::
- ;/((weld (slag (dec col) +<) "\0a"))
:: if block is verse
+ ;/((weld (slag (add 4 (dec col)) +<) "\0a"))
::
?: ?=($poem p.cur)
:: add break between stanzas
::
=. q.cur ?~(q.cur q.cur [[[%br ~] ~] q.cur])
- =- +(q.u.lub ~, q.cur (weld - q.cur))
+ =- fold(lub ~, q.cur (weld - q.cur))
%+ turn q.u.lub
|= tape ^- manx
:: each line is a paragraph
::
=/ dif (sub col.pic col)
=/ erp [p.naz col.pic]
- =. col col.pic
:: nap: take first line
::
=^ nap ..$ snap
|
but my fix for the comment was wrong, remove this part of the fix. | @@ -178,7 +178,7 @@ call_hook(struct module_qstate* qstate, struct ipsecmod_qstate* iq,
char str[65535], *s, *tempstring;
int w;
struct ub_packed_rrset_key* rrset_key;
- struct packed_rrset_data* rrset_data; /* IPSECKEY rrset. */
+ struct packed_rrset_data* rrset_data;
uint8_t *tempdata;
/* Check if a shell is available */
|
Travis: update installed gem version net-ssh | @@ -26,6 +26,6 @@ gem install rdoc -v 4.2.2 --no-document
gem install deep_merge -v 1.1.1 --no-document
gem install nokogiri -v 1.10.4 --no-document
gem install net-scp -v 1.2.1 --no-document
-gem install net-ssh -v 4.2.0 --no-document
+gem install net-ssh -v 6.0.2 --no-document
#fi
|
{AH} treat border case of all bases in pileup column below quality score | @@ -2966,7 +2966,6 @@ cdef class PileupColumn:
buf[n] = p.b.core.qual + 33
n += 1
assert n < MAX_PILEUP_BUFFER_SIZE
-
if not p.is_del:
if p.qpos < p.b.core.l_qseq:
cc = <uint8_t>seq_nt16_str[bam_seqi(bam_get_seq(p.b), p.qpos)]
@@ -3032,6 +3031,10 @@ cdef class PileupColumn:
n += 1
assert n < MAX_PILEUP_BUFFER_SIZE
+ if n == 0:
+ # could be zero if all qualities are too low
+ return ""
+ else:
# quicker to ensemble all and split than to encode all separately.
# ignore last ":"
return force_str(PyBytes_FromStringAndSize(<char*>buf, n-1)).split(":")
|
backed heap unmap() on dealloc | @@ -17,6 +17,7 @@ static void physically_backed_dealloc(heap h, u64 x, bytes length)
deallocate(b->physical, physical_from_virtual(pointer_from_u64(x)), length);
deallocate(b->virtual, pointer_from_u64(x), length);
+ unmap(x, length, b->pages);
}
|
ip: improve check_adj_port_range_x1
Type: improvement | @@ -99,48 +99,18 @@ static inline u32
check_adj_port_range_x1 (const protocol_port_range_dpo_t * ppr_dpo,
u16 dst_port, u32 next)
{
- u16x8vec_t key;
- u16x8vec_t diff1;
- u16x8vec_t diff2;
- u16x8vec_t sum, sum_equal_diff2;
- u16 sum_nonzero, sum_equal, winner_mask;
+ u16x8 key = u16x8_splat (dst_port);
int i;
if (NULL == ppr_dpo || dst_port == 0)
return IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP;
- /* Make the obvious screw-case work. A variant also works w/ no MMX */
- if (PREDICT_FALSE (dst_port == 65535))
- {
- int j;
-
- for (i = 0;
- i < VLIB_BUFFER_PRE_DATA_SIZE / sizeof (protocol_port_range_t);
- i++)
- {
- for (j = 0; j < 8; j++)
- if (ppr_dpo->blocks[i].low.as_u16[j] == 65535)
- return next;
- }
- return IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP;
- }
-
- key.as_u16x8 = u16x8_splat (dst_port);
for (i = 0; i < ppr_dpo->n_used_blocks; i++)
- {
- diff1.as_u16x8 =
- u16x8_sub_saturate (ppr_dpo->blocks[i].low.as_u16x8, key.as_u16x8);
- diff2.as_u16x8 =
- u16x8_sub_saturate (ppr_dpo->blocks[i].hi.as_u16x8, key.as_u16x8);
- sum.as_u16x8 = diff1.as_u16x8 + diff2.as_u16x8;
- sum_equal_diff2.as_u16x8 = (sum.as_u16x8 == diff2.as_u16x8);
- sum_nonzero = ~u16x8_zero_byte_mask (sum.as_u16x8);
- sum_equal = ~u16x8_zero_byte_mask (sum_equal_diff2.as_u16x8);
- winner_mask = sum_nonzero & sum_equal;
- if (winner_mask)
+ if (!u16x8_is_all_zero ((ppr_dpo->blocks[i].low.as_u16x8 >= key) &
+ (ppr_dpo->blocks[i].hi.as_u16x8 <= key)))
return next;
- }
+
return IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP;
}
|
Fix for family reset on armcc
Partial revert of [eb3fa9d2] | @@ -44,20 +44,20 @@ const target_family_descriptor_t g_sw_sysresetreq_family = {
};
// Weak references to family definitions.
-extern __WEAK const target_family_descriptor_t g_nxp_kinetis_kseries;
-extern __WEAK const target_family_descriptor_t g_nxp_kinetis_lseries;
-extern __WEAK const target_family_descriptor_t g_nxp_kinetis_k32w_series;
-extern __WEAK const target_family_descriptor_t g_nxp_mimxrt;
-extern __WEAK const target_family_descriptor_t g_nxp_rapid_iot;
-extern __WEAK const target_family_descriptor_t g_nxp_lpc55xx_series;
-extern __WEAK const target_family_descriptor_t g_nordic_nrf51;
-extern __WEAK const target_family_descriptor_t g_nordic_nrf52;
-extern __WEAK const target_family_descriptor_t g_realtek_rtl8195am;
-extern __WEAK const target_family_descriptor_t g_ti_family;
-extern __WEAK const target_family_descriptor_t g_wiznet_family;
-extern __WEAK const target_family_descriptor_t g_renesas_family;
-extern __WEAK const target_family_descriptor_t g_toshiba_tz_family;
-extern __WEAK const target_family_descriptor_t g_ambiq_ama3b1kk;
+__WEAK const target_family_descriptor_t g_nxp_kinetis_kseries = {0};
+__WEAK const target_family_descriptor_t g_nxp_kinetis_lseries = {0};
+__WEAK const target_family_descriptor_t g_nxp_kinetis_k32w_series = {0};
+__WEAK const target_family_descriptor_t g_nxp_mimxrt = {0};
+__WEAK const target_family_descriptor_t g_nxp_rapid_iot = {0};
+__WEAK const target_family_descriptor_t g_nxp_lpc55xx_series = {0};
+__WEAK const target_family_descriptor_t g_nordic_nrf51 = {0};
+__WEAK const target_family_descriptor_t g_nordic_nrf52 = {0};
+__WEAK const target_family_descriptor_t g_realtek_rtl8195am = {0};
+__WEAK const target_family_descriptor_t g_ti_family = {0};
+__WEAK const target_family_descriptor_t g_wiznet_family = {0};
+__WEAK const target_family_descriptor_t g_renesas_family = {0};
+__WEAK const target_family_descriptor_t g_toshiba_tz_family = {0};
+__WEAK const target_family_descriptor_t g_ambiq_ama3b1kk = {0};
//! @brief Terminator value for g_families list.
//!
|
Fix release date for 5.8-rc1 | skiboot-5.8-rc1
===============
-skiboot v5.8-rc1 was released on Monday August 21st 2017. It is the first
+skiboot v5.8-rc1 was released on Tuesday August 22nd 2017. It is the first
release candidate of skiboot 5.8, which will become the new stable release
of skiboot following the 5.7 release, first released 25th July 2017.
|
qlog: support the handshake_done frame type | @@ -65,6 +65,16 @@ def handle_ack_send(event):
"frame_type": "ack",
}
+def handle_handshake_done_receive(event):
+ return {
+ "frame_type": "handshake_done",
+ }
+
+def handle_handshake_done_send(event):
+ return {
+ "frame_type": "handshake_done",
+ }
+
def handle_new_connection_id_receive(event):
return {
"frame_type": "new_connection_id",
@@ -139,6 +149,8 @@ QLOG_EVENT_HANDLERS = {
FRAME_EVENT_HANDLERS = {
"ack-send": handle_ack_send,
+ "handshake-done-receive": handle_handshake_done_receive,
+ "handshake-done-send": handle_handshake_done_send,
"new-connection-id-receive": handle_new_connection_id_receive,
"new-connection-id-send": handle_new_connection_id_send,
"new-token-receive": handle_new_token_receive,
|
example/storage: fix find_partition function when no partition is found | @@ -47,8 +47,14 @@ static void find_partition(esp_partition_type_t type, esp_partition_subtype_t su
{
ESP_LOGI(TAG, "Find partition with type %s, subtype %s, label %s...", get_type_str(type), get_subtype_str(subtype),
name == NULL ? "NULL (unspecified)" : name);
+
const esp_partition_t * part = esp_partition_find_first(type, subtype, name);
+
+ if(part != NULL) {
ESP_LOGI(TAG, "\tfound partition '%s' at offset 0x%x with size 0x%x", part->label, part->address, part->size);
+ } else {
+ ESP_LOGE(TAG, "\tpartition not found!");
+ }
}
void app_main(void)
|
update frame delimiter in luos | @@ -340,7 +340,7 @@ static error_return_t Luos_MsgHandler(service_t *service, msg_t *input)
uint8_t wrong = false;
for (uint8_t i = 0; i < MAX_ALIAS_SIZE; i++)
{
- if (input->data[i] == '\r')
+ if ((input->data[i] == '\n') && (input->data[i - 1] == '\r'))
{
wrong = true;
break;
|
wifi: Add missing URL len check to u_wifi_mqtt | @@ -393,8 +393,11 @@ static int32_t establishMqttConnectionToBroker(const uMqttClientContext_t *pCont
}
}
- if (err == (int32_t)U_ERROR_COMMON_SUCCESS) {
+ if (len >= (int32_t)sizeof(url)) {
+ err = (int32_t)U_ERROR_COMMON_NO_MEMORY;
+ }
+ if (err == (int32_t)U_ERROR_COMMON_SUCCESS) {
atHandle = pMqttSession->atHandle;
uPortLog("U_WIFI_MQTT: Sending AT+UDCP\n");
uAtClientLock(atHandle);
|
fix(bot-slash-commands): wrong type being passed as parameter | @@ -133,7 +133,7 @@ void* read_input(void *p_client)
code = discord_create_global_application_command(
client,
g_application_id,
- &(struct discord_create_global_application_commands_params){
+ &(struct discord_create_global_application_command_params){
.name = cmd_name,
.description = cmd_desc,
.default_permission = true,
|
Switch wasm-core-testsuite to v1.1. Resolves | @@ -146,13 +146,13 @@ if not (os.path.isdir("./core") and os.path.isdir("./proposals")):
from zipfile import ZipFile
from urllib.request import urlopen
- officialSpec = "https://github.com/wasm3/wasm-core-testsuite/archive/master.zip"
+ officialSpec = "https://github.com/wasm3/wasm-core-testsuite/archive/v1.1.zip"
print(f"Downloading {officialSpec}")
resp = urlopen(officialSpec)
with ZipFile(BytesIO(resp.read())) as zipFile:
for zipInfo in zipFile.infolist():
- if re.match(r".*-master/.*/.*(\.wasm|\.json)", zipInfo.filename):
+ if re.match(r".*-.*/.*/.*(\.wasm|\.json)", zipInfo.filename):
parts = pathlib.Path(zipInfo.filename).parts
newpath = str(pathlib.Path(*parts[1:-1]))
newfn = str(pathlib.Path(*parts[-1:]))
|
s/mixier/mixer/g
fix brew package name | @@ -253,7 +253,7 @@ $ sudo make install
2. Install brew.
3. Execute follow command.
```
-$ brew install sdl2 sdl2_mixier sdl2_ttf
+$ brew install sdl2 sdl2_mixer sdl2_ttf
```
##### Build
@@ -287,7 +287,7 @@ $ make install
2. Install brew.
3. Execute follow command.
```
-$ brew install sdl sdl_mixier sdl_ttf
+$ brew install sdl sdl_mixer sdl_ttf
```
##### Build
|
Add versioned name for V8 library. | @@ -54,6 +54,7 @@ set(V8_PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
+ /usr/lib
/usr
/sw # Fink
/opt/local # DarwinPorts
@@ -241,6 +242,23 @@ else()
set(V8_LIBRARIES ${V8_LIBRARY})
endif()
+set(V8_LIBRARIES_VERSION)
+
+# Set version libraries
+if (V8_LIBRARY_DEBUG)
+ set(V8_LIBRARIES_VERSION
+ ${V8_LIBRARIES_VERSION}
+ ${V8_LIBRARY_DEBUG}.${V8_FIND_VERSION}
+ )
+endif()
+
+if (V8_LIBRARY_RELEASE)
+ set(V8_LIBRARIES_VERSION
+ ${V8_LIBRARIES_VERSION}
+ ${V8_LIBRARY_RELEASE}.${V8_FIND_VERSION}
+ )
+endif()
+
find_package_handle_standard_args(V8 DEFAULT_MSG V8_LIBRARY V8_INCLUDE_DIR)
# Base build
@@ -346,6 +364,7 @@ endif()
if(_V8_CMAKE_DEBUG)
message(STATUS "V8_INCLUDE_DIR: ${V8_INCLUDE_DIR}")
message(STATUS "V8_LIBRARIES: ${V8_LIBRARIES}")
+ message(STATUS "V8_LIBRARIES_VERSION: ${V8_LIBRARIES_VERSION}")
message(STATUS "V8_VERSION: ${V8_VERSION}")
message(STATUS "V8_VERSION_HEX: ${V8_VERSION_HEX}")
message(STATUS "V8_EXECUTABLE: ${V8_EXECUTABLE}")
|
policer: improvement show policer cli.
cli show policer's help info is not consistent
with it's arguments.
Type: improvement | @@ -779,7 +779,7 @@ show_policer_command_fn (vlib_main_t * vm,
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (show_policer_command, static) = {
.path = "show policer",
- .short_help = "show policer [name]",
+ .short_help = "show policer [name <name>]",
.function = show_policer_command_fn,
};
/* *INDENT-ON* */
|
fix wrong type in debug message | @@ -2120,7 +2120,7 @@ static int ssl_get_ecdh_params_from_cert( mbedtls_ssl_context *ssl )
tls_id = mbedtls_ssl_get_tls_id_from_ecp_group_id( peer_key->grp.id );
if( tls_id == 0 )
{
- MBEDTLS_SSL_DEBUG_MSG( 1, ( "ECC group %d not suported",
+ MBEDTLS_SSL_DEBUG_MSG( 1, ( "ECC group %u not suported",
peer_key->grp.id ) );
return( MBEDTLS_ERR_SSL_ILLEGAL_PARAMETER );
}
|
ACRN:VGPU: Add the missing initialization of vdisplay info
Now some fileds are not initialized, which causes that ACRN-DM doesn't
handle the request of VIRTIO_GPU_CMD_GET_DISPLAY_INFO and
VIRTIO_GPU_CMD_GET_EDID.
Acked-by: Wang Yu | @@ -1217,5 +1217,9 @@ int vdpy_parse_cmd_option(const char *opts)
pr_info("virtual display: windowed.\n");
}
+ vdpy.info.xoff = 0;
+ vdpy.info.yoff = 0;
+ vdpy.info.width = vdpy.width;
+ vdpy.info.height = vdpy.height;
return error;
}
|
[ctr/lua] preload bug fix | @@ -139,8 +139,7 @@ func preLoadWorker() {
txBody := tx.GetBody()
recipient := txBody.Recipient
- if txBody.Type != types.TxType_NORMAL || len(recipient) == 0 ||
- txBody.Payload == nil {
+ if txBody.Type != types.TxType_NORMAL || len(recipient) == 0 {
continue
}
|
Clean up failed attempt at ack gap. | @@ -2798,9 +2798,6 @@ int picoquic_is_ack_needed(picoquic_cnx_t* cnx, uint64_t current_time, uint64_t
pkt_ctx->first_sack_item.end_of_sack_range > 128 &&
!pkt_ctx->ack_after_fin) {
ack_gap = 4;
- if (cnx->path[0]->cwin > 256ull * cnx->path[0]->send_mtu) {
- ack_gap = (cnx->path[0]->cwin / (4 * cnx->path[0]->send_mtu));
- }
}
if (pkt_ctx->highest_ack_sent + ack_gap <= pkt_ctx->first_sack_item.end_of_sack_range ||
pkt_ctx->highest_ack_sent_time + pkt_ctx->ack_delay_local <= current_time) {
|
Guardian now uses `dap.bol` instead of its hardcoded app name. | |= msg/cord
%^ ta-action 0 %phrase
:- [[our.bol (main our.bol)] ~ ~]
- [%app %talk-guardian msg]~
+ [%app dap.bol msg]~
::
++ ta-evil ::< emit error
::> tracing printf and crash.
^+ +>
%+ so-act %phrase
:- [[our.bol (main our.bol)] ~ ~]
- [%app %talk-guardian msg]~
+ [%app dap.bol msg]~
::
++ so-delta ::< send delta
::> store delta in ++ta core.
:* ost.bol
%poke
/present
- [hos %talk-guardian]
+ [hos dap.bol]
[%talk-command %present nos dif]
==
::
:* 0
%peer
/burden
- [(above our.bol) %talk-guardian]
+ [(above our.bol) dap.bol]
/burden/(scot %p our.bol)
==
::
:* 0
%peer
/report/(scot %p who)
- [who %talk-guardian]
+ [who dap.bol]
/report
==
::
%+ da-emit ost.bol
:* %poke
/repeat/(scot %p hos.cir)/[nom.cir]/(scot %ud (jam ses))
- [hos.cir %talk-guardian]
+ [hos.cir dap.bol]
[%talk-command %publish out]
==
::
:_ ~
:* %pull
/circle/[nom]/(scot %p hos.cir)/[nom.cir]
- [hos.cir %talk-guardian]
+ [hos.cir dap.bol]
~
==
::
/(scot -.u.tal.u.wen +.u.tal.u.wen)
:* %peer
(welp /circle/[nom]/(scot %p hos.cir)/[nom.cir] ran)
- [hos.cir %talk-guardian]
+ [hos.cir dap.bol]
(welp /circle/[nom.cir] ran)
==
::
|
mmapstorage: refactor file unlinking | @@ -906,22 +906,13 @@ KeySet * copyKeySet (MmapHeader * mmapInfo, KeySet * unlinkKs, MmapHeader * mmap
return (KeySet *) dest;
}
-int elektraMmapstorageSet (Plugin * handle ELEKTRA_UNUSED, KeySet * returned, Key * parentKey)
-{
- // set all keys
- int errnosave = errno;
- DynArray * dynArray = 0;
-
- KeySet * mappedFiles = (KeySet *) elektraPluginGetData (handle);
- Key * parentCopy = keyDup (parentKey);
- Key * found = ksLookup (mappedFiles, parentCopy, KDB_O_POP);
- if (found)
+static void unlinkFile (Key * parentKey)
{
ELEKTRA_LOG_WARNING ("unlink: need to unlink old mapped memory from file");
const Key * cur;
- keyRewindMeta (found);
- while ((cur = keyNextMeta (found)) != 0)
+ keyRewindMeta (parentKey);
+ while ((cur = keyNextMeta (parentKey)) != 0)
{
void * toUnlinkMmap = hexStringToAddress (keyName (cur));
ELEKTRA_LOG_WARNING ("unlink: unlinking mmap str: %s", keyName (cur));
@@ -943,6 +934,21 @@ int elektraMmapstorageSet (Plugin * handle ELEKTRA_UNUSED, KeySet * returned, Ke
}
// keySetMeta (found, keyName (cur), ""); // delete
}
+}
+
+int elektraMmapstorageSet (Plugin * handle ELEKTRA_UNUSED, KeySet * returned, Key * parentKey)
+{
+ // set all keys
+ int errnosave = errno;
+ DynArray * dynArray = 0;
+
+ // check if file has open mappings and unlink them
+ KeySet * mappedFiles = (KeySet *) elektraPluginGetData (handle);
+ Key * parentCopy = keyDup (parentKey);
+ Key * found = ksLookup (mappedFiles, parentCopy, KDB_O_POP);
+ if (found)
+ {
+ unlinkFile (found);
keyDel (found);
}
keyDel (parentCopy);
|
Fix setting *node_out in jbn_add_item_bool | @@ -1711,7 +1711,9 @@ iwrc jbn_add_item_bool(JBL_NODE parent, const char *key, bool val, JBL_NODE *nod
n->type = JBV_BOOL;
n->vbool = val;
jbn_add_item(parent, n);
-
+ if (node_out) {
+ *node_out = n;
+ }
finish:
return rc;
}
|
Validate parser parameter to XML_SetDefaultHandlerExpand | @@ -1465,6 +1465,8 @@ void XMLCALL
XML_SetDefaultHandlerExpand(XML_Parser parser,
XML_DefaultHandler handler)
{
+ if (parser == NULL)
+ return;
defaultHandler = handler;
defaultExpandInternalEntities = XML_TRUE;
}
|
memory leak
obvious leak of parent_indices | @@ -565,6 +565,9 @@ dpo_stack_from_node (u32 child_node_index,
}
}
dpo_stack_i(edge, dpo, parent);
+
+ /* should free this local vector to avoid memory leak */
+ vec_free(parent_indices);
}
static clib_error_t *
|
bootloader: fix missing typedef on enum defintion
(MINOR CHANGES)
Closes | @@ -36,7 +36,7 @@ typedef enum {
} esp_image_spi_mode_t;
/* SPI flash clock frequency */
-enum {
+typedef enum {
ESP_IMAGE_SPI_SPEED_40M,
ESP_IMAGE_SPI_SPEED_26M,
ESP_IMAGE_SPI_SPEED_20M,
|
Cleanup a FIXME in ATExecAddIndex
We used to always dispatch in DefineIndex() but now we do not if
it is part of the ALTER TABLE command execution. So we no longer
need to skip DefineIndex for QEs. Confirmed and remove this FIXME. | @@ -9005,13 +9005,6 @@ ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
/* The IndexStmt has already been through transformIndexStmt */
Assert(stmt->transformed);
- /* The index should already be built if we are a QE */
- /* GPDB_12_MERGE_FIXME: it doesn't seem to work that way anymore. */
-#if 0
- if (Gp_role == GP_ROLE_EXECUTE)
- return InvalidObjectAddress;
-#endif
-
/* suppress schema rights check when rebuilding existing index */
check_rights = !is_rebuild;
/* skip index build if phase 3 will do it or we're reusing an old one */
|
Leave only some parts of SDK in iram
Leave only some parts of SDK in IRAM | @@ -103,7 +103,24 @@ SECTIONS
*(.init.literal)
*(.init)
- *sdk/esp_iot_sdk_*lib/lib*.a:*(.literal .text)
+ /* SDK libraries that used in bootup process, interruption handling
+ * and other ways where flash cache (iROM) is unavailable: */
+ *libmain.a:*(.literal .text)
+ *libnet80211.a:*(.literal .text)
+ *libphy.a:*(.literal .text)
+ *libpp.a:*(.literal .text)
+ *libgcc.a:*(.literal .text)
+
+ /* Following SDK libraries have .text sections, but not included in iRAM: */
+ /* *libat.a:*(.literal .text) - not used anywhere in NodeMCU */
+ /* *libcrypto.a:*(.literal .text) - tested that safe to keep in iROM */
+ /* *libdriver.a:*(.literal .text) - not used anywhere in NodeMCU */
+ /* *libespnow.a:*(.literal .text) - not used anywhere in NodeMCU */
+ /* *libmesh.a:*(.literal .text) - not used anywhere in NodeMCU */
+ /* *liblwip_536.a:*(.literal .text) - source-based library used instead */
+ /* *libpwm.a:*(.literal .text) - our own implementation used instead */
+ /* *libwpa.a:*(.literal .text) - tested that safe to keep in iROM */
+ /* *libwps.a:*(.literal .text) - tested that safe to keep in iROM */
*(.iram.text .iram0.text)
|
allow only existing old projects to depend on skynet_pyro4 | @@ -217,3 +217,7 @@ ALLOW contrib/python/mpop -> contrib/python/mipp
ALLOW weather/workers/nowcasting/preprocess_meteosat -> contrib/python/mipp
ALLOW yql/udfs/common/python/python_arc -> contrib/python/mipp
DENY .* -> contrib/python/mipp
+
+ALLOW infra/procman -> contrib/python/skynet_pyro4
+ALLOW skynet -> contrib/python/skynet_pyro4
+DENY .* -> contrib/python/skynet_pyro4
|
[mechanics] Fix some problems when btScalar is float | @@ -689,7 +689,7 @@ void SiconosBulletCollisionManager_impl::createCollisionObject(
SP::SiconosBox box,
SP::SiconosContactor contactor)
{
- const double half = 0.5;
+ const btScalar half = 0.5;
#ifdef USE_CONVEXHULL_FOR_BOX
const btScalar pts[] = {
@@ -904,11 +904,11 @@ void SiconosBulletCollisionManager_impl::updateShape(BodyCHRecord &record)
// If type of SiconosMatrix is the same as btScalar, we can avoid a copy
template<typename SCALAR>
-std::pair<SP::btTriangleIndexVertexArray, btScalar*>
+std::pair<SP::btTriangleIndexVertexArray, SCALAR*>
make_bt_vertex_array(SP::SiconosMesh mesh,
SCALAR _s1, SCALAR _s2)
{
- printf("make_bt_vertex_array: non-copy version\n");
+ assert(mesh->vertices()->size(1) == 3);
SP::btTriangleIndexVertexArray bttris(
std11::make_shared<btTriangleIndexVertexArray>(
mesh->indexes()->size()/3,
|
Clean up modifier parsing. | @@ -33,8 +33,7 @@ typedef struct ModifierNode {
unsigned int mask;
} ModifierNode;
-static ModifierNode modifiers[] = {
-
+static const ModifierNode MODIFIERS[] = {
{ 'C', MASK_CTRL },
{ 'S', MASK_SHIFT },
{ 'A', MASK_MOD1 },
@@ -42,10 +41,9 @@ static ModifierNode modifiers[] = {
{ '2', MASK_MOD2 },
{ '3', MASK_MOD3 },
{ '4', MASK_MOD4 },
- { '5', MASK_MOD5 },
- { 0, MASK_NONE }
-
+ { '5', MASK_MOD5 }
};
+static const unsigned MODIFIER_COUNT = ARRAY_LENGTH(MODIFIERS);
typedef struct KeyNode {
@@ -98,7 +96,7 @@ void StartupKeys(void)
/* Get the keys that we don't care about (num lock, etc). */
modmap = JXGetModifierMapping(display);
- for(x = 0; x < sizeof(lockMods) / sizeof(lockMods[0]); x++) {
+ for(x = 0; x < ARRAY_LENGTH(lockMods); x++) {
lockMods[x].mask = GetModifierMask(modmap, lockMods[x].symbol);
lockMask |= lockMods[x].mask;
}
@@ -182,12 +180,12 @@ void GrabKey(KeyNode *np, Window win)
}
/* Grab for each lock modifier. */
- maxIndex = 1 << (sizeof(lockMods) / sizeof(lockMods[0]));
+ maxIndex = 1 << ARRAY_LENGTH(lockMods);
for(index = 0; index < maxIndex; index++) {
/* Compute the modifier mask. */
mask = 0;
- for(x = 0; x < sizeof(lockMods) / sizeof(lockMods[0]); x++) {
+ for(x = 0; x < ARRAY_LENGTH(lockMods); x++) {
if(index & (1 << x)) {
mask |= lockMods[x].mask;
}
@@ -334,21 +332,19 @@ unsigned GetModifierMask(XModifierKeymap *modmap, KeySym key) {
/** Parse a modifier mask string. */
unsigned int ParseModifierString(const char *str)
{
- unsigned int mask;
- unsigned int x, y;
- char found;
+ unsigned mask = MASK_NONE;
+ unsigned x;
if(!str) {
- return MASK_NONE;
+ return mask;
}
- mask = MASK_NONE;
for(x = 0; str[x]; x++) {
-
- found = 0;
- for(y = 0; modifiers[y].name; y++) {
- if(modifiers[y].name == str[x]) {
- mask |= modifiers[y].mask;
+ unsigned y;
+ char found = 0;
+ for(y = 0; y < MODIFIER_COUNT; y++) {
+ if(MODIFIERS[y].name == str[x]) {
+ mask |= MODIFIERS[y].mask;
found = 1;
break;
}
@@ -357,7 +353,6 @@ unsigned int ParseModifierString(const char *str)
if(JUNLIKELY(!found)) {
Warning(_("invalid modifier: \"%c\""), str[x]);
}
-
}
return mask;
|
Handle extrapolated blocks with unmodified width using optimized_sad pointer | @@ -328,7 +328,8 @@ static unsigned hor_sad(const kvz_pixel *pic_data, const kvz_pixel *ref_data,
*/
static unsigned image_interpolated_sad(const kvz_picture *pic, const kvz_picture *ref,
int pic_x, int pic_y, int ref_x, int ref_y,
- int block_width, int block_height)
+ int block_width, int block_height,
+ optimized_sad_func_ptr_t optimized_sad)
{
kvz_pixel *pic_data, *ref_data;
@@ -421,13 +422,15 @@ static unsigned image_interpolated_sad(const kvz_picture *pic, const kvz_picture
result += ver_sad(pic_data,
&ref_data[top * ref->stride],
block_width, top, pic->stride);
- result += kvz_reg_sad(&pic_data[top * pic->stride],
+ result += reg_sad_maybe_optimized(&pic_data[top * pic->stride],
&ref_data[top * ref->stride],
- block_width, block_height - top, pic->stride, ref->stride);
+ block_width, block_height - top, pic->stride, ref->stride,
+ optimized_sad);
} else if (bottom) {
- result += kvz_reg_sad(pic_data,
+ result += reg_sad_maybe_optimized(pic_data,
ref_data,
- block_width, block_height - bottom, pic->stride, ref->stride);
+ block_width, block_height - bottom, pic->stride, ref->stride,
+ optimized_sad);
result += ver_sad(&pic_data[(block_height - bottom) * pic->stride],
&ref_data[(block_height - bottom - 1) * ref->stride],
block_width, bottom, pic->stride);
@@ -446,13 +449,13 @@ static unsigned image_interpolated_sad(const kvz_picture *pic, const kvz_picture
&ref_data[block_width - right - 1],
right, block_height, pic->stride, ref->stride);
} else {
- result += kvz_reg_sad(pic_data, ref_data, block_width, block_height, pic->stride, ref->stride);
+ result += reg_sad_maybe_optimized(pic_data, ref_data, block_width, block_height, pic->stride, ref->stride,
+ optimized_sad);
}
return result;
}
-
/**
* \brief Calculate interpolated SAD between two blocks.
*
|
Add os_get_glfw_window;
So lovr-keyboard and lovr-mouse and friends can continue to work. | @@ -324,3 +324,13 @@ uint32_t os_vk_create_surface(void* instance, void** surface) {
return glfwCreateWindowSurface(instance, glfwState.window, NULL, (VkSurfaceKHR*) surface);
}
#endif
+
+#ifdef _WIN32
+#define OS_EXPORT __declspec(dllexport)
+#else
+#define OS_EXPORT __attribute__((visibility("default")))
+#endif
+
+OS_EXPORT GLFWwindow* os_get_glfw_window(void) {
+ return glfwState.window;
+}
|
no running of ccl_sample_run in travis | @@ -24,7 +24,7 @@ before_install:
install: python setup.py install
script:
- python tests/run_tests.py --debug --detailed-errors --verbose --process-restartworker
- - make check-cpp && ./tests/ccl_sample_run
+ - make check-cpp
# Check why the note creation process crashes
# - make -C doc/0000-ccl_note
|
Fixed two bugs in neat_get_property (passing format string to nt_log w/o parameter | @@ -897,13 +897,13 @@ neat_get_property(neat_ctx *ctx, neat_flow *flow, const char* name, void *ptr, s
prop = json_object_get(flow->properties, name);
if (prop == NULL) {
- nt_log(ctx, NEAT_LOG_DEBUG, "Flow has no property named %s");
+ nt_log(ctx, NEAT_LOG_DEBUG, "Flow has no property named %s", name);
return NEAT_ERROR_UNABLE;
}
prop = json_object_get(prop, "value");
if (prop == NULL) {
- nt_log(ctx, NEAT_LOG_DEBUG, "Flow has property %s, but it contains no \"value\" key!");
+ nt_log(ctx, NEAT_LOG_DEBUG, "Flow has property %s, but it contains no \"value\" key!", name);
return NEAT_ERROR_UNABLE;
}
|
CustomSetupTool: Fix updating kph from portable install when not elevated | @@ -438,7 +438,7 @@ VOID SetupStartKph(
PhGetString(clientPath),
L"-installkph -s",
SW_NORMAL,
- 0,
+ PhGetOwnTokenAttributes().Elevated ? 0 : PH_SHELL_EXECUTE_ADMIN,
0,
&processHandle
))
|
Change doxygen code for parameters | @@ -102,7 +102,7 @@ typedef struct {
/**
* \ingroup ESP_UTILITIES
* \brief Set IP address to \ref esp_ip_t variable
- * \param[in] ip: Pointer to IP structure
+ * \param[in] ip_str: Pointer to IP structure
* \param[in] ip1,ip2,ip3,ip4: IPv4 parts
*/
#define ESP_SET_IP(ip_str, ip1, ip2, ip3, ip4) do { (ip_str)->ip[0] = (ip1); (ip_str)->ip[1] = (ip2); (ip_str)->ip[2] = (ip3); (ip_str)->ip[3] = (ip4); } while (0)
|
mmap(2): do not read entire file | @@ -171,35 +171,33 @@ static sysreturn mincore(void *addr, u64 length, u8 *vec)
return -ENOMEM;
}
-CLOSURE_4_1(mmap_load_entire, void, thread, u64, u64, u64, buffer);
-void mmap_load_entire(thread t, u64 where, u64 len, u64 offset, buffer b) {
+CLOSURE_4_2(mmap_read_complete, void, thread, u64, u64, buffer, status, bytes);
+void mmap_read_complete(thread t, u64 where, u64 mmap_len, buffer b, status s, bytes length) {
+ if (!is_ok(s)) {
+ deallocate_buffer(b);
+ set_syscall_error(t, EACCES);
+ thread_wakeup(t);
+ return;
+ }
+
kernel_heaps kh = (kernel_heaps)&t->uh;
heap pages = heap_pages(kh);
heap physical = heap_physical(kh);
- u64 msize = 0;
- u64 blen = buffer_length(b);
- if (blen > offset)
- msize = pad(blen - offset, PAGESIZE);
- if (msize > len)
- msize = len;
-
// mutal misalignment?...discontiguous backing?
- u64 p = physical_from_virtual(buffer_ref(b, offset));
- map(where, p, msize, pages);
+ u64 length_padded = pad(length, PAGESIZE);
+ u64 p = physical_from_virtual(buffer_ref(b, 0));
+ map(where, p, length_padded, pages);
+ if (length < length_padded)
+ zero(pointer_from_u64(where + length), length_padded - length);
- if (len > msize) {
- u64 bss = pad(len, PAGESIZE) - msize;
- map(where + msize, allocate_u64(physical, bss), bss, pages);
- zero(pointer_from_u64(where + msize), bss);
- }
- set_syscall_return(t, where);
- thread_wakeup(t);
+ if (length_padded < mmap_len) {
+ u64 bss = pad(mmap_len, PAGESIZE) - length_padded;
+ map(where + length_padded, allocate_u64(physical, bss), bss, pages);
+ zero(pointer_from_u64(where + length_padded), bss);
}
-CLOSURE_1_1(mmap_load_entire_fail, void, thread, status);
-void mmap_load_entire_fail(thread t, status v) {
- set_syscall_error(t, EACCES);
+ set_syscall_return(t, where);
thread_wakeup(t);
}
@@ -330,9 +328,11 @@ static sysreturn mmap(void *target, u64 size, int prot, int flags, int fd, u64 o
file f = resolve_fd(current->p, fd);
thread_log(current, " read file, blocking...");
- filesystem_read_entire(p->fs, f->n, heap_backed(kh),
- closure(h, mmap_load_entire, current, where, len, offset),
- closure(h, mmap_load_entire_fail, current));
+
+ heap mh = heap_backed(kh);
+ buffer b = allocate_buffer(mh, pad(len, mh->pagesize));
+ filesystem_read(p->fs, f->n, buffer_ref(b, 0), len, offset,
+ closure(h, mmap_read_complete, current, where, len, b));
runloop();
}
|
rtctime: try harder to speak in integers
Otherwise we might truncate precision with small floats and that's
unlikely to work out well for anyone. | @@ -131,28 +131,27 @@ static int rtctime_set (lua_State *L)
if (!rtc_time_check_magic ())
rtc_time_prepare ();
- uint32_t sec = luaL_checknumber (L, 1);
+ uint32_t sec = luaL_checkinteger (L, 1);
uint32_t usec = 0;
if (lua_isnumber (L, 2))
- usec = lua_tonumber (L, 2);
+ usec = lua_tointeger (L, 2);
struct rtc_timeval tv = { sec, usec };
rtctime_settimeofday (&tv);
if (lua_isnumber(L, 3))
- rtc_time_set_rate(lua_tonumber(L, 3));
+ rtc_time_set_rate(lua_tointeger(L, 3));
return 0;
}
-
// sec, usec = rtctime.get ()
static int rtctime_get (lua_State *L)
{
struct rtc_timeval tv;
rtctime_gettimeofday (&tv);
- lua_pushnumber (L, tv.tv_sec);
- lua_pushnumber (L, tv.tv_usec);
- lua_pushnumber (L, rtc_time_get_rate());
+ lua_pushinteger (L, tv.tv_sec);
+ lua_pushinteger (L, tv.tv_usec);
+ lua_pushinteger (L, rtc_time_get_rate());
return 3;
}
@@ -160,7 +159,7 @@ static void do_sleep_opt (lua_State *L, int idx)
{
if (lua_isnumber (L, idx))
{
- uint32_t opt = lua_tonumber (L, idx);
+ uint32_t opt = lua_tointeger (L, idx);
if (opt < 0 || opt > 4)
luaL_error (L, "unknown sleep option");
system_deep_sleep_set_option (opt);
@@ -170,8 +169,8 @@ static void do_sleep_opt (lua_State *L, int idx)
// rtctime.adjust_delta (usec)
static int rtctime_adjust_delta (lua_State *L)
{
- uint32_t us = luaL_checknumber (L, 1);
- lua_pushnumber(L, rtc_time_adjust_delta_by_rate(us));
+ uint32_t us = luaL_checkinteger (L, 1);
+ lua_pushinteger(L, rtc_time_adjust_delta_by_rate(us));
return 1;
}
@@ -179,7 +178,7 @@ static int rtctime_adjust_delta (lua_State *L)
// rtctime.dsleep (usec, option)
static int rtctime_dsleep (lua_State *L)
{
- uint32_t us = luaL_checknumber (L, 1);
+ uint32_t us = luaL_checkinteger (L, 1);
do_sleep_opt (L, 2);
rtctime_deep_sleep_us (us); // does not return
return 0;
@@ -192,8 +191,8 @@ static int rtctime_dsleep_aligned (lua_State *L)
if (!rtctime_have_time ())
return luaL_error (L, "time not available, unable to align");
- uint32_t align_us = luaL_checknumber (L, 1);
- uint32_t min_us = luaL_checknumber (L, 2);
+ uint32_t align_us = luaL_checkinteger (L, 1);
+ uint32_t min_us = luaL_checkinteger (L, 2);
do_sleep_opt (L, 3);
rtctime_deep_sleep_until_aligned_us (align_us, min_us); // does not return
return 0;
|
update geometricInverse for OMLINK | @@ -185,6 +185,7 @@ class OMLinkKinematics
}
Eigen::VectorXf geometricInverse(Manipulator* manipulator, Name tool_number, Pose target_pose, float gain) //for basic model
+
{
Eigen::VectorXf target_angle_vector(3);
Eigen::Vector3f control_position; //joint6-joint1
|
Don't need the checkbox; the hook does it | @@ -8,7 +8,6 @@ Contributors guide: https://github.com/openssl/openssl/blob/master/CONTRIBUTING
<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
- [ ] documentation is added or updated
- [ ] tests are added or updated
-- [ ] CLA is signed
##### Description of change
<!-- Provide a description of the changes.
|
Fixed set int state up for ipsec interfaces | @@ -63,11 +63,11 @@ ipsec_admin_up_down_function (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
if (err)
return err;
- vnet_sw_interface_set_flags (vnm, hi->sw_if_index,
+ vnet_hw_interface_set_flags (vnm, hw_if_index,
VNET_HW_INTERFACE_FLAG_LINK_UP);
}
else
- vnet_sw_interface_set_flags (vnm, hi->sw_if_index, 0 /* down */ );
+ vnet_hw_interface_set_flags (vnm, hw_if_index, 0 /* down */ );
return /* no error */ 0;
}
|
feat: use runtime logging to replace compile time switchable logging | @@ -95,7 +95,7 @@ on_success_cb(
int httpcode,
struct ua_conn *conn)
{
- DS_NOTOP_PRINT("(%d)%s - %s",
+ log_trace("(%d)%s - %s",
httpcode,
http_code_print(httpcode),
http_reason_print(httpcode));
@@ -111,7 +111,7 @@ on_failure_cb(
{
struct _ratelimit_cxt *cxt = p_cxt;
- NOTOP_PRINT("(%d)%s - %s",
+ log_warn("(%d)%s - %s",
httpcode,
http_code_print(httpcode),
http_reason_print(httpcode));
@@ -141,7 +141,7 @@ on_failure_cb(
message, &retry_after_ms);
if (retry_after_ms) { // retry after attribute received
- NOTOP_PRINT("RATELIMIT MESSAGE:\n\t%s (wait: %lld ms)", message, retry_after_ms);
+ log_warn("RATELIMIT MESSAGE:\n\t%s (wait: %lld ms)", message, retry_after_ms);
ua_block_ms(cxt->adapter->ua, retry_after_ms);
@@ -150,7 +150,7 @@ on_failure_cb(
// no retry after included, we should abort
- NOTOP_PRINT("RATELIMIT MESSAGE:\n\t%s", message);
+ log_warn("RATELIMIT MESSAGE:\n\t%s", message);
return UA_ABORT;
}
}
@@ -166,7 +166,7 @@ json_error_cb(char *str, size_t len, void *p_err)
json_scanf(str, len, "[message]%s [code]%d", message, &code);
- NOTOP_PRINT("Error Description:\n\t\t%s (code %d)"
+ log_warn("Error Description:\n\t\t%s (code %d)"
"- See Discord's JSON Error Codes", message, code);
}
|
primus: Switch FAN ID (EC) and USB_A1_RT_RST_ODL (PCH) pin
BRANCH=none
TEST=make -j BOARD=primus
Tested-by: Scott Chao | @@ -27,7 +27,7 @@ GPIO_INT(USB_C0_PPC_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, ppc_interr
GPIO_INT(USB_C1_TCPC_INT_ODL, PIN(A, 2), GPIO_INT_FALLING, tcpc_alert_event)
GPIO_INT(USB_C1_BC12_INT_ODL, PIN(0, 2), GPIO_INT_FALLING, bc12_interrupt)
GPIO_INT(USB_C1_PPC_INT_ODL, PIN(7, 0), GPIO_INT_FALLING, ppc_interrupt)
-GPIO_INT(USB_C1_RT_INT_ODL, PIN(4, 1), GPIO_INT_FALLING, retimer_interrupt)
+GPIO_INT(USB_C1_RT_INT_ODL, PIN(9, 7), GPIO_INT_FALLING, retimer_interrupt)
/* USED GPIOs: */
GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT)
@@ -77,7 +77,7 @@ GPIO(USB_A_LOW_PWR_OD, PIN(6, 6), GPIO_ODR_LOW)
GPIO(TBT_PWR_EN, PIN(D, 4), GPIO_OUT_LOW)
GPIO(TP4_RESET, PIN(9, 3), GPIO_ODR_LOW)
GPIO(USB_C1_FRS_EN, PIN(9, 4), GPIO_OUT_LOW)
-GPIO(FAN_ID, PIN(9, 7), GPIO_INPUT)
+GPIO(FAN_ID, PIN(4, 1), GPIO_INPUT)
GPIO(USB_C0_OC_ODL, PIN(5, 6), GPIO_ODR_HIGH)
GPIO(USB_C1_OC_ODL, PIN(8, 6), GPIO_ODR_HIGH)
|
omxplayer: Bump to head and fix missing native dependency | @@ -7,10 +7,10 @@ SECTION = "console/utils"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh libomxil coreutils-native"
+DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh libomxil coreutils-native curl-native"
PR = "r4"
-SRCREV = "62fb580260adb9b01e5694bb4374fb9a5f6f1021"
+SRCREV = "061425a5eabf6e9ee43229911c073a863d144038"
SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \
file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \
file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \
|
doc: add some known users | - Embedded: Elektra is on the frontier for embedded systems because of
its tiny core and the many possibilities with its plugins.
+ Known users:
+ - OpenWRT (distribution)
+ - Broadcom (blue-ray devices)
+ - Kapsch (cameras)
+ - Toshiba (TVs)
- Server: Elektra is ideal suited for a local configuration storage by
mounting existing configuration files into the global tree. Nodes
using Elektra can be connected by already existing configuration
management tools.
+ Known users:
+ - Allianz
+ - TU Wien
+ - Other Universities
- Desktop: Elektra allows applications to read and write from a global
configuration tree. We miss a specification (schema) so that these
configuration values can be shared (integrated).
|
Docker: reverted
Automatic synchronisation is now set up, so manual pushes to AWS ECR are
discouraged. | @@ -97,11 +97,9 @@ build-%: Dockerfile.%
tag-%: build-%
docker tag unit:$(VERSION)-$* nginx/unit:$(VERSION)-$*
- docker tag unit:$(VERSION)-$* public.ecr.aws/nginx/unit:$(VERSION)-$*
push-%: tag-%
docker push nginx/unit:$(VERSION)-$*
- docker push public.ecr.aws/nginx/unit:$(VERSION)-$*
$(EXPORT_DIR):
mkdir -p $@
|
fix seg fault in memory cypt when using public clients | #include "utils/stringUtils.h"
#include <string.h>
+#include <syslog.h>
#include <sodium.h>
@@ -37,13 +38,19 @@ char* xorCrypt(const char* string, uint64_t key, size_t len) {
* @return a pointer to the decrypted string. It has to be freed after usage.
*/
char* memoryDecrypt(const char* cipher) {
- if (cipher == NULL) {
+ if (!strValid(cipher)) {
oidc_setArgNullFuncError(__func__);
return NULL;
}
+ // syslog(LOG_AUTHPRIV | LOG_DEBUG, "memory decryption '%s'", cipher);
char* tmp = oidc_strcopy(cipher);
size_t len = strToInt(strtok(tmp, ":"));
char* cipher_base64 = strtok(NULL, ":");
+ if (len == 0 || cipher_base64 == NULL) {
+ secFree(tmp);
+ oidc_errno = OIDC_ECRYPM;
+ return NULL;
+ }
unsigned char* cipher_bin = secAlloc(sizeof(char) * (len + 1));
fromBase64(cipher_base64, len, cipher_bin);
char* decrypted = xorCrypt((char*)cipher_bin, memoryPass, len);
@@ -59,6 +66,11 @@ char* memoryDecrypt(const char* cipher) {
* after usage.
*/
char* memoryEncrypt(const char* text) {
+ if (!strValid(text)) {
+ oidc_setArgNullFuncError(__func__);
+ return NULL;
+ }
+ // syslog(LOG_AUTHPRIV | LOG_DEBUG, "memory encryption '%s'", text);
size_t len = strlen(text);
char* cipher = xorCrypt(text, memoryPass, len);
char* cipher_base64 = toBase64(cipher, len);
|
Error case should return -1, not 0 | @@ -54,7 +54,7 @@ static int test_all(void) {
if ((r = test(readbuf, writebuf, 512, num_bytes - 512, 500)) != 0) return r;
printf("Write beyond end region, should fail (offset %d)\n", num_bytes);
- if ((r = test(readbuf, writebuf, 512, num_bytes, 501)) == 0) return r;
+ if ((r = test(readbuf, writebuf, 512, num_bytes, 501)) == 0) return -1;
return 0;
}
|
update HOWTO #no_auto_pr | @@ -266,14 +266,17 @@ make dist-python PYPI_USERNAME=swiftnav PYPI_PASSWORD=...
In order to build on Windows, first install the necessary compilers per the
instructions [on this Microsoft developer blog][1] (shortcut: install
-[Microsoft Visual Studio Community 2019][msvsc2019] and select the
-"native Python development" option) then install the 64-bit Python 3.7
+[Microsoft Visual Studio Community 2019][msvsc2019] and select the "native
+Python development" option, or you can install [Visual Studio Build
+Tools][vcbuildtools] and install the "C++ build tools", also make sure to
+install MSVC v140 and MSCV v141. Afterwards install the 64-bit Python 3.7
version of [Conda][2]. You'll also need to install [Chocolatey][3].
[1]: https://devblogs.microsoft.com/python/unable-to-find-vcvarsall-bat/
[2]: https://docs.conda.io/en/latest/miniconda.html
[3]: https://chocolatey.org/docs/installation
[msvsc2019]: https://www.microsoft.com/en-us/download/details.aspx?id=48159
+[vcbuildtools]: https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019
For Chocolatey, the following packages are recommended:
- make
@@ -293,12 +296,26 @@ Import-BatchEnvironment 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Com
$env:CONDA_FORCE_32BIT = 0
```
+Or if you install the Visual Studio Build tools:
+
+```
+Import-BatchEnvironment 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat'
+$env:CONDA_FORCE_32BIT = 1
+```
+
And for 32-bit:
```
Import-BatchEnvironment 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat'
$env:CONDA_FORCE_32BIT = 1
```
+Or if you install the Visual Studio Build tools:
+
+```
+Import-BatchEnvironment 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars32.bat'
+$env:CONDA_FORCE_32BIT = 0
+```
+
Then invoke the `dist-python` target from `libsbp` (with appropriate PyPI auth).
This will need to be once for 32-bit and 64-bit.
|
linux/trace: check for func/file == NULL | @@ -164,14 +164,14 @@ void arch_bfdResolveSyms(pid_t pid, funcs_t* funcs, size_t num) {
if (bfd_find_nearest_line(
bfdParams.bfdh, section, bfdParams.syms, sec_offset, &file, &func, &line) == TRUE) {
- snprintf(funcs[i].func, sizeof(funcs->func), "%s", func);
- snprintf(funcs[i].file, sizeof(funcs->file), "%s", file);
+ snprintf(funcs[i].func, sizeof(funcs->func), "%s", func ? func : "");
+ snprintf(funcs[i].file, sizeof(funcs->file), "%s", file ? file : "");
funcs[i].line = line;
}
if (bfd_find_nearest_line(
bfdParams.bfdh, section, bfdParams.syms, sec_offset, &file, &func, &line) == TRUE) {
- snprintf(funcs[i].func, sizeof(funcs->func), "%s", func);
- snprintf(funcs[i].file, sizeof(funcs->file), "%s", file);
+ snprintf(funcs[i].func, sizeof(funcs->func), "%s", func ? func : "");
+ snprintf(funcs[i].file, sizeof(funcs->file), "%s", file ? file : "");
funcs[i].line = line;
}
}
|
docs: update startup of tftp services | [sms](*\#*) systemctl enable httpd.service
[sms](*\#*) systemctl restart httpd
[sms](*\#*) systemctl enable dhcpd.service
-[sms](*\#*) systemctl enable tftp
-[sms](*\#*) systemctl restart tftp
+[sms](*\#*) systemctl enable tftp.socket
+[sms](*\#*) systemctl start tftp.socket
\end{lstlisting}
%\end{verbatim}
% end_ohpc_run
|
Fix idle process parent text | * Process properties: General page
*
* Copyright (C) 2009-2016 wj32
- * Copyright (C) 2016-2021 dmex
+ * Copyright (C) 2016-2022 dmex
*
* This file is part of Process Hacker.
*
@@ -443,8 +443,16 @@ INT_PTR CALLBACK PhpProcessGeneralDlgProc(
}
else
{
- PhSetDialogItemText(hwndDlg, IDC_PARENTPROCESS,
- PhaFormatString(L"Non-existent process (%u)", HandleToUlong(processItem->ParentProcessId))->Buffer);
+ if (processItem->ProcessId == SYSTEM_IDLE_PROCESS_ID)
+ {
+ PhSetDialogItemText(hwndDlg, IDC_PARENTPROCESS, L"N/A");
+ }
+ else
+ {
+ PhSetDialogItemText(hwndDlg, IDC_PARENTPROCESS, PhaFormatString(
+ L"Non-existent process (%lu)", HandleToUlong(processItem->ParentProcessId))->Buffer);
+ }
+
EnableWindow(GetDlgItem(hwndDlg, IDC_VIEWPARENTPROCESS), FALSE);
}
@@ -458,7 +466,7 @@ INT_PTR CALLBACK PhpProcessGeneralDlgProc(
if (parentProcess = PhReferenceProcessItem((HANDLE)((ULONG_PTR)processItem->ConsoleHostProcessId & ~3)))
{
- if (parentProcess->ProcessId == 0)
+ if (parentProcess->ProcessId == SYSTEM_IDLE_PROCESS_ID)
{
PhSetDialogItemText(hwndDlg, IDC_PARENTCONSOLE, L"N/A");
}
|
in_cpu: fix packer variable | @@ -84,9 +84,9 @@ struct flb_in_cpu_config {
"cpu%i.p_%s", i - 1, #key)
#define CPU_PACK_SNAP(s, key) \
- msgpack_pack_str(&i_ins->mp_pck, s->k_##key.length); \
- msgpack_pack_str_body(&i_ins->mp_pck, s->k_##key.name, s->k_##key.length); \
- msgpack_pack_double(&i_ins->mp_pck, s->p_##key)
+ msgpack_pack_str(&mp_pck, s->k_##key.length); \
+ msgpack_pack_str_body(&mp_pck, s->k_##key.name, s->k_##key.length); \
+ msgpack_pack_double(&mp_pck, s->p_##key)
#define ULL_ABS(a, b) (a > b) ? a - b : b - a
|
{AH} update docs of infer_query_length, see | @@ -1469,7 +1469,7 @@ cdef class AlignedSegment:
return result
def infer_query_length(self, always=False):
- """infer query length from sequence or CIGAR alignment.
+ """infer query length from CIGAR alignment.
This method deduces the query length from the CIGAR alignment
but does not include hard-clipped bases.
|
Add SCOPE_METRIC_DISABLE env var for demo. | @@ -8,6 +8,7 @@ struct _out_t
{
transport_t* transport;
format_t* format;
+ int metric_disabled;
};
out_t*
@@ -19,6 +20,10 @@ outCreate()
return NULL;
}
+ // TBD. This is a quick and dirty way to disable metric output.
+ // Added 31-Jan-2020 for a demo.
+ out->metric_disabled = (getenv("SCOPE_METRIC_DISABLE") != NULL);
+
return out;
}
@@ -46,6 +51,8 @@ outSendEvent(out_t* out, event_t* e)
{
if (!out || !e) return -1;
+ if (out->metric_disabled) return -1;
+
char* msg = fmtStatsDString(out->format, e, NULL);
int rv = outSend(out, msg);
if (msg) free(msg);
|
[test] Add error message for travis | @@ -4065,11 +4065,12 @@ abi.register(oom, p, cp)`
`{"Name":"oom"}`,
),
)
- errMsg := "string length overflow"
+ errMsg1 := "string length overflow"
+ errMsg2 := "not enough memory"
if err == nil {
- t.Errorf("expected: %s", errMsg)
+ t.Errorf("expected: %s or %s", errMsg1, errMsg2)
}
- if err != nil && !strings.Contains(err.Error(), errMsg) {
+ if err != nil && (!strings.Contains(err.Error(), errMsg1) && !strings.Contains(err.Error(), errMsg2)) {
t.Error(err)
}
err = bc.ConnectBlock(
@@ -4080,7 +4081,7 @@ abi.register(oom, p, cp)`
`{"Name":"p"}`,
),
)
- if err != nil {
+ if err != nil && !strings.Contains(err.Error(), errMsg2) {
t.Error(err)
}
err = bc.ConnectBlock(
@@ -4091,7 +4092,7 @@ abi.register(oom, p, cp)`
`{"Name":"cp"}`,
),
)
- if err != nil {
+ if err != nil && !strings.Contains(err.Error(), errMsg2) {
t.Error(err)
}
}
|
bootloader: Remove extraneous newlines from some debug statements
ESP_LOGD(...) provides its own new lines so remove these from these
debug strings. | @@ -494,15 +494,15 @@ static bool should_load(uint32_t load_addr)
if (!load_rtc_memory) {
if (load_addr >= SOC_RTC_IRAM_LOW && load_addr < SOC_RTC_IRAM_HIGH) {
- ESP_LOGD(TAG, "Skipping RTC fast memory segment at 0x%08x\n", load_addr);
+ ESP_LOGD(TAG, "Skipping RTC fast memory segment at 0x%08x", load_addr);
return false;
}
if (load_addr >= SOC_RTC_DRAM_LOW && load_addr < SOC_RTC_DRAM_HIGH) {
- ESP_LOGD(TAG, "Skipping RTC fast memory segment at 0x%08x\n", load_addr);
+ ESP_LOGD(TAG, "Skipping RTC fast memory segment at 0x%08x", load_addr);
return false;
}
if (load_addr >= SOC_RTC_DATA_LOW && load_addr < SOC_RTC_DATA_HIGH) {
- ESP_LOGD(TAG, "Skipping RTC slow memory segment at 0x%08x\n", load_addr);
+ ESP_LOGD(TAG, "Skipping RTC slow memory segment at 0x%08x", load_addr);
return false;
}
}
|
chip/stm32: Rename field since "or" is reserved in C++
BRANCH=none
TEST=make buildall | @@ -137,7 +137,7 @@ struct timer_ctlr {
unsigned dcr;
unsigned dmar;
- unsigned or;
+ unsigned option_register;
};
/* Must be volatile, or compiler optimizes out repeated accesses */
typedef volatile struct timer_ctlr timer_ctlr_t;
|
Fleshed out text describing Visual Studio 2015 runtime requirements. | @@ -25,7 +25,7 @@ Two builds are currently provided for each release:
* 32 bit (Win32, SDL2 only) binaries also including source code.
* 64 bit (x64, SDL2 only) binaries also including source code.
-**Warning:** Run `samples.exe` as your first action, if you download these builds. If you get an error about `vcruntime140.dll` being missing, you need to install the two [Visual Studio 2015 runtimes](https://www.microsoft.com/en-us/download/details.aspx?id=53587). Make sure you install the 32-bit runtime. And make sure you also install the 64-bit runtime.
+**Warning:** If you download these builds, run `samples.exe` as your very first action. If you are unable to and get an error about `vcruntime140.dll` being missing, you need to install the two [Visual Studio 2015 runtimes](https://www.microsoft.com/en-us/download/details.aspx?id=53587). Make sure you install the 32-bit runtime. And make sure you also install the 64-bit runtime. Then run `samples.exe` again, and it should now work. Whether you plan to develop in C, C++, Python or some other language, this is required.
### Compiling from source ###
|
rt1718s/bc12: fix typo
TEST=manually
BRANCH=none
Tested-by: Ting Shen | @@ -331,7 +331,7 @@ static void rt1718s_bc12_usb_charger_task(const int port)
while (1) {
uint32_t evt = task_wait_event(-1);
bool is_non_pd_sink = !pd_capable(port) &&
- usb_charger_port_is_sourcing_vbus(port) &&
+ !usb_charger_port_is_sourcing_vbus(port) &&
pd_check_vbus_level(port, VBUS_PRESENT);
if (evt & USB_CHG_EVENT_VBUS) {
|
Fix issue causing that shorter atoms are considered of higher quality than longer ones.
Because of the way in which atom quality was being calculated atom {00} was considered better than atom {00 00}. | @@ -160,12 +160,12 @@ int yr_atoms_heuristic_quality(
unique_bytes += 1;
}
- // (atom_length + unique_bytes - penalty + 2) is within the range
+ // yr_max(atom_length + unique_bytes - penalty, 0) is within the range
// [0 - 2 * YR_MAX_ATOM_LENGTH], which means that the function returns a value
// in [YR_MAX_ATOM_QUALITY - 2 * YR_MAX_ATOM_LENGTH, YR_MAX_ATOM_QUALITY]
return YR_MAX_ATOM_QUALITY - 2 * YR_MAX_ATOM_LENGTH +
- (atom_length + unique_bytes - penalty + 2);
+ yr_max(atom_length + unique_bytes - penalty, 0);
}
//
|
CBLK: Add parameters to analysis script | #!/usr/bin/python
+
+#
+# Copyright 2017 International Business Machines
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
import re
+import getopt, sys
-def main():
+def analyze_file(fname):
seqs = []
- with open("run_threads1_prefetch0_lbas.log", "r") as ins:
+ with open(fname, "r") as ins:
lba_last = 0
last_seq = 0
for line in ins:
@@ -39,5 +57,31 @@ def main():
print("[" + str(i) + "] " + str(e))
i += 1
+def usage():
+ print("lbalog_analysis.py [-help] -i filename.log")
+
+def main():
+ try:
+ opts, args = getopt.getopt(sys.argv[1:], "hi:", ["help", "input="])
+ except getopt.GetoptError as err:
+ # print help information and exit:
+ print str(err)
+ usage()
+ sys.exit(2)
+
+ # fname = None
+ fname = "run_threads1_prefetch0_lbas.log"
+
+ for o, a in opts:
+ if o in ("-h", "--help"):
+ usage()
+ sys.exit()
+ elif o in ("-i", "--input"):
+ fname = a
+ else:
+ assert False, "unhandled option"
+
+ analyze_file(fname)
+
if __name__ == "__main__":
main()
|
Update datafari_bug.md | >>>
Template to declare a bug.
-You have 4 priorities to chose from: Prio 1 is for critical matters, Prio 2 is for enhancements meant to be pushed within the next 2 releases, Prio 3 is for things that matter but you're not sure when to push it, Prio 4 is for enhancements that have clearly no priority at all at the time of its creation.
+First, please use the label "bug" to flag it as such.
+
+You have 4 priorities to choose from: Prio 1 is for critical matters, Prio 2 is for enhancements meant to be pushed within the next 2 releases, Prio 3 is for things that matter but you're not sure when to push it, Prio 4 is for enhancements that have clearly no priority at all at the time of its creation.
You should create one ticket per Datafari version where it will be pushed, and use the linking mechanism to point to the same tickets between different versions. Versions are declared as Milestones in our Gitlab.
|
TEMPORARY: get latest 'goflying' packages in Makefile. | @@ -13,6 +13,8 @@ all:
xgen_gdl90:
go get -t -d -v ./main ./test ./godump978 ./uatparse ./sensors
+ go get -u github.com/westphae/goflying/ahrs
+ go get -u github.com/westphae/goflying/ahrsweb
go build $(BUILDINFO) -p 4 main/gen_gdl90.go main/traffic.go main/gps.go main/network.go main/managementinterface.go main/sdr.go main/ping.go main/uibroadcast.go main/monotonic.go main/datalog.go main/equations.go main/sensors.go
xdump1090:
|
Add JobRebroadcastTimeout 0 check for consistency | @@ -143,11 +143,14 @@ namespace Miningcore.Blockchain.Bitcoin
}
// periodically update transactions for current template
+ if(poolConfig.JobRebroadcastTimeout > 0)
+ {
triggers.Add(Observable.Timer(jobRebroadcastTimeout)
.TakeUntil(pollTimerRestart)
.Select(_ => (true, JobRefreshBy.PollRefresh, (string) null))
.Repeat());
}
+ }
else
{
|
include/queue.h: Format with clang-format
BRANCH=none
TEST=none | @@ -206,12 +206,8 @@ size_t queue_add_unit(struct queue const *q, const void *src);
size_t queue_add_units(struct queue const *q, const void *src, size_t count);
/* Add multiple units to queue using supplied memcpy. */
-size_t queue_add_memcpy(struct queue const *q,
- const void *src,
- size_t count,
- void *(*memcpy)(void *dest,
- const void *src,
- size_t n));
+size_t queue_add_memcpy(struct queue const *q, const void *src, size_t count,
+ void *(*memcpy)(void *dest, const void *src, size_t n));
/* Remove one unit from the begin of the queue. */
size_t queue_remove_unit(struct queue const *q, void *dest);
@@ -220,27 +216,18 @@ size_t queue_remove_unit(struct queue const *q, void *dest);
size_t queue_remove_units(struct queue const *q, void *dest, size_t count);
/* Remove multiple units from the begin of the queue using supplied memcpy. */
-size_t queue_remove_memcpy(struct queue const *q,
- void *dest,
- size_t count,
- void *(*memcpy)(void *dest,
- const void *src,
+size_t queue_remove_memcpy(struct queue const *q, void *dest, size_t count,
+ void *(*memcpy)(void *dest, const void *src,
size_t n));
/* Peek (return but don't remove) the count elements starting with the i'th. */
-size_t queue_peek_units(struct queue const *q,
- void *dest,
- size_t i,
+size_t queue_peek_units(struct queue const *q, void *dest, size_t i,
size_t count);
/* Peek (return but don't remove) the count elements starting with the i'th. */
-size_t queue_peek_memcpy(struct queue const *q,
- void *dest,
- size_t i,
- size_t count,
- void *(*memcpy)(void *dest,
- const void *src,
- size_t n));
+size_t
+queue_peek_memcpy(struct queue const *q, void *dest, size_t i, size_t count,
+ void *(*memcpy)(void *dest, const void *src, size_t n));
/*
* These macros will statically select the queue functions based on the number
|
Doc/SPI Master: Added description for SPI clock and speed settings | @@ -98,8 +98,8 @@ Phase Description
============== =========================================================================================================
**Command** In this phase, a command (0-16 bit) is written to the bus by the Host.
**Address** In this phase, an address (0-{IDF_TARGET_ADDR_LEN} bit) is transmitted over the bus by the Host.
-**Write** Host sends data to a Device. This data follows the optional command and address phases and is indistinguishable from them at the electrical level.
**Dummy** This phase is configurable and is used to meet the timing requirements.
+**Write** Host sends data to a Device. This data follows the optional command and address phases and is indistinguishable from them at the electrical level.
**Read** Device sends data to its Host.
============== =========================================================================================================
@@ -461,8 +461,37 @@ Typical transaction duration for one byte of data are given below.
SPI Clock Frequency
^^^^^^^^^^^^^^^^^^^
+The driver support setting an SPI peripheral to different clock frequencies. Actual clock frequency may not be exactly equal to the number you set, it will be re-calculated by the driver to the nearest hardware compatible number, you can call :cpp:func:`spi_device_get_actual_freq` to get the actual frequency computed by driver.
+
+Theoretical maximum transfer speed of Write or Read phase can be calculated according to the table below:
+
+.. only:: not SOC_SPI_SUPPORT_OCT
+
+ +--------------------------------+------------------------+
+ | Line Width of Write/Read phase | Speed (Bps) |
+ +================================+========================+
+ | 1-Line | *SPI Frequency / 8* |
+ +--------------------------------+------------------------+
+ | 2-Line | *SPI Frequency / 4* |
+ +--------------------------------+------------------------+
+ | 4-Line | *SPI Frequency / 2* |
+ +--------------------------------+------------------------+
+
+.. only:: SOC_SPI_SUPPORT_OCT
-Transferring each byte takes eight times the clock period *8/fspi*.
+ +--------------------------------+------------------------+
+ | Line Width of Write/Read phase | Speed (Bps) |
+ +================================+========================+
+ | 1-Line | *SPI Frequency / 8* |
+ +--------------------------------+------------------------+
+ | 2-Line | *SPI Frequency / 4* |
+ +--------------------------------+------------------------+
+ | 4-Line | *SPI Frequency / 2* |
+ +--------------------------------+------------------------+
+ | 8-Line | *SPI Frequency* |
+ +--------------------------------+------------------------+
+
+The transfer speed calculation of other phases(command, address, dummy) are similar.
.. only:: esp32
|
Negotiate simple if client has zero length CID. | @@ -409,8 +409,17 @@ int picoquic_negotiate_multipath_option(picoquic_cnx_t* cnx)
cnx->is_multipath_enabled = 1;
break;
case 3:
- /* same as case 2 */
+ /* Peer and local have been programmed to support either simple or full multipath.
+ * The default response is to do full multipath, but full multipath degrades to
+ * simple multipath is the client uses null length CID.
+ */
+ if (!cnx->client_mode && cnx->path[0]->p_remote_cnxid->cnx_id.id_len == 0) {
+ cnx->is_simple_multipath_enabled = 1;
+ cnx->local_parameters.enable_multipath = 1;
+ }
+ else {
cnx->is_multipath_enabled = 1;
+ }
break;
default:
/* error */
|
Correctly handle usleep call | @@ -248,7 +248,7 @@ static Value sleepNative(DictuVM *vm, int argCount, Value *args) {
double stopTime = AS_NUMBER(args[0]);
-#ifdef WIN32
+#ifdef _WIN32
Sleep(stopTime * 1000);
#elif _POSIX_C_SOURCE >= 199309L
struct timespec ts;
@@ -258,9 +258,10 @@ static Value sleepNative(DictuVM *vm, int argCount, Value *args) {
#else
if (stopTime >= 1)
sleep(stopTime);
- usleep(stopTime * 1000);
-#endif
+ // 1000000 = 1 second
+ usleep(fmod(stopTime, 1) * 1000000);
+#endif
return NIL_VAL;
}
|
[mod_openssl] copy data for larger SSL packets
copy small mem chunks into single large buffer before SSL_write()
to reduce number times write() called underneath SSL_write() and
potentially reduce number of packets generated if socket TCP_NODELAY | @@ -1101,14 +1101,14 @@ static int
load_next_chunk (server *srv, chunkqueue *cq, off_t max_bytes,
const char **data, size_t *data_len)
{
- chunk * const c = cq->first;
+ chunk *c = cq->first;
/* local_send_buffer is a 64k sendbuffer (LOCAL_SEND_BUFSIZE)
*
* it has to stay at the same location all the time to satisfy the needs
* of SSL_write to pass the SAME parameter in case of a _WANT_WRITE
*
- * buffer is allocated once, is NOT realloced
+ * buffer is allocated once, is NOT realloced (note: not thread-safe)
*
* (Note: above restriction no longer true since SSL_CTX_set_mode() is
* called with SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER)
@@ -1118,18 +1118,41 @@ load_next_chunk (server *srv, chunkqueue *cq, off_t max_bytes,
switch (c->type) {
case MEM_CHUNK:
- {
+ *data = NULL;
+ *data_len = 0;
+ do {
size_t have;
force_assert(c->offset >= 0
&& c->offset <= (off_t)buffer_string_length(c->mem));
have = buffer_string_length(c->mem) - c->offset;
+
+ /* copy small mem chunks into single large buffer before SSL_write()
+ * to reduce number times write() called underneath SSL_write() and
+ * potentially reduce number of packets generated if TCP_NODELAY */
+ if (*data_len) {
+ size_t space = LOCAL_SEND_BUFSIZE - *data_len;
+ if (have > space)
+ have = space;
+ if (have > (size_t)max_bytes - *data_len)
+ have = (size_t)max_bytes - *data_len;
+ if (*data != local_send_buffer) {
+ memcpy(local_send_buffer, *data, *data_len);
+ *data = local_send_buffer;
+ }
+ memcpy(local_send_buffer+*data_len,c->mem->ptr+c->offset,have);
+ *data_len += have;
+ continue;
+ }
+
if ((off_t) have > max_bytes) have = max_bytes;
*data = c->mem->ptr + c->offset;
*data_len = have;
- }
+ } while ((c = c->next) && c->type == MEM_CHUNK
+ && *data_len < LOCAL_SEND_BUFSIZE
+ && (off_t) *data_len < max_bytes);
return 0;
case FILE_CHUNK:
@@ -1365,7 +1388,7 @@ connection_read_cq_ssl (server *srv, connection *con,
/* FIXME: later */
}
- /* fall thourgh */
+ /* fall through */
default:
while((ssl_err = ERR_get_error())) {
switch (ERR_GET_REASON(ssl_err)) {
|
Changed job tests to use newer GCC versions and compile with C++14. | @@ -11,10 +11,10 @@ matrix:
include:
- os: osx
language: generic
- env: BUILD_TOOL=scons
+ env: BUILD_TOOL=scons CC=gcc
- os: osx
language: generic
- env: BUILD_TOOL=autotools
+ env: BUILD_TOOL=autotools CC=gcc
# sudo is required to prevent xvfb crashes from container-based workers.
sudo: required
@@ -42,9 +42,9 @@ before_script:
- 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export UNITTEST_ARGS="~~[!nonportable]"; fi'
script:
-- 'if [[ "$BUILD_TOOL" == "autotools" ]]; then echo "#include <libtcod.h>" | gcc -xc -c -I$HOME/.local/include/libtcod -; fi'
-- 'if [[ "$BUILD_TOOL" == "autotools" ]]; then echo "#include <libtcod.hpp>" | gcc -xc++ -std=c++11 -c -I$HOME/.local/include/libtcod -; fi'
-- 'if [[ "$BUILD_TOOL" == "autotools" ]]; then echo "#include <gui/gui.hpp>" | gcc -xc++ -std=c++11 -c -I$HOME/.local/include/libtcod -; fi'
+- 'if [[ "$BUILD_TOOL" == "autotools" ]]; then echo "#include <libtcod.h>" | $CC -xc -c -I$HOME/.local/include/libtcod -; fi'
+- 'if [[ "$BUILD_TOOL" == "autotools" ]]; then echo "#include <libtcod.hpp>" | $CC -xc++ -std=c++14 -c -I$HOME/.local/include/libtcod -; fi'
+- 'if [[ "$BUILD_TOOL" == "autotools" ]]; then echo "#include <gui/gui.hpp>" | $CC -xc++ -std=c++14 -c -I$HOME/.local/include/libtcod -; fi'
- 'if [[ "$BUILD_TOOL" == "autotools" ]]; then (cd build/autotools && make check); fi'
- 'if [[ "$BUILD_TOOL" == "scons" ]]; then LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR ./unittest $UNITTEST_ARGS; fi'
- (cd python && pytest -v)
|
sub shm BUGFIX correctly handle empty updated edits
Fixes | @@ -693,10 +693,11 @@ sr_shmsub_change_notify_update(struct sr_mod_info_s *mod_info, sr_sid_t sid, uin
/* SUB READ UNLOCK */
sr_rwunlock(&multi_sub_shm->lock, SR_LOCK_READ, __func__);
- /* collect new edits */
- if (!*update_edit) {
+ /* collect new edits (resulting edit may be empty) */
+ if (!*update_edit || !edit) {
+ lyd_free_withsiblings(*update_edit);
*update_edit = edit;
- } else {
+ } else if (edit) {
if (lyd_insert_after((*update_edit)->prev, edit)) {
sr_errinfo_new_ly(&err_info, ly_ctx);
goto cleanup;
|
add additional inforamtions for option -D | @@ -1184,6 +1184,7 @@ printf("%s %s (C) %s ZeroBeat\n"
" : all other are unknown\n"
"-F <file> : remove bad records and write only flawless records to hccapx file\n"
"-D <file> : remove duplicates from the same authentication sequence\n"
+ " : you must use nonce-error-corrections on that file!\n"
"-h : this help\n"
"\n", eigenname, VERSION, VERSION_JAHR, eigenname);
exit(EXIT_FAILURE);
|
testing/sensortest: fix bug because of adding custom type | * Pre-processor Definitions
****************************************************************************/
+#define ARRAYSIZE(a) (sizeof(a) / sizeof(a)[0])
#define DEVNAME_FMT "/dev/sensor/%s"
#define DEVNAME_MAX 64
@@ -201,7 +202,7 @@ int main(int argc, FAR char *argv[])
g_should_exit = false;
name = argv[1];
- for (idx = 0; idx < SENSOR_TYPE_COUNT; idx++)
+ for (idx = 0; idx < ARRAYSIZE(g_sensor_info); idx++)
{
if (!strncmp(name, g_sensor_info[idx].name,
strlen(g_sensor_info[idx].name)))
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.