message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
test/math_util.c: Format with clang-format
BRANCH=none
TEST=none | @@ -45,7 +45,6 @@ static int test_acos(void)
return EC_SUCCESS;
}
-
const mat33_fp_t test_matrices[] = {
{ { 0, FLOAT_TO_FP(-1), 0 },
{ FLOAT_TO_FP(-1), 0, 0 },
@@ -55,7 +54,6 @@ const mat33_fp_t test_matrices[] = {
{ FLOAT_TO_FP(3), FLOAT_TO_FP(4), 0 } }
};
-
static int test_rotate(void)
{
int i, j, k;
|
vlib: fix "<command> help"
Walk the sub_commands vector directly.
Type: fix
Fixes: | @@ -392,8 +392,6 @@ vlib_cli_dispatch_sub_commands (vlib_main_t * vm,
unformat_input_t sub_input;
u8 *string;
uword is_main_dispatch = cm == &vm->cli_main;
- uword value;
- u8 *key;
parent = vec_elt_at_index (cm->commands, parent_command_index);
if (is_main_dispatch && unformat (input, "help"))
@@ -428,17 +426,15 @@ vlib_cli_dispatch_sub_commands (vlib_main_t * vm,
else
{
vlib_cli_sub_rule_t *sr, *subs = 0;
+ vlib_cli_sub_command_t *sc;
- /* *INDENT-OFF* */
- hash_foreach_mem (key, value, c->sub_command_index_by_name,
- ({
- (void) key;
+ vec_foreach (sc, c->sub_commands)
+ {
vec_add2 (subs, sr, 1);
- sr->name = c->sub_commands[value].name;
- sr->command_index = value;
+ sr->name = sc->name;
+ sr->command_index = sc->index;
sr->rule_index = ~0;
- }));
- /* *INDENT-ON* */
+ }
vec_sort_with_function (subs, vlib_cli_cmp_rule);
|
ocvalidate: Always print compatibility info | @@ -78,11 +78,12 @@ int ENTRY_POINT(int argc, const char *argv[]) {
PcdGet32 (PcdFixedDebugPrintErrorLevel) |= DEBUG_INFO;
PcdGet32 (PcdDebugPrintErrorLevel) |= DEBUG_INFO;
+ DEBUG ((DEBUG_ERROR, "\nNOTE: This version of ocvalidate is only compatible with OpenCore version %a!\n\n", OPEN_CORE_VERSION));
+
//
// Print usage.
//
if (argc != 2 || (argc > 1 && AsciiStrCmp (argv[1], "--version") == 0)) {
- DEBUG ((DEBUG_ERROR, "\nNOTE: This version of ocvalidate is only compatible with OpenCore version %a!\n\n", OPEN_CORE_VERSION));
DEBUG ((DEBUG_ERROR, "Usage: %a <path/to/config.plist>\n\n", argv[0]));
return -1;
}
|
Handle trailing spaces and empty condition variables | @@ -43,7 +43,8 @@ macro(ParseMakefileVars MAKEFILE_IN)
if (NOT "${line_match}" STREQUAL "")
#message(STATUS "match on ${line_match}")
set(var_name ${CMAKE_MATCH_1})
- set(var_value ${CMAKE_MATCH_2})
+# set(var_value ${CMAKE_MATCH_2})
+ string(STRIP ${CMAKE_MATCH_2} var_value)
# check for Makefile variables in the string, e.g. $(TSUFFIX)
string(REGEX MATCHALL "\\$\\(([0-9_a-zA-Z]+)\\)" make_var_matches ${var_value})
foreach (make_var ${make_var_matches})
@@ -63,7 +64,7 @@ macro(ParseMakefileVars MAKEFILE_IN)
string(REGEX MATCH "ifeq \\(\\$\\(([_A-Z]+)\\),[ \t]*([0-9_A-Z]+)\\)" line_match "${makefile_line}")
if (NOT "${line_match}" STREQUAL "")
# message(STATUS "IFEQ: ${line_match} first: ${CMAKE_MATCH_1} second: ${CMAKE_MATCH_2}")
- if (${${CMAKE_MATCH_1}} STREQUAL ${CMAKE_MATCH_2})
+ if (DEFINED ${${CMAKE_MATCH_1}} AND ${${CMAKE_MATCH_1}} STREQUAL ${CMAKE_MATCH_2})
# message (STATUS "condition is true")
set (IfElse 1)
else ()
|
Use Dispose instead of CloseHandle | @@ -132,7 +132,7 @@ namespace MiningCore.Stratum
{
sub.Dispose();
- handle.CloseHandle();
+ handle.Dispose();
});
client.Subscription = Disposable.Create(() =>
@@ -140,6 +140,7 @@ namespace MiningCore.Stratum
disposer.Send();
});
+ // register client
lock (clients)
{
clients[connectionId] = client;
@@ -182,6 +183,7 @@ namespace MiningCore.Stratum
if (!string.IsNullOrEmpty(subscriptionId))
{
+ // unregister client
lock (clients)
{
clients.Remove(subscriptionId);
|
in_dummy: remove irrelevant comment. | @@ -74,7 +74,6 @@ static int in_dummy_collect(struct flb_input_instance *ins,
return 0;
}
-/* cb_collect callback */
static int gen_msg(struct flb_input_instance *ins, void *in_context)
{
size_t off = 0;
|
rms/slurm: update requirements for json; packages names differ per OS | @@ -333,7 +333,13 @@ according to the Slurm
Summary: Slurm REST API translator
Group: System Environment/Base
Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: json-c-devel, http-parser-devel
+BuildRequires: http-parser-devel
+%if 0%{?rhel}
+BuildRequires: json-c-devel
+%endif
+%if 0%{?suse_version:1}
+BuildRequires: libjson-c-devel
+%endif
%description slurmrestd
Provides a REST interface to Slurm.
%endif
|
fix: replace BoatIotSdkDeInit(); with BoatFree(); in test_002InitWallet_0006SetNodeUrlFailureNullParam
fix the issue aitos-io#1050 | @@ -672,7 +672,7 @@ START_TEST(test_002InitWallet_0006SetNodeUrlFailureNullParam)
/* 2-2. verify the global variables that be affected */
ck_assert(wallet_ptr->network_info.node_url_ptr == NULL);
- BoatIotSdkDeInit();
+ BoatFree(wallet_ptr);
}
END_TEST
|
virtio: fix the len offset
Type: fix | @@ -472,8 +472,8 @@ virtio_device_input_gso_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
{
increment_last (last, packed, vring);
u16 cslot = virtio_get_slot_id (vring, packed, last, mask);
- u16 clen =
- virtio_get_len (vring, packed, hdr_sz, last, mask);
+ /* hdr size is 0 after 1st packet in chain buffers */
+ u16 clen = virtio_get_len (vring, packed, 0, last, mask);
u32 cbi = vring->buffers[cslot];
cb = vlib_get_buffer (vm, cbi);
|
oic/observe: Set correct content type for notification | @@ -289,6 +289,7 @@ coap_notify_observers(oc_resource_t *resource,
coap_set_payload(notification, response_buf->buffer,
OS_MBUF_PKTLEN(response_buf->buffer));
coap_set_status_code(notification, response_buf->code);
+ coap_set_header_content_format(notification, APPLICATION_CBOR);
if (notification->code < BAD_REQUEST_4_00 &&
obs->resource->num_observers) {
coap_set_header_observe(notification, (obs->obs_counter)++);
|
Update: fix for noun composition support | @@ -150,7 +150,7 @@ def getNounRelNoun(words):
if nextmod != EMPTY:
Cs.append(nextmod)
Ms.append(EMPTY)
- elif x[0][0] == '[' or (i+1 < len(VALUES) and VALUES[i+1][1] - x[1] == 1):
+ elif x[0][0] == '[' or (i+1 < len(VALUES) and VALUES[i+1][1] - x[1] == 1 and x[3] + " " + VALUES[i+1][3] in sentence):
nextmod = x
else:
Cs.append(x)
@@ -231,8 +231,10 @@ def findSequences(st):
return sequences
localist_tokens = False
-def newSentence(sentence):
- global words, localist_tokens
+sentence = ""
+def newSentence(s):
+ global sentence, words, localist_tokens
+ sentence = s
if " " not in sentence:
localist_tokens = True
if localist_tokens and not "genericTokenization" in sys.argv:
@@ -327,7 +329,7 @@ if __name__ == "__main__":
if execution["operator"] == "^say":
arguments = [x.replace("*","").replace("(","").replace(")","") for x in execution["arguments"].split(" ")]
for concept in arguments:
- print("//^say result: " + Query(f"<(?1 * {concept}) --> R>")[2][0][1])
+ print("^say result: " + Query(f"<(?1 * {concept}) --> R>")[2][0][1])
if ret["selections"]:
print("Selected:", NAR.PrintedTask(ret["selections"][0]))
processInput(ret["selections"][0]["term"] + ret["selections"][0]["punctuation"])
|
usb: Don't access uninit pointer if usbh_install fails | @@ -438,8 +438,8 @@ assign_err:
hub_err:
ESP_ERROR_CHECK(usbh_uninstall());
usbh_err:
- if (p_host_lib_obj->constant.phy_handle) {
- ESP_ERROR_CHECK(usb_del_phy(p_host_lib_obj->constant.phy_handle));
+ if (host_lib_obj->constant.phy_handle) {
+ ESP_ERROR_CHECK(usb_del_phy(host_lib_obj->constant.phy_handle));
}
phy_err:
alloc_err:
|
Safe equality check | @@ -403,6 +403,9 @@ static bool AreFeaturesValuesEqual(
if (!lhs) {
return !rhs;
}
+ if (!rhs) {
+ return false;
+ }
if (lhs->GetSize() != rhs->GetSize()) {
return false;
}
|
[libretro] fix implicit-function-declaration | #include "pccore.h"
#include "iocore.h"
#include "sxsi.h"
+#include "sysmng.h"
#if defined(SUPPORT_IDEIO)
#include "ideio.h"
#endif
+#if !defined(_MSC_VER)
#include <sys/time.h>
+#endif
_SXSIDEV sxsi_dev[SASIHDD_MAX + SCSIHDD_MAX];
|
Trim any trailing spaces from lines in dojo
Trim any trailing spaces on the line. fixes | ++ he-duke :: ++he-dope variant
|= txt/tape
^- (each (unit (each dojo-command tape)) @ud)
- =+ foy=(he-dope txt)
+ =+ trim-space=;~(pfix spac:poja (star next))
+ =+ trimed-text=(flop (scan (flop txt) trim-space))
+ =+ foy=(he-dope trimed-text)
?- -.foy
$| [%| q.p.foy]
$& [%& p.foy]
|
Fix filename for script | @@ -1039,6 +1039,7 @@ static InterpretResult run(VM *vm) {
// If we have imported this file already, skip.
if (tableGet(&vm->modules, fileName, &moduleVal)) {
+ ++vm->scriptNameCount;
vm->lastModule = AS_MODULE(moduleVal);
DISPATCH();
}
|
Fix ip6 address cann't display completely when show ip6 neighbors | @@ -342,7 +342,7 @@ format_ip6_neighbor_ip6_entry (u8 * s, va_list * va)
u8 *flags = 0;
if (!n)
- return format (s, "%=12s%=25s%=6s%=20s%=40s", "Time", "Address", "Flags",
+ return format (s, "%=12s%=45s%=6s%=20s%=40s", "Time", "Address", "Flags",
"Link layer", "Interface");
if (n->flags & IP6_NEIGHBOR_FLAG_DYNAMIC)
@@ -355,7 +355,7 @@ format_ip6_neighbor_ip6_entry (u8 * s, va_list * va)
flags = format (flags, "N");
si = vnet_get_sw_interface (vnm, n->key.sw_if_index);
- s = format (s, "%=12U%=25U%=6s%=20U%=40U",
+ s = format (s, "%=12U%=45U%=6s%=20U%=40U",
format_vlib_time, vm, n->time_last_updated,
format_ip6_address, &n->key.ip6_address,
flags ? (char *) flags : "",
|
Test Fix: Add a null check in OTA teardown | @@ -171,7 +171,10 @@ TEST_SETUP( Full_OTA_AGENT )
TEST_TEAR_DOWN( Full_OTA_AGENT )
{
/* Disconnect from the MQTT broker. */
+ /* This must be protected against a Null xMQTTClientHandle if setup failed, for example due to an intermittent network connection */
+ if ( xMQTTClientHandle != NULL ) {
IotMqtt_Disconnect( xMQTTClientHandle, 0 );
+ }
xMQTTClientHandle = NULL;
IotMqtt_Cleanup();
|
usb: Codeowners for /examples/peripherals/usb/ | /examples/network/ @esp-idf-codeowners/network @esp-idf-codeowners/wifi
/examples/openthread/ @esp-idf-codeowners/ieee802154
/examples/peripherals/ @esp-idf-codeowners/peripherals
+/examples/peripherals/usb/ @esp-idf-codeowners/peripherals @esp-idf-codeowners/peripherals/usb
/examples/protocols/ @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
/examples/provisioning/ @esp-idf-codeowners/app-utilities
/examples/security/ @esp-idf-codeowners/security
|
parallel-libs/trilinos: update patch for v13.2.0 | ---- a/cmake/tribits/core/installation/set_installed_group_and_permissions.cmake.in 2020-08-05 18:22:40.000000000 -0700
-+++ b/cmake/tribits/core/installation/set_installed_group_and_permissions.cmake.in 2020-09-09 09:57:51.407553935 -0700
+-- a/cmake/tribits/core/installation/set_installed_group_and_permissions.cmake.in 2021-10-29 15:03:17.000000000 -0500
++++ b/cmake/tribits/core/installation/set_installed_group_and_permissions.cmake.in 2021-11-14 21:01:35.527549019 -0600
#
# Base install dir and subdirs where last element in array gives CMAKE_INSTALL_PREFIX
--SET(projectInstallBaseDir "@PROJECT_SET_GROUP_AND_PERMISSIONS_ON_INSTALL_BASE_DIR@")
-+SET(projectInstallBaseDir "$ENV{DESTDIR}/@PROJECT_SET_GROUP_AND_PERMISSIONS_ON_INSTALL_BASE_DIR@")
- SET(projectSubdirPathsArray "@PROJECT_SUBDIR_PATHS_ARRAY@")
+-set(projectInstallBaseDir "@PROJECT_SET_GROUP_AND_PERMISSIONS_ON_INSTALL_BASE_DIR@")
++set(projectInstallBaseDir "$ENV{DESTDIR}/@PROJECT_SET_GROUP_AND_PERMISSIONS_ON_INSTALL_BASE_DIR@")
+ set(projectSubdirPathsArray "@PROJECT_SUBDIR_PATHS_ARRAY@")
# Group and permissions
- SET(PROJECT_MAKE_INSTALL_GROUP "@PROJECT_MAKE_INSTALL_GROUP@")
+ set(PROJECT_MAKE_INSTALL_GROUP "@PROJECT_MAKE_INSTALL_GROUP@")
|
Re-enable unit test for C2 tcp_transport | @@ -49,8 +49,6 @@ TEST_CASE("tcp_transport: connect timeout", "[tcp_transport]")
esp_transport_list_destroy(transport_list);
}
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
-//IDF-5144
TEST_CASE("ssl_transport: connect timeout", "[tcp_transport]")
{
// Init the transport under test
@@ -123,7 +121,6 @@ TEST_CASE("ssl_transport: Keep alive test", "[tcp_transport]")
esp_transport_close(ssl);
esp_transport_list_destroy(transport_list);
}
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
TEST_CASE("ws_transport: Keep alive test", "[tcp_transport]")
{
@@ -154,8 +151,6 @@ TEST_CASE("ws_transport: Keep alive test", "[tcp_transport]")
esp_transport_list_destroy(transport_list);
}
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
-//IDF-5144
// Note: This functionality is tested and kept only for compatibility reasons with IDF <= 4.x
// It is strongly encouraged to use transport within lists only
TEST_CASE("ssl_transport: Check that parameters (keepalive) are set independently on the list", "[tcp_transport]")
@@ -183,4 +178,3 @@ TEST_CASE("ssl_transport: Check that parameters (keepalive) are set independentl
esp_transport_close(ssl);
esp_transport_destroy(ssl);
}
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
|
authzone work | @@ -2959,6 +2959,7 @@ xfr_probe_end_of_list(struct auth_xfer* xfr)
static int
xfr_transfer_nextmaster(struct auth_xfer* xfr)
{
+ /* TODO: no return value */
if(!xfr->task_transfer->scan_specific &&
!xfr->task_transfer->scan_target)
return 0;
@@ -2985,6 +2986,7 @@ xfr_transfer_nextmaster(struct auth_xfer* xfr)
static int
xfr_probe_nextmaster(struct auth_xfer* xfr)
{
+ /* TODO: no return value */
if(!xfr->task_probe->scan_specific && !xfr->task_probe->scan_target)
return 0;
if(xfr->task_probe->scan_addr) {
@@ -3488,6 +3490,7 @@ void auth_xfer_transfer_lookup_callback(void* arg, int rcode, sldns_buffer* buf,
/* move to lookup AAAA after A lookup, move to next hostname lookup,
* or move to fetch the zone, or, if nothing to do, end task_transfer */
+ xfr_transfer_move_to_next_lookup(xfr, env);
xfr_transfer_nexttarget_or_end(xfr, env);
}
@@ -3509,6 +3512,7 @@ auth_xfer_transfer_tcp_callback(struct comm_point* c, void* arg, int err,
xfr->task_transfer->master->host);
comm_point_delete(xfr->task_transfer->cp);
xfr->task_transfer->cp = NULL;
+ xfr_transfer_nextmaster(xfr);
xfr_transfer_nexttarget_or_end(xfr, env);
return 0;
}
@@ -3663,6 +3667,7 @@ auth_xfer_probe_timer_callback(void* arg)
xfr->task_probe->cp = NULL;
/* too many timeouts (or fail to send), move to next or end */
+ xfr_probe_nextmaster(xfr);
xfr_probe_send_or_end(xfr, env);
}
@@ -3721,6 +3726,7 @@ auth_xfer_probe_udp_callback(struct comm_point* c, void* arg, int err,
/* if the result was not a successfull probe, we need
* to send the next one */
+ xfr_probe_nextmaster(xfr);
xfr_probe_send_or_end(xfr, env);
return 0;
}
@@ -3856,6 +3862,7 @@ void auth_xfer_probe_lookup_callback(void* arg, int rcode, sldns_buffer* buf,
/* move to lookup AAAA after A lookup, move to next hostname lookup,
* or move to send the probes, or, if nothing to do, end task_probe */
+ xfr_probe_move_to_next_lookup(xfr, env);
xfr_probe_send_or_end(xfr, env);
}
|
TestMp3: EDK-II codestyle cleanup | #include <Library/OcMp3Lib.h>
#include <Library/OcMiscLib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <stdint.h>
-
#include <UserFile.h>
int
@@ -31,35 +26,37 @@ ENTRY_POINT (
char *argv[]
)
{
- uint32_t size;
- uint8_t *buffer;
- if ((buffer = UserReadFile(argc > 1 ? argv[1] : "test.mp3", &size)) == NULL) {
- printf("Read fail\n");
+ UINT32 Size;
+ UINT8 *Buffer;
+
+ if ((Buffer = UserReadFile (argc > 1 ? argv[1] : "test.mp3", &Size)) == NULL) {
+ DEBUG ((DEBUG_ERROR, "Read fail\n"));
return -1;
}
- void *outbuffer;
- uint32_t outsize;
- EFI_AUDIO_IO_PROTOCOL_FREQ freq;
- EFI_AUDIO_IO_PROTOCOL_BITS bits;
- UINT8 channels;
+ VOID *OutBuffer;
+ UINT32 OutSize;
+ EFI_AUDIO_IO_PROTOCOL_FREQ Freq;
+ EFI_AUDIO_IO_PROTOCOL_BITS Bits;
+ UINT8 Channels;
+ EFI_STATUS Status;
- EFI_STATUS Status = OcDecodeMp3 (
- buffer,
- size,
- &outbuffer,
- &outsize,
- &freq,
- &bits,
- &channels
+ Status = OcDecodeMp3 (
+ Buffer,
+ Size,
+ &OutBuffer,
+ &OutSize,
+ &Freq,
+ &Bits,
+ &Channels
);
- FreePool(buffer);
+ FreePool (Buffer);
if (!EFI_ERROR (Status)) {
- printf("Decode success %u\n", outsize);
- UserWriteFile("test.bin", outbuffer, outsize);
- FreePool(outbuffer);
+ DEBUG ((DEBUG_ERROR, "Decode success %u\n", OutSize));
+ UserWriteFile ("test.bin", OutBuffer, OutSize);
+ FreePool (OutBuffer);
return 0;
}
@@ -73,24 +70,26 @@ LLVMFuzzerTestOneInput (
size_t Size
)
{
+ VOID *OutBuffer;
+ UINT32 OutSize;
+ EFI_STATUS Status;
+
if (Size > 0) {
- void *outbuffer;
- uint32_t outsize;
- EFI_AUDIO_IO_PROTOCOL_FREQ freq;
- EFI_AUDIO_IO_PROTOCOL_BITS bits;
- UINT8 channels;
+ EFI_AUDIO_IO_PROTOCOL_FREQ Freq;
+ EFI_AUDIO_IO_PROTOCOL_BITS Bits;
+ UINT8 Channels;
- EFI_STATUS Status = OcDecodeMp3 (
+ Status = OcDecodeMp3 (
Data,
Size,
- &outbuffer,
- &outsize,
- &freq,
- &bits,
- &channels
+ &OutBuffer,
+ &OutSize,
+ &Freq,
+ &Bits,
+ &Channels
);
if (!EFI_ERROR (Status)) {
- FreePool(outbuffer);
+ FreePool (OutBuffer);
}
}
return 0;
|
grid: remove notification prompt for browser settings | @@ -3,7 +3,6 @@ import Mousetrap from 'mousetrap';
import { BrowserRouter, Switch, Route, useHistory, useLocation } from 'react-router-dom';
import { ErrorBoundary } from 'react-error-boundary';
import FingerprintJS from '@fingerprintjs/fingerprintjs';
-import { addNote } from '@urbit/api';
import { Grid } from './pages/Grid';
import useDocketState from './state/docket';
import { PermalinkRoutes } from './pages/PermalinkRoutes';
@@ -12,13 +11,7 @@ import useContactState from './state/contact';
import api from './state/api';
import { useMedia } from './logic/useMedia';
import { useHarkStore } from './state/hark';
-import {
- useSettingsState,
- useBrowserSettings,
- useTheme,
- setBrowserSetting,
- getBrowserSetting
-} from './state/settings';
+import { useSettingsState, useTheme } from './state/settings';
import { useBrowserId, useLocalState } from './state/local';
import { ErrorAlert } from './components/ErrorAlert';
import { useErrorHandler } from './logic/useErrorHandler';
@@ -52,8 +45,6 @@ const AppRoutes = () => {
const { search } = useLocation();
const handleError = useErrorHandler();
const browserId = useBrowserId();
- const settings = useBrowserSettings();
- const { loaded } = useSettingsState.getState();
useEffect(() => {
getId().then((value) => {
@@ -61,42 +52,6 @@ const AppRoutes = () => {
});
}, [browserId]);
- useEffect(() => {
- // Check if user has previously stored settings for this browser.
- // If not, send a notification prompting them to do so.
- // Set both settings to false so that they're not bugged again.
- if (browserId !== '' && loaded) {
- const thisBrowserSettings = getBrowserSetting(settings, browserId);
- if (!thisBrowserSettings) {
- api.poke(
- addNote(
- {
- path: '/browser-settings',
- place: { desk: 'garden', path: '/desk/garden' }
- },
- {
- title: [{ text: 'Browser Preferences' }],
- time: Date.now(),
- content: [
- { text: "You haven't set your preferences for this browser, set them now?" }
- ],
- link: '/grid/leap/system-preferences/interface',
- binned: '/desk/garden'
- }
- )
- );
- const newSettings = setBrowserSetting(
- settings,
- { protocolHandling: false, browserNotifications: false },
- browserId
- );
- useSettingsState
- .getState()
- .putEntry('browserSettings', 'settings', JSON.stringify(newSettings));
- }
- }
- }, [browserId, loaded]);
-
useEffect(() => {
const query = new URLSearchParams(search);
if (query.has('grid-note')) {
|
Update artik053/iotivity defconfig | @@ -246,13 +246,16 @@ CONFIG_ARTIK053_FLASH_CAPACITY=8388608
CONFIG_ARTIK053_FLASH_PAGE_SIZE=4096
CONFIG_ARTIK053_FLASH_PART=y
CONFIG_ARTIK053_FLASH_MINOR=0
-CONFIG_ARTIK053_FLASH_PART_LIST="16,48,192,32,512,2400,1536,1536,1400,8,512,"
-CONFIG_ARTIK053_FLASH_PART_TYPE="none,ftl,none,none,none,none,none,ftl,smartfs,config,none,"
-CONFIG_ARTIK053_FLASH_PART_NAME="bl1,sssro,bl2,sssfw,wlanfw,os,factory,ota,user,nvram,sssrw,"
+CONFIG_ARTIK053_FLASH_PART_LIST="16,48,192,32,512,2400,1536,1536,1000,400,8,512,"
+CONFIG_ARTIK053_FLASH_PART_TYPE="none,ftl,none,none,none,none,none,ftl,smartfs,romfs,config,none,"
+CONFIG_ARTIK053_FLASH_PART_NAME="bl1,sssro,bl2,sssfw,wlanfw,os,factory,ota,user,rom,nvram,sssrw,"
CONFIG_ARTIK053_AUTOMOUNT=y
CONFIG_ARTIK053_AUTOMOUNT_USERFS=y
CONFIG_ARTIK053_AUTOMOUNT_USERFS_DEVNAME="/dev/smart0p8"
CONFIG_ARTIK053_AUTOMOUNT_USERFS_MOUNTPOINT="/mnt"
+CONFIG_ARTIK053_AUTOMOUNT_ROMFS=y
+CONFIG_ARTIK053_AUTOMOUNT_ROMFS_DEVNAME="/dev/smart4rom9"
+CONFIG_ARTIK053_AUTOMOUNT_ROMFS_MOUNTPOINT="/rom"
#
# Kernel Features
@@ -768,7 +771,7 @@ CONFIG_FS_PROCFS=y
# CONFIG_FS_PROCFS_EXCLUDE_PARTITIONS is not set
# CONFIG_FS_PROCFS_EXCLUDE_SMARTFS is not set
# CONFIG_FS_PROCFS_EXCLUDE_POWER is not set
-# CONFIG_FS_ROMFS is not set
+CONFIG_FS_ROMFS=y
#
# Block Driver Configurations
|
typing stuff and clean the __init__ of replay parser | @@ -14,55 +14,49 @@ class ReplayEvent(object):
class Replay(object):
- __BYTE = 1
- __SHORT = 2
- __INT = 4
- __LONG = 8
+ """
+ R.A.P.E
+
+ R - redz
+ A - amazing
+ P - parser for replay
+ E - epic
+ """
+
+ game_mode: int = 0
+ game_version: int = 0
+ beatmap_hash: str = ''
+ player_name: str = ''
+ replay_hash: str = ''
+ number_300s: int = 0
+ number_100s: int = 0
+ number_50s: int = 0
+ gekis: int = 0
+ katus: int = 0
+ misses: int = 0
+ score: int = 0
+ max_combo: int = 0
+ is_perfect_combo: int = 0
+ mod_combination: [Mod] = []
+ life_bar_graph: str = ''
+ timestamp: datetime.datetime = None
+ play_data: [ReplayEvent] = []
+
+ # internal
+ view: [memoryview, bytes] = None # memoryview or bytes
+
#Order of field initilization matters.
def __init__(self, replay_data: bytes = None):
if replay_data is not None:
- self.offset = 0
- self.game_mode = None
- self.game_version = None
- self.beatmap_hash = None
- self.player_name = None
- self.replay_hash = None
- self.number_300s = None
- self.number_100s = None
- self.number_50s = None
- self.gekis = None
- self.katus = None
- self.misses = None
- self.score = None
- self.max_combo = None
- self.is_perfect_combo = None
- self.mod_combination = None
- self.life_bar_graph = None
- self.timestamp = None
- self.play_data = None
#self.view = memoryview(replay_data) # FireRedz: stupid python cant pickle memoryview
self.view = replay_data
self.parse_replay_and_initialize_fields(replay_data)
else:
- self.game_mode = 0
- self.game_version = ""
- self.beatmap_hash = ""
self.player_name = "osu!"
- self.replay_hash = ""
- self.number_300s = 0
- self.number_100s = 0
- self.number_50s = 0
- self.gekis = 0
- self.katus = 0
- self.misses = 0
self.score = float("inf")
- self.max_combo = 0
self.is_perfect_combo = 1
-
self.mod_combination = []
-
- self.life_bar_graph = ""
self.timestamp = datetime.datetime.now()
@classmethod
|
updates ames i/o driver to drop outbound packets if not live | @@ -309,6 +309,12 @@ u3_ames_ef_send(u3_pier* pir_u, u3_noun lan, u3_noun pac)
return;
}
+ if ( c3n == sam_u->liv ) {
+ u3l_log("ames: not yet live, dropping outbound\r\n");
+ u3z(lan); u3z(pac);
+ return;
+ }
+
u3_pact* pac_u = c3_calloc(sizeof(*pac_u));
if ( c3y == _ames_lane_ip(lan, &pac_u->por_s, &pac_u->pip_w) ) {
|
Allow compile.sh to run on Windows dev machines | @@ -39,7 +39,7 @@ function (GetVersion OUTVAR)
# Otherwise, append our custom suffix -<date>-git<short hash>
execute_process (
- COMMAND git rev-parse --revs-only --short=10 HEAD^{commit}
+ COMMAND git rev-parse --revs-only --short=10 HEAD
OUTPUT_VARIABLE SUFFIX_SHA
RESULT_VARIABLE GIT_STATUS
ERROR_VARIABLE GIT_ERROR
|
Set CU type in inter search functions | @@ -1381,6 +1381,7 @@ static void search_pu_inter_ref(inter_search_info_t *info,
unit_stats_map_t *cur_map = &amvp[ref_list];
int entry = cur_map->size;
cu_info_t *unipred_pu = &cur_map->unit[entry];
+ unipred_pu->type = CU_INTER;
unipred_pu->merged = false;
unipred_pu->skipped = false;
unipred_pu->inter.mv_dir = ref_list + 1;
@@ -1514,6 +1515,8 @@ static void search_pu_inter_bipred(inter_search_info_t *info,
CU_SET_MV_CAND(bipred_pu, reflist, cu_mv_cand);
}
+ bipred_pu->type = CU_INTER;
+
amvp_bipred->cost[amvp_bipred->size] = cost;
amvp_bipred->bits[amvp_bipred->size] = bitcost[0] + bitcost[1] + extra_bits;
amvp_bipred->size++;
|
fix very relevant compiler warning | @@ -634,8 +634,8 @@ dispatch_ip_discovery(oc_client_cb_t *cb4, const char *query,
return false;
}
- oc_client_cb_t *cb = oc_ri_alloc_client_cb(
- "/oic/res", endpoint, OC_GET, query, handler, LOW_QOS, user_data);
+ oc_client_cb_t *cb = oc_ri_alloc_client_cb("/oic/res", endpoint, OC_GET,
+ query, handler, qos, user_data);
if (cb) {
cb->discovery = true;
|
Use dedicated clang-cl option for Windows system header files | @@ -2019,9 +2019,11 @@ when ($MSVC_INLINE_OPTIMIZED == "no") {
vc_include = os.path.join(self.tc.vc_root, 'include') if not self.tc.ide_msvs else "$(VC_VC_IncludePath.Split(';')[0].Replace('\\','/'))"
if not self.tc.ide_msvs:
+ def include_flag(path):
+ return '{flag}"{path}"'.format(path=path, flag='/I' if not self.tc.use_clang else '-imsvc')
for name in ('shared', 'ucrt', 'um', 'winrt'):
- flags.append('/I"{}"'.format(os.path.join(self.tc.kit_includes, name)))
- flags.append('/I"{}"'.format(vc_include))
+ flags.append(include_flag(os.path.join(self.tc.kit_includes, name)))
+ flags.append(include_flag(vc_include))
flags_msvs_only = []
|
shm sub FEATURE check update edit for foreign data
Refs | @@ -2100,9 +2100,9 @@ sr_shmsub_change_listen_process_module_events(struct modsub_change_s *change_sub
{
sr_error_info_t *err_info = NULL;
uint32_t i, data_len = 0, valid_subscr_count;
- char *data = NULL;
+ char *data = NULL, *path;
int ret = SR_ERR_OK;
- struct lyd_node *diff;
+ struct lyd_node *diff, *iter;
sr_error_t err_code = SR_ERR_OK;
struct modsub_changesub_s *change_sub;
sr_multi_sub_shm_t *multi_sub_shm;
@@ -2211,7 +2211,29 @@ process_event:
switch (multi_sub_shm->event) {
case SR_SUB_EV_UPDATE:
if (err_code == SR_ERR_OK) {
- /* we may have an updated edit (empty is fine), print it into LYB */
+ /* we may have an updated edit (empty is fine), check it */
+ LY_TREE_FOR(tmp_sess.dt[tmp_sess.ds].edit, iter) {
+ if (strcmp(lyd_node_module(iter)->name, change_subs->module_name)) {
+ /* generate an error */
+ path = lyd_path(iter);
+ sr_set_error(&tmp_sess, path, "Updated edit with data from another module \"%s\".",
+ lyd_node_module(iter)->name);
+ free(path);
+ sr_log_msg(0, SR_LL_ERR, tmp_sess.err_info->err[0].message, tmp_sess.err_info->err[0].xpath);
+
+ /* prepare the error */
+ err_code = SR_ERR_INVAL_ARG;
+ if ((err_info = sr_shmsub_prepare_error(err_code, &tmp_sess, &data, &data_len))) {
+ goto cleanup_rdunlock;
+ }
+ break;
+ }
+ }
+ if (iter) {
+ break;
+ }
+
+ /* print it into LYB */
if (lyd_print_mem(&data, tmp_sess.dt[tmp_sess.ds].edit, LYD_LYB, LYP_WITHSIBLINGS)) {
sr_errinfo_new_ly(&err_info, conn->ly_ctx);
goto cleanup_rdunlock;
|
Fixing values | @@ -58,8 +58,8 @@ namespace FFXIVClientStructs.FFXIV.Client.Game.Gauge {
public int UmbralStacks => ElementStance >= 0 ? 0 : ElementStance * -1;
public int AstralStacks => ElementStance <= 0 ? 0 : ElementStance;
- public bool EnochianActive => Enochian != 0;
- public bool ParadoxActive => Enochian == 3;
+ public bool EnochianActive => Enochian == 1 || Enochian == 3;
+ public bool ParadoxActive => Enochian > 1;
}
[StructLayout(LayoutKind.Explicit, Size = 0x10)]
|
Fix again code formatting issue. | @@ -185,8 +185,7 @@ int od_instance_main(od_instance_t *instance, int argc, char **argv)
if (rc == -1) {
od_error(&instance->logger, "init", NULL, NULL,
"failed to create pid file %s: %s",
- instance->config.pid_file,
- strerror(errno));
+ instance->config.pid_file, strerror(errno));
goto error;
}
}
|
INI: Sort files in crash test | @@ -4,7 +4,7 @@ The following Markdown Shell Recorder test checks that the INI plugin does not c
not properly formatted.
```sh
-for file in $(find -E src/plugins/ini/crash_test -regex '.*crash[0-9]{3}.ini$'); do \
+for file in $(find -E src/plugins/ini/crash_test -regex '.*crash[0-9]{3}.ini$' | sort); do \
cat "$file" | kdb import user/examples/ini ini 2>&1 | grep -q 'SIG' && echo "File $file caused a crash" \
kdb rm -rf user/examples/ini 2>&1 | grep -q 'SIG' && echo "File $file caused a crash" \
# Check if we successfully removed all keys \
|
wsman-soap-envelope: fix a possible memory leak
In case of duplicate parameters we rewrote stored pointer
and leaking memory.
Release data stored in the pointer before allocating the new one. | @@ -671,13 +671,19 @@ int wsman_parse_credentials(WsXmlDocH doc, WsSubscribeInfo * subsInfo,
node = ws_xml_get_child(node, 0, XML_NS_SE, WSSE_USERNAMETOKEN);
if(node) {
temp = ws_xml_get_child(node, 0, XML_NS_SE, WSSE_USERNAME);
- if(temp)
+ if(temp) {
+ if (subsInfo->username)
+ u_free(subsInfo->username);
subsInfo->username = u_strdup(ws_xml_get_node_text(temp));
+ }
temp = ws_xml_get_child(node, 0, XML_NS_SE, WSSE_PASSWORD);
- if(temp)
+ if(temp) {
+ if (subsInfo->password)
+ u_free(subsInfo->password);
subsInfo->password = u_strdup(ws_xml_get_node_text(temp));
}
}
+ }
debug("subsInfo->username = %s, subsInfo->password = %s", subsInfo->username, \
subsInfo->password);
}
@@ -685,10 +691,13 @@ int wsman_parse_credentials(WsXmlDocH doc, WsSubscribeInfo * subsInfo,
node = ws_xml_get_child(tnode, 0, XML_NS_TRUST, WST_REQUESTEDSECURITYTOKEN);
if(node) {
node = ws_xml_get_child(node, 0, XML_NS_WS_MAN, WSM_CERTIFICATETHUMBPRINT);
- if(node)
+ if(node) {
+ if (subsInfo->certificate_thumbprint)
+ u_free(subsInfo->certificate_thumbprint);
subsInfo->certificate_thumbprint = u_strdup(ws_xml_get_node_text(node));
}
}
+ }
else {
*faultcode = WSMAN_INVALID_OPTIONS;
*detailcode = WST_DETAIL_UNSUPPORTED_TOKENTYPE;
|
Combine multi-repo release notes. | <release-feature-list>
<release-item>
+ <commit subject="Enhance expire command multi-repo support."/>
+ <commit subject="Expire continues if an error occurs processing a repository."/>
+ <commit subject="Add archive-get command multi-repo support."/>
+ <commit subject="Enhance restore command multi-repo support."/>
+ <commit subject="Refactor info command repoMin/Max."/>
+ <commit subject="Remove restore default repo from integration tests."/>
+ <commit subject="Make --repo optional for backup command."/>
+ <commit subject="Refactor archive-push command warnings to work like archive-get."/>
+ <commit subject="Add write fault-tolerance to archive-push command."/>
+ <commit subject="Make --repo optional for remaining commands except stanza-delete."/>
+
<release-item-contributor-list>
<release-item-contributor id="cynthia.shang"/>
<release-item-contributor id="david.steele"/>
</release-improvement-list>
<release-development-list>
- <release-item>
- <commit subject="Enhance expire command multi-repo support."/>
- <commit subject="Expire continues if an error occurs processing a repository."/>
- <commit subject="Add archive-get command multi-repo support."/>
- <commit subject="Enhance restore command multi-repo support."/>
- <commit subject="Refactor info command repoMin/Max."/>
- <commit subject="Remove restore default repo from integration tests."/>
- <commit subject="Make --repo optional for backup command."/>
- <commit subject="Refactor archive-push command warnings to work like archive-get."/>
- <commit subject="Add write fault-tolerance to archive-push command."/>
- <commit subject="Make --repo optional for remaining commands except stanza-delete."/>
-
- <release-item-contributor-list>
- <release-item-contributor id="cynthia.shang"/>
- <release-item-contributor id="david.steele"/>
- </release-item-contributor-list>
-
- <p>Partial multi-repository implementation.</p>
- </release-item>
-
<release-item>
<release-item-contributor-list>
<release-item-reviewer id="cynthia.shang"/>
|
Allow binding for Tuyatec devices | @@ -1974,6 +1974,10 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
sensor->modelId().contains(QLatin1String("ST218")) ||
// Tuya
sensor->modelId().contains(QLatin1String("TS0201")) ||
+ // Tuyatec
+ sensor->modelId().startsWith(QLatin1String("RH3040")) ||
+ sensor->modelId().startsWith(QLatin1String("RH3001")) ||
+ sensor->modelId().startsWith(QLatin1String("RH3052")) ||
// Xiaomi
sensor->modelId().startsWith(QLatin1String("lumi")) ||
// iris
|
intelrvp: Enable PD 3.0 support
BRANCH=none
TEST=tglrvp can negotiate with TBT3 docks | #define CONFIG_CHARGE_RAMP_HW
#endif
+/* Enable USB-PD REV 3.0 */
+#define CONFIG_USB_PD_REV30
+#define CONFIG_USB_PID 0x8086
+
/* USB PD config */
#define CONFIG_USB_PD_ALT_MODE
#define CONFIG_USB_PD_ALT_MODE_DFP
|
Fix a debug log mistake when create AF_PACKET socket | @@ -172,7 +172,7 @@ create_packet_v2_sock (int host_if_index, tpacket_req_t * rx_req,
if ((err =
setsockopt (*fd, SOL_PACKET, PACKET_TX_RING, tx_req, req_sz)) < 0)
{
- DBG_SOCK ("Failed to set packet rx ring options");
+ DBG_SOCK ("Failed to set packet tx ring options");
ret = VNET_API_ERROR_SYSCALL_ERROR_1;
goto error;
}
|
fix logic for fsconflock/mnconflock | @@ -1174,7 +1174,8 @@ bool AppInit2()
}
}
- if(GetBoolArg("-mnconflock", true) && pwalletMain || GetBoolArg("-fsconflock", true) && pwalletMain) {
+ if (pwalletMain) {
+ if(GetBoolArg("-fsconflock", true) & GetBoolArg("-mnconflock", true)) {
LOCK(pwalletMain->cs_wallet);
printf("Locking Fortunastakes:\n");
uint256 mnTxHash;
@@ -1192,7 +1193,7 @@ bool AppInit2()
printf(" %s %s - locked successfully\n", mne.getTxHash().c_str(), mne.getOutputIndex().c_str());
}
}
-
+ }
// Add any fortunastake.conf fortunastakes to the adrenaline nodes
BOOST_FOREACH(CFortunastakeConfig::CFortunastakeEntry mne, fortunastakeConfig.getEntries())
|
avx2: _mm256_bsrli_epi128 wasn't present in GCC until 4.8 | @@ -1019,6 +1019,7 @@ simde_mm256_bsrli_epi128 (simde__m256i a, const int imm8)
return simde__m256i_from_private(r_);
}
#if defined(SIMDE_X86_AVX2_NATIVE) && \
+ (!defined(HEDLEY_GCC_VERSION) || HEDLEY_GCC_VERSION_CHECK(4,8,0)) && \
SIMDE_DETECT_CLANG_VERSION_NOT(3,7,0)
#define simde_mm256_bsrli_epi128(a, imm8) _mm256_bsrli_epi128(a, imm8)
#endif
|
fix ssh-oidc alias to use a new socket each time | @@ -21,7 +21,7 @@ test -z $OIDC_SOCK && {
And in the `.bash_aliases` on your local machine:
```
alias OA='echo -R /tmp/oidc-forward-$RANDOM:$OIDC_SOCK'
-alias ssh-oidc="ssh $(OA)"
+alias ssh-oidc="ssh \`OA\`"
```
You can then call ssh the following way:
```
|
fix ios i386 tests | @@ -5409,8 +5409,14 @@ module DEFAULT_IOS_INTERFACE: IOS_INTERFACE {
SET(MODULE_SUFFIX .default.ios.interface)
}
+when ($ARCH_I386) {
+ TEST_IOS_DEVICE_TYPE_VALUE=com.apple.CoreSimulator.SimDeviceType.iPhone-5
+ TEST_IOS_RUNTIME_TYPE_VALUE=com.apple.CoreSimulator.SimRuntime.iOS-10-3
+}
+otherwise {
TEST_IOS_DEVICE_TYPE_VALUE=com.apple.CoreSimulator.SimDeviceType.iPhone-X
TEST_IOS_RUNTIME_TYPE_VALUE=com.apple.CoreSimulator.SimRuntime.iOS-12-1
+}
JDK_VERSION=11
when ($JDK_VERSION == "10") {
|
docs: fixes a broken link | @@ -6,7 +6,7 @@ This document intention is to provide guidelines on how to best contribute to th
### Join the Community
-Skip over to our [Discord Server](https://discord.gg/Q4Ub3wuF), we will be more than happy to assist you!
+Skip over to our [Discord Server](https://discord.gg/nBUqrWf), we will be more than happy to assist you!
### License and copyright
|
cleanup page break | \subsection{Add \InfiniBand{} support services on {\em master} node} \label{sec:add_ofed}
\input{common/ibsupport_sms_sles}
+\vspace*{-0.3cm}
\subsection{Complete basic Warewulf setup for {\em master} node} \label{sec:setup_ww}
\input{common/warewulf_setup}
\input{common/warewulf_setup_sles}
|
make test a little bit harder | @@ -5254,7 +5254,7 @@ int migration_test_loss()
int migration_zero_test()
{
- return migration_test_scenario(test_scenario_q_and_r, sizeof(test_scenario_q_and_r), 0, 1);
+ return migration_test_scenario(test_scenario_very_long, sizeof(test_scenario_q_and_r), 0, 1);
}
/* Failed migration test.
|
arch: qemu-rv: Fix build errors in chip.h for BUILD_KERNEL + SMP
Summary:
This commit fixes build errors for BUILD_KERNEL + SMP
Impact:
None
Testing:
Tested with rv-virt:ksmp64 (will be added later) | @@ -66,7 +66,7 @@ extern void up_serialinit(void);
#if defined(CONFIG_SMP) && CONFIG_ARCH_INTERRUPTSTACK > 15
.macro setintstack tmp0, tmp1
- csrr \tmp0, mhartid
+ riscv_mhartid \tmp0
li \tmp1, STACK_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK)
mul \tmp1, \tmp0, \tmp1
la \tmp0, g_intstacktop
@@ -74,12 +74,14 @@ extern void up_serialinit(void);
.endm
#endif /* CONFIG_SMP && CONFIG_ARCH_INTERRUPTSTACK > 15 */
-#if defined(CONFIG_ARCH_USE_S_MODE) && CONFIG_ARCH_INTERRUPTSTACK > 15
+#if CONFIG_ARCH_INTERRUPTSTACK > 15
+#if !defined(CONFIG_SMP) && defined(CONFIG_ARCH_USE_S_MODE)
.macro setintstack tmp0, tmp1
csrr \tmp0, CSR_SCRATCH
REGLOAD sp, RISCV_PERCPU_IRQSTACK(\tmp0)
.endm
-#endif /* CONFIG_ARCH_USE_S_MODE && CONFIG_ARCH_INTERRUPTSTACK > 15 */
+#endif /* !defined(CONFIG_SMP) && defined(CONFIG_ARCH_USE_S_MODE) */
+#endif /* CONFIG_ARCH_INTERRUPTSTACK > 15 */
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_RISCV_SRC_QEMU_RV_CHIP_H */
|
board/nocturne/battery.c: Format with clang-format
BRANCH=none
TEST=none | @@ -78,8 +78,8 @@ enum battery_disconnect_state battery_get_disconnect_state(void)
return BATTERY_NOT_DISCONNECTED;
/* Check if battery discharge FET is disabled. */
- rv = sb_read_mfgacc(PARAM_OPERATION_STATUS,
- SB_ALT_MANUFACTURER_ACCESS, data, sizeof(data));
+ rv = sb_read_mfgacc(PARAM_OPERATION_STATUS, SB_ALT_MANUFACTURER_ACCESS,
+ data, sizeof(data));
if (rv)
return BATTERY_DISCONNECT_ERROR;
if (~data[3] & (BATTERY_DISCHARGING_DISABLED)) {
@@ -91,8 +91,8 @@ enum battery_disconnect_state battery_get_disconnect_state(void)
* Battery discharge FET is disabled. Verify that we didn't enter this
* state due to a safety fault.
*/
- rv = sb_read_mfgacc(PARAM_SAFETY_STATUS,
- SB_ALT_MANUFACTURER_ACCESS, data, sizeof(data));
+ rv = sb_read_mfgacc(PARAM_SAFETY_STATUS, SB_ALT_MANUFACTURER_ACCESS,
+ data, sizeof(data));
if (rv || data[2] || data[3] || data[4] || data[5])
return BATTERY_DISCONNECT_ERROR;
|
CLI code coverage: add gpperfmon code coverage
This is a followup to commit - "CLI code coverage: add coverage
to the production pipeline". This updates the master-generated pipeline
now that gpperfmon has been updated to collect and upload coverage. | ## file (example: templates/gpdb-tpl.yml) and regenerate the pipeline
## using appropriate tool (example: gen_pipeline.py -t prod).
## ----------------------------------------------------------------------
-## Generated by gen_pipeline.py at: 2019-06-11 11:39:13.445019
+## Generated by gen_pipeline.py at: 2019-06-19 18:25:13.981216
## Template file: gpdb-tpl.yml
## OS Types: ['centos6', 'centos7', 'ubuntu18.04', 'win']
## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'Extensions', 'Gpperfmon']
@@ -1138,11 +1138,25 @@ jobs:
passed: [gate_gpperfmon_start]
trigger: true
- get: gpdb6-centos6-test
+ - get: gpdb6-centos7-test
- task: gpperfmon
file: gpdb_src/concourse/tasks/behave_gpdb.yml
image: gpdb6-centos6-test
params:
BEHAVE_TAGS: gpperfmon
+ TEST_NAME: gpperfmon_centos6
+ - task: publish_coverage
+ image: gpdb6-centos7-test
+ config:
+ platform: linux
+ inputs:
+ - name: gpdb_src
+ - name: coverage
+ run:
+ path: gpdb_src/concourse/scripts/gsutil_sync
+ args: [ "./coverage/", "gs://((coverage-bucket-name))/((pipeline-name))/" ]
+ params:
+ JSON_KEY: ((concourse-gcs-resources-service-account-key))
- name: gpperfmon_centos7
plan:
@@ -1162,6 +1176,19 @@ jobs:
image: gpdb6-centos7-test
params:
BEHAVE_TAGS: gpperfmon
+ TEST_NAME: gpperfmon_centos7
+ - task: publish_coverage
+ image: gpdb6-centos7-test
+ config:
+ platform: linux
+ inputs:
+ - name: gpdb_src
+ - name: coverage
+ run:
+ path: gpdb_src/concourse/scripts/gsutil_sync
+ args: [ "./coverage/", "gs://((coverage-bucket-name))/((pipeline-name))/" ]
+ params:
+ JSON_KEY: ((concourse-gcs-resources-service-account-key))
|
Use forward slashes for Windows home directory. | @@ -184,7 +184,8 @@ cups_globals_alloc(void)
#ifdef _WIN32
HKEY key; /* Registry key */
DWORD size; /* Size of string */
- static char installdir[1024] = "", /* Install directory */
+ static char homedir[1024] = "", /* Home directory */
+ installdir[1024] = "", /* Install directory */
confdir[1024] = "", /* Server root directory */
localedir[1024] = ""; /* Locale directory */
#endif /* _WIN32 */
@@ -274,7 +275,26 @@ cups_globals_alloc(void)
if ((cg->localedir = getenv("LOCALEDIR")) == NULL)
cg->localedir = localedir;
- cg->home = getenv("USERPROFILE");
+ if (!homedir[0])
+ {
+ const char *userprofile = getenv("USERPROFILE");
+ // User profile (home) directory
+ char *homeptr; // Pointer into homedir
+
+ DEBUG_printf(("cups_globals_alloc: USERPROFILE=\"%s\"", userprofile));
+
+ strlcpy(homedir, userprofile, sizeof(homedir));
+ for (homeptr = homedir; *homeptr; homeptr ++)
+ {
+ // Convert back slashes to forward slashes
+ if (*homeptr == '\\')
+ *homeptr = '/';
+ }
+
+ DEBUG_printf(("cups_globals_alloc: homedir=\"%s\"", homedir));
+ }
+
+ cg->home = homedir;
#else
# ifdef HAVE_GETEUID
|
build.sh: fix building on fedora | DATA_DIR=$HOME/.local/share/MangoHud
LAYER=build/release/usr/share/vulkan/implicit_layer.d/mangohud.json
IMPLICIT_LAYER_DIR=$HOME/.local/share/vulkan/implicit_layer.d
+DISTRO=$(sed 1q /etc/os-release | sed 's/NAME=//g' | sed 's/"//g')
dependencies() {
if [[ ! -f build/release/usr/lib64/libMangoHud.so ]]; then
- DISTRO=$(sed 1q /etc/os-release | sed 's/NAME=//g' | sed 's/"//g')
echo "# Checking Dependencies"
missing_deps() {
@@ -27,7 +27,18 @@ dependencies() {
fi
;;
"Fedora")
- for i in {meson,gcc,g++,libX11-devel,glslang,python-mako,mesa-libGL-devel,glibc-devel.i686,libstdc++-devel.i686}; do
+ for i in {meson,gcc,g++,libX11-devel,glslang,python-mako,mesa-libGL-devel}; do
+ dnf list installed | grep $i &> /dev/null
+ if [[ $? == 1 ]]; then
+ INSTALL=$INSTALL" "$i
+ fi
+ done
+ if [[ ! -z "$INSTALL" ]]; then
+ missing_deps
+ sudo dnf install $INSTALL
+ fi
+ unset INSTALL
+ for i in {glibc-devel.i686,libstdc++-devel.i686,libX11-devel.i686}; do
dnf list installed | grep $i &> /dev/null
if [[ $? == 1 ]]; then
INSTALL=$INSTALL" "$i
@@ -72,7 +83,7 @@ configure() {
export CC="gcc -m32"
export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig:${PKG_CONFIG_PATH_32}"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig:${PKG_CONFIG_PATH_32}"
export LLVM_CONFIG="/usr/bin/llvm-config32"
meson build/meson32 --libdir lib32 --prefix $PWD/build/release/usr
fi
|
Fix: segment fault bug in Graph_FillRectARGB() | @@ -684,32 +684,32 @@ static int Graph_FillRectARGB( LCUI_Graph *graph, LCUI_Color color,
LCUI_Rect rect, LCUI_BOOL with_alpha )
{
int x, y;
- LCUI_Rect rect_src;
- LCUI_ARGB *px_p, *px_row_p;
+ LCUI_Graph canvas;
+ LCUI_ARGB *pixel, *pixel_row;
if( !Graph_IsValid( graph ) ) {
return -1;
}
- Graph_GetValidRect( graph, &rect_src );
- graph = Graph_GetQuote( graph );
- px_row_p = graph->argb + (rect_src.y + rect.y)*graph->width;
- px_row_p += rect.x + rect_src.x;
+ Graph_Quote( &canvas, graph, &rect );
+ Graph_GetValidRect( &canvas, &rect );
+ graph = Graph_GetQuote( &canvas );
+ pixel_row = graph->argb + rect.y * graph->width + rect.x;
if( with_alpha ) {
for( y = 0; y < rect.height; ++y ) {
- px_p = px_row_p;
+ pixel = pixel_row;
for( x = 0; x < rect.width; ++x ) {
- *px_p++ = color;
+ *pixel++ = color;
}
- px_row_p += graph->width;
+ pixel_row += graph->width;
}
} else {
for( y = 0; y < rect.height; ++y ) {
- px_p = px_row_p;
+ pixel = pixel_row;
for( x = 0; x < rect.width; ++x ) {
- color.alpha = px_p->alpha;
- *px_p++ = color;
+ color.alpha = pixel->alpha;
+ *pixel++ = color;
}
- px_row_p += graph->width;
+ pixel_row += graph->width;
}
}
return 0;
|
VarDiff log rounding | @@ -147,7 +147,7 @@ namespace MiningCore.Mining
if (newDiff.HasValue)
{
- logger.Info(() => $"[{LogCat}] [{client.ConnectionId}] VarDiff update to {newDiff}");
+ logger.Info(() => $"[{LogCat}] [{client.ConnectionId}] VarDiff update to {Math.Round(newDiff.Value, 2)}");
OnVarDiffUpdate(client, newDiff.Value);
}
|
doc: Update Config Overview
Regarding post-launched VMs, update the messaging about static vs. dynamic. Dynamic is more about creating a VM at runtime per PR 7802, not changing the configuration of an existing VM at runtime. | @@ -101,20 +101,21 @@ ACRN offers three types of VMs:
* **Post-launched User VMs**: These VMs typically share hardware resources via
the Service VM and Device Model. They can also access hardware devices
- directly if they've been configured as passthrough devices. Unlike
- pre-launched VMs, you can change the configuration at runtime. They are
- well-suited for non-safety applications, including human machine interface
- (HMI), artificial intelligence (AI), computer vision, real-time, and others.
+ directly if they've been configured as passthrough devices. The configuration
+ of a post-launched VM can be static (defined at build time) or dynamic
+ (defined at runtime without rebuilding ACRN). They are well-suited for
+ non-safety applications, including human machine interface (HMI), artificial
+ intelligence (AI), computer vision, real-time, and others.
The names "pre-launched" and "post-launched" refer to the boot order of these
VMs. The ACRN hypervisor launches the pre-launched VMs first, then launches the
Service VM. The Service VM launches the post-launched VMs.
-Due to the static configuration of pre-launched VMs, they are recommended only
-if you need complete isolation from the rest of the system. Most use cases can
-meet their requirements without pre-launched VMs. Even if your application has
-stringent real-time requirements, start by testing the application on a
-post-launched VM before considering a pre-launched VM.
+Pre-launched VMs are recommended only if you need complete isolation from the
+rest of the system. Most use cases can meet their requirements without
+pre-launched VMs. Even if your application has stringent real-time requirements,
+start by testing the application on a post-launched VM before considering a
+pre-launched VM.
Scenario Types
---------------
|
Makefile: add an optional compiler wrapper
Use as 'make WRAPCC="ccache"', for example. | @@ -76,9 +76,9 @@ else
endif
CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections
AR = xtensa-lx106-elf-ar
- CC = xtensa-lx106-elf-gcc
+ CC = $(WRAPCC) xtensa-lx106-elf-gcc
NM = xtensa-lx106-elf-nm
- CPP = xtensa-lx106-elf-cpp
+ CPP = $(WRAPCC) xtensa-lx106-elf-gcc -E
OBJCOPY = xtensa-lx106-elf-objcopy
FIRMWAREDIR = ../bin/
UNAME_S := $(shell uname -s)
|
updated run_examples | @@ -10,7 +10,7 @@ path = pathlib.Path(__file__).parents[0].absolute()
example_list = sorted(glob.glob(str(path.parents[0] / "examples" / "*" / "makeplot.py")))
# list of examples that should not be ran in the test
-no_fly_list = ["AbioticO2", "ChaoticResonances", "DampedCBP", "TidalEarth", "SS_NBody", "MagneticBreaking"]
+no_fly_list = ["ChaoticResonances","MagneticBreaking"]
for example in example_list:
print(example)
|
rm mdb.dll file | @@ -100,7 +100,6 @@ def buildXamarinDLL(args, target):
return False
return makedirs(distDir) and \
copyfile('%s/bin/%s/CartoMobileSDK.%s.dll' % (buildDir, args.configuration, target), '%s/CartoMobileSDK.%s.dll' % (distDir, target)) and \
- copyfile('%s/bin/%s/CartoMobileSDK.%s.dll.mdb' % (buildDir, args.configuration, target), '%s/CartoMobileSDK.%s.dll.mdb' % (distDir, target)) and \
copyfile('%s/bin/%s/CartoMobileSDK.%s.xml' % (buildDir, args.configuration, target), '%s/CartoMobileSDK.%s.xml' % (distDir, target))
def buildXamarinNuget(args, target):
|
Add CI_UPSTREAM_COMMIT_SHA | @@ -247,6 +247,7 @@ installer:
CI_UPSTREAM_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
CI_UPSTREAM_COMMIT_BRANCH: $CI_COMMIT_BRANCH
CI_UPSTREAM_DEFAULT_BRANCH: $CI_DEFAULT_BRANCH
+ CI_UPSTREAM_COMMIT_SHA: ${CI_UPSTREAM_COMMIT_SHA}
PLUGIN_REF: main
AGENT_REF: $CI_COMMIT_REF_NAME
trigger:
|
Install SCons via Pip in workflow.
This gives better control over the installed version of SCons. | @@ -19,15 +19,23 @@ jobs:
steps:
- uses: actions/checkout@v2
+ - name: Set up Python 3
+ uses: actions/setup-python@v2
+ with:
+ python-version: 3.x
+ - name: Install SCons
+ run: |
+ python -m pip install --upgrade pip
+ python -m pip install scons
- name: Install APT dependencies
if: runner.os == 'Linux'
run: |
sudo apt-get update
- sudo apt-get install scons libsdl2-dev
+ sudo apt-get install libsdl2-dev
- name: Install Brew dependencies
if: runner.os == 'macOS'
run: |
- brew install scons sdl2
+ brew install sdl2
- name: Build package.
working-directory: buildsys/scons
env:
|
options/posix: Define old C compatibility names | @@ -31,5 +31,9 @@ typedef unsigned short u_short;
typedef char *caddr_t;
typedef off64_t loff_t;
+typedef unsigned long int ulong;
+typedef unsigned short int ushort;
+typedef unsigned int uint;
+
#endif // _SYS_TYPES_H
|
provisioning/warewulf-provision: define conditional | --- a/configure.ac 2018-07-11 13:56:05.000000000 -0700
-+++ b/configure.ac 2018-07-11 20:39:32.000000000 -0700
-@@ -35,7 +35,8 @@
++++ b/configure.ac 2018-07-11 20:55:42.000000000 -0700
+@@ -35,7 +35,9 @@
AC_MSG_CHECKING([for Debian based system])
-AM_CONDITIONAL(ISDEB, [test -f /etc/debian_version])
-+AS_IF([test -f /etc/debian_version], [ISDEB([yes])],
-+ [test -f /etc/SuSE-release], [ISDEB([yes])])
++AS_IF([test -f /etc/debian_version], [deblike=yes],
++ [test -f /etc/SuSE-release], [deblike=yes])
++AM_CONDITIONAL(ISDEB, [test "x$deblike" = "xyes"])
AC_PATH_PROG(PERLBIN, perl)
if test -z "$PERLBIN"; then
|
honggfuzz: test for input/output dirs existence | @@ -313,6 +313,12 @@ int main(int argc, char** argv) {
if (cmdlineParse(argc, myargs, &hfuzz) == false) {
LOG_F("Parsing of the cmd-line arguments failed");
}
+ if (hfuzz.io.inputDir && access(hfuzz.io.inputDir, R_OK) == -1) {
+ PLOG_F("Input directory '%s' is not readable", hfuzz.io.inputDir);
+ }
+ if (hfuzz.io.outputDir && access(hfuzz.io.outputDir, W_OK) == -1) {
+ PLOG_F("Output directory '%s' is not writeable", hfuzz.io.outputDir);
+ }
if (hfuzz.cfg.minimize) {
LOG_I("Minimization mode enabled. Setting number of threads to 1");
hfuzz.threads.threadsMax = 1;
|
Initialize memory | @@ -478,7 +478,7 @@ static void* fuzz_threadNew(void* arg) {
run_t run = {
.global = hfuzz,
.pid = 0,
- .dynfile = (dynfile_t*)util_Malloc(sizeof(dynfile_t) + hfuzz->io.maxFileSz),
+ .dynfile = (dynfile_t*)util_Calloc(sizeof(dynfile_t) + hfuzz->io.maxFileSz),
.fuzzNo = fuzzNo,
.persistentSock = -1,
.tmOutSignaled = false,
|
sim: Implement function in sim
The function `flash_area_id_from_image_slot` is used in the RAM_LOAD and
DIRECT_XIP configurations. Define a version for use in the simulator. | @@ -438,6 +438,11 @@ uint8_t flash_area_get_device_id(const struct flash_area *fa)
return fa->fa_device_id;
}
+int flash_area_id_from_image_slot(int slot) {
+ /* For single image cases, just use the first image. */
+ return flash_area_id_from_multi_image_slot(0, slot);
+}
+
void sim_assert(int x, const char *assertion, const char *file, unsigned int line, const char *function)
{
if (!(x)) {
|
system/ramspeed: Add system interrupt switch.
system/ramspeed: Add system interrupt switch. | @@ -457,10 +457,12 @@ int main(int argc, FAR char *argv[])
parse_commandline(argc, argv, &ramspeed);
memcpy_speed_test(ramspeed.dest, ramspeed.src,
- ramspeed.size, ramspeed.repeat_num, ramspeed.irq_disable);
+ ramspeed.size, ramspeed.repeat_num,
+ ramspeed.irq_disable);
memset_speed_test(ramspeed.dest, ramspeed.value,
- ramspeed.size, ramspeed.repeat_num, ramspeed.irq_disable);
+ ramspeed.size, ramspeed.repeat_num,
+ ramspeed.irq_disable);
return EXIT_SUCCESS;
}
|
Added casting macros | @@ -65,7 +65,8 @@ extern "C" {
/**
* \brief Align x value to specific number of bytes, provided from \ref ESP_MEM_ALIGNMENT configuration
* \param[in] x: Input value to align
- * \retval Input value aligned to specific number of bytes
+ * \return Input value aligned to specific number of bytes
+ * \hideinitializer
*/
#define ESP_MEM_ALIGN(x) ((x + (ESP_MEM_ALIGNMENT - 1)) & ~(ESP_MEM_ALIGNMENT - 1))
@@ -74,6 +75,7 @@ extern "C" {
* \param[in] x: First input to test
* \param[in] y: Second input to test
* \return Minimal value between x and y parameters
+ * \hideinitializer
*/
#define ESP_MIN(x, y) ((x) < (y) ? (x) : (y))
@@ -82,6 +84,7 @@ extern "C" {
* \param[in] x: First input to test
* \param[in] y: Second input to test
* \return Maximal value between x and y parameters
+ * \hideinitializer
*/
#define ESP_MAX(x, y) ((x) > (y) ? (x) : (y))
@@ -89,6 +92,7 @@ extern "C" {
* \brief Get size of statically declared array
* \param[in] x: Input array
* \return Number of array elements
+ * \hideinitializer
*/
#define ESP_ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0]))
@@ -97,9 +101,38 @@ extern "C" {
* \note Use this on all parameters in a function which are not used to prevent
* compiler warnings saying "unused variables"
* \param[in] x: Variable which is not used
+ * \hideinitializer
*/
#define ESP_UNUSED(x) ((void)(x))
+/**
+ * \brief Get input value casted to unsigned 32-bit value
+ * \param[in] x: Input value
+ * \hideinitializer
+ */
+#define ESP_U32(x) ((uint32_t)(x))
+
+/**
+ * \brief Get input value casted to unsigned 16-bit value
+ * \param[in] x: Input value
+ * \hideinitializer
+ */
+#define ESP_U16(x) ((uint16_t)(x))
+
+/**
+ * \brief Get input value casted to unsigned 8-bit value
+ * \param[in] x: Input value
+ * \hideinitializer
+ */
+#define ESP_U8(x) ((uint8_t)(x))
+
+/**
+ * \brief Get input value casted to size_t value
+ * \param[in] x: Input value
+ * \hideinitializer
+ */
+#define ESP_SZ(x) ((size_t)(x))
+
/**
* \}
*/
|
imgtool: fix validation with protected TLVs
After the change to support protected TLVs, the `verify` command was not
updated with proper support. Fix it by skipping any protected TLV found,
and fix the size of the hashed/signed region to also include the
protected TLV area. | @@ -544,16 +544,22 @@ class Image():
if magic != IMAGE_MAGIC:
return VerifyResult.INVALID_MAGIC, None, None
- tlv_info = b[header_size+img_size:header_size+img_size+TLV_INFO_SIZE]
+ tlv_off = header_size + img_size
+ tlv_info = b[tlv_off:tlv_off+TLV_INFO_SIZE]
+ magic, tlv_tot = struct.unpack('HH', tlv_info)
+ if magic == TLV_PROT_INFO_MAGIC:
+ tlv_off += tlv_tot
+ tlv_info = b[tlv_off:tlv_off+TLV_INFO_SIZE]
magic, tlv_tot = struct.unpack('HH', tlv_info)
+
if magic != TLV_INFO_MAGIC:
return VerifyResult.INVALID_TLV_INFO_MAGIC, None, None
sha = hashlib.sha256()
- sha.update(b[:header_size+img_size])
+ prot_tlv_size = tlv_off
+ sha.update(b[:prot_tlv_size])
digest = sha.digest()
- tlv_off = header_size + img_size
tlv_end = tlv_off + tlv_tot
tlv_off += TLV_INFO_SIZE # skip tlv info
while tlv_off < tlv_end:
@@ -569,7 +575,7 @@ class Image():
elif key is not None and tlv_type == TLV_VALUES[key.sig_tlv()]:
off = tlv_off + TLV_SIZE
tlv_sig = b[off:off+tlv_len]
- payload = b[:header_size+img_size]
+ payload = b[:prot_tlv_size]
try:
if hasattr(key, 'verify'):
key.verify(tlv_sig, payload)
|
Sockeye: Mark regions in use | @@ -547,8 +547,8 @@ init :-
add_SYSTEM([]),
DRAM_ID = ["DRAM"],
initial_dram_block(Block),
- assert(node_in_use(["DRAM"], [memory, [Block]])),
- printf("Decoding net initialized using %p as DRAM", Block).
+ assert(node_accept(["DRAM"], [memory, [Block]])),
+ printf("Decoding net initialized using %p as DRAM\n", Block).
add_pci :-
add_pci(["PCI0"]).
@@ -751,6 +751,9 @@ common_free_buffer_wrap(Bits, N1Enum, N2Enum) :-
common_free_buffer([memory, [Size]], R1, R2, ResR, _),
ResR = region{node_id: ResRId, blocks: [memory, [block{base:ResRAddr}]]},
get_or_alloc_node_enum(ResRId, ResEnum),
+ mark_range_in_use(ResR),
+ mark_range_in_use(R1),
+ mark_range_in_use(R2),
writeln([name(R1Addr, N1Enum),name(R2Addr, N2Enum),name(ResRAddr, ResEnum)]).
|
Reformat CMake: Do not split command output | @@ -11,7 +11,7 @@ SCRIPTS_DIR=$(dirname "$0")
# The command `cmake-format --version` seems to print the version number either to `stdout` or `stderr`, depending on the current system.
# To make sure we always capture the version number correctly we therefore redirect `stderr` to the same file descriptor as `stdout`,
# before we save the output of the command.
-CMAKE_FORMAT=$(which cmake-format) && CMAKE_FORMAT_VERSION=$("$CMAKE_FORMAT" 2>&1 --version)
+CMAKE_FORMAT="$(which cmake-format)" && CMAKE_FORMAT_VERSION="$("$CMAKE_FORMAT" 2>&1 --version)"
if [ -z "${CMAKE_FORMAT}" ] || [ "$CMAKE_FORMAT_VERSION" != "0.5.4" ]; then
printf >&2 'cmake-format: %s\n' "$CMAKE_FORMAT"
|
SOVERSION bump to version 5.0.14 | @@ -39,7 +39,7 @@ set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_
# with backward compatible change and micro version is connected with any internal change of the library.
set(SYSREPO_MAJOR_SOVERSION 5)
set(SYSREPO_MINOR_SOVERSION 0)
-set(SYSREPO_MICRO_SOVERSION 13)
+set(SYSREPO_MICRO_SOVERSION 14)
set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}.${SYSREPO_MICRO_SOVERSION})
set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
|
BugID:17865306: Adjust order for menu configs | @@ -19,14 +19,20 @@ config AOS_BUILD_APP
help
This option holds the name of the application that is going to build.
-#config MBINS
-# string
-# option env="MBINS"
+menu "Application Configuration"
+choice
+ prompt "Select App"
+ default AOS_APP_NULL
-## --- Generated Automatically ---
-source "board/Config.in"
+config AOS_APP_NULL
+ bool "Null"
-source "drivers/Config.in"
+source "app/example/Config.in"
+source "app/profile/Config.in"
+endchoice
+endmenu
+
+source "board/Config.in"
menu "Kernel Configuration"
source "kernel/Config.in"
@@ -35,6 +41,9 @@ source "osal/posix/Config.in"
source "osal/cmsis/Config.in"
endmenu
+source "drivers/Config.in"
+source "network/Config.in"
+
menu "Middleware Configuration"
source "middleware/linkkit/Config.in"
source "middleware/uagent/Config.in"
@@ -42,25 +51,6 @@ source "middleware/udata/Config.in"
source "middleware/tinyengine/Config.in"
endmenu
-source "network/Config.in"
-
source "security/Config.in"
-
-menu "Application Configuration"
-choice
- prompt "Select App"
- default AOS_APP_NULL
-
-config AOS_APP_NULL
- bool "Null"
-
-source "app/example/Config.in"
-source "app/profile/Config.in"
-endchoice
-endmenu
-
source "utility/Config.in"
-
source "test/Config.in"
-
-## --- End ---
|
skeleton/sgxsign: fix EINIT failure dueto SGX_INVALID_SIGNATURE
q2 is not always 384-byte length. Sometimes it only has 383-byte.
In this case, the valid portion of q2 is reordered reversely for
little endian order, and the remaining portion is filled with zero. | @@ -508,8 +508,11 @@ static bool calc_q1q2(const uint8_t *s, const uint8_t *m, uint8_t *q1,
goto out;
}
- BN_bn2bin(ctx.q1, q1);
- BN_bn2bin(ctx.q2, q2);
+ int len = BN_bn2bin(ctx.q1, q1);
+ /* convert to little endian */
+ reverse_bytes(q1, len);
+ len = BN_bn2bin(ctx.q2, q2);
+ reverse_bytes(q2, len);
free_q1q2_ctx(&ctx);
return true;
@@ -771,11 +774,10 @@ int main(int argc, char **argv)
/* convert to little endian */
reverse_bytes(ss.signature, SGX_MODULUS_SIZE);
reverse_bytes(ss.modulus, SGX_MODULUS_SIZE);
- reverse_bytes(ss.q1, SGX_MODULUS_SIZE);
- reverse_bytes(ss.q2, SGX_MODULUS_SIZE);
if (!save_sigstruct(&ss, argv[2]))
goto out;
+
exit(0);
out:
check_crypto_errors();
|
build - less verbose rsync of gpaddon_src | @@ -188,7 +188,7 @@ function _main() {
# symlink and `cd`s to the actual directory. Currently the Makefile in the
# addon directory assumes that it is located in a particular location under
# the source tree and hence needs to be copied over.
- rsync -auv gpaddon_src/ $GPDB_SRC_PATH/gpAux/$ADDON_DIR
+ rsync -au gpaddon_src/ $GPDB_SRC_PATH/gpAux/$ADDON_DIR
build_gpdb "${BLD_TARGET_OPTION[@]}"
build_gppkg
if [ "$TARGET_OS" != "win32" ] ; then
|
Add metadata command/key to README.md of gopts plugin
This is an addendum to | - infos/recommends =
- infos/placements = procgetstorage
- infos/status = recommended productive maintained nodep libc
-- infos/metadata = args args/index command opt opt/long opt/arg opt/flagvalue opt/help opt/hidden opt/# opt/#/long opt/#/arg opt/#/flagvalue opt/#/hidden env env/#
+- infos/metadata = args args/index command command/key opt opt/long opt/arg opt/flagvalue opt/help opt/hidden opt/# opt/#/long opt/#/arg opt/#/flagvalue opt/#/hidden env env/#
- infos/description = Parses command-line options using elektra-opts
## Introduction
|
Fix uninitialized variable usage in tabview | @@ -165,6 +165,7 @@ lv_obj_t * lv_tabview_create(lv_obj_t * par, const lv_obj_t * copy)
lv_tabview_ext_t * copy_ext = lv_obj_get_ext_attr(copy);
ext->point_last.x = 0;
ext->point_last.y = 0;
+ ext->tab_cnt = 0; /*Incremented later when the old tabs are copied*/
ext->btns = lv_btnm_create(new_tabview, copy_ext->btns);
ext->indic = lv_obj_create(ext->btns, copy_ext->indic);
ext->content = lv_cont_create(new_tabview, copy_ext->content);
|
net/oic; add newline to end of log_printf() for endpoint | @@ -47,7 +47,7 @@ oc_log_endpoint(uint16_t lvl, struct oc_endpoint *oe)
str = "<unkwn>";
}
}
- log_printf(&oc_log, LOG_MODULE_IOTIVITY, lvl, str);
+ log_printf(&oc_log, LOG_MODULE_IOTIVITY, lvl, "%s\n", str);
}
void
|
Fixed CMakeLists.txt regarding VMA_DYNAMIC_VULKAN_FUNCTIONS, VMA_STATIC_VULKAN_FUNCTIONS
Closes | @@ -26,20 +26,8 @@ set_target_properties(
target_include_directories(VulkanMemoryAllocator PUBLIC "${PROJECT_SOURCE_DIR}/include")
-if(${VMA_DYNAMIC_VULKAN_FUNCTIONS})
- set(VULKAN_USE_DYNAMIC ${VMA_DYNAMIC_VULKAN_FUNCTIONS})
-else()
- set(VULKAN_USE_DYNAMIC 0)
-endif()
-
-if(${VMA_STATIC_VULKAN_FUNCTIONS})
- set(VULKAN_USE_STATIC ${VMA_STATIC_VULKAN_FUNCTIONS})
-else()
- set(VULKAN_USE_STATIC 1)
-endif()
-
# Only link to Vulkan if static linking is used
-if(${VULKAN_USE_STATIC})
+if(${VMA_STATIC_VULKAN_FUNCTIONS})
target_link_libraries(VulkanMemoryAllocator PUBLIC Vulkan::Vulkan)
endif()
@@ -47,8 +35,8 @@ target_compile_definitions(
VulkanMemoryAllocator
PUBLIC
- VMA_STATIC_VULKAN_FUNCTIONS=$<BOOL:${VULKAN_USE_STATIC}>
- VMA_DYNAMIC_VULKAN_FUNCTIONS=$<BOOL:${VULKAN_USE_DYNAMIC}>
+ VMA_STATIC_VULKAN_FUNCTIONS=$<BOOL:${VMA_STATIC_VULKAN_FUNCTIONS}>
+ VMA_DYNAMIC_VULKAN_FUNCTIONS=$<BOOL:${VMA_DYNAMIC_VULKAN_FUNCTIONS}>
VMA_DEBUG_ALWAYS_DEDICATED_MEMORY=$<BOOL:${VMA_DEBUG_ALWAYS_DEDICATED_MEMORY}>
VMA_DEBUG_INITIALIZE_ALLOCATIONS=$<BOOL:${VMA_DEBUG_INITIALIZE_ALLOCATIONS}>
VMA_DEBUG_GLOBAL_MUTEX=$<BOOL:${VMA_DEBUG_GLOBAL_MUTEX}>
|
ci: add test for partition_table target | @@ -447,6 +447,10 @@ function run_tests()
(grep '"command"' build/compile_commands.json | grep -v mfix-esp32-psram-cache-issue) && failure "All commands in compile_commands.json should use PSRAM cache workaround"
rm -r build
+ print_status "Displays partition table when executing target partition_table"
+ idf.py partition_table | grep -E "# Espressif .+ Partition Table"
+ rm -r build
+
print_status "Make sure a full build never runs '/usr/bin/env python' or similar"
OLDPATH="$PATH"
PYTHON="$(which python)"
|
gethostlatency: remove unused code | @@ -34,7 +34,6 @@ struct val_t {
struct data_t {
u32 pid;
- u64 ts;
u64 delta;
char comm[TASK_COMM_LEN];
char host[80];
@@ -77,7 +76,6 @@ int do_return(struct pt_regs *ctx) {
bpf_probe_read(&data.host, sizeof(data.host), (void *)valp->host);
data.pid = valp->pid;
data.delta = tsp - valp->ts;
- data.ts = tsp / 1000;
events.perf_submit(ctx, &data, sizeof(data));
start.delete(&pid);
return 0;
@@ -96,37 +94,19 @@ TASK_COMM_LEN = 16 # linux/sched.h
class Data(ct.Structure):
_fields_ = [
("pid", ct.c_ulonglong),
- ("ts", ct.c_ulonglong),
("delta", ct.c_ulonglong),
("comm", ct.c_char * TASK_COMM_LEN),
("host", ct.c_char * 80)
]
-start_ts = 0
-prev_ts = 0
-delta = 0
-
# header
print("%-9s %-6s %-16s %10s %s" % ("TIME", "PID", "COMM", "LATms", "HOST"))
def print_event(cpu, data, size):
event = ct.cast(data, ct.POINTER(Data)).contents
- global start_ts
- global prev_ts
- global delta
-
- if start_ts == 0:
- prev_ts = start_ts
-
- if start_ts == 1:
- delta = float(delta) + (event.ts - prev_ts)
-
print("%-9s %-6d %-16s %10.2f %s" % (strftime("%H:%M:%S"), event.pid,
event.comm, (event.delta / 1000000), event.host))
- prev_ts = event.ts
- start_ts = 1
-
# loop with callback to print_event
b["events"].open_perf_buffer(print_event)
while 1:
|
build: Run CodeQL automatically if binary present | @@ -168,13 +168,15 @@ 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%
- if not "%VIRTIO_WIN_RUN_CODEQL%"=="" (
+ if exist "%CODEQL_BIN%" (
if "%TARGET_PROJ_CONFIG%"=="Win10" (
echo Running CodeQL for %BUILD_FILE%, configuration %TARGET_VS_CONFIG%
call :runql "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH%
) else (
echo Skipping CodeQL for %BUILD_FILE%, configuration %TARGET_VS_CONFIG%
)
+ ) else (
+ echo CodeQL binary is missing!
)
call :runca "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH%
call :rundvl "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH%
|
Makefile: adjust compilation flags order | @@ -114,7 +114,7 @@ $(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) $(call TESTANDREPLACEFILE, [email protected], $@)
$(SYMTABOBJ): %$(OBJEXT): %.c
- $(call COMPILE, -fno-lto -fno-builtin $<, $@)
+ $(call COMPILE, $<, $@, -fno-lto -fno-builtin)
$(BIN): $(SYMTABOBJ)
$(call ARCHIVE_ADD, $(call CONVERT_PATH,$(BIN)), $^)
|
Fixed RTOS2 message queue example. | @@ -113,7 +113,6 @@ typedef struct { // object dat
uint8_t Idx;
} MSGQUEUE_OBJ_t;
-osMemoryPoolId_t mpid_MemPool2; // memory pool id
osMessageQueueId_t mid_MsgQueue; // message queue id
int Init_MsgQueue (void) {
@@ -132,24 +131,25 @@ int Init_MsgQueue (void) {
}
void Thread_MsgQueue1 (void *argument) {
- MSGQUEUE_OBJ_t pMsg = 0;
+ MSGQUEUE_OBJ_t msg;
while (1) {
; // Insert thread code here...
- pMsg->Buf[0] = 0x55; // do some work...
- pMsg->Idx = 0;
- osMessageQueuePut (mid_MsgQueue, &pMsg, NULL, NULL);
+ msg.Buf[0] = 0x55; // do some work...
+ msg.Idx = 0;
+ osMessageQueuePut (mid_MsgQueue, &msg, 0, NULL);
osThreadYield (); // suspend thread
}
}
void Thread_MsgQueue2 (void *argument) {
- MSGQUEUE_OBJ_t pMsg = 0;
+ MSGQUEUE_OBJ_t msg;
+ osStatus_t status;
while (1) {
; // Insert thread code here...
- status = osMessageQueueGet (mid_MsgQueue, &pMsg, NULL, NULL); // wait for message
+ status = osMessageQueueGet (mid_MsgQueue, &msg, NULL, NULL); // wait for message
if (status == osOK) {
; // process data
}
|
Add support for Context inspection | @@ -500,6 +500,10 @@ namespace MAT_NS_BEGIN
LOG_TRACE("SetContext(\"%s\", ..., %u)", name.c_str(), piiKind);
EventProperty prop(value, piiKind);
m_context.SetCustomField(name, prop);
+ if (m_dataInspector)
+ {
+ m_dataInspector->InspectSemanticContext(name, value, /*isGlobalContext: */ true, std::string{});
+ }
return STATUS_SUCCESS;
}
@@ -570,6 +574,10 @@ namespace MAT_NS_BEGIN
LOG_INFO("SetContext");
EventProperty prop(value, piiKind);
m_context.SetCustomField(name, prop);
+ if (m_dataInspector)
+ {
+ m_dataInspector->InspectSemanticContext(name, value, /*isGlobalContext:*/ true, std::string{});
+ }
return STATUS_SUCCESS;
}
|
only delete dataKs if they have been initialized. | @@ -1851,6 +1851,7 @@ int kdbGet (KDB * handle, KeySet * ks, Key * parentKey)
if (goptsActive && !handle->hooks.gopts.get (handle->hooks.gopts.plugin, dataKs, parentKey))
{
clear_bit (parentKey->flags, KEY_FLAG_RO_NAME | KEY_FLAG_RO_VALUE);
+ ksDel (dataKs);
goto error;
}
clear_bit (parentKey->flags, KEY_FLAG_RO_NAME | KEY_FLAG_RO_VALUE);
@@ -1862,6 +1863,7 @@ int kdbGet (KDB * handle, KeySet * ks, Key * parentKey)
if (handle->hooks.spec.plugin && handle->hooks.spec.copy (handle->hooks.spec.plugin, dataKs, parentKey, true) == -1)
{
clear_bit (parentKey->flags, KEY_FLAG_RO_NAME | KEY_FLAG_RO_VALUE);
+ ksDel (dataKs);
goto error;
}
clear_bit (parentKey->flags, KEY_FLAG_RO_NAME | KEY_FLAG_RO_VALUE);
@@ -1876,12 +1878,14 @@ int kdbGet (KDB * handle, KeySet * ks, Key * parentKey)
ELEKTRA_SET_INTERNAL_ERROR (parentKey,
"Couldn't divide keys into mountpoints before poststorage. Please report this bug at "
"https://issues.libelektra.org.");
+ ksDel (dataKs);
goto error;
}
// Step 16: run poststorage phase for non-spec:/
if (!runGetPhase (backends, parentKey, ELETKRA_KDB_GET_PHASE_POST_STORAGE_NONSPEC))
{
+ ksDel (dataKs);
goto error;
}
@@ -1936,7 +1940,6 @@ error:
ksDel (backends);
ksDel (allBackends);
- ksDel (dataKs);
errno = errnosave;
return -1;
|
bignum_mod_raw.py: Added BignumModRawConvertfromMont
This patch adds test class for 'mpi_mod_raw_from_mont_rep()`. | @@ -211,6 +211,37 @@ class BignumModRawConvertToMont(BignumModRawOperationArchSplit):
@property
def hex_x(self) -> str:
return "{:x}".format(self.x).zfill(self.hex_digits)
+
+class BignumModRawConvertFromMont(BignumModRawConvertToMont):
+ """ Test cases for mpi_mod_raw_from_mont_rep(). """
+
+ test_function = "mpi_mod_raw_from_mont_rep"
+ test_name = "Convert from Mont: "
+
+ test_input_numbers = ["0",
+ "1",
+ "3ca",
+ "539ed428",
+ "7dfe5c6beb35a2d6",
+ "dca8de1c2adfc6d7aafb9b48e",
+ "a7d17b6c4be72f3d5c16bf9c1af6fc933",
+ "2fec97beec546f9553142ed52f147845463f579",
+ "378dc83b8bc5a7b62cba495af4919578dce6d4f175cadc4f",
+ "b6415f2a1a8e48a518345db11f56db3829c8f2c6415ab4a395a"
+ "b3ac2ea4cbef4af86eb18a84eb6ded4c6ecbfc4b59c2879a675"
+ "487f687adea9d197a84a5242a5cf6125ce19a6ad2e7341f1c57"
+ "d43ea4f4c852a51cb63dabcd1c9de2b827a3146a3d175b35bea"
+ "41ae75d2a286a3e9d43623152ac513dcdea1d72a7da846a8ab3"
+ "58d9be4926c79cfb287cf1cf25b689de3b912176be5dcaf4d4c"
+ "6e7cb839a4a3243a6c47c1e2c99d65c59d6fa3672575c2f1ca8"
+ "de6a32e854ec9d8ec635c96af7679fce26d7d159e4a9da3bd74"
+ "e1272c376cd926d74fe3fb164a5935cff3d5cdb92b35fe2cea32"
+ "138a7e6bfbc319ebd1725dacb9a359cbf693f2ecb785efb9d627"
+ ]
+
+ @property
+ def x(self): # pylint: disable=invalid-name
+ return (self.int_a * self.r_inv) % self.int_n
# END MERGE SLOT 7
# BEGIN MERGE SLOT 8
|
changed all pixel types to use the 40/80Mhz clock | @@ -422,23 +422,23 @@ static int set_pixformat(sensor_t *sensor, pixformat_t pixformat)
case PIXFORMAT_RGB565:
ret |= cambus_writeb2(sensor->slv_addr, FORMAT_CONTROL, 0x61);
ret |= cambus_writeb2(sensor->slv_addr, FORMAT_CONTROL_MUX, 0x01);
- pll = (resolution[sensor->framesize][0] > 2048) ? 0x50 : 0x64; // 32 MHz vs 40 MHz
+ pll = 0x64; // 40 MHz
break;
case PIXFORMAT_GRAYSCALE:
case PIXFORMAT_YUV422:
ret |= cambus_writeb2(sensor->slv_addr, FORMAT_CONTROL, 0x10);
ret |= cambus_writeb2(sensor->slv_addr, FORMAT_CONTROL_MUX, 0x00);
- pll = (resolution[sensor->framesize][0] > 2048) ? 0x50 : 0x64; // 32 MHz vs 40 MHz
+ pll = 0x64; // 40 MHz
break;
case PIXFORMAT_BAYER:
ret |= cambus_writeb2(sensor->slv_addr, FORMAT_CONTROL, 0x00);
ret |= cambus_writeb2(sensor->slv_addr, FORMAT_CONTROL_MUX, 0x01);
- pll = (resolution[sensor->framesize][0] > 2048) ? 0x64 : 0x50; // 40 MHz vs 32 MHz (jpeg can go faster at higher reses)
+ pll = 0x64; // 40 MHz (jpeg can go faster at higher reses)
break;
case PIXFORMAT_JPEG:
ret |= cambus_writeb2(sensor->slv_addr, FORMAT_CONTROL, 0x30);
ret |= cambus_writeb2(sensor->slv_addr, FORMAT_CONTROL_MUX, 0x00);
- pll = (resolution[sensor->framesize][0] > 2048) ? 0x50 : 0x64; // 32 MHz vs 40 MHz
+ pll = 0x64; // 40 MHz
break;
default:
return -1;
@@ -605,25 +605,7 @@ static int set_framesize(sensor_t *sensor, framesize_t framesize)
ret |= cambus_writeb2(sensor->slv_addr, JPEG_CTRL07, (sensor_div > 1) ? 0x4 : 0x10);
// Step 8: Adjust PLL freq.
-
- switch (sensor->pixformat) {
- case PIXFORMAT_RGB565:
- pll = (w > 2048) ? 0x50 : 0x64; // 32 MHz vs 40 MHz
- break;
- case PIXFORMAT_GRAYSCALE:
- case PIXFORMAT_YUV422:
-// pll = (w > 2048) ? 0x50 : 0x64; // 32 MHz vs 40 MHz
- pll = 0x64;
- break;
- case PIXFORMAT_BAYER:
- pll = (w > 2048) ? 0x64 : 0x50; // 40 MHz vs 32 MHz (jpeg can go faster at higher reses)
- break;
- case PIXFORMAT_JPEG:
- pll = (w > 2048) ? 0x50 : 0x64; // 32 MHz vs 40 MHz
- break;
- default:
- return -1;
- }
+ pll = 0x64; // 40 Mhz
ret |= cambus_writeb2(sensor->slv_addr, SC_PLL_CONTRL2, pll);
|
prepare kernel for sve zgemm | @@ -169,15 +169,24 @@ CGEMMOTCOPY = ../generic/zgemm_tcopy_$(CGEMM_UNROLL_N).c
CGEMMONCOPYOBJ = cgemm_oncopy$(TSUFFIX).$(SUFFIX)
CGEMMOTCOPYOBJ = cgemm_otcopy$(TSUFFIX).$(SUFFIX)
-ZGEMMKERNEL = zgemm_kernel_$(ZGEMM_UNROLL_M)x$(ZGEMM_UNROLL_N).S
-ZTRMMKERNEL = ztrmm_kernel_$(ZGEMM_UNROLL_M)x$(ZGEMM_UNROLL_N).S
-ifneq ($(ZGEMM_UNROLL_M), $(ZGEMM_UNROLL_N))
-ZGEMMINCOPY = ../generic/zgemm_ncopy_$(ZGEMM_UNROLL_M).c
-ZGEMMITCOPY = ../generic/zgemm_tcopy_$(ZGEMM_UNROLL_M).c
-ZGEMMINCOPYOBJ = zgemm_incopy$(TSUFFIX).$(SUFFIX)
-ZGEMMITCOPYOBJ = zgemm_itcopy$(TSUFFIX).$(SUFFIX)
-endif
+ZGEMMKERNEL = zgemm_kernel_sve_v1x$(ZGEMM_UNROLL_N).S
+ZTRMMKERNEL = ztrmm_kernel_sve_v1x$(ZGEMM_UNROLL_N).S
+
+ZGEMMINCOPY = zgemm_ncopy_sve_v1.c
+ZGEMMITCOPY = zgemm_tcopy_sve_v1.c
ZGEMMONCOPY = ../generic/zgemm_ncopy_$(ZGEMM_UNROLL_N).c
ZGEMMOTCOPY = ../generic/zgemm_tcopy_$(ZGEMM_UNROLL_N).c
+
+ZGEMMINCOPYOBJ = zgemm_incopy$(TSUFFIX).$(SUFFIX)
+ZGEMMITCOPYOBJ = zgemm_itcopy$(TSUFFIX).$(SUFFIX)
ZGEMMONCOPYOBJ = zgemm_oncopy$(TSUFFIX).$(SUFFIX)
ZGEMMOTCOPYOBJ = zgemm_otcopy$(TSUFFIX).$(SUFFIX)
+
+DTRMMUNCOPY_M = trmm_uncopy_sve_v1.c
+DTRMMLNCOPY_M = trmm_lncopy_sve_v1.c
+DTRMMUTCOPY_M = trmm_utcopy_sve_v1.c
+DTRMMLTCOPY_M = trmm_ltcopy_sve_v1.c
+
+DSYMMUCOPY_M = symm_ucopy_sve.c
+DSYMMLCOPY_M = symm_lcopy_sve.c
+
|
tests: add more pthread_cancel tests | #include <pthread.h>
#include <unistd.h>
-_Atomic int ready = 0;
+_Atomic int worker_ready = 0;
+_Atomic int main_ready = 0;
-static void *worker(void *arg) {
+static void *worker1(void *arg) {
(void)arg;
assert(!pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL));
assert(!pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL));
- ready = 1;
+ worker_ready = 1;
while (1) sleep(1);
return NULL;
}
+static void *worker2(void *arg) {
+ (void) arg;
+ assert(!pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL));
+
+ worker_ready = 1;
+
+ while(!main_ready);
+
+ // Cancellation point - we should cancel right now
+ sleep(1);
+
+ assert(!"Expected to be cancelled!");
+ __builtin_unreachable();
+}
+
+static void *worker3(void *arg) {
+ (void) arg;
+ assert(!pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL));
+
+ worker_ready = 1;
+
+ while(!main_ready);
+
+ // Cancellation point - we should cancel right now
+ pthread_testcancel();
+
+ assert(!"Expected to be cancelled!");
+ __builtin_unreachable();
+}
+
+static void check_result(pthread_t thread) {
+
+ void *ret_val = NULL;
+ int ret = pthread_join(thread, &ret_val);
+ assert(!ret);
+ assert(ret_val == PTHREAD_CANCELED);
+}
+
int main() {
pthread_t thread;
- int ret = pthread_create(&thread, NULL, &worker, NULL);
+ int ret = pthread_create(&thread, NULL, &worker1, NULL);
+ assert(!ret);
+
+ while (!worker_ready);
+ ret = pthread_cancel(thread);
assert(!ret);
+ check_result(thread);
- while (!ready);
+ worker_ready = 0;
+ ret = pthread_create(&thread, NULL, &worker2, NULL);
+ assert(!ret);
+ while(!worker_ready);
ret = pthread_cancel(thread);
assert(!ret);
+ main_ready = 1;
+ check_result(thread);
- void *ret_val = NULL;
- ret = pthread_join(thread, &ret_val);
+ worker_ready = 0;
+ ret = pthread_create(&thread, NULL, &worker3, NULL);
assert(!ret);
- assert(ret_val == PTHREAD_CANCELED);
+
+ while(!worker_ready);
+ ret = pthread_cancel(thread);
+ assert(!ret);
+ main_ready = 1;
+ check_result(thread);
+
return 0;
}
|
Use USBHS_Handler | @@ -109,7 +109,7 @@ void board_init(void)
//--------------------------------------------------------------------+
// USB Interrupt Handler
//--------------------------------------------------------------------+
-void UDP_Handler(void)
+void USBHS_Handler(void)
{
#if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
tud_int_handler(0);
|
BugID:23266661: Remove redundant http api | @@ -72,6 +72,12 @@ typedef struct httpc_s {
#endif
} httpc_t;
+/** @brief This structure defines the httpclient and HTTP data structure. */
+typedef struct {
+ httpclient_t client;
+ httpclient_data_t client_data;
+} httpclient_source_t;
+
#define HTTPC_VERSION "HTTP/1.1"
#define HTTPC_CRLF "\r\n"
@@ -81,6 +87,28 @@ typedef struct httpc_param_s {
uint16_t len;
} httpc_param_t;
+/**
+ * This function initialize httpclient params.
+ * @param[in, out] source source is a pointer to the #httpclient_source_t.
+ * @param[in] header_size header_size is the max sending header length.
+ * @param[in] body_size body_size is the max response buf length.
+ * @return The HTTP response code of the last request.
+ */
+HTTPC_RESULT httpc_prepare(httpclient_source_t *source, int header_size, int body_size);
+/**
+ * This function deinitialize httpclient params.
+ * @param[in] source source is a pointer to the #httpclient_t.
+ * @return The HTTP response code of the last request.
+ */
+HTTPC_RESULT httpc_unprepare(httpclient_source_t* source);
+
+/**
+ * This function reset httpclient params.
+ * @param[in] source source is a pointer to the #httpclient_t.
+ * @return None
+ */
+void httpc_reset(httpclient_source_t *source);
+
void http_log(const char *fmt, ...);
#endif
|
sysdeps/managarm: convert TIOCSCTTY to helix_ng | @@ -162,44 +162,28 @@ int sys_ioctl(int fd, unsigned long request, void *arg, int *result) {
return 0;
}
case TIOCSCTTY: {
- HelAction actions[4];
- globalQueue.trim();
-
managarm::fs::CntRequest<MemoryAllocator> req(getSysdepsAllocator());
req.set_req_type(managarm::fs::CntReqType::PT_IOCTL);
req.set_command(request);
- frg::string<MemoryAllocator> ser(getSysdepsAllocator());
- req.SerializeToString(&ser);
- actions[0].type = kHelActionOffer;
- actions[0].flags = kHelItemAncillary;
- actions[1].type = kHelActionSendFromBuffer;
- actions[1].flags = kHelItemChain;
- actions[1].buffer = ser.data();
- actions[1].length = ser.size();
- actions[2].type = kHelActionImbueCredentials;
- actions[2].handle = kHelThisThread;
- actions[2].flags = kHelItemChain;
- actions[3].type = kHelActionRecvInline;
- actions[3].flags = 0;
- HEL_CHECK(helSubmitAsync(handle, actions, 4,
- globalQueue.getQueue(), 0, 0));
-
- auto element = globalQueue.dequeueSingle();
- auto offer = parseHandle(element);
- auto imbue_creds = parseSimple(element);
- auto send_req = parseSimple(element);
- auto recv_resp = parseInline(element);
+ auto [offer, send_req, imbue_creds, recv_resp] = exchangeMsgsSync(
+ handle,
+ helix_ng::offer(
+ helix_ng::sendBragiHeadOnly(req, getSysdepsAllocator()),
+ helix_ng::imbueCredentials(),
+ helix_ng::recvInline())
+ );
- HEL_CHECK(offer->error);
- if(imbue_creds->error == kHelErrDismissed)
+ HEL_CHECK(offer.error());
+ if(imbue_creds.error() == kHelErrDismissed)
return EINVAL;
- HEL_CHECK(imbue_creds->error);
- HEL_CHECK(send_req->error);
- HEL_CHECK(recv_resp->error);
+ HEL_CHECK(imbue_creds.error());
+ HEL_CHECK(send_req.error());
+ HEL_CHECK(recv_resp.error());
managarm::fs::SvrResponse<MemoryAllocator> resp(getSysdepsAllocator());
- resp.ParseFromArray(recv_resp->data, recv_resp->length);
+ resp.ParseFromArray(recv_resp.data(), recv_resp.length());
+
if(resp.error() == managarm::fs::Errors::ILLEGAL_ARGUMENT) {
return EINVAL;
}else if(resp.error() == managarm::fs::Errors::INSUFFICIENT_PERMISSIONS) {
|
VERSION bump to version 2.1.75 | @@ -64,7 +64,7 @@ endif()
# micro version is changed with a set of small changes or bugfixes anywhere in the project.
set(SYSREPO_MAJOR_VERSION 2)
set(SYSREPO_MINOR_VERSION 1)
-set(SYSREPO_MICRO_VERSION 74)
+set(SYSREPO_MICRO_VERSION 75)
set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_MICRO_VERSION})
# Version of the library
|
Camel: Save test data below `/tests` | @@ -18,28 +18,28 @@ This plugin reads configuration data specified in a **very limited** subset of
### Basic Usage
```sh
-# Mount yaml plugin to cascading namespace `/examples/camel`
-sudo kdb mount config.yaml /examples/camel camel
+# Mount yaml plugin to cascading namespace `/tests/camel`
+sudo kdb mount config.yaml /tests/camel camel
-kdb set /examples/camel/key value
-kdb get /examples/camel/key
+kdb set /tests/camel/key value
+kdb get /tests/camel/key
#> value
-kdb set /examples/camel/kittens "warm & fuzzy"
-kdb get /examples/camel/kittens
+kdb set /tests/camel/kittens "warm & fuzzy"
+kdb get /tests/camel/kittens
#> warm & fuzzy
-kdb set /examples/camel/empty ""
+kdb set /tests/camel/empty ""
-kdb export /examples/camel camel
+kdb export /tests/camel camel
#> {
#> "empty" : ""
#> , "key" : "value"
#> , "kittens" : "warm & fuzzy"
#> }
-kdb rm -r /examples/camel
-sudo kdb umount /examples/camel
+kdb rm -r /tests/camel
+sudo kdb umount /tests/camel
```
## Limitations
|
We don't need to handle handshake completion in server write event | @@ -6981,31 +6981,7 @@ static ssize_t conn_write_handshake(ngtcp2_conn *conn, uint8_t *dest,
return res;
}
- nwrite = conn_write_handshake_ack_pkts(conn, dest, origlen, ts);
- if (nwrite < 0) {
- return nwrite;
- }
-
- res += nwrite;
-
- if (!(conn->flags & NGTCP2_CONN_FLAG_TRANSPORT_PARAM_RECVED)) {
- return NGTCP2_ERR_REQUIRED_TRANSPORT_PARAM;
- }
-
- rv = conn_handshake_completed(conn);
- if (rv != 0) {
- return (ssize_t)rv;
- }
- conn->state = NGTCP2_CS_POST_HANDSHAKE;
-
- rv = conn_process_buffered_protected_pkt(conn, &conn->hs_pktns, ts);
- if (rv != 0) {
- return (ssize_t)rv;
- }
-
- conn->hs_pktns.acktr.flags |= NGTCP2_ACKTR_FLAG_PENDING_FINISHED_ACK;
-
- return res;
+ return 0;
case NGTCP2_CS_CLOSING:
return NGTCP2_ERR_CLOSING;
case NGTCP2_CS_DRAINING:
|
bsync: using error-handling interface | /*
- * Copyright (c) 2007 - 2015 Joseph Gaeddert
+ * Copyright (c) 2007 - 2020 Joseph Gaeddert
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -77,10 +77,9 @@ BSYNC() BSYNC(_create_msequence)(unsigned int _g,
unsigned int _k)
{
// validate input
- if (_k == 0) {
- fprintf(stderr,"bsync_xxxt_create_msequence(), samples/symbol must be greater than zero\n");
- exit(1);
- }
+ if (_k == 0)
+ return liquid_error_config("bsync_xxxt_create_msequence(), samples/symbol must be greater than zero");
+
unsigned int m = liquid_msb_index(_g) - 1;
// create/initialize msequence
|
mesh: Fix printing heartbeat publication storing log | @@ -1026,6 +1026,7 @@ static void store_pending_hb_pub(void)
struct bt_mesh_hb_pub *pub = bt_mesh_hb_pub_get();
struct hb_pub_val val;
char *str;
+ int err;
if (!pub) {
return;
@@ -1051,7 +1052,12 @@ static void store_pending_hb_pub(void)
BT_DBG("Saving Heartbeat Publication as value %s",
str ? str : "(null)");
- settings_save_one("bt_mesh/HBPub", str);
+ err = settings_save_one("bt_mesh/HBPub", str);
+ if (err) {
+ BT_ERR("Failed to store Heartbeat Publication");
+ } else {
+ BT_DBG("Stored Heartbeat Publication");
+ }
}
static void store_pending_cfg(void)
|
acrn: allow to specify the build output folder
Usages: make O=<any folder> | @@ -4,8 +4,8 @@ T := $(CURDIR)
PLATFORM ?= uefi
RELEASE ?= 0
-BUILD_DIR := build
-ROOT_OUT := $(T)/$(BUILD_DIR)
+O ?= build
+ROOT_OUT := $(shell mkdir -p $(O);cd $(O);pwd)
HV_OUT := $(ROOT_OUT)/hypervisor
DM_OUT := $(ROOT_OUT)/devicemodel
TOOLS_OUT := $(ROOT_OUT)/tools
|
fuzz/asn1parse: Use BIO_s_mem() as fallback output
/dev/null is not available everywhere. | @@ -24,6 +24,8 @@ static BIO *bio_out;
int FuzzerInitialize(int *argc, char ***argv)
{
bio_out = BIO_new_file("/dev/null", "w");
+ if (bio_out == NULL)
+ bio_out = BIO_new(BIO_s_mem());
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
ERR_clear_error();
CRYPTO_free_ex_index(0, -1);
|
GBP: format include EPG index | @@ -331,7 +331,8 @@ format_gbp_endpoint_group (u8 * s, va_list * args)
vnet_main_t *vnm = vnet_get_main ();
if (NULL != gg)
- s = format (s, "%d, sclass:%d bd:[%d,%d], rd:[%d] uplink:%U locks:%d",
+ s = format (s, "[%d] %d, sclass:%d bd:[%d,%d], rd:[%d] uplink:%U locks:%d",
+ gg - gbp_endpoint_group_pool,
gg->gg_id,
gg->gg_sclass,
gbp_endpoint_group_get_bd_id(gg), gg->gg_bd_index,
|
Subsets and Splits