message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
updates :acme to confirm challenge contents
|
this
?> ?=(^ rod)
?> ?=(^ active.aut.u.rod)
- :: XX check content type and response body
+ =* aut u.active.aut.u.rod
+ =/ bod
+ %- as-octs:mimes:html
+ (rap 3 [tok.cal.aut '.' (pass:thumb:jwk key.act) ~])
+ ?. ?& ?=(^ r.rep)
+ =(bod u.r.rep)
+ ==
+ :: XX save-trail again?
+ :: XX probably a DNS misconfiguration
+ ::
+ ~& [%test-trial-mismatch expected=bod got=[wir rep]]
+ this
finalize-trial:effect
:: +finalize-trial:
::
|
fix(draw): fix duplicate alpha overlay for draw letter
|
@@ -257,7 +257,7 @@ LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_draw_ctx_t * draw_ctx, c
lv_draw_sw_blend_dsc_t blend_dsc;
lv_memzero(&blend_dsc, sizeof(blend_dsc));
blend_dsc.color = dsc->color;
- blend_dsc.opa = dsc->opa;
+ blend_dsc.opa = LV_OPA_COVER;
blend_dsc.blend_mode = dsc->blend_mode;
lv_coord_t hor_res = lv_disp_get_hor_res(_lv_refr_get_disp_refreshing());
|
common: GCC bug is fixed in 10.2
|
@@ -783,7 +783,7 @@ typedef SIMDE_FLOAT64_TYPE simde_float64;
# define SIMDE_BUG_GCC_95227
# define SIMDE_BUG_GCC_95782
# elif defined(SIMDE_ARCH_X86) || defined(SIMDE_ARCH_AMD64)
-# if !defined(__OPTIMIZE__)
+# if !HEDLEY_GCC_VERSION_CHECK(10,2,0) && !defined(__OPTIMIZE__)
# define SIMDE_BUG_GCC_96174
# endif
# endif
|
fuzz: print execution time per added input
|
@@ -222,10 +222,11 @@ static void fuzz_perfFeedback(run_t* run) {
run->global->linux.hwCnts.softCntEdge += softCntEdge;
run->global->linux.hwCnts.softCntCmp += softCntCmp;
- LOG_I("Size:%zu (i,b,hw,ed,ip,cmp): %" PRIu64 "/%" PRIu64 "/%" PRIu64 "/%" PRIu64
- "/%" PRIu64 "/%" PRIu64 ", Tot:%" PRIu64 "/%" PRIu64 "/%" PRIu64 "/%" PRIu64
- "/%" PRIu64 "/%" PRIu64,
- run->dynfile->size, run->linux.hwCnts.cpuInstrCnt, run->linux.hwCnts.cpuBranchCnt,
+ LOG_I("Size:%zu Time:%" PRIu64 "ms (i/b/h/e/p/c): %" PRIu64 "/%" PRIu64 "/%" PRIu64
+ "/%" PRIu64 "/%" PRIu64 "/%" PRIu64 ", Tot:%" PRIu64 "/%" PRIu64 "/%" PRIu64
+ "/%" PRIu64 "/%" PRIu64 "/%" PRIu64,
+ run->dynfile->size, util_timeNowMillis() - run->timeStartedMillis,
+ run->linux.hwCnts.cpuInstrCnt, run->linux.hwCnts.cpuBranchCnt,
run->linux.hwCnts.newBBCnt, softCntEdge, softCntPc, softCntCmp,
run->global->linux.hwCnts.cpuInstrCnt, run->global->linux.hwCnts.cpuBranchCnt,
run->global->linux.hwCnts.bbCnt, run->global->linux.hwCnts.softCntEdge,
|
Set EVP_PKEY_CTX in SignerInfo
If we aren't setting public key parameters make EVP_PKEY_CTX available
in SignerInfo so PSS mode and parameters are automatically selected.
|
@@ -656,6 +656,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
EVP_MD_CTX_reset(mctx);
if (EVP_DigestSignInit(mctx, &pctx, md, NULL, si->pkey) <= 0)
goto err;
+ si->pctx = pctx;
}
if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN,
|
update compiler version for multipltimer_radio project.
|
<TargetName>Target 1</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
- <pCCUsed>5060528::V5.06 update 5 (build 528)::ARMCC</pCCUsed>
+ <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
<uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
|
add comment for enforce virtual segment number.
|
@@ -4643,6 +4643,10 @@ calculate_planner_segment_num(PlannedStmt *plannedstmt, Query *query,
}
if (enforce_virtual_segment_number > 0) {
+ /*
+ * this is the last factor to determine the virtual segment number,
+ * it has the highest priority in all conditions.
+ */
maxTargetSegmentNumber = enforce_virtual_segment_number;
minTargetSegmentNumber = enforce_virtual_segment_number;
}
|
display: make it compile under cygwin
|
@@ -112,7 +112,7 @@ static unsigned getCpuUse(int numCpus) {
uint64_t systemT = 0UL;
uint64_t idleT = 0UL;
-#if defined(__linux__)
+#if defined(__linux__) || defined(__CYGWIN__)
FILE* f = fopen("/proc/stat", "re");
if (f == NULL) {
return 0;
|
SOVERSION bump to version 4.1.10
|
@@ -38,7 +38,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 4)
set(SYSREPO_MINOR_SOVERSION 1)
-set(SYSREPO_MICRO_SOVERSION 9)
+set(SYSREPO_MICRO_SOVERSION 10)
set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}.${SYSREPO_MICRO_SOVERSION})
set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
|
bin: on SIGTERM exit properly
|
@@ -410,7 +410,7 @@ static void flb_signal_handler(int signal)
case SIGTERM:
flb_stop(ctx);
flb_destroy(ctx);
- break;
+ _exit(EXIT_SUCCESS);
case SIGSEGV:
#ifdef FLB_HAVE_LIBBACKTRACE
flb_stacktrace_print(&flb_st);
|
Remove printf when parsing legacy tx
|
@@ -342,7 +342,6 @@ static bool processEIP2930Tx(txContext_t *context) {
}
static bool processLegacyTx(txContext_t *context) {
- PRINTF("Processing legacy\n");
switch (context->currentField) {
case LEGACY_RLP_CONTENT:
processContent(context);
|
tcp: correct validity check return value
Type: fix
|
@@ -2291,6 +2291,7 @@ tcp_lookup_is_valid (tcp_connection_t * tc, tcp_header_t * hdr)
&& tmp->rmt_port == hdr->src_port)
{
TCP_DBG ("half-open is valid!");
+ is_valid = 1;
}
}
}
|
tests CHANGE do not use "/home" when testing searchpaths
Do not use static paths since they are environment dependent. Instead,
use some of the paths provided via CMake.
|
@@ -127,8 +127,7 @@ test_searchdirs(void **state)
assert_int_equal(LY_SUCCESS, ly_ctx_set_searchdir(ctx, TESTS_SRC"/../doc"));
assert_int_equal(LY_SUCCESS, ly_ctx_set_searchdir(ctx, TESTS_SRC));
assert_int_equal(LY_SUCCESS, ly_ctx_set_searchdir(ctx, TESTS_BIN));
- assert_int_equal(LY_SUCCESS, ly_ctx_set_searchdir(ctx, "/home"));
- assert_int_equal(8, ctx->search_paths.count);
+ assert_int_equal(7, ctx->search_paths.count);
/* get searchpaths */
list = ly_ctx_get_searchdirs(ctx);
@@ -137,8 +136,7 @@ test_searchdirs(void **state)
assert_string_equal(TESTS_BIN"/CMakeFiles", list[1]);
assert_string_equal(TESTS_SRC, list[5]);
assert_string_equal(TESTS_BIN, list[6]);
- assert_string_equal("/home", list[7]);
- assert_null(list[8]);
+ assert_null(list[7]);
/* removing searchpaths */
/* nonexisting */
@@ -147,13 +145,13 @@ test_searchdirs(void **state)
/* first */
assert_int_equal(LY_SUCCESS, ly_ctx_unset_searchdir(ctx, TESTS_BIN"/utests"));
assert_string_not_equal(TESTS_BIN"/utests", list[0]);
- assert_int_equal(7, ctx->search_paths.count);
+ assert_int_equal(6, ctx->search_paths.count);
/* middle */
assert_int_equal(LY_SUCCESS, ly_ctx_unset_searchdir(ctx, TESTS_SRC));
- assert_int_equal(6, ctx->search_paths.count);
- /* last */
- assert_int_equal(LY_SUCCESS, ly_ctx_unset_searchdir(ctx, "/home"));
assert_int_equal(5, ctx->search_paths.count);
+ /* last */
+ assert_int_equal(LY_SUCCESS, ly_ctx_unset_searchdir(ctx, TESTS_BIN));
+ assert_int_equal(4, ctx->search_paths.count);
/* all */
assert_int_equal(LY_SUCCESS, ly_ctx_unset_searchdir(ctx, NULL));
assert_int_equal(0, ctx->search_paths.count);
@@ -167,10 +165,10 @@ test_searchdirs(void **state)
/* test searchdir list in ly_ctx_new() */
assert_int_equal(LY_EINVAL, ly_ctx_new("/nonexistingfile", 0, &ctx));
logbuf_assert("Unable to use search directory \"/nonexistingfile\" (No such file or directory).");
- assert_int_equal(LY_SUCCESS, ly_ctx_new(TESTS_SRC":/home:/home:"TESTS_SRC, LY_CTX_DISABLE_SEARCHDIRS, &ctx));
+ assert_int_equal(LY_SUCCESS, ly_ctx_new(TESTS_SRC":"TESTS_BIN":"TESTS_BIN":"TESTS_SRC, LY_CTX_DISABLE_SEARCHDIRS, &ctx));
assert_int_equal(2, ctx->search_paths.count);
assert_string_equal(TESTS_SRC, ctx->search_paths.objs[0]);
- assert_string_equal("/home", ctx->search_paths.objs[1]);
+ assert_string_equal(TESTS_BIN, ctx->search_paths.objs[1]);
/* cleanup */
*state = NULL;
|
mention gcc-arm-linux-gnueabihf in compile.md
|
@@ -43,6 +43,7 @@ sudo systemctl restart systemd-binfmt
_For Pi4. Change to RPI2 or RPI3 for other models. Change `-DRPI4=1` to `-DRPI4ARM64=1` for compiling on arm64. (armhf multiarch or chroot required alongside armhf gcc. Install it with 'sudo apt install gcc-arm-linux-gnueabihf'.)_
```
+sudo apt install gcc-arm-linux-gnueabihf # optional: armhf cross-compiler only required if you are not in a multiarch or chroot enviroment
git clone https://github.com/ptitSeb/box86
cd box86
mkdir build; cd build; cmake .. -DRPI4ARM64=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
Update version for development testing.
|
#define MOD_WSGI_MAJORVERSION_NUMBER 4
#define MOD_WSGI_MINORVERSION_NUMBER 9
-#define MOD_WSGI_MICROVERSION_NUMBER 4
-#define MOD_WSGI_VERSION_STRING "4.9.4"
+#define MOD_WSGI_MICROVERSION_NUMBER 5
+#define MOD_WSGI_VERSION_STRING "4.9.5.dev1"
/* ------------------------------------------------------------------------- */
|
Increase process timeout and emit occasional warnings.
Travis will timeout after 10 minutes with no output. Emit a warning every 5 minutes to keep Travis alive and increase the total timeout to 20 minutes.
Documentation builds have been timing out a lot recently so hopefully this will help.
|
@@ -107,7 +107,8 @@ sub begin
new pgBackRest::Common::Io::Handle('exec test', $self->{hError}), 0, 65536);
# Record start time and set process timeout
- $self->{iProcessTimeout} = 540;
+ $self->{iProcessTimeout} = 300;
+ $self->{iProcessTimeoutTotal} = 4;
$self->{lTimeLast} = time();
if (!defined($self->{hError}))
@@ -147,8 +148,16 @@ sub endRetry
# Error if process has been running longer than timeout
if (time() - $self->{lTimeLast} > $self->{iProcessTimeout})
{
- confess &log(ASSERT,
- "timeout after $self->{iProcessTimeout} seconds waiting for process to complete: $self->{strCommand}");
+ if ($self->{iProcessTimeoutTotal} > 0)
+ {
+ &log(WARN, "process has been running for $self->{iProcessTimeout} seconds with no output");
+ $self->{iProcessTimeoutTotal}--;
+ $self->{lTimeLast} = time();
+ }
+ else
+ {
+ confess &log(ASSERT, "timeout waiting for process to complete: $self->{strCommand}");
+ }
}
# Drain the stdout stream and look for test points
|
flash_fp_mcu: Add config_skyrim
BRANCH=NONE
TEST=On skyrim device, ran /usr/local/bin/flash_fp_mcu and
tested the fingerprint authentication in the UI
|
@@ -670,6 +670,20 @@ config_guybrush() {
readonly GPIO_PWREN=259
}
+config_skyrim() {
+ readonly TRANSPORT="UART"
+
+ readonly DEVICE="/dev/ttyS1"
+
+ readonly GPIO_CHIP="gpiochip768"
+ # FPMCU RST_ODL is on AGPIO 12 = 768 + 12 = 780
+ readonly GPIO_NRST=780
+ # FPMCU BOOT0 is on AGPIO 130 = 768 + 130 = 898
+ readonly GPIO_BOOT0=898
+ # FPMCU PWR_EN is on AGPIO 4 = 768 + 4 = 772
+ readonly GPIO_PWREN=772
+}
+
main() {
local filename="$1"
|
0-fill structures allocated from OC_MEMB() pools
|
@@ -61,7 +61,9 @@ oc_memb_alloc(struct oc_memb *m)
indicate that it now is used and return a pointer to the
memory block. */
++(m->count[i]);
- return (void *)((char *)m->mem + (i * m->size));
+ void *mem = (void *)((char *)m->mem + (i * m->size));
+ memset(mem, 0, m->size);
+ return mem;
}
}
|
ack_delay is milliseconds resolution
|
@@ -291,7 +291,7 @@ void print_frame(ngtcp2_dir dir, const ngtcp2_frame *fr) {
"largest_ack=%" PRIu64 " ack_delay=%s(%" PRIu64
") ack_block_count=%zu\n",
fr->ack.largest_ack,
- util::format_duration(fr->ack.ack_delay_unscaled).c_str(),
+ util::format_duration(fr->ack.ack_delay_unscaled * 1000).c_str(),
fr->ack.ack_delay, fr->ack.num_blks);
print_indent();
auto largest_ack = fr->ack.largest_ack;
|
Make sure leds are off before starting the bsp_cryptoengine test suite.
|
@@ -335,6 +335,8 @@ int mote_main(void) {
board_init();
+ leds_all_off();
+
#if TEST_AES_ECB
if (run_aes_ecb_suite(aes_ecb_suite, sizeof(aes_ecb_suite)/sizeof(aes_ecb_suite[0])) == E_FAIL) {
fail++;
|
Fix showing security editor for unnamed objects
|
@@ -567,6 +567,9 @@ BOOL STDMETHODCALLTYPE PhSecurityInformation3_GetFullResourceName(
{
PhSecurityInformation3 *this = (PhSecurityInformation3 *)This;
+ if (PhIsNullOrEmptyString(this->Context->ObjectName))
+ *ppszResourceName = PhGetString(this->Context->ObjectType);
+ else
*ppszResourceName = PhGetString(this->Context->ObjectName);
return TRUE;
|
doc: Update note for the directory of UOS image
|
@@ -312,8 +312,8 @@ For the User OS, we are using the same `Clear Linux`_ release version as the Ser
-k /lib/modules/kernel/default-iot-lts2018
.. note::
- The image of UOS can be stored in other directories instead of "/root",
- and please remember to modify it in "launch_uos.sh" too.
+ The image of UOS can be stored in other directories instead of ``/root/``,
+ and please remember to modify the directory of image in ``launch_uos.sh`` too.
Start the User OS (UOS)
***********************
|
admin/meta-packages: install python3 runtime on compute nodes
|
@@ -92,10 +92,12 @@ Requires: numactl
%if 0%{?centos_version} || 0%{?rhel_version}
Requires: cairo-devel
Requires: libpciaccess
+Requires: python34
%endif
%if 0%{?sles_version} || 0%{?suse_version}
Requires: libcairo2
Requires: libpciaccess0
+Requires: python3
%endif
%description -n %{PROJ_NAME}-base-compute
Collection of compute node base packages
|
PM: updated default profile and updated property namespace documentation
|
{
"uid":"default",
- "description":"default properties applied to each request",
+ "description":"default properties: profile matches ANY request",
"policy_type": "profile",
"priority": 0,
"properties":{
- "cached": {
+ "transport": {
+ "value": "reliable",
+ "precedence": 0
+ },
+ "low_latency": {
"value": false,
- "precedence": 0,
- "score": 0
+ "precedence": 0
},
- "local_interface": {
+ "capacity_profile": {
+ "value": "best_effort",
+ "precedence": 0
+ },
+ "high_availabity": {
"value": true,
- "precedence": 1,
+ "precedence": 0
+ },
+ "dscp_value": {
+ "value": 0,
+ "precedence": 0
+ },
+ "__cached": {
+ "value": false,
+ "precedence": 0,
"score": 0
},
"remote_ip": {
"value": null,
"precedence": 0,
"score": 0
- },
- "secure": {
- "value": false,
- "precedence": 0,
- "score": 0
- },
- "transport": {
- "value": "reliable",
- "precedence": 0,
- "score": 0
}
}
}
|
optimize the null pointer judgment of eb
|
@@ -48,8 +48,10 @@ static esp_err_t wifi_ap_receive(void *buffer, uint16_t len, void *eb)
static void wifi_free(void *h, void* buffer)
{
+ if (buffer) {
esp_wifi_internal_free_rx_buffer(buffer);
}
+}
static esp_err_t wifi_transmit(void *h, void *buffer, size_t len)
{
|
Del launcher when flashing new one from SD
|
@@ -122,6 +122,7 @@ bool parse_flash_metadata(uint32_t offset, GameInfo &info) {
bool parse_file_metadata(FIL &fh, GameInfo &info) {
BlitGameHeader header;
UINT bytes_read;
+ bool result = false;
f_lseek(&fh, 0);
f_read(&fh, &header, sizeof(header), &bytes_read);
@@ -156,11 +157,20 @@ bool parse_file_metadata(FIL &fh, GameInfo &info) {
memcpy(info.title, raw_meta.title, sizeof(info.title));
memcpy(info.author, raw_meta.author, sizeof(info.author));
- return true;
+ result = true;
}
+
+ // read category
+ res = f_read(&fh, buf, 8, &bytes_read);
+ if(bytes_read == 8 && memcmp(buf, "BLITTYPE", 8) == 0) {
+ RawTypeMetadata type_meta;
+ f_read(&fh, &type_meta, sizeof(RawTypeMetadata), &bytes_read);
+ memcpy(info.category, type_meta.category, sizeof(info.category));
}
- return false;
+ }
+
+ return result;
}
int calc_num_blocks(uint32_t size) {
@@ -371,6 +381,9 @@ bool launch_game_from_sd(const char *path) {
// new version is bigger, erase old one
erase_qspi_flash(flash_game.offset / qspi_flash_sector_size, flash_game.size);
}
+ } else if(strcmp(flash_game.category, "launcher") == 0 && strcmp(meta.category, "launcher") == 0) {
+ // flashing a launcher, remove previous launchers
+ erase_qspi_flash(flash_game.offset / qspi_flash_sector_size, flash_game.size);
}
}
}
|
some endian fixes on detection of replay counter
|
@@ -1403,7 +1403,7 @@ if(eapauth->type == EAPOL_KEY)
{
wpak = (wpakey_t*)(eapauthptr +EAPAUTH_SIZE);
keyinfo = (getkeyinfo(ntohs(wpak->keyinfo)));
- rc = byte_swap_64(wpak->replaycount);
+ rc = be64toh(wpak->replaycount);
if(keyinfo == 1)
{
if((authlen == 95) && (memcmp(macfrx->addr1, &mac_mysta, 6) == 0))
|
Bugfix for En_getaveragepatternvalue()
Fixes a bug where 0 was not considered to be a valid pattern index.
|
@@ -4525,7 +4525,7 @@ int DLLEXPORT EN_getaveragepatternvalue(EN_Project p, int index, double *value)
*value = 0.0;
if (!p->Openflag) return 102;
- if (index < 1 || index > net->Npats) return 205;
+ if (index < 0 || index > net->Npats) return 205;
for (i = 0; i < Pattern[index].Length; i++)
{
*value += (double)Pattern[index].F[i];
|
hfuzz-cc/: missing --wrap=strlcpy
|
@@ -450,6 +450,7 @@ static int ldMode(int argc, char** argv) {
args[j++] = "-Wl,--wrap=bcmp";
args[j++] = "-Wl,--wrap=memmem";
args[j++] = "-Wl,--wrap=strcpy";
+ args[j++] = "-Wl,--wrap=strlcpy";
/* Apache httpd */
args[j++] = "-Wl,--wrap=ap_cstr_casecmp";
args[j++] = "-Wl,--wrap=ap_cstr_casecmpn";
|
u3: refactors disabled set treap jet (+int:in)
|
*/
#include "all.h"
-
/* functions
*/
u3_noun
u3_noun l_a, n_a, r_a, lr_a;
u3_noun l_b, n_b, r_b, lr_b;
u3_noun c;
+ u3x_cell(a, &n_a, &lr_a);
+ u3x_cell(b, &n_b, &lr_b);
- if ( (c3n == u3r_cell(a, &n_a, &lr_a)) ) {
- return u3m_bail(c3__exit);
- }
- else if ( (c3n == u3r_cell(b, &n_b, &lr_b)) ) {
- return u3m_bail(c3__exit);
- }
- else {
if ( c3y == u3qc_mor(n_b, n_a) ) {
c = a; a = b; b = c;
c = n_a; n_a = n_b; n_b = c;
c = lr_a; lr_a = lr_b; lr_b = c;
}
- if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) {
- return u3m_bail(c3__exit);
- }
- else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) {
- return u3m_bail(c3__exit);
- }
- else if ( c3y == u3r_sing(n_a, n_b) ) {
+
+ u3x_cell(lr_a, &l_a, &r_a);
+ u3x_cell(lr_b, &l_b, &r_b);
+
+ if ( c3y == u3r_sing(n_a, n_b) ) {
return u3nt(u3k(n_a),
u3qdi_int(l_a, l_b),
u3qdi_int(r_a, r_b));
}
else if ( c3y == u3qc_gor(n_b, n_a) ) {
- return u3qdi_uni(u3qdi_int(l_a,
- u3nt(n_b,
- l_b,
- u3_nul)),
- u3qdi_int(a,
- r_b));
+ return u3qdi_uni(u3qdi_int(l_a, u3nt(n_b, l_b, u3_nul)),
+ u3qdi_int(a, r_b));
}
else {
- return u3qdi_uni(u3qdi_int(r_a,
- u3nt(n_b,
- u3_nul,
- r_b)),
- u3qdi_int(a,
- l_b));
- }
+ return u3qdi_uni(u3qdi_int(r_a, u3nt(n_b, u3_nul, r_b)),
+ u3qdi_int(a, l_b));
}
}
}
+
+// XX disabled in tree.c, reference counts presumed wrong
+//
u3_noun
u3wdi_int(u3_noun cor)
{
u3_noun a, b;
-
- if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) {
- return u3m_bail(c3__exit);
- } else {
+ u3x_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0);
return u3qdi_int(a, b);
}
- }
|
imageInput: adds clear button
fixes urbit/landscape#785
|
@@ -8,7 +8,8 @@ import {
Button,
Label,
BaseInput,
- Text
+ Text,
+ Icon
} from '@tlon/indigo-react';
import useStorage from '~/logic/lib/useStorage';
@@ -84,6 +85,31 @@ const errorRetry = (meta, uploading, clickUploadButton) => {
return null;
};
+const clearButton = (field, uploading, clearEvt) => {
+ if (field.value && !uploading) {
+ return (
+ <Box
+ position='absolute'
+ right={0}
+ top={0}
+ px={1}
+ height='100%'
+ cursor='pointer'
+ onClick={clearEvt}
+ backgroundColor='white'
+ display='flex'
+ alignItems='center'
+ borderRadius='0 4px 4px 0'
+ border='1px solid'
+ borderColor='lightGray'
+ >
+ <Icon icon='X' />
+ </Box>
+ );
+ }
+ return null;
+};
+
export function ImageInput(props: ImageInputProps): ReactElement {
const { id, label, caption } = props;
const { uploadDefault, canUpload, uploading } = useStorage();
@@ -107,6 +133,11 @@ export function ImageInput(props: ImageInputProps): ReactElement {
const clickUploadButton = useCallback(() => {
ref.current?.click();
}, [ref]);
+
+ const clearEvt = useCallback(() => {
+ setValue('');
+ }, []);
+
return (
<Box display="flex" flexDirection="column" {...props}>
<Label htmlFor={id}>{label}</Label>
@@ -117,6 +148,7 @@ export function ImageInput(props: ImageInputProps): ReactElement {
) : null}
<Row mt="2" alignItems="flex-end" position='relative' width='100%'>
{prompt(field, uploading, meta, clickUploadButton)}
+ {clearButton(field, uploading, clearEvt)}
{uploadingStatus(uploading, meta)}
{errorRetry(meta, uploading, clickUploadButton)}
<Box background='white' borderRadius={2} width='100%'>
|
core/test: Test pre-init memory reservations
|
@@ -74,7 +74,7 @@ bool lock_held_by_me(struct lock *l)
return l->lock_val;
}
-#define TEST_HEAP_ORDER 12
+#define TEST_HEAP_ORDER 14
#define TEST_HEAP_SIZE (1ULL << TEST_HEAP_ORDER)
static void add_mem_node(uint64_t start, uint64_t len)
@@ -203,14 +203,17 @@ int main(void)
buf = real_malloc(1024*1024);
add_mem_node((unsigned long)buf, 1024*1024);
- /* Now convert. */
- mem_region_init();
-
- /* create our reservations */
+ /* add pre-init reservations */
for (i = 0; i < ARRAY_SIZE(test_regions); i++)
mem_reserve_hw(test_regions[i].name,
test_regions[i].addr, 0x1000);
+ /* Now convert. */
+ mem_region_init();
+
+ /* add a post-init reservation */
+ mem_reserve_hw("test.4", 0x5000, 0x1000);
+
/* release unused */
mem_region_release_unused();
@@ -218,7 +221,7 @@ int main(void)
mem_region_add_dt_reserved();
/* ensure we can't create further reservations */
- r = new_region("test.4", 0x5000, 0x1000, NULL, REGION_RESERVED);
+ r = new_region("test.5", 0x5000, 0x1000, NULL, REGION_RESERVED);
assert(!add_region(r));
/* check old property-style reservations */
|
BUFR subset extraction: improve error message
|
@@ -172,7 +172,11 @@ static int pack_long(grib_accessor* a, const long* val, size_t *len)
v[0]=1;
err=grib_pack_long(self->packAccessor,v,&l);
- if (err) return err;
+ if (err) {
+ if (err == GRIB_ENCODING_ERROR)
+ grib_context_log(a->context,GRIB_LOG_ERROR,"Could not extract subset(s).\n\tHint: Did you forget to set unpack=1?");
+ return err;
+ }
return err;
}
|
abis/mlibc: Fix deprecation notice in utsname.h
|
#define _ABIBITS_UTSNAME_T_H
#if __MLIBC_BUILDING_MLIBC
-#warning abis/mlibc/wait.h is deprecated. We suggest to use abis/linux/wait.h instead. \
+#warning abis/mlibc/utsname.h is deprecated. We suggest to use abis/linux/utsname.h instead. \
Note that this will potentially require kernel changes.
#endif
|
Added Coding Style section on Type Casting.
|
@@ -357,6 +357,34 @@ All headers should contain:
#pragma once
+#### Type Conventions
+
+Because OpenEXR must deal properly with large images, whose width
+and/or height approach the maximum allowable in 32-bit signed
+integers, take special care that integer arithmatic doesn't overlow,
+and make it as clear as possible exactly what the code is doing,
+especially in the edge cases.
+
+To clarify the intention, prefer to cast between types using
+``static_cast<>()`` rather than the basic C-style ``()`` notation:
+
+ // good:
+ size_t x = static_cast <size_t> (y);
+
+ // bad:
+ x = (size_t) y;
+ x = size_t (y);
+
+Prefer to use ``std::numeric_limits<>`` instead of preprocesser
+define's such as ``INT_MAX``:
+
+ // good:
+ if (x > std::numeric_limits<int>::max())
+ std::cout << "That's too freakin' high.\n";
+
+ // bad:
+ if (x > INT_MAX)
+
#### Copyright Notices
All new source files should begin with a copyright and license stating:
|
Correct English grammar and typo errors
record -> recording
specifiy -> specify
|
@@ -547,7 +547,7 @@ static void smart_usage(void)
fprintf(stderr, " Performs a circular log style test where a fixed number of fixed\n");
fprintf(stderr, " length records are written and then overwritten with new data.\n");
fprintf(stderr, " Uses the -r, -e and -t options to specify the parameters of the\n");
- fprintf(stderr, " record geometry and update operation. The COUNT parameter sets\n");
+ fprintf(stderr, " recording geometry and update operation. The COUNT parameter sets\n");
fprintf(stderr, " the number of record updates to perform.\n\n");
fprintf(stderr, " -s SEEKCOUNT\n");
@@ -558,7 +558,7 @@ static void smart_usage(void)
fprintf(stderr, " -w WRITECOUNT\n");
fprintf(stderr, " Performs a seek/write/seek/read test where to validate the SMARTFS\n");
- fprintf(stderr, " seek/write operation. Uses the -l option to specifiy the number of\n");
+ fprintf(stderr, " seek/write operation. Uses the -l option to specify the number of\n");
fprintf(stderr, " test lines to write to the test file. The WRITECOUNT parameter sets\n");
fprintf(stderr, " the number of seek/write operations to perform.\n\n");
|
Add IRC channel information
|
@@ -37,6 +37,8 @@ For more information in the source, here are some pointers:
## Joining
-Developers welcome! To join in the discussion, please join the developer mailing list:
+Developers welcome!
+* Our developer mailing list:
http://lists.runtime.co/mailman/listinfo/dev-mcuboot_lists.runtime.co
+* Our IRC channel: http://irc.freenode.net, #mcuboot
|
Added granular java coverage support
issue:https://st.yandex-team.ru/DEVTOOLS-3383
|
@@ -13,7 +13,7 @@ def mkdir_p(path):
pass
-def main(source, output, java, prefix_filter, exclude_filter, jars_list, output_format):
+def main(source, output, java, prefix_filter, exclude_filter, jars_list, output_format, tar_output, agent_disposition):
reports_dir = 'jacoco_reports_dir'
mkdir_p(reports_dir)
with tarfile.open(source) as tf:
@@ -29,7 +29,6 @@ def main(source, output, java, prefix_filter, exclude_filter, jars_list, output_
mkdir_p(src_dir)
mkdir_p(cls_dir)
- agent_disposition = None
for jar in jars:
if jar.endswith('devtools-jacoco-agent.jar'):
agent_disposition = jar
@@ -50,7 +49,10 @@ def main(source, output, java, prefix_filter, exclude_filter, jars_list, output_
if not agent_disposition:
print>>sys.stderr, 'Can\'t find jacoco agent. Will not generate html report for java coverage.'
+ if tar_output:
report_dir = 'java.report.temp'
+ else:
+ report_dir = output
mkdir_p(report_dir)
if agent_disposition:
@@ -58,6 +60,7 @@ def main(source, output, java, prefix_filter, exclude_filter, jars_list, output_
agent_cmd += reports
subprocess.check_call(agent_cmd)
+ if tar_output:
with tarfile.open(output, 'w') as outf:
outf.add(report_dir, arcname='.')
@@ -72,5 +75,7 @@ if __name__ == '__main__':
parser.add_argument('--exclude-filter', action='store')
parser.add_argument('--jars-list', action='store')
parser.add_argument('--output-format', action='store', default="html")
+ parser.add_argument('--raw-output', dest='tar_output', action='store_false', default=True)
+ parser.add_argument('--agent-disposition', action='store')
args = parser.parse_args()
main(**vars(args))
|
Use QLatin1String in schedules API check
|
/*
- * Copyright (c) 2016 dresden elektronik ingenieurtechnik gmbh.
+ * Copyright (c) 2016-2019 dresden elektronik ingenieurtechnik gmbh.
* All rights reserved.
*
* The software in this package is published under the terms of the BSD
@@ -35,7 +35,7 @@ void DeRestPluginPrivate::initSchedules()
*/
int DeRestPluginPrivate::handleSchedulesApi(const ApiRequest &req, ApiResponse &rsp)
{
- if (req.path[2] != "schedules")
+ if (req.path[2] != QLatin1String("schedules"))
{
return REQ_NOT_HANDLED;
}
|
Fixing test execution for Travis CI in .travis.yml.
|
@@ -64,9 +64,9 @@ install:
script:
- if [[ "$DOCKER_DEPLOY" == "false" ]]; then
- cd python/test;
- python -m unittest discover -b;
- cd ../..;
+ cd python;
+ python setup.py test;
+ cd ..;
else
cd python;
cp -a ../src .;
|
change to call acquire_vm_cb() in main thread
Change the call to acquire_vm_cb() in luv.new_therad() to be made before
the thread is created in luv_new_thread().
|
@@ -277,7 +277,7 @@ static int luv_thread_tostring(lua_State* L)
static void luv_thread_cb(void* varg) {
//acquire vm and get top
luv_thread_t* thd = (luv_thread_t*)varg;
- lua_State* L = acquire_vm_cb();
+ lua_State* L = thd->args.L;
luv_ctx_t *ctx = luv_context(L);
//push lua function, thread entry
@@ -344,12 +344,16 @@ static int luv_new_thread(lua_State* L) {
}
thread->len = len;
+ thread->args.L = acquire_vm_cb();
#if LUV_UV_VERSION_GEQ(1, 26, 0)
ret = uv_thread_create_ex(&thread->handle, &options, luv_thread_cb, thread);
#else
ret = uv_thread_create(&thread->handle, luv_thread_cb, thread);
#endif
- if (ret < 0) return luv_error(L, ret);
+ if (ret < 0) {
+ release_vm_cb(thread->args.L);
+ return luv_error(L, ret);
+ }
return 1;
}
|
Add `transportTcpRemoteControlSupport`
cover all the paths with `transportSupportsCommandControl` function
|
@@ -587,6 +587,53 @@ transportTcpReconnect(void** state)
}
}
+static void
+transportTcpRemoteControlSupport(void** state)
+{
+ transport_t* t = NULL;
+ assert_false(transportSupportsCommandControl(t));
+
+ t = transportCreateTCP("127.0.0.1", "mom's apple pie recipe", TRUE, FALSE, NULL);
+ assert_non_null(t);
+ assert_false(transportSupportsCommandControl(t));
+ transportDestroy(&t);
+
+ t = transportCreateUdp("127.0.0.1", "12345");
+ assert_non_null(t);
+ assert_false(transportSupportsCommandControl(t));
+ transportDestroy(&t);
+
+ t = transportCreateSyslog();
+ assert_non_null(t);
+ assert_false(transportSupportsCommandControl(t));
+ transportDestroy(&t);
+
+ t = transportCreateShm();
+ assert_non_null(t);
+ assert_false(transportSupportsCommandControl(t));
+ transportDestroy(&t);
+
+ t = transportCreateFile("/tmp/my.path", CFG_BUFFER_FULLY);
+ assert_non_null(t);
+ assert_false(transportSupportsCommandControl(t));
+ transportDestroy(&t);
+
+ t = transportCreateUnix("/var/run/scope.sock");
+ assert_non_null(t);
+ assert_true(transportSupportsCommandControl(t));
+ transportDestroy(&t);
+
+ t = transportCreateTCP("127.0.0.1", "mom's apple pie recipe", FALSE, FALSE, NULL);
+ assert_non_null(t);
+ assert_true(transportSupportsCommandControl(t));
+ transportDestroy(&t);
+
+ t = transportCreateEdge();
+ assert_non_null(t);
+ assert_true(transportSupportsCommandControl(t));
+ transportDestroy(&t);
+}
+
int
main(int argc, char* argv[])
{
@@ -622,6 +669,7 @@ main(int argc, char* argv[])
cmocka_unit_test(transportSendForFileWritesToFileAfterFlushWhenFullyBuffered),
cmocka_unit_test(transportSendForFileWritesToFileImmediatelyWhenLineBuffered),
cmocka_unit_test(transportTcpReconnect),
+ cmocka_unit_test(transportTcpRemoteControlSupport),
cmocka_unit_test(dbgHasNoUnexpectedFailures),
};
return cmocka_run_group_tests(tests, groupSetup, groupTeardown);
|
docs: explicitly note that timer alarms are not recurring
Merges
|
@@ -67,7 +67,8 @@ After the alarm is enabled and the timer reaches the alarm value, depending on c
.. note::
- The alarm will be triggered immediately, if an alarm value is set and the timer has already passed this value.
+ * The alarm will be triggered immediately, if an alarm value is set and the timer has already passed this value.
+ * Once triggered the alarm will be disabled automatically and needs to be re-armed to trigger again.
To check what alarm value has been set up, call :cpp:func:`timer_get_alarm_value`.
|
Move NsDepth inside function
|
#define LDSCOPE_IN_HOST_NS "/usr/lib/appscope/ldscope" // TODO
#define LDSCOPE_CONFIG_IN_CHILD "/tmp/scope_filter" // TODO
#define LDSCOPE_CONFIG_IN_HOST "/usr/lib/appscope/scope_filter" // TODO
-#define VALID_NS_DEPTH 2
#define SCOPE_CRONTAB "* * * * * root /tmp/scope_att.sh\n"
#define SCOPE_CRON_SCRIPT "#! /bin/bash\ntouch /tmp/scope_test\nrm /etc/cron.d/scope_cron\n%s start -f < %s/scope_filter\n"
#define SCOPE_CRON_PATH "/etc/cron.d/scope_cron"
@@ -142,13 +141,16 @@ cleanupMem:
*/
bool
nsIsPidInChildNs(pid_t pid, pid_t *nsPid) {
+ const int validNsDepth = 2;
char path[PATH_MAX] = {0};
char buffer[4096];
bool status = FALSE;
int lastNsPid = 0;
int nsDepth = 0;
- if (scope_snprintf(path, sizeof(path), "/proc/%d/status", pid) < 0) return FALSE;
+ if (scope_snprintf(path, sizeof(path), "/proc/%d/status", pid) < 0) {
+ return FALSE;
+ }
FILE *fstream = scope_fopen(path, "r");
@@ -176,9 +178,9 @@ nsIsPidInChildNs(pid_t pid, pid_t *nsPid) {
/*
* TODO: we currently tested nesting depth
- * equals VALID_NS_DEPTH, check more depth level
+ * equals validNsDepth, check more depth level
*/
- if (nsDepth == VALID_NS_DEPTH) {
+ if (nsDepth == validNsDepth) {
status = TRUE;
*nsPid = lastNsPid;
}
|
Added prototypes and data types for sceClibMspace* functions.
|
extern "C" {
#endif
+/**
+ * A handle for a managed memory space.
+ */
+typedef void* SceClibMspace;
+
+/**
+ * Structure for stats of SceClibMspace
+ */
+typedef struct SceClibMspaceStats {
+ SceSize capacity; //!< Capacity of the Mspace
+ SceSize unk; //!< Unknown, value is equal to capacity
+ SceSize peak_in_use; //!< Peak memory allocated
+ SceSize current_in_use; //!< Current memory allocated
+} SceClibMspaceStats;
+
/**
* Run bkpt #0x88 and end the process in state -1
*
@@ -51,6 +66,22 @@ int sceClibMemcmp(const void *s1, const void *s2, SceSize len);
void *sceClibMemchr(const void *src, int ch, SceSize len);
+SceClibMspace sceClibMspaceCreate(void* memblock, SceSize size);
+void sceClibMspaceDestroy(SceClibMspace mspace);
+
+SceSize sceClibMspaceMallocUsableSize(void *ptr);
+SceBool sceClibMspaceIsHeapEmpty(SceClibMspace mspace);
+
+void sceClibMspaceMallocStats(SceClibMspace mspace, SceClibMspaceStats *stats);
+void sceClibMspaceMallocStatsFast(SceClibMspace mspace, SceClibMspaceStats *stats);
+
+void *sceClibMspaceMalloc(SceClibMspace mspace, SceSize size);
+void *sceClibMspaceCalloc(SceClibMspace mspace, SceSize num, SceSize size);
+void *sceClibMspaceRealloc(SceClibMspace mspace, void *ptr, SceSize size);
+void *sceClibMspaceReallocalign(SceClibMspace mspace, void *ptr, SceSize size, SceSize alignment);
+void *sceClibMspaceMemalign(SceClibMspace mspace, SceSize alignment, SceSize size);
+void sceClibMspaceFree(SceClibMspace mspace, void *ptr);
+
#ifdef __cplusplus
}
#endif
|
Remove breaks and replaces, not applicable to Debian
|
@@ -22,8 +22,6 @@ Package: libstlink1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libstlink
-Replaces: libstlink
Description: OpenSource ST-Link tools replacement.
Flashing tools for STMicroelectronics STM32VL and STM32L. The transport layers
STLINKv1 and STLINKv2 are supported.
@@ -33,8 +31,6 @@ Description: OpenSource ST-Link tools replacement.
Package: stlink-tools
Architecture: any
Depends: libstlink1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Breaks: libstlink
-Replaces: libstlink
Description: OpenSource ST-Link tools replacement.
Flashing tools for STMicroelectronics STM32VL and STM32L. The transport layers
STLINKv1 and STLINKv2 are supported.
|
driver: bmm150: Fix comment
Fix cut and paste error.
BRANCH=reef
TEST=compile
|
@@ -232,7 +232,7 @@ void bmm150_normalize(const struct motion_sensor_t *s,
/* X and Y are two's complement 13 bits vectors */
raw[X] = ((int16_t)(data[0] | (data[1] << 8))) >> 3;
raw[Y] = ((int16_t)(data[2] | (data[3] << 8))) >> 3;
- /* X and Y are two's complement 15 bits vectors */
+ /* Z are two's complement 15 bits vectors */
raw[Z] = ((int16_t)(data[4] | (data[5] << 8))) >> 1;
/* RHALL value to compensate with - unsigned 14 bits */
|
Use AC_LINK_IFELSE to find function in non-standard library
|
@@ -171,8 +171,24 @@ if test "x${request_openssl}" != "xno"; then
AC_MSG_NOTICE($OPENSSL_PKG_ERRORS)
fi
# Until OpenSSL gains mainline support for QUIC, check for a patched version.
- AC_CHECK_LIB([ssl], [SSL_is_quic], [have_openssl_quic=yes],
- [have_openssl_quic=no], [$OPENSSL_LIBS])
+ save_CFLAGS="$CFLAGS"
+ save_LIBS="$LIBS"
+ CFLAGS="$OPENSSL_CFLAGS $CFLAGS"
+ LIBS="$OPENSSL_LIBS $LIBS"
+
+ AC_MSG_CHECKING([for SSL_is_quic])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <openssl/ssl.h>
+ ]], [[
+ SSL *ssl = NULL;
+ SSL_is_quic(ssl);
+ ]])],
+ [AC_MSG_RESULT([yes]); have_openssl_quic=yes],
+ [AC_MSG_RESULT([no]); have_openssl_quic=no])
+
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+
if test "x${have_openssl}${have_openssl_quic}" = "xyesno"; then
AC_MSG_NOTICE([openssl does not have QUIC interface, disabling it])
have_openssl=no
@@ -208,11 +224,23 @@ AM_CONDITIONAL([HAVE_GNUTLS], [ test "x${have_gnutls}" = "xyes" ])
# BoringSSL (required for libngtcp2_crypto_boringssl)
have_boringssl=no
if test "x${request_boringssl}" != "xno"; then
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BORINGSSL_LIBS"
- AC_CHECK_LIB([ssl], [SSL_set_quic_early_data_context],
- [have_boringssl=yes], [have_boringssl=no], [$BORINGSSL_LIBS])
- LDFLAGS="$save_LDFLAGS"
+ save_CFLAGS="$CFLAGS"
+ save_LIBS="$LIBS"
+ CFLAGS="$BORINGSSL_CFLAGS"
+ LIBS="$BORINGSSL_LIBS $LIBS"
+
+ AC_MSG_CHECKING([for SSL_set_quic_early_data_context])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <openssl/ssl.h>
+ ]], [[
+ SSL *ssl = NULL;
+ SSL_set_quic_early_data_context(ssl, NULL, 0);
+ ]])],
+ [AC_MSG_RESULT([yes]); have_boringssl=yes],
+ [AC_MSG_RESULT([no]); have_boringssl=no])
+
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
fi
if test "x${request_boringssl}" = "xyes" &&
|
Prototype bitmask constants for recursive damage.
|
@@ -1225,19 +1225,11 @@ typedef enum
typedef enum
{
- /*
- Damage over time mode enum.
- Damon V. Caskey
- 2013-12-27
- */
-
- DOT_MODE_OFF, //Disable.
- DOT_MODE_HP, //Drain HP.
- DOT_MODE_HP_MP, //Drain HP and MP.
- DOT_MODE_MP, //Drain mp.
- DOT_MODE_NON_LETHAL_HP, //Drain HP, but do not kill entity.
- DOT_MODE_NON_LETHAL_HP_MP //Drain HP and MP, but do not kill entity.
-} e_dot_mode;
+ DAMAGE_RECURSIVE_NONE = (1 << 0),
+ DAMAGE_RECURSIVE_HP = (1 << 1),
+ DAMAGE_RECURSIVE_MP = (1 << 2),
+ DAMAGE_RECURSIVE_NON_LETHAL = (1 << 3)
+} e_damage_recursive;
typedef enum
{
@@ -1666,7 +1658,7 @@ typedef struct s_damage_recursive
{
int force; // Damage force per tick.
int index; // Index.
- e_dot_mode mode; // Mode.
+ e_damage_recursive mode; // Mode.
int rate; // Tick delay.
unsigned int tick; // Time of next tick.
unsigned int time; // Time to expire.
|
fixed freeing of gsl splines
|
@@ -38,8 +38,6 @@ void ccl_cosmology_compute_hmfparams(ccl_cosmology * cosmo, int *status)
gsl_spline * alphahmf = gsl_spline_alloc(D_SPLINE_TYPE, nd);
*status = gsl_spline_init(alphahmf, lgdelta, alpha, nd);
if (*status){
- free(delta);
- free(alpha);
gsl_spline_free(alphahmf);
*status = CCL_ERROR_SPLINE ;
strcpy(cosmo->status_message, "ccl_massfunc.c: ccl_cosmology_compute_hmfparams(): Error creating alpha(D) spline\n");
@@ -49,8 +47,7 @@ void ccl_cosmology_compute_hmfparams(ccl_cosmology * cosmo, int *status)
gsl_spline * betahmf = gsl_spline_alloc(D_SPLINE_TYPE, nd);
*status = gsl_spline_init(betahmf, lgdelta, beta, nd);
if (*status){
- free(delta);
- free(beta);
+ gsl_spline_free(alphahmf);
gsl_spline_free(betahmf);
*status = CCL_ERROR_SPLINE ;
strcpy(cosmo->status_message, "ccl_massfunc.c: ccl_cosmology_compute_hmfparams(): Error creating beta(D) spline\n");
@@ -60,8 +57,8 @@ void ccl_cosmology_compute_hmfparams(ccl_cosmology * cosmo, int *status)
gsl_spline * gammahmf = gsl_spline_alloc(D_SPLINE_TYPE, nd);
*status = gsl_spline_init(gammahmf, lgdelta, gamma, nd);
if (*status){
- free(delta);
- free(gamma);
+ gsl_spline_free(alphahmf);
+ gsl_spline_free(betahmf);
gsl_spline_free(gammahmf);
*status = CCL_ERROR_SPLINE ;
strcpy(cosmo->status_message, "ccl_massfunc.c: ccl_cosmology_compute_hmfparams(): Error creating gamma(D) spline\n");
@@ -71,8 +68,9 @@ void ccl_cosmology_compute_hmfparams(ccl_cosmology * cosmo, int *status)
gsl_spline * phihmf = gsl_spline_alloc(D_SPLINE_TYPE, nd);
*status = gsl_spline_init(phihmf, lgdelta, phi, nd);
if (*status){
- free(delta);
- free(phi);
+ gsl_spline_free(alphahmf);
+ gsl_spline_free(betahmf);
+ gsl_spline_free(gammahmf);
gsl_spline_free(phihmf);
*status = CCL_ERROR_SPLINE ;
strcpy(cosmo->status_message, "ccl_massfunc.c: ccl_cosmology_compute_hmfparams(): Error creating phi(D) spline\n");
@@ -82,8 +80,6 @@ void ccl_cosmology_compute_hmfparams(ccl_cosmology * cosmo, int *status)
gsl_spline * etahmf = gsl_spline_alloc(D_SPLINE_TYPE, nd);
*status = gsl_spline_init(etahmf, lgdelta, eta, nd);
if (*status){
- free(delta);
- free(eta);
gsl_spline_free(etahmf);
*status = CCL_ERROR_SPLINE ;
strcpy(cosmo->status_message, "ccl_massfunc.c: ccl_cosmology_compute_hmfparams(): Error creating eta(D) spline\n");
|
Xfail test_dist_train_snapshot
|
@@ -4525,6 +4525,7 @@ def test_dist_train_auc_weight(loss_func):
output_file_switch='--test-err-log'))]
+@pytest.mark.xfail(reason='Boost from average for distributed training')
@pytest.mark.parametrize('schema,train', [('quantized://', 'train_small_x128_greedylogsum.bin'), ('', 'train_small')])
def test_dist_train_snapshot(schema, train):
train_cmd = make_deterministic_train_cmd(
|
fixed setting EAPOL length field in sent EAP over TLS packet written to PCAPNG
|
@@ -857,8 +857,14 @@ return;
/*===========================================================================*/
static inline void writeepbown_peap(int fd, uint8_t *innerpacket, size_t innerpacketlen)
{
+eapauth_t *eapauth;
+exteap_t *exteap;
+eapauth = (eapauth_t*)(epbown +EPB_SIZE +HDRRT_SIZE +MAC_SIZE_QOS +LLC_SIZE);
+exteap = (exteap_t*)innerpacket;
+eapauth->len = exteap->len;
memcpy(epbown +EPB_SIZE +HDRRT_SIZE +MAC_SIZE_QOS +LLC_SIZE +EAPAUTH_SIZE, innerpacket, innerpacketlen);
packetlenown = HDRRT_SIZE +MAC_SIZE_QOS +LLC_SIZE +EAPAUTH_SIZE +innerpacketlen;
+timestamp++;
writeepbown(fd);
return;
}
|
parser json UPDATE matching meta/attr to nodes
Handle all 4 variants of opaque and standard
nodes.
|
@@ -1149,15 +1149,45 @@ lydjson_parse_attribute(struct lyd_json_ctx *lydctx, struct lyd_node *attr_node,
const char *opaq_name;
size_t opaq_name_len;
- /* parse as an attribute to a node */
- if (!attr_node && snode) {
+ if (!snode && !prefix) {
+ /* set the prefix */
+ if (parent) {
+ lydjson_get_node_prefix(parent, NULL, 0, &prefix, &prefix_len);
+ } else {
+ prefix = "";
+ prefix_len = 0;
+ }
+ }
+
+ /* parse as an attribute to a (opaque) node */
+ if (!attr_node) {
/* try to find the instance */
- for (struct lyd_node *iter = *first_p; iter; iter = iter->next) {
- if (iter->schema == snode) {
- attr_node = iter;
+ LY_LIST_FOR(*first_p, attr_node) {
+ if (snode) {
+ if (attr_node->schema) {
+ if (attr_node->schema == snode) {
+ break;
+ }
+ } else {
+ if (!strcmp(LYD_NAME(attr_node), snode->name) &&
+ !strcmp(((struct lyd_node_opaq *)attr_node)->name.module_name, snode->module->name)) {
break;
}
}
+ } else {
+ if (attr_node->schema) {
+ if (!ly_strncmp(LYD_NAME(attr_node), name, name_len) &&
+ !ly_strncmp(attr_node->schema->module->name, prefix, prefix_len)) {
+ break;
+ }
+ } else {
+ if (!ly_strncmp(LYD_NAME(attr_node), name, name_len) &&
+ !ly_strncmp(((struct lyd_node_opaq *)attr_node)->name.module_name, prefix, prefix_len)) {
+ break;
+ }
+ }
+ }
+ }
}
if (!attr_node) {
/* parse just as an opaq node with the name beginning with @,
|
libdriverkit: adding missing header file changes
|
@@ -24,6 +24,13 @@ errval_t driverkit_hwmodel_frame_alloc(struct capref *dst,
size_t bytes, int32_t dstnode,
int32_t *nodes);
+errval_t driverkit_hwmodel_get_map_conf(struct capref dst,
+ int32_t nodeid,
+ char *ret_conf_buf, size_t ret_conf_size,
+ genpaddr_t *ret_addr);
+
+
+
errval_t driverkit_hwmodel_vspace_map(int32_t nodeid, struct capref frame,
vregion_flags_t flags, struct dmem *dmem);
@@ -40,6 +47,9 @@ errval_t driverkit_hwmodel_vspace_map_fixed(int32_t nodeid,
*/
errval_t driverkit_hwmodel_vspace_alloc(struct capref frame,
int32_t nodeid, genvaddr_t *addr);
+errval_t driverkit_hwmode_vspace_get_vaddr(struct capref frame,
+ int32_t nodeid, genvaddr_t *addr,
+ bool *already_mapped);
int32_t driverkit_hwmodel_get_my_node_id(void);
int32_t driverkit_hwmodel_lookup_dram_node_id(void);
@@ -50,10 +60,6 @@ errval_t driverkit_hwmodel_reverse_resolve(struct capref dst,
int32_t nodeid,
genpaddr_t *ret_addr);
-errval_t driverkit_hwmodel_alias_conf(struct capref dst,
- int32_t nodeid,
- char *ret_conf, size_t ret_conf_size,
- genpaddr_t *ret_addr);
|
Save Heap location and size in config
|
@@ -81,4 +81,9 @@ void HeapLocation(unsigned char*& baseAddress, unsigned int& sizeInBytes)
baseAddress = pManagedHeap;
sizeInBytes = managedHeapSize;
+
+
+ // Update System config with Heap location and size
+ HalSystemConfig.RAM1.Size = managedHeapSize;
+ HalSystemConfig.RAM1.Base = (unsigned int)pManagedHeap;
}
|
perf-tools/mpiP: preserve compiler_family in install path when redefined
|
@@ -40,7 +40,7 @@ BuildRequires: binutils-devel
BuildRequires: python
# Default library install path
-%define install_path %{OHPC_LIBS}/%{compiler_family}/%{mpi_family}/%{pname}/%version
+%global install_path %{OHPC_LIBS}/%{compiler_family}/%{mpi_family}/%{pname}/%version
%description
@@ -148,3 +148,4 @@ rm -rf $RPM_BUILD_ROOT/%{install_path}/lib/*.a
* Wed Feb 22 2017 Adrian Reber <areber@redhat.com> - 3.4.1-1
- Switching to %%ohpc_compiler macro
+
|
refactored - now with status output
|
@@ -36,7 +36,6 @@ endif
$(CC) $(CFLAGS) -o wlanhcx2essid wlanhcx2essid.c
$(CC) $(CFLAGS) -o wlanhcx2ssid wlanhcx2ssid.c
$(CC) $(CFLAGS) -o wlanhcx2john wlanhcx2john.c
- $(CC) $(CFLAGS) -o wlanhcx2key wlanhcx2key.c -lcrypto
$(CC) $(CFLAGS) -o wlanhcxinfo wlanhcxinfo.c
$(CC) $(CFLAGS) -o wlanhcxmnc wlanhcxmnc.c
$(CC) $(CFLAGS) -o whoismac whoismac.c -lcurl
@@ -64,7 +63,6 @@ endif
install -D -m 0755 wlanhcx2essid $(INSTALLDIR)/wlanhcx2essid
install -D -m 0755 wlanhcx2ssid $(INSTALLDIR)/wlanhcx2ssid
install -D -m 0755 wlanhcx2john $(INSTALLDIR)/wlanhcx2john
- install -D -m 0755 wlanhcx2key $(INSTALLDIR)/wlanhcx2key
install -D -m 0755 wlanhcxinfo $(INSTALLDIR)/wlanhcxinfo
install -D -m 0755 wlanhcxmnc $(INSTALLDIR)/wlanhcxmnc
install -D -m 0755 whoismac $(INSTALLDIR)/whoismac
@@ -84,7 +82,6 @@ endif
rm -f wlanhcx2essid
rm -f wlanhcx2ssid
rm -f wlanhcx2john
- rm -f wlanhcx2key
rm -f wlanhcxinfo
rm -f wlanhcxmnc
rm -f whoismac
@@ -107,7 +104,6 @@ endif
rm -f wlanhcx2essid
rm -f wlanhcx2ssid
rm -f wlanhcx2john
- rm -f wlanhcx2key
rm -f wlanhcxinfo
rm -f wlanhcxmnc
rm -f whoismac
@@ -130,7 +126,6 @@ endif
rm -f $(INSTALLDIR)/wlanhcx2essid
rm -f $(INSTALLDIR)/wlanhcx2ssid
rm -f $(INSTALLDIR)/wlanhcx2john
- rm -f $(INSTALLDIR)/wlanhcx2key
rm -f $(INSTALLDIR)/wlanhcxinfo
rm -f $(INSTALLDIR)/wlanhcxmnc
rm -f $(INSTALLDIR)/whoismac
|
Don't show code completion on console
|
@@ -273,6 +273,9 @@ class EditorViewController: NSViewController, SyntaxTextViewDelegate, NSTextView
if (notification.object as? TextView) == textView.contentTextView {
textView.textViewDidChangeSelection(notification)
completeCode()
+ } else if (notification.object as? NSTextView) == consoleTextView {
+ completions = []
+ suggestions = []
}
}
|
Rename mbedtls_get_mode() to mbedtls_ssl_get_mode()
|
@@ -1715,7 +1715,7 @@ void mbedtls_ssl_conf_psk_cb( mbedtls_ssl_config *conf,
}
#endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
-static inline mbedtls_ssl_mode_t mbedtls_get_mode(
+static inline mbedtls_ssl_mode_t mbedtls_ssl_get_mode(
#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
int encrypt_then_mac,
#endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */
@@ -1771,7 +1771,7 @@ mbedtls_ssl_mode_t mbedtls_ssl_get_mode_from_transform(
const mbedtls_ssl_transform *transform )
{
#if defined(MBEDTLS_USE_PSA_CRYPTO)
- return mbedtls_get_mode(
+ return mbedtls_ssl_get_mode(
#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
transform->encrypt_then_mac,
#endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */
@@ -1780,7 +1780,7 @@ mbedtls_ssl_mode_t mbedtls_ssl_get_mode_from_transform(
mbedtls_cipher_mode_t mode =
mbedtls_cipher_get_cipher_mode( &transform->cipher_ctx_enc );
- return mbedtls_get_mode(
+ return mbedtls_ssl_get_mode(
#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
transform->encrypt_then_mac,
#endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */
@@ -1802,7 +1802,7 @@ mbedtls_ssl_mode_t mbedtls_ssl_get_mode_from_ciphersuite(
status = mbedtls_ssl_cipher_to_psa( suite->cipher, 0, &alg, &type, &size );
if( status == PSA_SUCCESS )
- return mbedtls_get_mode(
+ return mbedtls_ssl_get_mode(
#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
encrypt_then_mac,
#endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */
@@ -1812,7 +1812,7 @@ mbedtls_ssl_mode_t mbedtls_ssl_get_mode_from_ciphersuite(
mbedtls_cipher_info_from_type( suite->cipher );
if( cipher != NULL )
- return mbedtls_get_mode(
+ return mbedtls_ssl_get_mode(
#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
encrypt_then_mac,
#endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */
|
tools:fpgad fix double free memory
Changes:
-Bitsteam buffer freed twice in case of corrupted bitstream
|
@@ -255,7 +255,9 @@ int read_bitstream(const char *filename, struct bitstream_info *info)
return 0;
out_free:
+ if (info->data)
free((void *)info->data);
+ info->data = NULL;
out_close:
fclose(f);
return -1;
@@ -274,7 +276,8 @@ void *ap6_thread(void *thread_context)
fpga_result res;
uint32_t num_matches = 0;
- struct bitstream_info null_gbs_info = {0};
+ struct bitstream_info null_gbs_info ;
+ memset(&null_gbs_info, 0, sizeof(null_gbs_info));
ON_GOTO(c->config->num_null_gbs == 0, out_exit, "no NULL bitstreams registered.");
@@ -285,6 +288,7 @@ void *ap6_thread(void *thread_context)
ret = read_bitstream(c->config->null_gbs[i], &null_gbs_info);
if (ret < 0) {
dlog("ap6[%i]: \tfailed to read bitstream\n", c->socket);
+ if (null_gbs_info.data)
free((void *)null_gbs_info.data);
null_gbs_info.data = NULL;
continue;
|
Coverity unchecked return value
There isn't much else that can be done here unfortunately.
|
@@ -1914,7 +1914,8 @@ static void get_current_time(struct timeval *t)
t->tv_sec = (long)(now_ul / 10000000);
t->tv_usec = ((int)(now_ul % 10000000)) / 10;
# else
- gettimeofday(t, NULL);
+ if (gettimeofday(t, NULL) < 0)
+ perror("gettimeofday");
# endif
}
|
Elektra: Core: KeySet: lookup: add always KDB_O_OPMPHM to options
|
@@ -2052,9 +2052,6 @@ static Key * elektraLookupSearch (KeySet * ks, Key * key, option_t options)
#ifdef ELEKTRA_ENABLE_OPTIMIZATIONS
int opmphmOptionIsSet = 0;
- // OPMPHM always on
- options |= KDB_O_OPMPHM;
-
// flags not compatible with OPMPHM
if (((options & KDB_O_WITHOWNER) || (options & KDB_O_NOCASE)) && (options & KDB_O_OPMPHM))
{
@@ -2231,6 +2228,11 @@ Key * ksLookup (KeySet * ks, Key * key, option_t options)
const char * name = key->key;
if (!name) return 0;
+#ifdef ELEKTRA_ENABLE_OPTIMIZATIONS
+ // OPMPHM always on
+ options |= KDB_O_OPMPHM;
+#endif
+
Key * ret = 0;
const int mask = ~KDB_O_DEL & ~KDB_O_CREATE;
|
hv: pass kernel cmdline from SBL to vm0 kernel
The SBL could pass cmdline to vm0 kernel by using mbi->mi_cmdline
which should be passed to vm0 kernel as well.
Acked-by: Eddie Dong
|
#define ACRN_DBG_BOOT 6
+/* There are two sources for vm0 kernel cmdline:
+ * - cmdline from sbl. mbi->cmdline
+ * - cmdline from acrn stitching tool. mod[0].mm_string
+ * We need to merge them together
+ */
+static char kernel_cmdline[MEM_2K];
+
/*now modules support: FIRMWARE & RAMDISK */
static void parse_other_modules(struct vm *vm,
struct multiboot_module *mods, int mods_count)
@@ -163,12 +170,38 @@ int init_vm0_boot_info(struct vm *vm)
vm->sw.kernel_info.kernel_load_addr =
get_kernel_load_addr(vm->sw.kernel_info.kernel_src_addr);
+
+ /*
+ * If there is cmdline from mbi->mi_cmdline, merge it with
+ * mods[0].mm_string
+ */
+ if (mbi->mi_flags & MULTIBOOT_INFO_HAS_CMDLINE) {
+ char *cmd_src, *cmd_dst;
+ int off = 0;
+
+ cmd_dst = kernel_cmdline;
+ cmd_src = HPA2HVA((uint64_t)mbi->mi_cmdline);
+ strncpy_s(cmd_dst, MEM_2K, cmd_src, strnlen_s(cmd_src, MEM_2K));
+ off = strnlen_s(cmd_dst, MEM_2K);
+ cmd_dst[off] = ' '; /* insert space */
+ off += 1;
+
+ cmd_dst += off;
+ cmd_src = HPA2HVA((uint64_t)mods[0].mm_string);
+ strncpy_s(cmd_dst, MEM_2K - off, cmd_src,
+ strnlen_s(cmd_src, MEM_2K - off));
+
+ vm->sw.linux_info.bootargs_src_addr = kernel_cmdline;
+ vm->sw.linux_info.bootargs_size =
+ strnlen_s(kernel_cmdline, MEM_2K);
+ } else {
vm->sw.linux_info.bootargs_src_addr =
(void *)(uint64_t)mods[0].mm_string;
- vm->sw.linux_info.bootargs_load_addr =
- (void *)BOOT_ARGS_LOAD_ADDR;
vm->sw.linux_info.bootargs_size =
strnlen_s((char *)(uint64_t) mods[0].mm_string, MEM_2K);
+ }
+
+ vm->sw.linux_info.bootargs_load_addr = (void *)BOOT_ARGS_LOAD_ADDR;
if (mbi->mi_mods_count > 1) {
/*parse other modules, like firmware /ramdisk */
|
Code: Remove redundant check
|
/* 0 is not a valid value for xTimerPeriodInTicks. */
configASSERT( ( xTimerPeriodInTicks > 0 ) );
- if( pxNewTimer != NULL )
- {
/* Ensure the infrastructure used by the timer service task has been
* created/initialised. */
prvCheckForValidListAndQueue();
traceTIMER_CREATE( pxNewTimer );
}
- }
/*-----------------------------------------------------------*/
BaseType_t xTimerGenericCommand( TimerHandle_t xTimer,
|
Remove vtkVisItStructuredGrid and vtkVisItRectilinearGrid overrides
They are defined in visit_vtk/full/InitVTK.
|
#include <vtkToolkits.h>
#include <vtkVisItDataSetMapper.h>
-#include <vtkVisItRectilinearGrid.h>
-#include <vtkVisItStructuredGrid.h>
#include <vtkOpenGLPointMapper.h>
#include <vtkObjectFactory.h>
@@ -54,8 +52,6 @@ vtkStandardNewMacro(vtkVisItGraphicsFactory)
// Necessary for each object that will override a vtkObject.
//
VTK_CREATE_CREATE_FUNCTION(vtkVisItDataSetMapper);
-VTK_CREATE_CREATE_FUNCTION(vtkVisItRectilinearGrid);
-VTK_CREATE_CREATE_FUNCTION(vtkVisItStructuredGrid);
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLPointMapper);
const char*
@@ -112,6 +108,10 @@ vtkVisItGraphicsFactory::GetVTKSourceVersion()
// Kathleen Biagas, Tue Apr 13 2021
// Add vtkVisItDataSetMapper.
//
+// Kathleen Biagas, Thu July 22, 2021
+// Remove vtkVisItRectilinearGrid and vtkStructuredGrid overrides for
+// they are defined in visit_vtk/full/InitVTK
+//
vtkVisItGraphicsFactory::vtkVisItGraphicsFactory()
{
@@ -119,14 +119,6 @@ vtkVisItGraphicsFactory::vtkVisItGraphicsFactory()
"vtkVisItDataSetMapper override vtkDataSetMapper",
1,
vtkObjectFactoryCreatevtkVisItDataSetMapper);
- this->RegisterOverride("vtkRectilinearGrid", "vtkVisItRectilinearGrid",
- "vtkVisItRectilinearGrid override vtkRectilinearGrid",
- 1,
- vtkObjectFactoryCreatevtkVisItRectilinearGrid);
- this->RegisterOverride("vtkStructuredGrid", "vtkVisItStructuredGrid",
- "vtkVisItStructuredGrid override vtkStructuredGrid",
- 1,
- vtkObjectFactoryCreatevtkVisItStructuredGrid);
this->RegisterOverride("vtkPointMapper",
"vtkOpenGLPointMapper",
"vtkOpenGLPointMapper override vtkPointMapper",
|
gsettings: write tree changes immediately
|
@@ -351,6 +351,7 @@ static gboolean elektra_settings_backend_write_tree (GSettingsBackend * backend,
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s %s.", "Function writeTree. ", "We have to loop the tree and add the keys");
g_mutex_lock (&elektra_settings_kdb_lock);
g_tree_foreach (tree, elektra_settings_keyset_from_tree, esb->gks);
+ elektra_settings_backend_sync (backend);
/* Notify the GSettings about the changed tree */
g_settings_backend_changed_tree (G_SETTINGS_BACKEND (backend), tree, origin_tag);
g_mutex_unlock (&elektra_settings_kdb_lock);
|
Improve runas session enumeration
|
@@ -745,12 +745,40 @@ static VOID PhpAddSessionsToComboBox(
sessions[i].WinStationName[0] != UNICODE_NULL
)
{
- menuString = PhFormatString(L"%lu: %s (%s\\%s)",
- sessions[i].SessionId,
- sessions[i].WinStationName,
- winStationInfo.Domain,
- winStationInfo.UserName
- );
+ SIZE_T formatLength;
+ PH_FORMAT format[8];
+ WCHAR formatBuffer[0x80];
+
+ // %lu: %s (%s\\%s)
+ PhInitFormatU(&format[0], sessions[i].SessionId);
+ PhInitFormatS(&format[1], L": ");
+ PhInitFormatS(&format[2], sessions[i].WinStationName);
+ PhInitFormatS(&format[3], L" (");
+ PhInitFormatS(&format[4], winStationInfo.Domain);
+ PhInitFormatC(&format[5], L'\\');
+ PhInitFormatS(&format[6], winStationInfo.UserName);
+ PhInitFormatC(&format[7], L')');
+
+ if (PhFormatToBuffer(format, RTL_NUMBER_OF(format), formatBuffer, sizeof(formatBuffer), &formatLength))
+ {
+ PH_STRINGREF text;
+
+ text.Length = formatLength - sizeof(UNICODE_NULL);
+ text.Buffer = formatBuffer;
+
+ menuString = PhCreateString2(&text);
+ }
+ else
+ {
+ //menuString = PhFormatString(L"%lu: %s (%s\\%s)",
+ // sessions[i].SessionId,
+ // sessions[i].WinStationName,
+ // winStationInfo.Domain,
+ // winStationInfo.UserName
+ // );
+
+ menuString = PhFormat(format, RTL_NUMBER_OF(format), 0);
+ }
}
else if (winStationInfo.UserName[0] != UNICODE_NULL)
{
@@ -762,14 +790,37 @@ static VOID PhpAddSessionsToComboBox(
}
else if (sessions[i].WinStationName[0] != UNICODE_NULL)
{
- menuString = PhFormatString(L"%lu: %s",
- sessions[i].SessionId,
- sessions[i].WinStationName
- );
+ SIZE_T formatLength;
+ PH_FORMAT format[3];
+ WCHAR formatBuffer[0x80];
+
+ // %lu: %s
+ PhInitFormatU(&format[0], sessions[i].SessionId);
+ PhInitFormatS(&format[1], L": ");
+ PhInitFormatS(&format[2], sessions[i].WinStationName);
+
+ if (PhFormatToBuffer(format, RTL_NUMBER_OF(format), formatBuffer, sizeof(formatBuffer), &formatLength))
+ {
+ PH_STRINGREF text;
+
+ text.Length = formatLength - sizeof(UNICODE_NULL);
+ text.Buffer = formatBuffer;
+
+ menuString = PhCreateString2(&text);
+ }
+ else
+ {
+ //menuString = PhFormatString(L"%lu: %s",
+ // sessions[i].SessionId,
+ // sessions[i].WinStationName
+ // );
+
+ menuString = PhFormat(format, RTL_NUMBER_OF(format), 0);
+ }
}
else
{
- menuString = PhFormatString(L"%lu", sessions[i].SessionId);
+ menuString = PhFormatUInt64(sessions[i].SessionId, FALSE);
}
{
|
tcnyc update
fixed
|
@@ -132,12 +132,10 @@ DWORD WINAPI Init(LPVOID bDelay)
if (fGameSpeed)
{
- auto sub_40C930 = hook::pattern("8B 44 24 04 8B 0D ? ? ? ? 0F BE 4C 01 08 8B C1 99");
- auto flt_6CD6B0_pattern = hook::range_pattern((uintptr_t)sub_40C930.count(2).get(1).get<uintptr_t>(0), (uintptr_t)sub_40C930.count(2).get(1).get<uintptr_t>(108), "D8 2D ? ? ? ?");
-
- injector::WriteMemory(flt_6CD6B0_pattern.count(3).get(0).get<uintptr_t>(2), &fGameSpeed, true); //0x40C930 + 0x2 + 0x32
- injector::WriteMemory(flt_6CD6B0_pattern.count(3).get(1).get<uintptr_t>(2), &fGameSpeed, true); //0x40C930 + 0x2 + 0x64
- injector::WriteMemory(flt_6CD6B0_pattern.count(3).get(2).get<uintptr_t>(2), &fGameSpeed, true); //0x40C930 + 0x2 + 0x4D
+ pattern = hook::pattern("D8 2D ? ? ? ? DE F9 C3");
+ injector::WriteMemory(pattern.count(3).get(0).get<void>(2), &fGameSpeed, true); //0x40C930 + 0x2 + 0x32
+ injector::WriteMemory(pattern.count(3).get(1).get<void>(2), &fGameSpeed, true); //0x40C930 + 0x2 + 0x64
+ injector::WriteMemory(pattern.count(3).get(2).get<void>(2), &fGameSpeed, true); //0x40C930 + 0x2 + 0x4D
}
return 0;
|
Workaround not allowing if: within composite actions
|
@@ -14,29 +14,21 @@ runs:
run: .github/scripts/create-hash.sh
shell: bash
- - name: Generate keys
- id: genkey
- run: |
- echo "::set-output name=riscvtools-cache-key::riscv-tools-installed-${{ env.tools-cache-version }}-$(shasum riscv-tools.hash | cut -d' ' -f1)"
- echo "::set-output name=esptools-cache-key::esp-tools-installed-${{ env.tools-cache-version }}-$(shasum esp-tools.hash | cut -d' ' -f1)"
- shell: bash
-
# brute force way to swap between riscv/esp-tools caches
- name: Cache riscv-tools
- if: ${{ inputs.tools-version == "riscv-tools" }}
uses: actions/cache@v2
id: toolchain-build-riscv-tools
with:
path: ${{ inputs.tools-version }}-install
- key: ${{ steps.genkey.outputs.riscvtools-cache-key }}
+ key: riscv-tools-installed-${{ env.tools-cache-version }}-${{ hashFiles(riscv-tools.hash) }}
+ # brute force way to swap between riscv/esp-tools caches
- name: Cache esp-tools
- if: ${{ inputs.tools-version == "esp-tools" }}
uses: actions/cache@v2
id: toolchain-build-esp-tools
with:
path: ${{ inputs.tools-version }}-install
- key: ${{ steps.genkey.outputs.esptools-cache-key }}
+ key: esp-tools-installed-${{ env.tools-cache-version }}-${{ hashFiles(esp-tools.hash) }}
- name: Build toolchain if not cached
run: |
|
Fix fetch_from same file detection on Windows.
Python 2 does not implement os.path.samefile for Windows.
Note: mandatory check (NEED_CHECK) was skipped
|
@@ -284,7 +284,7 @@ def process(fetched_file, file_name, args, remove=True):
for src, dst in zip(args.rename, args.outputs):
if src == 'RESOURCE':
src = fetched_file
- if os.path.samefile(src, fetched_file):
+ if os.path.abspath(src) == os.path.abspath(fetched_file):
logging.info('Copying %s to %s', src, dst)
hardlink_or_copy(src, dst)
else:
@@ -298,7 +298,7 @@ def process(fetched_file, file_name, args, remove=True):
raise OutputIsDirectoryError('Output must be a file, not a directory: %s' % os.path.abspath(path))
if args.executable:
os.chmod(path, os.stat(path).st_mode | 0o111)
- if os.path.samefile(path, fetched_file):
+ if os.path.abspath(path) == os.path.abspath(fetched_file):
remove = False
if remove:
|
Replace comparison with XOR
|
@@ -127,7 +127,7 @@ void mbedtls_mpi_mod_raw_add( mbedtls_mpi_uint *X,
mbedtls_mpi_uint carry, borrow;
carry = mbedtls_mpi_core_add( X, A, B, N->limbs );
borrow = mbedtls_mpi_core_sub( X, X, N->p, N->limbs );
- (void) mbedtls_mpi_core_add_if( X, N->p, N->limbs, ( carry < borrow ) );
+ (void) mbedtls_mpi_core_add_if( X, N->p, N->limbs, (unsigned char) ( carry ^ borrow ) );
}
/* END MERGE SLOT 5 */
|
Fix error handling in test_harness.py
If this was run under python3 and a compilation error occurred,
it would throw another exception while trying to report the error.
[ci skip]
|
@@ -116,7 +116,7 @@ def build_program(source_files, image_type='bare-metal', opt_level='-O3', cflags
else:
return ELF_FILE
except subprocess.CalledProcessError as exc:
- raise TestException('Compilation failed:\n' + exc.output)
+ raise TestException('Compilation failed:\n' + exc.output.decode())
class TimedProcessRunner(threading.Thread):
|
brought back previous tests
|
@@ -3,6 +3,9 @@ import pytest
import pyccl as ccl
+COSMO = ccl.Cosmology(
+ Omega_c=0.27, Omega_b=0.045, h=0.67, sigma8=0.8, n_s=0.96,
+ transfer_function='bbks', matter_power_spectrum='halofit')
MS = [1E13, [1E12, 1E15], np.array([1E12, 1E15])]
MF_EQUIV = {'tinker10': 'Tinker10',
'tinker': 'Tinker08',
@@ -45,12 +48,57 @@ def test_halo_bias_smoke():
def test_m2r_smoke():
- cosmo = ccl.Cosmology(
- Omega_c=0.27, Omega_b=0.045, h=0.67, sigma8=0.8, n_s=0.96)
for m in MS:
- r_old = ccl.massfunc_m2r(cosmo, m)
- r_new = ccl.halos.mass2radius_lagrangian(cosmo, m)
+ r_old = ccl.massfunc_m2r(COSMO, m)
+ r_new = ccl.halos.mass2radius_lagrangian(COSMO, m)
assert np.all(np.isfinite(r_old))
assert np.shape(r_old) == np.shape(m)
assert np.all(np.array(r_old) ==
np.array(r_new))
+
+
+@pytest.mark.parametrize('m', [
+ 1e14,
+ int(1e14),
+ [1e14, 1e15],
+ np.array([1e14, 1e15])])
+def test_massfunc_smoke(m):
+ a = 0.8
+ mf = ccl.massfunc(COSMO, m, a)
+ assert np.all(np.isfinite(mf))
+ assert np.shape(mf) == np.shape(m)
+
+
+@pytest.mark.parametrize('m', [
+ 1e14,
+ int(1e14),
+ [1e14, 1e15],
+ np.array([1e14, 1e15])])
+def test_massfunc_m2r_smoke(m):
+ r = ccl.massfunc_m2r(COSMO, m)
+ assert np.all(np.isfinite(r))
+ assert np.shape(r) == np.shape(m)
+
+
+@pytest.mark.parametrize('m', [
+ 1e14,
+ int(1e14),
+ [1e14, 1e15],
+ np.array([1e14, 1e15])])
+def test_sigmaM_smoke(m):
+ a = 0.8
+ s = ccl.sigmaM(COSMO, m, a)
+ assert np.all(np.isfinite(s))
+ assert np.shape(s) == np.shape(m)
+
+
+@pytest.mark.parametrize('m', [
+ 1e14,
+ int(1e14),
+ [1e14, 1e15],
+ np.array([1e14, 1e15])])
+def test_halo_bias_smoke(m):
+ a = 0.8
+ b = ccl.halo_bias(COSMO, m, a)
+ assert np.all(np.isfinite(b))
+ assert np.shape(b) == np.shape(m)
|
Document how the configuration option 'reconf' works
|
the corresponding value in the inherited environment, if
there is one.
+ reconf
+ reconfigure
+ Reconfigure from earlier data. This fetches the previous
+ command line options and environment from data saved in
+ "configdata.pm", and runs the configuration process again,
+ using these options and environment.
+ Note: NO other option is permitted together with "reconf".
+ This means that you also MUST use "./Configure" (or
+ what corresponds to that on non-Unix platforms) directly
+ to invoke this option.
+ Note: The original configuration saves away values for ALL
+ environment variables that were used, and if they weren't
+ defined, they are still saved away with information that
+ they weren't originally defined. This information takes
+ precedence over environment variables that are defined
+ when reconfiguring.
Installation in Detail
----------------------
|
os\board\rtl8720e: Add checking for to make sure ftl_mapping_table is not null before accessing it
|
@@ -796,6 +796,11 @@ uint16_t read_mapping_table(uint16_t logical_addr)
uint32_t byte_index = bit_index / 8;
uint32_t byte_offset = bit_index % 8;
+ if (ftl_mapping_table == NULL) {
+ FTL_PRINTF(FTL_LEVEL_ERROR, "[ftl] ftl_mapping_table is null!");
+ ASSERT(0);
+ }
+
uint16_t phy_addr = ftl_mapping_table[byte_index] + (ftl_mapping_table[byte_index + 1] << 8);
phy_addr = (phy_addr & (0xfff << byte_offset)) >> byte_offset;
phy_addr *= 2;
@@ -811,6 +816,11 @@ void write_mapping_table(uint16_t logical_addr, uint8_t pageID, uint16_t cell_in
uint32_t byte_offset = bit_index % 8;
uint32_t phy_addr_offset = (pageID * PAGE_element + cell_index) / 2;//8 bytes aligned
+ if (ftl_mapping_table == NULL) {
+ FTL_PRINTF(FTL_LEVEL_ERROR, "[ftl] ftl_mapping_table is null!");
+ ASSERT(0);
+ }
+
if (4 == byte_offset) {
uint8_t phy_addr_offset_l = phy_addr_offset & 0x0f;
phy_addr_offset_l = (phy_addr_offset_l << 4) & 0xf0;
@@ -1255,6 +1265,11 @@ uint32_t ftl_ioctl(uint32_t cmd, uint32_t p1, uint32_t p2)
ftl_page_write(g_pPage + i, INFO_beg_index, 0x0);
}
+ if (ftl_mapping_table == NULL) {
+ FTL_PRINTF(FTL_LEVEL_ERROR, "[ftl] ftl_mapping_table is null!");
+ ASSERT(0);
+ }
+
//clear ftl_mapping_table
memset(ftl_mapping_table, 0, MAPPING_TABLE_SIZE);
|
refactor read-at-aeon into a ?-
|
++ read-at-aeon :: read-at-aeon:ze
|= {yon/aeon mun/mood} :: seek and read
^- (unit (unit (each cage lobe)))
- ?: ?=($w p.mun)
- ?^ r.mun [~ ~]
- ?. ?=($ud -.q.mun) [~ ~ %& %aeon !>(yon)]
+ ?- p.mun
+ $w
+ ?. ?=($ud -.q.mun) ?^(r.mun ~ [~ ~ %& %aeon !>(yon)])
(bind (read-w yon r.mun) (lift |=(a/cage [%& a])))
- ?: ?=($d p.mun)
+ ::
+ $d
=+ rom=(~(get by fat.ruf) her)
?~ rom
~&(%null-rom-cd [~ ~])
?^ r.mun
~&(%no-cd-path [~ ~])
[~ ~ %& %noun !>(~(key by dos.u.rom))]
- ?: ?=($u p.mun)
- (read-u yon r.mun)
- ?: ?=($v p.mun)
- (bind (read-v yon r.mun) (lift |=(a/cage [%& a])))
- ?: ?=($x p.mun)
- (read-x yon r.mun)
- ?: ?=($y p.mun)
- :: =- ~& :* %dude-someones-getting-curious
- :: mun=mun
- :: yon=yon
- :: our=our
- :: her=her
- :: syd=syd
- :: hep=-
- :: ==
- :: -
- (bind (read-y yon r.mun) (lift |=(a/cage [%& a])))
- ?: ?=($z p.mun)
- (bind (read-z yon r.mun) (lift |=(a/cage [%& a])))
- !!
+ ::
+ $u (read-u yon r.mun)
+ $v (bind (read-v yon r.mun) (lift |=(a/cage [%& a])))
+ $x (read-x yon r.mun)
+ $y (bind (read-y yon r.mun) (lift |=(a/cage [%& a])))
+ $z (bind (read-z yon r.mun) (lift |=(a/cage [%& a])))
+ ==
::
:: Stubbed out, should be removed in the refactoring mentioned in ++query.
::
|
client session BUGFIX check for parsing errors
|
@@ -1841,6 +1841,9 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
} else {
data = lyd_parse_mem(session->ctx, rpc_gen->content.xml_str, LYD_XML, LYD_OPT_RPC | LYD_OPT_NOEXTDEPS
| (session->flags & NC_SESSION_CLIENT_NOT_STRICT ? 0 : LYD_OPT_STRICT), NULL);
+ if (!data) {
+ return NC_MSG_ERROR;
+ }
}
break;
|
Fixed incorrect repository name in README
|
@@ -94,7 +94,7 @@ such as:
To build HermitCore from source (without compiler), the repository with its submodules has to be cloned.
```bash
-$ git clone git@github.com:hermitcore/libhermit.git
+$ git clone git@github.com:hermitcore/libhermit.git HermitCore
$ cd HermitCore
$ git submodule init
$ git submodule update
|
arch: fix typo of KMM_NHEAPS
MM_NHEAPS was merged to KMM_NHEAPS with commit
This commit fixes missing modification for that.
|
@@ -799,18 +799,18 @@ config RAM_KREGIONx_HEAP_INDEX
Index can be from 0 to (KMM_NHEAPS-1).
config RAM_MALLOC_PRIOR_INDEX
- int "prior region index(0 MM_NHEAPS-1) of RAM used in malloc"
+ int "prior region index(0 KMM_NHEAPS-1) of RAM used in malloc"
default 0
- depends on MM_NHEAPS != 1
+ depends on KMM_NHEAPS != 1
---help---
The prior region index of RAM used in malloc.
It means alloc memory from the index-th region with priority.
- Index can be from 0 to (MM_NHEAPS-1).
+ Index can be from 0 to (KMM_NHEAPS-1).
config FS_TMPFS_HEAP_INDEX
int "TMPFS Heap index"
default 1
- depends on FS_TMPFS && MM_NHEAPS != 1
+ depends on FS_TMPFS && KMM_NHEAPS != 1
---help---
when tmpfs uses an independent memory region.
Specifies the index of the heap to allocate.
|
[numerics] declare desctructor as static, unsure about that one
|
@@ -49,7 +49,7 @@ tlsvar MPI_Comm NM_mpi_com = MPI_COMM_NULL;
}
#elif defined(__GNUC__) & !defined(__APPLE__)
- void cleanup_MPI(void) __attribute__ ((destructor))
+ static void cleanup_MPI(void) __attribute__ ((destructor))
{
if (NM_mpi_com != MPI_COMM_NULL)
{
|
stiffen TLS error handling
|
@@ -537,19 +537,21 @@ static ssize_t fio_tls_read(intptr_t uuid, void *udata, void *buf,
case SSL_ERROR_SSL: /* overflow */
case SSL_ERROR_ZERO_RETURN:
return 0; /* EOF */
+ case SSL_ERROR_SYSCALL: /* allow errno to inform us */
+ break; /* return -1 */
case SSL_ERROR_NONE: /* overflow */
case SSL_ERROR_WANT_CONNECT: /* overflow */
case SSL_ERROR_WANT_ACCEPT: /* overflow */
case SSL_ERROR_WANT_X509_LOOKUP: /* overflow */
+ case SSL_ERROR_WANT_WRITE: /* overflow */
+ case SSL_ERROR_WANT_READ: /* overflow */
#ifdef SSL_ERROR_WANT_ASYNC
case SSL_ERROR_WANT_ASYNC: /* overflow */
#endif
- case SSL_ERROR_WANT_WRITE: /* overflow */
- case SSL_ERROR_WANT_READ:
default:
+ errno = EWOULDBLOCK;
break;
}
- errno = EWOULDBLOCK;
return -1;
(void)uuid;
}
@@ -591,19 +593,21 @@ static ssize_t fio_tls_write(intptr_t uuid, void *udata, const void *buf,
case SSL_ERROR_SSL: /* overflow */
case SSL_ERROR_ZERO_RETURN:
return 0; /* EOF */
+ case SSL_ERROR_SYSCALL: /* allow errno to inform us */
+ break; /* return -1 */
case SSL_ERROR_NONE: /* overflow */
case SSL_ERROR_WANT_CONNECT: /* overflow */
case SSL_ERROR_WANT_ACCEPT: /* overflow */
case SSL_ERROR_WANT_X509_LOOKUP: /* overflow */
+ case SSL_ERROR_WANT_WRITE: /* overflow */
+ case SSL_ERROR_WANT_READ: /* overflow */
#ifdef SSL_ERROR_WANT_ASYNC
case SSL_ERROR_WANT_ASYNC: /* overflow */
#endif
- case SSL_ERROR_WANT_WRITE: /* overflow */
- case SSL_ERROR_WANT_READ:
default:
+ errno = EWOULDBLOCK;
break;
}
- errno = EWOULDBLOCK;
return -1;
(void)uuid;
}
@@ -675,7 +679,8 @@ static size_t fio_tls_handshake(intptr_t uuid, void *udata) {
"SSL_accept/SSL_connect %p error: SSL_ERROR_SYSCALL, errno: %s",
(void *)uuid, strerror(errno));
// fio_force_event(uuid, FIO_EVENT_ON_DATA);
- return 0;
+ // return 0;
+ break;
case SSL_ERROR_SSL:
FIO_LOG_DEBUG("SSL_accept/SSL_connect %p error: SSL_ERROR_SSL",
(void *)uuid);
|
SNAT: fix invalid outside FIB index
|
@@ -163,6 +163,13 @@ snat_not_translate (snat_main_t * sm, snat_runtime_t * rt, u32 sw_if_index0,
if (PREDICT_FALSE(ip0->dst_address.as_u32 == rt->cached_ip4_address))
return 1;
+ /* If outside FIB index is not resolved yet */
+ if (sm->outside_fib_index == ~0)
+ {
+ sm->outside_fib_index =
+ ip4_fib_table_find_or_create_and_lock (sm->outside_vrf_id);
+ }
+
key0.addr = ip0->dst_address;
key0.port = udp0->dst_port;
key0.protocol = proto0;
@@ -528,6 +535,13 @@ snat_hairpinning (snat_main_t *sm,
u32 new_dst_addr0 = 0, old_dst_addr0, ti = 0, si;
u16 new_dst_port0, old_dst_port0;
+ /* If outside FIB index is not resolved yet */
+ if (sm->outside_fib_index == ~0)
+ {
+ sm->outside_fib_index =
+ ip4_fib_table_find_or_create_and_lock (sm->outside_vrf_id);
+ }
+
key0.addr = ip0->dst_address;
key0.port = udp0->dst_port;
key0.protocol = proto0;
|
stm32/usbd_conf: Add support for USB HS peripheral on H7 MCUs.
|
@@ -104,10 +104,16 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
else if (hpcd->Instance == USB_OTG_HS) {
#if MICROPY_HW_USB_HS_IN_FS
+ #if defined(STM32H7)
+ const uint32_t otg_alt = GPIO_AF12_OTG2_FS;
+ #else
+ const uint32_t otg_alt = GPIO_AF12_OTG_HS_FS;
+ #endif
+
// Configure USB FS GPIOs
- mp_hal_pin_config(pin_B14, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, GPIO_AF12_OTG_HS_FS);
+ mp_hal_pin_config(pin_B14, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, otg_alt);
mp_hal_pin_config_speed(pin_B14, GPIO_SPEED_FREQ_VERY_HIGH);
- mp_hal_pin_config(pin_B15, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, GPIO_AF12_OTG_HS_FS);
+ mp_hal_pin_config(pin_B15, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, otg_alt);
mp_hal_pin_config_speed(pin_B15, GPIO_SPEED_FREQ_VERY_HIGH);
#if defined(MICROPY_HW_USB_VBUS_DETECT_PIN)
@@ -117,7 +123,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
#if defined(MICROPY_HW_USB_OTG_ID_PIN)
// Configure ID pin
- mp_hal_pin_config(MICROPY_HW_USB_OTG_ID_PIN, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_UP, GPIO_AF12_OTG_HS_FS);
+ mp_hal_pin_config(MICROPY_HW_USB_OTG_ID_PIN, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_UP, otg_alt);
#endif
// Enable calling WFI and correct function of the embedded USB_FS_IN_HS phy
|
Fudge Python module search path on windows so that can use Python virtual environment.
|
@@ -424,6 +424,8 @@ InterpreterObject *newInterpreterObject(const char *name)
const char *str = NULL;
+ const char *python_home = 0;
+
/* Create handle for interpreter and local data. */
self = PyObject_New(InterpreterObject, &Interpreter_Type);
@@ -882,6 +884,34 @@ InterpreterObject *newInterpreterObject(const char *name)
if (!wsgi_daemon_pool)
wsgi_python_path = wsgi_server_config->python_path;
+ /*
+ * We use a hack here on Windows to add the site-packages
+ * directory into the Python module search path as well
+ * as use of Python virtual environments doesn't work
+ * otherwise if using 'python -m venv' or any released of
+ * 'virtualenv' from 20.x onwards.
+ */
+
+#if defined(WIN32)
+ python_home = wsgi_server_config->python_home;
+
+ if (python_home && *python_home) {
+ if (wsgi_python_path && *wsgi_python_path) {
+ char delim[2];
+ delim[0] = DELIM;
+ delim[1] = '\0';
+
+ wsgi_python_path = apr_pstrcat(wsgi_server->process->pool,
+ python_home, "/Lib/site-packages", delim,
+ wsgi_python_path, NULL);
+ }
+ else {
+ wsgi_python_path = apr_pstrcat(wsgi_server->process->pool,
+ python_home, "/Lib/site-packages", NULL);
+ }
+ }
+#endif
+
module = PyImport_ImportModule("site");
if (wsgi_python_path && *wsgi_python_path) {
|
ARMv8: strip debug symbols from the CPU driver
|
@@ -17,6 +17,7 @@ import HakeTypes
import qualified Config
import qualified ArchDefaults
+
-------------------------------------------------------------------------
--
-- Architecture specific definitions for ARM
@@ -155,12 +156,14 @@ linkKernel opts objs libs name driverType=
kernelmap = "/kernel/" ++ name ++ ".map"
kasmdump = "/kernel/" ++ name ++ ".asm"
kbinary = "/sbin/" ++ name
- kbootable = kbinary ++ ".bin"
+ kdebug = kbinary ++ ".debug"
+ kfull = kbinary ++ ".full"
in
Rules [ Rule ([ Str compiler ] ++
map Str Config.cOptFlags ++
[ NStr "-T", In BuildTree arch linkscript,
- Str "-o", Out arch kbinary,
+ Str "-o",
+ Out arch kfull,
NStr "-Wl,-Map,", Out arch kernelmap
]
++ (optLdFlags opts)
@@ -171,23 +174,20 @@ linkKernel opts objs libs name driverType=
++
(ArchDefaults.kernelLibs arch)
),
+ Rule $ strip opts kfull kdebug kbinary,
+ Rule $ debug opts kfull kdebug,
-- Generate kernel assembly dump
Rule [ Str objdump,
Str "-d",
Str "-M reg-names-raw",
In BuildTree arch kbinary,
- Str ">", Out arch kasmdump ],
+ Str ">",
+ Out arch kasmdump ],
Rule [ Str "cpp",
NStr "-I", NoDep SrcTree "src" "/kernel/include/arch/armv8",
Str "-D__ASSEMBLER__",
Str "-P", In SrcTree "src"
("/kernel/arch/armv8/"++driverType++".lds.in"),
Out arch linkscript
- ],
- -- Produce a stripped binary
- Rule [ Str objcopy,
- Str "-g",
- In BuildTree arch kbinary,
- Out arch (kbinary ++ ".stripped")
]
]
|
Improve migration guide for SHA384 option
|
@@ -5,5 +5,8 @@ This does not affect users who use the default `config.h`.
MBEDTLS_SHA512_NO_SHA384 was disabled by default, now MBEDTLS_SHA384_C is
enabled by default.
-If you were using a config file with MBEDTLS_SHA512_NO_SHA384 enabled,
-then just remove it (don't define MBEDTLS_SHA384_C).
+If you were using a config file with both MBEDTLS_SHA512_C and
+MBEDTLS_SHA512_NO_SHA384, then just remove the MBEDTLS_SHA512_NO_SHA384.
+If you were using a config file with MBEDTLS_SHA512_C and without
+MBEDTLS_SHA512_NO_SHA384 and you need the SHA-384 algorithm, then add
+`#define MBEDTLS_SHA384_C` to your config file.
|
no trigger nat ipfix flush in first worker
|
@@ -1539,7 +1539,7 @@ snat_ipfix_flush_from_main (void)
}
/* Trigger flush for each worker thread */
- for (i = 1; i < vec_len (silm->worker_vms); i++)
+ for (i = 0; i < vec_len (silm->worker_vms); i++)
{
worker_vm = silm->worker_vms[i];
if (worker_vm)
|
gso: remove ordering dependency on esp-encrypt-tun
Type: fix
... it's not a feature anymore
|
@@ -863,13 +863,13 @@ VNET_FEATURE_INIT (gso_l2_ip6_node, static) = {
VNET_FEATURE_INIT (gso_ip4_node, static) = {
.arc_name = "ip4-output",
.node_name = "gso-ip4",
- .runs_before = VNET_FEATURES ("esp4-encrypt-tun","ipsec4-output-feature"),
+ .runs_before = VNET_FEATURES ("ipsec4-output-feature"),
};
VNET_FEATURE_INIT (gso_ip6_node, static) = {
.arc_name = "ip6-output",
.node_name = "gso-ip6",
- .runs_before = VNET_FEATURES ("esp6-encrypt-tun","ipsec6-output-feature"),
+ .runs_before = VNET_FEATURES ("ipsec6-output-feature"),
};
/*
|
BugID:24656681: Fixed statfs issue
|
@@ -86,7 +86,7 @@ int statfs(const char *path, struct statfs *buf)
buf->f_namelen = statfs_temp.f_namelen;
}
- return aos_statfs(path, buf);
+ return ret;
}
int link(const char *oldpath, const char *newpath)
|
OcAppleKernelLib: Fix InternalPrepareCreateVtablesPrelinked64
|
@@ -232,19 +232,19 @@ InternalPrepareCreateVtablesPrelinked64 (
if (MachoSymbolNameIsVtable64 (Name)) {
Result = MachoIsSymbolValueInRange64 (
MachoContext,
- VtableExport->Symbols[Index]
+ Symbol
);
if (!Result) {
return FALSE;
}
+ VtableExport->Symbols[NumVtables] = Symbol;
+
++NumVtables;
//
// This should be accounted for via previous sanity checks.
//
ASSERT (VtableExportSize >= (sizeof (*VtableExport) + (NumVtables * sizeof (*VtableExport->Symbols))));
-
- VtableExport->Symbols[NumVtables] = Symbol;
}
}
|
finished misra 17.8
|
@@ -394,15 +394,16 @@ int current_int0_alt_setting = 0;
// packet read and write
void *USB_ReadPacket(void *dest, uint16_t len) {
- uint32_t i = 0;
+
+ void *dest_copy = dest;
uint32_t count32b = (len + 3U) / 4U;
- for ( i = 0; i < count32b; i++) {
+ for (uint32_t i = 0; i < count32b; i++) {
// packed?
- *(__attribute__((__packed__)) uint32_t *)dest = USBx_DFIFO(0);
- dest += 4;
+ *(__attribute__((__packed__)) uint32_t *)dest_copy = USBx_DFIFO(0);
+ dest_copy += 4;
}
- return ((void *)dest);
+ return ((void *)dest_copy);
}
void USB_WritePacket(const uint8_t *src, uint16_t len, uint32_t ep) {
@@ -412,7 +413,7 @@ void USB_WritePacket(const uint8_t *src, uint16_t len, uint32_t ep) {
#endif
uint8_t numpacket = (len + (MAX_RESP_LEN - 1U)) / MAX_RESP_LEN;
- uint32_t count32b = 0, i = 0;
+ uint32_t count32b = 0;
count32b = (len + 3U) / 4U;
// bullshit
@@ -421,9 +422,10 @@ void USB_WritePacket(const uint8_t *src, uint16_t len, uint32_t ep) {
USBx_INEP(ep)->DIEPCTL |= (USB_OTG_DIEPCTL_CNAK | USB_OTG_DIEPCTL_EPENA);
// load the FIFO
- for (i = 0; i < count32b; i++) {
- USBx_DFIFO(ep) = *((__attribute__((__packed__)) uint32_t *)src);
- src += 4;
+ const uint8_t *src_copy = src;
+ for (uint32_t i = 0; i < count32b; i++) {
+ USBx_DFIFO(ep) = *((__attribute__((__packed__)) uint32_t *)src_copy);
+ src_copy += 4;
}
}
|
README.md: update Windows guide
|
@@ -27,11 +27,26 @@ On __Arch Linux__, type:
On __Mac OS X__, install SDL2 via [Homebrew](http://brew.sh) like so:
`brew install sdl2{,_image,_ttf,_mixer}`
-On __Windows__, you can either install SDL2 via [Msys2](https://msys2.github.io) like so:
+On __Windows__,
+1. Install mingw-w64 from [Mingw-builds](http://mingw-w64.org/doku.php/download/mingw-builds)
+ - Version: latest (at time of writing 6.3.0)
+ - Architecture: x86_64
+ - Threads: win32
+ - Exception: seh
+ - Build revision: 1
+ - Destination Folder: Select a folder that your Windows user owns
+2. Install SDL2 http://libsdl.org/download-2.0.php
+ - Extract the SDL2 folder from the archive using a tool like [7zip](http://7-zip.org)
+ - Inside the folder, copy the `i686-w64-mingw32` and/or `x86_64-w64-mingw32` depending on the architecture you chose into your mingw-w64 folder e.g. `C:\Program Files\mingw-w64\x86_64-6.3.0-win32-seh-rt_v5-rev1\mingw64`
+3. Setup Path environment variable
+ - Put your mingw-w64 binaries location into your system Path environment variable. e.g. `C:\Program Files\mingw-w64\x86_64-6.3.0-win32-seh-rt_v5-rev1\mingw64\bin` and `C:\Program Files\mingw-w64\x86_64-6.3.0-win32-seh-rt_v5-rev1\mingw64\x86_64-w64-mingw32\bin`
+4. Open up a terminal such as `Git Bash` and run `go get -v github.com/veandco/go-sdl2/sdl`. To prove that it's working correctly, you can change directory by running `cd go/src/github.com/veandco/go-sdl2/examples/events` and run `go run events.go`. A window should pop up and you can see event logs printed when moving your mouse over it or typing on your keyboard.
+5. (Optional) You can repeat __Step 2__ for [SDL_image](https://www.libsdl.org/projects/SDL_image), [SDL_mixer](https://www.libsdl.org/projects/SDL_mixer), [SDL_ttf](https://www.libsdl.org/projects/SDL_ttf)
+ - NOTE: pre-build the libraries for faster compilation by running `go install github.com/veandco/go-sdl2/sdl_{image,mixer,ttf}`
+
+or you can install SDL2 via [Msys2](https://msys2.github.io) like so:
`pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2{,_mixer,_image,_ttf}`
-or use [MinGW](http://mingw.org) and download pre-compiled development libraries from http://libsdl.org/download-2.0.php. In this case, you need to put files inside `i686-w64-mingw32` or `x86_64-w64-mingw32` into MinGW's `mingw32` directory e.g. `C:\MinGW\mingw32`. Assuming you have setup MinGW correctly (install base system so it has `gcc` and friends, set PATH environment variables), you should be able to build go-sdl2. If you have 64-bit system, you can still build by modifying certain environment flags before building such as `CGO_ENABLED=1 GOARCH=386 go build`.
-
Installation
============
|
autogen if needed
|
@@ -125,6 +125,9 @@ Provides components of Sensys to run on an aggregator.
%setup -qn %{sensys_name}-1.0.0
%build
+if [ ! -f configure ]; then
+ ./autogen.pl
+fi
%configure %{configure_flags}
%{__make} %{?_smp_mflags}
|
Fix gppkg's coordinator hook not execute.
old (and current) gppkg create the package like this format:
```
PostInstall:
- Master: "sh ./master.sh"
- Segment: "sh ./segment.sh';"
- All: "echo 'install successful'"
```
sed -i s/master/coordinator/g will break this behavior.
|
@@ -1141,7 +1141,7 @@ class PerformHooks(Operation):
if key is None:
return
key_str = key[0]
- if key_str.lower() == 'coordinator':
+ if key_str.lower() in ('coordinator', 'master'):
if self.standby_host:
RemoteCommand(hook[key_str], [self.standby_host]).run()
LocalCommand(hook[key_str], True).run()
|
config_tools: fix the board inspector exit issue
Fix the issue that board inspector exit after showing warning message.
|
@@ -51,7 +51,6 @@ def check_deps():
res = subprocess.Popen(["update-pciids", "-q"])
if res.wait() != 0:
logging.warning(f"Failed to invoke update-pciids. No functional impact is foreseen, but descriptions of PCI devices may be inaccurate.")
- sys.exit(1)
except Exception as e:
logging.warning(f"Failed to invoke update-pciids: {e}. No functional impact is foreseen, but descriptions of PCI devices may be unavailable.")
|
Do not crash on argument counter of zero
Check before calling xstrdup, which does not accept a NULL pointer,
whether argv[0] is actually set.
|
@@ -266,7 +266,7 @@ parse_conf_file (int *argc, char ***argv) {
size_t idx;
/* assumes program name is on argv[0], though, it is not guaranteed */
- append_to_argv (&nargc, &nargv, xstrdup ((char *) *argv[0]));
+ append_to_argv (&nargc, &nargv, xstrdup (*argv[0] ?: PACKAGE_NAME));
/* determine which config file to open, default or custom */
path = get_config_file_path ();
|
Added sources sub folders support (single depth only but that should be enough)
|
@@ -27,12 +27,18 @@ MKDIR= $(BIN)/mkdir
SRC_C= $(wildcard *.c)
SRC_C+= $(wildcard $(SRC)/*.c)
+SRC_C+= $(wildcard $(SRC)/**/*.c)
+SRC_C:= $(filter-out $(SRC)/boot/rom_head.c,$(SRC_C))
SRC_S= $(wildcard *.s)
SRC_S+= $(wildcard $(SRC)/*.s)
+SRC_S+= $(wildcard $(SRC)/**/*.s)
+SRC_S:= $(filter-out $(SRC)/boot/sega.s,$(SRC_S))
SRC_ASM= $(wildcard *.asm)
SRC_ASM+= $(wildcard $(SRC)/*.asm)
+SRC_ASM+= $(wildcard $(SRC)/**/*.asm)
SRC_S80= $(wildcard *.s80)
SRC_S80+= $(wildcard $(SRC)/*.s80)
+SRC_S80+= $(wildcard $(SRC)/**/*.s80)
RES_C= $(wildcard $(RES)/*.c)
RES_S= $(wildcard $(RES)/*.s)
@@ -141,7 +147,7 @@ out/cmd_: $(OBJS)
$(ECHO) "$(OBJS)" > out/cmd_
out/sega.o: $(SRC)/boot/sega.s out/rom_head.bin
- $(CC) $(DEFAULT_FLAGS) -c $(SRC)/boot/sega.s -o $@
+ $(CC) -x assembler-with-cpp $(DEFAULT_FLAGS) -c $(SRC)/boot/sega.s -o $@
out/rom_head.bin: out/rom_head.o
$(LD) -T $(GDK)/md.ld -nostdlib --oformat binary -o $@ $<
|
Change function name in psp2kern/syscon.h
just fix wrong function name since (db.yml was changed)
it will fix broken CI, but documents is still wrong
|
@@ -109,7 +109,7 @@ int ksceSysconCmdSync(SceSysconPacket *packet, int noWait);
*
* @return 0 on success.
*/
-int ksceSysconResetDevice(int type, int mode);
+int ksceSysconSetPowerMode(int type, int mode);
int ksceSysconReadCommand(unsigned short cmd, void *buffer, unsigned int size);
int ksceSysconSendCommand(unsigned short cmd, const void *buffer, unsigned int size);
@@ -138,7 +138,7 @@ int ksceSysconCtrlLED(int led, int enable);
*
* @return 0 on success.
*/
-int ksceSysconCtrlMsPower(int power);
+int ksceSysconCtrlRMRPower(int power);
/**
* Set the SD power.
|
Extend abort test to cover more epilog code
|
@@ -4552,7 +4552,7 @@ selective_aborting_default_handler(void *userData,
START_TEST(test_abort_epilog)
{
- const char *text = "<doc></doc>\r\n";
+ const char *text = "<doc></doc>\n\r\n";
char match[] = "\r";
XML_SetDefaultHandler(parser, selective_aborting_default_handler);
|
build] scripts/ci-build.sh remove --with-maxminddb
remove --with-maxminddb;
maxminddb libs not currently part of our FreeBSD build images
|
@@ -22,7 +22,6 @@ case "${build}" in
--with-webdav-props --with-webdav-locks --with-gdbm \
--with-memcached --with-lua --with-libev --with-libunwind \
--with-krb5 \
- --with-maxminddb \
--with-nettle \
--with-gnutls \
--with-mbedtls \
@@ -44,7 +43,6 @@ case "${build}" in
--with-webdav-props --with-webdav-locks --with-gdbm \
--with-memcached --with-lua --with-libev --with-libunwind \
--with-krb5 --with-sasl \
- --with-maxminddb \
--with-nettle \
--with-gnutls \
--with-openssl
@@ -65,7 +63,6 @@ case "${build}" in
-DWITH_LIBEV=ON \
-DWITH_LIBUNWIND=ON \
-DWITH_LUA=ON \
- -DWITH_MAXMINDDB=ON \
-DWITH_MEMCACHED=ON \
-DWITH_DBI=ON \
-DWITH_MYSQL=ON \
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.