message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Add an option to use Clang as CUDA compiler and an option to select CUDA Toolkit version
Pull-request for branch users/somov/platform/cuda | @@ -8,16 +8,25 @@ IF (NOT HAVE_CUDA)
MESSAGE(FATAL_ERROR "No CUDA Toolkit for your build")
ENDIF()
-IF (_USE_ARCADIA_CUDA)
+IF (USE_ARCADIA_CUDA)
IF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
IF (OS_LINUX AND ARCH_X86_64)
- DECLARE_EXTERNAL_RESOURCE(CUDA sbr:235618970)
+ IF (CUDA_VERSION STREQUAL "9.1")
+ DECLARE_EXTERNAL_RESOURCE(CUDA sbr:494273996) # CUDA Toolkit 9.1.85.1 for Linux x86-64
+ DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:144212391) # GCC 6.1.0 for Linux x86-64
+ ELSEIF(CUDA_VERSION STREQUAL "8.0")
+ DECLARE_EXTERNAL_RESOURCE(CUDA sbr:494267287) # CUDA Toolkit 8.0.61.2 for Linux x86-64
+ DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:89559664) # GCC 4.9.2 for Linux x86-64
+ ELSE()
+ ENABLE(CUDA_NOT_FOUND)
+ ENDIF()
+
CFLAGS(GLOBAL "-I$CUDA_RESOURCE_GLOBAL/include")
LDFLAGS_FIXED("-L$CUDA_RESOURCE_GLOBAL/lib64")
ELSEIF (OS_LINUX AND ARCH_AARCH64)
- DECLARE_EXTERNAL_RESOURCE(CUDA sbr:152786617)
+ DECLARE_EXTERNAL_RESOURCE(CUDA sbr:152786617) # 8.0.61
CFLAGS(GLOBAL "-I$CUDA_RESOURCE_GLOBAL/targets/aarch64-linux/include")
LDFLAGS_FIXED("-L$CUDA_RESOURCE_GLOBAL/targets/aarch64-linux/lib")
@@ -28,8 +37,14 @@ IF (_USE_ARCADIA_CUDA)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
IF (OS_DARWIN AND ARCH_X86_64)
+ IF (CUDA_VERSION STREQUAL "9.1")
+ DECLARE_EXTERNAL_RESOURCE(CUDA sbr:494327636) # CUDA Toolkit 9.1.128 for macOS x86-64
+ DECLARE_EXTERNAL_RESOURCE(CUDA_XCODE sbr:498971125) # Xcode 9.2 for CUDA Toolkit 9.1.128 macOS x86-64
+ ELSE()
DECLARE_EXTERNAL_RESOURCE(CUDA sbr:377468938)
DECLARE_EXTERNAL_RESOURCE(CUDA_XCODE sbr:377517442)
+ ENDIF()
+
CFLAGS(GLOBAL "-I$CUDA_RESOURCE_GLOBAL/include")
LDFLAGS_FIXED("-L$CUDA_RESOURCE_GLOBAL/lib")
|
packaging: minor tweak for Bullseye publishing | @@ -53,11 +53,11 @@ if ! aptly -config="$APTLY_CONFIG" publish switch -gpg-key="[email protected]
exit 1
fi
-# Debian 11 Bullseye
+# Debian 11 Bullseye - notice tweak in repo location
echo "Publishing Debian 11 Bullseye"
find "$SOURCE_DIR/debian/bullseye/" -iname "*-bit_$VERSION*.deb" -exec aptly -config="$APTLY_CONFIG" repo add flb-debian-bullseye {} \;
aptly -config="$APTLY_CONFIG" snapshot create "fluent-bit-debian-bullseye-${VERSION}" from repo flb-debian-bullseye
-if ! aptly -config="$APTLY_CONFIG" publish switch -gpg-key="[email protected]" bullseye filesystem:debian/bullseye: "fluent-bit-debian-bullseye-${VERSION}"; then
+if ! aptly -config="$APTLY_CONFIG" publish switch -gpg-key="[email protected]" bullseye filesystem:debian/bullseye:bullseye "fluent-bit-debian-bullseye-${VERSION}"; then
# Cleanup snapshot in case we want to retry later
aptly -config="$APTLY_CONFIG" snapshot drop "fluent-bit-debian-bullseye-${VERSION}"
exit 1
@@ -73,11 +73,11 @@ if ! aptly -config="$APTLY_CONFIG" publish switch -gpg-key="[email protected]
exit 1
fi
-# Raspbian 11 Bullseye
+# Raspbian 11 Bullseye - notice tweak in repo location
echo "Publishing Raspbian 11 Bullseye"
find "$SOURCE_DIR/raspbian/bullseye/" -iname "*-bit_$VERSION*.deb" -exec aptly -config="$APTLY_CONFIG" repo add flb-raspbian-bullseye {} \;
aptly -config="$APTLY_CONFIG" snapshot create "fluent-bit-raspbian-bullseye-${VERSION}" from repo flb-raspbian-bullseye
-if ! aptly -config="$APTLY_CONFIG" publish switch -gpg-key="[email protected]" bullseye filesystem:raspbian/bullseye: "fluent-bit-raspbian-bullseye-${VERSION}" ; then
+if ! aptly -config="$APTLY_CONFIG" publish switch -gpg-key="[email protected]" bullseye filesystem:raspbian/bullseye:bullseye "fluent-bit-raspbian-bullseye-${VERSION}" ; then
# Cleanup snapshot in case we want to retry later
aptly -config="$APTLY_CONFIG" snapshot drop "fluent-bit-raspbian-bullseye-${VERSION}"
exit 1
|
publish: prevId -> nextId | @@ -54,7 +54,7 @@ export function NoteNavigation(props: NoteNavigationProps) {
}
if (next) {
- nextUrl = `${props.prevId}`;
+ nextUrl = `${props.nextId}`;
nextComponent = (
<NavigationItem
title={next.title}
|
Add note about possible missing `west` command. | @@ -117,6 +117,12 @@ cd zmk
west init -l app/
```
+:::note
+If you encounter errors like `command not found: west` then your `PATH` environment variable is likely
+missing the Python 3 user packages directory. See the [West Build Command](#west-build-command)
+section again for links to how to do this
+:::
+
#### Update To Fetch Modules
```bash
|
Fix
Removes "unescape_string(argv[i]);".
Since "do_var_replacement(argv[i])" never adds escape
characters, it is both wrong and unnecessary to remove escape characters
on the next line.
This caused characters that were meant to be escaped to not be anymore. | @@ -276,7 +276,6 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
// Var replacement, for all but first argument of set
for (int i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) {
argv[i] = do_var_replacement(argv[i]);
- unescape_string(argv[i]);
}
if (!config->handler_context.using_criteria) {
|
removed TP-LINK TL-WN722N v1 due to driver issues | @@ -83,7 +83,6 @@ This list is for information purposes only and should not be regarded as a bindi
| SEMPRE WU150-1 | ID 148f:7601 Ralink Technology, Corp. MT7601U Wireless Adapter |
| TP-LINK Archer T2UH | ID 148f:761a Ralink Technology, Corp. MT7610U ("Archer T2U" 2.4G+5G WLAN Adapter) |
| TENDA W311U+ | ID 148f:3070 Ralink Technology, Corp. RT2870/RT3070 Wireless Adapter |
-| TP-LINK TL-WN722N v1 | ID 0cf3:9271 Qualcomm Atheros Communications AR9271 802.11n |
Always verify the actual chipset with 'lsusb' and/or 'lspci'!
|
libcupsfilters: In mupdftoraster() replaced perror() by proper logging
All log messages (error, debug, ...) have to go to the log function
and never directly to stderr (as perror() does). | @@ -205,7 +205,8 @@ mutool_spawn (const char *filename,
if ((pid = fork()) == 0) {
/* Execute mutool command line ... */
execvpe(filename, mutoolargv, envp);
- perror(filename);
+ if (log) log(ld, FILTER_LOGLEVEL_ERROR,
+ "mupdftoraster: Unable to execute %s.", filename);
goto out;
}
@@ -213,7 +214,9 @@ mutool_spawn (const char *filename,
if (waitpid (pid, &wstatus, 0) == -1) {
if (errno == EINTR)
goto retry_wait;
- perror ("mutool");
+ if (log) log(ld, FILTER_LOGLEVEL_ERROR,
+ "mupdftoraster: Error while waiting for mutool to finish - %s.",
+ strerror(errno));
goto out;
}
|
core: rconf: new sub-comment style support with '--- something' | @@ -373,6 +373,10 @@ static int mk_rconf_read(struct mk_rconf *conf, const char *path)
continue;
}
+ if (len - indent_len >= 3 && strncmp(buf + indent_len, "---", 3) == 0) {
+ continue;
+ }
+
/* Get key and val */
i = mk_string_char_search(buf + indent_len, ' ', len - indent_len);
key = mk_string_copy_substr(buf + indent_len, 0, i);
|
[ctr/lua] Prevent setting key type setting from delete function | @@ -152,7 +152,7 @@ static int state_map_delete(lua_State *L)
{
/* m key */
state_map_t *m = luaL_checkudata(L, 1, STATE_MAP_ID);
- state_map_check_index(L, m, 1);
+ state_map_check_index(L, m, 0);
if (m->key_type == LUA_TNONE) {
return 0;
}
@@ -447,6 +447,7 @@ static int state_var(lua_State *L)
lua_pushstring(L, TYPE_NAME); /* T key value VT _type_ */
lua_pushstring(L, "map"); /* T key value VT _type_ "map" */
lua_rawset(L, -3); /* T key value VT{_type="map"} */
+ goto found;
}
arr = luaL_testudata(L, -1, STATE_ARRAY_ID);
@@ -459,6 +460,7 @@ static int state_var(lua_State *L)
lua_pushstring(L, TYPE_LEN); /* T key value VT _len_ */
lua_pushinteger(L, arr->len); /* T key value VT _len_ len */
lua_rawset(L, -3); /* T key value VT{_type_="array", _len_=len} */
+ goto found;
}
v = luaL_testudata(L, -1, STATE_VALUE_ID);
@@ -468,8 +470,10 @@ static int state_var(lua_State *L)
lua_pushstring(L, TYPE_NAME); /* T key value VT _type_ */
lua_pushstring(L, "value"); /* T key value VT _type_ "value" */
lua_rawset(L, -3); /* T key value VT{_type="value"} */
+ goto found;
}
+found:
if (lua_istable(L, -1)) {
insert_var(L, var_name);
lua_setglobal(L, var_name); /* T key */
|
fs/procfs/fs_procfsproc : Fix missing change about getting kernel heap
There is a missing change about getting kernel heap(commit 0be6d2a5e3e16f)
Change to get the kernel heap with kmm_get_heap API instead of direct access | @@ -389,7 +389,7 @@ static ssize_t proc_entry_stat(FAR struct proc_file_s *procfile, FAR struct tcb_
#ifndef CONFIG_BUILD_PROTECTED
heap = mm_get_heap_with_index(0);
#else
- heap = &g_kmmheap;
+ heap = kmm_get_heap();
#endif
} else {
heap = mm_get_heap(tcb->stack_alloc_ptr);
|
Empty if statements in C look nicer | @@ -1184,6 +1184,11 @@ gen_cmd["If"] = function(self, cmd)
local condition = self:c_value(cmd.condition)
local then_ = self:generate_cmds(cmd.then_)
local else_ = self:generate_cmds(cmd.else_)
+
+ local A = (#cmd.then_ > 0)
+ local B = (#cmd.else_ > 0)
+
+ if A and B then
return (util.render([[
if ($condition) {
${then_}
@@ -1194,6 +1199,28 @@ gen_cmd["If"] = function(self, cmd)
then_ = then_,
else_ = else_,
}))
+
+ elseif A and (not B) then
+ return (util.render([[
+ if ($condition) {
+ ${then_}
+ } ]], {
+ condition = condition,
+ then_ = then_,
+ }))
+
+ elseif (not A) and B then
+ return (util.render([[
+ if (!$condition) {
+ ${else_}
+ } ]], {
+ condition = condition,
+ else_ = else_,
+ }))
+
+ else -- (not A) and (not B)
+ return ""
+ end
end
gen_cmd["Loop"] = function(self, cmd)
|
Fix shadowing declartion in dcd_da146xx.c | @@ -290,7 +290,6 @@ void tusb_vbus_changed(bool present)
static void fill_tx_fifo(xfer_ctl_t * xfer)
{
int left_to_send;
- uint8_t const *src;
EPx_REGS *regs = xfer->regs;
uint8_t const epnum = tu_edpt_number(xfer->ep_addr);
@@ -338,7 +337,7 @@ static void fill_tx_fifo(xfer_ctl_t * xfer)
}
else
{
- src = &xfer->buffer[xfer->transferred];
+ uint8_t const *src = &xfer->buffer[xfer->transferred];
while ((regs->txs & USB_USB_TXS1_REG_USB_TCOUNT_Msk) > 0 && left_to_send > 0)
{
regs->txd = *src++;
|
[io] do not include ChangeLogIter in generated headers | @@ -38,7 +38,7 @@ input_headers = {
def unwanted(s):
""" un processed classed or attributes : to be defined explicitely in SiconosFull.hpp"""
- m = re.search('xml|XML|Xml|MBlockCSR|fPtr|SimpleMatrix|SiconosVector|SiconosGraph|SiconosSharedLibrary|numerics|computeFIntPtr|computeJacobianFIntqPtr|computeJacobianFIntqDotPtr|PrimalFrictionContact|FrictionContact|Lsodar|_moving_plans|_err|Hem5|_bufferY|_spo|_measuredPert|_predictedPert|_blockCSR', s)
+ m = re.search('xml|XML|Xml|MBlockCSR|fPtr|SimpleMatrix|SiconosVector|SiconosGraph|SiconosSharedLibrary|numerics|computeFIntPtr|computeJacobianFIntqPtr|computeJacobianFIntqDotPtr|PrimalFrictionContact|FrictionContact|Lsodar|_moving_plans|_err|Hem5|_bufferY|_spo|_measuredPert|_predictedPert|_blockCSR|NonSmoothDynamicalSystem::ChangeLogIter', s)
# note _err,_bufferY, _spo, _measuredPert, _predictedPert -> boost::circular_buffer issue with serialization
# _spo : subpluggedobject
# _blockCSR -> double * serialization needed by hand (but uneeded anyway for a full restart)
|
Update: omit to in translation to English, leads to more natural output | @@ -65,4 +65,4 @@ for line in sys.stdin:
l = re.sub(r"<([^><:]*)\s(<->)\s([^><:]*)>", RED+ STATEMENT_OPENER + GREEN + r"\1" + RED + r" resembles " + GREEN + r"\3" + RED + STATEMENT_CLOSER + COLOR, l)
#Other compound term copulas (not higher order)
l = re.sub(r"\(([^><:]*)\s(\*|&)\s([^><:]*)\)", YELLOW+r"" + GREEN + r"\1" + YELLOW + r" " + GREEN + r"\3" + YELLOW + "" + COLOR, l)
- print(COLOR + l.replace(")","").replace("(","").replace("&/","and").replace(" * "," ").replace(" & "," ").replace("/1","to").replace("/2","by") + RESET)
+ print(COLOR + l.replace(")","").replace("(","").replace("&/","and").replace(" * "," ").replace(" & "," ").replace(" /1","").replace("/2","by") + RESET)
|
Edited examples/README.rst. | @@ -16,12 +16,19 @@ To run the Python scripts and generate the figures in the subdirectories, you mu
`AtmEscRegimes <AtmEscRegimes>`_: Hydrogen envelope loss due to Roche lobe overflow, radiation-recombination-limited escape, energy-limited escape, and "automatic" loss in which the local environment sets the escape rate. [AtmEsc, STELLAR]
-`AtmEscEqTide <AtmEscEqTide>`_: Coupled atmospheric escape and tidal evolution. Includes water loss with CPL or CTL, as well as hydrogen escape via energy-limited, radiation-recombination-limited, Bondi-limited, and automatic models coupled to the CPL tidal model. [AtmEsc, EqTide, STELLAR]
+`HLossTides <HLossTides>`_: Coupled atmospheric escape and tidal evolution for
+the CPL tidal model with hydrogen escape via energy-limited,
+radiation-recombination-limited, Bondi-limited, and automatic models. [AtmEsc,
+EqTide, STELLAR]
`EarthClimate <EarthClimate>`_: Energy balance climate model of Earth over one year, as well as ice sheet growth and retreat on long timescales due to orbital and rotational forcings, i.e. Milankovitch Cycles. [DistOrb, DistRot, POISE]
`VenusWaterLoss <VenusWaterLoss>`_: Water loss from Venus due to water photolyzation and hydrogen escape. [AtmEsc, STELLAR]
+`WaterLossTides <WaterLossTides>`_: Evolution of a planet losing water from
+photolysis and hydrogen escape while it tidally evolves. [AtmEsc, EqTide,
+STELLAR]
+
`IceBelts <IceBelts>`_: Formation of equatorial ice belts on planets with high obliquity.
`MiniNeptuneEvap <MiniNeptuneEvap>`_: Removal of an mini-Neptune's isothermal hydrogen atmosphere by high energy radiation and/or Roche lobe overflow.
@@ -89,4 +96,11 @@ To run the Python scripts and generate the figures in the subdirectories, you mu
`TideLock <TideLock>`_: Tidal locking of habitable planets with the CPL and CTL equilibrium tide models. [EqTide]
-`AtmEscEqTide <AtmEscEqTide>`_: Coupled atmospheric escape and tidal evolution. Includes water loss with CPL or CTL, as well as hydrogen escape via energy-limited, radiation-recombination-limited, Bondi-limited, and automatic models coupled to the CPL tidal model. [AtmEsc, EqTide, STELLAR]
+`HLossTides <HLossTides>`_: Coupled atmospheric escape and tidal evolution for
+the CPL tidal model with hydrogen escape via energy-limited,
+radiation-recombination-limited, Bondi-limited, and automatic models. [AtmEsc,
+EqTide, STELLAR]
+
+`WaterLossTides <WaterLossTides>`_: Evolution of a planet losing water from
+photolysis and hydrogen escape while it tidally evolves. [AtmEsc, EqTide,
+STELLAR]
|
Backport LFS-Fix (1/2) | @@ -18,4 +18,5 @@ SET (UPNP_HAVE_SOAP @UPNP_HAVE_SOAP@ CACHE INTERNAL "see.upnpconfig.h")
SET (UPNP_HAVE_SSDP @UPNP_HAVE_SSDP@ CACHE INTERNAL "see.upnpconfig.h")
SET (UPNP_HAVE_TOOLS @UPNP_HAVE_TOOLS@ CACHE INTERNAL "see.upnpconfig.h")
SET (UPNP_HAVE_WEBSERVER @UPNP_HAVE_WEBSERVER@ CACHE INTERNAL "see.upnpconfig.h")
+SET (UPNP_LARGEFILE_SENSITIVE @UPNP_LARGEFILE_SENSITIVE@ CACHE INTERNAL "see.upnpconfig.h")
SET (UPNP_MINISERVER_REUSEADDR @UPNP_MINISERVER_REUSEADDR@ CACHE INTERNAL "see.upnpconfig.h")
|
sdl: cpuinfo: add warning message to SDL_GetSystemRAM() and SDL_HasAVX() if used on older SDL2 versions | @@ -3,23 +3,21 @@ package sdl
/*
#include "sdl_wrapper.h"
-static inline int _SDL_GetSystemRAM()
+#if !(SDL_VERSION_ATLEAST(2,0,1))
+#pragma message("SDL_GetSystemRAM is not supported before SDL 2.0.1")
+static inline int SDL_GetSystemRAM()
{
-#if (SDL_VERSION_ATLEAST(2,0,1))
- return SDL_GetSystemRAM();
-#else
- return 0;
-#endif
+ return -1;
}
+#endif
-static inline SDL_bool _SDL_HasAVX()
+#if !(SDL_VERSION_ATLEAST(2,0,2))
+#pragma message("SDL_HasAVX is not supported before SDL 2.0.2")
+static inline SDL_bool SDL_HasAVX()
{
-#if (SDL_VERSION_ATLEAST(2,0,2))
- return SDL_HasAVX();
-#else
return SDL_FALSE;
-#endif
}
+#endif
*/
import "C"
@@ -83,9 +81,9 @@ func HasSSE42() bool {
// GetSystemRAM (https://wiki.libsdl.org/SDL_GetSystemRAM)
func GetSystemRAM() int {
- return int(C._SDL_GetSystemRAM())
+ return int(C.SDL_GetSystemRAM())
}
func HasAVX() bool {
- return C._SDL_HasAVX() > 0
+ return C.SDL_HasAVX() > 0
}
|
Jenkinsfile: do not use placeholder dirs on Fedora 33 release | @@ -211,7 +211,6 @@ def generateReleaseStages() {
DOCKER_IMAGES.fedora_33,
params.fedora_revision,
false, // do not bundle git repo
- true // use placeholder dirs
)
return tasks
|
Delete SWIG_DEFAULT_INCLUDES and SWIG_DEFAULT_INDUCED.
Swig parser uses SWIG_IMPLICIT_INCLUDES since r5425695. | @@ -231,13 +231,6 @@ elsewhen ($OS_WINDOWS) {
CYTHON_OPTIONS += -E UNAME_SYSNAME=Windows
}
-SWIG_DEFAULT_INCLUDES=\
- contrib/tools/swig/Lib/python/python.swg \
- contrib/tools/swig/Lib/swig.swg
-SWIG_DEFAULT_INDUCED=\
- contrib/libs/python/Include/Python.h \
- string.h \
- stdexcept
SWIG_IMPLICIT_INCLUDES = swig.swg go.swg java.swg perl5.swg python.swg
FATAL_ERROR_MODULE=no
|
refactor: Reduced one call to api_ethereum.c function.
boatethereum.c should not call functions in api_ethereum.c.
Some formatting issues have also been modified. | @@ -474,7 +474,7 @@ BOAT_RESULT EthSendRawtx(BOAT_INOUT BoatEthTx *tx_ptr)
BoatLog(BOAT_LOG_NORMAL, "Fail to send raw transaction to network.");
boat_throw(BOAT_ERROR_RPC_FAILED, EthSendRawtx_cleanup);
}
- result = BoatEthPraseRpcResponseResult(tx_hash_str, "",
+ result = web3_parse_json_result(tx_hash_str, "",
&tx_ptr->wallet_ptr->web3intf_context_ptr->web3_result_string_buf);
if (result != BOAT_SUCCESS)
{
|
When listing language options in the spec, use "x, y, or z" format | @@ -261,14 +261,22 @@ static char* replaceHelpTokens(const char* text)
char langnames[10240] = {0};
char langextensions[10240] = {0};
char langnamespipe[10240] = {0};
+
FOR_EACH_LANG(ln)
+ bool isLast = *(conf+1) == NULL;
+ bool isSecondToLast = *(conf+2) == NULL;
+
strcat(langnames, ln->name);
- strcat(langnames, " ");
+ if (!isLast)
+ strcat(langnames, ", ");
+ if (isSecondToLast)
+ strcat(langnames, "or ");
strcat(langextensions, ln->fileExtension);
strcat(langextensions, " ");
strcat(langnamespipe, ln->name);
+ if (!isLast)
strcat(langnamespipe, "|");
FOR_EACH_LANG_END
@@ -2540,7 +2548,7 @@ static const char HelpUsage[] = "help [<text>"
macro("new", \
NULL, \
"creates a new `Hello World` cartridge.", \
- "new [$LANG_NAMES_PIPE$...]", \
+ "new [$LANG_NAMES_PIPE$]", \
onNewCommand) \
\
macro("load", \
|
[DFS] Remove opened file check
Remove opened file check in dfs_file_open function. It will be replaced with POSIX flock/fcntl. | * 2005-02-22 Bernard The first version.
* 2011-12-08 Bernard Merges rename patch from iamcacy.
* 2015-05-27 Bernard Fix the fd clear issue.
+ * 2019-01-24 Bernard Remove file repeatedly open check.
*/
#include <dfs.h>
@@ -48,14 +49,6 @@ int dfs_file_open(struct dfs_fd *fd, const char *path, int flags)
LOG_D("open file:%s", fullpath);
- /* Check whether file is already open */
- if (fd_is_open(fullpath) == 0)
- {
- rt_free(fullpath); /* release path */
-
- return -EBUSY;
- }
-
/* find filesystem */
fs = dfs_filesystem_lookup(fullpath);
if (fs == NULL)
|
common: add WASM to SIMDE_ASSUME_VECTORIZATION list | @@ -495,7 +495,7 @@ typedef SIMDE_FLOAT64_TYPE simde_float64;
SIMDE_ASSUME_VECTORIZATION if you want to force SIMDe to use the
vectorized version. */
#if !defined(SIMDE_NO_ASSUME_VECTORIZATION) && !defined(SIMDE_ASSUME_VECTORIZATION)
-# if defined(__SSE__) || defined(__ARM_NEON) || defined(__mips_msa) || defined(__ALTIVEC__)
+# if defined(__SSE__) || defined(__ARM_NEON) || defined(__mips_msa) || defined(__ALTIVEC__) || defined(__wasm_simd128__)
# define SIMDE_ASSUME_VECTORIZATION
# endif
#endif
|
load mpi module in ohpc-tests | @@ -9,33 +9,35 @@ source ./common/TEST_ENV || exit 1
source ./common/functions || exit 1
cd libs/ptscotch || exit 1
-
-export BATS_JUNIT_CLASS=PTSCOTCH
+export BATS_JUNIT_CLASS=PTScotch
# bootstrap the local autotools project if necessary
./bootstrap || exit 1
for compiler in $COMPILER_FAMILIES ; do
+ for mpi in $MPI_FAMILIES ; do
echo " "
echo " "
echo "-------------------------------------------------------"
- echo "Libraries: PTScotch tests: $compiler"
+ echo "Libraries: PTScotch tests: $compiler-$mpi"
echo "-------------------------------------------------------"
module purge || exit 1
- module load $compiler || exit 1
- module load ptscotch || exit 1
module load prun || exit 1
+ module load $compiler || exit 1
+ module load $mpi || exit 1
+ module load scotch || exit 1
./configure || exit 1
make clean || exit 1
make -k check || status=1
- save_logs_compiler_family tests $compiler
+ save_logs_mpi_family tests $compiler $mpi
make distclean
done
+done
exit ${status}
|
decisions: add guideline for relative links | @@ -93,6 +93,11 @@ This section has links to other decisions with description what the relation is.
One-side relations are allowed, not every decision must link back.
Decisions that give constraints must be listed in "Constraints" above.
+> Guideline:
+> Links to decisions should be in the form `- [name of decision](../step of decision/name of decision.md)`.
+> In particular, they should always contain the step of the decision, even if they are in the same directory.
+> This makes renaming issues easier.
+
> Note:
> Sometimes the best solution is only understood if the relation between decisions becomes clear.
> Make sure that everything that requires updates to a decision, is listed as "Constraints" or "Assumptions".
|
filter_kubernetes: on nested json, skip trash bytes after map ends properly | @@ -159,11 +159,12 @@ static int pack_map_content(msgpack_packer *pck, msgpack_sbuffer *sbuf,
/* Do not process ending \n if set at the end of the map */
size = v.via.str.size;
- if (v.via.str.ptr[v.via.str.size - 2] == '\\' &&
- v.via.str.ptr[v.via.str.size - 1] == 'n') {
- size -= 2;
+ for (i = size - 1; i > 0; i--) {
+ if (v.via.str.ptr[i] == '}') {
+ size = i + 1;
+ break;
+ }
}
-
json_size = unescape_string((char *) v.via.str.ptr,
size, &ctx->merge_json_buf);
ret = flb_pack_json(ctx->merge_json_buf, json_size,
|
thaw update
fixes | @@ -36,8 +36,13 @@ void Init()
Screen.fHudOffset = ((480.0f * Screen.fAspectRatio) - 640.0f) / 2.0f;
Screen.fHudOffsetReal = (Screen.fWidth - Screen.fHeight * (4.0f / 3.0f)) / 2.0f;
+ //Fixes (sort of) crash when using high resolutions
+ static uint8_t vec[100000];
+ auto pattern = hook::pattern("B9 ? ? ? ? 89 74 24 14 8B FF 8B C3 99 F7 FE"); //0x50D195
+ injector::WriteMemory(pattern.get_first(1), &vec[0], true);
+
//Resolution
- auto pattern = hook::pattern("89 0D ? ? ? ? 89 0D ? ? ? ? 8A 0D ? ? ? ? 84 C9");
+ pattern = hook::pattern("89 0D ? ? ? ? 89 0D ? ? ? ? 8A 0D ? ? ? ? 84 C9");
static int32_t* dword_6D2224 = *pattern.get_first<int32_t*>(2);
static int32_t* dword_6D2228 = *hook::get_pattern<int32_t*>("89 3D ? ? ? ? 89 3D ? ? ? ? 89 15 ? ? ? ? 89 15 ? ? ? ? 74", 2);
static int32_t* dword_7F3A2C = *pattern.get_first<int32_t*>(8);
|
Yajl: Format source code | @@ -253,7 +253,8 @@ static void elektraYajlParseSuppressNonLeafKeys (KeySet * returned)
{
const char * baseName = keyBaseName (ksCurrent (returned));
// TODO: Add test for empty array check
- if(strcmp(baseName, "#0") && strcmp(baseName, "###empty_array")) {
+ if (strcmp (baseName, "#0") && strcmp (baseName, "###empty_array"))
+ {
ELEKTRA_LOG_DEBUG ("Removing non-leaf key %s", keyName (cur));
keyDel (ksLookup (returned, cur, KDB_O_POP));
ksSetCursor (returned, cursor);
|
lydmods BUGFIX always implement non-implemented modules
... when loading them.
Fixes | @@ -1307,8 +1307,8 @@ sr_lydmods_ctx_load_module(const struct lyd_node *sr_mod, struct ly_ctx *ly_ctx,
assert(mod_name);
/* the module is not supposed to be loaded yet, but is in case of LY internal modules and dependency modules */
- ly_mod = ly_ctx_get_module(ly_ctx, mod_name, NULL, 1);
- if (!ly_mod) {
+ ly_mod = ly_ctx_get_module(ly_ctx, mod_name, revision, 1);
+ if (!ly_mod || !ly_mod->implemented) {
/* load the module */
ly_mod = ly_ctx_load_module(ly_ctx, mod_name, revision);
}
|
Send msgStart on every reconnect of the event interface. | @@ -2418,8 +2418,11 @@ periodic(void *arg)
//if (g_prevlog) logDestroy(&g_prevlog);
//if (g_prevevt) evtDestroy(&g_prevevt);
- if (ctlNeedsConnection(g_ctl)) {
- ctlConnect(g_ctl);
+ if (ctlNeedsConnection(g_ctl) && ctlConnect(g_ctl)) {
+ // Hey we have a new connection! Identify ourselves
+ // like reportProcessStart, but only on the event interface...
+ cJSON *json = msgStart(&g_cfg.proc, g_staticfg);
+ cmdSendInfoMsg(g_ctl, json);
}
remoteConfig();
|
Fix SBP message example
The example message shown in Chapter 4 of the SBP Specification is incorrect - the message ID for MSG_BASELINE_ECEF is 523 = 20Bh, not 514 = 202h. | @@ -189,10 +189,10 @@ contents.
\par As an example, consider this framed series of bytes read from a
serial port:
\begin{verbatim}
-55 02 02 cc 04 14 70 3d d0 18 cf ef ff ff ef e8 ff ff f0 18 00 00 00 00 05 00 43 94
+55 0b 02 cc 04 14 70 3d d0 18 cf ef ff ff ef e8 ff ff f0 18 00 00 00 00 05 00 15 dc
\end{verbatim}
This byte array decodes into a \texttt{MSG\_BASELINE\_ECEF} (see
-pg.~\pageref{sec:MSG_POS_ECEF}), which reports the baseline position
+pg.~\pageref{sec:MSG_BASELINE_ECEF}), which reports the baseline position
solution of the rover receiver relative to the base station receiver
in Earth Centered Earth Fixed (ECEF) coordinates. The segments of this
byte array and its contents break down as follows:
@@ -204,7 +204,7 @@ byte array and its contents break down as follows:
Field Name & Type & Value & Bytestring Segment\\
\midrule
{Preamble} & u8 & 0x55 & \verb!55! \\
- {Message Type}& u16 & \texttt{MSG\_BASELINE\_ECEF} & \verb!02 02! \\
+ {Message Type}& u16 & \texttt{MSG\_BASELINE\_ECEF} & \verb!0b 02! \\
{Sender}& u16 & 1228 & \verb!cc 04! \\
{Length}& u8 & 20 & \verb!14! \\
{Payload}& & --- & \verb!70 3d d0 18 cf ef ff ff ef e8 ff ff! \\
@@ -217,7 +217,7 @@ byte array and its contents break down as follows:
\quad~.accuracy & u16 & 0 & \verb!00 00! \\
\quad~.nsats & u8 & 5 & \verb!05! \\
\quad~.flags & u8 & 0 & \verb!00! \\
- {CRC} & u16 & 0x9443 & \verb!43 94! \\
+ {CRC} & u16 & 0x9443 & \verb!15 dc! \\
\bottomrule
\end{tabular}
\caption{SBP breakdown for \texttt{MSG\_BASELINE\_ECEF}}
|
Prepare for 0.4.1 release | # Changelog
All notable changes to this project will be documented in this file.
-## 0.4.1 latest - ??
+## 0.4.1 - 2019-04-14
+- Squash some bugs
+- Peg patterns can now make captures in any position in a grammar.
- Add color to repl output
- Add array/remove function
- Add meson build support
|
[Readme] Add more params | @@ -110,6 +110,7 @@ A partial list of parameters are below. See the config file for a complete list.
|------------------------------------|---------------------------------------------------------------------------------------|
| `cpu_temp`<br>`gpu_temp` | Displays current CPU/GPU temperature |
| `core_load` | Displays load & frequency per core |
+| `gpu_core_clock`<br>`gpu_mem_clock`| Displays GPU core/memory frequency |
| `ram`<br>`vram` | Displays system RAM/VRAM usage |
| `full` | Enables all of the above config options |
| `crosshair` | Adds a crosshair overlay at the centre of the screen |
@@ -134,6 +135,7 @@ A partial list of parameters are below. See the config file for a complete list.
| `pci_dev` | Select GPU device in multi-gpu setups |
| `version` | Shows current mangohud version |
| `fps_limit` | Limit the apps framerate |
+| `arch` | Show if the application is 32 or 64 bit |
Example: `MANGOHUD_CONFIG=cpu_temp,gpu_temp,position=top-right,height=500,font_size=32`
|
Process Konke motion sensor battery reports | @@ -7457,6 +7457,8 @@ void DeRestPluginPrivate::updateSensorNode(const deCONZ::NodeEvent &event)
i->modelId() == QLatin1String("Motion Sensor-A") || // Osram motion sensor
i->modelId() == QLatin1String("Bell") || // Sage doorbell sensor
i->modelId() == QLatin1String("ISW-ZPR1-WP13") || // Bosch motion sensor
+ i->modelId() == QLatin1String("3AFE14010402000D") || // Konke motion sensor
+ i->modelId() == QLatin1String("3AFE28010402000D") || // Konke motion sensor v2
i->modelId().endsWith(QLatin1String("86opcn01")) || // Aqara Opple
i->modelId().startsWith(QLatin1String("AQSZB-1")) || // Develco air quality sensor
i->modelId().startsWith(QLatin1String("SMSZB-1")) || // Develco smoke sensor
|
Show the complete keymap example inline. | @@ -151,4 +151,31 @@ For the full set of possible behaviors, start at the [Key Press](/docs/behavior/
### Complete Example
-You can see a complete example if you see the [stock Kyria keymap](https://github.com/zmkfirmware/zmk/blob/main/app/boards/shields/kyria/kyria.keymap).
+Putting this all together, a complete [`kyria.keymap`](https://github.com/zmkfirmware/zmk/blob/main/app/boards/shields/kyria/kyria.keymap) looks like:
+
+```
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+
+/ {
+ keymap {
+ compatible = "zmk,keymap";
+
+ default_layer {
+// ---------------------------------------------------------------------------------------------------------------------------------
+// | ESC | Q | W | E | R | T | | Y | U | I | O | P | \ |
+// | TAB | A | S | D | F | G | | H | J | K | L | ; | ' |
+// | SHIFT | Z | X | C | V | B | L SHIFT | L SHIFT | | L SHIFT | L SHIFT | N | M | , | . | / | CTRL |
+// | GUI | DEL | RET | SPACE | ESC | | RET | SPACE | TAB | BSPC | R-ALT |
+ bindings = <
+ &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH
+ &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT
+ &kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp LSFT &kp LSFT &kp LSFT &kp LSFT &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RCTL
+ &kp LGUI &kp DEL &kp RET &kp SPC &kp ESC &kp RET &kp SPC &kp TAB &kp BKSP &kp RALT
+ >;
+
+ sensor-bindings = <&inc_dec_cp M_VOLU M_VOLD &inc_dec_kp PGUP PGDN>;
+ };
+ };
+};
+```
|
Add perl2host call missing from a new test file.
Oversight in today's commit
Per buildfarm member jacana.
Discussion: | @@ -124,6 +124,7 @@ wal_skip_threshold = 0
$copy_file, qq(20000,30000
20001,30001
20002,30002));
+ $copy_file = TestLib::perl2host($copy_file);
# Test truncation with inserted tuples using both INSERT and COPY. Tuples
# inserted after the truncation should be seen.
|
VERSION bump to version 2.0.85 | @@ -58,7 +58,7 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
# set version of the project
set(LIBYANG_MAJOR_VERSION 2)
set(LIBYANG_MINOR_VERSION 0)
-set(LIBYANG_MICRO_VERSION 84)
+set(LIBYANG_MICRO_VERSION 85)
set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
# set version of the library
set(LIBYANG_MAJOR_SOVERSION 2)
|
Exclude pre_shared_key for HRR | @@ -1898,7 +1898,7 @@ static int ssl_tls13_write_server_hello_body( mbedtls_ssl_context *ssl,
}
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
- if( mbedtls_ssl_tls13_key_exchange_mode_with_psk( ssl ) )
+ if( !is_hrr && mbedtls_ssl_tls13_key_exchange_mode_with_psk( ssl ) )
{
ret = ssl_tls13_write_server_pre_shared_key_ext( ssl, p, end, &output_len );
if( ret != 0 )
|
remove the dynamic exception for all versions of c++ unless FORCE_CXX03 is on | #ifdef ILMBASE_FORCE_CXX03
# define IEX_THROW_SPEC(...) throw (__VA_ARGS__)
#else
-# if __cplusplus <= 201402L
# define IEX_THROW_SPEC(...)
-# else
-# define IEX_THROW_SPEC(...) throw (__VA_ARGS__)
-# endif
#endif
IEX_INTERNAL_NAMESPACE_HEADER_ENTER
|
whitespace change to test update | Expressions
-----------
-.. danger::
+.. danger:: Foo
Confirm the text here adequately characterizes that an expression has
value everywhere over the whole mesh it is defined on. Its a field.
|
added api and keywords syntax | @@ -405,6 +405,8 @@ static bool isWord(char symbol) {return isLetter(symbol) || isNumber(symbol);}
#include <ctype.h>
static inline bool islineend(char c) {return c == '\n' || c == '\0';}
+static inline bool isalpha_(char c) {return isalpha(c) || c == '_';}
+static inline bool isalnum_(char c) {return isalnum(c) || c == '_';}
static void parse(const char* start, u8* color)
{
@@ -413,6 +415,7 @@ static void parse(const char* start, u8* color)
const char* blockCommentStart = NULL;
const char* blockStringStart = NULL;
const char* singleCommentStart = NULL;
+ const char* wordStart = NULL;
const char* numberStart = NULL;
static const char BlockCommentStart[] = "--[[";
@@ -471,6 +474,44 @@ static void parse(const char* start, u8* color)
singleCommentStart = NULL;
continue;
}
+ else if(wordStart)
+ {
+ while(!islineend(*ptr) && isalnum_(*ptr)) ptr++;
+
+ bool keyword = false;
+ {
+ static const char* const Keywords [] =
+ {
+ "and", "break", "do", "else", "elseif",
+ "end", "false", "for", "function", "goto", "if",
+ "in", "local", "nil", "not", "or", "repeat",
+ "return", "then", "true", "until", "while"
+ };
+
+ for(s32 i = 0; i < COUNT_OF(Keywords); i++)
+ if(memcmp(wordStart, Keywords[i], strlen(Keywords[i])) == 0)
+ {
+ memset(color + (wordStart - start), getConfig()->theme.code.keyword, ptr - wordStart);
+ keyword = true;
+ break;
+ }
+ }
+
+ if(!keyword)
+ {
+ static const char* const Api[] = API_KEYWORDS;
+
+ for(s32 i = 0; i < COUNT_OF(Api); i++)
+ if(memcmp(wordStart, Api[i], strlen(Api[i])) == 0)
+ {
+ memset(color + (wordStart - start), getConfig()->theme.code.api, ptr - wordStart);
+ break;
+ }
+ }
+
+ wordStart = NULL;
+ continue;
+ }
else if(numberStart)
{
while(!islineend(*ptr))
@@ -511,7 +552,7 @@ static void parse(const char* start, u8* color)
if(c == '"' || c == '\'')
{
blockStringStart = ptr;
- ptr += 1;
+ ptr++;
continue;
}
else
@@ -525,11 +566,19 @@ static void parse(const char* start, u8* color)
continue;
}
else
+ {
+ if(isalpha_(c))
+ {
+ wordStart = ptr;
+ ptr++;
+ continue;
+ }
+ else
{
if(isdigit(c) || (c == '.' && isdigit(ptr[1])))
{
numberStart = ptr;
- ptr += 1;
+ ptr++;
continue;
}
else
@@ -540,6 +589,7 @@ static void parse(const char* start, u8* color)
}
}
}
+ }
if(!c) break;
|
doc: improve text about comments
to catch problems like | @@ -73,54 +73,73 @@ note= this will rarely used within specifications, but is directly
[comment]
type= string
status= deprecated
-usedby/plugin= (keytometa)
+usedby/plugin= keytometa
description= the users comment about the key (mostly its value)
- the first line is the comment after a key-value
+ the first line is the comment after a key-value (in the same line)
further lines are the lines before a key-value
+
+ This metadata is deprecated because it assumes line-based comments
+ and cannot preserve formatting within comments.
note= if used within specifications it refers to the specification, not
the key. Use `description` to refer to the key.
-
[comment/#]
status= implemented
usedby/plugin= hosts
type= string
-description= comment line preceding an actual key
- Except #0, which is the inline key (in the same line).
- The comment numbering starts from top to bottom. The comment
- directly above the key is the last entry in the array and
- the topmost comment belonging to the key is #1.
+description= A comment preceding or in-line with a key.
+
+ - #0 is the inline comment (in the same line).
+ - The comment numbering starts from top (#1) to bottom (#n).
+ - The comment directly above the key is the last entry in the array (#n).
+ - The topmost comment belonging to the key is (#1).
+
Comment keys that are not above any key (comments in the last
lines of files) are added to the parentkey.
- It allows:
+ The array of comments allows:
+
+ - to structure comments, which are not line-based
- to restore formatting, including:
- inline comments
- spaces before comments
- empty lines
- - to distinguish between different kinds of comments and empty lines
- - to tag every single comment line, which increases extensibility
+ - to distinguish between different kinds of comments
+ - to tag every comment, which increases extensibility
- It needs, however, an API so that the user is not required to fiddle
- with all these details. (to be done)
-note= Other libraries doing similar things:
- http://commons.apache.org/proper/commons-configuration/apidocs/org/apache/commons/configuration2/PropertiesConfigurationLayout.html
- http://code.google.com/p/bracket-properties/
+ The plugin need to take care that only valid characters are
+ present in the comment.
+ E.g. on line-based comments, no newlines must be present.
+note= if used within specifications it refers to the specification, not
+ the key. Use `description` to refer to the key.
[comment/#/start]
status= implemented
usedby/plugin= hosts
type= string
-description= determines the character used to start this line of comment
- None if its an empty line
+description= Determines the character(s) used to start this comment.
+
+ This meta-key is empty if its an empty line/comment.
+
+ The default on absence of this key is plugin-specific.
+ Some comment start character should be assumed then.
+
+ The plugin needs to make sure that every comment is actually
+ commented out. An error needs to be emitted if there is no
+ start symbol that will be recognized as comment.
+example= ;
[comment/#/space]
status= implemented
usedby/plugin= hosts
type= string
-description= the spaces/tabs used between a comment and the beginning of the
- line or after end of payload data (for inline comments)
- If no start-comment token was found, only space and no comment is present.
+description= The spaces/tabs used between a comment and the beginning of the
+ line or after end of payload data (for inline comments).
+
+ If no start key is present, only space and no comment is present.
+
+ The plugin needs to make sure that all spaces present are allowed.
+ An error needs to be emitted if non-ignored spaces are present.
example=
|
Use binary representation for key values dumped to crash log
Use binary representation for key values dumped crash to log,
so that if they contain null chars they're still printed correctly.
Additionally limit their length to 128 chars | @@ -1729,10 +1729,10 @@ void logCurrentClient(void) {
sdsfree(client);
for (j = 0; j < cc->argc; j++) {
robj *decoded;
-
decoded = getDecodedObject(cc->argv[j]);
- serverLog(LL_WARNING|LL_RAW,"argv[%d]: '%s'\n", j,
- (char*)decoded->ptr);
+ sds repr = sdscatrepr(sdsempty(),decoded->ptr, min(sdslen(decoded->ptr), 128));
+ serverLog(LL_WARNING|LL_RAW,"argv[%d]: '%s'\n", j, (char*)repr);
+ sdsfree(repr);
decrRefCount(decoded);
}
/* Check if the first argument, usually a key, is found inside the
|
filter_kubernetes: fix 'tls' context reference | @@ -959,7 +959,7 @@ static int flb_kube_network_init(struct flb_kube *ctx, struct flb_config *config
ctx->api_host,
ctx->api_port,
io_type,
- &ctx->tls);
+ ctx->tls);
if (!ctx->upstream) {
/* note: if ctx->tls.context is set, it's destroyed upon context exit */
return -1;
|
board/fluffy/board.c: Format with clang-format
BRANCH=none
TEST=none | @@ -106,8 +106,7 @@ static int command_cc_flip(int argc, char *argv[])
print_port_status();
return EC_SUCCESS;
}
-DECLARE_CONSOLE_COMMAND(ccflip, command_cc_flip,
- "<enable/disable>",
+DECLARE_CONSOLE_COMMAND(ccflip, command_cc_flip, "<enable/disable>",
"enable or disable flipping CC orientation");
/*
* Support tca6416 I2C ioexpander.
@@ -128,10 +127,10 @@ static void i2c_expander_init(void)
/*
* Setup P00, P02, P04, P10, and P12 on the I/O expander as an output.
*/
- i2c_write8(I2C_PORT_MASTER, GPIOX_I2C_ADDR_FLAGS,
- GPIOX_DIR_PORT_A, 0xea);
- i2c_write8(I2C_PORT_MASTER, GPIOX_I2C_ADDR_FLAGS,
- GPIOX_DIR_PORT_B, 0xfa);
+ i2c_write8(I2C_PORT_MASTER, GPIOX_I2C_ADDR_FLAGS, GPIOX_DIR_PORT_A,
+ 0xea);
+ i2c_write8(I2C_PORT_MASTER, GPIOX_I2C_ADDR_FLAGS, GPIOX_DIR_PORT_B,
+ 0xfa);
}
DECLARE_HOOK(HOOK_INIT, i2c_expander_init, HOOK_PRIO_INIT_I2C + 1);
@@ -141,15 +140,13 @@ static void write_ioexpander(int bank, int gpio, int reg, int val)
int tmp;
/* Read output port register */
- i2c_read8(I2C_PORT_MASTER, GPIOX_I2C_ADDR_FLAGS,
- reg + bank, &tmp);
+ i2c_read8(I2C_PORT_MASTER, GPIOX_I2C_ADDR_FLAGS, reg + bank, &tmp);
if (val)
tmp |= BIT(gpio);
else
tmp &= ~BIT(gpio);
/* Write back modified output port register */
- i2c_write8(I2C_PORT_MASTER, GPIOX_I2C_ADDR_FLAGS,
- reg + bank, tmp);
+ i2c_write8(I2C_PORT_MASTER, GPIOX_I2C_ADDR_FLAGS, reg + bank, tmp);
}
enum led_ch {
@@ -227,7 +224,6 @@ static void board_init(void)
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
-
enum usb_mux {
USB_MUX0 = 0,
USB_MUX1,
@@ -388,7 +384,8 @@ void show_output_voltage_on_leds(void)
set_led(i, i < max_on_exclusive);
act = (vbus_mv * 76667) / 10000;
- if ((vbus_mv > prev_vbus_mv+2) || (vbus_mv < prev_vbus_mv-2)) {
+ if ((vbus_mv > prev_vbus_mv + 2) ||
+ (vbus_mv < prev_vbus_mv - 2)) {
CPRINTS("PPVAR_VBUS_DUT: %d mV (raw: %d)", act,
vbus_mv);
prev_vbus_mv = vbus_mv;
@@ -400,6 +397,5 @@ void show_output_voltage_on_leds(void)
* a hook with a HOOK_TICK period is to allow the LED sweep sequence
* when the board boots up.
*/
- hook_call_deferred(&show_output_voltage_on_leds_data,
- 500 * MSEC);
+ hook_call_deferred(&show_output_voltage_on_leds_data, 500 * MSEC);
}
|
Address "is already installed" Jenkins issue | @@ -112,7 +112,7 @@ build-rpm: $(DEV_RPM)
install-rpm:
ifneq ($(INSTALLED_RPM_VER),$(RPM_VER)-$(PKG_SUFFIX))
@$(MAKE) $(DEV_RPM)
- sudo rpm -Uih $(DEV_RPM)
+ sudo rpm -Uih --force $(DEV_RPM)
else
@echo "=========================================================="
@echo " Up-to-date DPDK package already installed"
|
unix/Makefile: Remove building of libaxtls.a which is no longer needed. | @@ -221,8 +221,7 @@ nanbox:
CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_nanbox.h>"' \
BUILD=build-nanbox \
PROG=micropython_nanbox \
- MICROPY_FORCE_32BIT=1 \
- axtls all
+ MICROPY_FORCE_32BIT=1
freedos:
$(MAKE) \
@@ -249,7 +248,7 @@ coverage:
-DMICROPY_UNIX_COVERAGE' \
LDFLAGS_EXTRA='-fprofile-arcs -ftest-coverage' \
FROZEN_DIR=coverage-frzstr FROZEN_MPY_DIR=coverage-frzmpy \
- BUILD=build-coverage PROG=micropython_coverage axtls all
+ BUILD=build-coverage PROG=micropython_coverage
coverage_test: coverage
$(eval DIRNAME=ports/$(notdir $(CURDIR)))
@@ -280,14 +279,7 @@ libffi:
../configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out --disable-structs CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="-Os -fomit-frame-pointer -fstrict-aliasing -ffast-math -fno-exceptions"; \
$(MAKE) install-exec-recursive; $(MAKE) -C include install-data-am
-axtls: $(BUILD)/libaxtls.a
-
-$(BUILD)/libaxtls.a: $(TOP)/lib/axtls/README | $(OBJ_DIRS)
- cd $(TOP)/lib/axtls; cp config/upyconfig config/.config
- cd $(TOP)/lib/axtls; $(MAKE) oldconfig -B
- cd $(TOP)/lib/axtls; $(MAKE) clean
- cd $(TOP)/lib/axtls; $(MAKE) all CC="$(CC)" LD="$(LD)"
- cp $(TOP)/lib/axtls/_stage/libaxtls.a $@
+axtls: $(TOP)/lib/axtls/README
$(TOP)/lib/axtls/README:
@echo "You cloned without --recursive, fetching submodules for you."
|
when lb tcp in2out flow,
in2out and out2in protocol are not same | @@ -1372,6 +1372,7 @@ snat_in2out_lb (snat_main_t *sm,
s->outside_address_index = ~0;
s->in2out = l_key;
s->out2in = e_key;
+ s->out2in.protocol = l_key.protocol;
u->nstaticsessions++;
/* Add to lookup tables */
|
use find_library for pthread (issue | @@ -210,14 +210,15 @@ endif()
if(WIN32)
list(APPEND mi_libraries psapi shell32 user32 advapi32 bcrypt)
else()
- if(NOT ${CMAKE_C_COMPILER} MATCHES "android")
- list(APPEND mi_libraries pthread)
+ find_library(LIBPTHREAD pthread)
+ if (LIBPTHREAD)
+ list(APPEND mi_libraries ${LIBPTHREAD})
+ endif()
find_library(LIBRT rt)
if(LIBRT)
list(APPEND mi_libraries ${LIBRT})
endif()
endif()
-endif()
if (MI_USE_LIBATOMIC)
list(APPEND mi_libraries atomic)
@@ -270,6 +271,8 @@ else()
message(STATUS "C Compiler : ${CMAKE_C_COMPILER}")
endif()
message(STATUS "Compiler flags : ${mi_cflags}")
+message(STATUS "Compiler defines : ${mi_defines}")
+message(STATUS "Link libraries : ${mi_libraries}")
message(STATUS "Build targets : ${mi_build_targets}")
message(STATUS "")
|
doc: update distributions providing Elektra | For the following Linux Distributions 0.8 packages are available:
- - [Fedora](https://admin.fedoraproject.org/pkgdb/package/elektra/)
- - [Gentoo](http://packages.gentoo.org/package/app-admin/elektra)
- [Arch Linux](https://aur.archlinux.org/packages/elektra/)
- - [Debian](https://packages.debian.org/de/jessie/libelektra4)
- - [Ubuntu](https://launchpad.net/ubuntu/+source/elektra)
- [Openwrt](https://github.com/openwrt/packages/tree/master/libs/elektra)
- [OpenSuse](https://software.opensuse.org/package/elektra)
- - [PLDLinux](http://sophie.zarb.org/rpms/763d9e52beefaa15b1363d11d836b65c)
- - [LEDE](https://lede-project.org/packages/pkgdata/libelektra-core?s[]=elektra)
+ - [Debian](https://packages.debian.org/de/jessie/libelektra4)
+ - [Ubuntu](https://launchpad.net/ubuntu/+source/elektra)
+ - [Gentoo](http://packages.gentoo.org/package/app-admin/elektra)
- [Linux Mint](https://community.linuxmint.com/software/view/elektra-bin)
+ - [ALT Linux](https://pkgs.org/download/elektra)
-Available, but not up-to-date (Version 0.7):
+Available, but not up-to-date:
- [Mageia](http://svnweb.mageia.org/packages/updates/1/elektra/)
+ - [Fedora](https://admin.fedoraproject.org/pkgdb/package/elektra/)
For [OpenSUSE, CentOS, Fedora, RHEL and SLE](https://build.opensuse.org/package/show/home:bekun:devel/elektra)
Kai-Uwe Behrmann kindly provides packages [for download](http://software.opensuse.org/download.html?project=home%3Abekun%3Adevel&package=libelektra4).
|
cl_tracer_new changed and ccl_sample_run needed to be updated to match the new function arguments | @@ -55,18 +55,25 @@ int main(int argc,char **argv)
z_arr_sh[i]=Z0_SH-5*SZ_SH+10*SZ_SH*(i+0.5)/NZ;
nz_arr_sh[i]=exp(-0.5*pow((z_arr_sh[i]-Z0_SH)/SZ_SH,2));
}
+ /*CCL_ClTracer *ccl_cl_tracer_new(ccl_cosmology *cosmo,int tracer_type,
+ int has_rsd,int has_magnification,int has_intrinsic_alignment,
+ int nz_n,double *z_n,double *n,
+ int nz_b,double *z_b,double *b,
+ int nz_s,double *z_s,double *s,
+ int nz_ba,double *z_ba,double *ba,
+ int nz_rf,double *z_rf,double *rf);*/
//Galaxy clustering tracer
- CCL_ClTracer *ct_gc=ccl_cl_tracer_new(cosmo,CL_TRACER_NC,NZ,z_arr_gc,nz_arr_gc,NZ,z_arr_gc,bz_arr,
- 0,0,-1,NULL,NULL);
+ CCL_ClTracer *ct_gc=ccl_cl_tracer_new(cosmo,CL_TRACER_NC,0,0,0,NZ,z_arr_gc,nz_arr_gc,NZ,z_arr_gc,bz_arr,0,NULL,NULL,0,NULL,NULL,0,NULL,NULL);
+
//Cosmic shear tracer
- CCL_ClTracer *ct_wl=ccl_cl_tracer_new(cosmo,CL_TRACER_WL,NZ,z_arr_sh,nz_arr_sh,
- -1,NULL,NULL,0,0,-1,NULL,NULL);
- printf("ell C_ell(g,g) C_ell(g,s) C_ell(s,s) | r(g,s)\n");
+ CCL_ClTracer *ct_wl=ccl_cl_tracer_new(cosmo,CL_TRACER_WL,0,0,0,NZ,z_arr_sh,nz_arr_sh,0,NULL,NULL,0,NULL,NULL,0,NULL,NULL,0,NULL,NULL);
+
+ printf("ell C_ell(g,g) C_ell(g,s) C_ell(s,s) r(g,s)\n");
for(int l=2;l<NL;l+=10) {
double cl_gg=ccl_angular_cl(cosmo,l,ct_gc,ct_gc); //Galaxy-galaxy
double cl_gs=ccl_angular_cl(cosmo,l,ct_gc,ct_wl); //Galaxy-lensing
double cl_ss=ccl_angular_cl(cosmo,l,ct_wl,ct_wl); //Lensing-lensing
- printf("%d %.3lE %.3lE %.3lE | %.3lE\n",l,cl_gg,cl_gs,cl_ss,cl_gs/sqrt(cl_gg*cl_ss));
+ printf("%d %.3lE %.3lE %.3lE %.3lE\n",l,cl_gg,cl_gs,cl_ss,cl_gs/sqrt(cl_gg*cl_ss));
}
//Free up tracers
ccl_cl_tracer_free(ct_gc);
|
NimBLE: host_rcv_pkt event buf size check.
Check if the size of HCI event buffer is greater than the received HCI
packet. If not then abort with the error message. | @@ -342,6 +342,13 @@ static int host_rcv_pkt(uint8_t *data, uint16_t len)
totlen = BLE_HCI_EVENT_HDR_LEN + data[2];
assert(totlen <= UINT8_MAX + BLE_HCI_EVENT_HDR_LEN);
+ if (totlen > MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE)) {
+ ESP_LOGE(TAG, "Received HCI data length at host (%d) exceeds maximum configured HCI event buffer size (%d).",
+ totlen, MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE));
+ ble_hs_sched_reset(BLE_HS_ECONTROLLER);
+ return 0;
+ }
+
if (data[1] == BLE_HCI_EVCODE_HW_ERROR) {
assert(0);
}
|
tools/dump_tool/dump_tool.c: Add proper formatting of fileystem start address
Modify formatting of filesystem start address print output to console. | @@ -220,7 +220,7 @@ static int fsdump_recv(int dev_fd)
}
printf("\n=========================================================================\n");
- printf("Filesystem start address = %x, filesystem size = %d\n", smartfs_addr, smartfs_size);
+ printf("Filesystem start address = %08x, filesystem size = %d\n", smartfs_addr, smartfs_size);
printf("=========================================================================\n");
/* Create filesystem dump binary file name */
|
fix CDDA upsampling | @@ -1213,7 +1213,7 @@ const UINT8 *ptr;
SINT sampl;
SINT sampr;
SINT samplbias = soundcfg.rate >= 44100 ? 1 : (44100 / soundcfg.rate);
- SINT samphbias = soundcfg.rate >= 44100 ? soundcfg.rate / 44100 : 1;
+ SINT samphbias = soundcfg.rate > 44100 ? (soundcfg.rate / 44100) : 1;
SINT samphloop;
sxsi = sxsi_getptr(drv->sxsidrv);
@@ -1223,10 +1223,16 @@ const UINT8 *ptr;
return(FAILURE);
}
while(count) {
+ if(soundcfg.rate > 44100)
+ r = min(count, drv->dabufrem * samphbias);
+ else
r = min(count, drv->dabufrem / samplbias);
if (r) {
count -= r;
ptr = drv->dabuf + 2352 - drv->dabufrem * 4;
+ if(soundcfg.rate > 44100)
+ drv->dabufrem -= r / samphbias;
+ else
drv->dabufrem -= r * samplbias;
do {
sampl = ((SINT8)ptr[1] << 8) + ptr[0];
|
[AArch64][asan] fix typo in AsanStats::Print
This created an infinite loop that timed out several build bots while
executing the test in compiler-rt/test/asan/TestCases/atexit_stats.cpp | @@ -52,7 +52,7 @@ void AsanStats::Print() {
mmaps, munmaps);
PrintMallocStatsArray(" mallocs by size class: ", malloced_by_size,
- get_allocator().KMaxSize());
+ get_allocator().KNumClasses());
Printf("Stats: malloc large: %zu\n", malloc_large);
}
|
LISP: fix crash when GPE interface is re-added, | @@ -866,11 +866,11 @@ vnet_lisp_eid_table_map (u32 vni, u32 dp_id, u8 is_l2, u8 is_add)
"mapping!", vni, dp_id);
return -1;
}
- hash_unset (dp_table_by_vni[0], vni);
- hash_unset (vni_by_dp_table[0], dp_id);
-
/* remove dp iface */
dp_add_del_iface (lcm, vni, is_l2, 0);
+
+ hash_unset (dp_table_by_vni[0], vni);
+ hash_unset (vni_by_dp_table[0], dp_id);
}
return 0;
|
Update celix-deprecated target to correctly print targets | @@ -83,6 +83,16 @@ MACRO(celix_subproject)
ENDIF (${NAME})
ENDMACRO(celix_subproject)
+#[[
+Custom target which list the Celix CMake targets that are still using deprecated headers.
+]]
+if (NOT TARGET celix-deprecated)
+ add_custom_target(celix-deprecated
+ COMMAND ${CMAKE_COMMAND} -E echo "Targets still using deprecated utils headers: $<JOIN:$<TARGET_PROPERTY:celix-deprecated,UTIL_TARGETS>, >"
+ )
+ set_target_properties(celix-deprecated PROPERTIES "UTIL_TARGETS" "")
+endif ()
+
#[[
Add include path for the Celix utils deprecated headers to the provided target (as PRIVATE)
@@ -99,15 +109,5 @@ function(celix_deprecated_utils_headers)
set_target_properties(celix-deprecated PROPERTIES "UTIL_TARGETS" "${TARGETS}")
endfunction()
-#[[
-Custom target which list the Celix CMake target still using the deprecated utils headers
-]]
-if (NOT TARGET celix-deprecated)
- add_custom_target(celix-deprecated
- COMMAND ${CMAKE_COMMAND} -E echo "Utils targets: $<TARGET_PROPERTY:celix-deprecated,TARGETS_PROVIDED>"
- )
- set_target_properties(celix-deprecated PROPERTIES "UTIL_TARGETS" "")
-endif ()
-
include(${CMAKE_CURRENT_LIST_DIR}/ApacheRat.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/CodeCoverage.cmake)
|
Fix yaml in .travis.yml | @@ -45,17 +45,15 @@ before_install:
./get_nanoversion.sh;
cat __nanoversion__.txt;
cd ..;
- # python3.6 will break package dependency in conda.
if [[ "$DOCKER_DEPLOY" != "false" ]]; then
- # conda install --no-update-deps --yes python="$TRAVIS_PYTHON_VERSION" pip;
conda install --no-update-deps --yes pip;
else
- # conda install --no-update-deps --yes python="$TRAVIS_PYTHON_VERSION" pip numpy pyyaml;
conda install --no-update-deps --yes pip numpy pyyaml;
fi
fi
- pwd
-
+# conda install --no-update-deps --yes python="$TRAVIS_PYTHON_VERSION" pip;
+# conda install --no-update-deps --yes python="$TRAVIS_PYTHON_VERSION" pip numpy pyyaml;
install:
- pwd
|
Fix ZCL reporting configuration for non DDF managed devices | @@ -709,7 +709,9 @@ bool DeRestPluginPrivate::sendConfigureReportingRequest(BindingTask &bt, const s
// clue code to get classic hard coded C++ bindings into DDF
Device *device = DEV_GetDevice(m_devices, bt.binding.srcAddress);
- if (device && !device->managed())
+ if (!device)
+ { }
+ else if (!device->managed())
{
DDF_Binding ddfBinding;
@@ -758,7 +760,9 @@ bool DeRestPluginPrivate::sendConfigureReportingRequest(BindingTask &bt, const s
deviceDescriptions->put(ddf);
}
}
-
+ }
+ else if (device->managed())
+ {
return false;
}
|
Update dynamic_arch.yml | @@ -77,5 +77,5 @@ jobs:
mkdir build
cd build
- cmake -DDYNAMIC_ARCH=1 -DNOFORTRAN=0 -DBUILD_WITHOUT_LAPACK=0 -DCMAKE_VERBOSE_MAKEFILES=ON ..
+ cmake -DDYNAMIC_ARCH=1 -DNOFORTRAN=0 -DBUILD_WITHOUT_LAPACK=0 -DCMAKE_VERBOSE_MAKEFILE=ON ..
make -j$(nproc)
|
Update docker for travis. | @@ -38,6 +38,11 @@ env:
- IMAGE_NAME: registry.hub.docker.com/$TRAVIS_REPO_SLUG
- ARTIFACTS_PATH: $TRAVIS_BUILD_DIR/artifacts
+addons:
+ apt:
+ packages:
+ - docker-ce
+
before_install:
- sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
|
Fix SceUsbStorVstorType
remain bugs. change to SceUsbstorVstorType | @@ -38,11 +38,11 @@ int sceUsbstorVStorSetDeviceInfo(const char *name, const char *version);
/**
* Start USB virtual storage
*
- * @param[in] type - One of ::SceUsbStorVstorType
+ * @param[in] type - One of ::SceUsbstorVstorType
*
* @return 0 on success, < 0 on error.
*/
-int sceUsbstorVStorStart(SceUsbStorVstorType type);
+int sceUsbstorVStorStart(SceUsbstorVstorType type);
/**
* Stop USB virtual storage
|
Fix right-shift data loss issue with MBEDTLS_PUT_UINT16_BE in cookie | @@ -713,7 +713,7 @@ static int ssl_tls13_write_cookie_ext( mbedtls_ssl_context *ssl,
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_COOKIE, p, 0 );
MBEDTLS_PUT_UINT16_BE( ssl->handshake->verify_cookie_len + 2, p, 2 );
- MBEDTLS_PUT_UINT16_BE( ssl->handshake->verify_cookie_len, p, 4 );
+ MBEDTLS_PUT_UINT16_BE( (size_t) ssl->handshake->verify_cookie_len, p, 4 );
p += 6;
/* Cookie */
|
turtle: abort on disarm delay reversing again to next arm | @@ -37,33 +37,29 @@ void turtle_mode_cancel() {
}
void turtle_mode_update() {
- if (turtle_state > TURTLE_STAGE_IDLE && flags.arm_state == 1) {
+ if (turtle_state != TURTLE_STAGE_IDLE) {
+ // turtle is active
flags.turtle = 1;
- } else {
- flags.turtle = 0;
- }
- // turtle was interrupted
- if (!turtle_ready && turtle_state != TURTLE_STAGE_IDLE) {
- // force motors to forward, in case turtle was interrupted
- if (!motor_set_direction(MOTOR_FORWARD)) {
- return;
+ if (
+ !turtle_ready || // turtle was canceled
+ state.GEstG.yaw > 0.5f || // quad was flipped
+ !flags.arm_state // quad was disarmed
+ ) {
+ // quad was flipped
+ turtle_state = TURTLE_STAGE_EXIT;
}
-
- // reset state
- turtle_state = TURTLE_STAGE_IDLE;
- flags.controls_override = 0;
- flags.motortest_override = 0;
+ } else {
+ // turtle is in-active
+ if (flags.arm_state && !motor_set_direction(MOTOR_FORWARD)) {
return;
}
-
- if (state.GEstG.yaw > 0.5f && turtle_state) {
- // exit the sequence if you failed to turtle, picked up the quad, and flipped it over your damn self
- turtle_state = TURTLE_STAGE_EXIT;
+ flags.turtle = 0;
}
switch (turtle_state) {
case TURTLE_STAGE_IDLE: {
+ // quad was just armed and upside down, begin the turtle sequence
static uint8_t last_armed_state_turtle = 0;
if (flags.arm_switch != last_armed_state_turtle) {
last_armed_state_turtle = flags.arm_switch;
@@ -123,22 +119,12 @@ void turtle_mode_update() {
if (time_millis() - turtle_time > TURTLE_TIMEOUT) {
turtle_state = TURTLE_STAGE_START;
}
-
- if (state.GEstG.yaw > 0.50f) {
- turtle_state = TURTLE_STAGE_EXIT;
- }
break;
case TURTLE_STAGE_EXIT:
flags.controls_override = 0;
flags.motortest_override = 0;
flags.arm_safety = 1;
-
- if (!motor_set_direction(MOTOR_FORWARD)) {
- // wait for the motor to sucessfully change
- break;
- }
-
turtle_state = TURTLE_STAGE_IDLE;
turtle_ready = false;
break;
|
add unsubscribe to BLE_Send_Data_After_Disconnected | @@ -459,6 +459,10 @@ TEST( Full_BLE_Integration_Test_Connection, BLE_Send_Data_After_Disconnected )
IotTestBleHal_ReadResponse( bletestATTR_SRVCB_CHAR_A, xReadEvent, true );
IotTestBleHal_CheckIndicationNotification( false, true );
IotTestBleHal_CheckIndicationNotification( true, true );
+
+ /* unsubscribe notification&indication */
+ IotTestBleHal_checkNotificationIndication( bletestATTR_SRVCB_CCCD_E, false );
+ IotTestBleHal_checkNotificationIndication( bletestATTR_SRVCB_CCCD_F, false );
}
/* trigger Adv Stop callback AdvStartCB(with start=false) when Adv timeout. */
|
Retry packet contains connection ID chosen by server | @@ -2550,9 +2550,9 @@ static int conn_recv_handshake_pkt(ngtcp2_conn *conn, const uint8_t *pkt,
if (conn->strm0->last_rx_offset != 0) {
return NGTCP2_ERR_PROTO;
}
- if (conn->conn_id != hd.conn_id) {
- return 0;
- }
+ /* hd.conn_id is a connection ID chosen by server, and client
+ MUST choose it in a subsequent packets. */
+ conn->conn_id = hd.conn_id;
break;
case NGTCP2_PKT_VERSION_NEGOTIATION:
if (conn->client_conn_id != hd.conn_id) {
|
copy qcow and file's lba and length checks
Copy qcow and file_examples iov, lba and length checks to
the generic code. | #define _GNU_SOURCE
#include <scsi/scsi.h>
#include <errno.h>
+#include <inttypes.h>
#include "libtcmu.h"
#include "libtcmu_aio.h"
@@ -81,6 +82,29 @@ static void free_single_iovec(struct tcmulib_cmd *cmd)
cmd->iovec = NULL;
}
+static int check_lba_and_length(struct tcmu_device *dev,
+ struct tcmulib_cmd *cmd, uint32_t sectors)
+{
+ uint8_t *cdb = cmd->cdb;
+ uint64_t lba = tcmu_get_lba(cdb);
+ uint64_t num_lbas = tcmu_get_dev_num_lbas(dev);
+ size_t iov_length = tcmu_iovec_length(cmd->iovec, cmd->iov_cnt);
+
+ if (iov_length != sectors * tcmu_get_dev_block_size(dev)) {
+ tcmu_err("iov len mismatch: iov len %zu, xfer len %" PRIu32 ", block size %" PRIu32 "\n",
+ iov_length, sectors, tcmu_get_dev_block_size(dev));
+
+ return tcmu_set_sense_data(cmd->sense_buf, HARDWARE_ERROR,
+ ASC_INTERNAL_TARGET_FAILURE, NULL);
+ }
+
+ if (lba >= num_lbas || lba + sectors > num_lbas)
+ return tcmu_set_sense_data(cmd->sense_buf, ILLEGAL_REQUEST,
+ ASC_LBA_OUT_OF_RANGE, NULL);
+
+ return SAM_STAT_GOOD;
+}
+
/* async write verify */
struct tcmu_write_verify_state {
@@ -443,6 +467,10 @@ static int handle_caw(struct tcmu_device *dev,
uint8_t *sense = cmd->sense_buf;
ssize_t half = (tcmu_iovec_length(iovec, iov_cnt)) / 2;
+ ret = check_lba_and_length(dev, cmd, cmd->cdb[13] * 2);
+ if (ret)
+ return ret;
+
ret = errno_to_sam_status(-ENOMEM, sense);
readcmd = caw_init_readcmd(cmd, off, half);
@@ -512,6 +540,10 @@ static int handle_write(struct tcmu_device *dev,
int ret;
struct tcmu_call_stub stub;
+ ret = check_lba_and_length(dev, cmd, tcmu_get_xfer_length(cmd->cdb));
+ if (ret)
+ return ret;
+
stub.sop = TCMU_STORE_OP_WRITE;
stub.callout_cbk = handle_write_cbk;
@@ -542,6 +574,10 @@ static int handle_read(struct tcmu_device *dev,
int ret;
struct tcmu_call_stub stub;
+ ret = check_lba_and_length(dev, cmd, tcmu_get_xfer_length(cmd->cdb));
+ if (ret)
+ return ret;
+
stub.sop = TCMU_STORE_OP_READ;
stub.callout_cbk = handle_read_cbk;
|
Fix leak in TlsClient object.
sckClientOpen() is the most likely part of this code to error so move it up above SSL session creation to reduce the chance of a leak. | @@ -281,7 +281,11 @@ tlsClientOpen(TlsClient *this)
TRY_BEGIN()
{
- // Create internal TLS session
+ // Open the socket session first since this is mostly likely to fail
+ SocketSession *socketSession = sckClientOpen(this->socketClient);
+
+ // Create internal TLS session. If there is a failure before the TlsSession object is created there may be a leak
+ // of the TLS session but this is likely to result in program termination so it doesn't seem worth coding for.
cryptoError((session = SSL_new(this->context)) == NULL, "unable to create TLS session");
// Set server host name used for validation
@@ -290,11 +294,10 @@ tlsClientOpen(TlsClient *this)
"unable to set TLS host name");
// Create the TLS session
- result = tlsSessionNew(session, sckClientOpen(this->socketClient), this->timeout);
+ result = tlsSessionNew(session, socketSession, this->timeout);
}
CATCH_ANY()
{
- tlsSessionFree(result);
result = NULL;
// Retry if wait time has not expired
|
Fix stat page context | @@ -289,7 +289,15 @@ INT_PTR CALLBACK PhpProcessStatisticsDlgProc(
if (PhpPropPageDlgProcHeader(hwndDlg, uMsg, lParam, &propSheetPage, &propPageContext, &processItem))
{
- statisticsContext = (PPH_STATISTICS_CONTEXT)propPageContext->Context;
+ if (propPageContext->Context)
+ {
+ statisticsContext = propPageContext->Context;
+ }
+ else
+ {
+ statisticsContext = propPageContext->Context = PhAllocate(sizeof(PH_STATISTICS_CONTEXT));
+ memset(propPageContext->Context, 0, sizeof(PH_STATISTICS_CONTEXT));
+ }
}
else
{
@@ -300,9 +308,6 @@ INT_PTR CALLBACK PhpProcessStatisticsDlgProc(
{
case WM_INITDIALOG:
{
- propPageContext->Context = statisticsContext = PhAllocate(sizeof(PH_STATISTICS_CONTEXT));
- memset(statisticsContext, 0, sizeof(PH_STATISTICS_CONTEXT));
-
statisticsContext->WindowHandle = hwndDlg;
statisticsContext->ListViewHandle = GetDlgItem(hwndDlg, IDC_STATISTICS_LIST);
statisticsContext->Enabled = TRUE;
|
build: Move DVL creation to separate function
This allows to run different code analysis tools for different EWDK. | @@ -167,6 +167,8 @@ call "%~dp0\SetVsEnv.bat" x86
if /I "!TAG!"=="SDV" (
echo Running SDV for %BUILD_FILE%, configuration %TARGET_VS_CONFIG%
call :runsdv "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH%
+ call :runca "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH%
+ call :rundvl "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH%
) else (
echo Building %BUILD_FILE%, configuration %TARGET_VS_CONFIG%, command %BUILD_COMMAND%
call :runbuild "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH%
@@ -208,12 +210,18 @@ IF ERRORLEVEL 1 (
set BUILD_FAILED=1
)
+goto :eof
+
+:runca
msbuild.exe %BUILD_FILE% /p:Configuration="%~1" /P:Platform=%2 /P:RunCodeAnalysisOnce=True
IF ERRORLEVEL 1 (
set BUILD_FAILED=1
)
+goto :eof
+
+:rundvl
msbuild.exe %BUILD_FILE% /t:dvl /p:Configuration="%~1" /P:platform=%2
IF ERRORLEVEL 1 (
|
launch: bring tutorial prompt to spec | -import React, { useState, useEffect } from 'react';
+import React, { useState, useMemo, useEffect } from 'react';
import styled from 'styled-components';
import { useHistory } from 'react-router-dom';
import f from 'lodash/fp';
@@ -73,10 +73,13 @@ export default function LaunchApp(props) {
const { query } = useQuery();
useEffect(() => {
- if(query.tutorial) {
- props.api.settings.putEntry('tutorial', 'seen', false);
+ if(query.get('tutorial')) {
+ if(hasTutorialGroup(props)) {
+ nextTutStep();
+ } else {
+ showModal();
+ }
}
-
}, [query]);
const { tutorialProgress, nextTutStep } = useLocalState(tutSelector);
@@ -84,6 +87,8 @@ export default function LaunchApp(props) {
const waiter = useWaitForProps(props);
const { modal, showModal } = useModal({
+ position: 'relative',
+ maxWidth: '350px',
modal: (dismiss) => {
const onDismiss = (e) => {
e.stopPropagation();
@@ -97,7 +102,7 @@ export default function LaunchApp(props) {
await waiter(hasTutorialGroup);
await Promise.all(
[TUTORIAL_BOOK, TUTORIAL_CHAT, TUTORIAL_LINKS].map(graph =>
- api.graph.join(TUTORIAL_HOST, graph)));
+ props.api.graph.join(TUTORIAL_HOST, graph)));
await waiter(p => {
return `/ship/${TUTORIAL_HOST}/${TUTORIAL_CHAT}` in p.associations.graph &&
@@ -109,7 +114,10 @@ export default function LaunchApp(props) {
dismiss();
}
return (
- <Col gapY="2" p="3">
+ <Col maxWidth="350px" gapY="2" p="3">
+ <Box position="absolute" left="-16px" top="-16px">
+ <Icon width="32px" height="32px" color="blue" display="block" icon="LargeBullet" />
+ </Box>
<Text lineHeight="tall" fontWeight="medium">Welcome</Text>
<Text lineHeight="tall">
You have been invited to use Landscape, an interface to chat
@@ -118,7 +126,7 @@ export default function LaunchApp(props) {
Would you like a tour of Landscape?
</Text>
<Row gapX="2" justifyContent="flex-end">
- <Button onClick={onDismiss}>Skip</Button>
+ <Button backgroundColor="washedGray" onClick={onDismiss}>Skip</Button>
<StatelessAsyncButton primary onClick={onContinue}>
Yes
</StatelessAsyncButton>
@@ -126,12 +134,14 @@ export default function LaunchApp(props) {
</Col>
)}
});
+ const hasLoaded = useMemo(() => Object.keys(props.contacts).length > 0, [props.contacts]);
+
useEffect(() => {
const seenTutorial = _.get(props.settings, ['tutorial', 'seen'], true);
- if(!seenTutorial && tutorialProgress === 'hidden') {
+ if(hasLoaded && !seenTutorial && tutorialProgress === 'hidden') {
showModal();
}
- }, [props.settings]);
+ }, [props.settings, hasLoaded]);
return (
<>
|
Further additions for Xiaomi special reporting output | @@ -11706,7 +11706,7 @@ void DeRestPluginPrivate::handleZclAttributeReportIndicationXiaomiSpecial(const
}
else if (tag == 0x0b && dataType == deCONZ::Zcl8BitUint)
{
- DBG_Printf(DBG_INFO, "\t0b unknown %d (0x%04X)\n", u8, u8);
+ DBG_Printf(DBG_INFO, "\t0b unknown %d (0x%02X)\n", u8, u8);
}
else if ((tag == 0x64 || structIndex == 0x01) && dataType == deCONZ::ZclBoolean) // lumi.ctrl_ln2 endpoint 01
{
@@ -11720,7 +11720,7 @@ void DeRestPluginPrivate::handleZclAttributeReportIndicationXiaomiSpecial(const
lift = 100 - u8;
}
DBG_Printf(DBG_INFO, "\t64 lift %d (%d%%)\n", u8, lift);
- DBG_Printf(DBG_INFO, "\t64 somke/gas density %d (%d%%)\n", u8); // lumi.sensor_smoke/lumi.sensor_natgas
+ DBG_Printf(DBG_INFO, "\t64 somke/gas density %d (0x%02X)\n", u8, u8); // lumi.sensor_smoke/lumi.sensor_natgas
}
else if (tag == 0x64 && dataType == deCONZ::Zcl16BitInt)
{
@@ -11744,6 +11744,14 @@ void DeRestPluginPrivate::handleZclAttributeReportIndicationXiaomiSpecial(const
DBG_Printf(DBG_INFO, "\t65 humidity %u\n", u16); // Mi
humidity = u16;
}
+ else if (tag == 0x65 && dataType == deCONZ::Zcl8BitUint)
+ {
+ DBG_Printf(DBG_INFO, "\t65 unknown %d (0x%02X)\n", u8, u8);
+ }
+ else if (tag == 0x66 && dataType == deCONZ::Zcl16BitUint)
+ {
+ DBG_Printf(DBG_INFO, "\t66 unknown %d (0x%04X)\n", u16, u16);
+ }
else if (tag == 0x66 && dataType == deCONZ::Zcl32BitInt) // lumi.weather
{
pressure = (s32 + 50) / 100;
|
added initialization of record_status | @@ -310,7 +310,7 @@ split(
/* stores for record data */
ion_byte_t *record_key = alloca(linear_hash->super.record.key_size);
ion_byte_t *record_value = alloca(linear_hash->super.record.value_size);
- ion_byte_t record_status;
+ ion_byte_t record_status = 0;
/* ion_fpos_t linear_hash->record_total_size = linear_hash->super.record.key_size + linear_hash->super.record.value_size + sizeof(ion_byte_t); */
int split_hash_key;
@@ -318,6 +318,7 @@ split(
int i, j;
ion_byte_t *records = alloca(linear_hash->record_total_size * linear_hash->records_per_bucket);
+
memset(records, 0, linear_hash->record_total_size * linear_hash->records_per_bucket);
ion_fpos_t record_offset = 0;
@@ -666,12 +667,13 @@ linear_hash_get(
/* create a linear_hash_record with the desired key, value, and status of full*/
ion_byte_t *record_key = alloca(linear_hash->super.record.key_size);
ion_byte_t *record_value = alloca(linear_hash->super.record.value_size);
- ion_byte_t record_status;
+ ion_byte_t record_status = 0;
int found = 0;
int i;
ion_byte_t *records = alloca(linear_hash->record_total_size * linear_hash->records_per_bucket);
+
memset(records, 0, linear_hash->record_total_size * linear_hash->records_per_bucket);
ion_fpos_t record_offset = 0;
@@ -766,7 +768,7 @@ linear_hash_update(
/* create a temporary store for records that are read */
ion_byte_t *record_key = alloca(linear_hash->super.record.key_size);
ion_byte_t *record_value = alloca(linear_hash->super.record.value_size);
- ion_byte_t record_status;
+ ion_byte_t record_status = 0;
ion_fpos_t record_loc;
@@ -868,11 +870,12 @@ linear_hash_delete(
/* create a linear_hash_record with the desired key, value, and status of full*/
ion_byte_t *record_key = alloca(linear_hash->super.record.key_size);
ion_byte_t *record_value = alloca(linear_hash->super.record.value_size);
- ion_byte_t record_status;
+ ion_byte_t record_status = 0;
int i;
ion_byte_t *records = alloca(linear_hash->record_total_size * linear_hash->records_per_bucket);
+
memset(records, 0, linear_hash->record_total_size * linear_hash->records_per_bucket);
ion_fpos_t record_offset = 0;
@@ -881,7 +884,7 @@ linear_hash_delete(
/* memory allocated to transfer the terminal records to delete location for swap on delete */
ion_byte_t *terminal_record_key = alloca(linear_hash->super.record.key_size);
ion_byte_t *terminal_record_value = alloca(linear_hash->super.record.value_size);
- ion_byte_t terminal_record_status;
+ ion_byte_t terminal_record_status = 0;
while (bucket.overflow_location != -1) {
record_loc = bucket_loc + sizeof(linear_hash_bucket_t);
|
gtkui_transfer.c: simplify logic to get selected transfers
the function used gtk_tree_selection_get_selected_rows()
which is more suitable for a GtkTreeView with GtkTreeStore model I guess.. | @@ -114,41 +114,33 @@ on_gtk_button_clicked_unselectall (GtkButton *button, gpointer data)
static void
-gftpui_gtk_set_action (gftp_transfer * tdata, char * transfer_str,
+gftp_gtk_set_transfer_action (gftp_transfer * tdata, char * transfer_str,
int transfer_action)
{
- //GList *filelist = tdata->files;
Wg_mutex_lock (&tdata->structmutex);
GtkTreeView *tree = GTK_TREE_VIEW (tdata->clist);
-
GtkTreeSelection *tsel = gtk_tree_view_get_selection (tree);
- GList *selrows = gtk_tree_selection_get_selected_rows (tsel, NULL);
- GList *i = selrows;
-
- GtkTreeModel *model = GTK_TREE_MODEL (gtk_tree_view_get_model (tree));
+ GtkTreeModel *model = gtk_tree_view_get_model (tree);
GtkListStore *store = GTK_LIST_STORE (model);
GtkTreeIter iter;
- GtkTreePath *tpath = NULL;
+ gboolean valid;
gftp_file * gftpFile = NULL;
- while (i)
- {
- tpath = (GtkTreePath *) i->data;
+ valid = gtk_tree_model_get_iter_first (model, &iter);
- gtk_tree_model_get_iter (model, &iter, tpath);
- gtk_tree_model_get (model, &iter,
- TRANSFER_DLG_COL_GFTPFILE, &gftpFile, -1);
+ while (valid)
+ {
+ if (gtk_tree_selection_iter_is_selected (tsel, &iter)) {
+ gtk_tree_model_get (model, &iter, TRANSFER_DLG_COL_GFTPFILE, &gftpFile, -1);
if (gftpFile) {
- // fprintf (stderr, "- %s: %s\n", gftpFile->file, transfer_str);
gftpFile->transfer_action = transfer_action;
+ // change transfer action text in TreeView
gtk_list_store_set (store, &iter, TRANSFER_DLG_COL_ACTION, transfer_str, -1);
}
-
- i = i->next;
}
-
- g_list_free_full (selrows, (GDestroyNotify) gtk_tree_path_free);
+ valid = gtk_tree_model_iter_next (model, &iter);
+ }
Wg_mutex_unlock (&tdata->structmutex);
}
@@ -156,19 +148,19 @@ gftpui_gtk_set_action (gftp_transfer * tdata, char * transfer_str,
static void
on_gtk_button_clicked_overwrite (GtkButton *button, gpointer data)
{
- gftpui_gtk_set_action (data, _("Overwrite"), GFTP_TRANS_ACTION_OVERWRITE);
+ gftp_gtk_set_transfer_action (data, _("Overwrite"), GFTP_TRANS_ACTION_OVERWRITE);
}
static void
on_gtk_button_clicked_resume (GtkButton *button, gpointer data)
{
- gftpui_gtk_set_action (data, _("Resume"), GFTP_TRANS_ACTION_RESUME);
+ gftp_gtk_set_transfer_action (data, _("Resume"), GFTP_TRANS_ACTION_RESUME);
}
static void
on_gtk_button_clicked_skip (GtkButton *button, gpointer data)
{
- gftpui_gtk_set_action (data, _("Skip"), GFTP_TRANS_ACTION_SKIP);
+ gftp_gtk_set_transfer_action (data, _("Skip"), GFTP_TRANS_ACTION_SKIP);
}
|
freertos-smp: fix pytest_esp_timer test with FreeRTOS SMP enabled
This commit adjusts the threshold for one-shot timer callback time. | @@ -63,7 +63,7 @@ def test_esp_timer(dut: Dut) -> None:
one_shot_timer_time = int(match.group(1))
diff = start_time + ONE_SHOT_TIMER_PERIOD - one_shot_timer_time
logging.info('One-shot timer, time: {} us, diff: {}'.format(one_shot_timer_time, diff))
- assert(abs(diff) < 220)
+ assert(abs(diff) < 350)
match = dut.expect(RESTART_REGEX, timeout=3)
start_time = int(match.group(1))
|
Make sure an image file exists before attempting to open it. | @@ -72,7 +72,7 @@ static int FreeColors(Display *d, Colormap cmap, Pixel *pixels, int n,
#endif
/* File extension to image loader mapping. */
-static struct {
+static const struct {
const char *extension;
ImageLoader loader;
} IMAGE_LOADERS[] = {
@@ -104,15 +104,21 @@ ImageNode *LoadImage(const char *fileName, int rwidth, int rheight,
unsigned i;
unsigned name_length;
ImageNode *result = NULL;
+
+ /* Make sure we have a reasonable file name. */
if(!fileName) {
return result;
}
-
name_length = strlen(fileName);
if(JUNLIKELY(name_length == 0)) {
return result;
}
+ /* Make sure the file exists. */
+ if(access(fileName, R_OK) < 0) {
+ return result;
+ }
+
/* First we attempt to use the extension to determine the type
* to avoid trying all loaders. */
for(i = 0; i < IMAGE_LOADER_COUNT; i++) {
|
groups: fix linting errors | @@ -198,7 +198,7 @@ function stitchInline(a: any, b: any) {
last.children.push({
type: 'paragraph',
children: []
- })
+ });
}
}
if (last?.children) {
@@ -302,17 +302,17 @@ function stitchAsts(asts: [StitchMode, GraphAstNode][]) {
if (c.type === 'blockquote' && t[1].children[idx +1] !== undefined && t[1].children[idx +1].type === 'paragraph') {
const next = idx !== t[1].children.length -1
? t[1].children.splice(idx +1, 1)
- : []
+ : [];
if (next.length > 0) {
- t[1].children[idx].children.push(next[0])
+ t[1].children[idx].children.push(next[0]);
+ }
}
- };
- let links = [];
+ const links = [];
function addRichEmbedURL(nodes) {
if (nodes?.children) {
- nodes.children.filter(k => {
+ nodes.children.filter((k) => {
if (k.type === 'link') {
links.push({
type: 'root',
@@ -322,9 +322,9 @@ function stitchAsts(asts: [StitchMode, GraphAstNode][]) {
url: k.url
}
]
- })
+ });
} else if (k?.children) {
- k.children.filter(o => {
+ k.children.filter((o) => {
if (o.type === 'link') {
links.push({
type: 'root',
@@ -334,20 +334,19 @@ function stitchAsts(asts: [StitchMode, GraphAstNode][]) {
url: o.url
}
]
- })
+ });
}
- })
+ });
}
- })
+ });
nodes.children.push(...links);
}
}
- addRichEmbedURL(c)
-
+ addRichEmbedURL(c);
});
- return t
+ return t;
}
const header = ({ children, depth, ...rest }) => {
const level = depth;
|
[mod_auth] check that digest realm matches config | @@ -678,6 +678,13 @@ static handler_t mod_auth_check_digest(server *srv, connection *con, void *p_d,
return mod_auth_send_400_bad_request(srv, con);
}
+ if (!buffer_is_equal_string(require->realm, realm, strlen(realm))) {
+ log_error_write(srv, __FILE__, __LINE__, "s",
+ "digest: realm mismatch");
+ buffer_free(b);
+ return mod_auth_send_401_unauthorized_digest(srv, con, require->realm, 0);
+ }
+
/**
* protect the md5-sess against missing cnonce and nonce
*/
|
obs: enable test-suite | @@ -36,7 +36,7 @@ mpi_families=["openmpi3","mpich","mvapich2","impi"]
# define (standalone) component packages
standalone = ["charliecloud","cmake","conman","docs","easybuild","gnu-compilers","hwloc",
"lmod","lustre-client","nagios","pbspro","pmix","singularity","slurm",
- "spack","valgrind"]
+ "spack","test-suite","valgrind"]
# define (compiler dependent) packages
compiler_dependent = ["likwid","mpich","openblas","openmpi","R","plasma"]
|
base64: check for buffer overflow and cleanup
Check for buffer overflow after each pointer increment
since 0 is a valid marker | @@ -156,14 +156,17 @@ base64_decode(const char *str, void *data)
for (p = str; *p && (*p == '=' || strchr(base64_chars, *p)); p += 4) {
unsigned int val = token_decode(p);
unsigned int marker = (val >> 24) & 0xff;
- if (val == DECODE_ERROR)
+ if (val == DECODE_ERROR) {
return -1;
+ }
*q++ = (val >> 16) & 0xff;
- if (marker < 2)
+ if (marker < 2) {
*q++ = (val >> 8) & 0xff;
- if (marker < 1)
+ }
+ if (marker < 1) {
*q++ = val & 0xff;
}
+ }
return q - (unsigned char *) data;
}
@@ -175,19 +178,33 @@ base64_decode_maxlen(const char *str, void *data, int len)
q = data;
for (p = str; *p && (*p == '=' || strchr(base64_chars, *p)); p += 4) {
- if (q - (unsigned char *)data >= len) {
- break;
- }
unsigned int val = token_decode(p);
unsigned int marker = (val >> 24) & 0xff;
- if (val == DECODE_ERROR)
+
+ if (val == DECODE_ERROR) {
return -1;
+ }
+
*q++ = (val >> 16) & 0xff;
- if (marker < 2)
+ if (q - (unsigned char *)data >= len) {
+ break;
+ }
+
+ if (marker < 2) {
*q++ = (val >> 8) & 0xff;
- if (marker < 1)
+ if (q - (unsigned char *)data >= len) {
+ break;
+ }
+ }
+
+ if (marker < 1) {
*q++ = val & 0xff;
+ if (q - (unsigned char *)data >= len) {
+ break;
+ }
}
+ }
+
return q - (unsigned char *) data;
}
|
add unpack_dist command | @@ -341,6 +341,8 @@ install: install_soter_headers install_themis_headers install_static_libs instal
get_themis_version:
@echo $(THEMIS_VERSION)
+THEMIS_DIST_FILENAME = $(THEMIS_VERSION).tar.gz
+
dist:
mkdir -p $(THEMIS_VERSION)
rsync -avz src $(THEMIS_VERSION)
@@ -356,7 +358,7 @@ dist:
rsync -avz build.gradle $(THEMIS_VERSION)
rsync -avz gradlew $(THEMIS_VERSION)
rsync -avz themis.podspec $(THEMIS_VERSION)
- tar -zcvf $(THEMIS_VERSION).tar.gz $(THEMIS_VERSION)
+ tar -zcvf $(THEMIS_DIST_FILENAME) $(THEMIS_VERSION)
rm -rf $(THEMIS_VERSION)
for-audit: $(SOTER_AUD) $(THEMIS_AUD)
@@ -432,9 +434,10 @@ themispp_uninstall:
@echo -n "themispp uninstall "
@$(BUILD_CMD_)
+
COSSACKLABS_URL = https://www.cossacklabs.com
# tag version from VCS
-THEMIS_VERSION = `git describe --tags HEAD | cut -b 1-`
+THEMIS_VERSION := $(shell git describe --tags HEAD | cut -b 1-)
THEMIS_LICENSE_NAME = "Apache License Version 2.0"
MAINTAINER = "CossackLabs LTD <[email protected]>"
DEBIAN_THEMIS_DEPENDENCIES = libssl-dev
@@ -456,7 +459,10 @@ themis_collect_headers:
collect_headers: themis_collect_headers soter_collect_headers
-deb: themis_static themis_shared soter_static soter_shared collect_headers
+unpack_dist:
+ @tar -xf $(THEMIS_DIST_FILENAME)
+
+deb: test themis_static themis_shared soter_static soter_shared collect_headers
@find . -name \*.so -exec strip -o {} {} \;
@mkdir -p $(BIN_PATH)/deb
@@ -494,8 +500,10 @@ deb: themis_static themis_shared soter_static soter_shared collect_headers
$(BIN_PATH)/libsoter.a=$(PREFIX)/lib/libsoter.a \
$(BIN_PATH)/libsoter.so=$(PREFIX)/lib/libsoter.so 1>/dev/null
+ # it's just for printing .deb files
@find $(BIN_PATH) -name \*.deb
+
rpm: themis_static themis_shared soter_static soter_shared collect_headers
@find . -name \*.so -exec strip -o {} {} \;
@mkdir -p $(BIN_PATH)/rpm
|
in_systemd: tags dont match _SYSTEMD_UNIT | @@ -78,12 +78,12 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
char *sep;
char *key;
char *val;
- char *tag;
- char *last_tag = NULL;
char *cursor = NULL;
- size_t last_tag_len;
+ char *tag;
size_t tag_len;
- char out_tag[PATH_MAX];
+ char new_tag[PATH_MAX];
+ char last_tag[PATH_MAX];
+ size_t last_tag_len = 0;
const void *data;
struct flb_systemd_config *ctx = in_context;
struct flb_time tm;
@@ -115,12 +115,12 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
if (ctx->dynamic_tag) {
ret = sd_journal_get_data(ctx->j, "_SYSTEMD_UNIT", &data, &length);
if (ret == 0) {
- tag = out_tag;
+ tag = new_tag;
tag_compose(ctx->i_ins->tag, (char *) data + 14, length - 14,
&tag, &tag_len);
}
else {
- tag = out_tag;
+ tag = new_tag;
tag_compose(ctx->i_ins->tag,
FLB_SYSTEMD_UNKNOWN, sizeof(FLB_SYSTEMD_UNKNOWN) - 1,
&tag, &tag_len);
@@ -131,8 +131,8 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
tag_len = ctx->i_ins->tag_len;
}
- if (last_tag == NULL) {
- last_tag = tag;
+ if (last_tag_len == 0) {
+ strncpy(last_tag, tag, tag_len);
last_tag_len = tag_len;
}
@@ -157,13 +157,13 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
if (mp_sbuf.size > 0 &&
((last_tag_len != tag_len) || (strncmp(last_tag, tag, tag_len) != 0))) {
flb_input_dyntag_append_raw(ctx->i_ins,
- tag, tag_len,
+ last_tag, last_tag_len,
mp_sbuf.data,
mp_sbuf.size);
msgpack_sbuffer_destroy(&mp_sbuf);
msgpack_sbuffer_init(&mp_sbuf);
- last_tag = tag;
+ strncpy(last_tag, tag, tag_len);
last_tag_len = tag_len;
}
@@ -200,7 +200,7 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
mp_sbuf.size);
msgpack_sbuffer_destroy(&mp_sbuf);
msgpack_sbuffer_init(&mp_sbuf);
- last_tag = tag;
+ strncpy(last_tag, tag, tag_len);
last_tag_len = tag_len;
ret_j = -1;
break;
|
Fix unlocking outputs | @@ -7072,7 +7072,13 @@ bool CWallet::ExpandLockedAnonOutput(CWalletDB *pwdb, CKeyID &ckeyId, CLockedAno
return error("%s: SecretToPublicKey() failed.", __func__);
+ //CKey key;
CKey key;
+ CSecret vchSecret;
+ vchSecret.resize(ec_secret_size);
+
+ key.Set(&vchSecret[0], &sSpendR.e[0], true);
+
if (!key.IsValid())
return error("%s: Reconstructed key is invalid.", __func__);
|
replace libretro-common 12 | @@ -688,9 +688,10 @@ SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/compat/compat_strcasestr
# $(NP2_PATH)/sdl2/libretro/libretro-common/formats/libchdr/libchdr_flac_codec.c \
# $(NP2_PATH)/sdl2/libretro/libretro-common/streams/trans_stream_zlib.c
+ifneq ($(platform), switch)
#SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/rthreads/switch_pthread.c
#SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/rthreads/rthreads.c
-ifneq ($(platform), switch)
+else
SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/rthreads/rthreads.c
endif
|
Add webhook name limit | @@ -39,6 +39,10 @@ https://discord.com/developers/docs/resources/channel#embed-limits*/
#define EMBED_FOOTER_TEXT_LEN 2048 + 1
#define EMBED_AUTHOR_NAME_LEN 256 + 1
+/* WEBHOOK LIMITS
+https://discord.com/developers/docs/resources/webhook#create-webhook*/
+#define WEBHOOK_NAME_LEN 80 + 1
+
/* SNOWFLAKES
https://discord.com/developers/docs/reference#snowflakes */
#define SNOWFLAKE_INCREMENT 12
@@ -1140,7 +1144,7 @@ struct dati {
uint64_t guild_id;
uint64_t channel_id;
user::dati *user;
- char *name; //@todo find fixed size limit
+ char name[WEBHOOK_NAME_LEN];
char *avatar; //@todo find fixed size limit
char *token; //@todo find fixed size limit
uint64_t application_id;
|
libbpf-tools: update filelife for libbpf 1.0
Switch to libbpf 1.0 mode and adapt libbpf API usage accordingly. | @@ -111,7 +111,6 @@ int main(int argc, char **argv)
.parser = parse_arg,
.doc = argp_program_doc,
};
- struct perf_buffer_opts pb_opts;
struct perf_buffer *pb = NULL;
struct filelife_bpf *obj;
int err;
@@ -120,14 +119,9 @@ int main(int argc, char **argv)
if (err)
return err;
+ libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
libbpf_set_print(libbpf_print_fn);
- err = bump_memlock_rlimit();
- if (err) {
- fprintf(stderr, "failed to increase rlimit: %d\n", err);
- return 1;
- }
-
obj = filelife_bpf__open();
if (!obj) {
fprintf(stderr, "failed to open BPF object\n");
@@ -152,13 +146,10 @@ int main(int argc, char **argv)
printf("Tracing the lifespan of short-lived files ... Hit Ctrl-C to end.\n");
printf("%-8s %-6s %-16s %-7s %s\n", "TIME", "PID", "COMM", "AGE(s)", "FILE");
- pb_opts.sample_cb = handle_event;
- pb_opts.lost_cb = handle_lost_events;
pb = perf_buffer__new(bpf_map__fd(obj->maps.events), PERF_BUFFER_PAGES,
- &pb_opts);
- err = libbpf_get_error(pb);
- if (err) {
- pb = NULL;
+ handle_event, handle_lost_events, NULL, NULL);
+ if (!pb) {
+ err = -errno;
fprintf(stderr, "failed to open perf buffer: %d\n", err);
goto cleanup;
}
@@ -171,8 +162,8 @@ int main(int argc, char **argv)
while (!exiting) {
err = perf_buffer__poll(pb, PERF_POLL_TIMEOUT_MS);
- if (err < 0 && errno != EINTR) {
- fprintf(stderr, "error polling perf buffer: %s\n", strerror(errno));
+ if (err < 0 && err != -EINTR) {
+ fprintf(stderr, "error polling perf buffer: %s\n", strerror(-err));
goto cleanup;
}
/* reset err to return 0 if exiting */
|
fixed another BE BE issue | @@ -229,11 +229,7 @@ memset(&shb, 0, 256);
shblen = SHB_SIZE;
shbhdr = (section_header_block_t*)shb;
shbhdr->block_type = PCAPNGBLOCKTYPE;
-#ifdef BIG_ENDIAN_HOST
-shbhdr->byte_order_magic = PCAPNGMAGICNUMBERBE;
-#else
shbhdr->byte_order_magic = PCAPNGMAGICNUMBER;
-#endif
shbhdr->major_version = PCAPNG_MAJOR_VER;
shbhdr->minor_version = PCAPNG_MINOR_VER;
shbhdr->section_length = -1;
|
keystore: simplify _get_and_decrypt_seed()
Since recently, this function returns keystore_error_t, which contains
KEYSTORE_ERR_INCORRECT_PASSWORD, so the extra out argument
`password_correct_out` can be dropped.
One line of zeroing `decrypted_seed_out` can be dropped since its not
written to in case of a decryption error. | @@ -182,7 +182,6 @@ static keystore_error_t _get_and_decrypt_seed(
const char* password,
uint8_t* decrypted_seed_out,
size_t* decrypted_seed_len_out,
- bool* password_correct_out,
int* securechip_result_out)
{
uint8_t encrypted_seed_and_hmac[96];
@@ -202,17 +201,18 @@ static keystore_error_t _get_and_decrypt_seed(
}
size_t decrypted_len = encrypted_len - 48;
uint8_t decrypted[decrypted_len];
- *password_correct_out = cipher_aes_hmac_decrypt(
+ bool password_correct = cipher_aes_hmac_decrypt(
encrypted_seed_and_hmac, encrypted_len, decrypted, &decrypted_len, secret);
- if (*password_correct_out) {
+ if (!password_correct) {
+ return KEYSTORE_ERR_INCORRECT_PASSWORD;
+ }
if (!_validate_seed_length(decrypted_len)) {
util_zero(decrypted, sizeof(decrypted));
return KEYSTORE_ERR_SEED_SIZE;
}
*decrypted_seed_len_out = decrypted_len;
memcpy(decrypted_seed_out, decrypted, decrypted_len);
- }
- util_zero(decrypted, sizeof(decrypted));
+
return KEYSTORE_OK;
}
@@ -224,12 +224,7 @@ static bool _verify_seed(
uint8_t decrypted_seed[KEYSTORE_MAX_SEED_LENGTH] = {0};
size_t seed_len;
UTIL_CLEANUP_32(decrypted_seed);
- bool password_correct = false;
- if (_get_and_decrypt_seed(password, decrypted_seed, &seed_len, &password_correct, NULL) !=
- KEYSTORE_OK) {
- return false;
- }
- if (!password_correct) {
+ if (_get_and_decrypt_seed(password, decrypted_seed, &seed_len, NULL) != KEYSTORE_OK) {
return false;
}
if (expected_seed_len != seed_len) {
@@ -351,13 +346,12 @@ keystore_error_t keystore_unlock(
uint8_t seed[KEYSTORE_MAX_SEED_LENGTH] = {0};
UTIL_CLEANUP_32(seed);
size_t seed_len;
- bool password_correct = false;
keystore_error_t result =
- _get_and_decrypt_seed(password, seed, &seed_len, &password_correct, securechip_result_out);
- if (result != KEYSTORE_OK) {
+ _get_and_decrypt_seed(password, seed, &seed_len, securechip_result_out);
+ if (result != KEYSTORE_OK && result != KEYSTORE_ERR_INCORRECT_PASSWORD) {
return result;
}
- if (password_correct) {
+ if (result == KEYSTORE_OK) {
if (_is_unlocked_device) {
// Already unlocked. Fail if the seed changed under our feet (should never happen).
if (seed_len != _seed_length || !MEMEQ(_retained_seed, seed, _seed_length)) {
@@ -380,7 +374,7 @@ keystore_error_t keystore_unlock(
}
*remaining_attempts_out = MAX_UNLOCK_ATTEMPTS - failed_attempts;
- return password_correct ? KEYSTORE_OK : KEYSTORE_ERR_INCORRECT_PASSWORD;
+ return result;
}
bool keystore_unlock_bip39(const char* mnemonic_passphrase)
|
checkout t/90h2olog.t from gfx/h2olog-e2e-tests | #!perl
-# DTRACE_TEST=1 to skip to check prereqisites except for OS
+# DTRACE_TESTS=1 to skip to check prereqisites
# H2OLOG_DEBUG=1 for more runtime logs
use strict;
use warnings FATAL => "all";
@@ -8,15 +8,12 @@ use Test::More;
use JSON;
use t::Util;
-plan skip_all => "h2olog is supported only for Linux"
- if $^O ne 'linux';
-
run_as_root();
my $h2olog_prog = bindir() . "/h2olog";
my $client_prog = bindir() . "/h2o-httpclient";
-unless ($ENV{DTRACE_TEST}) {
+unless ($ENV{DTRACE_TESTS}) {
plan skip_all => "$h2olog_prog not found"
unless -e $h2olog_prog;
@@ -50,52 +47,42 @@ EOT
});
subtest "h2olog", sub {
- my $trace = slurp_h2olog({
+ my $tracer = H2ologTracer->new({
pid => $server->{pid},
- args => [$ENV{H2OLOG_DEBUG} ? ("-d") : ()],
+ args => [],
+ });
- request => sub {
my ($headers, $body) = run_prog("$client_prog -3 https://127.0.0.1:$quic_port/");
like $headers, qr{^HTTP/3 200\n}, "req: HTTP/3";
- is $body, "hello\n", "req: body";
- },
- is_done => sub {
- my($partial_tace) = @_;
-
- # it has at least one line
- return $partial_tace =~ /\n/;
- },
- });
+ my $trace;
+ until (($trace = $tracer->get_trace()) =~ m{"h3s-destroy"}) {}
if ($ENV{H2OLOG_DEBUG}) {
diag "h2olog output:\n", $trace;
}
- diag("ls /sys/fs/bpf/:");
- diag(`ls /sys/fs/bpf/`);
-
ok( (map { decode_json($_) } split /\n/, $trace), "h2olog output is valid JSON Lines");
};
-# subtest "h2olog -H", sub {
-# my $trace = slurp_h2olog({
-# pid => $server->{pid},
-# args => ["-H", $ENV{H2OLOG_DEBUG} ? ("-d") : ()],
+subtest "h2olog -H", sub {
+ my $tracer = H2ologTracer->new({
+ pid => $server->{pid},
+ args => ["-H"],
+ });
+
+ my ($headers, $body) = run_prog("$client_prog -3 https://127.0.0.1:$quic_port/");
+ like $headers, qr{^HTTP/3 200\n}, "req: HTTP/3";
-# request => sub {
-# my ($headers, $body) = run_prog("$client_prog -3 https://127.0.0.1:$quic_port/");
-# like $headers, qr{^HTTP/3 200\n}, "req: HTTP/3";
-# is $body, "hello\n", "req: body";
-# },
-# });
+ my $trace;
+ until (($trace = $tracer->get_trace()) =~ m{RxProtocol\s+HTTP/3.0}) {}
-# if ($ENV{H2OLOG_DEBUG}) {
-# diag "h2olog output:\n", $trace;
-# }
+ if ($ENV{H2OLOG_DEBUG}) {
+ diag "h2olog output:\n", $trace;
+ }
-# ok length($trace), "h2olog output exists"
-# };
+ ok length($trace), "h2olog output exists"
+};
# wait until the server and the tracer exits
diag "shutting down ...";
|
YANG printer BUGFIX yin-element statement indentation | @@ -525,19 +525,19 @@ yprp_extension(struct ypr_ctx *ctx, const struct lysp_ext *ext)
if (ext->argument) {
ypr_open(ctx->out, &flag);
ly_print(ctx->out, "%*sargument %s", INDENT, ext->argument);
- if (ext->exts) {
LEVEL++;
+ if (ext->exts) {
i = -1;
while ((i = lysp_ext_instance_iter(ext->exts, i + 1, LYEXT_SUBSTMT_ARGUMENT)) != LY_ARRAY_SIZE(ext->exts)) {
yprp_extension_instances(ctx, LYEXT_SUBSTMT_ARGUMENT, 0, &ext->exts[i], &flag2, 1);
}
- LEVEL--;
}
if ((ext->flags & LYS_YINELEM_MASK) ||
(ext->exts && lysp_ext_instance_iter(ext->exts, 0, LYEXT_SUBSTMT_YINELEM) != LY_ARRAY_SIZE(ext->exts))) {
ypr_open(ctx->out, &flag2);
ypr_substmt(ctx, LYEXT_SUBSTMT_YINELEM, 0, (ext->flags & LYS_YINELEM_TRUE) ? "true" : "false", ext->exts);
}
+ LEVEL--;
ypr_close(ctx, flag2);
}
|
Ensure execsnoop.py replace result is not misplaced
Found by yonghong-song while reviewing PR | @@ -130,7 +130,7 @@ int kretprobe__sys_execve(struct pt_regs *ctx)
}
"""
-bpf_text.replace("MAXARG", args.max_args)
+bpf_text = bpf_text.replace("MAXARG", args.max_args)
if args.ebpf:
print(bpf_text)
exit()
|
viorng: adapt provider project to EWDK 1903 and latest CPDK | </PropertyGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseDebugLibraries>false</UseDebugLibraries>
</PropertyGroup>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
- <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Windows Kits\8.0\Cryptographic Provider Development Kit\Include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Windows Kits\10\Cryptographic Provider Development Kit\Include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(MSBuildProgramFiles32)\Windows Kits\8.0\Cryptographic Provider Development Kit\Lib\win8\$(PlatformTarget)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MSBuildProgramFiles32)\Windows Kits\10\Cryptographic Provider Development Kit\Lib\$(PlatformTarget)</AdditionalLibraryDirectories>
<AdditionalDependencies>bcrypt_provider.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>viorngci.def</ModuleDefinitionFile>
</Link>
|
Fix no-tls1_3
The hostname_cb in sslapitest.c was originally only defined if TLSv1.3
was enabled. A recently added test now uses this unconditionally, so we
move the function implementation earlier in the file, and always compile
it in. | @@ -110,6 +110,17 @@ static unsigned char serverinfov2[] = {
0xff /* Dummy extension data */
};
+static int hostname_cb(SSL *s, int *al, void *arg)
+{
+ const char *hostname = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
+
+ if (hostname != NULL && (strcmp(hostname, "goodhost") == 0
+ || strcmp(hostname, "altgoodhost") == 0))
+ return SSL_TLSEXT_ERR_OK;
+
+ return SSL_TLSEXT_ERR_NOACK;
+}
+
static void client_keylog_callback(const SSL *ssl, const char *line)
{
int line_length = strlen(line);
@@ -3196,17 +3207,6 @@ static int test_early_data_not_sent(int idx)
return testresult;
}
-static int hostname_cb(SSL *s, int *al, void *arg)
-{
- const char *hostname = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
-
- if (hostname != NULL && (strcmp(hostname, "goodhost") == 0
- || strcmp(hostname, "altgoodhost") == 0))
- return SSL_TLSEXT_ERR_OK;
-
- return SSL_TLSEXT_ERR_NOACK;
-}
-
static const char *servalpn;
static int alpn_select_cb(SSL *ssl, const unsigned char **out,
|
Add Ubuntu 20.04 SDK | @@ -19,6 +19,8 @@ ELSEIF (ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:243881345)
ELSEIF (OS_SDK STREQUAL "ubuntu-18")
DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:617908641)
+ ELSEIF (OS_SDK STREQUAL "ubuntu-20")
+ DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1470082810)
ELSE()
MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for x86-64")
ENDIF()
|
docs: updated title for serial libs table | @@ -48,6 +48,6 @@ The relevant package groupings and associated Table references are as follows:
\item Distro support packages and dependencies (Table~\ref{table:distro-packages})
\item IO Libraries (Table~\ref{table:io-libs})
\item Runtimes (Table~\ref{table:runtimes})
-\item Serial Libraries (Table~\ref{table:serial-libs})
+\item Serial/Threaded Libraries (Table~\ref{table:serial-libs})
\item Parallel Libraries (Table~\ref{table:parallel-libs})
\end{itemize*}
|
Fix crash sorting by timeline, Fix typo, Remove extra column space (more consistent with PE) | @@ -2211,6 +2211,7 @@ BOOLEAN NTAPI PhpProcessTreeNewCallback(
SORT_FUNCTION(ImageCoherency),
SORT_FUNCTION(ErrorMode),
SORT_FUNCTION(CodePage),
+ SORT_FUNCTION(StartTime), // Timeline
};
int (__cdecl *sortFunction)(const void *, const void *);
@@ -3526,8 +3527,8 @@ BOOLEAN NTAPI PhpProcessTreeNewCallback(
{
static LARGE_INTEGER bootTime = { 0 };
LARGE_INTEGER systemTime;
- LARGE_INTEGER created;
- LARGE_INTEGER current;
+ LARGE_INTEGER startTime;
+ LARGE_INTEGER createTime;
if (bootTime.QuadPart == 0)
{
@@ -3550,16 +3551,16 @@ BOOLEAN NTAPI PhpProcessTreeNewCallback(
// NULL
// )))
//{
- // created.QuadPart = timeOfDayInfo.CurrentTime.QuadPart - timeOfDayInfo.BootTime.QuadPart;
- // current.QuadPart = timeOfDayInfo.CurrentTime.QuadPart - processItem->CreateTime.QuadPart;
- // percent = round((DOUBLE)((FLOAT)current.QuadPart / (FLOAT)created.QuadPart * 100));
+ // startTime.QuadPart = timeOfDayInfo.CurrentTime.QuadPart - timeOfDayInfo.BootTime.QuadPart;
+ // createTime.QuadPart = timeOfDayInfo.CurrentTime.QuadPart - processItem->CreateTime.QuadPart;
+ // percent = round((DOUBLE)((FLOAT)createTime.QuadPart / (FLOAT)startTime.QuadPart * 100));
//}
}
PhQuerySystemTime(&systemTime);
- created.QuadPart = systemTime.QuadPart - bootTime.QuadPart;
- current.QuadPart = systemTime.QuadPart - processItem->CreateTime.QuadPart;
- percent = round((DOUBLE)((FLOAT)current.QuadPart / (FLOAT)created.QuadPart * 100.f));
+ startTime.QuadPart = systemTime.QuadPart - bootTime.QuadPart;
+ createTime.QuadPart = systemTime.QuadPart - processItem->CreateTime.QuadPart;
+ percent = round((DOUBLE)((FLOAT)createTime.QuadPart / (FLOAT)startTime.QuadPart * 100.f));
}
else
{
@@ -3569,6 +3570,7 @@ BOOLEAN NTAPI PhpProcessTreeNewCallback(
FillRect(customDraw->Dc, &rect, GetSysColorBrush(COLOR_WINDOW));
PhInflateRect(&rect, -1, -1);
+ rect.bottom += 1;
FillRect(customDraw->Dc, &rect, GetSysColorBrush(COLOR_3DFACE));
if (!backgroundBrush) backgroundBrush = CreateSolidBrush(RGB(158, 202, 158));
@@ -3590,6 +3592,7 @@ BOOLEAN NTAPI PhpProcessTreeNewCallback(
//if (backgroundBrush) DeleteBrush(backgroundBrush);
PhInflateRect(&borderRect, -1, -1);
+ borderRect.bottom += 1;
FrameRect(customDraw->Dc, &borderRect, GetStockBrush(GRAY_BRUSH));
}
break;
|
docs: add S3 TRM URL | @@ -57,12 +57,12 @@ class StringSubstituter:
TRM_EN_URL = {'esp32': 'https://www.espressif.com/sites/default/files/documentation/esp32_technical_reference_manual_en.pdf',
'esp32s2': 'https://www.espressif.com/sites/default/files/documentation/esp32-s2_technical_reference_manual_en.pdf',
- 'esp32s3': '#',
+ 'esp32s3': 'https://www.espressif.com/sites/default/files/documentation/esp32-s3_technical_reference_manual_en.pdf',
'esp32c3': 'https://www.espressif.com/sites/default/files/documentation/esp32-c3_technical_reference_manual_en.pdf'}
TRM_CN_URL = {'esp32': 'https://www.espressif.com/sites/default/files/documentation/esp32_technical_reference_manual_cn.pdf',
'esp32s2': 'https://www.espressif.com/sites/default/files/documentation/esp32-s2_technical_reference_manual_cn.pdf',
- 'esp32s3': '#',
+ 'esp32s3': 'https://www.espressif.com/sites/default/files/documentation/esp32-s3_technical_reference_manual_cn.pdf',
'esp32c3': 'https://www.espressif.com/sites/default/files/documentation/esp32-c3_technical_reference_manual_cn.pdf'}
RE_PATTERN = re.compile(r'^\s*{IDF_TARGET_(\w+?):(.+?)}', re.MULTILINE)
|
some socket fixes | @@ -4395,14 +4395,16 @@ if((iwr.u.mode & IW_MODE_MONITOR) != IW_MODE_MONITOR)
return false;
}
-ifr.ifr_flags = IFF_UP | IFF_BROADCAST | IFF_RUNNING;
+memset(&ifr, 0, sizeof(ifr));
+strncpy( ifr.ifr_name, interfacename, IFNAMSIZ -1);
+ifr.ifr_flags = IFF_UP;
if(ioctl(fd_socket, SIOCSIFFLAGS, &ifr) < 0)
{
perror("failed to set interface up");
return false;
}
-memset(&iwr, 0, sizeof(iwr));
+memset(&ifr, 0, sizeof(ifr));
strncpy( ifr.ifr_name, interfacename, IFNAMSIZ -1);
if(ioctl(fd_socket, SIOCGIFFLAGS, &ifr) < 0)
{
@@ -4410,7 +4412,7 @@ if(ioctl(fd_socket, SIOCGIFFLAGS, &ifr) < 0)
return false;
}
-if((ifr.ifr_flags & (IFF_UP)) != (IFF_UP))
+if((ifr.ifr_flags & (IFF_UP | IFF_RUNNING | IFF_BROADCAST)) != (IFF_UP | IFF_RUNNING | IFF_BROADCAST))
{
fprintf(stderr, "interface is not up\n");
return false;
@@ -4424,7 +4426,6 @@ if(ioctl(fd_socket, SIOCGIFINDEX, &ifr) < 0)
perror("failed to get SIOCGIFINDEX");
return false;
}
-
memset(&ll, 0, sizeof(ll));
ll.sll_family = AF_PACKET;
ll.sll_ifindex = ifr.ifr_ifindex;
|
Fix native implementation of GetHashCode | @@ -1064,16 +1064,85 @@ CLR_UINT32 CLR_RT_HeapBlock::GetHashCode(CLR_RT_HeapBlock *ptr, bool fRecurse, C
}
break;
+ case DATATYPE_BOOLEAN:
+ crc = ptr->NumericByRef().u1 == 0 ? 0 : 1;
+ break;
+
+ case DATATYPE_I1:
+ crc = (CLR_UINT32)ptr->NumericByRef().s1;
+ break;
+
+ case DATATYPE_U1:
+ crc = (CLR_UINT32)ptr->NumericByRef().u1;
+ break;
+
+ case DATATYPE_CHAR:
+ crc = (CLR_UINT32)(ptr->NumericByRef().u2 | ptr->NumericByRef().u2 << 16);
+ break;
+
+ case DATATYPE_U2:
+ crc = (CLR_UINT32)ptr->NumericByRef().u2;
+ break;
+
+ case DATATYPE_I2:
+ crc = (CLR_UINT32)(ptr->NumericByRef().s2 | ptr->NumericByRef().s2 << 16);
+ break;
+
+ case DATATYPE_I4:
+ crc = (CLR_UINT32)ptr->NumericByRef().s4;
+ break;
+
+ case DATATYPE_U4:
+ crc = ptr->NumericByRef().u4;
+ break;
+
+ case DATATYPE_R4:
+ crc = (CLR_INT32)ptr->NumericByRef().u8.LL;
+ break;
+
+ case DATATYPE_U8:
+ crc = ((CLR_INT32)ptr->NumericByRef().u8.LL ^ (CLR_INT32)ptr->NumericByRef().u8.HH);
+ break;
+
+ case DATATYPE_I8:
+ crc = ((CLR_INT32)ptr->NumericByRef().s8.LL ^ (CLR_INT32)ptr->NumericByRef().s8.HH);
+ break;
+
+ case DATATYPE_R8:
+ crc = ((CLR_INT32)ptr->NumericByRef().r8.LL ^ (CLR_INT32)ptr->NumericByRef().r8.HH);
+ break;
+
case DATATYPE_CLASS:
case DATATYPE_VALUETYPE:
+ {
+ CLR_RT_TypeDef_Instance cls;
+ cls.InitializeFromIndex(ptr->ObjectCls());
+
+ // check if this is any of the following types
+ // DATATYPE_BOOLEAN
+ // DATATYPE_I1
+ // DATATYPE_U1
+ // DATATYPE_CHAR
+ // DATATYPE_I2
+ // DATATYPE_U2
+ // DATATYPE_I4
+ // DATATYPE_U4
+ // DATATYPE_R4
+ // DATATYPE_I8
+ // DATATYPE_U8
+ // DATATYPE_R8
+ if (fRecurse && cls.m_target->dataType <= DATATYPE_R8)
+ {
+ // pass the 1st field which is the one holding the actual value
+ crc = GetHashCode(&ptr[CLR_RT_HeapBlock::HB_Object_Fields_Offset], false, crc);
+ }
+ else
{
// always starts with the pointer to the object to fully disambiguate
crc = SUPPORT_ComputeCRC(&ptr, sizeof(ptr), crc);
if (fRecurse)
{
- CLR_RT_TypeDef_Instance cls;
- cls.InitializeFromIndex(ptr->ObjectCls());
int totFields = cls.CrossReference().m_totalFields;
if (totFields > 0)
@@ -1085,6 +1154,7 @@ CLR_UINT32 CLR_RT_HeapBlock::GetHashCode(CLR_RT_HeapBlock *ptr, bool fRecurse, C
}
}
}
+ }
break;
case DATATYPE_DELEGATE_HEAD:
|
change default search path to put working directory first | @@ -1319,7 +1319,7 @@ local libopen = [[
#define TITAN_VER_SUFFIX "_0_5"
#define TITAN_PATH_VAR "TITAN_PATH"
#define TITAN_PATH_SEP "/"
- #define TITAN_PATH_DEFAULT "/usr/local/lib/titan/" TITAN_VER ";."
+ #define TITAN_PATH_DEFAULT ".;/usr/local/lib/titan/" TITAN_VER
#define TITAN_PATH_KEY "ec10e486-d8fd-11e7-87f4-e7e9581a929c"
#define TITAN_LIBS_KEY "ecfc9174-d8fd-11e7-8be2-abbaa3ded45f"
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.