message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Migrate maker config to electron forge 6 | @@ -4,12 +4,15 @@ module.exports = {
{
name: "@electron-forge/maker-squirrel",
config: {
- name: "my_app"
+ name: "gb_studio",
+ exe: "gb-studio.exe",
+ loadingGif: "src/assets/app/install.gif",
+ setupIcon: "src/assets/app/icon/app_icon.ico"
}
},
{
name: "@electron-forge/maker-zip",
- platforms: ["darwin"]
+ platforms: ["darwin", "win32"]
},
{
name: "@electron-forge/maker-deb",
@@ -20,11 +23,6 @@ module.exports = {
config: {}
}
],
- make_targets: {
- win32: ["squirrel", "zip"],
- darwin: ["zip"],
- linux: ["deb", "rpm"]
- },
packagerConfig: {
name: "GB Studio",
executableName: "gb-studio",
@@ -43,25 +41,6 @@ module.exports = {
"entitlements-inherit": "./entitlements.plist"
}
},
- electronWinstallerConfig: {
- name: "gb_studio",
- exe: "gb-studio.exe",
- loadingGif: "src/assets/app/install.gif"
- },
- electronInstallerDebian: {},
- electronInstallerRedhat: {},
- github_repository: {
- owner: "",
- name: ""
- },
- electronInstallerDMG: {
- background: "src/assets/app/dmg/background.tiff",
- format: "ULFO"
- },
- windowsStoreConfig: {
- packageName: "",
- name: "gbstudio"
- },
hooks: {
postPackage: require("./src/hooks/notarize.js")
},
|
Add missing gettext build requirement | @@ -187,13 +187,13 @@ GoAccess has minimal requirements, it's written in C and requires only ncurses.
However, below is a table of some optional dependencies in some distros to
build GoAccess from source.
-Distro | NCurses | GeoIP (opt) | Tokyo Cabinet (opt) | OpenSSL (opt)
----------------------- | -----------------|------------------| -------------------------| -------------------
-**Ubuntu/Debian** | libncursesw5-dev | libgeoip-dev | libtokyocabinet-dev | libssl-dev
-**Fedora/RHEL/CentOS** | ncurses-devel | geoip-devel | tokyocabinet-devel | openssl-devel
-**Arch Linux** | ncurses | geoip | [compile from source](https://goaccess.io/faq#installation) | openssl
-**Gentoo** | sys-libs/ncurses | dev-libs/geoip | dev-db/tokyocabinet | dev-libs/openssl
-**Slackware** | ncurses | GeoIP | tokyocabinet | openssl
+Distro | NCurses | GeoIP (opt) | Tokyo Cabinet (opt) | OpenSSL (opt) | gettext
+---------------------- | -----------------|------------------| -------------------------| -------------------| -------------------
+**Ubuntu/Debian** | libncursesw5-dev | libgeoip-dev | libtokyocabinet-dev | libssl-dev | gettext
+**Fedora/RHEL/CentOS** | ncurses-devel | geoip-devel | tokyocabinet-devel | openssl-devel | gettext-devel
+**Arch Linux** | ncurses | geoip | [compile from source](https://goaccess.io/faq#installation) | openssl | gettext
+**Gentoo** | sys-libs/ncurses | dev-libs/geoip | dev-db/tokyocabinet | dev-libs/openssl |
+**Slackware** | ncurses | GeoIP | tokyocabinet | openssl |
#### Docker ####
|
options.h: don't translate "FTP", "FTPS" & "SSH2" | @@ -249,17 +249,17 @@ gftp_config_vars gftp_global_config_vars[] =
supported_gftp_protocols gftp_protocols[] =
{
- {N_("FTP"), rfc959_init, rfc959_register_module, "ftp", 21, 1, 1},
+ { "FTP", rfc959_init, rfc959_register_module, "ftp", 21, 1, 1},
#ifdef USE_SSL
- {N_("FTPS"), ftps_init, ftps_register_module, "ftps", 21, 1, 1},
+ { "FTPS", ftps_init, ftps_register_module, "ftps", 21, 1, 1},
#else
- {N_("FTPS"), ftps_init, ftps_register_module, "ftps", 21, 0, 1},
+ { "FTPS", ftps_init, ftps_register_module, "ftps", 21, 0, 1},
#endif
{N_("Local"), local_init, local_register_module, "file", 0, 1, 0},
- {N_("SSH2"), sshv2_init, sshv2_register_module, "ssh2", 22, 1, 1},
+ { "SSH2", sshv2_init, sshv2_register_module, "ssh2", 22, 1, 1},
{N_("Bookmark"), bookmark_init, bookmark_register_module, "bookmark", 0, 0, 0},
{NULL, NULL, NULL, NULL, 0, 0, 0}
|
Fix PhGetFileVersionInfoString returning invalid version strings | @@ -1627,6 +1627,10 @@ PPH_STRING PhGetFileVersionInfoString(
{
PPH_STRING string;
+ // Check if the string has a valid length.
+ if (length <= sizeof(WCHAR))
+ return NULL;
+
string = PhCreateStringEx((PWCHAR)buffer, length * sizeof(WCHAR));
// length may include the null terminator.
PhTrimToNullTerminatorString(string);
|
list: fix add_after prev pointer reference bug | @@ -76,10 +76,10 @@ static inline void mk_list_add_after(struct mk_list *_new,
}
next = prev->next;
- next->prev = prev;
_new->next = next;
_new->prev = prev;
prev->next = _new;
+ next->prev = _new;
}
static inline void __mk_list_del(struct mk_list *prev, struct mk_list *next)
|
ParseOptionalChunks: clear int sanitizer warning
clears a warning of the form:
src/dec/webp_dec.c:182:62: runtime error: implicit conversion from type
'int' of value -2 (32-bit, signed) to type 'unsigned int' changed the
value to (32-bit, unsigned) | @@ -179,7 +179,7 @@ static VP8StatusCode ParseOptionalChunks(const uint8_t** const data,
return VP8_STATUS_BITSTREAM_ERROR; // Not a valid chunk size.
}
// For odd-sized chunk-payload, there's one byte padding at the end.
- disk_chunk_size = (CHUNK_HEADER_SIZE + chunk_size + 1) & ~1;
+ disk_chunk_size = (CHUNK_HEADER_SIZE + chunk_size + 1) & ~1u;
total_size += disk_chunk_size;
// Check that total bytes skipped so far does not exceed riff_size.
|
nrf/readme: Update make flash command when defining board.
Update the "make flash" command sample to include BOARD parameter
when building for a specific target board. | @@ -54,7 +54,7 @@ By default, the PCA10040 (nrf52832) is used as compile target. To build and flas
Alternatively the target board could be defined:
make BOARD=pca10040
- make flash
+ make BOARD=pca10040 flash
## Compile and Flash with Bluetooth Stack
|
Make IDDoubleZ an ident | @@ -70,8 +70,8 @@ func (x ID) IsStrLiteral(m *Map) bool {
func (x ID) IsIdent(m *Map) bool {
if x < nBuiltInIDs {
- // TODO: move Diamond into the built-in ident space.
- return x == IDDiamond || (minBuiltInIdent <= x && x <= maxBuiltInIdent)
+ // TODO: move DoubleZ and Diamond into the built-in ident space.
+ return x == IDDoubleZ || x == IDDiamond || (minBuiltInIdent <= x && x <= maxBuiltInIdent)
} else if s := m.ByID(x); s != "" {
return alpha(s[0])
}
|
fix `vswhere` detection in find_vswhere | @@ -51,6 +51,8 @@ function main(opt)
opt = opt or {}
-- find program
+ opt.check = "-?"
+ opt.command = "-?"
opt.pathes = opt.pathes or
{
path.join(os.getenv("ProgramFiles(x86)"), "Microsoft Visual Studio", "Installer", "vswhere.exe"),
|
Unfudged brain-damaged tabs from Visual Studio | @@ -192,8 +192,8 @@ namespace ebi
size_t scanned_first_value_length, scanned_second_value_length;
int first_numeric_value = std::stoi(values[0], &scanned_first_value_length);
int second_numeric_value = std::stoi(values[1], &scanned_second_value_length);
- if (first_numeric_value > 0 || second_numeric_value < 0 ||
- values[0].size() != scanned_first_value_length || values[1].size() != scanned_second_value_length) {
+ if (first_numeric_value > 0 || second_numeric_value < 0
+ || values[0].size() != scanned_first_value_length || values[1].size() != scanned_second_value_length) {
throw new InfoBodyError{state.n_lines,
"INFO " + confidence_interval_tag +
" is a confidence interval tag, which should have first value <= 0 and second value >= 0"};
|
Idle task always yields after an interrupt | @@ -372,6 +372,7 @@ void iosentinel_check_now() {
void idle_task() {
while (1) {
asm("hlt");
+ sys_yield(RUNNABLE);
}
}
@@ -398,9 +399,8 @@ void tasking_init() {
//_iosentinel_task = task_spawn(update_blocked_tasks, PRIORITY_NONE);
printf_info("Multitasking initialized");
+ pit_callback = timer_callback_register((void*)tasking_timer_tick, 10, true, 0);
asm("sti");
-
- pit_callback = timer_callback_register((void*)tasking_timer_tick, 100, true, 0);
}
int fork() {
|
TC: Expand tc for kernel/clock module API's
1) Adds failure tc: invalid 'clk_id' as input to clock_getres() API.
2) Adds failure tc: invalid input to gettimeofday() API. | @@ -64,6 +64,9 @@ static void tc_clock_clock_getres(void)
TC_ASSERT_EQ("clock_getres", st_res.tv_sec, 0);
TC_ASSERT_EQ("clock_getres", st_res.tv_nsec, NSEC_PER_TICK);
+ ret_chk = clock_getres(33 , &st_res);
+ TC_ASSERT_EQ("clock_getres", ret_chk, ERROR);
+
TC_SUCCESS_RESULT();
}
@@ -135,6 +138,10 @@ static void tc_clock_clock_gettimeofday(void)
if (tv2.tv_sec == tv1.tv_sec + SEC_2) {
TC_ASSERT_GEQ("gettimeofday", tv2.tv_usec, tv1.tv_usec);
}
+#ifdef CONFIG_DEBUG
+ ret_chk = gettimeofday(NULL, NULL);
+ TC_ASSERT_EQ("gettimeofday", ret_chk, ERROR);
+#endif
TC_SUCCESS_RESULT();
}
|
json encode test assumes buffer is 0ed | @@ -79,6 +79,8 @@ TEST_CASE(test_json_simple_encode)
rc = json_encode_object_finish(&encoder);
TEST_ASSERT(rc == 0);
+ bigbuf[buf_index] = '\0';
+
/* does it match what we expect it to */
rc = strcmp(bigbuf, output);
TEST_ASSERT(rc == 0);
|
[CUDA] Fix address space of constant global variables | @@ -248,6 +248,22 @@ void pocl_update_users_address_space(llvm::Value *inst,
void pocl_fix_constant_address_space(llvm::Module *module)
{
+ // Loop over global variables
+ std::vector<llvm::GlobalVariable*> globals;
+ for (auto G = module->global_begin(); G != module->global_end(); G++)
+ {
+ globals.push_back(&*G);
+ }
+
+ for (auto G = globals.begin(); G != globals.end(); G++)
+ {
+ llvm::Type *type = (*G)->getType();
+ llvm::Type *new_type = type->getPointerElementType()->getPointerTo(1);
+ (*G)->mutateType(new_type);
+ pocl_update_users_address_space(*G);
+ }
+
+
// Loop over functions
std::vector<llvm::Function*> functions;
for (auto F = module->begin(); F != module->end(); F++)
|
apps/system/utils/utils_proc.h : Remove unnecessary #ifdef condition for proc utils
We don't need to enclose with ENABLE_PROC_UTILS for using proc utils.
Even it is not good to add every configs.
So remove unnecessary condition. | #include <tinyara/config.h>
#include <dirent.h>
-#if defined(CONFIG_ENABLE_IRQINFO) || defined(CONFIG_ENABLE_IRQINFO) || defined(CONFIG_ENABLE_PS) || defined(CONFIG_ENABLE_STACKMONITOR) || defined(CONFIG_ENABLE_HEAPINFO)
-#define ENABLE_PROC_UTILS
-#endif
-
-#if defined(ENABLE_PROC_UTILS)
enum proc_stat_data_e {
PROC_STAT_PID = 0,
PROC_STAT_PPID,
@@ -62,6 +57,4 @@ typedef void (*utils_print_t)(char *buf);
int utils_proc_pid_foreach(procentry_handler_t handler);
int utils_readfile(FAR const char *filepath, char *buf, int buflen, utils_print_t print_func);
-#endif
-
#endif /* __APPS_SYSTEM_UTILS_UTILS_PROC_H */
|
oauth2: fix missing parameter on warning message (CID 304404) | @@ -352,7 +352,7 @@ char *flb_oauth2_token_get(struct flb_oauth2 *ctx)
/* Issue request */
ret = flb_http_do(c, &b_sent);
if (ret != 0) {
- flb_warn("[oauth2] cannot issue request, http_do=%i, ret");
+ flb_warn("[oauth2] cannot issue request, http_do=%i", ret);
}
else {
flb_info("[oauth2] HTTP Status=%i", c->resp.status);
|
Fix coverity CID - Uninitialized pointer read in x942_encode_otherinfo() | @@ -164,7 +164,7 @@ static int x942_encode_otherinfo(size_t keylen,
/* keylenbits must fit into 4 bytes */
if (keylen > 0xFFFFFF)
- goto err;
+ return 0;
keylen_bits = 8 * keylen;
/* Calculate the size of the buffer */
|
runargs can be a table | @@ -226,7 +226,13 @@ function _make_targetinfo(mode, arch, target)
table.insert(runenvstr, k .. "=" .. v)
end
targetinfo.runenvs = table.concat(runenvstr, "\n")
- targetinfo.runargs = target:get("runargs")
+
+ local runargs = target:get("runargs")
+ if type(runargs) == "table" then
+ targetinfo.runargs = table.concat(runargs, " ")
+ else
+ targetinfo.runargs = runargs
+ end
-- use mfc? save the mfc runtime kind
if target:rule("win.sdk.mfc.shared_app") or target:rule("win.sdk.mfc.shared") then
|
[kernel] in SiconosVector(string,bool) constructor, remove bool default value
This is mainly to remove ambiguity with the SiconosVector(std::vector)
constructor when using C++11 initializer lists. | @@ -108,9 +108,9 @@ public:
/** constructor with an input file
* \param filename a std::string which contain the file path
- * \param b a boolean to indicate if the file is in ascii
+ * \param is_ascii a boolean to indicate if the file is in ascii
*/
- SiconosVector(const std::string& filename, bool b = true);
+ SiconosVector(const std::string& filename, bool is_ascii);
/** constructor for the concatenation of two vectors
* \param v1 the first vector
|
fixed bug output format error | @@ -564,7 +564,7 @@ memset(&essidstring, 0, 36);
memcpy(&essidstring, hcxrecord->essid, hcxrecord->essid_len);
if(showinfo1 == TRUE)
{
- printf("%8x%8x%8x%8x:%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s\n",
+ printf("%08x%08x%08x%08x:%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s\n",
hash[0], hash[1], hash[2], hash[3],
hcxrecord->mac_ap.addr[0], hcxrecord->mac_ap.addr[1], hcxrecord->mac_ap.addr[2], hcxrecord->mac_ap.addr[3], hcxrecord->mac_ap.addr[4], hcxrecord->mac_ap.addr[5],
hcxrecord->mac_sta.addr[0], hcxrecord->mac_sta.addr[1], hcxrecord->mac_sta.addr[2], hcxrecord->mac_sta.addr[3], hcxrecord->mac_sta.addr[4], hcxrecord->mac_sta.addr[5],
@@ -581,7 +581,7 @@ if(showinfo2 == TRUE)
exit(EXIT_FAILURE);
}
}
- fprintf(fhshowinfo2, "%8x%8x%8x%8x:%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s\n",
+ fprintf(fhshowinfo2, "%08x%08x%08x%08x:%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s\n",
hash[0], hash[1], hash[2], hash[3],
hcxrecord->mac_ap.addr[0], hcxrecord->mac_ap.addr[1], hcxrecord->mac_ap.addr[2], hcxrecord->mac_ap.addr[3], hcxrecord->mac_ap.addr[4], hcxrecord->mac_ap.addr[5],
hcxrecord->mac_sta.addr[0], hcxrecord->mac_sta.addr[1], hcxrecord->mac_sta.addr[2], hcxrecord->mac_sta.addr[3], hcxrecord->mac_sta.addr[4], hcxrecord->mac_sta.addr[5],
|
Try again on updating the version. | /* Don't nuke this block! It is used for automatically updating the
* versions below. VERSION = string formatting, VERNUM = numbered
* version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION "3.2.3"
-#define RUBY_LIBXML_VERNUM 323
+#define RUBY_LIBXML_VERSION "3.2.4"
+#define RUBY_LIBXML_VERNUM 324
#define RUBY_LIBXML_VER_MAJ 3
#define RUBY_LIBXML_VER_MIN 2
#define RUBY_LIBXML_VER_MIC 4
|
Detailed messages about sba failures | @@ -294,23 +294,23 @@ static double run_sba_find_3d_structure(SBAData *d, PoserDataLight *pdl, Survive
}
double rtn = -1;
- if (status > 0 && (info[1] / meas_size * 2) < d->max_error) {
+ bool status_failure = status <= 0;
+ bool error_failure = (info[1] / meas_size * 2) >= d->max_error;
+ if (!status_failure && !error_failure) {
d->failures_to_reset_cntr = d->failures_to_reset;
quatnormalize(soLocation.Rot, soLocation.Rot);
*out = soLocation;
rtn = info[1] / meas_size * 2;
- } else if ((info[1] / meas_size * 2) >= d->max_error) {
+ } else if (error_failure) {
d->stats.error_failures++;
}
{
SurviveContext *ctx = so->ctx;
// Docs say info[0] should be divided by meas; I don't buy it really...
- static int cnt = 0;
- if (cnt++ > 1000 || meas_size < d->required_meas || (info[1] / meas_size * 2) > d->max_error) {
- // SV_INFO("%f original reproj error for %u meas", (info[0] / meas_size * 2), (int)meas_size);
- // SV_INFO("%f cur reproj error", (info[1] / meas_size * 2));
- cnt = 0;
+ if (error_failure) {
+ SV_INFO("%f original reproj error for %u meas", (info[0] / meas_size * 2), (int)meas_size);
+ SV_INFO("%f cur reproj error", (info[1] / meas_size * 2));
}
}
|
board/sweetberry/board.c: Format with clang-format
BRANCH=none
TEST=none | @@ -59,38 +59,33 @@ struct dwc_usb usb_ctl = {
/* I2C ports */
const struct i2c_port_t i2c_ports[] = {
- {
- .name = "i2c1",
+ { .name = "i2c1",
.port = I2C_PORT_0,
.kbps = 400,
.scl = GPIO_I2C1_SCL,
- .sda = GPIO_I2C1_SDA
- },
- {
- .name = "i2c2",
+ .sda = GPIO_I2C1_SDA },
+ { .name = "i2c2",
.port = I2C_PORT_1,
.kbps = 400,
.scl = GPIO_I2C2_SCL,
- .sda = GPIO_I2C2_SDA
- },
- {
- .name = "i2c3",
+ .sda = GPIO_I2C2_SDA },
+ { .name = "i2c3",
.port = I2C_PORT_2,
.kbps = 400,
.scl = GPIO_I2C3_SCL,
- .sda = GPIO_I2C3_SDA
- },
- {
- .name = "fmpi2c4",
+ .sda = GPIO_I2C3_SDA },
+ { .name = "fmpi2c4",
.port = FMPI2C_PORT_3,
.kbps = 900,
.scl = GPIO_FMPI2C_SCL,
- .sda = GPIO_FMPI2C_SDA
- },
+ .sda = GPIO_FMPI2C_SDA },
};
const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
-int usb_i2c_board_is_enabled(void) { return 1; }
+int usb_i2c_board_is_enabled(void)
+{
+ return 1;
+}
#define GPIO_SET_HS(bank, number) \
(STM32_GPIO_OSPEEDR(GPIO_##bank) |= (0x3 << ((number)*2)))
|
fcrypt: add documentation about textmode
See for discussion. | @@ -66,15 +66,15 @@ Please refer to [crypto](../crypto/).
You can mount the plugin with encryption enabled like this:
- kdb mount test.ecf /t fcrypt encrypt/key=DDEBEF9EE2DC931701338212DAF635B17F230E8D
+ kdb mount test.ecf /t fcrypt "encrypt/key=DDEBEF9EE2DC931701338212DAF635B17F230E8D"
If you only want to sign the configuration file, you can mount the plugin like this:
- kdb mount test.ecf /t fcrypt sign/key=DDEBEF9EE2DC931701338212DAF635B17F230E8D
+ kdb mount test.ecf /t fcrypt "sign/key=DDEBEF9EE2DC931701338212DAF635B17F230E8D"
Both options `encrypt/key` and `sign/key` can be combined:
- kdb mount test.ecf /t fcrypt encrypt/key=DDEBEF9EE2DC931701338212DAF635B17F230E8D sign/key=DDEBEF9EE2DC931701338212DAF635B17F230E8D
+ kdb mount test.ecf /t fcrypt "encrypt/key=DDEBEF9EE2DC931701338212DAF635B17F230E8D,sign/key=DDEBEF9EE2DC931701338212DAF635B17F230E8D"
If you create a key under `/t`
@@ -110,3 +110,12 @@ However, you can simply display the plain text content of the file by using GPG:
### GPG Configuration
The GPG Configuration is described in [crypto](../crypto/).
+
+### Textmode
+
+`fcrypt` operates in textmode per default. In textmode `fcrypt` uses the `--armor` option of GPG, thus the
+output of `fcrypt` is ASCII armored. If no encryption key is provided (i.e. only signature is requested)
+`fcrypt` uses the `--clearsign` option of GPG.
+
+Textmode can be disabled by setting `fcrypt/textmode` to `0` in the plugin configuration.
+
|
network: fix poll(2) call fd
Fixes small bug for
(commit b8689c0afbcf308f1844b8e1611381ada80c8f6d)
One was added accidentally to fd.
pfd_read.fd = fd + 1; => pfd_read.fd = fd; | @@ -270,7 +270,7 @@ static int net_connect_sync(int fd, const struct sockaddr *addr, socklen_t addrl
* for this use case.
*/
- pfd_read.fd = fd + 1;
+ pfd_read.fd = fd;
pfd_read.events = POLLIN;
ret = poll(&pfd_read, 1, connect_timeout * 1000);
if (ret == 0) {
|
initialize iceflowtot to 0 | @@ -1152,6 +1152,7 @@ void InitializeClimateParams(BODY *body, int iBody, int iVerbose) {
body[iBody].daEnerResWAnn = malloc(body[iBody].iNumLats*sizeof(double));
body[iBody].bSnowball = 0;
body[iBody].dFluxInGlobal = 0;
+ body[iBody].dIceFlowTot = 0;
if (body[iBody].bColdStart) {
Toffset = -40.0;
|
Just do one specific test for now | @@ -43,4 +43,4 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y valgrind
- valgrind -v --error-exitcode=1 --track-origins=yes ./picoquic_ct -n
\ No newline at end of file
+ valgrind -v --error-exitcode=1 --track-origins=yes ./picoquic_ct zero_rtt_many_losses
\ No newline at end of file
|
Remove useless prefetch in ip4-rewrite node
Prefetching first 2 packets' header is useless cause of the prefetching
action is not done before using the packets.
There's no performance drop in Xeon platform and slightly performance
gain in Atom platform after rmoving the prefetch. | @@ -2197,7 +2197,7 @@ ip4_rewrite_inline (vlib_main_t * vm,
if (n_left_from >= 6)
{
int i;
- for (i = 0; i < 6; i++)
+ for (i = 2; i < 6; i++)
vlib_prefetch_buffer_header (bufs[i], LOAD);
}
|
Add arch detection in build tool | @@ -66,6 +66,12 @@ while getopts c:dhpsv-: opt_val; do
esac
done
+arch=
+case $(uname -m) in
+ x86_64) arch=x86_64;;
+ *) arch=unknown;;
+esac
+
warn() {
echo "Warning: $*" >&2
}
@@ -201,6 +207,11 @@ build_target() {
;;
*) fatal "Unknown build config \"$1\"";;
esac
+
+ case $arch in
+ x86_64) add cc_flags -march=nehalem;;
+ esac
+
add source_files field.c mark.c bank.c sim.c
case "$2" in
orca|cli)
@@ -239,6 +250,7 @@ print_info() {
fi
cat <<EOF
Operating system: $os
+Architecture: $arch
Compiler name: $cc_exe
Compiler type: $cc_id
Compiler version: $cc_vers
|
firdecim/autotest: using prototype generation for block test | @@ -70,13 +70,15 @@ void autotest_firdecim_block()
{
unsigned int M = 4;
unsigned int m = 12;
+ float beta = 0.3f;
unsigned int num_blocks = 10 + m;
float complex buf_0[M*num_blocks]; // input
float complex buf_1[ num_blocks]; // output (regular)
float complex buf_2[ num_blocks]; // output (block)
- firdecim_crcf decim = firdecim_crcf_create_kaiser(M, m, 60.0f);
+ firdecim_crcf decim = firdecim_crcf_create_prototype(
+ LIQUID_FIRFILT_ARKAISER, M, m, beta, 0);
// create random-ish input (does not really matter what the input is
// so long as the outputs match, but systematic for repeatability)
|
Remove invalid comments in pk_can_do_ext() | @@ -275,13 +275,9 @@ void pk_can_do_ext( int key_type, int key_usage, int key_alg, int key_alg2,
TEST_EQUAL( mbedtls_pk_can_do_ext( &pk, alg_check ), result );
exit:
- /*
- * Key attributes may have been returned by psa_get_key_attributes()
- * thus reset them as required.
- */
psa_reset_key_attributes( &attributes );
PSA_ASSERT( psa_destroy_key( key ) );
- mbedtls_pk_free( &pk ); /* redundant except upon error */
+ mbedtls_pk_free( &pk );
USE_PSA_DONE( );
}
/* END_CASE */
|
SOVERSION bump to version 2.26.0 | @@ -65,8 +65,8 @@ set(LIBYANG_MICRO_VERSION 5)
set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
# set version of the library
set(LIBYANG_MAJOR_SOVERSION 2)
-set(LIBYANG_MINOR_SOVERSION 25)
-set(LIBYANG_MICRO_SOVERSION 4)
+set(LIBYANG_MINOR_SOVERSION 26)
+set(LIBYANG_MICRO_SOVERSION 0)
set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION})
set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION})
|
shared-lib: preserve CFLAGS & move to MAKESTAGE=2
We do not want to override the CFLAGS, so just add -fPIC to the normal
initialization of CFLAGS.
Additionally, the target needs to be defined in MAKESTAGE=2,
because the necessary variables are only defined in there. | @@ -319,7 +319,7 @@ endif
ifeq ($(MAKESTAGE),1)
.PHONY: doc/commands.txt $(TARGETS)
-default all clean allclean distclean doc/commands.txt doxygen test utest utest_gpu gputest pythontest $(TARGETS):
+default all clean allclean distclean doc/commands.txt doxygen test utest utest_gpu gputest pythontest shared-lib $(TARGETS):
$(MAKE) MAKESTAGE=2 $(MAKECMDGOALS)
tests/test-%: force
@@ -804,7 +804,12 @@ utests_gpu-all: $(UTARGETS_GPU)
utest_gpu: utests_gpu-all
@echo ALL GPU UNIT TESTS PASSED.
-
+# shared library
+shared-lib:
+ make allclean
+ CFLAGS="-fPIC $(OPT) -Wmissing-prototypes" make
+ gcc -shared -fopenmp -o libbart.so src/bart.o -Wl,-whole-archive lib/lib*.a -Wl,-no-whole-archive -Wl,-Bdynamic $(FFTW_L) $(CUDA_L) $(BLAS_L) $(PNG_L) $(ISMRM_L) $(LIBS) -lm -lrt
+ make allclean
endif # MAKESTAGE
@@ -828,11 +833,4 @@ bart.syms: bart
rules/make_symbol_table.sh bart bart.syms
-# shared library
-shared-lib:
- make allclean
- CFLAGS=-fPIC make
- gcc -shared -fopenmp -o libbart.so src/bart.o -Wl,-whole-archive lib/lib*.a -Wl,-no-whole-archive -Wl,-Bdynamic $(FFTW_L) $(CUDA_L) $(BLAS_L) $(PNG_L) $(ISMRM_L) $(LIBS) -lm -lrt
- make allclean
-
|
update fftmonitor doc | # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
"""
-the :mod:`sbp.client.examples.simple` module contains a basic example of
-reading SBP messages from a serial port, decoding BASELINE_NED messages and
-printing them out.
+the :mod:`sbp.client.util.fftmonitor` module contains functionality to log
+and assemble spectrum analyzer messages into FFT information
"""
from collections import defaultdict
|
Setting for Contactor | @@ -3189,12 +3189,14 @@ devices can operate on either battery or mains power, and can have a wide variet
> Dimmer switch without neutral : Option 1 = Dimmer on/off.
> Cable outlet : Option 1 = Fil pilote on/off.
+> Contactor : On/off=0003 - HP/HC=0004.
</description>
<server>
<attribute id="0x0000" type="dat16" name="Option 1" default="0x0101" access="rw" required="m" showas="hex">
<description>Choose correctly according to your device Dimmer OR fil pilote.
Dimmer > Off=0100 - On=0101
-Fil pilote > Off=0001 - On=0002</description>
+Fil pilote > Off=0001 - On=0002
+Contactor > On/off=0003 - HP/HC=0004</description>
</attribute>
<attribute id="0x0001" type="bool" name="Option 2" required="m" access="rw" default="0">
<description>Option 1</description>
|
Fix Android compilation issue | @@ -71,7 +71,7 @@ public class MapView extends GLSurfaceView implements GLSurfaceView.Renderer, Ma
public static boolean registerLicense(final String licenseKey, Context context) {
// Check that native .so loading was successful
if (libraryLoadingErrorCause != null) {
- throw RuntimeException("Failed to load native library", libraryLoadingErrorCause);
+ throw new RuntimeException("Failed to load native library", libraryLoadingErrorCause);
}
// Connect context info and assets manager to native part
|
highlevel: elektraOpen: take defaults values from metadata | @@ -47,6 +47,8 @@ static void insertDefaults (KeySet * config, const Key * parentKey, KeySet * def
* a non-existent value will cause a fatal error. It is recommended, to
* only pass NULL, if you are using a specification, which provides
* default values inside of the KDB.
+ * If a key in this KeySet doesn't have a value, we will use the value of the "default"
+ * metakey of this key.
* @param error If an error occurs during initialization of the Elektra instance, this pointer
* will be used to report the error.
*
@@ -290,6 +292,16 @@ void insertDefaults (KeySet * config, const Key * parentKey, KeySet * defaults)
const char * name = keyName (key);
keySetName (dup, keyName (parentKey));
keyAddName (dup, name);
+
+ if (strlen (keyString (dup)) == 0)
+ {
+ const Key * defaultMeta = keyGetMeta (dup, "default");
+ if (defaultMeta != NULL)
+ {
+ keySetString (dup, keyString (defaultMeta));
+ }
+ }
+
ksAppendKey (config, dup);
}
}
|
Set manufacturer name to Namron AS for all devices starting with 451270 | @@ -5669,6 +5669,10 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const SensorFi
{
sensorNode.setManufacturer("Heiman");
}
+ else if (modelId.startsWith(QLatin1String("451270")))
+ {
+ sensorNode.setManufacturer("Namron AS");
+ }
else if (node->nodeDescriptor().manufacturerCode() == VENDOR_LGE)
{
sensorNode.setManufacturer("LG Electronics");
|
engine: added ring buffer flush request handler | #include <fluent-bit/flb_http_server.h>
#include <fluent-bit/flb_metrics.h>
#include <fluent-bit/flb_version.h>
+#include <fluent-bit/flb_ring_buffer.h>
#ifdef FLB_HAVE_METRICS
#include <fluent-bit/flb_metrics_exporter.h>
@@ -524,6 +525,14 @@ static int flb_engine_log_start(struct flb_config *config)
return 0;
}
+static void flb_engine_drain_ring_buffer_signal_channel(struct flb_ring_buffer *rb)
+{
+ static char signal_buffer[512];
+
+ flb_pipe_r(rb->signal_channels[0], signal_buffer, sizeof(signal_buffer));
+}
+
+
#ifdef FLB_HAVE_IN_STORAGE_BACKLOG
extern int sb_segregate_chunks(struct flb_config *config);
#else
@@ -538,6 +547,7 @@ int flb_engine_start(struct flb_config *config)
int ret;
uint64_t ts;
char tmp[16];
+ int rb_flush_flag;
struct flb_time t_flush;
struct mk_event *event;
struct mk_event_loop *evl;
@@ -771,13 +781,14 @@ int flb_engine_start(struct flb_config *config)
ret = sb_segregate_chunks(config);
- if (ret)
- {
+ if (ret) {
flb_error("[engine] could not segregate backlog chunks");
return -2;
}
while (1) {
+ rb_flush_flag = FLB_FALSE;
+
mk_event_wait(evl); /* potentially conditional mk_event_wait or mk_event_wait_2 based on bucket queue capacity for one shot events */
flb_event_priority_live_foreach(event, evl_bktq, evl, FLB_ENGINE_LOOP_MAX_ITER) {
if (event->type == FLB_ENGINE_EV_CORE) {
@@ -902,6 +913,15 @@ int flb_engine_start(struct flb_config *config)
ts = cmt_time_now();
handle_input_event(event->fd, ts, config);
}
+ else if(event->type == FLB_ENGINE_EV_THREAD_INPUT) {
+ flb_engine_drain_ring_buffer_signal_channel((struct flb_ring_buffer *) event->data);
+
+ rb_flush_flag = FLB_TRUE;
+ }
+ }
+
+ if (rb_flush_flag) {
+ flb_input_chunk_ring_buffer_collector(config, NULL);
}
/* Cleanup functions associated to events and timers */
|
Mark __sanitizer_cov_indir_call16 as weak to avoid problems with llvm-4.0 interfaces | @@ -234,7 +234,11 @@ ATTRIBUTE_X86_REQUIRE_SSE42 void __sanitizer_cov_trace_pc_indir(uintptr_t callee
}
}
-ATTRIBUTE_X86_REQUIRE_SSE42 void __sanitizer_cov_indir_call16(
+/*
+ * In LLVM-4.0 it marked (probably mistakenly) as non-weak symbol, so we need to mark it as weak
+ * here
+ */
+__attribute__((weak)) ATTRIBUTE_X86_REQUIRE_SSE42 void __sanitizer_cov_indir_call16(
void* callee, void* callee_cache16[] HF_ATTR_UNUSED) {
register size_t pos1 = (uintptr_t)__builtin_return_address(0) << 12;
register size_t pos2 = (uintptr_t)callee & 0xFFF;
|
export flag functions | @@ -546,6 +546,15 @@ struct evhtp_ssl_cfg_s {
*/
EVHTP_EXPORT evhtp_t * evhtp_new(evbase_t * evbase, void * arg);
+EVHTP_EXPORT void evhtp_enable_flag(evhtp_t *, int);
+EVHTP_EXPORT void evhtp_connection_enable_flag(evhtp_connection_t *, int);
+EVHTP_EXPORT void evhtp_request_enable_flag(evhtp_request_t *, int);
+EVHTP_EXPORT int evhtp_get_flags(evhtp_t *);
+EVHTP_EXPORT int evhtp_connection_get_flags(evhtp_connection_t *);
+EVHTP_EXPORT int evhtp_request_get_flags(evhtp_request_t *);
+EVHTP_EXPORT void evhtp_disable_flag(evhtp_t *, int);
+EVHTP_EXPORT void evhtp_connection_disable_flag(evhtp_connection_t *, int);
+EVHTP_EXPORT void evhtp_request_disable_flag(evhtp_request_t *, int);
/**
* @brief free a evhtp_t context
|
[mod_accesslog] flush access logs every 4 seconds | @@ -649,12 +649,10 @@ SETDEFAULTS_FUNC(log_access_open) {
#define O_LARGEFILE 0
#endif
-SIGHUP_FUNC(log_access_cycle) {
+static void log_access_flush(server *srv, void *p_d) {
plugin_data *p = p_d;
size_t i;
- if (!p->config_storage) return HANDLER_GO_ON;
-
for (i = 0; i < srv->config_context->used; i++) {
plugin_config *s = p->config_storage[i];
@@ -665,7 +663,25 @@ SIGHUP_FUNC(log_access_cycle) {
buffer_reset(s->access_logbuffer);
}
+ }
+}
+TRIGGER_FUNC(log_access_periodic_flush) {
+ /* flush buffered access logs every 4 seconds */
+ if (0 == (srv->cur_ts & 3)) log_access_flush(srv, p_d);
+ return HANDLER_GO_ON;
+}
+
+SIGHUP_FUNC(log_access_cycle) {
+ plugin_data *p = p_d;
+ size_t i;
+
+ if (!p->config_storage) return HANDLER_GO_ON;
+
+ log_access_flush(srv, p);
+
+ for (i = 0; i < srv->config_context->used; i++) {
+ plugin_config *s = p->config_storage[i];
if (s->use_syslog == 0
&& !buffer_string_is_empty(s->access_logfile)
&& s->access_logfile->ptr[0] != '|') {
@@ -1126,6 +1142,7 @@ int mod_accesslog_plugin_init(plugin *p) {
p->cleanup = mod_accesslog_free;
p->handle_request_done = log_access_write;
+ p->handle_trigger = log_access_periodic_flush;
p->handle_sighup = log_access_cycle;
p->data = NULL;
|
fixed class name
VL53L0X => VL53L1X | @@ -93,7 +93,7 @@ VL51L1X_DEFAULT_CONFIGURATION = bytes([
0x01, # 0x86 : clear interrupt, use ClearInterrupt() */
0x40 # 0x87 : start ranging, use StartRanging() or StopRanging(), If you want an automatic start after VL53L1X_init() call, put 0x40 in location 0x87 */
])
-class VL53L0X:
+class VL53L1X:
def __init__(self,i2c, address=0x29):
self.i2c = i2c
self.address = address
|
libcupsfilters: Double free in imagetoraster() filter function fixed | @@ -211,7 +211,7 @@ imagetoraster(int inputfd, /* I - File descriptor input stream */
xc1, yc1;
ppd_file_t *ppd; /* PPD file */
ppd_choice_t *choice; /* PPD option choice */
- char *resolution = "", /* Output resolution */
+ char *resolution = strdup("300dpi") , /* Output resolution */
*media_type ; /* Media type */
ppd_profile_t *profile; /* Color profile */
ppd_profile_t userprofile; /* User-specified profile */
@@ -420,6 +420,7 @@ imagetoraster(int inputfd, /* I - File descriptor input stream */
header.cupsPageSize[1] :
(float)header.PageSize[1];
}
+if(log) log(ld, FILTER_LOGLEVEL_DEBUG, "doc.color = %d", doc.Color);
if ((val = cupsGetOption("multiple-document-handling",
num_options, options)) != NULL)
{
@@ -560,7 +561,7 @@ imagetoraster(int inputfd, /* I - File descriptor input stream */
/*
* Set the needed options in the page header...
*/
-
+ if(ppd!=NULL)
if (ppdRasterInterpretPPD(&header, ppd, num_options, options, raster_cb))
{
if (log) {
@@ -635,7 +636,8 @@ imagetoraster(int inputfd, /* I - File descriptor input stream */
}
}
else
- resolution = strdup("");
+ resolution = strdup("300dpi");
+ if(log) log(ld, FILTER_LOGLEVEL_DEBUG, "Resolution = %s", resolution);
/* support the "cm-calibration" option */
cm_calibrate = cmGetCupsColorCalibrateMode(options, num_options);
@@ -1919,19 +1921,29 @@ imagetoraster(int inputfd, /* I - File descriptor input stream */
/*
* Free memory used for the "zoom" engine...
*/
- free(resolution);
- free(media_type);
_cupsImageZoomDelete(z);
}
}
-
+ if(resolution){
+ free(resolution);
+ resolution = NULL;
+ }
+ if(media_type){
+ free(media_type);
+ media_type = NULL;
+ }
/*
* Close files...
*/
canceled:
+ if(resolution){
free(resolution);
+ resolution = NULL;}
+ if(media_type){
free(media_type);
+ media_type = NULL;
+ }
free(row);
cupsRasterClose(ras);
cupsImageClose(img);
|
arch/bcm4390x: Add necessary configs which is defined in defconfig
To use CY4390X board, some configurations are necessary but
they are not added in bcm4390x/Kconfig.
This causes disapearing of existed definition from defconfig when
menuconfig is executed.
This commit adds them into bcm4390x/Kconfig. | @@ -34,14 +34,26 @@ config BOOT_RESULT
bool
default y
-
config BCM4390X_BCM43907
bool
default n
select ARCH_CORTEXR4
select ARMV7R_ICACHE
select ARMV7R_DCACHE
-
+ select BCM4390X_UART0
+ select BCM4390X_UART1
+ select BCM4390X_I2C
+ select BCM4390X_I2C0
+ select BCM4390X_I2C1
+ select BCM4390X_PWM
+ select BCM4390X_SPI
+ select BCM4390X_SPI0
+ select BCM4390X_SPI1
+ select BCM4390X_GPIO
+ select BCM4390X_SFLASH
+ select BCM4390X_WDT
+ select BCM4390X_WIRELESS
+ select BCM4390X_M2M
config BCM4390X_BOOT_RESULT_ADDR
hex "boot result address (physical)"
@@ -52,11 +64,87 @@ config BCM4390X_BCM43909
bool
default n
select ARCH_CORTEXR4
- select ARMV7R_HAVE_ICACHE
- select ARMV7R_HAVE_DCACHE
+ select ARMV7R_ICACHE
+ select ARMV7R_DCACHE
config ARMCR4_CYCLE_COUNTER_REG
hex "Cpu clock Register address"
default 0x18003028
+comment "BCM4390x Peripheral Support"
+config BCM4390X_UART0
+ bool
+ default n
+ select ARCH_HAVE_UART0
+ select ARCH_HAVE_SERIAL_TERMIOS
+
+config BCM4390X_UART1
+ bool
+ default n
+ select ARCH_HAVE_UART1
+ select ARCH_HAVE_SERIAL_TERMIOS
+
+config BCM4390X_UART2
+ bool
+ default n
+ select ARCH_HAVE_UART2
+ select ARCH_HAVE_SERIAL_TERMIOS
+
+config BCM4390X_I2C
+ bool
+ default n
+
+config BCM4390X_I2C0
+ bool
+ default n
+
+config BCM4390X_I2C1
+ bool
+ default n
+
+config BCM4390X_PWM
+ bool
+ default n
+
+config BCM4390X_SPI
+ bool
+ default n
+
+config BCM4390X_SPI0
+ bool
+ default n
+
+config BCM4390X_SPI1
+ bool
+ default n
+
+config BCM4390X_GPIO
+ bool
+ default n
+
+if BCM4390X_GPIO
+config BCM4390X_GPIO_COUNT
+ int
+ default 17
+endif
+
+config BCM4390X_SFLASH
+ bool
+ default n
+
+config BCM4390X_BOOTLOADER_REGION_SIZE
+ int
+ default 4128
+
+config BCM4390X_WDT
+ bool
+ default n
+
+config BCM4390X_WIRELESS
+ bool
+ default n
+
+config BCM4390X_M2M
+ bool
+ default n
endif # ARCH_CHIP_BCM4390X
|
add authcode flow | -oidc-agent (1.1.1-2) UNRELEASED; urgency=medium
+oidc-agent (1.2.0) UNRELEASED; urgency=medium
[ Marcus hardt ]
* Trying to fix debuild messages
@@ -8,4 +8,7 @@ oidc-agent (1.1.1-2) UNRELEASED; urgency=medium
* Fixes dependencies versions
* adds man pages
- -- Gabriel Zachmann <[email protected]> Tue, 19 Sep 2017 09:16:45 +0200
+ [ Marcus Hardt ]
+ * Add authentication code flow
+
+ -- Marcus Hardt <[email protected]> Tue, 30 Jan 2018 13:37:47 +0100
|
Don't restyle end of file
Move the *INDENT-ON* annotation to the end of the file so that
uncrustify does not restyle the later sections (since it introduces a
risk of future problems). | #endif /* MSVC */
#endif /* MBEDTLS_HAVE_ASM */
-/* *INDENT-ON* */
#if !defined(MULADDC_X1_CORE)
#if defined(MBEDTLS_HAVE_UDBL)
#define MULADDC_X8_CORE MULADDC_X4_CORE MULADDC_X4_CORE
#endif /* MULADDC_X8_CORE */
+/* *INDENT-ON* */
#endif /* bn_mul.h */
|
make test: fix dependencies
checkstyle - doesn't need scapy/pexpect, remove it
doc - scapy wasn't patched properly, fix it | @@ -54,9 +54,9 @@ wipe: reset
@rm -rf $(PYTHON_VENV_PATH)
@rm -f $(PAPI_INSTALL_FLAGS)
-doc: verify-python-path
+doc: verify-python-path $(PIP_PATCH_DONE)
@virtualenv $(PYTHON_VENV_PATH) -p python2.7
- @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install $(PYTHON_DEPENDS) sphinx sphinx-rtd-theme"
+ @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install sphinx sphinx-rtd-theme"
@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && make -C doc WS_ROOT=$(WS_ROOT) BR=$(BR) NO_VPP_PAPI=1 html"
.PHONY: wipe-doc
|
Check whether there is enough space for ND6 option headers when processing
incoming packets. | @@ -123,7 +123,8 @@ static uip_ds6_prefix_t *prefix; /** Pointer to a prefix list entry */
/*------------------------------------------------------------------*/
/* Copy link-layer address from LLAO option to a word-aligned uip_lladdr_t */
static int
-extract_lladdr_from_llao_aligned(uip_lladdr_t *dest) {
+extract_lladdr_from_llao_aligned(uip_lladdr_t *dest)
+{
if(dest != NULL && nd6_opt_llao != NULL) {
memcpy(dest, &nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], UIP_LLADDR_LEN);
return 1;
@@ -135,7 +136,8 @@ extract_lladdr_from_llao_aligned(uip_lladdr_t *dest) {
#if UIP_ND6_SEND_NA /* UIP_ND6_SEND_NA */
/* create a llao */
static void
-create_llao(uint8_t *llao, uint8_t type) {
+create_llao(uint8_t *llao, uint8_t type)
+{
llao[UIP_ND6_OPT_TYPE_OFFSET] = type;
llao[UIP_ND6_OPT_LEN_OFFSET] = UIP_ND6_OPT_LLAO_LEN >> 3;
memcpy(&llao[UIP_ND6_OPT_DATA_OFFSET], &uip_lladdr, UIP_LLADDR_LEN);
@@ -193,7 +195,7 @@ ns_input(void)
/* Options processing */
nd6_opt_llao = NULL;
nd6_opt_offset = UIP_ND6_NS_LEN;
- while(uip_l3_icmp_hdr_len + nd6_opt_offset < uip_len) {
+ while(uip_l3_icmp_hdr_len + nd6_opt_offset + UIP_ND6_OPT_HDR_LEN < uip_len) {
#if UIP_CONF_IPV6_CHECKS
if(ND6_OPT_HDR_BUF(nd6_opt_offset)->len == 0) {
LOG_ERR("NS received is bad\n");
@@ -202,6 +204,11 @@ ns_input(void)
#endif /* UIP_CONF_IPV6_CHECKS */
switch (ND6_OPT_HDR_BUF(nd6_opt_offset)->type) {
case UIP_ND6_OPT_SLLAO:
+ if(uip_l3_icmp_hdr_len + nd6_opt_offset +
+ UIP_ND6_OPT_DATA_OFFSET + UIP_LLADDR_LEN > uip_len) {
+ LOG_ERR("Insufficient data for NS SLLAO option\n");
+ goto discard;
+ }
nd6_opt_llao = &uip_buf[uip_l3_icmp_hdr_len + nd6_opt_offset];
#if UIP_CONF_IPV6_CHECKS
/* There must be NO option in a DAD NS */
|
tools: Make Utility.console_log accept Unicode and byte strings as well | @@ -3,18 +3,18 @@ import sys
_COLOR_CODES = {
- "white": '\033[0m',
- "red": '\033[31m',
- "green": '\033[32m',
- "orange": '\033[33m',
- "blue": '\033[34m',
- "purple": '\033[35m',
- "W": '\033[0m',
- "R": '\033[31m',
- "G": '\033[32m',
- "O": '\033[33m',
- "B": '\033[34m',
- "P": '\033[35m'
+ "white": u'\033[0m',
+ "red": u'\033[31m',
+ "green": u'\033[32m',
+ "orange": u'\033[33m',
+ "blue": u'\033[34m',
+ "purple": u'\033[35m',
+ "W": u'\033[0m',
+ "R": u'\033[31m',
+ "G": u'\033[32m',
+ "O": u'\033[33m',
+ "B": u'\033[34m',
+ "P": u'\033[35m'
}
@@ -29,8 +29,10 @@ def console_log(data, color="white", end="\n"):
if color not in _COLOR_CODES:
color = "white"
color_codes = _COLOR_CODES[color]
+ if type(data) is type(b''):
+ data = data.decode('utf-8', 'replace')
print(color_codes + data, end=end)
if color not in ["white", "W"]:
# reset color to white for later logs
- print(_COLOR_CODES["white"] + "\r")
+ print(_COLOR_CODES["white"] + u"\r")
sys.stdout.flush()
|
BugID:17646749:[mqtt]add port check in construct | @@ -3084,7 +3084,8 @@ void *IOT_MQTT_Construct(iotx_mqtt_param_t *pInitParams)
}
if (pInitParams->host == NULL || pInitParams->client_id == NULL ||
- pInitParams->username == NULL || pInitParams->password == NULL) {
+ pInitParams->username == NULL || pInitParams->password == NULL ||
+ pInitParams->port == 0) {
mqtt_err("init params is not complete");
if (mqtt_params != NULL) {
mqtt_free(mqtt_params);
|
Fix pgbouncer compatibility in SHOW CLIENTS | @@ -529,6 +529,16 @@ od_console_show_clients_callback(od_client_t *client, void **argv)
return -1;
/* request_time */
rc = kiwi_be_write_data_row_add(stream, offset, NULL, -1);
+ if (rc == -1)
+ return -1;
+ /* wait */
+ data_len = od_snprintf(data, sizeof(data), "0");
+ rc = kiwi_be_write_data_row_add(stream, offset, data, data_len);
+ if (rc == -1)
+ return -1;
+ /* wait_us */
+ data_len = od_snprintf(data, sizeof(data), "0");
+ rc = kiwi_be_write_data_row_add(stream, offset, data, data_len);
if (rc == -1)
return -1;
/* ptr */
@@ -587,7 +597,7 @@ od_console_show_clients(od_client_t *client, machine_msg_t *stream)
machine_msg_t *msg;
msg = kiwi_be_write_row_descriptionf(stream,
- "sssssdsdssssds",
+ "sssssdsdssddssds",
"type",
"user",
"database",
@@ -598,6 +608,8 @@ od_console_show_clients(od_client_t *client, machine_msg_t *stream)
"local_port",
"connect_time",
"request_time",
+ "wait",
+ "wait_us",
"ptr",
"link",
"remote_pid",
|
Update README.md
Change z_spec to z_s | @@ -309,9 +309,9 @@ where `smooth_mass` is mass smoothing scale (in units of *M_sun*) and `odelta` i
### LSST Specifications
`CCL` includes LSST specifications for the expected galaxy distributions of the full galaxy clustering sample and the lensing source galaxy sample. Start by defining a flexible photometric redshift model given by function
````c
-double (* your_pz_func)(double z_ph, double z_spec, void *param, int * status);
+double (* your_pz_func)(double z_ph, double z_s, void *param, int * status);
````
-which returns the likelihood of measuring a particular photometric redshift `z_ph` given a spectroscopic redshift `z_spec`, with a pointer to additional arguments `param` and a status flag. Then you call function **`ccl_specs_create_photoz_info`**
+which returns the likelihood of measuring a particular photometric redshift `z_ph` given a spectroscopic redshift `z_s`, with a pointer to additional arguments `param` and a status flag. Then you call function **`ccl_specs_create_photoz_info`**
````c
user_pz_info* ccl_specs_create_photoz_info(void * user_params,
double(*user_pz_func)(double, double, void*, int*));
@@ -380,13 +380,13 @@ struct user_func_params
double (* sigma_z) (double);
};
-// The user defines a function of the form double function ( z_ph, z_spec, void * user_pz_params)
+// The user defines a function of the form double function ( z_ph, z_s, void * user_pz_params)
// where user_pz_params is a pointer to the parameters of the user-defined function.
// This returns the probabilty of obtaining a given photo-z given a particular spec_z.
-double user_pz_probability(double z_ph, double z_spec, void * user_par, int * status)
+double user_pz_probability(double z_ph, double z_s, void * user_par, int * status)
{
- double sigma_z = ((struct user_func_params *) user_par)->sigma_z(z_spec);
- return exp(- (z_ph-z_spec)*(z_ph-z_spec) / (2.*sigma_z*sigma_z)) / (pow(2.*M_PI,0.5)*sigma_z);
+ double sigma_z = ((struct user_func_params *) user_par)->sigma_z(z_s);
+ return exp(- (z_ph-z_s)*(z_ph-z_s) / (2.*sigma_z*sigma_z)) / (pow(2.*M_PI,0.5)*sigma_z);
}
int main(int argc,char **argv)
|
libcommon/files: use open(O_DIRECTORY|O_CLOEXEC) | @@ -278,11 +278,16 @@ bool files_init(honggfuzz_t * hfuzz)
return false;
}
- if ((hfuzz->inputDirP = opendir(hfuzz->inputDir)) == NULL) {
+ int dir_fd = open(hfuzz->inputDir, O_DIRECTORY | O_RDONLY | O_CLOEXEC);
+ if (dir_fd == -1) {
+ PLOG_W("open('%s', O_DIRECTORY|O_RDONLY|O_CLOEXEC)", hfuzz->inputDir);
+ return false;
+ }
+ if ((hfuzz->inputDirP = fdopendir(dir_fd)) == NULL) {
+ close(dir_fd);
PLOG_W("opendir('%s')", hfuzz->inputDir);
return false;
}
-
if (files_getDirStatsAndRewind(hfuzz) == false) {
hfuzz->fileCnt = 0U;
LOG_W("files_getDirStatsAndRewind('%s')", hfuzz->inputDir);
|
fast-reboot: allow mambo fast reboot independent of CPU type
Don't tie mambo fast reboot to POWER8 CPU type. | @@ -363,7 +363,8 @@ void fast_reboot(void)
struct cpu_thread *cpu;
static int fast_reboot_count = 0;
- if (proc_gen != proc_gen_p8) {
+ if (!chip_quirk(QUIRK_MAMBO_CALLOUTS) &&
+ proc_gen != proc_gen_p8) {
prlog(PR_DEBUG,
"RESET: Fast reboot not available on this CPU\n");
return;
|
Prevent compiler warning in lv_draw_rect.c | @@ -1111,7 +1111,7 @@ LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coord
_lv_mem_buf_release(mask_line);
if(sw == 1) {
- uint32_t i;
+ int32_t i;
lv_opa_t * res_buf = (lv_opa_t *)sh_buf;
for(i = 0; i < size * size; i++) {
res_buf[i] = (sh_buf[i] >> SHADOW_UPSACALE_SHIFT);
@@ -1140,7 +1140,7 @@ LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coord
shadow_blur_corner(size, sw, sh_buf);
}
- uint32_t x;
+ int32_t x;
lv_opa_t * res_buf = (lv_opa_t *)sh_buf;
for(x = 0; x < size * size; x++) {
res_buf[x] = sh_buf[x];
|
Docs: minor change for backout script | @@ -239,7 +239,7 @@ $ gpinitsystem -c gpconfigs/gpinitsystem_config -h gpconfigs/hostfile_gpinitsyst
caused <codeph>gpinitsystem</codeph> to fail and running the backout script, you
should be ready to retry initializing your Greenplum Database array.</p>
<p>The following example shows how to run the backout script:</p>
- <codeblock>$ sh backout_gpinitsystem_gpadmin_20071031_121053</codeblock>
+ <codeblock>$ bash ~/gpAdminLogs/backout_gpinitsystem_gpadmin_20071031_121053</codeblock>
</section>
</body>
</topic>
|
vere: filter ames by protocol # | @@ -374,9 +374,9 @@ _ames_recv_cb(uv_udp_t* wax_u,
if ( 0 == nrd_i ) {
_ames_free(buf_u->base);
}
- // check header's fourth most significant bit to ignore old protocols
+ // check protocol version in header matches 0
//
- else if ( 0 != (1 & (*((c3_w*)buf_u->base) >> 28)) ) {
+ else if ( 0 != (0x7 & *((c3_w*)buf_u->base)) ) {
_ames_free(buf_u->base);
}
else {
|
config-tools: correct the confirm log
When clicking the Save button in UI, the log message is incorrect for
pre-launched VM.
Do not show 'launch script' related message when there is only pre-launched
VMs. | @@ -350,6 +350,9 @@ export default {
"scenario xml save failed\n",
"launch scripts generate failed\n"];
let stepDone = 0
+ let totalMsg = msg.length // msg and errMsg must be same length.
+ let needSaveLaunchScript = false
+
let scenarioXMLData = configurator.convertScenarioToXML(
{
// simple deep copy
@@ -366,6 +369,14 @@ export default {
// get scenario XML with defaults
scenarioXMLData = scenarioWithDefault.xml
if (!errorFlag) {
+ this.scenario.vm.map((vmConfig) => {
+ if (vmConfig['load_order'] === 'POST_LAUNCHED_VM') {
+ needSaveLaunchScript = true
+ }
+ })
+ if (!needSaveLaunchScript) {
+ totalMsg = totalMsg - 1 // remove the 'launch script' related mssage.
+ }
// begin verify and write down
console.log("validate settings...")
try {
@@ -379,18 +390,20 @@ export default {
configurator.writeFile(this.WorkingFolder + 'scenario.xml', scenarioXMLData)
stepDone = 2
+ if (needSaveLaunchScript) {
let launchScripts = configurator.pythonObject.generateLaunchScript(this.board.content, scenarioXMLData)
for (let filename in launchScripts) {
configurator.writeFile(this.WorkingFolder + filename, launchScripts[filename])
}
stepDone = 3
- alert(`${msg.join('')} \n All files successfully saved to your working folder ${this.WorkingFolder}`)
+ }
+ alert(`${msg.slice(0,stepDone).join('')} \n All files successfully saved to your working folder ${this.WorkingFolder}`)
} catch(err) {
console.log("error" + err)
let outmsg = ''
for (var i = 0; i < stepDone; i++)
outmsg += msg[i]
- for (i = stepDone; i < 3; i++)
+ for (i = stepDone; i < totalMsg; i++)
outmsg += errmsg[i]
alert(`${outmsg} \n Please check your configuration`)
}
|
CMakeLists.txt: set minimum version to 3.7
cmake/cpu.cmake (at least) requires 3.7 due to its use of GREATER_EQUAL: | # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.7)
if(POLICY CMP0072)
cmake_policy(SET CMP0072 NEW)
|
cirrus: add formulae
as described in | @@ -118,6 +118,7 @@ mac_task:
install_script:
- | # Install Homebrew formulas
brew install openjdk
+ brew tap oclint/formulae
brew install oclint
brew install antlr
brew install antlr4-cpp-runtime
|
docs: readme in speculos tests | @@ -17,23 +17,33 @@ python3 -m pip install --extra-index-url https://test.pypi.org/simple/ -r requir
## Usage
-Given the requirements are installed, just do:
+### Compilation app
+Go to the root of the repository:
+```sh
+make DEBUG=1 NFT_TESTING_KEY=1 BOLOS_SDK=$NANOX_SDK
```
-pytest tests/speculos/
+
+Given the requirements are installed, just do (by default command):
+
+```
+cd tests/speculos/
+pytest
```
-## Tests by APDU
+### Custom options
+- **--model:** "nanos", "nanox", "nanosp" | default: "nanos"
+- **--display:** "qt", "headless" | default: "qt"
+- **--path:** the path of the binary app | default: path of makefile compilation
-you will find the list of apdu [here](../../doc/apdu.md)
+## Example
-- Get
- - GET APP CONFIGURATION ( 1 test )
- - Get the configuration
- - GET ETH PUBLIC ADDRESS ( 3 tests )
- - Ether coin without display
- - Dai coin with display
- - Dai coin with display and reject
- - GET ETH2 PUBLIC KEY
- - [ ] Test get key
- - [ ] Test get key with display
\ No newline at end of file
+With `nanox` binary app:
+```sh
+# the --path is variable to where you put your binary
+
+pytest --model nanox --path ./elfs/nanox.elf
+
+# Execute specific test:
+pytest --model nanox --path ./elfs/nanox.elf test_pubkey_cmd.py
+```
\ No newline at end of file
|
[yabs/vh/cms-pgaas] yolint: fix migrations. | @@ -506,9 +506,3 @@ migrations:
- a.yandex-team.ru/transfer_manager/go/pkg/worker
- a.yandex-team.ru/transfer_manager/go/pkg/worker_test
- a.yandex-team.ru/transfer_manager/go/proto/cdc_server
- - a.yandex-team.ru/yabs/vh/cms-pgaas/dhdd
- - a.yandex-team.ru/yabs/vh/cms-pgaas/dhdd/db
- - a.yandex-team.ru/yabs/vh/cms-pgaas/dhdd/io
- - a.yandex-team.ru/yabs/vh/cms-pgaas/dhdd/util
- - a.yandex-team.ru/yabs/vh/cms-pgaas/dhdd/util_test
- - a.yandex-team.ru/yabs/vh/cms-pgaas/transcoded
|
Fix use-after-free in BIO_C_SET_SSL callback
Since the BIO_SSL structure was renewed by `ssl_free(b)/ssl_new(b)`,
the `bs` pointer needs to be updated before assigning to `bs->ssl`.
Thanks to for reporting the issue and providing a fix.
Closes | @@ -284,6 +284,7 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
ssl_free(b);
if (!ssl_new(b))
return 0;
+ bs = BIO_get_data(b);
}
BIO_set_shutdown(b, num);
ssl = (SSL *)ptr;
|
added additional information about promiscuous mode | hcxdumptool : added bind() ll.sll_pkttype = PACKET_OTHERHOST | PACKET_OUTGOING
added setsockopt() r.mr_type = PACKET_MR_PROMISC
+now dmesg will show when device entered promiscuous mode
+during hcxdumptool initialization:
+[ 6313.657830] device wlp3s0f0u11u1 entered promiscuous mode
+
+and when it left promiscuous mode when hcxdumptool terminated:
+[ 6313.735833] device wlp3s0f0u11u1 left promiscuous mode
+
01.09.2019
==========
|
interface: set child graph, not parent graph, upon removing hcild index | @@ -131,7 +131,7 @@ const addNodes = (json, state) => {
} else {
const child = graph.get(index[0]);
if (child) {
- graph = _remove(child.children, index.slice(1));
+ child.children = _remove(child.children, index.slice(1));
graph.set(index[0], child);
}
}
|
Remove BIKE1_L1_crypto_kem_dec postconditions. | @@ -64,7 +64,7 @@ let crypto_kem_dec_unsuccessful_spec = do {
ap <- out_ref char_ss_T;
(b, bp) <- in_ref char_ct_T "ct";
(c, cp) <- in_ref char_sk_T "sk";
- crucible_precond {{ (BIKE1_L1_crypto_kem_dec b c).0 != SUCCESS }};
+ //crucible_precond {{ (BIKE1_L1_crypto_kem_dec b c).0 != SUCCESS }};
// NOTE: This is for memory safety
crucible_precond {{ is_bounded_sk (assemble_sk_t c) }};
@@ -81,15 +81,15 @@ let crypto_kem_dec_successful_spec = do {
ap <- out_ref char_ss_T;
(b, bp) <- in_ref char_ct_T "ct";
(c, cp) <- in_ref char_sk_T "sk";
- crucible_precond {{ (BIKE1_L1_crypto_kem_dec b c).0 == SUCCESS }} ;
+ //crucible_precond {{ (BIKE1_L1_crypto_kem_dec b c).0 == SUCCESS }} ;
// NOTE: This is for memory safety
crucible_precond {{ is_bounded_sk (assemble_sk_t c) }};
crucible_execute_func [ap, bp, cp];
- a' <- point_to char_ss_T ap "a'";
+ //a' <- point_to char_ss_T ap "a'";
ret <- crucible_fresh_var "ret" i32;
- crucible_postcond {{ (toInteger ret, a') == (BIKE1_L1_crypto_kem_dec b c) }};
+ //crucible_postcond {{ (toInteger ret, a') == (BIKE1_L1_crypto_kem_dec b c) }};
crucible_return (tm ret);
};
|
Silent note bug | @@ -1111,7 +1111,7 @@ static void processMusic(tic_mem* memory)
if(machine->state.music.play == MusicStop) return;
const tic_track* track = &machine->sound.music->tracks.data[memory->ram.music_pos.track];
- s32 row = machine->state.music.ticks++ * (track->tempo + DEFAULT_TEMPO) * DEFAULT_SPEED / (track->speed + DEFAULT_SPEED) / NOTES_PER_MUNUTE;
+ s32 row = machine->state.music.ticks * (track->tempo + DEFAULT_TEMPO) * DEFAULT_SPEED / (track->speed + DEFAULT_SPEED) / NOTES_PER_MUNUTE;
s32 rows = MUSIC_PATTERN_ROWS - track->rows;
if (row >= rows)
@@ -1162,7 +1162,7 @@ static void processMusic(tic_mem* memory)
}
}
- if (row != memory->ram.music_pos.row && row < rows)
+ if (row != memory->ram.music_pos.row)
{
memory->ram.music_pos.row = row;
@@ -1197,6 +1197,8 @@ static void processMusic(tic_mem* memory)
if(c->index >= 0)
sfx(memory, c->index, c->freq, c, &memory->ram.registers[i]);
}
+
+ machine->state.music.ticks++;
}
static bool isNoiseWaveform(const tic_waveform* wave)
|
dm: fix some possible memory leak
free memory allocated by strdup() | @@ -660,7 +660,7 @@ blockif_open(const char *optstr, const char *ident)
if (size < DEV_BSIZE || (size & (DEV_BSIZE - 1))) {
WPRINTF(("%s size not corret, should be multiple of %d\n",
nopt, DEV_BSIZE));
- return 0;
+ goto err;
}
psectsz = sbuf.st_blksize;
}
|
Remove filename lookup | @@ -67,7 +67,7 @@ PPH_MODULE_PROVIDER PhCreateModuleProvider(
static PH_INITONCE initOnce = PH_INITONCE_INIT;
NTSTATUS status;
PPH_MODULE_PROVIDER moduleProvider;
- PPH_STRING fileName;
+ PPH_PROCESS_ITEM processItem;
if (PhBeginInitOnce(&initOnce))
{
@@ -128,9 +128,10 @@ PPH_MODULE_PROVIDER PhCreateModuleProvider(
moduleProvider->RunStatus = status;
}
- if (NT_SUCCESS(PhGetProcessImageFileNameByProcessId(ProcessId, &fileName)))
+ if (processItem = PhReferenceProcessItem(ProcessId))
{
- PhMoveReference(&moduleProvider->ProcessFileName, fileName);
+ PhSetReference(&moduleProvider->ProcessFileName, processItem->FileName);
+ PhDereferenceObject(processItem);
}
if (WindowsVersion >= WINDOWS_8 && moduleProvider->ProcessHandle)
|
travis: don't do makefile checks | @@ -34,7 +34,7 @@ script:
[[ -n ${COVERITY_SCAN_TOKEN} ]] || exit 0; # don't fail on this for PRs
# ensure we end up with an existing compiler
export CC=gcc
- ./configure || { cat config.log ; exit 1 ; }
+ ./configure --disable-maintainer-mode || { cat config.log ; exit 1 ; }
curl -s 'https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh' | bash
else
v() { echo "$@"; "$@"; }
|
Fixed non 64-bit mode mask-register error condition | @@ -4297,7 +4297,8 @@ static ZydisStatus ZydisCheckErrorConditions(ZydisDecoderContext* context,
}
break;
case ZYDIS_REG_CONSTRAINTS_MASK:
- if (context->cache.v_vvvv > 7)
+ if ((context->decoder->machineMode == ZYDIS_MACHINE_MODE_LONG_64) &&
+ (context->cache.v_vvvv > 7))
{
return ZYDIS_STATUS_BAD_REGISTER;
}
|
mkfs fail should = build fail | @@ -10,7 +10,7 @@ mkfs/mkfs: force
cd mkfs ; make
image: boot/boot mkfs/mkfs examples/$(TARGET).manifest stage3/stage3 examples/$(TARGET)
- mkfs/mkfs fs < examples/$(TARGET).manifest ; cat boot/boot fs > image
+ mkfs/mkfs fs < examples/$(TARGET).manifest && cat boot/boot fs > image
examples/$(TARGET): force
cd examples ; make
|
tool: elektra - update keyset before attempting to delete meta key | @@ -87,6 +87,7 @@ func (s *server) postMetaHandler(w http.ResponseWriter, r *http.Request) {
// Response Code:
// 201 No Content if the request is successfull.
// 401 Bad Request if no key name was passed - or the key name is invalid.
+// 404 Not Found if the key was not found.
//
// Example: `curl -X DELETE -d '{ "key": "hello" }' localhost:33333/kdbMeta/user/test/hello`
func (s *server) deleteMetaHandler(w http.ResponseWriter, r *http.Request) {
@@ -109,6 +110,13 @@ func (s *server) deleteMetaHandler(w http.ResponseWriter, r *http.Request) {
handle, ks := getHandle(r)
+ _, err = handle.Get(ks, key)
+
+ if err != nil {
+ writeError(w, err)
+ return
+ }
+
k := ks.Lookup(key)
if k == nil {
|
Update: NAR_language.py: translate ^say call arguments back into learned language words | @@ -253,7 +253,13 @@ if __name__ == "__main__":
print(inp)
continue
if not Training and (inp.startswith("<") or inp.endswith(". :|:") or inp.endswith("! :|:")):
- NAR.AddInput(inp)
+ executions = NAR.AddInput(inp)["executions"]
+ if executions:
+ for execution in executions:
+ 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])
continue
if inp.startswith("*reset"):
memory = {}
|
Mention cups-filters in pdftops debug log | @@ -919,7 +919,7 @@ main(int argc, /* I - Number of command-line args */
pdf_argv[pdf_argc++] = (char *)"-optimizecolorspace"; */
/* Issue a warning message when printing a grayscale job with Poppler */
fprintf(stderr, "WARNING: Grayscale/monochrome printing requested for this job but Poppler is not able to convert to grayscale/monochrome PostScript.\n");
- fprintf(stderr, "WARNING: Use \"pdftops-renderer\" option (see README file) to use Ghostscript or MuPDF for the PDF -> PostScript conversion.\n");
+ fprintf(stderr, "WARNING: Use \"pdftops-renderer\" option (see cups-filters README file) to use Ghostscript or MuPDF for the PDF -> PostScript conversion.\n");
}
pdf_argv[pdf_argc++] = filename;
pdf_argv[pdf_argc++] = (char *)"-";
|
Fix error introduced when merging | @@ -496,7 +496,7 @@ size_t xStreamBufferSpacesAvailable( StreamBufferHandle_t xStreamBuffer )
{
const StreamBuffer_t * const pxStreamBuffer = xStreamBuffer;
size_t xSpace;
- volatile size_t xOriginalTail;
+ size_t xOriginalTail;
configASSERT( pxStreamBuffer );
@@ -726,7 +726,7 @@ static size_t prvWriteMessageToBuffer( StreamBuffer_t * const pxStreamBuffer,
{
size_t xNextHead = pxStreamBuffer->xHead;
- if( xDataLengthBytes != xRequiredSpace )
+ if( ( pxStreamBuffer->ucFlags & sbFLAGS_IS_MESSAGE_BUFFER ) != ( uint8_t ) 0 )
{
/* This is a message buffer, as opposed to a stream buffer. */
|
engine: use new scheduler api | @@ -115,7 +115,7 @@ static void cb_engine_sched_timer(struct flb_config *ctx, void *data)
(void) data;
/* Upstream connections timeouts handling */
- flb_upstream_conn_timeouts(ctx);
+ flb_upstream_conn_timeouts(&ctx->upstreams);
}
static inline int handle_output_event(flb_pipefd_t fd, struct flb_config *config)
@@ -444,6 +444,7 @@ int flb_engine_start(struct flb_config *config)
struct flb_time t_flush;
struct mk_event *event;
struct mk_event_loop *evl;
+ struct flb_sched *sched;
/* HTTP Server */
#ifdef FLB_HAVE_HTTP
@@ -536,11 +537,16 @@ int flb_engine_start(struct flb_config *config)
}
/* Initialize the scheduler */
- ret = flb_sched_init(config);
- if (ret == -1) {
+ sched = flb_sched_create(config, config->evl);
+ if (!sched) {
flb_error("[engine] scheduler could not start");
return -1;
}
+ config->sched = sched;
+
+ /* Register the scheduler context */
+ flb_sched_ctx_init();
+ flb_sched_ctx_set(sched);
#ifdef FLB_HAVE_METRICS
if (config->storage_metrics == FLB_TRUE) {
@@ -590,7 +596,7 @@ int flb_engine_start(struct flb_config *config)
* Sched a permanent callback triggered every 1.5 second to let other
* Fluent Bit components run tasks at that interval.
*/
- ret = flb_sched_timer_cb_create(config,
+ ret = flb_sched_timer_cb_create(config->sched,
FLB_SCHED_TIMER_CB_PERM,
1500, cb_engine_sched_timer, config);
if (ret == -1) {
@@ -683,7 +689,7 @@ int flb_engine_start(struct flb_config *config)
/* Cleanup functions associated to events and timers */
if (config->is_running == FLB_TRUE) {
flb_sched_timer_cleanup(config->sched);
- flb_upstream_conn_pending_destroy(config);
+ flb_upstream_conn_pending_destroy_list(&config->upstreams);
}
}
}
|
Update Travis build script. | @@ -4,6 +4,9 @@ sudo: required
language: c
stage: build
+git:
+ depth: 5
+
notifications:
email:
on_success: never
@@ -18,7 +21,8 @@ cache:
script:
# update submodules
- - git submodule update --init --recursive
+ - git submodule update --init --depth=5
+ - git -C src/micropython/ submodule update --init --depth=5
# install ARM GCC
- pushd .
- cd ~ && mkdir gcc && cd gcc
|
Add needed test args for ctest run. | @@ -205,6 +205,19 @@ if (BUILD_TESTING)
${test_case_name}
PROPERTY
ENVIRONMENT LD_PRELOAD=$<TARGET_FILE:allocator_overrides>)
+
+ set_property(
+ TEST
+ ${test_case_name}
+ PROPERTY
+ ENVIRONMENT S2N_UNIT_TEST=1)
+
+ set_property(
+ TEST
+ ${test_case_name}
+ PROPERTY
+ ENVIRONMENT S2N_DONT_MLOCK=1)
+
endforeach(test_case)
add_executable(s2nc "bin/s2nc.c" "bin/echo.c")
|
copyright + typos | -#include <stdlib.h>
-#include <stdio.h>
+/* Copyright 2021-2022. Uecker Lab, University Medical Center Goettingen.
+ * All rights reserved. Use of this source code is governed by
+ * a BSD-style license which can be found in the LICENSE file.
+ */
+
#include <complex.h>
#include "grecon/opt_iter6.h"
#include "grecon/losses.h"
#include "grecon/network.h"
-#include "iter/iter6.h"
-
-#include "nn/weights.h"
#include "num/multind.h"
#include "num/flpmath.h"
#include "num/init.h"
+#include "iter/iter6.h"
+
+#include "nn/weights.h"
+
#ifdef USE_CUDA
#include "num/gpuops.h"
#endif
@@ -121,7 +125,7 @@ int main_nnet(int argc, char* argv[argc])
OPTL_SUBOPT(0, "adam", "...", "configure Adam", N_iter6_adam_opts, iter6_adam_opts),
//OPTL_SUBOPT(0, "iPALM", "...", "configure iPALM", N_iter6_ipalm_opts, iter6_ipalm_opts),
- OPTL_SET(0, "load-memory", &(load_mem), "load files int memory"),
+ OPTL_SET(0, "load-memory", &(load_mem), "load files into memory"),
OPTL_STRING(0, "export-graph", (const char**)(&(graph_filename)), "<file.dot>", "export graph for visualization"),
};
@@ -201,7 +205,7 @@ int main_nnet(int argc, char* argv[argc])
if (NULL != filename_weights_load) {
if (apply)
- error("Weights should only be loaded for trining using -l option!");
+ error("Weights should only be loaded for training using -l option!");
config.weights = load_nn_weights(filename_weights_load);
}
|
LOVR_DEBUG_AUDIOTAP debug helper in audio.c | @@ -20,6 +20,14 @@ static const ma_format miniAudioFormatFromLovr[] = {
#define OUTPUT_CHANNELS 2
#define CAPTURE_CHANNELS 1
+//#define LOVR_DEBUG_AUDIOTAP
+#ifdef LOVR_DEBUG_AUDIOTAP
+// To get a record of what the audio callback is playing, define LOVR_DEBUG_AUDIOTAP,
+// after running look in the lovr save directory for lovrDebugAudio.raw,
+// and open as raw 32-bit stereo floats (Audacity can do this, or Amadeus on Mac)
+#include "filesystem/filesystem.h"
+#endif
+
struct Source {
Source* next;
SoundData* sound;
@@ -51,6 +59,10 @@ static struct {
SoundData *captureStream;
arr_t(ma_data_converter*) converters;
Spatializer* spatializer;
+
+#ifdef LOVR_DEBUG_AUDIOTAP
+ bool audiotapWriting;
+#endif
} state;
// Device callbacks
@@ -102,6 +114,10 @@ static bool mix(Source* source, float* output, uint32_t count) {
}
static void onPlayback(ma_device* device, void* output, const void* _, uint32_t count) {
+#ifdef LOVR_DEBUG_AUDIOTAP
+ int originalCount = count;
+#endif
+
ma_mutex_lock(&state.playbackLock);
// For each Source, remove it if it isn't playing or process it and remove it if it stops
@@ -116,6 +132,11 @@ static void onPlayback(ma_device* device, void* output, const void* _, uint32_t
}
ma_mutex_unlock(&state.playbackLock);
+
+#ifdef LOVR_DEBUG_AUDIOTAP
+ if (state.audiotapWriting)
+ lovrFilesystemWrite("lovrDebugAudio.raw", outputUntyped, originalCount*OUTPUT_CHANNELS*sizeof(float), true);
+#endif
}
static void onCapture(ma_device* device, void* output, const void* inputUntyped, uint32_t frames) {
@@ -156,6 +177,11 @@ bool lovrAudioInit() {
arr_init(&state.converters);
+#ifdef LOVR_DEBUG_AUDIOTAP
+ lovrFilesystemWrite("lovrDebugAudio.raw", NULL, 0, false); // Erase file
+ state.audiotapWriting = true;
+#endif
+
return state.initialized = true;
}
@@ -179,6 +205,10 @@ void lovrAudioDestroy() {
free(state.config[0].deviceName);
free(state.config[1].deviceName);
memset(&state, 0, sizeof(state));
+
+#ifdef LOVR_DEBUG_AUDIOTAP
+ state.audiotapWriting = false;
+#endif
}
bool lovrAudioInitDevice(AudioType type) {
|
Add support for replacements in i10n | @@ -35,6 +35,15 @@ const translations = Object.keys(en).reduce(
{}
);
-export default key => {
- return translations[key];
+export default (key, params = null) => {
+ let translation = translations[key];
+
+ if (params) {
+ Object.keys(params).forEach(param => {
+ const pattern = new RegExp(`{(\s+)?${param}(\s+)?}`)
+ translation = translation.replace(pattern, params[param]);
+ });
+ }
+
+ return translation;
};
|
reordered swaylock manpage | @@ -21,20 +21,25 @@ Locks your Wayland session.
All leading dashes should be omitted and the equals sign is required for
flags that take an argument.
-*-c, --color* <rrggbb[aa]>
- Turn the screen into the given color. If -i is used, this sets the
- background of the image to the given color. Defaults to white (FFFFFF), or
- transparent (00000000) if an image is in use.
-
*-e, --ignore-empty-password*
When an empty password is provided by the user, do not validate it.
*-f, --daemonize*
Detach from the controlling terminal after locking.
+ Note: this is the default bahavior of i3lock.
+
*-h, --help*
Show help message and quit.
+*-v, --version*
+ Show the version number and quit.
+
+# APPEARANCE
+
+*-u, --no-unlock-indicator*
+ Disable the unlock indicator.
+
*-i, --image* [<output>:]<path>
Display the given image, optionally only on the given output. Use -c to set
a background color.
@@ -45,13 +50,10 @@ Locks your Wayland session.
*-t, --tiling*
Same as --scaling=tile.
-*-u, --no-unlock-indicator*
- Disable the unlock indicator.
-
-*-v, --version*
- Show the version number and quit.
-
-# APPEARANCE
+*-c, --color* <rrggbb[aa]>
+ Turn the screen into the given color. If -i is used, this sets the
+ background of the image to the given color. Defaults to white (FFFFFF), or
+ transparent (00000000) if an image is in use.
*--bs-hl-color* <rrggbb[aa]>
Sets the color of backspace highlight segments.
|
add check test library as build dependency | @@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 9),
libsodium-dev (>= 1.0.14),
help2man (>= 1.46.4),
libseccomp-dev (>= 2.1.1),
- libmicrohttpd-dev (>= 0.9.33)
+ libmicrohttpd-dev (>= 0.9.33),
+ check (>= 0.10.0)
Package: oidc-agent
Architecture: any
|
Metrics change not needed after all... | @@ -2115,10 +2115,6 @@ cfgLogStreamDefault(config_t *cfg)
cfgTransportTlsValidateServerSet(cfg, CFG_CTL, validateserver);
const char *cacertpath = cfgTransportTlsCACertPath(cfg, CFG_LS);
cfgTransportTlsCACertPathSet(cfg, CFG_CTL, cacertpath);
-
- cfgTransportTypeSet(cfg, CFG_MTC, type);
- cfgTransportHostSet(cfg, CFG_MTC, host);
- cfgTransportPortSet(cfg, CFG_MTC, port);
}
if (cfgMtcEnable(cfg) != TRUE) {
|
Restyled: Reformat JavaScript code with Prettier | -restylers_version: '20191031'
+restylers_version: '20191216'
auto: true
restylers:
@@ -6,10 +6,7 @@ restylers:
# - clang-format:
# image: restyled/restyler-clang-format:v9.0.0
- # TODO: Enable `prettier` again, after Restyled offers Prettier 1.19
- # See also: https://github.com/restyled-io/restylers/blob/master/prettier/Dockerfile
- # - prettier
-
+ - prettier
- prettier-markdown:
arguments: []
- shfmt:
|
Orchestra: fix building of the link-based rule after API changes | @@ -177,8 +177,8 @@ static void
new_time_source(const struct tsch_neighbor *old, const struct tsch_neighbor *new)
{
if(new != old) {
- const linkaddr_t *old_addr = old != NULL ? &old->addr : NULL;
- const linkaddr_t *new_addr = new != NULL ? &new->addr : NULL;
+ const linkaddr_t *old_addr = tsch_queue_get_nbr_address(old);
+ const linkaddr_t *new_addr = tsch_queue_get_nbr_address(new);
if(new_addr != NULL) {
linkaddr_copy(&orchestra_parent_linkaddr, new_addr);
} else {
|
hoon: fix batch comment parsing for ++ $ arms
comments for ++ $ arms are set using four aces | %- stew
^. stet ^. limo
:~ :- '|'
- ;~(pfix bar (stag %chat sym))
+ (stag %chat (ifix [bar cola] sym))
:- '.'
- ;~(pfix dot (stag %frag sym))
+ (stag %frag (ifix [dot cola] sym))
:- '+'
- ;~(pfix lus (stag %funk sym))
+ (stag %funk (ifix [lus cola] sym))
:- '$'
- ;~(pfix buc (stag %grog sym))
+ (stag %grog (ifix [buc cola] sym))
+ :- ' '
+ (stag %funk ;~(pfix step (easy *term)))
==
++ shot
;~(plug ;~(sfix line (just `@`10) (punt gap)) (rant ;~(less tine text)))
++ code ;~(pfix step step (cook crip (star prn))) :: code line
++ noel ;~(plug (punt ;~(pfix step hax)) null) :: header padding
++ null (cold ~ (star ace)) :: blank line
+ ++ cola ;~(plug col ace)
++ fine :: definition line
- ;~ (glue ;~(plug col ace))
+ ;~ (glue cola)
sym
(cook crip (star prn))
==
++ tine
- ;~ (glue ;~(plug col ace))
+ ;~ (glue cola)
dibs
(cook crip (star prn))
==
:: +into: :: and indent to end of line, consuming following space.
:: +indo: :: to end of line, consuming following space.
:: +exit: :: to end of line, not consuming following space.
- :: +ingo: :: then consume, followed by col ace
+ :: +ingo: :: then consume
::
++ step ;~(plug ace ace)
++ into |*(bod=rule (indo ;~(pfix step bod)))
(ifix [;~(plug col gar) ;~(plug (just `@`10) (punt gap))] bod)
++ ingo
|* bod=rule
- (ifix [;~(plug col gar step) ;~(plug col ace)] bod)
+ ;~(pfix ;~(plug col gar step) bod)
::
++ exit
|* bod=rule
|
install-config-file: Catch errors in kdb ls
Additionally use "test -z" instead of wc -l | @@ -32,7 +32,12 @@ fi
base="${specialPathStart}${specialPathEnd}"
# check if something is in <elektra path>
-if [ $(kdb ls $our | wc -c) = 0 ]; then
+contentOfElektraPath=$(kdb ls $our)
+if [ $? -ne 0 ]; then
+ echo "ERROR: Could not use kdb ls on $our."
+ exit 1
+fi
+if [ -z "$contentOfElektraPath" ]; then
kdb mount --with-recommends $their $our $format
if ! [ $? -eq 0 ]; then
echo "Could not mount file $their. Got code $?"
|
ChatMessage: reposition timestamp | @@ -495,7 +495,8 @@ export const Message = React.memo(({
width='36px'
textAlign='right'
left='0'
- top='3px'
+ top='2px'
+ lineHeight="tall"
fontSize={0}
gray
>
|
RTX5: add _fp_init function prototype | @@ -674,6 +674,7 @@ void osRtxKernelPreInit (void) {
extern void $Super$$_fp_init (void);
+void $Sub$$_fp_init (void);
void $Sub$$_fp_init (void) {
$Super$$_fp_init();
FPU->FPDSCR = __get_FPSCR();
|
accelerate md_zscalar2 on the GPU | @@ -2329,6 +2329,29 @@ complex float md_zscalar2(unsigned int D, const long dim[D], const long str1[D],
complex double ret = 0.;
complex double* retp = &ret;
+#ifdef USE_CUDA
+ if (cuda_ondevice(ptr1)) {
+
+ // FIXME: because md_zfmacc2 with stride = 0 is slow
+
+ complex float* tmp = md_alloc_gpu(D, dim, CFL_SIZE);
+
+ long strs[D];
+ md_calc_strides(D, strs, dim, CFL_SIZE);
+ md_clear(D, dim, tmp, CFL_SIZE);
+
+ md_zfmacc2(D, dim, strs, tmp, str1, ptr1, str2, ptr2);
+
+ gpu_ops.zsum(md_calc_size(D, dim), tmp);
+
+ complex float ret = 0.;
+ md_copy(1, (long[1]){ 1 }, &ret, tmp, CFL_SIZE);
+ md_free(tmp);
+
+ return ret;
+ }
+#endif
+
#ifdef USE_CUDA
if (cuda_ondevice(ptr1))
retp = gpu_constant(&ret, CDL_SIZE);
@@ -2541,6 +2564,7 @@ float md_asum2(unsigned int D, const long dims[D], const long strs[D], const flo
#ifdef USE_CUDA
if (cuda_ondevice(ptr)) {
+
md_copy(D, dims0, &ret, retp, FL_SIZE);
md_free(retp);
}
|
for 0.7-6 we will use flang branch and aomp-extras branch 0.7-6 | @@ -116,7 +116,7 @@ AOMP_ROCR_REPO_BRANCH=${AOMP_ROCR_REPO_BRANCH:-roc-2.9.x}
AOMP_ATMI_REPO_NAME=${AOMP_ATMI_REPO_NAME:-atmi}
AOMP_ATMI_REPO_BRANCH=${AOMP_ATMI_REPO_BRANCH:-aomp-0.7}
AOMP_EXTRAS_REPO_NAME=${AOMP_EXTRAS_REPO_NAME:-aomp-extras}
-AOMP_EXTRAS_REPO_BRANCH=${AOMP_EXTRAS_REPO_BRANCH:-0.7-5}
+AOMP_EXTRAS_REPO_BRANCH=${AOMP_EXTRAS_REPO_BRANCH:-0.7-6}
AOMP_APPS_REPO_NAME=${AOMP_APPS_REPO_NAME:-openmpapps}
AOMP_APPS_REPO_BRANCH=${AOMP_APPS_REPO_BRANCH:-AOMP-0.5}
AOMP_COMGR_REPO_NAME=${AOMP_COMGR_REPO_NAME:-rocm-compilersupport}
@@ -124,7 +124,7 @@ AOMP_COMGR_REPO_BRANCH=${AOMP_COMGR_REPO_BRANCH:-roc-2.9.x}
AOMP_F18_REPO_NAME=${AOMP_F18_REPO_NAME:-f18}
AOMP_F18_REPO_BRANCH=${AOMP_F18_REPO_BRANCH:-master}
AOMP_FLANG_REPO_NAME=${AOMP_FLANG_REPO_NAME:-flang}
-AOMP_FLANG_REPO_BRANCH=${AOMP_FLANG_REPO_BRANCH:-AOMP-191023}
+AOMP_FLANG_REPO_BRANCH=${AOMP_FLANG_REPO_BRANCH:-AOMP-191025}
GITSOLVV="https://github.com/SOLLVE"
AOMP_SOLVV_REPO_NAME=${AOMP_SOLVV_REPO_NAME:-sollve_vv}
AOMP_SOLVV_REPO_BRANCH=${AOMP_SOLVV_REPO_BRANCH:-master}
|
Fix system solver (local asan tests were broken) | @@ -117,12 +117,12 @@ void SolveLinearSystemCholesky(TVector<double>* matrix,
return;
}
- char matrixStorageType = 'U';
+ char matrixStorageType[] = {'U', '\0'};
int systemSize = target->ysize();
int numberOfRightHandSides = 1;
int info = 0;
- dposv_(&matrixStorageType, &systemSize, &numberOfRightHandSides, matrix->data(), &systemSize,
+ dposv_(matrixStorageType, &systemSize, &numberOfRightHandSides, matrix->data(), &systemSize,
target->data(), &systemSize, &info);
Y_VERIFY(info >= 0);
|
Check for invalid src/dst header in assignment | @@ -300,8 +300,14 @@ def gen_do_assignment(dst, src):
src_hdr_name = src.path.name if src.node_type == 'PathExpression' else src.member
dst_hdr_name = dst.path.name if dst.node_type == 'PathExpression' else dst.member
+ #{ if (unlikely(!is_header_valid(HDR(${dst_hdr_name}), pd))) {
+ #[ debug(" " T4LIT(!!,warning) " Ignoring assignment to invalid header " T4LIT(%s,header) "\n", hdr_infos[HDR(${dst_hdr_name})].name);
+ #[ } else if (unlikely(!is_header_valid(HDR(${src_hdr_name}), pd))) {
+ #[ debug(" " T4LIT(!!,warning) " Ignoring assignment from invalid header " T4LIT(%s,header) "\n", hdr_infos[HDR(${src_hdr_name})].name);
+ #[ } else {
#[ memcpy(pd->headers[HDR(${dst_hdr_name})].pointer, pd->headers[HDR(${src_hdr_name})].pointer, hdr_infos[HDR(${src_hdr_name})].byte_width);
#[ dbg_bytes(pd->headers[HDR(${dst_hdr_name})].pointer, hdr_infos[HDR(${src_hdr_name})].byte_width, " : Set " T4LIT(dst_hdr_name,header) "/" T4LIT(%dB) " = " T4LIT(src_hdr_name,header) " = ", hdr_infos[HDR(${src_hdr_name})].byte_width);
+ #} }
elif dst.type.node_type == 'Type_Bits':
# TODO refine the condition to find out whether to use an assignment or memcpy
requires_memcpy = src.type.size > 32 or 'decl_ref' in dst
|
OPENMV2: Update memory config to fix self-test issues. | #define OMV_BOOTLDR_LED_PORT (GPIOC)
// RAW buffer size
-#define OMV_RAW_BUF_SIZE (153600)
+#define OMV_RAW_BUF_SIZE (155648)
// Enable sensor drivers
#define OMV_ENABLE_OV2640 (1)
#define OMV_STACK_MEMORY DTCM // stack memory
#define OMV_DMA_MEMORY SRAM2 // Misc DMA buffers
-#define OMV_FB_SIZE (150K) // FB memory: header + QVGA/GS image
-#define OMV_FB_ALLOC_SIZE (12K) // minimum fb alloc size
-#define OMV_STACK_SIZE (4K)
-#define OMV_HEAP_SIZE (51K)
+#define OMV_FB_SIZE (152K) // FB memory: header + QVGA/GS image
+#define OMV_FB_ALLOC_SIZE (10K) // minimum fb alloc size
+#define OMV_STACK_SIZE (8K)
+#define OMV_HEAP_SIZE (47K)
#define OMV_LINE_BUF_SIZE (2 * 1024) // Image line buffer round(320 * 2BPP * 2 buffers).
#define OMV_MSC_BUF_SIZE (2K) // USB MSC bot data
|
Docker: bumped PHP image version. | @@ -50,7 +50,7 @@ CONFIGURE_perl ?= perl
INSTALL_perl ?= perl-install
COPY_perl =
-VERSION_php ?= 8.0
+VERSION_php ?= 8.1
CONTAINER_php ?= php:$(VERSION_php)-cli
CONFIGURE_php ?= php
INSTALL_php ?= php-install
|
awm translates mouse to local coordinates upon left click | @@ -149,6 +149,8 @@ static void _begin_left_click(mouse_interaction_state_t* state, Point mouse_poin
mouse_point.x - state->active_window->frame.origin.x,
mouse_point.y - state->active_window->frame.origin.y
);
+ local_mouse.x -= state->active_window->content_view->frame.origin.x;
+ local_mouse.y -= state->active_window->content_view->frame.origin.y;
awm_mouse_left_click_msg_t msg = {0};
msg.event = AWM_MOUSE_LEFT_CLICK;
msg.click_point = local_mouse;
|
landscape: bring placeholder group joins to parity
Fixes urbit/landscape#478 | @@ -71,20 +71,15 @@ export function GroupLink(
pr="2"
onClick={showModal}
cursor='pointer'
+ opacity={preview ? '1' : '0.6'}
>
- {preview ? (
- <>
- <MetadataIcon height={6} width={6} metadata={preview.metadata} />
+ <MetadataIcon height={6} width={6} metadata={preview ? preview.metadata : {"color": "0x0"}} />
<Col>
- <Text ml="2" fontWeight="medium">
- {preview.metadata.title}
+ <Text ml="2" fontWeight="medium" mono={!preview}>
+ {preview ? preview.metadata.title : name}
</Text>
- <Text pt='1' ml='2'>{preview.members} members</Text>
+ <Text pt='1' ml='2'>{preview ? preview.members : "Unknown"} members</Text>
</Col>
- </>
- ) : (
- <Text mono>{name}</Text>
- )}
</Row>
</Box>
);
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.