message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
CLI code coverage: install python requirements as root instead of as gpadmin
This makes it easier to maintain this part of the script, now that we no
longer need the virtualenv to be active while running the tests. | @@ -19,14 +19,11 @@ function install_python_hacks() {
fi
}
-function gen_env(){
- cat > /opt/run_test.sh <<-EOF
- set -ex
-
+function install_python_requirements() {
# virtualenv 16.0 and greater does not support python2.6, which is
# used on centos6
pip install --user virtualenv~=15.0
- export PATH=\$PATH:~/.local/bin
+ export PATH=$PATH:~/.local/bin
# create virtualenv before sourcing greenplum_path since greenplum_path
# modifies PYTHONHOME and PYTHONPATH
@@ -57,9 +54,14 @@ function gen_env(){
# Install requirements into the vendored Python stack.
mkdir -p /tmp/py-requirements
source /tmp/venv/bin/activate
- pip install --prefix /tmp/py-requirements -r "\${1}/gpdb_src/gpMgmt/requirements-dev.txt"
+ pip install --prefix /tmp/py-requirements -r ./gpdb_src/gpMgmt/requirements-dev.txt
cp -r /tmp/py-requirements/* /usr/local/greenplum-db-devel/ext/python/
deactivate
+}
+
+function gen_env(){
+ cat > /opt/run_test.sh <<-EOF
+ set -ex
source /usr/local/greenplum-db-devel/greenplum_path.sh
@@ -94,6 +96,7 @@ function _main() {
time (make_cluster)
time install_python_hacks
+ time install_python_requirements
time gen_env
time run_test
|
VERSION bump to version 0.12.35 | @@ -33,7 +33,7 @@ set(CMAKE_C_FLAGS_DEBUG "-g -O0")
# set version
set(LIBNETCONF2_MAJOR_VERSION 0)
set(LIBNETCONF2_MINOR_VERSION 12)
-set(LIBNETCONF2_MICRO_VERSION 34)
+set(LIBNETCONF2_MICRO_VERSION 35)
set(LIBNETCONF2_VERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION}.${LIBNETCONF2_MICRO_VERSION})
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION})
|
README: Add link to trace sni guide. | @@ -33,6 +33,7 @@ Explore the following documentation to find out which tools can help you in your
- [`oomkill`](docs/guides/trace/oomkill.md)
- [`open`](docs/guides/trace/open.md)
- [`signal`](docs/guides/trace/signal.md)
+ - [`sni`](docs/guides/trace/sni.md)
- [`tcp`](docs/guides/trace/tcp.md)
- [`tcpconnect`](docs/guides/trace/tcpconnect.md)
- [`traceloop`](docs/guides/traceloop.md)
|
input metadata contains info for external rendering only | @@ -492,17 +492,6 @@ void tic_core_tick(tic_mem* tic, tic_tick_data* data)
else return;
}
- {
- if (!tic->input.keyboard)
- ZEROMEM(tic->ram.input.keyboard);
-
- if (!tic->input.gamepad)
- ZEROMEM(tic->ram.input.gamepads);
-
- if (!tic->input.mouse)
- ZEROMEM(tic->ram.input.mouse);
- }
-
core->state.tick(tic);
}
|
Add documentation on prior changes. | @@ -48,3 +48,47 @@ Bugs Fixed
This issue was causing the ``asgiref`` module used in Django to fail when
using ``signal.set_wakeup_fd()`` as code was thinking it was in the main
thread when it wasn't. See https://github.com/django/asgiref/issues/143.
+
+Features Changed
+----------------
+
+* The ``--isatty`` option of mod_wsgi-express has been removed and the
+ behaviour enabled by the option is now the default. The default behaviour
+ is now that if mod_wsgi-express is run in an interactive terminal, then
+ Apache will be started within a sub process of the mod_wsgi-express script
+ and the ``SIGWINCH`` signal will be blocked and not passed through to
+ Apache. This means that a window resizing event will no longer cause
+ mod_wsgi-express to shutdown unexpectedly.
+
+New Features
+------------
+
+* Added the ``mod_wsgi.subscribe_shutdown()`` function for registering a
+ callback to be called when the process is being shutdown. This is needed
+ because ``atexit.register()`` doesn't work as required for the main
+ Python interpreter, specifically the ``atexit`` callback isn't called
+ before the main interpreter thread attempts to wait on threads on
+ shutdown, thus preventing one from shutting down daemon threads and
+ waiting on them.
+
+ This feature to get a callback on process shutdown was previously
+ available by using ``mod_wsgi.subscribe_events()``, but that would also
+ reports events to the callback on requests as they happen, thus adding
+ extra overhead if not using the request events. The new registration
+ function can thus be used where only interested in the event for the
+ process being shutdown.
+
+* Locking of the Python global interpreter lock has been reviewed with
+ changes resulting in a reduction in overhead, or otherwise changing
+ the interaction between threads such that at high request rate with a
+ hello world application, a greater request throughput can be achieved.
+ How much improvement you see with your own applications will depend on
+ what your application does and whether you have short response times
+ to begin with. If you have an I/O bound application with long response
+ times you likely aren't going to see any difference.
+
+* Internal metrics collection has been improved with additional information
+ provided in process metrics and a new request metrics feature added
+ giving access to aggregrated metrics over the time of a reporting period.
+ This includes bucketed time data on requests so can calculate distribution
+ of server, queue and application time.
|
pyocf: volume offlining | @@ -239,6 +239,7 @@ class Volume:
type(self)._uuid_[self.uuid] = self
self.reset_stats()
+ self.is_online = True
self.opened = False
def do_open(self):
@@ -254,10 +255,10 @@ class Volume:
def get_max_io_size(self):
raise NotImplementedError
- def submit_flush(self, flush):
+ def do_submit_flush(self, flush):
raise NotImplementedError
- def submit_discard(self, discard):
+ def do_submit_discard(self, discard):
raise NotImplementedError
def get_stats(self):
@@ -269,10 +270,6 @@ class Volume:
def inc_stats(self, _dir):
self.stats[_dir] += 1
- def submit_io(self, io):
- volume.inc_stats(IoDir(io.contents._dir))
- volume.do_submit_io(io)
-
def do_submit_io(self, io):
raise NotImplementedError
@@ -282,6 +279,35 @@ class Volume:
def md5(self):
raise NotImplementedError
+ def offline(self):
+ self.is_online = False
+
+ def online(self):
+ self.is_online = True
+
+ def _reject_io(self, io):
+ cast(io, POINTER(Io)).contents._end(io, -OcfErrorCode.OCF_ERR_IO)
+
+ def submit_flush(self, io):
+ if self.is_online:
+ self.do_submit_flush(io)
+ else:
+ self._reject_io(io)
+
+ def submit_io(self, io):
+ if self.is_online:
+ self.inc_stats(IoDir(io.contents._dir))
+ self.do_submit_io(io)
+ else:
+ self._reject_io(io)
+
+ def submit_discard(self, io):
+ if self.is_online:
+ self.do_submit_discard(io)
+ else:
+ self._reject_io(io)
+
+
class RamVolume(Volume):
props = None
@@ -309,10 +335,10 @@ class RamVolume(Volume):
def get_max_io_size(self):
return S.from_KiB(128)
- def submit_flush(self, flush):
+ def do_submit_flush(self, flush):
flush.contents._end(flush, 0)
- def submit_discard(self, discard):
+ def do_submit_discard(self, discard):
try:
dst = self.data_ptr + discard.contents._addr
memset(dst, 0, discard.contents._bytes)
|
Fix compilation when path includes spaces | @@ -9,13 +9,13 @@ include_directories(SYSTEM ${gtk_INCLUDE_DIRS})
add_executable(stlink-gui-local ${GUI_SOURCES})
set_target_properties(stlink-gui-local PROPERTIES
- COMPILE_FLAGS -DSTLINK_UI_DIR=\\"${CMAKE_CURRENT_SOURCE_DIR}/gui\\")
+ COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_CURRENT_SOURCE_DIR}/gui")
target_link_libraries(stlink-gui-local ${STLINK_LIB_STATIC} ${gtk_LDFLAGS})
add_executable(stlink-gui ${GUI_SOURCES})
set_target_properties(stlink-gui PROPERTIES
- COMPILE_FLAGS -DSTLINK_UI_DIR=\\"${CMAKE_INSTALL_PREFIX}/${INSTALLED_UI_DIR}\\")
+ COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_INSTALL_PREFIX}/${INSTALLED_UI_DIR}")
target_link_libraries(stlink-gui ${STLINK_LIB_STATIC} ${gtk_LDFLAGS})
install(TARGETS stlink-gui
|
add instantruntimedir | # try to obtain a temp dir unique to the user, to enable
# instantOS xsessions for concurrent users on the same machine
-if [ -z "${XDG_RUNTIME_DIR}" ]; then
- RTD=/tmp/${UID}/instantos
-else
- RTD=${XDG_RUNTIME_DIR}/instantos
-fi
-[[ -d "${RTD}" ]] || mkdir -p "${RTD}"
+RTD="$(instantruntimedir)"
+RTD="${RTD:/tmp/instantos}"
-echo $$ >${RTD}/instantosrunning
+echo $$ >"${RTD}"/instantosrunning
# just in case, some systems might not do this
cd
@@ -34,18 +30,18 @@ fi
source ~/.instantsession
# loop so crashing instantwm doesn't end the x session
-while [ -e ${RTD}/instantosrunning ]; do
+while [ -e "${RTD}"/instantosrunning ]; do
# allow changing wm on the fly
- if [ -e ${RTD}/wmoverride ]; then
- if command -v "$(cat ${RTD}/wmoverride)" &>/dev/null; then
+ if [ -e "${RTD}"/wmoverride ]; then
+ if command -v "$(cat "${RTD}"/wmoverride)" &>/dev/null; then
"$(cat ${RTD}/wmoverride)" 2>~/.instantos.log &
WMPID="$!"
- echo "$WMPID" >${RTD}/wmpid
+ echo "$WMPID" >"${RTD}"/wmpid
while kill -0 "$WMPID"; do
sleep 1
done
fi
- rm ${RTD}/wmoverride
+ rm "${RTD}"/wmoverride
else
# Log stderror or stdout to a file
if ! [ -e .local/share ]; then
|
nvbios/power/base_clock: parse basic fields for version 0x20 | @@ -861,6 +861,15 @@ int envy_bios_parse_power_base_clock(struct envy_bios *bios) {
return -EINVAL;
}
+ break;
+ case 0x20:
+ err |= bios_u8(bios, bc->offset + 0x1, &bc->hlen);
+ err |= bios_u8(bios, bc->offset + 0x2, &bc->rlen);
+ err |= bios_u8(bios, bc->offset + 0x3, &bc->entriesnum);
+ err |= bios_u8(bios, bc->offset + 0x4, &bc->secount);
+ err |= bios_u8(bios, bc->offset + 0x5, &bc->selen);
+ bc->valid = !err;
+
break;
default:
ENVY_BIOS_ERR("BASE CLOCKS table version 0x%x\n", bc->version);
@@ -896,7 +905,7 @@ void envy_bios_print_power_base_clock(struct envy_bios *bios, FILE *out, unsigne
}
fprintf(out, "BASE CLOCK table at 0x%x, version %x\n", bc->offset, bc->version);
- if (bc->entriesnum) {
+ if (bc->version == 0x10 && bc->entriesnum) {
if (bc->d2_entry != 0xff)
fprintf(out, "d2 entry: %i\n", bc->d2_entry);
if (bc->d3_entry != 0xff)
@@ -937,14 +946,17 @@ void envy_bios_print_power_base_clock(struct envy_bios *bios, FILE *out, unsigne
for (i = 0; i < bc->entriesnum; i++) {
struct envy_bios_power_base_clock_entry *bce = &bc->entries[i];
- if (bce->pstate == 0x0 || bce->pstate == 0xff)
+ if (!bce || bce->pstate == 0x0 || bce->pstate == 0xff)
continue;
+ if (bc->version == 0x10) {
fprintf(out, "-- entry %i, pstate = %x, reqPower = %i mW, reqSlowdownPower = %i mW",
i, bce->pstate, bce->reqPower * 10, bce->reqSlowdownPower * 10);
for (j = 0; j < bc->secount; j++)
fprintf(out, ", clock%i = %i MHz", j, bce->clock[j]);
fprintf(out, "\n");
+ }
+
envy_bios_dump_hex(bios, out, bce->offset, bc->rlen + (bc->selen * bc->secount), mask);
if (mask & ENVY_BIOS_PRINT_VERBOSE) fprintf(out, "\n");
}
|
Add changelog entry for fixing | * [Issue #346](https://github.com/grobian/carbon-c-relay/issues/346)
sporadic segfaults when using UDP connections
+* [Issue #368](https://github.com/grobian/carbon-c-relay/issues/368)
+ segfault sending or receiving metrics using ssl transport
* [Issue #369](https://github.com/grobian/carbon-c-relay/issues/369)
quoted expressions aren't printed as such by relay
|
disable DDR tests with no_RAM_configs | set -e # exit on error
n=0 # count amount of tests executed (exception for subsecond calls)
loops=1;
- export DNUT_TRACE=0xFF
+# export DNUT_TRACE=0xFF
stimfile=$(basename "$0"); logfile="${stimfile%.*}.log"; ts0=$(date +%s); echo "executing $stimfile, logging $logfile maxloop=$loops";
for((i=1;i<=loops;i++)) do l="loop=$i of $loops"; ts1=$(date +%s); # sec
# t="$DONUT_ROOT/software/tools/dnut_peek -h" ;echo -e "$t $l"; $t;echo -e "RC=$?$del" # 1
done
done
done
+ if [[ "$DDR3_USED" == "TRUE" || "$DDR4_USED" == "TRUE" ]];then echo "testing DDR"
for num64 in 1 5 63 64;do # 1..64
for align in 4096 1024 256 64; do # must be mult of 64
for num4k in 0 1 3 7; do # 1=6sec, 7=20sec
done
done
done
- #### check DDR3 memory in KU3
+ #### check DDR3 memory in KU3,, stay under 512k for BRAM
t="$DONUT_ROOT/software/tools/stage2_ddr -h" ;echo -e "$t $l"; $t;echo -e "RC=$?$del" #
- for strt in 0x1000 0x2000;do # start adr
+ for strt in 0x1000 0x2000;do # start adr,
for iter in 1 2 3;do # number of blocks
for bsize in 64 0x1000; do # block size
let end=${strt}+${iter}*${bsize}
done
done
done
- #### use memset in host or in fpga memory
+ #### use memset in host or in fpga memory, stay under 512k for BRAM
t="$DONUT_ROOT/software/tools/stage2_set -h" ;echo -e "$t $l"; $t;echo -e "RC=$?$del" #
for beg in 0 1 11 63 64;do # start adr
for size in 1 7 4097; do # block size to copy
t="$DONUT_ROOT/software/tools/stage2_set -F -b${beg} -s${size} -p${size} -t200" ;echo -e "$t $l";date;((n+=1));time $t;echo -e "RC=$?$del" #
done
done
+ fi
fi # memcopy
if [[ $action == *"hls_mem"* || $action == *"hls_search"* ]];then echo "testing demo_memcopy"
|
Travis: Do not set installation folder for macOS | @@ -237,8 +237,11 @@ before_install:
#
before_script:
- cd $TRAVIS_BUILD_DIR/..
- - >
- [[ "$TRAVIS_OS_NAME" == "linux" ]] && INSTALL_DIR="$PWD/install" || INSTALL_DIR="/usr/local"
+ - |
+ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+ CMAKE_OPT+=(-DCMAKE_INSTALL_PREFIX="$PWD/install")
+ export PATH=$PATH:"$PWD/install/bin"
+ fi
- SYSTEM_DIR="$PWD/kdbsystem"
- mkdir build
- cd build
@@ -263,11 +266,9 @@ before_script:
-DENABLE_DEBUG=ON
-DINSTALL_SYSTEM_FILES=OFF
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
- -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR"
-DKDB_DB_SYSTEM="$SYSTEM_DIR"
${CMAKE_OPT[@]}
$TRAVIS_BUILD_DIR
- - export PATH=$PATH:"$INSTALL_DIR/bin"
script:
- ninja
|
fpgainfo: wrap stdout with codec StreamWriter
This change replaces `sys.stdout` with a StreamWriter object that uses
`UTF-8` encoding. This will allow fpgainfo to print unicode (non-ascii).
Without this, an exception will be raised when printing unicode
characters and redirecting the output stream.
Conflicts:
tools/fpgainfo/fpgainfo | # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
import argparse
+import codecs
import fpga_common
import fpgaerr
import fpgapwr
@@ -65,4 +66,6 @@ if __name__ == "__main__":
logging.warning("Could not open log file: {}."
"Logging to stderr".format(logfile))
+ # wrap stdout with the StreamWriter that does unicode
+ sys.stdout = codecs.getwriter('UTF-8')(sys.stdout)
args.func(args)
|
Adding missing LED pin macros to nRF52 bsp.h | @@ -40,8 +40,11 @@ extern uint8_t _ram_start;
#define RAM_SIZE 0x10000
/* LED pins */
-#define LED_BLINK_PIN (17)
+#define LED_1 (17)
#define LED_2 (18)
+#define LED_3 (19)
+#define LED_4 (20)
+#define LED_BLINK_PIN (LED_1)
#if MYNEWT_VAL(BOOT_SERIAL)
#define BOOT_SERIAL_DETECT_PIN 13 /* Button 1 */
|
media/encorder: Correct input/output buffer size | @@ -64,9 +64,9 @@ Encoder::Encoder(audio_type_t audio_type, unsigned short channels, unsigned int
// params for streaming
ext.pOutputBuffer = outputBuf;
- ext.outputBufferMaxLength = sizeof(outputBuf);
+ ext.outputBufferMaxLength = sizeof(unsigned char) * MAX_PACKET_SIZE;
ext.pInputBuffer = inputBuf;
- ext.inputBufferMaxLength = sizeof(inputBuf);
+ ext.inputBufferMaxLength = sizeof(signed short) * inSamples;
// params about PCM source
ext.inputChannels = channels;
|
Update information on image scaling. | @@ -85,12 +85,10 @@ File Formats
------------
PAPPL supports JPEG, PNG, PWG Raster, and Apple Raster documents in all of the
-standard color spaces and bit depths. JPEG images are scaled to the destination
-media size and print resolution using bilinear interpolation, while PNG images
-are scaled using a nearest-neighbor algorithm to preserve edge detail in bar
-codes and other non-photographic content. PWG Raster and Apple Raster documents
-are not scaled as they are normally sent at the proper resolution and size by
-the print client.
+standard color spaces and bit depths. JPEG and PNG images are scaled to the
+destination media size and print resolution. PWG Raster and Apple Raster
+documents are *not* scaled as they are normally sent at the proper resolution
+and size by the print client.
PAPPL also allows drivers to advertise support for other "raw" formats that are
directly supported by the printer.
|
tls: re-added a piece of code I removed by mistake | @@ -606,8 +606,15 @@ int flb_tls_session_create(struct flb_tls *tls,
connection->coroutine = NULL;
+ /* This check's purpose is to abort when a timeout is detected.
+ */
+ if (connection->net_error == -1) {
goto retry_handshake;
}
+ else {
+ result = -1;
+ }
+ }
cleanup:
if (event_restore_needed) {
|
[core] reduce optim inline of cold funcs | @@ -977,6 +977,7 @@ static void server_graceful_shutdown_maint (server *srv) {
}
__attribute_cold__
+__attribute_noinline__
static void server_graceful_state (server *srv) {
if (!srv_shutdown) {
@@ -1016,6 +1017,7 @@ static void server_graceful_state (server *srv) {
}
__attribute_cold__
+__attribute_noinline__
static void server_sockets_enable (server *srv) {
server_sockets_set_event(srv, FDEVENT_IN);
srv->sockets_disabled = 0;
@@ -1023,6 +1025,7 @@ static void server_sockets_enable (server *srv) {
}
__attribute_cold__
+__attribute_noinline__
static void server_sockets_disable (server *srv) {
server_sockets_set_event(srv, 0);
srv->sockets_disabled = 1;
|
[catboost/java] revert r3983495; commited accidentally | @@ -9,7 +9,6 @@ from __future__ import absolute_import, print_function
import contextlib
import os
-import platform
import shutil
import subprocess
import sys
@@ -57,7 +56,7 @@ def _get_ya_path():
def _get_package_resources_dir():
return os.path.join(
_get_arcadia_root(),
- os.path.join(*'catboost/jvm-packages/catboost4j-prediction/src/main/resourcesb'.split('/')))
+ os.path.join(*'catboost/jvm-packages/catboost4j-prediction/src/main/resources/lib'.split('/')))
def _get_native_lib_dir(relative=None):
@@ -77,17 +76,10 @@ def _ensure_dir_exists(path):
raise
-def _get_current_machine_resources_dir():
- return ''.join((_get_platform(), '-', platform.machine()))
-
-
def _main():
ya_path = _get_ya_path()
- shared_lib_dir = _get_package_resources_dir()
- native_lib_dir = os.path.join(
- _get_native_lib_dir(),
- _get_current_machine_resources_dir(),
- 'lib')
+ resources_dir = _get_package_resources_dir()
+ native_lib_dir = _get_native_lib_dir()
env = os.environ.copy()
print('building dynamic library with `ya`', file=sys.stderr)
@@ -101,7 +93,7 @@ def _main():
stdout=sys.stdout,
stderr=sys.stderr)
- _ensure_dir_exists(shared_lib_dir)
+ _ensure_dir_exists(resources_dir)
native_lib_name = {
'darwin': 'libcatboost4j-prediction.dylib',
'win32': 'catboost4j-prediction.dll',
@@ -111,7 +103,7 @@ def _main():
print('copying dynamic library to resources/lib', file=sys.stderr)
shutil.copy(
os.path.join(_get_native_lib_dir(build_output_dir), native_lib_name),
- shared_lib_dir)
+ resources_dir)
if '__main__' == __name__:
|
lp5523.c: remove redundant include | #include "lp5523/lp5523.h"
#include <syscfg/syscfg.h>
-#if MYNEWT_VAL(LED_ABSTRACTION_LAYER)
-#include "led/led.h"
-#endif
-
/* Define the stats section and records */
STATS_SECT_START(lp5523_stat_section)
STATS_SECT_ENTRY(read_errors)
|
Fix some typos; | @@ -1254,6 +1254,7 @@ Shader* lovrShaderCreate(const char* vertexSource, const char* fragmentSource) {
UniformBlock block = { .index = i, .binding = i + 1, .source = NULL };
glUniformBlockBinding(program, block.index, block.binding);
vec_init(&block.uniforms);
+ vec_push(&shader->blocks, block);
char name[LOVR_MAX_UNIFORM_LENGTH];
glGetActiveUniformBlockName(program, i, LOVR_MAX_UNIFORM_LENGTH, NULL, name);
@@ -1263,7 +1264,8 @@ Shader* lovrShaderCreate(const char* vertexSource, const char* fragmentSource) {
// Uniform introspection
int32_t uniformCount;
int textureSlot = 0;
- map_init(&shader->uniforms);
+ map_init(&shader->uniformMap);
+ vec_init(&shader->uniforms);
glGetProgramiv(program, GL_ACTIVE_UNIFORMS, &uniformCount);
for (uint32_t i = 0; i < (uint32_t) uniformCount; i++) {
Uniform uniform;
@@ -1284,7 +1286,7 @@ Shader* lovrShaderCreate(const char* vertexSource, const char* fragmentSource) {
glGetActiveUniformsiv(program, 1, &i, GL_UNIFORM_BLOCK_INDEX, &blockIndex);
if (blockIndex != -1) {
- UniformBlock* block = &shader->blocks.data[i];
+ UniformBlock* block = &shader->blocks.data[blockIndex];
glGetActiveUniformsiv(program, 1, &i, GL_UNIFORM_OFFSET, &uniform.offset);
glGetActiveUniformsiv(program, 1, &i, GL_UNIFORM_SIZE, &uniform.size);
vec_push(&block->uniforms, uniform);
|
board/anahera/sensors.c: Format with clang-format
BRANCH=none
TEST=none | @@ -44,30 +44,22 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
/* Temperature sensor configuration */
const struct temp_sensor_t temp_sensors[] = {
- [TEMP_SENSOR_1_FAN] = {
- .name = "Fan",
+ [TEMP_SENSOR_1_FAN] = { .name = "Fan",
.type = TEMP_SENSOR_TYPE_BOARD,
.read = get_temp_3v3_30k9_47k_4050b,
- .idx = ADC_TEMP_SENSOR_1_FAN
- },
- [TEMP_SENSOR_2_SOC] = {
- .name = "SOC",
+ .idx = ADC_TEMP_SENSOR_1_FAN },
+ [TEMP_SENSOR_2_SOC] = { .name = "SOC",
.type = TEMP_SENSOR_TYPE_BOARD,
.read = get_temp_3v3_30k9_47k_4050b,
- .idx = ADC_TEMP_SENSOR_2_SOC
- },
- [TEMP_SENSOR_3_CHARGER] = {
- .name = "Charger",
+ .idx = ADC_TEMP_SENSOR_2_SOC },
+ [TEMP_SENSOR_3_CHARGER] = { .name = "Charger",
.type = TEMP_SENSOR_TYPE_BOARD,
.read = get_temp_3v3_30k9_47k_4050b,
- .idx = ADC_TEMP_SENSOR_3_CHARGER
- },
- [TEMP_SENSOR_4_REGULATOR] = {
- .name = "Regulator",
+ .idx = ADC_TEMP_SENSOR_3_CHARGER },
+ [TEMP_SENSOR_4_REGULATOR] = { .name = "Regulator",
.type = TEMP_SENSOR_TYPE_BOARD,
.read = get_temp_3v3_30k9_47k_4050b,
- .idx = ADC_TEMP_SENSOR_4_REGULATOR
- },
+ .idx = ADC_TEMP_SENSOR_4_REGULATOR },
};
BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);
|
Remove dirty check from LRU cleaner getter callback
This check is incorrect as cacheline status may change
from dirty to clean at any point during cleaning, except for
when the hash bucket is locked. | @@ -525,7 +525,6 @@ static int evp_lru_clean_get(ocf_cache_t cache, void *getter_context,
if (ctx->cline[idx] == end_marker)
return -1;
- ENV_BUG_ON(!metadata_test_dirty(ctx->cache, ctx->cline[idx]));
*line = ctx->cline[idx];
return 0;
|
Fix pixel bar below title
This commit changes how the left and right indents are calculated for the
title bottom pixel bar, so that it is displayed properly in case the left or
right border is hidden. | @@ -383,21 +383,21 @@ static void render_container_simple_border_normal(struct sway_output *output,
scale_box(&box, output_scale);
render_rect(output->wlr_output, output_damage, &box, color);
+ // Setting these makes marks and title easier
+ size_t inner_x = con->x + view->border_thickness * view->border_left;
+ size_t inner_width = con->width - view->border_thickness * view->border_left
+ - view->border_thickness * view->border_right;
+
// Single pixel bar below title
memcpy(&color, colors->border, sizeof(float) * 4);
color[3] *= con->alpha;
- box.x = con->x + view->border_thickness;
+ box.x = inner_x;
box.y = view->y - 1;
- box.width = con->width - view->border_thickness * 2;
+ box.width = inner_width;
box.height = 1;
scale_box(&box, output_scale);
render_rect(output->wlr_output, output_damage, &box, color);
- // Setting these makes marks and title easier
- size_t inner_x = con->x + view->border_thickness * view->border_left;
- size_t inner_width = con->width - view->border_thickness * view->border_left
- - view->border_thickness * view->border_right;
-
// Marks
size_t marks_width = 0;
if (config->show_marks && marks_texture) {
|
tools: fix ldgen_test fragment file KEEP | @@ -4,5 +4,5 @@ entries:
* (noflash)
src1 (default)
src1:func1 (noflash);
- text->iram0_text KEEP ALIGN(9) ALIGN(12, post) SURROUND(sym1)
+ text->iram0_text KEEP() ALIGN(9) ALIGN(12, post) SURROUND(sym1)
src1:func2 (rtc)
|
One more try. Missed an errant ItemGroup opening tag. | <ImportGroup Label="ExtensionTargets">
<Import Project="$(StarboardBasePath)\msvc\sdk-build.targets" />
</ImportGroup>
- <ItemGroup>
<Target Name="CopyXamlFilesToOutput" BeforeTargets="_CopyFilesMarkedCopyLocal" DependsOnTargets="$(AfterBuildCompileTargets)">
<ItemGroup>
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)$(XamlGeneratedOutputPath)\**\*.xaml">
|
Gtest-exc depends on frames not being inlined
The test is unwinding a precise number of frames, which assumes the
compiler will not inline these functions. Mark this explicitly to be
more reliable, and add some more verbose debugging aids. | @@ -24,6 +24,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/* This illustrates the basics of using the unwind interface for
exception handling. */
+#include "compiler.h"
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@ -54,6 +56,8 @@ raise_exception (void)
unw_cursor_t cursor;
unw_context_t uc;
int i;
+ unw_word_t ip;
+ unw_word_t sp;
unw_getcontext (&uc);
if (unw_init_local (&cursor, &uc) < 0)
@@ -62,6 +66,14 @@ raise_exception (void)
return;
}
+ if (verbose)
+ {
+ printf ("raise_exception(): sp=%p\n", (void*) &sp);
+ unw_get_reg (&cursor, UNW_REG_IP, &ip);
+ unw_get_reg (&cursor, UNW_REG_SP, &sp);
+ printf ("\t #%-3d ip=%p sp=%p\n", 0, (void*) ip, (void*) sp);
+ }
+
/* unwind to top-most frame a(), skipping over b() and raise_exception(): */
for (i = 0; i < depth + 2; ++i)
if (unw_step (&cursor) < 0)
@@ -69,6 +81,12 @@ raise_exception (void)
panic ("unw_step() failed!\n");
return;
}
+ else if (verbose)
+ {
+ unw_get_reg (&cursor, UNW_REG_IP, &ip);
+ unw_get_reg (&cursor, UNW_REG_SP, &sp);
+ printf ("\t #%-3d ip=%p sp=%p\n", i + 1, (void*) ip, (void*) sp);
+ }
unw_resume (&cursor); /* transfer control to exception handler */
}
@@ -86,7 +104,7 @@ get_bsp (void)
#endif
}
-int
+int NOINLINE
a (int n)
{
long stack;
@@ -118,7 +136,7 @@ a (int n)
return result;
}
-void
+void NOINLINE
b (int n)
{
if ((n & 1) == 0)
|
bmp280 reads at the right frequency. | @@ -51,7 +51,9 @@ func NewBMP280(i2cbus *embd.I2CBus, freq time.Duration) (*BMP280, error) {
func (bmp *BMP280) run() {
bmp.running = true
+ clock := time.NewTicker(100 * time.Millisecond)
for bmp.running {
+ <-clock.C
bmp.data = <-bmp.sensor.C
}
}
|
sched/signal: fix error handling in sigtimedwait() | @@ -280,10 +280,6 @@ int nxsig_timedwait(FAR const sigset_t *set, FAR struct siginfo *info,
}
#endif
- /* Save the set of pending signals to wait for */
-
- rtcb->sigwaitmask = *set;
-
/* Check if we should wait for the timeout */
if (timeout != NULL)
@@ -309,6 +305,12 @@ int nxsig_timedwait(FAR const sigset_t *set, FAR struct siginfo *info,
waitticks = MSEC2TICK(waitmsec);
#endif
+ if (waitticks > 0)
+ {
+ /* Save the set of pending signals to wait for */
+
+ rtcb->sigwaitmask = *set;
+
/* Start the watchdog */
wd_start(&rtcb->waitdog, waitticks,
@@ -326,11 +328,21 @@ int nxsig_timedwait(FAR const sigset_t *set, FAR struct siginfo *info,
wd_cancel(&rtcb->waitdog);
}
+ else
+ {
+ leave_critical_section(flags);
+ return -EAGAIN;
+ }
+ }
/* No timeout, just wait */
else
{
+ /* Save the set of pending signals to wait for */
+
+ rtcb->sigwaitmask = *set;
+
/* And wait until one of the unblocked signals is posted,
* but first make sure this is not the idle task,
* descheduling that isn't going to end well.
@@ -356,6 +368,13 @@ int nxsig_timedwait(FAR const sigset_t *set, FAR struct siginfo *info,
if (nxsig_ismember(set, rtcb->sigunbinfo.si_signo))
{
+ /* Return the signal info to the caller if so requested */
+
+ if (info != NULL)
+ {
+ memcpy(info, &rtcb->sigunbinfo, sizeof(struct siginfo));
+ }
+
/* Yes.. the return value is the number of the signal that
* awakened us.
*/
@@ -395,13 +414,6 @@ int nxsig_timedwait(FAR const sigset_t *set, FAR struct siginfo *info,
}
}
- /* Return the signal info to the caller if so requested */
-
- if (info)
- {
- memcpy(info, &rtcb->sigunbinfo, sizeof(struct siginfo));
- }
-
leave_critical_section(flags);
}
|
fs/epoll: Notify POLLIN directly(avoid set POLLFILE) | @@ -365,7 +365,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
return -1;
}
- poll_notify(&eph->poll, 1, eph->poll[0].events);
+ poll_notify(&eph->poll, 1, POLLIN);
return 0;
}
|
Fix the Readme about Kconfig-frontend Installation explanation | @@ -78,7 +78,7 @@ Please keep in mind that we are actively working on board configurations, and wi
## APPENDIX
### Kconfig-frontends Installation
-1. The *gperf* and *libncurses5-dev* packages should be installed.
+1. The *byacc*, *flex*, *gperf* and *libncurses5-dev* packages should be installed.
```bash
sudo apt-get install byacc flex gperf libncurses5-dev
```
|
tdep_uc_addr: use +4 offset for UNW_MIPS_PC on MIPS (be)
According to mcontext_t definition its "pc" field
is also 64 bit wide and thus requires 4 byte offset
on MIPS32 (be). | @@ -59,7 +59,7 @@ tdep_uc_addr (ucontext_t *uc, int reg)
{
char *addr = uc_addr (uc, reg);
- if (reg >= UNW_MIPS_R0 && reg <= UNW_MIPS_R31
+ if (((reg >= UNW_MIPS_R0 && reg <= UNW_MIPS_R31) || reg == UNW_MIPS_PC)
&& tdep_big_endian (unw_local_addr_space)
&& unw_local_addr_space->abi == UNW_MIPS_ABI_O32)
addr += 4;
|
zoul: remove implicit enum conversion
Convert the values from one enum to
the other. | @@ -55,19 +55,40 @@ disk_initialize(BYTE pdrv)
DRESULT __attribute__((__weak__))
disk_read(BYTE pdrv, BYTE *buff, DWORD sector, UINT count)
{
- return mmc_driver.read(pdrv, buff, sector, count);
+ switch(mmc_driver.read(pdrv, buff, sector, count)) {
+ default:
+ case DISK_RESULT_NO_INIT:
+ case DISK_RESULT_IO_ERROR: return RES_ERROR;
+ case DISK_RESULT_OK: return RES_OK;
+ case DISK_RESULT_WR_PROTECTED: return RES_WRPRT;
+ case DISK_RESULT_INVALID_ARG: return RES_PARERR;
+ }
}
/*----------------------------------------------------------------------------*/
DRESULT __attribute__((__weak__))
disk_write(BYTE pdrv, const BYTE *buff, DWORD sector, UINT count)
{
- return mmc_driver.write(pdrv, buff, sector, count);
+ switch(mmc_driver.write(pdrv, buff, sector, count)) {
+ default:
+ case DISK_RESULT_NO_INIT:
+ case DISK_RESULT_IO_ERROR: return RES_ERROR;
+ case DISK_RESULT_OK: return RES_OK;
+ case DISK_RESULT_WR_PROTECTED: return RES_WRPRT;
+ case DISK_RESULT_INVALID_ARG: return RES_PARERR;
+ }
}
/*----------------------------------------------------------------------------*/
DRESULT __attribute__((__weak__))
disk_ioctl(BYTE pdrv, BYTE cmd, void *buff)
{
- return mmc_driver.ioctl(pdrv, cmd, buff);
+ switch(mmc_driver.ioctl(pdrv, cmd, buff)) {
+ default:
+ case DISK_RESULT_NO_INIT:
+ case DISK_RESULT_IO_ERROR: return RES_ERROR;
+ case DISK_RESULT_OK: return RES_OK;
+ case DISK_RESULT_WR_PROTECTED: return RES_WRPRT;
+ case DISK_RESULT_INVALID_ARG: return RES_PARERR;
+ }
}
/*----------------------------------------------------------------------------*/
DWORD __attribute__((__weak__))
|
Silence clang warning about comparing function pointers.
The comparison is used to create a set of function pointers. | @@ -409,7 +409,7 @@ static void janet_registry_sort(void) {
JanetCFunRegistry reg = janet_vm.registry[i];
size_t j;
for (j = i; j > 0; j--) {
- if (janet_vm.registry[j - 1].cfun < reg.cfun) break;
+ if ((void *)(janet_vm.registry[j - 1].cfun) < (void *)(reg.cfun)) break;
janet_vm.registry[j] = janet_vm.registry[j - 1];
}
janet_vm.registry[j] = reg;
@@ -463,7 +463,7 @@ JanetCFunRegistry *janet_registry_get(JanetCFunction key) {
if (mid->cfun == key) {
return mid;
}
- if (mid->cfun > key) {
+ if ((void *)(mid->cfun) > (void *)(key)) {
hi = mid;
} else {
lo = mid + 1;
|
Build Lua binding for OSX via Github actions. | @@ -88,6 +88,42 @@ jobs:
PKG_CONFIG_PATH=~/tinyspline/lib64/pkgconfig make test
fi
+ lua:
+ needs: build
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [macos-10.15]
+ luaVersion: ["5.1", "5.2", "5.3", "5.4"]
+
+ steps:
+ - uses: actions/checkout@master
+ - uses: leafo/[email protected]
+ with:
+ luaVersion: ${{ matrix.luaVersion }}
+ - uses: leafo/[email protected]
+
+ - name: Create Build Environment
+ run: cmake -E make_directory ${{runner.workspace}}/build
+
+ - name: Configure CMake
+ shell: bash
+ working-directory: ${{runner.workspace}}/build
+ run: |
+ cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DTINYSPLINE_ENABLE_LUA=True
+
+ - name: Build
+ working-directory: ${{runner.workspace}}/build
+ shell: bash
+ run: luarocks make --pack-binary-rock
+
+ - name: Deploy
+ uses: actions/upload-artifact@v2
+ with:
+ name: lua-${{ matrix.luaVersion }}-${{ matrix.os }}_amd64
+ path: ${{runner.workspace}}/build/*.rock
+ if-no-files-found: error
+
python:
needs: build
runs-on: ${{ matrix.os }}
|
Add AddonAttribute | @@ -7,6 +7,7 @@ namespace FFXIVClientStructs.FFXIV.Client.UI
// Component::GUI::AtkUnitBase
// Component::GUI::AtkEventListener
[StructLayout(LayoutKind.Explicit, Size = 0x3D0)]
+ [Addon("ChatLogPanel_0", "ChatLogPanel_1", "ChatLogPanel_2", "ChatLogPanel_3")]
public unsafe struct AddonChatLogPanel
{
[FieldOffset(0x0)] public AtkUnitBase AtkUnitBase;
|
tile: don't allow near white tiles | @@ -13,17 +13,24 @@ function getMenuColor(color: string, darkBg: boolean): string {
return bgAdjustedColor(satAdjustedColor, darkBg);
}
+// makes tiles look broken because they blend into BG
+function disallowWhiteTiles(color: string): string {
+ const hslaColor = parseToHsla(color);
+ return hslaColor[2] >= 0.95 ? darken(color, hslaColor[2] - 0.95) : color;
+}
+
export const useTileColor = (color: string) => {
const theme = useCurrentTheme();
const darkTheme = theme === 'dark';
- const tileColor = darkTheme ? getDarkColor(color) : color;
+ const allowedColor = disallowWhiteTiles(color);
+ const tileColor = darkTheme ? getDarkColor(allowedColor) : allowedColor;
const darkBg = !readableColorIsBlack(tileColor);
const lightText = darkBg !== darkTheme; // if not same, light text
const suspendColor = darkTheme ? 'rgb(26,26,26)' : 'rgb(220,220,220)';
return {
theme,
- tileColor: theme === 'dark' ? getDarkColor(color) : color,
+ tileColor,
menuColor: getMenuColor(tileColor, darkBg),
suspendColor,
suspendMenuColor: bgAdjustedColor(suspendColor, darkBg),
|
WIP: try allowing ptrace | @@ -747,7 +747,7 @@ def withDockerEnv(image, cl) {
echo "Starting ${env.STAGE_NAME} on ${env.NODE_NAME}"
checkout scm
docker.image(image.id)
- .inside("-v ${env.HOME}/git_mirrors:/home/jenkins/git_mirrors") { cl() }
+ .inside("-v ${env.HOME}/git_mirrors:/home/jenkins/git_mirrors --cap-add SYS_PTRACE") { cl() }
}
}
}
|
Added additional debug messages when starting WebSocket server. | @@ -2833,9 +2833,11 @@ ws_start (WSServer * server)
if (wsconfig.sslcert && wsconfig.sslkey) {
LOG (("==Using TLS/SSL==\n"));
wsconfig.use_ssl = 1;
- if (initialize_ssl_ctx (server))
+ if (initialize_ssl_ctx (server)) {
+ LOG (("Unable to initialize_ssl_ctx\n"));
return;
}
+ }
#endif
memset (&fdstate, 0, sizeof fdstate);
@@ -2858,14 +2860,17 @@ ws_start (WSServer * server)
if (select (max_file_fd, &fdstate.rfds, &fdstate.wfds, NULL, NULL) == -1) {
switch (errno) {
case EINTR:
+ LOG (("A signal was caught on select(2)\n"));
break;
default:
FATAL ("Unable to select: %s.", strerror (errno));
}
}
/* handle self-pipe trick */
- if (FD_ISSET (server->self_pipe[0], &fdstate.rfds))
+ if (FD_ISSET (server->self_pipe[0], &fdstate.rfds)) {
+ LOG (("Handled self-pipe to close event loop.\n"));
break;
+ }
/* iterate over existing connections */
for (conn = 0; conn < max_file_fd; ++conn) {
|
[examples] Fix modify_normals.py hack. | @@ -42,9 +42,9 @@ with Hdf5() as io:
relations_keeper = {}
class MyBulletR(Mechanics.collision.bullet.BulletR):
- def updateContactPoints(self, point):
+ def updateContactPoints(self, point, q1, q2):
# Call usual updateContactPoints
- super(self.__class__,self).updateContactPoints(point)
+ super(self.__class__,self).updateContactPoints(point, q1, q2)
# Add some noise to the normal's direction
n = self.nc() + np.random.normal(0, 0.1, 3)
@@ -71,7 +71,8 @@ class MyBulletManager(Mechanics.collision.bullet.SiconosBulletCollisionManager):
# BulletR-derived class.
def makeBulletR(self, ds1, shape1, ds2, shape2, manifoldpoint,
flip=False, y_correction_A=0, y_correction_B=0, scaling=1):
- r = MyBulletR(manifoldpoint, flip, y_correction_A, y_correction_B, scaling)
+ r = MyBulletR(manifoldpoint, ds1.q(), None,
+ flip, y_correction_A, y_correction_B, scaling)
relations_keeper[r] = True
return r
|
Remove delay from LL | @@ -116,7 +116,6 @@ configure_uart(uint32_t baudrate) {
if (!initialized) {
thread_handle = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)uart_thread, NULL, 0, 0);
}
- esp_delay(3000);
}
/**
|
README.md: Use version 2.05.40 | @@ -36,11 +36,11 @@ https://github.com/dresden-elektronik/deconz-rest-plugin/releases
1. Download deCONZ package
- wget http://www.dresden-elektronik.de/rpi/deconz/beta/deconz-2.05.39-qt5.deb
+ wget http://www.dresden-elektronik.de/rpi/deconz/beta/deconz-2.05.40-qt5.deb
2. Install deCONZ package
- sudo dpkg -i deconz-2.05.39-qt5.deb
+ sudo dpkg -i deconz-2.05.40-qt5.deb
**Important** this step might print some errors *that's ok* and will be fixed in the next step.
@@ -55,11 +55,11 @@ The deCONZ package already contains the REST API plugin, the development package
1. Download deCONZ development package
- wget http://www.dresden-elektronik.de/rpi/deconz-dev/deconz-dev-2.05.39.deb
+ wget http://www.dresden-elektronik.de/rpi/deconz-dev/deconz-dev-2.05.40.deb
2. Install deCONZ development package
- sudo dpkg -i deconz-dev-2.05.39.deb
+ sudo dpkg -i deconz-dev-2.05.40.deb
3. Install missing dependencies
@@ -74,7 +74,7 @@ The deCONZ package already contains the REST API plugin, the development package
2. Checkout related version tag
cd deconz-rest-plugin
- git checkout -b mybranch V2_05_39
+ git checkout -b mybranch V2_05_40
3. Compile the plugin
|
calyptia: fix segfault when some properties are not set. | @@ -91,6 +91,7 @@ static void pipeline_config_add_properties(flb_sds_t *buf, struct mk_list *props
mk_list_foreach(head, props) {
kv = mk_list_entry(head, struct flb_kv, _head);
+ if (kv->key != NULL && kv->val != NULL) {
flb_sds_printf(buf, " %s ", kv->key);
if (is_sensitive_property(kv->key)) {
@@ -103,6 +104,7 @@ static void pipeline_config_add_properties(flb_sds_t *buf, struct mk_list *props
flb_sds_printf(buf, "\n");
}
}
+}
flb_sds_t custom_calyptia_pipeline_config_get(struct flb_config *ctx)
{
|
Update Windows.Devices.Pwm version | @@ -58,5 +58,5 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_Windows_Devices_Pwm =
"Windows.Devices.Pwm",
0xBBD6237A,
method_lookup,
- { 1, 0, 0, 0 }
+ { 1, 0, 2, 8 }
};
|
SOVERSION bump to version 5.6.40 | @@ -54,7 +54,7 @@ set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_
# with backward compatible change and micro version is connected with any internal change of the library.
set(SYSREPO_MAJOR_SOVERSION 5)
set(SYSREPO_MINOR_SOVERSION 6)
-set(SYSREPO_MICRO_SOVERSION 39)
+set(SYSREPO_MICRO_SOVERSION 40)
set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}.${SYSREPO_MICRO_SOVERSION})
set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
|
sse: add a couple more NEON implementations
I think I'm done with NEON for SSE. There are probably a few places
where the NEON implementation could be better, in which case I'm happy
to accept patches, but overall I think the implementations are pretty
solid. | @@ -2829,6 +2829,8 @@ void
simde_mm_stream_pi (simde__m64* mem_addr, simde__m64 a) {
#if defined(SIMDE_SSE_NATIVE)
_mm_stream_pi(&(mem_addr->n), a.n);
+#elif defined(SIMDE_SSE_NEON)
+ mem_addr->i64[0] = vget_lane_s64(a.neon_i64, 0);
#else
mem_addr->i64[0] = a.i64[0];
#endif
@@ -2844,6 +2846,8 @@ simde_mm_stream_ps (simde_float32 mem_addr[4], simde__m128 a) {
#if defined(SIMDE_SSE_NATIVE)
_mm_stream_ps(mem_addr, a.n);
+#elif defined(SIMDE_SSE_NEON)
+ vst1q_f32(mem_addr, a.neon_f32);
#else
SIMDE__ASSUME_ALIGNED(mem_addr, 16);
memcpy(mem_addr, &a, sizeof(a));
|
Fix another set of warnings that crept in during previous fix merges | @@ -98,7 +98,7 @@ void fillPixels (Array2D<unsigned int>& sampleCount, Array2D<T*> &ph, int width,
for (int x = 0; x < width; ++x)
{
ph[y][x] = new T[sampleCount[y][x]];
- for (int i = 0; i < sampleCount[y][x]; i++)
+ for (unsigned int i = 0; i < sampleCount[y][x]; i++)
{
//
// We do this because half cannot store number bigger than 2048 exactly.
@@ -181,7 +181,7 @@ bool checkPixels (Array2D<unsigned int>& sampleCount, Array2D<T*> &ph,
for (int y = ly; y <= ry; ++y)
for (int x = lx; x <= rx; ++x)
{
- for (int i = 0; i < sampleCount[y][x]; i++)
+ for (unsigned int i = 0; i < sampleCount[y][x]; i++)
{
if (ph[y][x][i] != (y * width + x) % 2049)
{
|
upstream: made a few shutdown calls conditional | @@ -796,7 +796,10 @@ int flb_upstream_conn_timeouts(struct mk_list *list)
* waiting for I/O will receive the notification and trigger
* the error to it caller.
*/
+ if (u_conn->fd != -1) {
shutdown(u_conn->fd, SHUT_RDWR);
+ }
+
u_conn->net_error = ETIMEDOUT;
prepare_destroy_conn(u_conn);
}
@@ -806,7 +809,10 @@ int flb_upstream_conn_timeouts(struct mk_list *list)
mk_list_foreach_safe(u_head, tmp, &uq->av_queue) {
u_conn = mk_list_entry(u_head, struct flb_upstream_conn, _head);
if ((now - u_conn->ts_available) >= u->net.keepalive_idle_timeout) {
+ if (u_conn->fd != -1) {
shutdown(u_conn->fd, SHUT_RDWR);
+ }
+
prepare_destroy_conn(u_conn);
flb_debug("[upstream] drop keepalive connection #%i to %s:%i "
"(keepalive idle timeout)",
|
Require vector extensions for shuffle/convert function. | # endif
# endif
-/* GCC and clang have built-in functions to handle shuffling of
- vectors, but the implementations are slightly different. This
- macro is just an abstraction over them. Note that elem_size is in
- bits but vec_size is in bytes. */
-# if !defined(SIMDE_NO_SHUFFLE_VECTOR)
+/* GCC and clang have built-in functions to handle shuffling and
+ converting of vectors, but the implementations are slightly
+ different. This macro is just an abstraction over them. Note that
+ elem_size is in bits but vec_size is in bytes. */
+# if !defined(SIMDE_NO_SHUFFLE_VECTOR) && defined(SIMDE_VECTOR_SUBSCRIPT)
# if HEDLEY_HAS_BUILTIN(__builtin_shufflevector)
# define SIMDE__SHUFFLE_VECTOR(elem_size, vec_size, a, b, ...) __builtin_shufflevector(a, b, __VA_ARGS__)
# elif HEDLEY_GCC_HAS_BUILTIN(__builtin_shuffle,4,7,0) && !defined(__INTEL_COMPILER)
# endif
# endif
+/* TODO: this actually works on XL C/C++ without SIMDE_VECTOR_SUBSCRIPT
+ but the code needs to be refactored a bit to take advantage. */
+# if !defined(SIMDE_NO_CONVERT_VECTOR) && defined(SIMDE_VECTOR_SUBSCRIPT)
# if HEDLEY_HAS_BUILTIN(__builtin_convertvector) || HEDLEY_GCC_VERSION_CHECK(9,0,0)
# define SIMDE__CONVERT_VECTOR(to, from) ((to) = __builtin_convertvector((from), __typeof__(to)))
# endif
# endif
+#endif
/* Since we currently require SUBSCRIPT before using a vector in a
union, we define these as dependencies of SUBSCRIPT. They are
|
mpi-families/impi-devel: define MPI_HOME variable to be consistent
with ohpc-style modulefiles for other MPI stacks | @@ -178,6 +178,12 @@ EOF
prepend-path PATH ${topDir}/${dir}/linux/mpi/intel64/bin_ohpc
EOF
+ # Also define MPI_HOME based on $I_MPI_ROOT
+ IMPI_HOME=`egrep "^setenv\s+I_MPI_ROOT" %{OHPC_MODULEDEPS}/intel/impi/${version} | awk '{print $3}'`
+ if [ -d "$IMPI_HOME/intel64" ];then
+ echo "setenv MPI_HOME $IMPI_HOME/intel64" >> %{OHPC_MODULEDEPS}/intel/impi/${version}
+ fi
+
# Version file
%{__cat} << EOF > %{OHPC_MODULEDEPS}/intel/impi/.version.${version}
#%Module1.0#####################################################################
@@ -224,6 +230,12 @@ EOF
set ModulesVersion "${version}"
EOF
+ # Also define MPI_HOME based on $I_MPI_ROOT
+ IMPI_HOME=`egrep "^setenv\s+I_MPI_ROOT" %{OHPC_MODULEDEPS}/intel/impi/${version} | awk '{print $3}'`
+ if [ -d "$IMPI_HOME/intel64" ];then
+ echo "setenv MPI_HOME $IMPI_HOME/intel64" >> %{OHPC_MODULEDEPS}/gnu/impi/${version}
+ fi
+
# support for additional gnu variants
%{__cp} %{OHPC_MODULEDEPS}/gnu/impi/${version} %{OHPC_MODULEDEPS}/gnu7/impi/${version}
%{__cp} %{OHPC_MODULEDEPS}/gnu/impi/.version.${version} %{OHPC_MODULEDEPS}/gnu7/impi/.version.${version}
|
fix(draw_border):draw error if radius == 0 and parent clip_corner == true | @@ -1080,7 +1080,9 @@ void draw_border_generic(const lv_area_t * clip_area, const lv_area_t * outer_ar
{
opa = opa >= LV_OPA_COVER ? LV_OPA_COVER : opa;
- if(rout == 0 && rin == 0) {
+ bool mask_any = lv_draw_mask_is_any(outer_area);
+
+ if(!mask_any && rout == 0 && rin == 0) {
draw_border_simple(clip_area, outer_area, inner_area, color, opa);
return;
}
@@ -1092,8 +1094,6 @@ void draw_border_generic(const lv_area_t * clip_area, const lv_area_t * outer_ar
if(!_lv_area_intersect(&draw_area, outer_area, clip_area)) return;
int32_t draw_area_w = lv_area_get_width(&draw_area);
- bool mask_any = lv_draw_mask_is_any(outer_area);
-
/*Create a mask if there is a radius*/
lv_opa_t * mask_buf = lv_mem_buf_get(draw_area_w);
|
mmapstorage: update docu | #include <stdlib.h> // strtol()
#include <string.h> // memcmp()
#include <sys/mman.h> // mmap()
-#include <sys/stat.h> // stat()
+#include <sys/stat.h> // stat(), fstat()
#include <sys/types.h> // ftruncate (), size_t
-#include <unistd.h> // close(), ftruncate(), unlink(), write()
+#include <unistd.h> // close(), ftruncate(), unlink(), read(), write()
#ifdef ELEKTRA_MMAP_CHECKSUM
#include <zlib.h> // crc32()
@@ -60,7 +60,8 @@ typedef enum
*
* @param parentKey containing the filename
* @param flags file access mode
- * @param mode file mode bits when file is created
+ * @param openMode file mode bits when file is created
+ * @param mode the current plugin mode
*
* @return file descriptor
*/
@@ -82,6 +83,7 @@ static int openFile (Key * parentKey, int flag, mode_t openMode, PluginMode mode
* @param fd the file descriptor
* @param mmapsize size of the mapped region
* @param parentKey holding the filename, for debug purposes
+ * @param mode the current plugin mode
*
* @retval 1 on success
* @retval -1 if ftruncate() failed
@@ -101,8 +103,10 @@ static int truncateFile (int fd, size_t mmapsize, Key * parentKey ELEKTRA_UNUSED
/**
* @brief Wrapper for fstat().
*
+ * @param fd the file descriptor
* @param sbuf the stat structure
* @param parentKey holding the filename
+ * @param mode the current plugin mode
*
* @retval 1 on success
* @retval -1 if fstat() failed
@@ -125,6 +129,7 @@ static int fstatFile (int fd, struct stat * sbuf, Key * parentKey ELEKTRA_UNUSED
*
* @param sbuf the stat structure
* @param parentKey holding the filename
+ * @param mode the current plugin mode
*
* @retval 1 on success
* @retval -1 if stat() failed
@@ -150,6 +155,7 @@ static int statFile (struct stat * sbuf, Key * parentKey, PluginMode mode)
* @param mmapSize size of the mapped region
* @param mapOpts mmap flags (MAP_PRIVATE, MAP_FIXED, ...)
* @param parentKey holding the filename, for debug purposes
+ * @param mode the current plugin mode
*
* @return pointer to mapped region on success, MAP_FAILED on failure
*/
@@ -180,6 +186,16 @@ static char * mmapFile (void * addr, int fd, size_t mmapSize, int mapOpts, Key *
return mappedRegion;
}
+
+/**
+ * @brief Copy file
+ *
+ * @param sourceFd source file descriptor
+ * @param destFd destination file descriptor
+ *
+ * @retval 0 on success
+ * @retval -1 if any error occured
+ */
static int copyFile (int sourceFd, int destFd)
{
ssize_t readBytes = 0;
@@ -215,6 +231,21 @@ static int copyFile (int sourceFd, int destFd)
return 0;
}
+/**
+ * @brief Copy file to anonymous temporary file
+ *
+ * This function is needed to make mmapstorage compatible
+ * with any file. The `mmap()` syscall only supports regular
+ * files.
+ *
+ * @param fd source file descriptor
+ * @param sbuf the stat structure
+ * @param parentKey holding the file name
+ * @param mode the current plugin mode
+ *
+ * @retval 0 on success
+ * @retval -1 if any error occured
+ */
static int copyToAnonymousTempfile (int fd, struct stat * sbuf, Key * parentKey, PluginMode mode)
{
int tmpFd = 0;
|
Added visual studio support for dot net .tt files | info.action = "Compile"
elseif fcfg.buildaction == "Embed" or ext == ".resx" then
info.action = "EmbeddedResource"
- elseif fcfg.buildaction == "Copy" or ext == ".asax" or ext == ".aspx" or ext == ".dll" then
+ elseif fcfg.buildaction == "Copy" or ext == ".asax" or ext == ".aspx" or ext == ".dll" or ext == ".tt" then
info.action = "Content"
elseif fcfg.buildaction == "Resource" then
info.action = "Resource"
info.SubType = "Form"
end
+ testname = basename .. ".tt"
+ if project.hasfile(fcfg.project, testname) then
+ info.AutoGen = "True"
+ info.DesignTime = "True"
+ info.DependentUpon = testname
+ end
+
end
-- Allow C# object type build actions to override the default
end
end
+ if info.action == "Content" and fname:endswith(".tt") then
+ local testname = fname:sub(1, -4) .. ".cs"
+ if project.hasfile(fcfg.project, testname) then
+ info.Generator = "TextTemplatingFileGenerator"
+ info.LastGenOutput = path.getname(testname)
+ info.CopyToOutputDirectory = nil
+ end
+ end
+
if info.action == "None" and fname:endswith(".xsd") then
local testname = fname:sub(1, -5) .. ".Designer.cs"
if project.hasfile(fcfg.project, testname) then
|
Ignore steam dbus warning | @@ -21,6 +21,7 @@ cd ../ && rm -rf ./tmp/
echo "#!/bin/bash
export STEAMOS=1
export STEAM_RUNTIME=1
+export DBUS_FATAL_WARNINGS=0
~/steam/bin/steam -noreactlogin steam://open/minigameslist $@" > steam
# make script executable and move
|
document replace_one's reply | @@ -34,7 +34,7 @@ Description
This function shall replace documents in ``collection`` that match ``selector`` with ``replacement``.
-If you pass a non-NULL ``reply``, it is filled out with fields "modifiedCount" and "matchedCount". If there is a server error then ``reply`` contains either a "writeErrors" array with one subdocument or a "writeConcernErrors" array. The reply must be freed with :symbol:`bson:bson_destroy`.
+If provided, ``reply`` will be initialized and populated with the fields ``matchedCount``, ``modifiedCount``, ``upsertedCount``, and optionally ``upsertedId`` if applicable. If there is a server error then ``reply`` contains either a ``writeErrors`` array with one subdocument or a ``writeConcernErrors`` array. The reply must be freed with :symbol:`bson:bson_destroy`.
See Also
--------
|
hv:Remove redundancy 'vlapic' in 'struct vcpu'
It has been defined in 'struct vcpu_arch'
Acked-by: Eddie Dong | @@ -222,7 +222,6 @@ struct vcpu {
/* State of debug request for this VCPU */
volatile enum vcpu_state dbg_req_state;
uint64_t sync; /*hold the bit events*/
- struct acrn_vlapic *vlapic; /* per vCPU virtualized LAPIC */
struct list_head run_list; /* inserted to schedule runqueue */
uint64_t pending_pre_work; /* any pre work pending? */
|
esp32/modmachine: Add implementation of machine.soft_reset(). | #include "py/obj.h"
#include "py/runtime.h"
+#include "lib/utils/pyexec.h"
#include "extmod/machine_mem.h"
#include "extmod/machine_signal.h"
#include "extmod/machine_pulse.h"
@@ -193,6 +194,12 @@ STATIC mp_obj_t machine_reset(void) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
+STATIC mp_obj_t machine_soft_reset(void) {
+ pyexec_system_exit = PYEXEC_FORCED_EXIT;
+ nlr_raise(mp_obj_new_exception(&mp_type_SystemExit));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
+
STATIC mp_obj_t machine_unique_id(void) {
uint8_t chipid[6];
esp_efuse_mac_get_default(chipid);
@@ -228,6 +235,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_freq_obj) },
{ MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&machine_reset_obj) },
+ { MP_ROM_QSTR(MP_QSTR_soft_reset), MP_ROM_PTR(&machine_soft_reset_obj) },
{ MP_ROM_QSTR(MP_QSTR_unique_id), MP_ROM_PTR(&machine_unique_id_obj) },
{ MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&machine_lightsleep_obj) },
{ MP_ROM_QSTR(MP_QSTR_lightsleep), MP_ROM_PTR(&machine_lightsleep_obj) },
|
Fix mistake / outdated doc comment
Unlike original reference code, Redis uses 64bit variable, so half the bits make it 32bit, not 16 | /* Interleave lower bits of x and y, so the bits of x
* are in the even positions and bits from y in the odd;
- * x and y must initially be less than 2**32 (65536).
+ * x and y must initially be less than 2**32 (4294967296).
* From: https://graphics.stanford.edu/~seander/bithacks.html#InterleaveBMN
*/
static inline uint64_t interleave64(uint32_t xlo, uint32_t ylo) {
|
Remove duplicated macros for R_SetFlags() R_ClearFlags()
They only need to be defined in resource.h | @@ -369,7 +369,6 @@ bool getResourceItemDescriptor(const QString &str, ResourceItemDescriptor &descr
/*! Clears \p flags in \p item which must be a numeric value item.
The macro is used to print the flag defines as human readable.
*/
-#define R_ClearFlags(item, flags) R_ClearFlags1(item, flags, #flags)
bool R_ClearFlags1(ResourceItem *item, qint64 flags, const char *strFlags)
{
DBG_Assert(item);
@@ -391,7 +390,6 @@ bool R_ClearFlags1(ResourceItem *item, qint64 flags, const char *strFlags)
/*! Sets \p flags in \p item which must be a numeric value item.
The macro is used to print the flag defines as human readable.
*/
-#define R_SetFlags(item, flags) R_SetFlags1(item, flags, #flags)
bool R_SetFlags1(ResourceItem *item, qint64 flags, const char *strFlags)
{
DBG_Assert(item);
|
Invalidate join response struct before beginning. | @@ -31,6 +31,8 @@ owerror_t cbor_parse_join_response(join_response_t *response, uint8_t *buf, uint
uint8_t *tmp;
owerror_t error;
+ memset(response, 0x00, sizeof(join_response_t));
+
error = E_SUCCESS;
tmp = buf;
major_type = (cbor_majortype_t) *buf >> 5;
|
lovr.graphics.submit works; | @@ -462,7 +462,27 @@ static int l_lovrGraphicsInit(lua_State* L) {
}
static int l_lovrGraphicsSubmit(lua_State* L) {
- lovrGraphicsSubmit(NULL, 0);
+ bool table = lua_istable(L, 1);
+ int count = table ? luax_len(L, 1) : lua_gettop(L);
+
+ Pass* stack[8];
+ Pass** passes = (size_t) count > COUNTOF(stack) ? malloc(count * sizeof(Pass*)) : stack;
+ lovrAssert(passes, "Out of memory");
+
+ if (table) {
+ for (int i = 0; i < count; i++) {
+ lua_rawgeti(L, 1, i + 1);
+ passes[i] = luax_checktype(L, -1, Pass);
+ lua_pop(L, 1);
+ }
+ } else {
+ for (int i = 0; i < count; i++) {
+ passes[i] = luax_checktype(L, i + 1, Pass);
+ }
+ }
+
+ lovrGraphicsSubmit(passes, count);
+ if (passes != stack) free(passes);
return 0;
}
|
graph-api: prevent more than one join request | @@ -3,8 +3,8 @@ import { StoreState } from '../store/type';
import { Patp, Path, PatpNoSig } from '~/types/noun';
import _ from 'lodash';
import {makeResource, resourceFromPath} from '../lib/group';
-import {GroupPolicy, Enc, Post, NodeMap, Content} from '~/types';
-import { numToUd, unixToDa, decToUd, deSig } from '~/logic/lib/util';
+import {GroupPolicy, Enc, Post, NodeMap, Content, Resource} from '~/types';
+import { numToUd, unixToDa, decToUd, deSig, resourceAsPath } from '~/logic/lib/util';
export const createBlankNodeWithChildPost = (
parentIndex: string = '',
@@ -81,6 +81,8 @@ function moduleToMark(mod: string): string | undefined {
export default class GraphApi extends BaseApi<StoreState> {
+ joiningGraphs = new Set<string>();
+
private storeAction(action: any): Promise<any> {
return this.action('graph-store', 'graph-update', action)
}
@@ -138,11 +140,19 @@ export default class GraphApi extends BaseApi<StoreState> {
joinGraph(ship: Patp, name: string) {
const resource = makeResource(ship, name);
+ const rid = resourceAsPath(resource);
+ if(this.joiningGraphs.has(rid)) {
+ return Promise.resolve();
+ }
+ this.joiningGraphs.add(rid);
return this.viewAction('graph-join', {
join: {
resource,
ship,
}
+ }).then(res => {
+ this.joiningGraphs.delete(rid);
+ return res;
});
}
|
naive: l2 csv apply ~wicdev's style suggestions | +$ keccak @ux :: used for transaction and roll hashes
+$ blocknum number:block :: @udblocknumber
+$ net net:dice ::?(%mainnet %ropsten %local %default)
- +$ block-map %+ map blocknum
+ +$ block-map
+ %+ map blocknum
[timestamp=@da rolls=(map keccak [[gas=@ud sender=address] =effects:naive])]
+$ rolls-map (map blocknum (map keccak effects:naive))
::
- +$ action $? %transfer-point
+ +$ action
+ $? %transfer-point
%spawn
%configure-keys
%escape
?~ cur
%+ ~(put by out) block
(my [[transaction-hash.u.mined.log effects]~])
- %+ ~(jab by out) u.cur
- |= m=(map keccak effects:naive)
- (~(put by m) transaction-hash.u.mined.log effects)
+ %+ ~(put by out) block
+ (~(put by u.cur) transaction-hash.u.mined.log effects)
==
::
:: +export-csv writes a (list cord) as csv to disk at .pax
|
tests: internal: fizzer: updated sha512 test | #include <fluent-bit/flb_gzip.h>
#include <fluent-bit/flb_hash_table.h>
#include <fluent-bit/flb_uri.h>
-#include <fluent-bit/flb_sha512.h>
+#include <fluent-bit/flb_hash.h>
#include <fluent-bit/flb_regex.h>
#include "flb_fuzz_header.h"
@@ -197,14 +197,15 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
}
/* Fuzzing the sha routines */
- struct flb_sha512 sha512;
+ struct flb_hash sha512;
uint8_t buf[64];
- flb_sha512_init(&sha512);
- flb_sha512_update(&sha512, null_terminated, 32);
- flb_sha512_update(&sha512, null_terminated+32, 32);
- flb_sha512_update(&sha512, null_terminated+64, 32);
- flb_sha512_sum(&sha512, buf);
+ flb_hash_init(&sha512, FLB_HASH_SHA512);
+ flb_hash_update(&sha512, (unsigned char *) null_terminated, 32);
+ flb_hash_update(&sha512, (unsigned char *) null_terminated+32, 32);
+ flb_hash_update(&sha512, (unsigned char *) null_terminated+64, 32);
+ flb_hash_finalize(&sha512, buf, sizeof(buf));
+ flb_hash_cleanup(&sha512);
/* regex */
char *pregex = "^(?<INT>[^ ]+) (?<FLOAT>[^ ]+) (?<BOOL>[^ ]+) (?<STRING>.+)$";
|
ESPIRiT GPU test | @@ -40,6 +40,15 @@ tests/test-ecalib-rotation2: ecalib cc fmac transpose nrmse $(TESTS_OUT)/shepplo
rm *.ra ; cd .. ; rmdir $(TESTS_TMP)
touch $@
+tests/test-ecalib-gpu: ecalib pocsense nrmse $(TESTS_OUT)/shepplogan_coil_ksp.ra
+ set -e ; mkdir $(TESTS_TMP) ; cd $(TESTS_TMP) ;\
+ $(TOOLDIR)/ecalib -m1 $(TESTS_OUT)/shepplogan_coil_ksp.ra coils1.ra ;\
+ $(TOOLDIR)/ecalib -g -m1 $(TESTS_OUT)/shepplogan_coil_ksp.ra coils2.ra ;\
+ $(TOOLDIR)/nrmse -t 0.00001 coils1.ra coils2.ra ;\
+ rm *.ra ; cd .. ; rmdir $(TESTS_TMP)
+ touch $@
+
TESTS += tests/test-ecalib tests/test-ecalib-auto tests/test-ecalib-rotation
TESTS += tests/test-ecalib-rotation2
+TESTS_GPU += tests/test-ecalib-gpu
|
in_storage_backlog: remove failed chunks from queue on load | @@ -104,8 +104,12 @@ static int cb_queue_chunks(struct flb_input_instance *in,
/* Associate this backlog chunk to this instance into the engine */
ic = flb_input_chunk_map(in, ch);
if (!ic) {
- flb_plg_error(ctx->ins, "error registering chunk");
+ flb_plg_error(ctx->ins, "removing chunk %s:%s from the queue",
+ sbc->stream->name, sbc->chunk->name);
cio_chunk_down(sbc->chunk);
+ cio_chunk_close(sbc->chunk, FLB_FALSE);
+ mk_list_del(&sbc->_head);
+ flb_free(sbc);
continue;
}
|
build: add libssl-dev for ubuntu 16.04 and 18.04
The recent changes to Makefile lead to the lack of libssl-dev
dependency for ubuntu 16.04 and 18.04. Add libssl-dev to DEB_DEPENDS
variable for corresponding ubuntu version.
Type: fix | @@ -75,8 +75,10 @@ DEB_DEPENDS += python3-dev # needed for python3 -m pip install psutil
ifeq ($(OS_VERSION_ID),16.04)
DEB_DEPENDS += python-dev
+ DEB_DEPENDS += libssl-dev
else ifeq ($(OS_VERSION_ID),18.04)
DEB_DEPENDS += python-dev
+ DEB_DEPENDS += libssl-dev
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
DEB_DEPENDS += libssl-dev
APT_ARGS = -t jessie-backports
|
Remove FIXME comment in typecmds.c
We validated a hidden feature of CREATE TYPE which allows users to create
append only column oriented encoding defaults for user defined types. It still
works after the 9.0 merge.
Discussed on gpdb-dev: https://groups.google.com/a/greenplum.org/forum/#!topic/gpdb-dev/gYuBL-Fk8rM | @@ -291,9 +291,10 @@ DefineType(List *names, List *parameters)
else if (is_storage_encoding_directive(defel->defname))
{
/*
- * GPDB_84_MERGE_FIXME: need to check to make sure that this is
- * copied correctly when using CREATE TABLE LIKE. See new logic
- * below.
+ * This is to define default block size, compress type, and
+ * compress level. When this type is used in an append only column
+ * oriented table, the column's encoding will be defaulted to these
+ * values.
*/
encoding = lappend(encoding, defel);
continue;
|
Grr.. last commit unreverted some changes. I think it is right now. | @@ -43,23 +43,46 @@ DEPCONFIG = $(TOPDIR)$(DELIM).config
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define REGISTER
$(Q) echo Register: $1
- $(Q) echo { "$1", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$1.bdat"
- $(Q) if [ ! -z $4 ]; then \
- echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$1.pdat"; \
- fi;
+ $(Q) echo { "$1", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat"
+ $(Q) echo int $4(int argc, char *argv[]); > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat"
$(Q) touch $(BUILTIN_REGISTRY)$(DELIM).updated"
endef
else
define REGISTER
- $(Q) echo "Register: $1 $4"
- $(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$1.bdat"
- $(Q) if [ ! -z $4 ]; then \
- echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$1.pdat"; \
- fi;
+ $(Q) echo "Register: $1"
+ $(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat"
+ $(Q) echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat"
$(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated"
endef
endif
+# COMPILE - a macro to compile a loadable app in C
+
+ifeq ($(LOADABLE),y)
+define COMPILE
+ @echo "CC) $1"
+ $(Q) $(CC) -c $(CELFFLAGS) -DLOADABLE_APP $1 -o $2
+endef
+endif
+
+# COMPILEXX - a macro to compile a loadable app in C++
+
+ifeq ($(LOADABLE),y)
+define COMPILEXX
+ @echo "CXX: $1"
+ $(Q) $(CXX) -c $(CXXELFFLAGS) -DLOADABLE_APP $1 -o $2
+endef
+endif
+
+# ELFLD - a macro to link loadable app
+# Example: $(call ELFLD, entry point, in-file(s), out-file)
+
+define ELFLD
+ @echo "LD: $3"
+ $(Q) $(LD) $(LDELFFLAGS) $2 -o $3
+ $(Q) chmod +x $3
+endef
+
# Tools
#
# In a normal build, tools will reside in the nuttx/tools sub-directory and
|
README.md: Added reference to CMSIS-Build | @@ -23,7 +23,8 @@ The following is an list of all CMSIS components that are available.
|[NN](http://arm-software.github.io/CMSIS_5/NN/html/index.html) | All Cortex-M | Collection of efficient neural network kernels developed to maximize the performance and minimize the memory footprint on Cortex-M processor cores.|
|[RTOS v1](http://arm-software.github.io/CMSIS_5/RTOS/html/index.html) | Cortex-M0/M0+/M3/M4/M7 | Common API for real-time operating systems along with a reference implementation based on RTX. It enables software components that can work across multiple RTOS systems.|
|[RTOS v2](http://arm-software.github.io/CMSIS_5/RTOS2/html/index.html)| All Cortex-M, Cortex-A5/A7/A9 | Extends CMSIS-RTOS v1 with Armv8-M support, dynamic object creation, provisions for multi-core systems, binary compatible interface. |
-|[Pack](http://arm-software.github.io/CMSIS_5/Pack/html/index.html) | All Cortex-M, SecurCore, Cortex-A5/A7/A9 | Describes a delivery mechanism for software components, device parameters, and evaluation board support. It simplifies software re-use and product life-cycle management (PLM). |
+|[Pack](http://arm-software.github.io/CMSIS_5/Pack/html/index.html) | All Cortex-M, SecurCore, Cortex-A5/A7/A9 | Describes a delivery mechanism for software components, device parameters, and evaluation board support. It simplifies software re-use and product life-cycle management (PLM). <br/>Is part of the <a href="https://www.open-cmsis-pack.org" target="_blank"><b>Open CMSIS Pack project</b></a>. |
+|<a href="http://arm-software.github.io/CMSIS_5/Build/html/index.html"><b>Build</b></a>| All Cortex-M, SecurCore, Cortex-A5/A7/A9 | A set of tools, software frameworks, and work flows that improve productivity, for example with Continuous Integration (CI).<br/>Is replaced with the <a href="https://github.com/Open-CMSIS-Pack/devtools/tree/main/tools" target="_blank"><b>CMSIS-Toolbox</b></a>. |
|[SVD](http://arm-software.github.io/CMSIS_5/SVD/html/index.html) | All Cortex-M, SecurCore | Peripheral description of a device that can be used to create peripheral awareness in debuggers or CMSIS-Core header files.|
|[DAP](http://arm-software.github.io/CMSIS_5/DAP/html/index.html) | All Cortex | Firmware for a debug unit that interfaces to the CoreSight Debug Access Port. |
|[Zone](http://arm-software.github.io/CMSIS_5/Zone/html/index.html) | All Cortex-M | Defines methods to describe system resources and to partition these resources into multiple projects and execution areas. |
|
fsplib.c: use snprintf | @@ -663,15 +663,12 @@ int fsp_readdir_r(FSP_DIR *dir,struct dirent *entry, struct dirent **result)
entry->d_ino = 10;
#endif
entry->d_reclen = fentry.reclen;
- strncpy(entry->d_name,fentry.name,MAXNAMLEN);
+ snprintf (entry->d_name, sizeof(entry->d_name), "%s", fentry.name);
- if (fentry.namlen >= MAXNAMLEN)
- {
- entry->d_name[MAXNAMLEN] = '\0';
+ if (fentry.namlen >= MAXNAMLEN) {
#if defined(HAVE_DIRENT_NAMLEN) || defined(_DIRENT_HAVE_D_NAMLEN) // configure || glibc
entry->d_namlen = MAXNAMLEN;
- } else
- {
+ } else {
entry->d_namlen = fentry.namlen;
#endif
}
|
tests: internal: pack: use new flb_pack_json() prototype | @@ -41,6 +41,7 @@ static inline void consume_bytes(char *buf, int bytes, int length)
void test_json_pack()
{
int ret;
+ int root_type;
size_t len;
char *data;
char *out_buf;
@@ -51,7 +52,7 @@ void test_json_pack()
len = strlen(data);
- ret = flb_pack_json(data, len, &out_buf, &out_size);
+ ret = flb_pack_json(data, len, &out_buf, &out_size, &root_type);
TEST_CHECK(ret == 0);
flb_free(data);
|
add vcs field in debian/control | @@ -4,6 +4,8 @@ Priority: optional
Maintainer: Marcus Hardt <[email protected]>
Homepage: https://github.com/indigo-dc/oidc-agent/
Standards-Version: 4.5.0
+Vcs-Git: https://github.com/indigo-dc/oidc-agent.git
+Vcs-browser: https://github.com/indigo-dc/oidc-agent
Rules-Requires-Root: no
Build-Depends: debhelper-compat (= 9),
fakeroot,
|
Add constant for solving again with refinement after a failure | @@ -613,7 +613,8 @@ enum SICONOS_FRICTION_3D_IPM_IPARAM_FINISH_WITHOUT_SCALING_ENUM
enum SICONOS_FRICTION_3D_IPM_IPARAM_REFINEMENT_ENUM
{
SICONOS_FRICTION_3D_IPM_IPARAM_REFINEMENT_NO = 0,
- SICONOS_FRICTION_3D_IPM_IPARAM_REFINEMENT_YES = 1
+ SICONOS_FRICTION_3D_IPM_IPARAM_REFINEMENT_YES = 1,
+ SICONOS_FRICTION_3D_IPM_IPARAM_REFINEMENT_AFTER = 2
};
enum SICONOS_FRICTION_3D_IPM_IPARAM_CHOLESKY_ENUM
|
gall: smaller %watch-not-unique print
Instead of printing all outgoing subscriptions for the app, only print the
subscription whose wire we're trying to re-use. | =. ap-core
=/ =tang
~[leaf+"subscribe wire not unique" >agent-name< >short-wire< >dock<]
- %- (slog >out=outgoing.subscribers.current-agent< tang)
+ =/ have
+ (~(got by outgoing.subscribers.current-agent) short-wire dock)
+ %- (slog >out=have< tang)
(ap-error %watch-not-unique tang)
$(moves t.moves)
=. outgoing.subscribers.current-agent
|
Handle a mix of CNAME, A/AAAA records
Poster-child: 8.8.8.8 resolving mag.ncep.noaa.gov | @@ -941,9 +941,11 @@ vnet_dns_cname_indirection_nolock (dns_main_t * dm, u32 ep_index, u8 * reply)
dns_rr_t *rr;
u8 *curpos;
u8 *pos, *pos2;
+ u8 *cname_pos = 0;
int len, i;
u8 *cname = 0;
u8 *request = 0;
+ u8 *name_copy;
u32 qp_offset;
u16 flags;
u16 rcode;
@@ -999,25 +1001,36 @@ vnet_dns_cname_indirection_nolock (dns_main_t * dm, u32 ep_index, u8 * reply)
case DNS_TYPE_A:
case DNS_TYPE_AAAA:
return 0;
- /* Chase a CNAME pointer? */
+ /*
+ * Maybe chase a CNAME pointer?
+ * It's not unheard-of for name-servers to return
+ * both CNAME and A/AAAA records...
+ */
case DNS_TYPE_CNAME:
- goto chase_chain;
+ cname_pos = pos;
+ break;
/* Some other junk, e.g. a nameserver... */
default:
break;
}
pos += sizeof (*rr) + clib_net_to_host_u16 (rr->rdlength);
+ /* Skip name... */
+ if ((pos2[0] & 0xc0) == 0xc0)
+ pos += 2;
}
/* Neither a CNAME nor a real address. Try another server */
+ if (cname_pos == 0)
+ {
flags &= ~DNS_RCODE_MASK;
flags |= DNS_RCODE_NAME_ERROR;
h->flags = clib_host_to_net_u16 (flags);
return -1;
+ }
-chase_chain:
/* This is a CNAME record, chase the name chain. */
+ pos = cname_pos;
/* The last request is no longer pending.. */
for (i = 0; i < vec_len (dm->unresolved_entries); i++)
@@ -1068,15 +1081,22 @@ found_last_request:
#undef _
request = name_to_labels (cname);
+ name_copy = vec_dup (request);
qp_offset = vec_len (request);
/* Add space for the query header */
- vec_validate (request, qp_offset + sizeof (dns_query_t) - 1);
+ vec_validate (request, 2 * qp_offset + 2 * sizeof (dns_query_t) - 1);
qp = (dns_query_t *) (request + qp_offset);
- qp->type = clib_host_to_net_u16 (DNS_TYPE_ALL);
+ qp->type = clib_host_to_net_u16 (DNS_TYPE_A);
+ qp->class = clib_host_to_net_u16 (DNS_CLASS_IN);
+ clib_memcpy (qp, name_copy, vec_len (name_copy));
+ qp = (dns_query_t *) (((u8 *) qp) + vec_len (name_copy));
+ vec_free (name_copy);
+
+ qp->type = clib_host_to_net_u16 (DNS_TYPE_AAAA);
qp->class = clib_host_to_net_u16 (DNS_CLASS_IN);
/* Punch in space for the dns_header_t */
@@ -1089,7 +1109,7 @@ found_last_request:
/* Ask for a recursive lookup */
h->flags = clib_host_to_net_u16 (DNS_RD | DNS_OPCODE_QUERY);
- h->qdcount = clib_host_to_net_u16 (1);
+ h->qdcount = clib_host_to_net_u16 (2);
h->nscount = 0;
h->arcount = 0;
|
[core] reset var if FAMMonitorDirectory() fails
do not read fam_dir->version if FAMMonitorDirectory() fails | @@ -343,6 +343,7 @@ static void stat_cache_fam_dir_monitor(server *srv, stat_cache_fam *scf, stat_ca
FamErrlist[FAMErrno]);
fam_dir_entry_free(&scf->fam, fam_dir);
+ fam_dir = NULL;
} else {
int osize = splaytree_size(scf->dirs);
|
Fixes a make param typo | # it should be set to either RSA, or ECDSA_P256. This value can be
# overridden by the make invocation, e.g.:
#
-# make SIGNATURE_TYPE=ECDSA_P256
+# make CONF_SIGNATURE_TYPE=ECDSA_P256
#
CONF_SIGNATURE_TYPE ?= RSA
|
NVMe: Adding experimental DDR burst mode | @@ -531,6 +531,7 @@ module nvme_top (
DDR_awid = 0;
DDR_awlen = 0;
DDR_awsize = 0;
+ DDR_wstrb = 0;
DDR_awburst = 0;
DDR_awvalid = 0;
DDR_wstrb = 0;
@@ -607,31 +608,36 @@ module nvme_top (
always @(posedge DDR_aclk) begin
case (ddr_write_state)
DDR_WADDR: begin
- DDR_awlen <= 8'h0;
- DDR_awsize <= 3'b001;
- DDR_awburst <= 2'b00;
+ DDR_awburst <= 2'b01; /* 00 FIXED, 01 INCR burst mode */
+ DDR_awlen <= 8'h0; /* 1 only */
+ DDR_awcache <= 4'b0010; /* allow merging */
+ DDR_awprot <= 4'b0000; /* no protection bits */
+ DDR_awsize <= 3'b100; /* 16 bytes */
+ DDR_wstrb <= 16'hffff; /* all bytes enabled */
DDR_bready <= 1'b0;
DDR_wvalid <= 1'b0;
DDR_awaddr <= ddr_write_addr;
DDR_awvalid <= 1'b1; /* put address on bus */
if (DDR_M_AXI_awready && DDR_awvalid) begin
- DDR_awvalid <= 1'b0;
DDR_wdata <= ddr_write_data;
DDR_wvalid <= 1'b1; /* put data on bus */
+ DDR_awvalid <= 1'b0;
ddr_write_state <= DDR_WDATA;
end
end
DDR_WDATA: begin
if (DDR_wvalid && DDR_M_AXI_wready) begin
- DDR_wvalid <= 1'b0;
+ DDR_wlast <= 1'b1;
DDR_bready <= 1'b1;
+ DDR_wvalid <= 1'b0;
ddr_write_state <= DDR_WACK;
end
end
DDR_WACK: begin
if (DDR_bready && DDR_M_AXI_bvalid) begin
DDR_bready <= 1'b0;
+ DDR_wlast <= 1'b0;
ddr_write_state <= DDR_WIDLE;
end
end
@@ -661,10 +667,9 @@ module nvme_top (
always @(posedge DDR_aclk) begin
case (ddr_read_state)
DDR_RADDR: begin
- DDR_arlen <= 8'h0;
- DDR_arsize <= 3'b001;
- DDR_arburst <= 2'b00;
- DDR_arvalid <= 1'b0;
+ DDR_arburst <= 2'b00; /* no burst */
+ DDR_arlen <= 8'h0; /* one only */
+ DDR_arsize <= 3'b100; /* 16 bytes */
DDR_araddr <= ddr_read_addr;
DDR_arvalid <= 1'b1; /* put read address on bus */
@@ -697,9 +702,9 @@ module nvme_top (
#1;
end
- DDR_awlen = 8'h0;
- DDR_awsize = 3'b001;
- DDR_awburst = 2'b00;
+ DDR_awburst = 2'b00; /* no burst */
+ DDR_awlen = 8'h0; /* 1 shot */
+ DDR_awsize = 3'b100; /* 16 bytes */
DDR_awaddr = addr;
DDR_awvalid = 1'b1; // write address is valid now
/* BREADY Master Response ready. This signal indicates that the master can accept a write response. */
|
0.3.0; travis notes for mac + compiler inputs | language: c
+
+# https://docs.travis-ci.com/user/languages/c/#gcc-on-macos
+# On mac, gcc is aliased to clang, so we only have one row
+# in build the matrix, not two like on linux
compiler:
- - gcc
- clang
+ - gcc
jobs:
include:
|
Python API: Fix error message typo. | @@ -442,7 +442,7 @@ class VPP():
size = ffi.new("int *")
rv = vpp_api.vac_read(mem, size, self.read_timeout)
if rv:
- raise IOError(rv, 'vac_read filed')
+ raise IOError(rv, 'vac_read failed')
msg = bytes(ffi.buffer(mem[0], size[0]))
vpp_api.vac_free(mem[0])
return msg
|
self_test.h: fix the C++ wrapping
Fixes | @@ -73,10 +73,6 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
-# ifdef __cplusplus
-}
-# endif
-
void OSSL_SELF_TEST_set_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK *cb,
void *cbarg);
void OSSL_SELF_TEST_get_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK **cb,
@@ -90,4 +86,7 @@ void OSSL_SELF_TEST_onbegin(OSSL_SELF_TEST *st, const char *type,
int OSSL_SELF_TEST_oncorrupt_byte(OSSL_SELF_TEST *st, unsigned char *bytes);
void OSSL_SELF_TEST_onend(OSSL_SELF_TEST *st, int ret);
+# ifdef __cplusplus
+}
+# endif
#endif /* OPENSSL_SELF_TEST_H */
|
handle multiple dir in upgrade script | @@ -102,7 +102,7 @@ SEGMENT_HOSTS=`cat $GPHOME/etc/slaves`
OPTIONS='-c gp_maintenance_conn=true'
# check whether all tmp dir exsits
-ls $MASTER_TEMP_DIR
+echo $MASTER_TEMP_DIR | sed "s/,/ /g" | xargs ls
check_error "check master and segment temp dir on master"
# check whether all segments replaced with new binary
|
Update Doxyfile-api.in | @@ -57,7 +57,7 @@ CREATE_SUBDIRS = NO
# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene,
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene,
# Spanish, Swedish, and Ukrainian.
OUTPUT_LANGUAGE = English
@@ -278,13 +278,13 @@ TYPEDEF_HIDES_STRUCT = NO
# For small to medium size projects (<1000 input files) the default value is
# probably good enough. For larger projects a too small cache size can cause
# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
+# causing a significant performance penalty.
# If the system has enough physical memory increasing the cache will improve the
# performance by keeping more symbols in memory. Note that the value works on
# a logarithmic scale so increasing the size by one will rougly double the
# memory usage. The cache size is given by this formula:
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
+# corresponding to a cache size of 2^16 = 65536 symbols.
SYMBOL_CACHE_SIZE = 0
@@ -532,7 +532,7 @@ WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for
# functions that are documented, but have no documentation for their parameters
# or return value. If set to NO (the default) doxygen will only warn about
# wrong or incomplete parameter documentation, but not about the absence of
@@ -907,7 +907,8 @@ QHP_VIRTUAL_FOLDER = doc
QHP_CUST_FILTER_NAME =
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.
+# For more information please see
# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
QHP_CUST_FILTER_ATTRS =
@@ -1311,7 +1312,7 @@ PERL_PATH = @PERL@
#---------------------------------------------------------------------------
# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# generate an inheritance diagram (in HTML, RTF and LaTeX) for classes with base
# or super classes. Setting the tag to NO turns the diagrams off. Note that
# this option is superseded by the HAVE_DOT option below. This is only a
# fallback. It is recommended to install and use dot, since it yields more
@@ -1456,7 +1457,7 @@ DOTFILE_DIRS =
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
# nodes that will be shown in the graph. If the number of nodes in a graph
# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
+# visualized by representing a node as a red box. Note that if the
# number of direct children of the root node in a graph is already larger than
# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
|
.vscode/launch: Adapt virtualhub config for motors.
At the moment, the virtualhub is mainly used to debug motor code. So it helps to make this the default launch configuration.
We also add the virtual environment to the path to ensure the correct libraries can be imported. | "request": "launch",
"program": "${workspaceFolder}/bricks/virtualhub/build/virtualhub-micropython",
"args": [
- "./tests/pup/motors/busy.py"
+ "./tests/motors/single_motor.py"
],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
},
{
"name": "PBIO_VIRTUAL_PLATFORM_MODULE",
- "value": "pbio_virtual.platform.turtle"
+ "value": "pbio_virtual.platform.robot"
+ },
+ {
+ "name": "PATH",
+ "value": "${workspaceFolder}/.venv/bin:${env:PATH}",
}
],
"externalConsole": false,
|
Describe --key and --cert in help | @@ -2407,6 +2407,10 @@ Options:
handshake completes.
--no-preferred-addr
Do not try to use preferred address offered by server.
+ --key=<PATH>
+ The path to client private key PEM file.
+ --cert=<PATH>
+ The path to client certificate PEM file.
--download=<PATH>
The path to the directory to save a downloaded content.
It is undefined if 2 concurrent requests write to the
|
Improve delivery of stream reset notifications | @@ -3993,10 +3993,17 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t
struct sctp_stream_change_event *stradd;
if ((stcb == NULL) ||
- (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT))) {
+ (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) ||
+ (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) ||
+ (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) {
+ /* If the socket is gone we are out of here. */
+ return;
+ }
+ if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT)) {
/* event not enabled */
return;
}
+
if ((stcb->asoc.peer_req_out) && flag) {
/* Peer made the request, don't tell the local user */
stcb->asoc.peer_req_out = 0;
@@ -4049,10 +4056,17 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32
struct sctp_assoc_reset_event *strasoc;
if ((stcb == NULL) ||
- (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT))) {
+ (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) ||
+ (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) ||
+ (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) {
+ /* If the socket is gone we are out of here. */
+ return;
+ }
+ if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT)) {
/* event not enabled */
return;
}
+
m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_assoc_reset_event), 0, M_NOWAIT, 1, MT_DATA);
if (m_notify == NULL)
/* no space left */
|
fix path id4good | -APP_LOAD_PARAMS += "44'/161803'"
+APP_LOAD_PARAMS += --path "44'/161803'"
DEFINES += CHAINID_UPCASE=\"ID4GOOD\" CHAINID_COINNAME=\"A4G\" CHAIN_KIND=CHAIN_KIND_ID4GOOD CHAIN_ID=846000
APPNAME = "ID4Good"
|
bind address for msbench | @@ -24,15 +24,24 @@ static uint16_t config_port = 8080;
static uint16_t config_log_level = 1;
static uint16_t config_num_flows = 3;
static uint16_t config_max_flows = 100;
-static char *config_property = "\
-{\
+static char *config_property = "{\
\"transport\": [\
{\
\"value\": \"SCTP\",\
\"precedence\": 1\
}\
+ ],\
+ \"local_ips\": [\
+ {\
+ \"value\": \"10.1.1.2\",\
+ \"precedence\": 1\
+ },\
+ {\
+ \"value\": \"10.1.2.2\",\
+ \"precedence\": 2\
+ }\
]\
-}";
+}";\
static uint32_t flows_active = 0;
|
RTX5: minor optimization in mutex priority inversion | @@ -82,6 +82,7 @@ void osRtxMutexOwnerRestore (const os_mutex_t *mutex, const os_thread_t *thread_
int8_t priority;
// Restore owner Thread priority
+ if ((mutex->attr & osMutexPrioInherit) != 0U) {
thread = mutex->owner_thread;
priority = thread->priority_base;
mutex0 = thread->mutex_list;
@@ -106,6 +107,7 @@ void osRtxMutexOwnerRestore (const os_mutex_t *mutex, const os_thread_t *thread_
osRtxThreadListSort(thread);
}
}
+}
// ==== Service Calls ====
|
wpa_supplicant: Fix supplicant debug logs errors. | @@ -41,7 +41,7 @@ static void aes_ccm_auth_start(void *aes, size_t M, size_t L, const u8 *nonce,
os_memcpy(&b[1], nonce, 15 - L);
WPA_PUT_BE16(&b[AES_BLOCK_SIZE - L], plain_len);
- wpa_hexdump_key(MSG_EXCESSIVE, "CCM B_0", b, AES_BLOCK_SIZE);
+ wpa_hexdump_key(MSG_DEBUG, "CCM B_0", b, AES_BLOCK_SIZE);
aes_encrypt(aes, b, x); /* X_1 = E(K, B_0) */
if (!aad_len)
@@ -120,13 +120,13 @@ static void aes_ccm_encr_auth(void *aes, size_t M, u8 *x, u8 *a, u8 *auth)
size_t i;
u8 tmp[AES_BLOCK_SIZE];
- wpa_hexdump_key(MSG_EXCESSIVE, "CCM T", x, M);
+ wpa_hexdump_key(MSG_DEBUG, "CCM T", x, M);
/* U = T XOR S_0; S_0 = E(K, A_0) */
WPA_PUT_BE16(&a[AES_BLOCK_SIZE - 2], 0);
aes_encrypt(aes, a, tmp);
for (i = 0; i < M; i++)
auth[i] = x[i] ^ tmp[i];
- wpa_hexdump_key(MSG_EXCESSIVE, "CCM U", auth, M);
+ wpa_hexdump_key(MSG_DEBUG, "CCM U", auth, M);
}
@@ -135,13 +135,13 @@ static void aes_ccm_decr_auth(void *aes, size_t M, u8 *a, const u8 *auth, u8 *t)
size_t i;
u8 tmp[AES_BLOCK_SIZE];
- wpa_hexdump_key(MSG_EXCESSIVE, "CCM U", auth, M);
+ wpa_hexdump_key(MSG_DEBUG, "CCM U", auth, M);
/* U = T XOR S_0; S_0 = E(K, A_0) */
WPA_PUT_BE16(&a[AES_BLOCK_SIZE - 2], 0);
aes_encrypt(aes, a, tmp);
for (i = 0; i < M; i++)
t[i] = auth[i] ^ tmp[i];
- wpa_hexdump_key(MSG_EXCESSIVE, "CCM T", t, M);
+ wpa_hexdump_key(MSG_DEBUG, "CCM T", t, M);
}
@@ -205,7 +205,7 @@ int aes_ccm_ad(const u8 *key, size_t key_len, const u8 *nonce,
aes_encrypt_deinit(aes);
if (os_memcmp_const(x, t, M) != 0) {
- wpa_printf(MSG_EXCESSIVE, "CCM: Auth mismatch");
+ wpa_printf(MSG_DEBUG, "CCM: Auth mismatch");
return -1;
}
|
Fix use before definition in | @@ -99,6 +99,8 @@ typedef enum SceKernelModel {
SCE_KERNEL_MODEL_VITATV = 0x20000
} SceKernelModel;
+typedef int (*SceClassCallback)(void *item);
+
typedef struct SceClass {
struct SceClass *next;
struct SceClass *root;
@@ -251,8 +253,6 @@ int ksceKernelUidRetain(SceUID uid);
*/
int ksceKernelUidRelease(SceUID uid);
-typedef int (*SceClassCallback)(void *item);
-
SceClass *ksceKernelGetUidClass(void);
int ksceKernelCreateClass(SceClass *cls, const char *name, void *uidclass, size_t itemsize, SceClassCallback create, SceClassCallback destroy);
int ksceKernelDeleteUserUid(SceUID pid, SceUID user_uid);
|
Added k_yield to switch context so that MPU settings can be applied. | @@ -535,7 +535,8 @@ void *uPortAcquireExecutableChunk(void *pChunkToMakeExecutable,
k_mem_domain_init(&dom0, ARRAY_SIZE(app_parts), app_parts);
k_mem_domain_add_thread(&dom0, k_current_get());
-
+ // Need to switch context to make the memory domain changes active
+ k_yield();
*pSize = U_CFG_OS_EXECUTABLE_CHUNK_INDEX_0_SIZE;
return exe_chunk_0;
|
ignores AddressSanitizer errors in jets.c | /* _cj_count(): count and link dashboard entries.
*/
+ __attribute__((no_sanitize("address")))
static c3_w
_cj_count(u3j_core* par_u, u3j_core* dev_u)
{
}
/* _cj_install(): install dashboard entries.
*/
+ __attribute__((no_sanitize("address")))
static c3_w
_cj_install(u3j_core* ray_u, c3_w jax_l, u3j_core* dev_u)
{
@@ -268,6 +270,7 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc)
**
** XX bat is used only for printing, remove.
*/
+__attribute__((no_sanitize("address")))
static c3_l
_cj_hot_mean(c3_l par_l, u3_noun mop, u3_noun bat)
{
|
tcl: remove plugin
fixes | @@ -96,7 +96,6 @@ spec-namespace (put a focus on having nice syntax for metadata):
- [ni](ni/) parses INI files based on (including metadata)
[ni](https://lab.burn.capital/chaz-attic/bohr/-/blob/main/include/bohr/ni.h).
-- [tcl](tcl/)-like config files (including metadata).
Only suited for import/export:
|
Improved wording on push continue toggle | @@ -426,7 +426,7 @@ export const EventFields = {
[EVENT_ACTOR_PUSH]: [
{
key: "continue",
- label: "Continue Until Collision",
+ label: "Slide Until Collision",
type: "checkbox",
defaultValue: false
}
|
Remove the additional UNLINKDIR to fix parallel build break | @@ -67,7 +67,6 @@ $(TOPDIR)$(DELIM).config:
$(PLATFORMDIR): $(TOPDIR)$(DELIM).config
@echo "LN: platform$(DELIM)board to $(LINKDIR)"
- $(Q) $(DIRUNLINK) $(PLATFORMDIR)
$(Q) $(DIRLINK) $(LINKDIR) $(PLATFORMDIR)
dirlinks: $(PLATFORMDIR)
|
CI: Check file is executable if in the list of executables | @@ -35,11 +35,14 @@ def check_executable_list():
def check_executables(files):
ret = 0
for fn in files:
- if not is_executable(fn):
- continue
- if fn not in known_executables:
+ fn_executable = is_executable(fn)
+ fn_in_list = fn in known_executables
+ if fn_executable and not fn_in_list:
print('"{}" is not in {}'.format(fn, EXECUTABLE_LIST_FN))
ret = 1
+ if not fn_executable and fn_in_list:
+ print('"{}" is not executable but is in {}'.format(fn, EXECUTABLE_LIST_FN))
+ ret = 1
return ret
|
Don't use variable length arrays in exception code
OMG Kees Cook was right, the code is *smaller*. We save like a dozen
instructions in the exception path! | @@ -39,14 +39,15 @@ static void dump_regs(struct stack_frame *stack)
i, stack->gpr[i], i + 16, stack->gpr[i + 16]);
}
+#define EXCEPTION_MAX_STR 320
+
void exception_entry(struct stack_frame *stack)
{
bool fatal = false;
bool hv;
uint64_t nip;
uint64_t msr;
- const size_t max = 320;
- char buf[max];
+ char buf[EXCEPTION_MAX_STR];
size_t l;
switch (stack->type) {
@@ -81,23 +82,23 @@ void exception_entry(struct stack_frame *stack)
l = 0;
if (stack->type == 0x100) {
if (fatal) {
- l += snprintf(buf + l, max - l,
+ l += snprintf(buf + l, EXCEPTION_MAX_STR - l,
"Fatal System Reset at "REG" ", nip);
} else {
- l += snprintf(buf + l, max - l,
+ l += snprintf(buf + l, EXCEPTION_MAX_STR - l,
"System Reset at "REG" ", nip);
}
} else if (stack->type == 0x200) {
fatal = true;
- l += snprintf(buf + l, max - l,
+ l += snprintf(buf + l, EXCEPTION_MAX_STR - l,
"Fatal MCE at "REG" ", nip);
} else {
fatal = true;
- l += snprintf(buf + l, max - l,
+ l += snprintf(buf + l, EXCEPTION_MAX_STR - l,
"Fatal Exception 0x%llx at "REG" ", stack->type, nip);
}
- l += snprintf_symbol(buf + l, max - l, nip);
- l += snprintf(buf + l, max - l, " MSR "REG, msr);
+ l += snprintf_symbol(buf + l, EXCEPTION_MAX_STR - l, nip);
+ l += snprintf(buf + l, EXCEPTION_MAX_STR - l, " MSR "REG, msr);
prerror("%s\n", buf);
dump_regs(stack);
@@ -115,13 +116,12 @@ void exception_entry(struct stack_frame *stack)
void exception_entry_pm_sreset(void)
{
- const size_t max = 320;
- char buf[max];
+ char buf[EXCEPTION_MAX_STR];
size_t l;
prerror("***********************************************\n");
l = 0;
- l += snprintf(buf + l, max - l,
+ l += snprintf(buf + l, EXCEPTION_MAX_STR - l,
"System Reset in sleep");
prerror("%s\n", buf);
backtrace();
@@ -129,13 +129,12 @@ void exception_entry_pm_sreset(void)
void __noreturn exception_entry_pm_mce(void)
{
- const size_t max = 320;
- char buf[max];
+ char buf[EXCEPTION_MAX_STR];
size_t l;
prerror("***********************************************\n");
l = 0;
- l += snprintf(buf + l, max - l,
+ l += snprintf(buf + l, EXCEPTION_MAX_STR - l,
"Fatal MCE in sleep");
prerror("%s\n", buf);
prerror("SRR0 : "REG" SRR1 : "REG"\n",
|
feat: add get_guild_member | @@ -92,6 +92,36 @@ void run(
}
} // namespace create_channel
+namespace get_guild_member {
+void
+run(client *client, u64_snowflake_t guild_id, u64_snowflake_t user_id, member::dati **p_member)
+{
+ if (!guild_id) {
+ D_PUTS("Missing 'guild_id'");
+ return;
+ }
+ if (!user_id) {
+ D_PUTS("Missing 'user_id'");
+ return;
+ }
+ if (p_member == NULL || *p_member == NULL) {
+ D_PUTS("'p_member' cannot be NULL");
+ return;
+ }
+
+ struct resp_handle resp_handle = {
+ .ok_cb = member::dati_from_json_v, .ok_obj = *p_member
+ };
+
+ user_agent::run(
+ &client->ua,
+ &resp_handle,
+ NULL,
+ HTTP_GET, "/guilds/%llu/members/%llu", guild_id, user_id);
+ D_PRINT("permssion %s\n", (*p_member)->permissions);
+}
+} // namespace get_guild_member
+
namespace list_guild_members {
void
run(
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.