message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Hash no longer caches keys when empty | @@ -435,7 +435,7 @@ FIO_INLINE void fiobj_free(FIOBJ o) {
return;
if (fiobj_ref_dec(o))
return;
- if (FIOBJECT2VTBL(o)->each) /* testing obj count ignores hash key caching */
+ if (FIOBJECT2VTBL(o)->each && FIOBJECT2VTBL(o)->count(o))
fiobj_free_complex_object(o);
else
FIOBJECT2VTBL(o)->dealloc(o, NULL, NULL);
|
nlinv: fix noncart ENLIVE
Commit rewrote part of the image size estimation for
noncartesian nlinv, and overwrote the number of maps in the `dims`
array, breaking noncartesian ENLIVE. | @@ -139,7 +139,6 @@ int main_nlinv(int argc, char* argv[argc])
long dims[DIMS];
md_copy_dims(DIMS, dims, ksp_dims);
- dims[MAPS_DIM] = nmaps;
complex float* traj = NULL;
long trj_dims[DIMS];
@@ -162,6 +161,9 @@ int main_nlinv(int argc, char* argv[argc])
md_copy_dims(DIMS - 3, dims + 3, ksp_dims + 3);
}
+ // for ENLIVE maps
+ dims[MAPS_DIM] = nmaps;
+
long strs[DIMS];
md_calc_strides(DIMS, strs, dims, CFL_SIZE);
|
iphone: Ruby VM make time_t unsigned to expand date capacity | #define NUM2GIDT(v) NUM2UINT(v)
#define PRI_GIDT_PREFIX PRI_INT_PREFIX
#define rb_time_t time_t
-#define SIGNEDNESS_OF_TIME_T -1
+#define SIGNEDNESS_OF_TIME_T 1
#define TIMET2NUM(v) LONG2NUM(v)
#define NUM2TIMET(v) NUM2LONG(v)
#define PRI_TIMET_PREFIX PRI_LONG_PREFIX
|
pmalloc: tolerate move_pages failure on numa node
Type: fix | @@ -309,7 +309,8 @@ pmalloc_map_pages (clib_pmalloc_main_t * pm, clib_pmalloc_arena_t * a,
to support non-numa kernels */
clib_mem_get_page_stats (va, CLIB_MEM_PAGE_SZ_DEFAULT, 1, &stats);
- if (stats.per_numa[numa_node] != 1)
+ if (stats.per_numa[numa_node] != 1 &&
+ !(numa_node == 0 && stats.unknown == 1))
{
u16 allocated_at = ~0;
if (stats.unknown)
|
Tool for integration tests of protobuf jaeger UDP protocol. | @@ -326,5 +326,6 @@ ALLOW yt/jaeger/plugin -> vendor/github.com/uber/jaeger-lib
ALLOW yt/jaeger/plugin -> vendor/github.com/uber/jaeger-client-go
ALLOW yt/jaeger/plugin -> vendor/github.com/spf13/viper
ALLOW yt/jaeger/plugin -> vendor/github.com/gorilla
+ALLOW yt/jaeger/plugin -> vendor/github.com/gogo
DENY .* -> vendor/
|
net:netlib fix vulerability while parsing malicious URLs
netlib_parsehttpurl() should be returned when error is detected | @@ -119,7 +119,7 @@ int netlib_parsehttpurl(const char *url, uint16_t *port, char *hostname, int hos
*dest++ = *src++;
bytesleft--;
} else {
- ret = -E2BIG;
+ return -E2BIG;
}
}
*dest = '\0';
@@ -140,7 +140,7 @@ int netlib_parsehttpurl(const char *url, uint16_t *port, char *hostname, int hos
/* The rest of the line is the file name */
if (*src == '\0' || *src == ' ') {
- ret = -ENOENT;
+ return -ENOENT;
}
/* Make sure the file name starts with exactly one '/' */
|
os/dbuild.sh : Refactor dbuild.sh
I changed the hardcoded part of the dbuild.sh to read board-specific predefined options.
In addition, it provide board-specific options to the user with a menu | @@ -112,7 +112,7 @@ function SELECT_OPTION()
read SELECTED_START
fi
- case ${SELECTED_START} in
+ case ${SELECTED_START,,} in
1|build)
BUILD
;;
@@ -294,40 +294,78 @@ function SELECT_CONFIG()
CONFIGURE ${BOARD}/${CONFIG} || exit 1
}
+function get_selected_board
+{
+ if [ "${CONFIG_ARCH_BOARD_ARTIK053}" == "y" ]; then
+ BOARD=artik053
+ elif [ "${CONFIG_ARCH_BOARD_ARTIK053S}" == "y" ]; then
+ BOARD=artik053s
+ elif [ "${CONFIG_ARCH_BOARD_ARTIK055S}" == "y" ]; then
+ BOARD=artik055s
+ elif [ "${CONFIG_ARCH_BOARD_ESP32_DEVKITC}" == "y" ]; then
+ BOARD=esp32_DevKitC
+ elif [ "${CONFIG_ARCH_BOARD_ESP_WROVER_KIT}" == "y" ]; then
+ BOARD=esp_wrover_kit
+ else
+ BOARD=${CONFIG_ARCH_BOARD}
+ fi
+}
+
# This function should be replaced to parse and to show the partition map.
function SELECT_DL
{
unset DL_ARG
-
if [ ! -z "$1" ];then
SELECTED_DL=$1
else
+ if [ -z ${BOARD} ]; then
+ get_selected_board
+ fi
+ contents=`cat ${CONFIGDIR}/${BOARD}/.flashSpec.xml | grep option`
+ command=()
+
+ while [ "${contents}" != "</options>" ]
+ do
+ contents=`echo ${contents#*>}`
+ unset menu
+ for ((i=0;;i++)); do
+ if [ "${contents:$i:1}" == "<" ]; then
+ break
+ fi
+ menu+=${contents:$i:1}
+ done
+ if [ ! -z "${menu}" ]; then
+ command[${#command[@]}]=${menu}
+ fi
+ done
+
echo ==================================================
echo " \"Select download option\""
echo ==================================================
- echo " \"1. ALL\""
- echo " \"2. OS\""
+ for ((i=1;i<=${#command[@]};i++)); do
+ if [ "${command[$i-1]}" != "USBrule" ]; then
+ echo " \"${i}. ${command[$i-1]}\""
+ fi
+ done
echo " \"u. USBrule\""
echo " \"x. Exit\""
echo ==================================================
read SELECTED_DL
fi
+ for ((i=1;i<=${#command[@]};i++)); do
+ if [ $SELECTED_DL == $i ]; then
+ DL_ARG=${command[$i-1]}
+ fi
+ done
+
case ${SELECTED_DL} in
- 1|all)
- DL_ARG=ALL
- ;;
- 2|os)
- DL_ARG=OS
- ;;
u|USBrule)
DL_ARG=USBrule
;;
x|exit)
exit 1
;;
- *)
- ;;
esac
if [ ! -z "${DL_ARG}" ]; then
|
allows -N without -F (temporary, revisit) | @@ -218,8 +218,8 @@ _main_getopt(c3_i argc, c3_c** argv)
// XX revisit
if ( (0 == u3_Host.ops_u.fak_c) && (c3y == u3_Host.ops_u.net) ) {
- fprintf(stderr, "-N only makes sense with -F\n");
- return c3n;
+ // fprintf(stderr, "-N only makes sense with -F\n");
+ u3_Host.ops_u.net = c3n;
} else if ( (0 == u3_Host.ops_u.fak_c) && (c3n == u3_Host.ops_u.net) ) {
u3_Host.ops_u.net = c3y; /* remote networking is always on in real mode. */
}
|
improved NC detection | @@ -1201,8 +1201,8 @@ for(zeigerhs = zeigerhsakt; zeigerhs < handshakelistptr; zeigerhs++)
}
if(memcmp(zeigermac->addr, zeigerhs->ap, 6) == 0)
{
- if((zeigerhs->status &ST_APLESS) != ST_APLESS) getnc(zeigerhs);
eapolmpbestcount++;
+ if((zeigerhs->status &ST_APLESS) != ST_APLESS) getnc(zeigerhs);
if((zeigerhs->status &ST_APLESS) == ST_APLESS) eapolaplesscount++;
if((zeigerhs->status &7) == ST_M12E2) eapolm12e2count++;
if((zeigerhs->status &7) == ST_M14E4) eapolm14e4count++;
@@ -1508,7 +1508,13 @@ return false;
static void addhandshake(uint64_t eaptimegap, uint64_t rcgap, messagelist_t *msgclient, messagelist_t *msgap, uint8_t keyver, uint8_t mpfield)
{
static handshakelist_t *handshakelistnew;
+static messagelist_t *zeiger;
+
eapolmpcount++;
+for(zeiger = messagelist; zeiger < messagelist +MESSAGELIST_MAX; zeiger++)
+ {
+ if(memcmp(msgap->ap, zeiger->ap, 6) == 0) mpfield |= zeiger->status;
+ }
if(msgap->timestamp == msgclient->timestamp) eapolmsgtimestamperrorcount++;
if(testeapolzeropmk(keyver, msgclient->client, msgap->ap, msgap->nonce, msgclient->eapauthlen, msgclient->eapol) == false)
@@ -1527,7 +1533,10 @@ if(testeapolzeropmk(keyver, msgclient->client, msgap->ap, msgap->nonce, msgclien
}
memset(handshakelistptr, 0, HANDSHAKELIST_SIZE);
handshakelistptr->timestampgap = eaptimegap;
- handshakelistptr->status = mpfield | msgap->status;
+
+ if((msgap->status &ST_NC) == ST_NC) printf("debug nc\n");
+
+ handshakelistptr->status = mpfield;
handshakelistptr->rcgap = rcgap;
if(handshakelistptr->rcgap > 0) handshakelistptr->status |= ST_NC;
handshakelistptr->messageap = msgap->message;
@@ -2037,7 +2046,6 @@ static uint64_t rcgap;
static uint8_t mpfield;
static const uint8_t foxtrott[4] = { 0xff, 0xff, 0xff, 0xff };
-
eapolm4count++;
eapolmsgcount++;
eapauth = (eapauth_t*)eapauthptr;
|
kernel/os/test - Prevent unused-but-set warning | @@ -117,6 +117,11 @@ sem_test_basic_handler(void *arg)
struct os_sem *sem;
os_error_t err;
+ /* Prevent unused-but-set-variable warning when system assert is
+ * enabled.
+ */
+ (void)t;
+
sem = &g_sem1;
t = os_sched_get_current_task();
|
Moved debugging code for clarity. | @@ -2524,8 +2524,8 @@ ws_broadcast_fifo (void *value, void *user_data) {
return 0;
}
+ LOG ((" - Sending...\n"));
ws_send_data (client, packet->type, packet->data, packet->size);
- LOG ((" - Sent\n"));
return 0;
}
|
Fix clang warning (-Wsometimes-uninitialized) | @@ -647,7 +647,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t *len)
int isp;
- bif_trunc_t * bt;
+ bif_trunc_t * bt = NULL;
long count = 0;
@@ -749,7 +749,7 @@ static int pack_double(grib_accessor* a, const double* val, size_t *len)
long hpos = 0;
long lpos = 0;
int isp;
- bif_trunc_t * bt;
+ bif_trunc_t * bt = NULL;
double max = 0;
double min = 0;
|
u3: check for road stack overflow on every nock %2 and %9 | @@ -1838,6 +1838,23 @@ _n_kale(u3_noun a)
return a;
}
+/* _n_sane(): check for stack overflow
+*/
+static inline void
+_n_sane(c3_ys off_ys)
+{
+ if ( !off_ys ) {
+ if( !(u3R->cap_p > u3R->hat_p) ) {
+ u3m_bail(c3__meme);
+ }
+ }
+ else {
+ if( !(u3R->cap_p < u3R->hat_p) ) {
+ u3m_bail(c3__meme);
+ }
+ }
+}
+
typedef struct {
u3n_prog* pog_u;
c3_w ip_w;
@@ -2078,6 +2095,7 @@ _n_burn(u3n_prog* pog_u, u3_noun bus, c3_ys mov, c3_ys off)
x = _n_pep(mov, off);
fam = u3to(burnframe, u3R->cap_p) + off + mov;
u3R->cap_p = u3of(burnframe, fam - off);
+ _n_sane(off);
fam->ip_w = ip_w;
fam->pog_u = pog_u;
_n_push(mov, off, x);
@@ -2240,6 +2258,7 @@ _n_burn(u3n_prog* pog_u, u3_noun bus, c3_ys mov, c3_ys off)
fam = u3to(burnframe, u3R->cap_p) + off + mov;
u3R->cap_p = u3of(burnframe, fam - off);
+ _n_sane(off);
fam->ip_w = ip_w;
fam->pog_u = pog_u;
|
Optimize get_jsonb_path_all avoiding an iterator
Instead of creating an iterator object at each step down the JSONB
object/array, we can just just examine its object/array flags, which is
faster. Also, use the recently introduced JsonbValueAsText instead of
open-coding the same thing, for code simplicity.
Author: Nikita Glukhov
Discussion: | @@ -1329,7 +1329,6 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
{
Jsonb *jb = PG_GETARG_JSONB_P(0);
ArrayType *path = PG_GETARG_ARRAYTYPE_P(1);
- Jsonb *res;
Datum *pathtext;
bool *pathnulls;
int npath;
@@ -1337,7 +1336,6 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
bool have_object = false,
have_array = false;
JsonbValue *jbvp = NULL;
- JsonbValue tv;
JsonbContainer *container;
/*
@@ -1449,41 +1447,30 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
if (jbvp->type == jbvBinary)
{
- JsonbIterator *it = JsonbIteratorInit((JsonbContainer *) jbvp->val.binary.data);
- JsonbIteratorToken r;
-
- r = JsonbIteratorNext(&it, &tv, true);
- container = (JsonbContainer *) jbvp->val.binary.data;
- have_object = r == WJB_BEGIN_OBJECT;
- have_array = r == WJB_BEGIN_ARRAY;
+ container = jbvp->val.binary.data;
+ have_object = JsonContainerIsObject(container);
+ have_array = JsonContainerIsArray(container);
+ Assert(!JsonContainerIsScalar(container));
}
else
{
- have_object = jbvp->type == jbvObject;
- have_array = jbvp->type == jbvArray;
+ Assert(IsAJsonbScalar(jbvp));
+ have_object = false;
+ have_array = false;
}
}
if (as_text)
{
- /* special-case outputs for string and null values */
- if (jbvp->type == jbvString)
- PG_RETURN_TEXT_P(cstring_to_text_with_len(jbvp->val.string.val,
- jbvp->val.string.len));
if (jbvp->type == jbvNull)
PG_RETURN_NULL();
- }
-
- res = JsonbValueToJsonb(jbvp);
- if (as_text)
- {
- PG_RETURN_TEXT_P(cstring_to_text(JsonbToCString(NULL,
- &res->root,
- VARSIZE(res))));
+ PG_RETURN_TEXT_P(JsonbValueAsText(jbvp));
}
else
{
+ Jsonb *res = JsonbValueToJsonb(jbvp);
+
/* not text mode - just hand back the jsonb */
PG_RETURN_JSONB_P(res);
}
|
Tweak random docs. | @@ -63,7 +63,7 @@ typedef enum {
TCOD_DISTRIBUTION_GAUSSIAN_RANGE_INVERSE
} TCOD_distribution_t;
-/* Pseudorandom number generator toolkit, all attributes are private. */
+// Old RNG, this struct and its attribute are private.
struct TCOD_Random_MT_CMWC {
TCOD_random_algo_t algorithm; // algorithm identifier
TCOD_distribution_t distribution; // distribution
@@ -75,7 +75,9 @@ struct TCOD_Random_MT_CMWC {
uint32_t Q[4096], c;
int cur;
};
-
+/***************************************************************************
+ @brief Pseudorandom number generator toolkit, all attributes are private.
+ */
typedef union TCOD_Random {
TCOD_random_algo_t algorithm;
struct TCOD_Random_MT_CMWC mt_cmwc;
|
actions MAINTENANCE minor improvements | @@ -39,7 +39,6 @@ jobs:
- {
name: "Release, Ubuntu 18.04, gcc",
os: "ubuntu-18.04",
- branches: "all",
build-type: "Release",
dep-build-type: "Release",
cc: "gcc",
@@ -52,7 +51,6 @@ jobs:
- {
name: "Release, Ubuntu 18.04, clang",
os: "ubuntu-18.04",
- branches: "all",
build-type: "Release",
dep-build-type: "Release",
cc: "clang",
@@ -65,7 +63,6 @@ jobs:
- {
name: "Debug, Ubuntu 18.04, gcc",
os: "ubuntu-18.04",
- branches: "all",
build-type: "Debug",
dep-build-type: "Debug",
cc: "gcc",
@@ -78,7 +75,6 @@ jobs:
- {
name: "Debug, Ubuntu 18.04, clang",
os: "ubuntu-18.04",
- branches: "all",
build-type: "Debug",
dep-build-type: "Debug",
cc: "clang",
@@ -91,7 +87,6 @@ jobs:
- {
name: "ASAN and UBSAN",
os: "ubuntu-18.04",
- branches: "all",
build-type: "Debug",
dep-build-type: "Debug",
cc: "clang",
@@ -104,7 +99,6 @@ jobs:
- {
name: "ABI Check",
os: "ubuntu-latest",
- branches: "all",
build-type: "ABICheck",
dep-build-type: "Debug",
cc: "gcc",
@@ -117,7 +111,6 @@ jobs:
- {
name: "Coverity",
os: "ubuntu-latest",
- branches: "devel-only",
build-type: "Debug",
dep-build-type: "Debug",
cc: "clang",
@@ -130,7 +123,6 @@ jobs:
- {
name: "Codecov",
os: "ubuntu-latest",
- branches: "all",
build-type: "Debug",
dep-build-type: "Debug",
cc: "gcc",
@@ -231,10 +223,10 @@ jobs:
https://scan.coverity.com/builds?project=$COVERITY_PROJECT
env:
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
- if: ${{ matrix.config.name == 'Coverity' && needs.git-branch.outputs.branch-name == 'devel' }}
+ if: ${{ matrix.config.name == 'Coverity' && github.event_name == 'push' && needs.git-branch.outputs.branch-name == 'devel' }}
- name: Upload to Codecov.io
shell: bash
working-directory: ${{ github.workspace }}/build
run: bash <(curl -s https://codecov.io/bash)
- if: ${{ matrix.config.name == 'Codecov' }}
+ if: ${{ matrix.config.name == 'Codecov' && github.event_name == 'push' }}
|
zeromq plugins: fix typo | @@ -13,7 +13,7 @@ if (ZMQ_FOUND)
set (SOURCES ${ADAPTER_SRC_FILES})
add_library (${ADAPTER_OBJECT} OBJECT ${SOURCES})
- target_include_directories (${ADAPTER_OBJECT} SYSTEM PUBLIC ${ZMQ_INCLUDE_DIR})
+ target_include_directories (${ADAPTER_OBJECT} SYSTEM PUBLIC ${ZMQ_INCLUDE_DIRS})
# NOTE CMAKE_POSITION_INDEPENDENT_CODE does not seem to work (e.g. CMake 3.9.2 on Travis)
target_compile_options (${ADAPTER_OBJECT} PRIVATE "-fPIC")
|
chat-cli: address style issues | =^ char state.cli
(~(transmit sole-lib state.cli) [%ins send-pos `@c`i.to-send])
$(moves [(effect:sh-out %det char) moves], send-pos +(send-pos), to-send t.to-send)
-
-
:: +edit: apply sole edit
::
:: called when typing into the cli prompt.
|= options=(list [cord tank])
^- move
(effect %tab options)
-
:: +print: puts some text into the cli as-is
::
++ print
|
Fixed STM32F407VE sectors_info type. | @@ -53,10 +53,10 @@ static const uint32_t flash_size = 0x00080000;
* The last pair in the list will have sectors starting at that address and ending
* at address flash_start + flash_size.
*/
-static const uint32_t sectors_info[] = {
- 0x08000000, 0x00004000,
- 0x08010000, 0x00010000,
- 0x08020000, 0x00020000,
+static const sector_info_t sectors_info[] = {
+ { 0x08000000, 0x00004000 },
+ { 0x08010000, 0x00010000 },
+ { 0x08020000, 0x00020000 },
};
static const program_target_t flash = {
|
common MAINTENANCE sanity assert | @@ -4471,6 +4471,7 @@ _sr_rwlock(sr_rwlock_t *rwlock, int timeout_ms, sr_lock_mode_t mode, sr_cid_t ci
if (!wr_urged) {
rwlock->writer = cid;
}
+ assert(rwlock->writer == cid);
} else if (mode == SR_LOCK_READ_UPGR) {
/* READ UPGR lock */
|
FIX: update _run_memcached_solo.sh script | #!/bin/sh
-./memcached -E .libs/default_engine.so -X .libs/syslog_logger.so -X .libs/ascii_scrub.so $@
+CURRENT_DIR_PATH=`pwd`
+
+ ./memcached -E $CURRENT_DIR_PATH/.libs/default_engine.so -X $CURRENT_DIR_PATH/.libs/syslog_logger.so -X $CURRENT_DIR_PATH/.libs/ascii_scrub.so $@
|
Fixing direct member variable access in CGGradient.
CGGradient's initializer access CGColorSpace's colorSpacemodel var, it should use CGColorSpaceGetModel | @@ -51,12 +51,8 @@ __CGGradient::~__CGGradient() {
}
void __CGGradient::initWithColorComponents(const float* components, const float* locations, size_t count, CGColorSpaceRef colorspace) {
- __CGColorSpace* cs = (__CGColorSpace*)colorspace;
DWORD componentCount = 0;
-
- _colorSpaceModel = cs->colorSpaceModel;
-
- switch (_colorSpaceModel) {
+ switch (CGColorSpaceGetModel(colorspace)) {
case kCGColorSpaceModelRGB:
componentCount = 4;
_format = _ColorABGR;
@@ -89,11 +85,8 @@ void __CGGradient::initWithColorComponents(const float* components, const float*
void __CGGradient::initWithColors(CFArrayRef componentsArr, const float* locations, CGColorSpaceRef colorspace) {
NSArray* components = (NSArray*)componentsArr;
size_t componentCount = 0;
- __CGColorSpace* cs = (__CGColorSpace*)colorspace;
-
- _colorSpaceModel = cs->colorSpaceModel;
- switch (_colorSpaceModel) {
+ switch (CGColorSpaceGetModel(colorspace)) {
case kCGColorSpaceModelRGB:
componentCount = 4;
_format = _ColorABGR;
|
Added intermediate key for ini
Because a null-key has a different value than a key with a value, this test fails using ini... | @@ -56,6 +56,7 @@ This command will return the following values as an exit status:
kdb set user/tests/cp/examples/kdb-cp/key key1
kdb set user/tests/cp/examples/kdb-cp/key/first key
kdb set user/tests/cp/examples/kdb-cp/key/second key
+kdb set user/tests/cp/examples/kdb-cp/cpkey key1
kdb set user/tests/cp/examples/kdb-cp/cpkey/first key
kdb set user/tests/cp/examples/kdb-cp/cpkey/second key
kdb set user/tests/cp/examples/kdb-cp/cpkeyerror/first key
|
Link -lm or -lm_hard for Android ARMv7. | @@ -493,6 +493,14 @@ else
CCOMMON_OPT += -mfloat-abi=hard
FCOMMON_OPT += -mfloat-abi=hard
endif
+
+ifeq ($(OSNAME), Android)
+ifeq ($(ARM_SOFTFP_ABI), 1)
+EXTRALIB += -lm
+else
+EXTRALIB += -Wl,-lm_hard
+endif
+endif
endif
ifeq ($(ARCH), arm64)
|
[kernel] raise exception instead of calling exit | @@ -134,8 +134,7 @@ int AVI::compute(double time)
if (_numerics_problem->size != _sizeOutput)
{
- std::cout << "AVI::compute - size mismatch between AVI size and and the current size" << std::endl;
- std::exit(EXIT_FAILURE);
+ RuntimeException::selfThrow("AVI::compute - size mismatch between AVI size and and the current size");
}
// --- Call Numerics driver ---
|
stm32/boards/NUCLEO_L432KC: Specify L4 OpenOCD config file for this MCU. | @@ -2,3 +2,4 @@ MCU_SERIES = l4
CMSIS_MCU = STM32L432xx
AF_FILE = boards/stm32l432_af.csv
LD_FILES = boards/stm32l432.ld boards/common_basic.ld
+OPENOCD_CONFIG = boards/openocd_stm32l4.cfg
|
Set stream handle to 0 in LMS_DestroyStream()
should handle attempts to use stream after closing in nicer manner | @@ -731,12 +731,19 @@ API_EXPORT int CALL_CONV LMS_DestroyStream(lms_device_t *device, lms_stream_t *s
{
if(stream == nullptr)
{
- lime::error("stream cannot be NULL.");
+ lime::error("Stream cannot be NULL.");
+ return -1;
+ }
+ if (stream->handle == 0)
+ {
+ lime::error("Invalid stream handle");
return -1;
}
- lime::LMS7_Device* lms = (lime::LMS7_Device*)device;
- return lms->DestroyStream((lime::StreamChannel*)stream->handle);
+ lime::LMS7_Device* lms = CheckDevice(device);
+ lms->DestroyStream((lime::StreamChannel*)stream->handle);
+ stream->handle = 0;
+ return 0;
}
API_EXPORT int CALL_CONV LMS_StartStream(lms_stream_t *stream)
|
Have util/mktar.sh display the absolute path to the tarball | @@ -30,4 +30,7 @@ if [ -z "$TARFILE" ]; then TARFILE="$NAME.tar"; fi
git archive --worktree-attributes --format=tar --prefix="$NAME/" -v HEAD \
| gzip -9 > "$TARFILE.gz"
-ls -l "$TARFILE.gz"
+# Good old way to ensure we display an absolute path
+td=`dirname $TARFILE`
+tf=`basename $TARFILE`
+ls -l "`cd $td; pwd`/$tf.gz"
|
configs/rtl8721csm/loadable_apps : Enable CONFIG_MM_ASSERT_ON_FAIL | @@ -982,7 +982,7 @@ CONFIG_KMM_REGIONS=3
CONFIG_KMM_NHEAPS=2
# CONFIG_KMM_FORCE_ALLOC_AT is not set
# CONFIG_GRAN is not set
-# CONFIG_MM_ASSERT_ON_FAIL is not set
+CONFIG_MM_ASSERT_ON_FAIL=y
#
# Work Queue Support
|
highlevel: try to get symver working | @@ -111,13 +111,13 @@ Elektra * elektraOpen (const char * application, KeySet * defaults, KeySet * con
return elektra;
}
-ELEKTRA_SYMVER_DECLARE ("libelektra_0.8", elektraOpen, v1);
-
Elektra * ELEKTRA_SYMVER (elektraOpen, v1) (const char * application, KeySet * defaults, ElektraError ** error)
{
return elektraOpen (application, defaults, NULL, error);
}
+ELEKTRA_SYMVER_DECLARE ("libelektra_0.8", elektraOpen, v1)
+
/**
* Promote an ElektraError to fatal and call the fatal error handler.
*
|
JPEGDEC/PicoGraphics: Add support for RGB888 target.
Fixes | @@ -137,6 +137,9 @@ MICROPY_EVENT_POLL_HOOK
// Dithered output to RGB332
current_graphics->set_pixel_dither({pDraw->x + x, pDraw->y + y}, (RGB565)(pDraw->pPixels[i]));
}
+ } else if (current_graphics->pen_type == PicoGraphics::PEN_RGB888) {
+ current_graphics->set_pen(RGB((RGB565)pDraw->pPixels[i]).to_rgb888());
+ current_graphics->pixel({pDraw->x + x, pDraw->y + y});
} else if (current_graphics->pen_type == PicoGraphics::PEN_P8 || current_graphics->pen_type == PicoGraphics::PEN_P4 || current_graphics->pen_type == PicoGraphics::PEN_3BIT) {
current_graphics->set_pixel_dither({pDraw->x + x, pDraw->y + y}, RGB((RGB565)pDraw->pPixels[i]));
} else {
|
Remove a test which is unsafe | @@ -14784,13 +14784,6 @@ out_unlocked:
if (free_cnt_applied) {
atomic_subtract_int(&asoc->refcnt, 1);
}
-#ifdef INVARIANTS
-#if defined(__FreeBSD__) && !defined(__Userspace__)
- if (mtx_owned(&stcb->tcb_mtx)) {
- panic("Leaving with tcb mtx owned?");
- }
-#endif
-#endif
}
if (top != NULL) {
sctp_m_freem(top);
|
SOVERSION bump to version 2.2.8 | @@ -63,7 +63,7 @@ set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_
# set version of the library
set(LIBYANG_MAJOR_SOVERSION 2)
set(LIBYANG_MINOR_SOVERSION 2)
-set(LIBYANG_MICRO_SOVERSION 7)
+set(LIBYANG_MICRO_SOVERSION 8)
set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION})
set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION})
|
ELM327: Fixed dreaded double response bug (tcp connection allocation issue). | @@ -119,10 +119,11 @@ static uint16_t elm_mode_keepalive_period = ELM_MODE_KEEPALIVE_PERIOD_DEFAULT;
// All ELM operations are global, so send data out to all connections
void ICACHE_FLASH_ATTR elm_tcp_tx_flush() {
if(!rsp_buff_len) return; // Was causing small error messages
+
for(elm_tcp_conn_t *iter = connection_list; iter != NULL; iter = iter->next){
int8_t err = espconn_send(iter->conn, rsp_buff, rsp_buff_len);
if(err){
- os_printf(" Wifi TX error code %d\n", err);
+ os_printf(" Wifi %p TX error code %d\n", iter->conn, err);
if(err == ESPCONN_ARG) {
if(iter == connection_list) {
connection_list = iter->next;
@@ -605,7 +606,9 @@ void ICACHE_FLASH_ATTR elm_LINFast_timer_cb(void *arg){
uint8_t newmsg_len = 4 + (lin_ringbuff_get(0) & 0x7);
if(lin_ringbuff_len >= newmsg_len) {
#ifdef ELM_DEBUG
- os_printf("Processing LIN MSG. BuffLen %d; expect %d\n", lin_ringbuff_len, newmsg_len);
+ os_printf("Processing LIN MSG. BuffLen %d; expect %d. Dat: ", lin_ringbuff_len, newmsg_len);
+ for(int i = 0; i < newmsg_len; i++) os_printf("%02x ", lin_ringbuff_get(i));
+ os_printf("\n");
#endif
got_msg_this_run = true;
loopcount = LOOPCOUNT_FULL;
@@ -1370,7 +1373,7 @@ static int ICACHE_FLASH_ATTR elm_msg_is_at_cmd(char *data, uint16_t len){
static void ICACHE_FLASH_ATTR elm_rx_cb(void *arg, char *data, uint16_t len) {
#ifdef ELM_DEBUG
- os_printf("\nGot ELM Data In: '%s'\n", data);
+ //os_printf("\nGot ELM Data In: '%s'\n", data);
#endif
rsp_buff_len = 0;
@@ -1454,6 +1457,14 @@ void ICACHE_FLASH_ATTR elm_tcp_connect_cb(void *arg) {
//Allow several sends to be queued at a time.
espconn_tcp_set_buf_count(pesp_conn, 3);
+ bool connection_address_already_there = false;
+ for(elm_tcp_conn_t *iter2 = connection_list; iter2 != NULL; iter2 = iter2->next)
+ if(iter2->conn == pesp_conn){connection_address_already_there = true; break;}
+
+ if(connection_address_already_there) {
+ os_printf("ELM WIFI: Memory reuse of recently killed connection\n");
+ } else {
+ os_printf("ELM WIFI: Adding connection\n");
elm_tcp_conn_t *newconn = os_malloc(sizeof(elm_tcp_conn_t));
if(!newconn) {
os_printf("Failed to allocate place for connection\n");
@@ -1463,6 +1474,7 @@ void ICACHE_FLASH_ATTR elm_tcp_connect_cb(void *arg) {
connection_list = newconn;
}
}
+}
void ICACHE_FLASH_ATTR elm327_init() {
// control listener
|
peview: Remove SetWindowSubclass | @@ -51,6 +51,7 @@ typedef struct _EDIT_CONTEXT
HBRUSH BrushNormal;
HBRUSH BrushPushed;
HBRUSH BrushHot;
+ WNDPROC DefaultWindowProc;
} EDIT_CONTEXT, *PEDIT_CONTEXT;
HICON PhpSearchBitmapToIcon(
@@ -421,12 +422,16 @@ LRESULT CALLBACK PhpSearchWndSubclassProc(
_In_ HWND hWnd,
_In_ UINT uMsg,
_In_ WPARAM wParam,
- _In_ LPARAM lParam,
- _In_ UINT_PTR uIdSubclass,
- _In_ ULONG_PTR dwRefData
+ _In_ LPARAM lParam
)
{
- PEDIT_CONTEXT context = (PEDIT_CONTEXT)dwRefData;
+ PEDIT_CONTEXT context;
+ WNDPROC oldWndProc;
+
+ if (!(context = PhGetWindowContext(hWnd, SHRT_MAX)))
+ return 0;
+
+ oldWndProc = context->DefaultWindowProc;
switch (uMsg)
{
@@ -437,7 +442,8 @@ LRESULT CALLBACK PhpSearchWndSubclassProc(
if (context->WindowFont)
DeleteObject(context->WindowFont);
- RemoveWindowSubclass(hWnd, PhpSearchWndSubclassProc, uIdSubclass);
+ SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)oldWndProc);
+ PhRemoveWindowContext(hWnd, SHRT_MAX);
PhFree(context);
}
break;
@@ -651,7 +657,7 @@ LRESULT CALLBACK PhpSearchWndSubclassProc(
break;
}
- return DefSubclassProc(hWnd, uMsg, wParam, lParam);
+ return CallWindowProc(oldWndProc, hWnd, uMsg, wParam, lParam);
}
HICON PhpSearchBitmapToIcon(
@@ -687,9 +693,7 @@ VOID PvCreateSearchControl(
{
PEDIT_CONTEXT context;
- context = (PEDIT_CONTEXT)PhAllocate(sizeof(EDIT_CONTEXT));
- memset(context, 0, sizeof(EDIT_CONTEXT));
-
+ context = PhAllocateZero(sizeof(EDIT_CONTEXT));
context->WindowHandle = WindowHandle;
//PhpSearchInitializeTheme(context);
@@ -700,7 +704,9 @@ VOID PvCreateSearchControl(
Edit_SetCueBannerText(context->WindowHandle, BannerText);
// Subclass the Edit control window procedure.
- SetWindowSubclass(context->WindowHandle, PhpSearchWndSubclassProc, 0, (ULONG_PTR)context);
+ context->DefaultWindowProc = (WNDPROC)GetWindowLongPtr(WindowHandle, GWLP_WNDPROC);
+ PhSetWindowContext(WindowHandle, SHRT_MAX, context);
+ SetWindowLongPtr(WindowHandle, GWLP_WNDPROC, (LONG_PTR)PhpSearchWndSubclassProc);
// Initialize the theme parameters.
SendMessage(context->WindowHandle, WM_THEMECHANGED, 0, 0);
|
fix case sensitivity for properties | @@ -291,6 +291,7 @@ class NEATProperty(object):
"""
The basic unit for representing properties in NEAT. NEATProperties are (key,value) tuples.
+ NEATProperty keys are always in lower case
"""
IMMUTABLE = 2
@@ -298,7 +299,7 @@ class NEATProperty(object):
BASE = 0
def __init__(self, key_val, precedence=OPTIONAL, score=0, banned=None, evaluated=False):
- self.key = key_val[0]
+ self.key = str(key_val[0]).lower()
self._value = PropertyValue(key_val[1])
self.precedence = precedence
@@ -582,14 +583,13 @@ class PropertyMultiArray(list):
return
def expand(self):
- # FIXME this alters the properties?? XXXX
# FIXME this is called too often
expanded_pas = []
for pa_product in itertools.product(*self):
pa = PropertyArray()
for p in pa_product:
- tmp = copy.deepcopy(p)
+ tmp = copy.deepcopy(p) # FIXME otherwise method alters the properties
pa.add(*tmp.values())
expanded_pas.append(pa)
return expanded_pas
|
fix(README) improve grammar
The real intent is to kick CI to test a MicroPython build. | </p>
<p align="center">
-LVGL provides everything you need to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint.
+LVGL provides everything you need to create an embedded GUI with easy-to-use graphical elements, beautiful visual effects and a low memory footprint.
</p>
<h4 align="center">
|
CLEANUP: add error handling for auto_scrub | @@ -1282,11 +1282,13 @@ static void sm_check_and_scrub_stale(bool *retry)
/* remove stale items after zk_timeout have passed
* since a new node is added to the cluster
*/
- if (arcus_memcached_scrub_stale() != 0) {
+ if (arcus_memcached_scrub_stale() == 0) {
+ sm_info.node_added_time = 0;
+ } else {
arcus_conf.logger->log(EXTENSION_LOG_WARNING, NULL,
"Failed to scrub stale data.\n");
+ *retry = true; /* Do retry */
}
- sm_info.node_added_time = 0;
} else {
*retry = true; /* Do retry */
}
|
Fix include UART names | @@ -44,15 +44,15 @@ struct hal_uart_irq {
volatile uint32_t ui_cnt;
};
-#if defined(USART8_BASE)
+#if defined(UART8_BASE)
static struct hal_uart_irq uart_irqs[8];
-#elif defined(USART7_BASE)
+#elif defined(UART7_BASE)
static struct hal_uart_irq uart_irqs[7];
#elif defined(USART6_BASE)
static struct hal_uart_irq uart_irqs[6];
-#elif defined(USART5_BASE)
+#elif defined(UART5_BASE)
static struct hal_uart_irq uart_irqs[5];
-#elif defined(USART4_BASE)
+#elif defined(UART4_BASE)
static struct hal_uart_irq uart_irqs[4];
#else
static struct hal_uart_irq uart_irqs[3];
@@ -224,7 +224,7 @@ uart_irq3(void)
}
#endif
-#ifdef USART4_BASE
+#ifdef UART4_BASE
static void
uart_irq4(void)
{
@@ -232,7 +232,7 @@ uart_irq4(void)
}
#endif
-#ifdef USART5_BASE
+#ifdef UART5_BASE
static void
uart_irq5(void)
{
@@ -248,7 +248,7 @@ uart_irq6(void)
}
#endif
-#ifdef USART7_BASE
+#ifdef UART7_BASE
static void
uart_irq7(void)
{
@@ -256,7 +256,7 @@ uart_irq7(void)
}
#endif
-#ifdef USART8_BASE
+#ifdef UART8_BASE
static void
uart_irq8(void)
{
@@ -285,13 +285,13 @@ hal_uart_set_nvic(IRQn_Type irqn, struct hal_uart *uart)
ui = &uart_irqs[2];
break;
#endif
-#ifdef USART4_BASE
+#ifdef UART4_BASE
case UART4_IRQn:
isr = (uint32_t)&uart_irq4;
ui = &uart_irqs[3];
break;
#endif
-#ifdef USART5_BASE
+#ifdef UART5_BASE
case UART5_IRQn:
isr = (uint32_t)&uart_irq5;
ui = &uart_irqs[4];
@@ -303,13 +303,13 @@ hal_uart_set_nvic(IRQn_Type irqn, struct hal_uart *uart)
ui = &uart_irqs[5];
break;
#endif
-#ifdef USART7_BASE
+#ifdef UART7_BASE
case UART7_IRQn:
isr = (uint32_t)&uart_irq7;
ui = &uart_irqs[6];
break;
#endif
-#ifdef USART8_BASE
+#ifdef UART8_BASE
case UART8_IRQn:
isr = (uint32_t)&uart_irq8;
ui = &uart_irqs[7];
@@ -319,11 +319,7 @@ hal_uart_set_nvic(IRQn_Type irqn, struct hal_uart *uart)
assert(0);
break;
}
-/*
- XXX need somehow to detect where these exist or not
- case UART4_IRQn:
- case UART5_IRQn:
-*/
+
if (ui) {
ui->ui_uart = uart;
|
Match Check: Save test data below `/tests` | @@ -27,17 +27,17 @@ Keynames are all either relative to to-be-tested key (starting with `./` or `../
Full example:
```sh
-# Backup-and-Restore:/examples/mathcheck
+# Backup-and-Restore:/tests/mathcheck
-sudo kdb mount mathcheck.dump /examples/mathcheck mathcheck
+sudo kdb mount mathcheck.dump /tests/mathcheck mathcheck
-kdb set /examples/mathcheck/a 3.1
-kdb set /examples/mathcheck/b 4.5
-kdb set /examples/mathcheck/k 7.6
-kdb setmeta user/examples/mathcheck/k check/math "== + ../a ../b"
+kdb set /tests/mathcheck/a 3.1
+kdb set /tests/mathcheck/b 4.5
+kdb set /tests/mathcheck/k 7.6
+kdb setmeta user/tests/mathcheck/k check/math "== + ../a ../b"
# should fail
-kdb set /examples/mathcheck/k 7.7
+kdb set /tests/mathcheck/k 7.7
# RET:5
# ERROR:123
# Set string to "7.7"
@@ -48,37 +48,37 @@ kdb set /examples/mathcheck/k 7.7
# Module: mathcheck
# At: /home/thomas/Dev/Elektra/libelektra/src/plugins/mathcheck/mathcheck.c:399
# Reason: 7.7 != 7.6
-# Mountpoint: /examples/mathcheck
+# Mountpoint: /tests/mathcheck
# Configfile: /home/thomas/.config/mathcheck.dump.25680:1478749409.938013.tmp
```
To calculate values on-demand you can use:
```sh
-kdb setmeta user/examples/mathcheck/k check/math ":= + @/a @/b"
-kdb set /examples/mathcheck/a 8.0
-kdb set /examples/mathcheck/b 4.5
+kdb setmeta user/tests/mathcheck/k check/math ":= + @/a @/b"
+kdb set /tests/mathcheck/a 8.0
+kdb set /tests/mathcheck/b 4.5
-kdb get /examples/mathcheck/k
+kdb get /tests/mathcheck/k
#> 12.5
-kdb set /examples/mathcheck/a 5.5
+kdb set /tests/mathcheck/a 5.5
-kdb get /examples/mathcheck/k
+kdb get /tests/mathcheck/k
#> 10
```
It also works with constants:
```sh
-kdb setmeta user/examples/mathcheck/k check/math ":= + ../a '5'"
-kdb set /examples/mathcheck/a 5.5
+kdb setmeta user/tests/mathcheck/k check/math ":= + ../a '5'"
+kdb set /tests/mathcheck/a 5.5
-kdb get /examples/mathcheck/k
+kdb get /tests/mathcheck/k
#> 10.5
-kdb set /examples/mathcheck/a 8.0
+kdb set /tests/mathcheck/a 8.0
-kdb get /examples/mathcheck/k
+kdb get /tests/mathcheck/k
#> 13
#cleanup
-kdb rm -r /examples/mathcheck
-sudo kdb umount /examples/mathcheck
+kdb rm -r /tests/mathcheck
+sudo kdb umount /tests/mathcheck
```
|
chore(file_explorer): use the correct example path | Simple File Explorer
"""""""""""""""""""""""""
-.. lv_example:: others/ime/lv_example_file_explorer_1
+.. lv_example:: others/file_explorer/lv_example_file_explorer_1
:language: c
Control File Explorer
"""""""""""""""""""""""""
-.. lv_example:: others/ime/lv_example_file_explorer_2
+.. lv_example:: others/file_explorer/lv_example_file_explorer_2
:language: c
Custom sort
"""""""""""""""""""""""""
-.. lv_example:: others/ime/lv_example_file_explorer_3
+.. lv_example:: others/file_explorer/lv_example_file_explorer_3
:language: c
|
Update size for base64 buffer | @@ -13,7 +13,7 @@ static Value encode(VM *vm, int argCount, Value *args) {
ObjString *string = AS_STRING(args[0]);
- int size = b64e_size(string->length + 1);
+ int size = b64e_size(string->length) + 1;
char *buffer = ALLOCATE(vm, char, size);
int actualSize = b64_encode((unsigned char*)string->chars, string->length, (unsigned char*)buffer);
@@ -37,7 +37,7 @@ static Value decode(VM *vm, int argCount, Value *args) {
ObjString *encodedString = AS_STRING(args[0]);
- int size = b64d_size(encodedString->length + 1);
+ int size = b64d_size(encodedString->length) + 1;
char *buffer = ALLOCATE(vm, char, size);
int actualSize = b64_decode((unsigned char*)encodedString->chars, encodedString->length, (unsigned char*)buffer);
|
hdata/memory: ignore homer and occ reserved ranges
We populate these from the HOMER BARs in the PBA directly. There's no
need to take the hostboot supplied values so just ignore the
corresponding reserved ranges. | @@ -457,6 +457,12 @@ static void get_hb_reserved_mem(struct HDIF_common_hdr *ms_vpd)
if (label_size > 64)
label_size = 64;
+ /* these are broken, just ignore them */
+ if (!strncmp(hb_resv_mem->label, "ibm,homer-image", label_size))
+ continue;
+ if (!strncmp(hb_resv_mem->label, "ibm,occ-common-area", label_size))
+ continue;
+
label = malloc(label_size+1);
assert(label);
|
Avoid nxt_port_mmap_header_t redefinition warning. | #include <nxt_main.h>
#include <nxt_port_memory_int.h>
-typedef struct nxt_port_mmap_header_s nxt_port_mmap_header_t;
-
#ifndef _NXT_GO_PROCESS_T_DEFINED_
#define _NXT_GO_PROCESS_T_DEFINED_
typedef struct nxt_go_process_s nxt_go_process_t;
#endif
-nxt_port_mmap_header_t *
+struct nxt_port_mmap_header_s *
nxt_go_port_mmap_get(nxt_go_process_t *process, nxt_port_id_t port_id,
nxt_chunk_id_t *c);
|
py/objenumerate: Check for valid args in enumerate constructor.
For the case where MICROPY_CPYTHON_COMPAT is disabled. This fix makes
basics/fun_error2.py pass and not crash the interpreter. | @@ -59,7 +59,7 @@ STATIC mp_obj_t enumerate_make_new(const mp_obj_type_t *type, size_t n_args, siz
o->iter = mp_getiter(arg_vals.iterable.u_obj, NULL);
o->cur = arg_vals.start.u_int;
#else
- (void)n_kw;
+ mp_arg_check_num(n_args, n_kw, 1, 2, false);
mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t);
o->base.type = type;
o->iter = mp_getiter(args[0], NULL);
|
ACRN:DM:VGPU: Fix the incorrect use after free
It still tries to access the gpu->vdpy_handel after the gpu
is free. This is incorrect.
Acked-by: Wang Yu | @@ -1680,12 +1680,13 @@ virtio_gpu_deinit(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
}
}
+ vdpy_deinit(gpu->vdpy_handle);
+
if (gpu) {
pthread_mutex_destroy(&gpu->mtx);
free(gpu);
}
virtio_gpu_device_cnt--;
- vdpy_deinit(gpu->vdpy_handle);
}
uint64_t
|
highlevel: fix error handling | @@ -205,7 +205,14 @@ void elektraSaveKey (Elektra * elektra, Key * key, ElektraError ** error)
if (ret == -1)
{
ElektraError * kdbSetError = elektraErrorCreateFromKey (elektra->parentKey);
- if (elektraErrorCode (kdbSetError) != 30) // ELEKTRA_ERROR_CONFLICT = 30
+ if (elektraErrorCode (kdbSetError) != ELEKTRA_ERROR_CODE_LOW_LEVEL)
+ {
+ *error = kdbSetError;
+ return;
+ }
+
+ ElektraKDBError * kdbError = elektraErrorLowLevelError (kdbSetError);
+ if (elektraKDBErrorCode (kdbError) != 30) // ELEKTRA_ERROR_CONFLICT = 30
{
*error = kdbSetError;
return;
|
don't allocate more than PTRDIFF_MAX on aligned allocations | @@ -19,7 +19,7 @@ static void* mi_heap_malloc_zero_aligned_at(mi_heap_t* heap, size_t size, size_t
// the address at offset is aligned regardless of the allocated size.
mi_assert(alignment > 0 && alignment % sizeof(uintptr_t) == 0);
if (alignment <= sizeof(uintptr_t)) return _mi_heap_malloc_zero(heap,size,zero);
- if (size >= (SIZE_MAX - alignment)) return NULL; // overflow
+ if (mi_unlikely(size > PTRDIFF_MAX)) return NULL; // we don't allocate more than PTRDIFF_MAX (see <https://sourceware.org/ml/libc-announce/2019/msg00001.html>)
// try if there is a current small block with just the right alignment
if (size <= MI_SMALL_SIZE_MAX) {
|
.travis.yml: esp32: Use Pycopy fork of mbedtls.
Also, for debugging, dump mbedtls git revs. | @@ -332,7 +332,10 @@ jobs:
script:
- make ${MAKEOPTS} -C mpy-cross
- git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V3 :=" ports/esp32/Makefile | cut -d " " -f 3)
- - git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2 components/nimble components/bt
+ - git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/micro-ecc/micro-ecc components/nghttp/nghttp2 components/nimble components/bt
+ - (cd esp-idf/components/mbedtls/; rm -rf mbedtls; git clone -b mbedtls-2.16.5-idf-pycopy https://github.com/pfalcon/mbedtls/)
+# - git -C esp-idf log -n1 components/mbedtls/mbedtls
+ - (cd esp-idf/components/mbedtls/mbedtls; git log -n1)
- make ${MAKEOPTS} -C ports/esp32 submodules
- make ${MAKEOPTS} -C ports/esp32
@@ -349,7 +352,10 @@ jobs:
script:
- make ${MAKEOPTS} -C mpy-cross
- git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V4 :=" ports/esp32/Makefile | cut -d " " -f 3)
- - git -C esp-idf submodule update --init components/bt/controller/lib components/bt/host/nimble/nimble components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls
+ - git -C esp-idf submodule update --init components/bt/controller/lib components/bt/host/nimble/nimble components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip
+ - (cd esp-idf/components/mbedtls/; rm -rf mbedtls; git clone -b mbedtls-2.16.5-idf-pycopy https://github.com/pfalcon/mbedtls/)
+# - git -C esp-idf log -n1 components/mbedtls/mbedtls
+ - (cd esp-idf/components/mbedtls/mbedtls; git log -n1)
- make ${MAKEOPTS} -C ports/esp32 submodules
- make ${MAKEOPTS} -C ports/esp32
|
Create rules from bindings only for supported devices | @@ -1056,6 +1056,11 @@ void DeRestPluginPrivate::bindingToRuleTimerFired()
for (; i != end; ++i)
{
+ if (!i->modelId().startsWith(QLatin1String("FLS-NB")))
+ {
+ continue;
+ }
+
if (bnd.srcAddress == i->address().ext())
{
if (bnd.srcEndpoint == i->fingerPrint().endpoint)
|
examples/term: use different fd for read/write, exclude more characters | #define ARRAYSIZE(x) (sizeof(x) / sizeof(*x))
-static int fd_tty;
+static int fd_tty_write;
+static int fd_tty_read;
static int fd_log;
int LLVMFuzzerInitialize(int* argc, char*** argv)
{
- fd_tty = open("/dev/tty", O_RDWR | O_NONBLOCK);
- if (fd_tty == -1) {
- perror("open('/dev/tty')");
+ fd_tty_write = open("/dev/tty", O_RDWR | O_DSYNC);
+ if (fd_tty_write == -1) {
+ perror("open('/dev/tty'), O_RDWR | O_DSYNC");
+ exit(EXIT_FAILURE);
+ }
+ fd_tty_read = open("/dev/tty", O_RDWR | O_NONBLOCK);
+ if (fd_tty_read == -1) {
+ perror("open('/dev/tty'), O_RDWR | O_NONBLOCK");
exit(EXIT_FAILURE);
}
fd_log = open("./term.log", O_WRONLY | O_CREAT | O_APPEND, 0644);
@@ -30,6 +36,7 @@ int LLVMFuzzerInitialize(int* argc, char*** argv)
perror("open('./term.log')");
exit(EXIT_FAILURE);
}
+ setsid();
return 0;
}
@@ -57,6 +64,9 @@ static bool isInteresting(const char* s, size_t len)
if (s[i] == '\0') {
continue;
}
+ if (s[i] == '\x1b') {
+ continue;
+ }
if (isdigit(s[i])) {
continue;
}
@@ -67,10 +77,10 @@ static bool isInteresting(const char* s, size_t len)
int LLVMFuzzerTestOneInput(uint8_t* buf, size_t len)
{
- write(fd_tty, buf, len);
+ write(fd_tty_write, buf, len);
char read_buf[1024 * 1024];
- ssize_t sz = read(fd_tty, read_buf, sizeof(read_buf));
+ ssize_t sz = read(fd_tty_read, read_buf, sizeof(read_buf));
if (sz > 0 && isInteresting(read_buf, sz)) {
static const char msg_in[] = "\n============ IN ============\n";
|
tramp: add state to wait for serial to be ready | @@ -20,6 +20,7 @@ typedef enum {
PARSER_READ_MAGIC,
PARSER_READ_PAYLOAD,
PARSER_READ_CRC,
+ PRASER_WAIT_FOR_READY
} tramp_parser_state_t;
tramp_settings_t tramp_settings;
@@ -163,8 +164,8 @@ vtx_update_result_t serial_tramp_update() {
parser_state = PARSER_READ_MAGIC;
return VTX_WAIT;
} else {
- parser_state = PARSER_IDLE;
- return VTX_SUCCESS;
+ parser_state = PRASER_WAIT_FOR_READY;
+ return VTX_WAIT;
}
}
case PARSER_READ_MAGIC: {
@@ -218,9 +219,16 @@ vtx_update_result_t serial_tramp_update() {
return VTX_ERROR;
}
+ parser_state = PRASER_WAIT_FOR_READY;
+ return VTX_WAIT;
+ }
+ case PRASER_WAIT_FOR_READY: {
+ if (vtx_transfer_done == 1) {
parser_state = PARSER_IDLE;
return VTX_SUCCESS;
}
+ return VTX_WAIT;
+ }
}
return VTX_ERROR;
|
add bootsrap updater to post | @@ -167,12 +167,24 @@ systemctl restart httpd.service >/dev/null 2>&1 || :
systemctl enable tftp-server.socket >/dev/null 2>&1 || :
systemctl restart tftp-server.socket >/dev/null 2>&1 || :
+if [ ! -d %{_localstatedir}/warewulf/bootstrap ];then
+bootstraps=`wwsh bootstrap list | tail -n +2 | awk '{print $1}'`
+
+for boot in $bootstraps; do
+ echo "Updating bootstrap image: $boot"
+ wwsh bootstrap export ${boot} /tmp/.exported_bootstrap
+ wwsh -y bootstrap import /tmp/.exported_bootstrap --name ${boot}
+ rm -f /tmp/.exported_bootstrap
+done
+fi
+
mkdir -p %{_localstatedir}/warewulf/ipxe %{_localstatedir}/warewulf/bootstrap 2>/dev/null || :
semanage fcontext -a -t httpd_sys_content_t '%{_localstatedir}/warewulf/ipxe(/.*)?' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_content_t '%{_localstatedir}/warewulf/bootstrap(/.*)?' 2>/dev/null || :
restorecon -R %{_localstatedir}/warewulf/bootstrap || :
restorecon -R %{_localstatedir}/warewulf/ipxe || :
+
%postun -n %{pname}-server%{PROJ_DELIM}
if [ $1 -eq 0 ] ; then
semanage fcontext -d -t httpd_sys_content_t '%{_localstatedir}/warewulf/ipxe(/.*)?' 2>/dev/null || :
|
Moving notify check after the no time check
CLA: trivial | @@ -1018,14 +1018,14 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)
time_t *ptime;
int i;
- if (notify)
- ctx->current_crl = crl;
if ((ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME) != 0)
ptime = &ctx->param->check_time;
else if ((ctx->param->flags & X509_V_FLAG_NO_CHECK_TIME) != 0)
return 1;
else
ptime = NULL;
+ if (notify)
+ ctx->current_crl = crl;
i = X509_cmp_time(X509_CRL_get0_lastUpdate(crl), ptime);
if (i == 0) {
|
HW: Adding TODO for master access | @@ -503,7 +503,7 @@ BEGIN
mmio_read_ack_q0 <= '1';
mmio_master_read_q0 <= mmio_read_master_access_q;
- CASE to_integer(unsigned(ha_mm_r_q.ad(13 DOWNTO 5))) IS
+ CASE to_integer(unsigned(ha_mm_r_q.ad(13 DOWNTO 5))) IS -- TODO: master access with bits 22:14 not zero?
-- for DEBUG (TODO: remove)
--
-- AFU DEBUG REGISTER READ
@@ -542,8 +542,12 @@ BEGIN
IF mmio_read_reg_offset_q = SNAP_CTX_ID_REG THEN
mmio_read_data_q0 <= (OTHERS => '0');
mmio_read_data_q0(SNAP_CTX_MASTER_BIT) <= mmio_read_master_access_q;
+ IF mmio_read_master_access_q = '0' THEN
mmio_read_data_q0(SNAP_CTX_ID_L DOWNTO SNAP_CTX_ID_R) <= context_config_mmio_addr;
mmio_read_datapar_q0 <= parity_gen_odd(context_config_mmio_addr) XOR mmio_read_master_access_q;
+ ELSE
+ mmio_read_datapar_q0 <= '0';
+ END IF;
ELSE
-- invalid address
non_fatal_master_rd_errors_q(NFE_INV_RD_ADDRESS) <= mmio_read_master_access_q;
@@ -769,7 +773,8 @@ BEGIN
-- valid write request that is not targeting the action
--
IF (mmio_write_access_q AND NOT mmio_action_access_q) = '1' THEN
- CASE to_integer(unsigned(ha_mm_w_q.ad(13 DOWNTO 5))) IS
+
+ CASE to_integer(unsigned(ha_mm_w_q.ad(13 DOWNTO 5))) IS -- TODO: master access with bits 22:14 not zero?
-- --
-- -- AFU FIR REGISTER WRITE (Reset on One)
-- --
|
microphone: less throwy, more MAX()y | @@ -46,13 +46,12 @@ SoundData* lovrMicrophoneGetData(Microphone* microphone, size_t samples) {
return NULL;
}
- size_t maxSamples = lovrMicrophoneGetSampleCount(microphone);
- if (maxSamples == 0) {
+ size_t availableSamples = lovrMicrophoneGetSampleCount(microphone);
+ if (availableSamples == 0) {
return NULL;
}
- lovrAssert(samples <= maxSamples, "Requested more audio data than is buffered by the microphone");
- if (samples == 0) {
- samples = maxSamples;
+ if (samples == 0 || samples > availableSamples) {
+ samples = availableSamples;
}
SoundData* soundData = lovrSoundDataCreate(samples, microphone->sampleRate, microphone->bitDepth, microphone->channelCount);
|
rms/pbspro: remove ref to patches that are not being applied | @@ -31,8 +31,6 @@ Name: %{pbs_name}%{PROJ_DELIM}
Version: %{pbs_version}
Release: %{pbs_release}
Source0: https://github.com/PBSPro/pbspro/releases/download/v%{version}/%{pbs_name}-%{version}.tar.gz
-Patch1: systemd.patch
-Patch2: pbs.null.patch
License: AGPLv3 with exceptions
URL: https://github.com/PBSPro/pbspro
Prefix: %{pbs_prefix}
|
Place NaN and Infinity ins Strings (promise validity) | @@ -244,12 +244,12 @@ re_rooted:
break;
case FIOBJ_T_FLOAT:
if (isnan(obj2float(obj)->f))
- fiobj_str_write(data->buffer, "NaN", 3);
+ fiobj_str_write(data->buffer, "\"NaN\"", 5);
else if (isinf(obj2float(obj)->f)) {
if (obj2float(obj)->f > 0)
- fiobj_str_write(data->buffer, "Infinity", 8);
+ fiobj_str_write(data->buffer, "\"Infinity\"", 10);
else
- fiobj_str_write(data->buffer, "-Infinity", 9);
+ fiobj_str_write(data->buffer, "\"-Infinity\"", 11);
} else {
char *start = obj2str(data->buffer)->str + obj2str(data->buffer)->len;
fiobj_str_write2(data->buffer, "%g", obj2float(obj)->f);
|
Update arm_offset_q31.c
It seems that there is __QADD instruction in all cases. Can we just use __QADD here, like you did in arm_add_q31.c . | @@ -114,29 +114,13 @@ void arm_offset_q31(
/* C = A + offset */
/* Add offset and store result in destination buffer. */
-#if defined (ARM_MATH_DSP)
*pDst++ = __QADD(*pSrc++, offset);
-#else
- *pDst++ = (q31_t) clip_q63_to_q31((q63_t) * pSrc++ + offset);
-#endif
-#if defined (ARM_MATH_DSP)
*pDst++ = __QADD(*pSrc++, offset);
-#else
- *pDst++ = (q31_t) clip_q63_to_q31((q63_t) * pSrc++ + offset);
-#endif
-#if defined (ARM_MATH_DSP)
*pDst++ = __QADD(*pSrc++, offset);
-#else
- *pDst++ = (q31_t) clip_q63_to_q31((q63_t) * pSrc++ + offset);
-#endif
-#if defined (ARM_MATH_DSP)
*pDst++ = __QADD(*pSrc++, offset);
-#else
- *pDst++ = (q31_t) clip_q63_to_q31((q63_t) * pSrc++ + offset);
-#endif
/* Decrement loop counter */
blkCnt--;
|
Fix SVACE defect in IoT.js (fs.scandir) | @@ -407,6 +407,12 @@ static ssize_t uv__fs_scandir(uv_fs_t* req) {
cnt++;
}
+ if (cnt > 0 && dents == NULL) {
+ closedir(dir);
+ cnt = -1;
+ goto error;
+ }
+
/* Allcoate memory for the directory entries. */
dents = (uv__dirent_t**) malloc(sizeof (uv__dirent_t*) * cnt);
|
docs: remove duplicate step in WW to add overlay drivers (closses | @@ -22,9 +22,6 @@ of the bootstrap image based on the running kernel.
[sms](*\#*) export WW_CONF=/etc/warewulf/bootstrap.conf
[sms](*\#*) echo "drivers += updates/kernel/" >> $WW_CONF
-# (Optional) Include overlayfs drivers; needed by Singularity
-[sms](*\#*) echo "drivers += overlay" >> $WW_CONF
-
# Build bootstrap image
[sms](*\#*) wwbootstrap `uname -r`
\end{lstlisting}
|
core: define SSIZE_MAX if not available | #include <inttypes.h>
#include <sys/types.h>
+#ifndef SSIZE_MAX
+#ifdef _POSIX_SSIZE_MAX
+#define SSIZE_MAX _POSIX_SSIZE_MAX
+#else
+#define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2U))
+#endif
+#endif
+
/**KDB_MAX_PATH_LENGTH will be the value for longest
* possible filenames on the system.*/
|
ReadWebP: fix for big-endian | //
// WebP decode.
+#ifdef HAVE_CONFIG_H
+#include "webp/config.h"
+#endif
+
#include "./webpdec.h"
#include <stdio.h>
@@ -150,7 +154,11 @@ int ReadWebP(const uint8_t* const data, size_t data_size,
break;
}
if (pic->use_argb) {
+#ifdef WORDS_BIGENDIAN
+ output_buffer->colorspace = MODE_ARGB;
+#else
output_buffer->colorspace = MODE_BGRA;
+#endif
output_buffer->u.RGBA.rgba = (uint8_t*)pic->argb;
output_buffer->u.RGBA.stride = pic->argb_stride * sizeof(uint32_t);
output_buffer->u.RGBA.size = output_buffer->u.RGBA.stride * pic->height;
|
vector indicies walk in reverse | @@ -191,6 +191,10 @@ for (var = vec_end (vec) - 1; var >= (vec); var--)
/** \brief Iterate over vector indices. */
#define vec_foreach_index(var,v) for ((var) = 0; (var) < vec_len (v); (var)++)
+/** \brief Iterate over vector indices (reverse). */
+#define vec_foreach_index_backwards(var,v) \
+ for ((var) = vec_len((v)) - 1; (var) >= 0; (var)--)
+
#endif /* included_clib_vec_bootstrap_h */
/*
|
doc: shell recorder TESTING | ## Introduction
Libraries need a pervasive testing for continuous improvement. Any
-problem found and behaviour described must be written down as test and
-integrated so that after running all tests in the build directory:
+problem found and behaviour described must be written down as test
+so that it is assured that no new regressions will be added.
+
+
+## Running Tests
+
+Running all tests in the build directory:
make run_all
@@ -12,12 +17,13 @@ And on the target (installed) system:
kdb run_all
-It is assured that no new regressions were added.
To run memcheck tests run in the build directory:
make run_memcheck
They are supplementary, ideally you run all three.
+
+Some tests write into system paths.
To avoid running tests that write to the disc you
can use:
@@ -26,7 +32,6 @@ can use:
Directly running `ctest` might cause problems:
You need to set `LD_LIBRARY_PATH` as `run_all` and `run_nokdbtests` do.
-Some tests write into system paths.
If the access is denied, several tests will fail.
You have some options to avoid running them as root:
@@ -61,6 +66,7 @@ You have some options to avoid running them as root:
- should only write below
- `/tests/<testname>` (e.g. `/tests/ruby`) and
- `system/elektra` (e.g. for mounts or globalplugins).
+ - clean up everything they change (in KDB and temporary files)
- If your test has memleaks, e.g. because the library used leaks and
that cannot be fixed, give them the label memleak with following
command:
@@ -119,7 +125,7 @@ According to `src/libs/elektra/libelektra-symbols.map`, all functions starting w
* ks
get exported. Functions not starting with this prefix are internal only and therefore
-not visible in the test cases. Test internal functionality by including the corresponding c file.
+not visible in the test cases. Test internal functionality by including the corresponding C file.
### Module Tests
@@ -127,24 +133,36 @@ The modules, which are typically used as plugins in Elektra (but can
also be available statically or in the `-full` variant), should have their
own tests.
-Use the Cmake macro `add_plugintest` for adding these tests.
+Use the CMake macro `add_plugintest` for adding these tests.
### C++ Unit Tests
-C++ Unit tests are done using the gtest framework. See [architectural decision](/doc/decisions/unit_testing.md).
+C++ Unit tests are done using the gtest framework.
+See [architectural decision](/doc/decisions/unit_testing.md).
Use the CMake macro `add_gtest` for adding these tests.
### Script Tests
-Script test are done using POSIX shell + CMake. See [architectural decision](/doc/decisions/script_testing.md).
+Test which need scripts are done using shell recorder or directly with POSIX shell commands.
+See [architectural decision](/doc/decisions/script_testing.md).
The script tests have different purposes:
-- End to End tests (usage of tools as a user would do)
-- External Compilation tests (compile and run programs as a user would do)
+
+- End to End tests (usage of tools as an end user would do)
+- External compilation tests (compile and run programs as a user would do)
- Conventions tests (do internal checks that check for common problems)
- Meta Test Suites (run other test suites)
+See [here](tests/shell).
+
+### Shell Recorder
+
+The more elegant way to specify script tests are via the so called shell recorder
+using Markdown Syntax.
+
+See [here](tests/shell/shell_recorder/tutorial_wrapper/README.md).
+
### Fuzz Testing
Copy some import files to testcase_dir and run:
|
Update key usage determination for exercise key tests | @@ -923,14 +923,20 @@ psa_key_usage_t mbedtls_test_psa_usage_to_exercise( psa_key_type_t type,
psa_algorithm_t alg )
{
if( PSA_ALG_IS_MAC( alg ) || PSA_ALG_IS_SIGN( alg ) )
+ {
+ if( PSA_ALG_IS_HASH_AND_SIGN( alg ) )
{
if( PSA_ALG_SIGN_GET_HASH( alg ) )
return( PSA_KEY_TYPE_IS_PUBLIC_KEY( type ) ?
PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:
PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_VERIFY_HASH |
PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_MESSAGE );
+ }
+ else if( PSA_ALG_IS_SIGN_MESSAGE( alg) )
+ return( PSA_KEY_TYPE_IS_PUBLIC_KEY( type ) ?
+ PSA_KEY_USAGE_VERIFY_MESSAGE :
+ PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_MESSAGE );
- else
return( PSA_KEY_TYPE_IS_PUBLIC_KEY( type ) ?
PSA_KEY_USAGE_VERIFY_HASH :
PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_VERIFY_HASH );
|
Add test from "Fix re-signing certificates with different key sizes"
Tests for and | @@ -16,7 +16,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
setup("test_x509");
-plan tests => 21;
+plan tests => 28;
# Prevent MSys2 filename munging for arguments that look like file paths but
# aren't
@@ -146,3 +146,58 @@ ok(run(app(["openssl", "x509", "-noout", "-dates", "-dateopt", "iso_8601",
ok(!run(app(["openssl", "x509", "-noout", "-dates", "-dateopt", "invalid_format",
"-in", srctop_file("test/certs", "ca-cert.pem")])),
"Run with invalid -dateopt format");
+
+# extracts issuer from a -text formatted-output
+sub get_issuer {
+ my $f = shift(@_);
+ my $issuer = "";
+ open my $fh, $f or die;
+ while (my $line = <$fh>) {
+ if ($line =~ /Issuer:/) {
+ $issuer = $line;
+ }
+ }
+ close $fh;
+ return $issuer;
+}
+
+# Tests for signing certs (broken in 1.1.1o)
+my $a_key = "a-key.pem";
+my $a_cert = "a-cert.pem";
+my $a2_cert = "a2-cert.pem";
+my $ca_key = "ca-key.pem";
+my $ca_cert = "ca-cert.pem";
+my $cnf = srctop_file('apps', 'openssl.cnf');
+
+# Create cert A
+ok(run(app(["openssl", "req", "-x509", "-newkey", "rsa:2048",
+ "-config", $cnf,
+ "-keyout", $a_key, "-out", $a_cert, "-days", "365",
+ "-nodes", "-subj", "/CN=test.example.com"])));
+# Create cert CA - note key size
+ok(run(app(["openssl", "req", "-x509", "-newkey", "rsa:4096",
+ "-config", $cnf,
+ "-keyout", $ca_key, "-out", $ca_cert, "-days", "3650",
+ "-nodes", "-subj", "/CN=ca.example.com"])));
+# Sign cert A with CA (errors on 1.1.1o)
+ok(run(app(["openssl", "x509", "-in", $a_cert, "-CA", $ca_cert,
+ "-CAkey", $ca_key, "-set_serial", "1234567890",
+ "-preserve_dates", "-sha256", "-text", "-out", $a2_cert])));
+# verify issuer is CA
+ok (get_issuer($a2_cert) =~ /CN=ca.example.com/);
+
+# Tests for issue #16080 (fixed in 1.1.1o)
+my $b_key = "b-key.pem";
+my $b_csr = "b-cert.csr";
+my $b_cert = "b-cert.pem";
+# Create the CSR
+ok(run(app(["openssl", "req", "-new", "-newkey", "rsa:4096",
+ "-keyout", $b_key, "-out", $b_csr, "-nodes",
+ "-config", $cnf,
+ "-subj", "/CN=b.example.com"])));
+# Sign it - position of "-text" matters!
+ok(run(app(["openssl", "x509", "-req", "-text", "-CAcreateserial",
+ "-CA", $ca_cert, "-CAkey", $ca_key,
+ "-in", $b_csr, "-out", $b_cert])));
+# Verify issuer is CA
+ok(get_issuer($b_cert) =~ /CN=ca.example.com/);
|
extmod/modbuiltins/Control: add limit get/set | @@ -35,11 +35,30 @@ STATIC mp_obj_t builtins_Control_limits(size_t n_args, const mp_obj_t *pos_args,
PB_PARSE_ARGS_METHOD(n_args, pos_args, kw_args,
builtins_Control_obj_t, self,
- PB_ARG_REQUIRED(test)
+ PB_ARG_DEFAULT_NONE(speed),
+ PB_ARG_DEFAULT_NONE(acceleration),
+ PB_ARG_DEFAULT_NONE(actuation)
);
- (void) self;
- (void) test;
+ // Read current values
+ int32_t _speed, _acceleration, _actuation;
+ pbio_control_settings_get_limits(&self->control->settings, &_speed, &_acceleration, &_actuation);
+
+ // If all given values are none, return current values
+ if (speed == mp_const_none && acceleration == mp_const_none && actuation == mp_const_none) {
+ mp_obj_t ret[3];
+ ret[0] = mp_obj_new_int(_speed);
+ ret[1] = mp_obj_new_int(_acceleration);
+ ret[2] = mp_obj_new_int(_actuation);
+ return mp_obj_new_tuple(3, ret);
+ }
+
+ // Set user settings
+ _speed = pb_obj_get_default_int(speed, _speed);
+ _acceleration = pb_obj_get_default_int(acceleration, _acceleration);
+ _actuation = pb_obj_get_default_int(actuation, _actuation);
+
+ pbio_control_settings_set_limits(&self->control->settings, _speed, _acceleration, _actuation);
return mp_const_none;
}
|
Fix setjmp/longjmp implementation for thumb mode (i.e.: tiva, which is Cortex M3, based on armv7-m architecture).
Compiles for armv7-a/r in both arm and thumb modes and for armv7-m. | @@ -151,12 +151,19 @@ longjmp:
ldr r14, [r0, #((_JB_REG_R14 - _JB_REG_R4) * 4)]
#endif
+#ifndef __thumb__
/* Validate sp and r14 */
teq sp, #0
it ne
teqne r14, #0
it eq
beq botch
+#else
+ cmp sp, #0
+ beq botch
+ cmp lr, #0
+ beq botch
+#endif
/* Set return value */
movs r0, r1
|
fill errBuffer to avoid junk | @@ -1010,9 +1010,6 @@ static JANET_CFUN(janet_fset)
static void reportError(tic_core* core, Janet result)
{
janet_stacktrace(GameFiber, result);
- /* printf("\n\n"); */
- /* printf(errBuffer.data); */
- /* printf("\n\n"); */
core->data->error(core->data->data, errBuffer.data);
}
@@ -1048,7 +1045,7 @@ static bool initJanet(tic_mem* tic, const char* code)
core->currentVM = (JanetTable*)janet_core_env(NULL);
// override the dynamic err to a buffer, so that we can get errors later
- janet_buffer_init(&errBuffer, 0);
+ janet_buffer_init(&errBuffer, 1024);
janet_setdyn("err", janet_wrap_buffer(&errBuffer));
GameFiber = janet_current_fiber();
|
tm: Only varargs is relevant when looking up a type. | @@ -93,8 +93,9 @@ static lily_type *lookup_type(lily_type *input_type)
while (iter_type) {
if (iter_type->subtype_count == input_type->subtype_count &&
- (iter_type->flags & ~BUBBLE_FLAGS) ==
- (input_type->flags & ~BUBBLE_FLAGS)) {
+ /* All other type-based flags are irrelevant to equality. */
+ (iter_type->flags & TYPE_IS_VARARGS) ==
+ (input_type->flags & TYPE_IS_VARARGS)) {
int i, match = 1;
for (i = 0;i < iter_type->subtype_count;i++) {
if (iter_type->subtypes[i] != input_type->subtypes[i]) {
|
derive_output test: fix output key bit length | @@ -7109,10 +7109,6 @@ void derive_output( int alg_arg,
if( derive_type == 1 ) // output key
{
psa_status_t expected_status = PSA_ERROR_NOT_PERMITTED;
- size_t bits = 48; // default for Mix-PSK-to-MS
-
- if( PSA_ALG_IS_HKDF_EXTRACT( alg ) || PSA_ALG_IS_HKDF_EXPAND( alg ))
- bits = PSA_HASH_LENGTH( alg );
/* For output key derivation secret must be provided using
input key, otherwise operation is not permitted. */
@@ -7122,7 +7118,7 @@ void derive_output( int alg_arg,
psa_set_key_usage_flags( &attributes4, PSA_KEY_USAGE_EXPORT );
psa_set_key_algorithm( &attributes4, alg );
psa_set_key_type( &attributes4, PSA_KEY_TYPE_DERIVE );
- psa_set_key_bits( &attributes4, bits );
+ psa_set_key_bits( &attributes4, PSA_BYTES_TO_BITS( requested_capacity ) );
TEST_EQUAL( psa_key_derivation_output_key( &attributes4, &operation,
&derived_key ), expected_status );
|
Added shutdown command to the timer to achieve low power mode. | @@ -704,6 +704,7 @@ hal_timer_deinit(int timer_num)
hwtimer = (NRF_TIMER_Type *)bsptimer->tmr_reg;
hwtimer->INTENCLR = NRF_TIMER_INT_MASK(NRF_TIMER_CC_INT);
hwtimer->TASKS_STOP = 1;
+ hwtimer->TASKS_SHUTDOWN = 1;
}
bsptimer->tmr_enabled = 0;
bsptimer->tmr_reg = NULL;
|
Test: Remove unnecessary `rewindMeta` | @@ -58,7 +58,6 @@ using namespace kdb;
testing::AssertionResult & operator<< (testing::AssertionResult & stream, kdb::Key & key)
{
stream << key.getName () << ": " << (key.isString () ? key.getString () : (key.getBinarySize () == 0 ? "NULL" : "BINARY"));
- key.rewindMeta ();
key.rewindMeta ();
while (key.nextMeta ())
|
Tools makefile: remove unrelated clean commands | @@ -3,27 +3,6 @@ all: tunslip6
CFLAGS += -Wall -Werror
tunslip6: tools-utils.c tunslip6.c
+
clean:
rm -f *.o tunslip6
-
-gitclean:
- @git clean -d -x -n ..
- @echo "Enter yes to delete these files";
- @read response;if [[ "$$response" = "yes" ]]; then git clean -d -f -x ..;fi;
-
-distclean: cleanobj cleanfiles cleantargets cleandone
-cleanobj:
- ${info Removing obj_* directories...}
- @find ../examples/ -name "obj_*" -print -exec rm -R '{}' +
-cleanfiles:
- ${info Removing .map, .co, .ce, contiki*.a files...}
- @find ../examples -name "*.map" -print -delete
- @find ../examples -name "*.co" -print -delete
- @find ../examples -name "*.ce" -print -delete
- @find ../examples -name "contiki-*.a" -delete
-cleantargets:
- ${info Removing .TARGET builds...}
- @rm -f -v ${addprefix ../examples/*/*., ${shell ls ../arch/platform/}}
- @rm -f -v ${addprefix ../examples/*/*/*., ${shell ls ../arch/platform/}}
-cleandone:
- @echo ${info All done!}
|
[CI] Try a different action to upload release | @@ -57,9 +57,9 @@ jobs:
python3 scripts/build_kernel.py --no_run
- name: Update nightly release
- uses: eine/tip@master
+ uses: meeDamian/[email protected]
with:
- tag: nightly
- rm: false
token: ${{ secrets.GITHUB_TOKEN }}
- files: ./axle.iso
+ tag: nightly
+ files: axle.iso
+ allow_override: true
|
RTX5: corrected OS control blocks sections when using ARMCC5 (used for debug with Component Viewer) | @@ -496,6 +496,8 @@ __asm void os_cb_sections_wrapper (void) {
os_cb_sections
DCD ||.bss.os.thread.cb$$Base||
DCD ||.bss.os.thread.cb$$Limit||
+ DCD ||.bss.os.timer.cb$$Base||
+ DCD ||.bss.os.timer.cb$$Limit||
DCD ||.bss.os.evflags.cb$$Base||
DCD ||.bss.os.evflags.cb$$Limit||
DCD ||.bss.os.mutex.cb$$Base||
|
adding an addition register_syscall() | @@ -1371,6 +1371,7 @@ void register_file_syscalls(void **map)
register_syscall(map, SYS_sched_getaffinity, sched_getaffinity);
register_syscall(map, SYS_sched_setaffinity, sched_setaffinity);
register_syscall(map, SYS_getuid, getuid);
+ register_syscall(map, SYS_geteuid, geteuid);
}
void *linux_syscalls[SYS_MAX];
|
moba T1: bug fix (thanks to Moritz) | @@ -113,8 +113,8 @@ static void T1_fun(const nlop_data_t* _data, complex float* dst, const complex f
// t*exp(-t.*scaling_R1s*R1s):
md_zmul2(data->N, data->out_dims, data->out_strs, data->tmp_exp, data->out_strs, data->tmp_exp, data->TI_strs, data->TI);
- // scaling_M0:*exp(-t.*scaling_R1s.*R1s).*t
- md_zsmul(data->N, data->out_dims, data->tmp_exp, data->tmp_exp, data->scaling_M0);
+ // scaling_R1s.*exp(-t.*scaling_R1s.*R1s).*t
+ md_zsmul(data->N, data->out_dims, data->tmp_exp, data->tmp_exp, data->scaling_R1s);
// scaling_M0.*M0
md_zsmul2(data->N, data->map_dims, data->map_strs, data->tmp_map, data->map_strs, data->M0, data->scaling_M0);
@@ -122,7 +122,7 @@ static void T1_fun(const nlop_data_t* _data, complex float* dst, const complex f
// Mss + scaling_M0*M0
md_zadd(data->N, data->map_dims, data->tmp_ones, data->Mss, data->tmp_map);
- // R1s' = (Mss + scaling_M0*M0) * scaling_M0.*exp(-t.*scaling_R1s.*R1s) * t
+ // R1s' = (Mss + scaling_M0*M0) * scaling_R1s.*exp(-t.*scaling_R1s.*R1s) * t
md_zmul2(data->N, data->out_dims, data->out_strs, data->tmp_dR1s, data->map_strs, data->tmp_ones, data->out_strs, data->tmp_exp);
}
|
trace: up TRACE_COREID_LIMIT to 10 and reduce TRACE_MAX_EVENTS to 8000 | struct trace_buffer;
-#define TRACE_COREID_LIMIT 4
+#define TRACE_COREID_LIMIT 10
#define TRACE_EVENT_SIZE 16
-#define TRACE_MAX_EVENTS 30000 // max number of events
+#define TRACE_MAX_EVENTS 8000 // max number of events
#define TRACE_MAX_APPLICATIONS 128
//#define TRACE_PERCORE_BUF_SIZE 0x1ff00
#define TRACE_PERCORE_BUF_SIZE (TRACE_EVENT_SIZE * TRACE_MAX_EVENTS + (sizeof (struct trace_buffer)))
|
Use sein to find comet sponsor | ::
?. ?=(%1 lyf.seed)
[%| %invalid-life]
- [%& ~marzod] ::TODO how to do comet sponsorship?
+ [%& (^sein:title who.seed)]
::
%earl
:: a moon must be signed by the parent
|
JsThemis 0.12.0 | {
"name": "jsthemis",
- "version": "0.11.2",
+ "version": "0.12.0",
"description": "Themis is a data security library, providing users with high-quality security services for secure messaging of any kinds and flexible data storage. Themis is aimed at modern developers, with high level OOP wrappers for Ruby, Python, PHP, Java / Android and iOS / OSX. It is designed with ease of use in mind, high security and cross-platform availability.",
"main": "build/Release/jsthemis.node",
"scripts": {
|
fpgaotsu: log the flash control / shorten filename
Instead of always printing "Writing flash@0x0000..", change flash
to the actual name of the 'type' key in the flash config object.
Shorten filenames to basename when printing. | @@ -253,8 +253,8 @@ class otsu_updater(object):
if obj.get('erase_start') is not None:
erase_start = to_int(obj['erase_start'])[1]
erase_end = to_int(obj['erase_end'])[1]
- LOG.info('Erasing flash@0x%x for %d bytes',
- erase_start, (erase_end + 1) - erase_start)
+ LOG.info('Erasing %s@0x%x for %d bytes',
+ obj['type'], erase_start, (erase_end + 1) - erase_start)
mtd_dev.erase(erase_start,
(erase_end + 1) - erase_start)
@@ -274,8 +274,9 @@ class otsu_updater(object):
verify = obj.get('verify', False)
with open(filename, 'rb') as infile:
- LOG.info('Writing flash@0x%x for %d bytes (%s)',
- start, (end + 1) - start, filename)
+ LOG.info('Writing %s@0x%x for %d bytes (%s)',
+ obj['type'], start, (end + 1) - start,
+ os.path.basename(filename))
infile.seek(seek)
if infile.tell() != seek:
@@ -342,11 +343,13 @@ class otsu_updater(object):
os.remove(flash_bits.name)
if compare:
- LOG.info('Verified flash@0x%x for %d bytes (%s)',
- start, (end + 1) - start, filename)
+ LOG.info('Verified %s@0x%x for %d bytes (%s)',
+ obj['type'], start, (end + 1) - start,
+ os.path.basename(filename))
return (0, SUCCESS)
- return (1, 'Verification of %s @0x%x failed' % (filename, start))
+ return (1, 'Verification of %s @0x%x failed' %
+ (os.path.basename(filename), start))
def wait(self):
"""Wait for this update's thread to terminate
|
Fix runas error check | @@ -2033,7 +2033,7 @@ PPH_STRING PhpQueryRunFileParentDirectory(
}
}
-NTSTATUS PhpCustomShellExecute(
+NTSTATUS PhpRunAsShellExecute(
_In_ HWND hWnd,
_In_ PWSTR FileName,
_In_opt_ PWSTR Parameters,
@@ -2214,7 +2214,7 @@ NTSTATUS PhpRunFileProgram(
// If the file doesn't exist its probably a URL with http, https, www (dmex)
if (isDirectory || !PhDoesFileExistsWin32(fullFileName->Buffer))
{
- status = PhpCustomShellExecute(
+ status = PhpRunAsShellExecute(
Context->WindowHandle,
commandString->Buffer,
NULL,
@@ -2226,7 +2226,7 @@ NTSTATUS PhpRunFileProgram(
// and clicking the OK button, so we'll implement the same functionality. (dmex)
(!!(GetKeyState(VK_CONTROL) < 0 && !!(GetKeyState(VK_SHIFT) < 0))))
{
- status = PhpCustomShellExecute(
+ status = PhpRunAsShellExecute(
Context->WindowHandle,
PhGetString(fullFileName),
PhGetString(argumentsString),
@@ -2388,9 +2388,9 @@ NTSTATUS PhpRunFileProgram(
NtClose(newProcessHandle);
}
- else if (WIN32_FROM_NTSTATUS(status) == ERROR_ELEVATION_REQUIRED)
+ else if (NT_NTWIN32(status) && WIN32_FROM_NTSTATUS(status) == ERROR_ELEVATION_REQUIRED)
{
- status = PhpCustomShellExecute(
+ status = PhpRunAsShellExecute(
Context->WindowHandle,
PhGetString(fullFileName),
PhGetString(argumentsString),
|
Improve tests for the Scientific StackValue instance | @@ -33,6 +33,7 @@ test-suite hslua-aeson-test
, quickcheck-instances
, hslua
, hslua-aeson
+ , ieee754
, scientific
ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall
default-language: Haskell2010
|
configurator: update configurator version to 0.3.0
update configurator version to 0.3.0 | {
"name": "acrn-configurator",
"private": true,
- "version": "0.2.1",
+ "version": "0.3.0",
"author": {
"name": "Feng, Weiyi",
"email": "[email protected]",
|
Send NON discovery responses as CONfirmable | @@ -236,7 +236,8 @@ coap_receive(oc_message_t *msg)
OC_DBG(" QUERY: %.*s", (int)message->uri_query_len, message->uri_query);
OC_DBG(" Payload: %.*s", (int)message->payload_len, message->payload);
#endif
-
+ const char *href;
+ size_t href_len = coap_get_header_uri_path(message, &href);
#ifdef OC_TCP
if (msg->endpoint.flags & TCP) {
coap_tcp_init_message(response, CONTENT_2_05);
@@ -253,18 +254,21 @@ coap_receive(oc_message_t *msg)
history[idx] = message->mid;
history_dev[idx] = (uint8_t)msg->endpoint.device;
idx = (idx + 1) % OC_REQUEST_HISTORY_SIZE;
+ if (href_len == 7 && memcmp(href, "oic/res", 7) == 0) {
+ coap_udp_init_message(response, COAP_TYPE_CON, CONTENT_2_05,
+ coap_get_mid());
+ } else {
coap_udp_init_message(response, COAP_TYPE_NON, CONTENT_2_05,
coap_get_mid());
}
}
+ }
/* create transaction for response */
- transaction = coap_new_transaction(message->mid, &msg->endpoint);
+ transaction = coap_new_transaction(response->mid, &msg->endpoint);
if (transaction) {
#ifdef OC_BLOCK_WISE
- const char *href;
- size_t href_len = coap_get_header_uri_path(message, &href);
const uint8_t *incoming_block;
uint32_t incoming_block_len =
(uint32_t)coap_get_payload(message, &incoming_block);
@@ -438,9 +442,18 @@ coap_receive(oc_message_t *msg)
href, href_len, &msg->endpoint, message->code, message->uri_query,
message->uri_query_len, OC_BLOCKWISE_SERVER);
if (response_buffer) {
+ if (msg->endpoint.flags & MULTICAST &&
+ response_buffer->next_block_offset <
+ response_buffer->payload_size) {
+ OC_DBG("Dropping duplicate block-wise transfer request due to "
+ "repeated multicast");
+ coap_status_code = CLEAR_TRANSACTION;
+ goto send_message;
+ } else {
oc_blockwise_free_response_buffer(response_buffer);
response_buffer = NULL;
}
+ }
goto request_handler;
} else {
OC_ERR("incoming payload size exceeds block size");
|
test: include the prerelease string from libgit2 if it exists | @@ -529,7 +529,7 @@ index 94aaae8..af8f41d 100644
+_file1.txt_
file1.txt
--
-libgit2 #{Rugged.libgit2_version.join('.')}
+libgit2 #{Rugged.libgit2_version.join('.')}#{Rugged.libgit2_prerelease ? "-" : ""}#{Rugged.libgit2_prerelease}
EOS
end
@@ -572,7 +572,7 @@ index 0000000..9435022
+file3
+file3
--
-libgit2 #{Rugged.libgit2_version.join('.')}
+libgit2 #{Rugged.libgit2_version.join('.')}#{Rugged.libgit2_prerelease ? "-" : ""}#{Rugged.libgit2_prerelease}
EOS
@@ -611,7 +611,7 @@ index 9435022..9a2d780 100644
file3
file3
--
-libgit2 #{Rugged.libgit2_version.join('.')}
+libgit2 #{Rugged.libgit2_version.join('.')}#{Rugged.libgit2_prerelease ? "-" : ""}#{Rugged.libgit2_prerelease}
EOS
@@ -655,7 +655,7 @@ index 94aaae8..af8f41d 100644
+_file1.txt_
file1.txt
--
-libgit2 #{Rugged.libgit2_version.join('.')}
+libgit2 #{Rugged.libgit2_version.join('.')}#{Rugged.libgit2_prerelease ? "-" : ""}#{Rugged.libgit2_prerelease}
EOS
end
@@ -694,7 +694,7 @@ index 94aaae8..af8f41d 100644
+_file1.txt_
file1.txt
--
-libgit2 #{Rugged.libgit2_version.join('.')}
+libgit2 #{Rugged.libgit2_version.join('.')}#{Rugged.libgit2_prerelease ? "-" : ""}#{Rugged.libgit2_prerelease}
EOS
end
|
[core] fix crash on master after graceful restart
(bug on master branch; never released)
(thx nate) | @@ -574,6 +574,10 @@ static void show_help (void) {
__attribute_cold__
static void server_sockets_save (server *srv) { /* graceful_restart */
+ for (uint32_t i = 0; i < srv->srv_sockets.used; ++i)
+ srv->srv_sockets.ptr[i]->srv = NULL; /* srv will shortly be invalid */
+ for (uint32_t i = 0; i < srv->srv_sockets_inherited.used; ++i)
+ srv->srv_sockets_inherited.ptr[i]->srv = NULL; /* srv to be invalid */
memcpy(&graceful_sockets, &srv->srv_sockets, sizeof(server_socket_array));
memset(&srv->srv_sockets, 0, sizeof(server_socket_array));
memcpy(&inherited_sockets, &srv->srv_sockets_inherited, sizeof(server_socket_array));
@@ -586,6 +590,10 @@ static void server_sockets_restore (server *srv) { /* graceful_restart */
memset(&graceful_sockets, 0, sizeof(server_socket_array));
memcpy(&srv->srv_sockets_inherited, &inherited_sockets, sizeof(server_socket_array));
memset(&inherited_sockets, 0, sizeof(server_socket_array));
+ for (uint32_t i = 0; i < srv->srv_sockets.used; ++i)
+ srv->srv_sockets.ptr[i]->srv = srv; /* update ptr */
+ for (uint32_t i = 0; i < srv->srv_sockets_inherited.used; ++i)
+ srv->srv_sockets_inherited.ptr[i]->srv = srv; /* update ptr */
}
__attribute_cold__
|
rollback ya tool deploy | },
"deploy": {
"formula": {
- "sandbox_id": 243231127,
+ "sandbox_id": 227505422,
"match": "DEPLOY"
},
"executable": {
|
add keycloak authz realm "unit test" | @@ -1391,13 +1391,17 @@ static char * test_authz_worker(request_rec *r) {
rc = oidc_authz_worker24(r, json, require_args, oidc_authz_match_claim);
TST_ASSERT("auth status (8: nested non-array)", rc == AUTHZ_DENIED);
+ require_args = "Require claim realm_access.roles:someRole1";
+ rc = oidc_authz_worker24(r, json, require_args, oidc_authz_match_claim);
+ TST_ASSERT("auth status (9: keycloak sample 1)", rc == AUTHZ_GRANTED);
+
require_args = "Require claim resource_access.someClient.roles:someRole4";
rc = oidc_authz_worker24(r, json, require_args, oidc_authz_match_claim);
- TST_ASSERT("auth status (9: keycloak sample)", rc == AUTHZ_GRANTED);
+ TST_ASSERT("auth status (10: keycloak sample 2)", rc == AUTHZ_GRANTED);
require_args = "Require claim https://test.com/pay:alot";
rc = oidc_authz_worker24(r, json, require_args, oidc_authz_match_claim);
- TST_ASSERT("auth status (10: namespaced key)", rc == AUTHZ_GRANTED);
+ TST_ASSERT("auth status (11: namespaced key)", rc == AUTHZ_GRANTED);
json_decref(json);
|
docs: update description of jtag pins for esp32s3 and esp32c3 | @@ -192,20 +192,30 @@ The board can be reset by entering ``mon reset`` or ``mon reset halt`` into GDB.
.. _jtag-debugging-tip-jtag-pins-reconfigured:
-Do not use JTAG pins for something else
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Can JTAG pins be used for other purposes?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. only:: SOC_USB_SERIAL_JTAG_SUPPORTED
+
+ {IDF_TARGET_NAME} contains a USB Serial/JTAG Controller which can be used for debugging. By default, {IDF_TARGET_NAME} JTAG interface is connected to the built-in USB SERIAL/JTAG peripheral. For details, please refer to :doc:`Configure {IDF_TARGET_NAME} built-in JTAG Interface <../jtag-debugging/configure-builtin-jtag>`.
+
+ When you use USB Serial/JTAG Controller for debugging, |jtag-gpio-list| can be used for other purposes.
-Operation of JTAG may be disturbed, if some other h/w is connected to JTAG pins besides {IDF_TARGET_NAME} module and JTAG adapter. {IDF_TARGET_NAME} JTAG is using the following pins:
+ However, if you switch the USB JTAG interface to the GPIOs by burning eFuses, |jtag-gpio-list| can be used for JTAG debugging. When they perform this function, they cannot be used for other purposes.
+
+Operation of JTAG may be disturbed, if some other hardware is connected to JTAG pins besides {IDF_TARGET_NAME} module and JTAG adapter. {IDF_TARGET_NAME} JTAG is using the following pins:
.. include:: {IDF_TARGET_PATH_NAME}.inc
:start-after: jtag-pins
:end-before: ---
-JTAG communication will likely fail, if configuration of JTAG pins is changed by user application. If OpenOCD initializes correctly (detects the two Tensilica cores), but loses sync and spews out a lot of DTR/DIR errors when the program is ran, it is likely that the application reconfigures the JTAG pins to something else, or the user forgot to connect Vtar to a JTAG adapter that needed it.
+JTAG communication will likely fail, if configuration of JTAG pins is changed by a user application. If OpenOCD initializes correctly (detects all the CPU cores in the SOC), but loses sync and spews out a lot of DTR/DIR errors when the program is running, it is likely that the application reconfigures the JTAG pins to something else, or the user forgot to connect Vtar to a JTAG adapter that requires it.
+
+.. only:: esp32
.. highlight:: none
-Below is an excerpt from series of errors reported by GDB after the application stepped into the code that reconfigured MTDO pin to be an input::
+ Below is an excerpt from series of errors on the dual-core {IDF_TARGET_NAME} reported by GDB after the application stepped into the code that reconfigured MTDO pin to be an input::
cpu0: xtensa_resume (line 431): DSR (FFFFFFFF) indicates target still busy!
cpu0: xtensa_resume (line 431): DSR (FFFFFFFF) indicates DIR instruction generated an exception!
|
fix bugs on ref address incorrect on sockcompact with getsockopt | @@ -192,9 +192,8 @@ int win32_getsockopt(SOCKET sockfd, int level, int optname, void *optval, sockle
int ret = 0;
if ((level == SOL_SOCKET) && ((optname == SO_RCVTIMEO) || (optname == SO_SNDTIMEO))) {
struct timeval *tv = (struct timeval *)optval;
- DWORD timeout = 0;
- socklen_t dwlen = 0;
- ret = getsockopt(sockfd, level, optname, (char *)timeout, &dwlen);
+ DWORD timeout = 0; socklen_t dwlen = 0;
+ ret = getsockopt(sockfd, level, optname, (char *)&timeout, &dwlen);
tv->tv_sec = timeout / 1000;
tv->tv_usec = timeout * 1000;
*optlen = sizeof (struct timeval);
|
tests: extra logging in reassembly tests
Type: test | @@ -836,6 +836,11 @@ class TestIPv4MWReassembly(VppTestCase):
for send_if in self.send_ifs:
send_if.assert_nothing_captured()
+ self.logger.debug(self.vapi.ppcli("show trace"))
+ self.logger.debug(self.vapi.ppcli("show ip4-full-reassembly details"))
+ self.logger.debug(self.vapi.ppcli("show buffers"))
+ self.vapi.cli("clear trace")
+
self.pg_enable_capture()
self.send_packets(first_packets)
self.send_packets(second_packets)
@@ -1464,6 +1469,11 @@ class TestIPv6MWReassembly(VppTestCase):
for send_if in self.send_ifs:
send_if.assert_nothing_captured()
+ self.logger.debug(self.vapi.ppcli("show trace"))
+ self.logger.debug(self.vapi.ppcli("show ip6-full-reassembly details"))
+ self.logger.debug(self.vapi.ppcli("show buffers"))
+ self.vapi.cli("clear trace")
+
self.pg_enable_capture()
self.send_packets(first_packets)
self.send_packets(second_packets)
|
ADJ: crash in format/show | @@ -179,7 +179,7 @@ format_ip_adjacency (u8 * s, va_list * args)
s = format (s, "\n counts:[%Ld:%Ld]", counts.packets, counts.bytes);
s = format (s, "\n locks:%d", adj->ia_node.fn_locks);
s = format(s, "\n delegates:\n ");
- adj_delegate_format(s, adj);
+ s = adj_delegate_format(s, adj);
s = format(s, "\n children:");
if (fib_node_list_get_size(adj->ia_node.fn_children))
|
vere: remove stale function declarations | void
u3_walk_save(c3_c* pas_c, u3_noun tim, u3_atom pad, c3_c* bas_c, u3_noun pax);
- /* u3_sync_reck(): traverse filesystem for changes -> lamb
- */
- u3_noun
- u3_sync_reck(void);
-
/* u3_walk(): traverse `dir_c` to produce an arch, updating `old`.
*/
u3_noun
c3_c*
u3_path(c3_o fyl, u3_noun pax);
- /** Filesystem (old api).
- **/
- /* u3_ve_file(): load internal file as atom from local or system.
- */
- u3_weak
- u3_ve_file(c3_c* ext_c, u3_noun tah);
-
- /* u3_ve_frep(): load [.~ %rep myp {now} tah].
- **
- ** File is either ~ or [nbytes mdate atom].
- */
- u3_noun
- u3_ve_frep(u3_noun myp, u3_noun tah);
-
- /* u3_ve_date(): date internal file.
- */
- c3_d
- u3_ve_date(c3_c* ext_c, u3_noun tah);
-
- /* u3_ve_save(): save internal file as atom.
- */
- c3_o
- u3_ve_save(c3_c* ext_c, u3_noun tah, u3_noun dat);
-
- /* u3_ve_zeus(): prayer to internal file path. Return unit.
- */
- u3_noun
- u3_ve_zeus(u3_noun hap);
-
/** Filesystem (async)
**/
/* u3_foil_folder(): load directory, blockingly. create if nonexistent.
/** Pier control.
**/
- /* u3_pier_db_shutdown(): close the log.
- */
- void
- u3_pier_db_shutdown(u3_pier* pir_u);
-
- /* u3_pier_interrupt(): interrupt running process.
- */
- void
- u3_pier_interrupt(u3_pier* pir_u);
-
- /* u3_pier_discover(): insert task into process controller.
- */
- void
- u3_pier_discover(u3_pier* pir_u,
- c3_l msc_l,
- u3_noun job);
-
/* u3_pier_exit(): trigger a gentle shutdown.
*/
void
|
update uart isr ore-flag handle error bug. | @@ -270,7 +270,7 @@ static void uart_isr(struct rt_serial_device *serial) {
}
if (USART_GetFlagStatus(uart->uart_device, USART_FLAG_ORE) == SET)
{
- stm32_getc(serial);
+ USART_ReceiveData(uart->uart_device);
}
}
|
bump gcc to 6.3 | # Define subcomponent versions required for build
-%define gmp_version 6.1.1
+%define gmp_version 6.1.2
%define mpc_version 1.0.3
-%define mpfr_version 3.1.4
+%define mpfr_version 3.1.5
Summary: The GNU C Compiler and Support Files
Name: %{pname}%{PROJ_DELIM}
-Version: 5.4.0
+Version: 6.3
Release: 1
License: GNU GPL
Group: %{PROJ_NAME}/compiler-families
|
Docker: Remove unnecessary `sudo` command | @@ -126,7 +126,7 @@ RUN cd /tmp \
# PEGTL
ARG PEGTL_VERSION=2.7.1
RUN git clone --branch ${PEGTL_VERSION} --depth 1 https://github.com/taocpp/PEGTL.git \
- && sudo cp -R PEGTL/include/tao /usr/local/include
+ && cp -R PEGTL/include/tao /usr/local/include
# YAEP
ARG YAEP_VERSION=550de4cc5600d5f6109c7ebcfbacec51bf80d8d3
|
config_tools: add assert to check if the scenario is valid
Add assert for below invalid scenario:
1. Two or more pre-launched RTVM
2. One pre-launched RTVM and one or more post-launched RTVM | @@ -52,4 +52,20 @@ https://github.com/projectacrn/acrn-hypervisor/issues if you meet this.</xs:docu
</xs:annotation>
</xs:assert>
+ <xs:assert test="(count(vm[vm_type = 'PRE_RT_VM']) = 1 and count(vm[vm_type='POST_RT_VM']) = 0)
+ or (count(vm[vm_type='PRE_RT_VM']) = 0 and count(vm[vm_type='POST_RT_VM']) >= 0)">
+ <xs:annotation acrn:severity="error">
+ <xs:documentation>There should not be both pre-launched RTVM and post-launched RTVM.
+And two or more pre-launched RTVM are not allowed.
+
+This assertion checks below invalid scenario:
+
+- Two or more pre-launched RTVM
+- One pre-launched RTVM and one or more post-launched RTVM
+
+To fix this error, please check the RTVM number to ensure the scenario configuration is valid.</xs:documentation>
+
+ </xs:annotation>
+ </xs:assert>
+
</xs:schema>
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.