message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
---|---|
Clarify changes around modules | @@ -53,6 +53,11 @@ Open a pull request against the main `cpp_client_telemetry` repo.
as `work-in-progress`, or mark it as [`draft`](https://github.blog/2019-02-14-introducing-draft-pull-requests/).
* Make sure CLA is signed and CI is clear.
+### Making Changes to Modules
+* Navigate to lib/modules
+* Check out a branch of [the modules repository.](https://github.com/microsoft/cpp_client_telemetry_modules/)
+* Create a PR from your branch to cpp_client_telemetry's master branch.
+
### How to Get PR Merged
A PR is considered to be **ready to merge** when:
@@ -62,6 +67,7 @@ A PR is considered to be **ready to merge** when:
reasonable time to review.
* Trivial change (typo, cosmetic, doc, etc.) doesn't have to wait for one day.
* Urgent fix can take exception as long as it has been actively communicated.
+* Any dependent subm-module changes have updated the sub-module commit id (`git add lib/modules`)
Any Collaborator/Maintainer can merge the PR once it is **ready to merge**.
|
change parameter order of train() function to be consistant with other gbdt libraries | @@ -1948,20 +1948,30 @@ class CatBoostRegressor(CatBoost):
return np.sqrt(np.mean(error))
-def train(pool=None, params=None, dtrain=None, logging_level=None, verbose=None, iterations=None, num_boost_round=None, evals=None, eval_set=None, plot=None):
+def train(params=None, pool=None, iterations=None, evals=None, verbose=None, dtrain=None, logging_level=None, num_boost_round=None, eval_set=None, plot=None):
"""
Train CatBoost model.
Parameters
----------
- pool : Pool or tuple (X, y)
- Data to train on.
-
params : dict
Parameters for CatBoost.
If None, all params are set to their defaults.
If dict, overriding parameters present in the dict.
+ pool : Pool or tuple (X, y)
+ Data to train on.
+
+ iterations : int
+ Number of boosting iterations. Can be set in params dict.
+
+ evals : Pool or tuple (X, y)
+ Synonym for evals. Only one of these parameters should be set.
+
+ verbose : bool
+ If set to True, then logging_level is set to Verbose, otherwise
+ logging_level is set to Silent.
+
dtrain : Pool or tuple (X, y)
Synonym for pool parameter. Only one of these parameters should be set.
@@ -1972,22 +1982,12 @@ def train(pool=None, params=None, dtrain=None, logging_level=None, verbose=None,
- 'Info'
- 'Debug'
- verbose : bool
- If set to True, then logging_level is set to Verbose, otherwise
- logging_level is set to Silent.
-
- iterations : int
- Number of boosting iterations. Can be set in params dict.
-
num_boost_round : int
Synonym for iterations. Only one of these parameters should be set.
eval_set : Pool or tuple (X, y)
Dataset for evaluation.
- evals : Pool or tuple (X, y)
- Synonym for evals. Only one of these parameters should be set.
-
plot : bool, optional (default=False)
If True, drow train and eval error in Jupyter notebook
|
Update src/libs/elektra/plugin.c | @@ -163,7 +163,7 @@ size_t elektraPluginGetFunction (Plugin * plugin, const char * name)
if (strstr (name, "..") != NULL)
{
- // The sequence ".." is contained in the key.
+ // The sequence ".." is contained in the name.
// For security and stability purposes we do not allow that.
return 0;
}
|
Fix usage of QNetworkAccessManager::sendCustomRequest() for Qt version >= 4.7
Issue | *
*/
+#include <QBuffer>
#include <QString>
#include <QVariantMap>
#include <QRegExp>
@@ -1622,7 +1623,10 @@ int DeRestPluginPrivate::handleWebHook(const RuleAction &action)
{
QNetworkRequest req(QUrl(action.address()));
- if (webhookManager->sendCustomRequest(req, qPrintable(action.method()), qPrintable(action.body())) != nullptr)
+ QBuffer data;
+ data.setData(action.body().toUtf8());
+
+ if (webhookManager->sendCustomRequest(req, action.method().toLatin1(), &data) != nullptr)
{
return REQ_READY_SEND;
}
|
Fix documentation for gdbstub module. | @@ -16,6 +16,12 @@ At this point, you can just poke around and see what happened, but you cannot co
In order to do interactive debugging, add a call to `gdbstub.brk()` in your Lua code. This will trigger a break instruction and will trap into gdb as above. However, continuation is supported from a break instruction and so you can single step, set breakpoints, etc. Note that the lx106 processor as configured by Espressif only supports a single hardware breakpoint. This means that you can only put a single breakpoint in flash code. You can single step as much as you like.
+## gdbstub.open()
+Runs gdbstub initialization routine. It has to be run only once in code.
+
+#### Syntax
+`gdbstub.open()`
+
## gdbstub.brk()
Enters gdb by executing a `break 0,0` instruction.
@@ -40,6 +46,7 @@ function entergdb()
print("Active")
end
+gdbstub.open()
entergdb()
```
|
vlib: add vlib_buffer_free_from_ring | @@ -433,6 +433,32 @@ vlib_buffer_free_one (vlib_main_t * vm, u32 buffer_index)
vlib_buffer_free (vm, &buffer_index, /* n_buffers */ 1);
}
+/** \brief Free buffers from ring
+
+ @param vm - (vlib_main_t *) vlib main data structure pointer
+ @param buffers - (u32 * ) buffer index ring
+ @param start - (u32) first slot in the ring
+ @param ring_size - (u32) ring size
+ @param n_buffers - (u32) number of buffers
+*/
+always_inline void
+vlib_buffer_free_from_ring (vlib_main_t * vm, u32 * ring, u32 start,
+ u32 ring_size, u32 n_buffers)
+{
+ ASSERT (n_buffers <= ring_size);
+
+ if (PREDICT_TRUE (start + n_buffers <= ring_size))
+ {
+ vlib_buffer_free (vm, ring + start, n_buffers);
+ }
+ else
+ {
+ vlib_buffer_free (vm, ring + start, ring_size - start);
+ vlib_buffer_free (vm, ring, n_buffers - (ring_size - start));
+ }
+}
+
+
/* Add/delete buffer free lists. */
vlib_buffer_free_list_index_t vlib_buffer_create_free_list (vlib_main_t * vm,
u32 n_data_bytes,
|
Adding a constant for the desired alignments | @@ -32,6 +32,8 @@ typedef char hashkey_t[64];
typedef char hashdata_t[256];
/* FIXME Make tables entry size a multiple of 64 bytes */
+#define HASHJOIN_ALIGNMENT 128
+
typedef struct table1_s {
hashkey_t name; /* 64 bytes */
uint32_t age; /* 4 bytes */
|
Remove CountSetBits function.
This function is not being used anywhere. | @@ -272,22 +272,6 @@ TCOD_list_t TCOD_sys_get_directory_content(const char* path, const char* pattern
}
/* thread stuff */
-#ifdef TCOD_WINDOWS
-/* Helper function to count set bits in the processor mask. */
-static DWORD CountSetBits(ULONG_PTR bitMask) {
- DWORD L_SHIFT = sizeof(ULONG_PTR) * 8 - 1;
- DWORD bitSetCount = 0;
- ULONG_PTR bitTest = (ULONG_PTR)1 << L_SHIFT;
- DWORD i;
-
- for (i = 0; i <= L_SHIFT; ++i) {
- bitSetCount += ((bitMask & bitTest) ? 1 : 0);
- bitTest /= 2;
- }
-
- return bitSetCount;
-}
-#endif
int TCOD_sys_get_num_cores(void) {
#ifndef NO_SDL
|
board/kinox/fw_config.h: Format with clang-format
BRANCH=none
TEST=none | * Source of truth is the project/brask/kinox/config.star configuration file.
*/
-enum ec_cfg_dp_display {
- ABSENT = 0,
- DB_HDMI = 1,
- DB_DP = 2
-};
+enum ec_cfg_dp_display { ABSENT = 0, DB_HDMI = 1, DB_DP = 2 };
union kinox_cbi_fw_config {
struct {
|
YAML: Fix buffer allocation | @@ -136,14 +136,16 @@ static parserType * readNumberChars (parserType * const parser, size_t numberCha
while (parser->bufferCharsAvailable < numberChars && (numberCharsRead = getline (&line, &capacity, parser->file)) != -1)
{
+ size_t bufferOffset = parser->buffer - parser->bufferBase;
size_t bufferCharsAvailable = parser->bufferCharsAvailable + numberCharsRead;
- if ((parser->bufferBase == 0 && (parser->bufferBase = elektraMalloc (bufferCharsAvailable)) == NULL) ||
- ((elektraRealloc ((void **)&parser->bufferBase, bufferCharsAvailable + 1) < 0)))
+ size_t bufferSize = bufferOffset + bufferCharsAvailable + 1;
+ if ((parser->bufferBase == 0 && (parser->bufferBase = elektraMalloc (bufferSize)) == NULL) ||
+ ((elektraRealloc ((void **)&parser->bufferBase, bufferSize) < 0)))
{
- return setErrorMalloc (parser, bufferCharsAvailable + 1);
+ return setErrorMalloc (parser, bufferSize);
}
- strncpy (parser->bufferBase + parser->bufferCharsAvailable, line, numberCharsRead + 1);
- if (!parser->buffer) parser->buffer = parser->bufferBase;
+ strncpy (parser->bufferBase + bufferOffset, line, numberCharsRead + 1);
+ parser->buffer = parser->bufferBase + bufferOffset;
free (line);
parser->bufferCharsAvailable = bufferCharsAvailable;
|
extract @ () at ./deps/picotls | @@ -168,6 +168,7 @@ extern "C" {
#define PTLS_ALERT_CERTIFICATE_UNKNOWN 46
#define PTLS_ALERT_ILLEGAL_PARAMETER 47
#define PTLS_ALERT_UNKNOWN_CA 48
+#define PTLS_ALERT_ACCESS_DENIED 49
#define PTLS_ALERT_DECODE_ERROR 50
#define PTLS_ALERT_DECRYPT_ERROR 51
#define PTLS_ALERT_PROTOCOL_VERSION 70
@@ -946,6 +947,9 @@ int ptls_buffer_push_asn1_ubigint(ptls_buffer_t *buf, const void *bignum, size_t
static uint8_t *ptls_encode_quicint(uint8_t *p, uint64_t v);
#define PTLS_ENCODE_QUICINT_CAPACITY 8
+#define PTLS_QUICINT_MAX 4611686018427387903 // (1 << 62) - 1
+#define PTLS_QUICINT_LONGEST_STR "4611686018427387903"
+
#define ptls_buffer_pushv(buf, src, len) \
do { \
if ((ret = ptls_buffer__do_pushv((buf), (src), (len))) != 0) \
|
no movement when not animated | @@ -4437,7 +4437,7 @@ animleft(const Arg *arg) {
animateclient(selmon->sel, selmon->mx + 2, selmon->my + bh + 2, (selmon->mw / 2) - 8, selmon->mh - bh - 8, 15, 0);
return;
}
-
+ if (animated) {
for(tempc = selmon->clients; tempc; tempc = tempc->next) {
if (tempc->tags & 1 << selmon->pertag->curtag - 2 && !tempc->isfloating && selmon->pertag &&
selmon->pertag->ltidxs[selmon->pertag->curtag - 1][0]->arrange != NULL) {
@@ -4447,6 +4447,7 @@ animleft(const Arg *arg) {
}
}
}
+ }
viewtoleft(arg);
}
@@ -4466,6 +4467,7 @@ animright(const Arg *arg) {
return;
}
+ if (animated) {
for(tempc = selmon->clients; tempc; tempc = tempc->next) {
if (tempc->tags & 1 << selmon->pertag->curtag && !tempc->isfloating && selmon->pertag &&
selmon->pertag->ltidxs[selmon->pertag->curtag + 1][0]->arrange != NULL) {
@@ -4475,6 +4477,7 @@ animright(const Arg *arg) {
}
}
}
+ }
viewtoright(arg);
}
|
[test] Separate testcase for the travis | @@ -4066,12 +4066,17 @@ abi.register(oom, p, cp)`
`{"Name":"oom"}`,
),
)
- errMsg1 := "string length overflow"
- errMsg2 := "not enough memory"
+
+ errMsg := "string length overflow"
+ var travis bool
+ if os.Getenv("TRAVIS") == "true" {
+ errMsg = "not enough memory"
+ travis = true
+ }
if err == nil {
- t.Errorf("expected: %s or %s", errMsg1, errMsg2)
+ t.Errorf("expected: %s", errMsg)
}
- if err != nil && (!strings.Contains(err.Error(), errMsg1) && !strings.Contains(err.Error(), errMsg2)) {
+ if err != nil && !strings.Contains(err.Error(), errMsg) {
t.Error(err)
}
err = bc.ConnectBlock(
@@ -4082,7 +4087,7 @@ abi.register(oom, p, cp)`
`{"Name":"p"}`,
),
)
- if err != nil && !strings.Contains(err.Error(), errMsg2) {
+ if err != nil && (!travis || !strings.Contains(err.Error(), errMsg)) {
t.Error(err)
}
err = bc.ConnectBlock(
@@ -4093,7 +4098,7 @@ abi.register(oom, p, cp)`
`{"Name":"cp"}`,
),
)
- if err != nil && !strings.Contains(err.Error(), errMsg2) {
+ if err != nil && (!travis || !strings.Contains(err.Error(), errMsg)) {
t.Error(err)
}
}
@@ -5118,7 +5123,7 @@ abi.register(testall)
func TestTimeoutCnt(t *testing.T) {
timeout := 250
if os.Getenv("TRAVIS") == "true" {
- //timeout = 1000
+ timeout = 1000
return
}
src := `
|
revert tneat changes | @@ -39,7 +39,7 @@ static uint16_t config_mode = 0;
static uint16_t config_chargen_offset = 0;
static uint16_t config_port = 23232;
static uint16_t config_log_level = 1;
-static uint16_t config_num_flows = 1;
+static uint16_t config_num_flows = 5;
static uint16_t config_max_flows = 100;
static uint16_t config_max_server_runs = 0;
static uint32_t config_low_watermark = 0;
|
BugID:23251492: Add global rtp include path | @@ -427,6 +427,7 @@ AOS_SDK_INCLUDES += -I$(SOURCE_ROOT)/include \
-I$(SOURCE_ROOT)/include/network/nal/atparser \
-I$(SOURCE_ROOT)/include/network/nal/sal \
-I$(SOURCE_ROOT)/include/network/netmgr \
+ -I$(SOURCE_ROOT)/include/network/rtp \
-I$(SOURCE_ROOT)/include/network/yloop
ifeq ($(AOS_COMP_LORAWAN_4_4_2), y)
|
Add more comments on wuffsfmt's -l and -w flags | // wuffsfmt formats Wuffs programs.
//
// Without explicit paths, it rewrites the standard input to standard output.
-// Otherwise, the -l or -w or both flags must be given. Given a file path, it
-// operates on that file; given a directory path, it operates on all *.wuffs
-// files in that directory, recursively. File paths starting with a period are
-// ignored.
+// Otherwise, the -l (list files that would change) or -w (write files in
+// place) or both flags must be given. Given a file path, it operates on that
+// file; given a directory path, it operates on all *.wuffs files in that
+// directory, recursively. File paths starting with a period are ignored.
package main
import (
|
Added missing #include <intrin.h>
Fixes | @@ -2489,6 +2489,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
#include <cstring>
#include <utility>
+#ifdef _MSC_VER
+ #include <intrin.h> // For functions like __popcnt, _BitScanForward etc.
+#endif
+
/*******************************************************************************
CONFIGURATION SECTION
|
replace old container reference | @@ -246,7 +246,7 @@ static void RoutingTB_Generate(service_t *service, uint16_t nb_node)
// Asks for introduction for every found node (even the one detecting).
uint16_t try_nb = 0;
uint16_t last_node_id = RoutingTB_BigestNodeID();
- uint16_t last_cont_id = 0;
+ uint16_t last_service_id = 0;
msg_t intro_msg;
while ((last_node_id < nb_node) && (try_nb < nb_node))
{
@@ -257,8 +257,8 @@ static void RoutingTB_Generate(service_t *service, uint16_t nb_node)
intro_msg.header.target = last_node_id + 1;
// set the first service id it can use
intro_msg.header.size = 2;
- last_cont_id = RoutingTB_BigestID() + 1;
- memcpy(intro_msg.data, &last_cont_id, sizeof(uint16_t));
+ last_service_id = RoutingTB_BigestID() + 1;
+ memcpy(intro_msg.data, &last_service_id, sizeof(uint16_t));
// Ask to introduce and wait for a reply
if (!RoutingTB_WaitRoutingTable(service, &intro_msg))
{
|
configs/imxrt1050-evk: Fix NXP download script
If protected build config is enabled:
Strip the last line from tinyara.hex
Concatenate tinyara.hex and tinyara_user.hex into tinyara_prot.hex
Flash tinyara_prot.hex onto device | @@ -40,6 +40,20 @@ done;
#echo $IMXRT1050_USB_PATH
#echo $OS_DIR_PATH
-cp $OS_DIR_PATH/../build/output/bin/tinyara.hex $IMXRT1050_USB_PATH
+CONFIG=${OS_DIR_PATH}/.config
+if [ ! -f ${CONFIG} ]; then
+ echo "No .config file"
+ exit 1
+fi
+
+source ${CONFIG}
-echo "Waiting until detecting usb memory again!!!"
+if [[ "${CONFIG_BUILD_PROTECTED}" == "y" ]]; then
+sed '$d' $OS_DIR_PATH/../build/output/bin/tinyara.hex > $OS_DIR_PATH/../build/output/bin/tinyara_temp.hex
+cat $OS_DIR_PATH/../build/output/bin/tinyara_temp.hex $OS_DIR_PATH/../build/output/bin/tinyara_user.hex > $OS_DIR_PATH/../build/output/bin/tinyara_prot.hex
+echo "Downloading tinyara_prot.hex for Protected build"
+cp $OS_DIR_PATH/../build/output/bin/tinyara_prot.hex $IMXRT1050_USB_PATH
+else
+echo "Downloading tinyara.hex for Flat build"
+cp $OS_DIR_PATH/../build/output/bin/tinyara.hex $IMXRT1050_USB_PATH
+fi
|
phb4: Call pci config filters | @@ -325,6 +325,12 @@ static int64_t phb4_pcicfg_read(struct phb4 *p, uint32_t bdfn,
return OPAL_HARDWARE;
}
+ /* Handle per-device filters */
+ rc = pci_handle_cfg_filters(&p->phb, bdfn, offset, size,
+ (uint32_t *)data, false);
+ if (rc != OPAL_PARTIAL)
+ return rc;
+
/* Handle root complex MMIO based config space */
if (bdfn == 0)
return phb4_rc_read(p, offset, size, data);
@@ -428,6 +434,12 @@ static int64_t phb4_pcicfg_write(struct phb4 *p, uint32_t bdfn,
return OPAL_HARDWARE;
}
+ /* Handle per-device filters */
+ rc = pci_handle_cfg_filters(&p->phb, bdfn, offset, size,
+ (uint32_t *)&data, true);
+ if (rc != OPAL_PARTIAL)
+ return rc;
+
/* Handle root complex MMIO based config space */
if (bdfn == 0)
return phb4_rc_write(p, offset, size, data);
|
[RTduino][stm32f410-nucleo] add English readme | ## 1 RTduino - Arduino Ecosystem Compatibility Layer for RT-Thread
-STM32F401 Nucleo board has support [RTduino](https://github.com/RTduino/RTduino). Users can use Arduino APIs, third party libraries and programming method to program on Blue Pill board.
+STM32F401 Nucleo board has support [RTduino](https://github.com/RTduino/RTduino). Users can use Arduino APIs, third party libraries and programming method to program on the board.
### 1.1 How to Enable RTduino
|
[kernel] throw an exception in fillHtrans if a dynamical system has boundary conditions
first attempt to take into account bc. not completed yet | @@ -515,6 +515,7 @@ void OSNSMatrix::fillHtrans(DynamicalSystemsGraph & DSG, InteractionsGraph& inde
leftInteractionBlock = inter.getLeftInteractionBlock();
double * array = &*leftInteractionBlock->getArray();
+ //double * array_with_bc= nullptr;
SP::DynamicalSystem ds1 = indexSet.properties(*ui).source;
SP::DynamicalSystem ds2 = indexSet.properties(*ui).target;
@@ -529,6 +530,42 @@ void OSNSMatrix::fillHtrans(DynamicalSystemsGraph & DSG, InteractionsGraph& inde
{
endl = (ds == ds2);
size_t sizeDS = ds->dimension();
+
+ SecondOrderDS* sods = dynamic_cast<SecondOrderDS*> (ds.get());
+
+ if (sods)
+ {
+ SP::BoundaryCondition bc;
+ if(sods->boundaryConditions())
+ {
+ // bc = sods->boundaryConditions();
+ // NM_dense_display(array,sizeY,sizeDS,sizeY);
+ // array_with_bc = (double *) calloc(sizeY*sizeDS,sizeof(double));
+ // memcpy(array_with_bc, array ,sizeY*sizeDS,sizeof(double));
+ // NM_dense_display(array_with_bc,sizeY,sizeDS,sizeY);
+ // for(std::vector<unsigned int>::iterator itindex = bc->velocityIndices()->begin() ;
+ // itindex != bc->velocityIndices()->end();
+ // ++itindex)
+ // {
+
+
+ // for (unsigned int row; row < sizeY; row++ )
+ // {
+ // array_with_bc[row + (sizeY) * (posBlock + *itindex)] = 0.0
+ // }
+ // // (nslawSize,sizeDS));
+ // //SP::SiconosVector coltmp(new SiconosVector(nslawSize));
+ // //coltmp->zero();
+ // std::cout << "bc indx "<< *itindex << std::endl;
+ // }
+
+
+ // //getchar();
+ THROW_EXCEPTION("OSNSMatrix::fillHtrans boundary conditions not yet implemented.");
+ }
+ }
+
+
abs_pos_ds = DSG.properties(DSG.descriptor(ds)).absolute_position;
CSparseMatrix_block_dense_zentry(Htriplet, pos, abs_pos_ds, array+posBlock*sizeY, sizeY, sizeDS, DBL_EPSILON);
}
|
Provide actions for the extra mouse buttons
Bind APP_SWITCH to button 4 and expand notification panel on button 5.
PR <https://github.com/Genymobile/scrcpy/pull/2258> | @@ -661,6 +661,14 @@ input_manager_process_mouse_button(struct input_manager *im,
if (!im->forward_all_clicks) {
int action = down ? ACTION_DOWN : ACTION_UP;
+ if (control && event->button == SDL_BUTTON_X1) {
+ action_app_switch(im->controller, action);
+ return;
+ }
+ if (control && event->button == SDL_BUTTON_X2 && down) {
+ expand_notification_panel(im->controller);
+ return;
+ }
if (control && event->button == SDL_BUTTON_RIGHT) {
press_back_or_turn_screen_on(im->controller, action);
return;
|
Fix condition in iteration over Dynamic section entry
An entry with a DT_NULL tag (`d_tag`) not the
section entry itself marks the end of the
_DYNAMIC array | @@ -172,7 +172,7 @@ set_library(const char* libpath)
// locate the .dynamic section
for (i = 0; i < elf->e_shnum; i++) {
if (sections[i].sh_type == SHT_DYNAMIC) {
- for (dyn = (Elf64_Dyn *)((char *)buf + sections[i].sh_offset); dyn != DT_NULL; dyn++) {
+ for (dyn = (Elf64_Dyn *)((char *)buf + sections[i].sh_offset); dyn != NULL && dyn->d_tag != DT_NULL; dyn++) {
if (dyn->d_tag == DT_NEEDED) {
char *depstr = (char *)(strtab + dyn->d_un.d_val);
if (depstr && strstr(depstr, "ld-linux")) {
|
native: Add basic ble_hw_rng implementation | #include <stdint.h>
#include <assert.h>
#include <string.h>
+#include <stdlib.h>
+#include <stdbool.h>
#include "syscfg/syscfg.h"
#include "os/os.h"
#include "nimble/ble.h"
/* We use this to keep track of which entries are set to valid addresses */
static uint8_t g_ble_hw_whitelist_mask;
+static ble_rng_isr_cb_t rng_cb;
+static bool rng_started;
+
/* Returns public device address or -1 if not present */
int
ble_hw_get_public_addr(ble_addr_t *addr)
@@ -143,7 +148,8 @@ ble_hw_encrypt_block(struct ble_encryption_block *ecb)
int
ble_hw_rng_init(ble_rng_isr_cb_t cb, int bias)
{
- return -1;
+ rng_cb = cb;
+ return 0;
}
/**
@@ -154,7 +160,15 @@ ble_hw_rng_init(ble_rng_isr_cb_t cb, int bias)
int
ble_hw_rng_start(void)
{
- return -1;
+ rng_started = true;
+
+ if (rng_cb) {
+ while (rng_started) {
+ rng_cb(rand());
+ }
+ }
+
+ return 0;
}
/**
@@ -165,7 +179,8 @@ ble_hw_rng_start(void)
int
ble_hw_rng_stop(void)
{
- return -1;
+ rng_started = false;
+ return 0;
}
/**
@@ -176,7 +191,7 @@ ble_hw_rng_stop(void)
uint8_t
ble_hw_rng_read(void)
{
- return 0;
+ return rand();
}
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
|
Fix to allow gradle only extensions to work. | @@ -23,7 +23,9 @@ class Dependency
public function isAndroidProject()
{
- return FileSystem.exists( getAndroidProject() + "/project.properties" );
+ var isAnt = FileSystem.exists( getAndroidProject() + "/project.properties" );
+ var isGradle = FileSystem.exists( getAndroidProject() + "/build.gradle" );
+ return isAnt || isGradle;
}
public function isFramework()
|
Don't act upon reception of default responses | void DeRestPluginPrivate::handleIasAceClusterIndication(const deCONZ::ApsDataIndication &ind, deCONZ::ZclFrame &zclFrame)
{
- Q_UNUSED(ind);
+ if (zclFrame.isDefaultResponse())
+ {
+ return;
+ }
QDataStream stream(zclFrame.payload());
stream.setByteOrder(QDataStream::LittleEndian);
|
Test that we don't have a memory leak in d2i_ASN1_OBJECT.
Fixes
Reworked test supplied by into a unit test. | #include <openssl/rand.h>
#include <openssl/asn1t.h>
+#include <openssl/obj_mac.h>
#include "internal/numbers.h"
#include "testutil.h"
@@ -195,6 +196,30 @@ static int test_invalid_template(void)
return 0;
}
+static int test_reuse_asn1_object(void)
+{
+ static unsigned char cn_der[] = { 0x06, 0x03, 0x55, 0x04, 0x06 };
+ static unsigned char oid_der[] = {
+ 0x06, 0x06, 0x2a, 0x03, 0x04, 0x05, 0x06, 0x07
+ };
+ int ret = 0;
+ ASN1_OBJECT *obj;
+ unsigned char const *p = oid_der;
+
+ /* Create an object that owns dynamically allocated 'sn' and 'ln' fields */
+
+ if (!TEST_ptr(obj = ASN1_OBJECT_create(NID_undef, cn_der, sizeof(cn_der),
+ "C", "countryName")))
+ goto err;
+ /* reuse obj - this should not leak sn and ln */
+ if (!TEST_ptr(d2i_ASN1_OBJECT(&obj, &p, sizeof(oid_der))))
+ goto err;
+ ret = 1;
+err:
+ ASN1_OBJECT_free(obj);
+ return ret;
+}
+
int setup_tests(void)
{
#ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -205,5 +230,6 @@ int setup_tests(void)
ADD_TEST(test_int64);
ADD_TEST(test_uint64);
ADD_TEST(test_invalid_template);
+ ADD_TEST(test_reuse_asn1_object);
return 1;
}
|
Allow checking variable IV/key size in cipher_info | @@ -542,6 +542,42 @@ static inline unsigned int mbedtls_cipher_info_get_block_size(
return( info->MBEDTLS_PRIVATE(block_size) );
}
+/**
+ * \brief This function returns a non-zero value if the key length for
+ * the given cipher is variable.
+ *
+ * \param info The cipher info structure. This may be \c NULL.
+ *
+ * \return Non-zero if the key length is variable, \c 0 otherwise.
+ * \return \c 0 if the given pointer is \c NULL.
+ */
+static inline int mbedtls_cipher_info_has_variable_key_bitlen(
+ const mbedtls_cipher_info_t *info )
+{
+ if( info == NULL )
+ return( 0 );
+
+ return( info->MBEDTLS_PRIVATE(flags) & MBEDTLS_CIPHER_VARIABLE_KEY_LEN );
+}
+
+/**
+ * \brief This function returns a non-zero value if the IV size for
+ * the given cipher is variable.
+ *
+ * \param info The cipher info structure. This may be \c NULL.
+ *
+ * \return Non-zero if the IV size is variable, \c 0 otherwise.
+ * \return \c 0 if the given pointer is \c NULL.
+ */
+static inline int mbedtls_cipher_info_has_variable_iv_size(
+ const mbedtls_cipher_info_t *info )
+{
+ if( info == NULL )
+ return( 0 );
+
+ return( info->MBEDTLS_PRIVATE(flags) & MBEDTLS_CIPHER_VARIABLE_IV_LEN );
+}
+
/**
* \brief This function initializes a \p cipher_context as NONE.
*
|
VERSION bump to version 1.2.6 | @@ -27,7 +27,7 @@ endif()
# micro version is changed with a set of small changes or bugfixes anywhere in the project.
set(SYSREPO_MAJOR_VERSION 1)
set(SYSREPO_MINOR_VERSION 2)
-set(SYSREPO_MICRO_VERSION 5)
+set(SYSREPO_MICRO_VERSION 6)
set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_MICRO_VERSION})
# Version of the library
|
psock_socket: Add type field check
behavior alignment to Linux
Return EINVAL when type field include nonsupport bit | @@ -82,6 +82,11 @@ int psock_socket(int domain, int type, int protocol,
FAR const struct sock_intf_s *sockif = NULL;
int ret;
+ if (type & ~(SOCK_CLOEXEC | SOCK_NONBLOCK | SOCK_TYPE_MASK))
+ {
+ return -EINVAL;
+ }
+
/* Initialize the socket structure */
psock->s_domain = domain;
|
rpi-base.inc: enable i2c-gpio overlay
Adds support for software i2c controller on gpio pins
RPI_EXTRA_CONFIG += "\
dtoverlay=i2c-gpio,bus=7,i2c_gpio_sda=6,i2c_gpio_scl=5 \
"
Will configure a /dev/i2c-7 bus with sda=gpio#6 and slc=gpio#5
The overlay documentation can be found here: | @@ -31,6 +31,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
overlays/justboom-both.dtbo \
overlays/justboom-dac.dtbo \
overlays/justboom-digi.dtbo \
+ overlays/i2c-gpio.dtbo \
overlays/i2c-rtc.dtbo \
overlays/imx219.dtbo \
overlays/imx477.dtbo \
|
Simplify demuxer
Call the same push_packet_to_sinks() in all cases, and make
sc_demuxer_parse() return void. | @@ -69,7 +69,7 @@ push_packet_to_sinks(struct sc_demuxer *demuxer, const AVPacket *packet) {
return true;
}
-static bool
+static void
sc_demuxer_parse(struct sc_demuxer *demuxer, AVPacket *packet) {
uint8_t *in_data = packet->data;
int in_len = packet->size;
@@ -89,14 +89,6 @@ sc_demuxer_parse(struct sc_demuxer *demuxer, AVPacket *packet) {
}
packet->dts = packet->pts;
-
- bool ok = push_packet_to_sinks(demuxer, packet);
- if (!ok) {
- LOGE("Could not process packet");
- return false;
- }
-
- return true;
}
static bool
@@ -138,25 +130,23 @@ sc_demuxer_push_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
}
}
- if (is_config) {
- // config packet
- bool ok = push_packet_to_sinks(demuxer, packet);
- if (!ok) {
- return false;
- }
- } else {
+ if (!is_config) {
// data packet
- bool ok = sc_demuxer_parse(demuxer, packet);
+ sc_demuxer_parse(demuxer, packet);
+ }
- if (demuxer->pending) {
+ bool ok = push_packet_to_sinks(demuxer, packet);
+
+ if (!is_config && demuxer->pending) {
// the pending packet must be discarded (consumed or error)
av_packet_free(&demuxer->pending);
}
if (!ok) {
+ LOGE("Could not process packet");
return false;
}
- }
+
return true;
}
|
Function grib_context_log(): errno value can potentially be overwritten | @@ -1012,6 +1012,7 @@ void grib_context_log(const grib_context* c, int level, const char* fmt, ...)
else {
char msg[1024];
va_list list;
+ const int errsv = errno;
va_start(list, fmt);
vsprintf(msg, fmt, list);
@@ -1023,12 +1024,12 @@ void grib_context_log(const grib_context* c, int level, const char* fmt, ...)
/* #if HAS_STRERROR */
#if 1
strcat(msg, " (");
- strcat(msg, strerror(errno));
+ strcat(msg, strerror(errsv));
strcat(msg, ")");
#else
- if (errno > 0 && errno < sys_nerr) {
+ if (errsv > 0 && errsv < sys_nerr) {
strcat(msg, " (");
- strcat(msg, sys_errlist[errno]);
+ strcat(msg, sys_errlist[errsv]);
strcat(msg, " )");
}
#endif
|
Test that signal was successful | @@ -937,7 +937,12 @@ static inline void facil_cluster_signal_children(void) {
cluster_uint2str(msg + 12, 0);
FIO_HASH_FOR_LOOP(&facil_cluster_data.clients, i) {
if (i->obj) {
- write(sock_uuid2fd(i->key), msg, 16);
+ int attempt = write(sock_uuid2fd(i->key), msg, 16);
+ if (attempt > 0 && attempt != 16) {
+ fwrite("FATAL ERROR: Couldn't perform hot restart\n", 42, 1, stderr);
+ kill(0, SIGINT);
+ return;
+ }
}
}
}
|
Flattened ocf_core_info struct | @@ -22,14 +22,11 @@ struct ocf_core_info {
/** Core size in bytes unit */
uint64_t core_size_bytes;
- /** Fields refers ongoing flush operation */
- struct {
/** Number of blocks flushed in ongoing flush operation */
uint32_t flushed;
/** Number of blocks left to flush in ongoing flush operation */
uint32_t dirty;
- };
/** How long core is dirty in seconds unit */
uint64_t dirty_for;
|
meta: test coverage for cas fixes | @@ -147,6 +147,41 @@ my $sock = $server->sock;
#my $res = mget($sock, 'foo2', 's t v');
}
+{
+ diag "basic mset CAS";
+ my $key = "msetcas";
+ print $sock "ms $key 2\r\nbo\r\n";
+ like(scalar <$sock>, qr/^HD/, "set test key");
+
+ my $res = mget($sock, $key, 'c');
+ ok(get_flag($res, 'c'), "got a cas value back");
+
+ my $cas = get_flag($res, 'c');
+ my $badcas = $cas + 10;
+ print $sock "ms $key 2 c C$badcas\r\nio\r\n";
+ like(scalar <$sock>, qr/^EX c0/, "zeroed out cas on return");
+
+ print $sock "ms $key 2 c C$cas\r\nio\r\n";
+ like(scalar <$sock>, qr/^HD c\d+/, "success on correct cas");
+}
+
+{
+ diag "mdelete with cas";
+ my $key = "mdeltest";
+ print $sock "ms $key 2\r\nzo\r\n";
+ like(scalar <$sock>, qr/^HD/, "set test key");
+
+ my $res = mget($sock, $key, 'c');
+ ok(get_flag($res, 'c'), "got a cas value back");
+
+ my $cas = get_flag($res, 'c');
+ my $badcas = $cas + 10;
+ print $sock "md $key C$badcas\r\n";
+ like(scalar <$sock>, qr/^EX/, "mdelete fails for wrong CAS");
+ print $sock "md $key C$cas\r\n";
+ like(scalar <$sock>, qr/^HD/, "mdeleted key");
+}
+
{
diag "encoded binary keys";
# 44OG44K544OI is "tesuto" in katakana
|
Updated pdsc: RTOS2 header registration moved from RTX5 to API section | @@ -471,6 +471,7 @@ ARMv8-M Mainline based device with TrustZone
<description>CMSIS-RTOS API for Cortex-M, SC000, and SC300</description>
<files>
<file category="doc" name="CMSIS/Documentation/RTOS2/html/index.html"/>
+ <file category="header" name="CMSIS/RTOS2/Include/cmsis_os2.h"/>
</files>
</api>
<api Cclass="CMSIS Driver" Cgroup="USART" Capiversion="2.2.0" exclusive="0">
@@ -2246,7 +2247,6 @@ ARMv8-M Mainline based device with TrustZone
<file category="doc" name="CMSIS/Documentation/RTOS2/html/rtx5_impl.html"/>
<!-- RTX header files -->
- <file category="header" name="CMSIS/RTOS2/Include/cmsis_os2.h"/>
<file category="header" name="CMSIS/RTOS2/RTX/Include/rtx_os.h"/>
<!-- RTX configuration -->
@@ -2316,7 +2316,6 @@ ARMv8-M Mainline based device with TrustZone
<file category="doc" name="CMSIS/Documentation/RTOS2/html/rtx5_impl.html"/>
<!-- RTX header files -->
- <file category="header" name="CMSIS/RTOS2/Include/cmsis_os2.h"/>
<file category="header" name="CMSIS/RTOS2/RTX/Include/rtx_os.h"/>
<!-- RTX configuration -->
@@ -2367,7 +2366,6 @@ ARMv8-M Mainline based device with TrustZone
<file category="doc" name="CMSIS/Documentation/RTOS2/html/rtx5_impl.html"/>
<!-- RTX header files -->
- <file category="header" name="CMSIS/RTOS2/Include/cmsis_os2.h"/>
<file category="header" name="CMSIS/RTOS2/RTX/Include/rtx_os.h"/>
<!-- RTX configuration -->
@@ -2449,7 +2447,6 @@ ARMv8-M Mainline based device with TrustZone
<file category="doc" name="CMSIS/Documentation/RTOS2/html/rtx5_impl.html"/>
<!-- RTX header files -->
- <file category="header" name="CMSIS/RTOS2/Include/cmsis_os2.h"/>
<file category="header" name="CMSIS/RTOS2/RTX/Include/rtx_os.h"/>
<!-- RTX configuration -->
|
Fix wrong learn error computation when model shrinkage is on. | @@ -77,6 +77,7 @@ static void ScaleAllApproxes(
}
}
allApproxes.push_back(&learnProgress->AveragingFold.BodyTailArr[0].Approx);
+ allApproxes.push_back(&learnProgress->AvrgApprox);
const int learnApproxesCount = SafeIntegerCast<int>(allApproxes.size());
for (auto& testApprox : learnProgress->TestApprox) {
allApproxes.push_back(&testApprox);
|
Apply memory overwrite fix from Unity's repo | @@ -288,6 +288,9 @@ namespace t2
HashAddSeparator(&sighash);
}
+ // Roll back scratch allocator after scanning only - filenames are being retained between scans
+ MemAllocLinearScope alloc_scope(&thread_state->m_ScratchAlloc);
+
const ScannerData* scanner = node_data->m_Scanner;
for (const FrozenFileAndHash& input : node_data->m_InputFiles)
@@ -298,9 +301,6 @@ namespace t2
if (scanner)
{
- // Roll back scratch allocator between scans
- MemAllocLinearScope alloc_scope(&thread_state->m_ScratchAlloc);
-
ScanInput scan_input;
scan_input.m_ScannerConfig = scanner;
scan_input.m_ScratchAlloc = &thread_state->m_ScratchAlloc;
|
Do not enable tap tests when the test os is 'sles'. | @@ -36,7 +36,7 @@ function configure() {
if [ "$TEST_OS" == "sles" ]; then
# TODO: remove this line as soon as the SLES image has zstd baked in
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --without-zstd"
- ./configure --prefix=/usr/local/greenplum-db-devel --with-python --with-libxml --enable-orafce --enable-tap-tests --disable-orca ${CONFIGURE_FLAGS}
+ ./configure --prefix=/usr/local/greenplum-db-devel --with-python --with-libxml --enable-orafce --disable-orca ${CONFIGURE_FLAGS}
else
./configure --prefix=/usr/local/greenplum-db-devel --with-perl --with-python --with-libxml --enable-mapreduce --enable-orafce --enable-tap-tests --disable-orca ${CONFIGURE_FLAGS}
fi
|
[chainmaker][#436]add two null parameters | @@ -197,6 +197,9 @@ START_TEST(test_002Parameters_0002TxinitxFailureNullpara)
rtnVal = BoatHlChainmakerTxInit(g_chaninmaker_wallet_ptr, NULL);
ck_assert(rtnVal == BOAT_ERROR_COMMON_INVALID_ARGUMENT);
+
+ rtnVal = BoatHlChainmakerTxInit(NULL, NULL);
+ ck_assert(rtnVal == BOAT_ERROR_COMMON_INVALID_ARGUMENT);
}
END_TEST
|
If selected sprite animation is hidden reset sub navigation to select root of state | @@ -250,6 +250,27 @@ export const NavigatorSprites = ({
? `${selectedStateId}_group`
: `${selectedStateId}_${highlightAnimationId}`;
+ useEffect(() => {
+ if (spriteAnimations.length > 0) {
+ const selected = spriteAnimations.find(
+ (a) => a.id === selectedNavigationId
+ );
+ // If selected sprite animation is hidden
+ // reset sub navigation to select root of state
+ if (!selected) {
+ const newId = `${selectedStateId}_group`;
+ if (selectedNavigationId !== newId) {
+ dispatch(
+ editorActions.setSelectedAnimationId({
+ animationId: "",
+ stateId: selectedStateId,
+ })
+ );
+ }
+ }
+ }
+ }, [dispatch, selectedNavigationId, selectedStateId, spriteAnimations]);
+
const addState = useCallback(
(e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
e.stopPropagation();
|
SOVERSION bump to version 1.3.17 | @@ -48,7 +48,7 @@ set(LIBNETCONF2_VERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION
# with backward compatible change and micro version is connected with any internal change of the library.
set(LIBNETCONF2_MAJOR_SOVERSION 1)
set(LIBNETCONF2_MINOR_SOVERSION 3)
-set(LIBNETCONF2_MICRO_SOVERSION 16)
+set(LIBNETCONF2_MICRO_SOVERSION 17)
set(LIBNETCONF2_SOVERSION_FULL ${LIBNETCONF2_MAJOR_SOVERSION}.${LIBNETCONF2_MINOR_SOVERSION}.${LIBNETCONF2_MICRO_SOVERSION})
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_SOVERSION})
|
Still trying to undo convergence changes... | @@ -2277,7 +2277,7 @@ void InitializeClimateParams(BODY *body, int iBody, int iVerbose) {
RunningMeanTmp = daRunningMean[RunLen];
while (fabs(RunningMeanTmp - daRunningMean[RunLen]) >
body[iBody].dSpinUpTol ||
- count <= RunLen) {
+ count <= iMaxIteration) {
RunningMeanTmp = daRunningMean[RunLen];
PoiseSeasonal(body, iBody);
fvMatrixSeasonal(body, iBody);
@@ -2308,12 +2308,14 @@ void InitializeClimateParams(BODY *body, int iBody, int iVerbose) {
}
}
count += 1;
+ /*
if (count >= iMaxIteration) {
if (iVerbose > VERBPROG) {
fprintf(stderr,"ERROR: Initial climate state failed to converge.\n");
}
exit(EXIT_INPUT);
}
+ */
}
free(daRunningMean);
|
[externals] fix redefinition of CXSparse typedefs in clang | @@ -47,14 +47,14 @@ Documentation to be done
#endif
#endif
-/* From cs.h */
#ifndef CS_INT
+
+/* From cs.h */
#ifdef CS_LONG
#define CS_INT long
#else
#define CS_INT int
#endif
-#endif
/* Treat CXSparse structs as opaque types. Users may #include "cs.h"
* to use them outside Siconos. */
@@ -70,7 +70,6 @@ typedef struct cs_dl_numeric cs_dln;
typedef struct cs_di_numeric cs_din;
#ifdef SICONOS_INT64 // SWIG gives syntax error for CS_NAME(_sparse)
-typedef struct cs_dl_sparse CSparseMatrix;
#ifndef css
#define css cs_dls
#endif
@@ -78,7 +77,6 @@ typedef struct cs_dl_sparse CSparseMatrix;
#define csn cs_dln
#endif
#else
-typedef struct cs_di_sparse CSparseMatrix;
#ifndef css
#define css cs_dis
#endif
@@ -87,15 +85,15 @@ typedef struct cs_di_sparse CSparseMatrix;
#endif
#endif
-#if defined(__cplusplus) && !defined(BUILD_AS_CPP)
-extern "C"
-{
#endif
-#if defined(__cplusplus) && !defined(BUILD_AS_CPP)
-}
+#ifdef SICONOS_INT64 // SWIG gives syntax error for CS_NAME(_sparse)
+typedef struct cs_dl_sparse CSparseMatrix;
+#else
+typedef struct cs_di_sparse CSparseMatrix;
#endif
+
/* we use csparse from Timothy Davis
Timothy Davis,
|
configure: print utf-8 support | @@ -300,6 +300,7 @@ Your build configuration:
Version : $VERSION
Compiler flags : $CFLAGS
Linker flags : $LIBS $LDFLAGS
+ UTF-8 support : $utf8
Dynamic buffer : $with_getline
Geolocation : $geolocation
Storage method : $storage
|
resolved conflict and merged | |- ^- (list telegram)
?~ gaz zeg
?: ?- -.tal :: after the end
+ $sd !! :: caught above
$ud (lth +.tal num)
$da (lth +.tal wen.i.gaz)
==
:: if past the range, we're done searching.
zeg
?: ?- -.hed :: before the start
+ $sd !! :: caught above
$ud (lth num +.hed)
$da (lth wen.i.gaz +.hed)
==
=/ min
=* hed hed.u.ran
?- -.hed
+ $sd & :: relative is always in.
$ud (gth count +.hed)
$da (gth now.bol +.hed)
==
=- [&(min -) !-]
=* tal u.tal.u.ran
?- -.tal
+ $sd | :: relative is always done.
$ud (gte +(+.tal) count)
$da (gte +.tal now.bol)
==
|
VPP crash when run "lb set interface nat4 in <intc>" | @@ -359,7 +359,7 @@ lb_set_interface_nat_command_fn (vlib_main_t * vm,
unformat_input_t _line_input, *line_input = &_line_input;
vnet_main_t * vnm = vnet_get_main();
clib_error_t * error = 0;
- u32 * sw_if_index = 0;
+ u32 _sw_if_index, *sw_if_index = &_sw_if_index;
u32 * inside_sw_if_indices = 0;
int is_del = 0;
|
tests/thread: Make stress_aes.py test run on bare-metal ports.
This is a long-running test, so make it run in reasonable time on slower,
bare-metal ports. | @@ -235,7 +235,7 @@ class LockedCounter:
count = LockedCounter()
-def thread_entry():
+def thread_entry(n_loop):
global count
aes = AES(256)
@@ -244,7 +244,7 @@ def thread_entry():
data = bytearray(128)
# from now on we don't use the heap
- for loop in range(5):
+ for loop in range(n_loop):
# encrypt
aes.set_key(key)
aes.set_iv(iv)
@@ -265,8 +265,20 @@ def thread_entry():
if __name__ == "__main__":
+ import sys
+
+ if sys.platform == "rp2":
+ n_thread = 1
+ n_loop = 2
+ elif sys.platform in ("esp32", "pyboard"):
+ n_thread = 2
+ n_loop = 2
+ else:
n_thread = 20
+ n_loop = 5
for i in range(n_thread):
- _thread.start_new_thread(thread_entry, ())
+ _thread.start_new_thread(thread_entry, (n_loop,))
+ thread_entry(n_loop)
while count.value < n_thread:
time.sleep(1)
+ print("done")
|
Partial revert (re-add strict version checking for KPH on Win10), Add missing 32bit KPH offsets | @@ -160,9 +160,7 @@ NTSTATUS KphInitializeDynamicPackage(
Package->ResultingNtVersion = PHNT_REDSTONE5;
break;
default:
- Package->BuildNumber = USHRT_MAX;
- Package->ResultingNtVersion = PHNT_THRESHOLD;
- break;
+ return STATUS_NOT_SUPPORTED;
}
Package->StructData.EgeGuid = 0x18;
@@ -291,10 +289,16 @@ NTSTATUS KphInitializeDynamicPackage(
Package->BuildNumber = 16299;
Package->ResultingNtVersion = PHNT_REDSTONE3;
break;
- default:
- Package->BuildNumber = USHRT_MAX;
- Package->ResultingNtVersion = PHNT_THRESHOLD;
+ case 17134:
+ Package->BuildNumber = 17134;
+ Package->ResultingNtVersion = PHNT_REDSTONE4;
break;
+ case 17763:
+ Package->BuildNumber = 17763;
+ Package->ResultingNtVersion = PHNT_REDSTONE5;
+ break;
+ default:
+ return STATUS_NOT_SUPPORTED;
}
Package->StructData.EgeGuid = 0xc;
|
messages: check for isOwn | @@ -122,7 +122,7 @@ export function ResourceSkeleton(props: ResourceSkeletonProps): ReactElement {
);
const ExtraControls = () => {
- if (workspace === '/messages' && !resource.startsWith('dm-')) {
+ if (workspace === '/messages' && isOwn && !resource.startsWith('dm-')) {
return (
<Dropdown
flexShrink={0}
|
Ensure timezone conversion works on timestamps (s,ms,us). | @@ -520,6 +520,21 @@ tm2time (const struct tm *src) {
return timegm (&tmp) - src->tm_gmtoff;
}
+static void
+set_tz (void) {
+ char tz[TZ_NAME_LEN] = { 0 };
+
+ if (!conf.tz_name)
+ return;
+
+ snprintf (tz, TZ_NAME_LEN, "TZ=%s", conf.tz_name);
+ if ((putenv (tz)) != 0) {
+ LOG_DEBUG (("Can't set TZ env variable %s: %s\n", tz, strerror (errno)));
+ return;
+ }
+ tzset ();
+}
+
/* Format the given date/time according the given format.
*
* On error, 1 is returned.
@@ -528,7 +543,6 @@ tm2time (const struct tm *src) {
int
str_to_time (const char *str, const char *fmt, struct tm *tm) {
time_t t;
- char tz[TZ_NAME_LEN] = { 0 };
char *end = NULL, *sEnd = NULL;
unsigned long long ts = 0;
int us, ms;
@@ -561,6 +575,8 @@ str_to_time (const char *str, const char *fmt, struct tm *tm) {
return 1;
seconds = (us) ? ts / SECS : ((ms) ? ts / MILS : ts);
+
+ set_tz ();
/* if GMT needed, gmtime_r instead of localtime_r. */
localtime_r (&seconds, tm);
@@ -579,12 +595,7 @@ str_to_time (const char *str, const char *fmt, struct tm *tm) {
return 0;
}
- snprintf (tz, TZ_NAME_LEN, "TZ=%s", conf.tz_name);
- if ((putenv (tz)) != 0) {
- LOG_DEBUG (("Can't set TZ env variable %s: %s\n", tz, strerror (errno)));
- return 0;
- }
- tzset ();
+ set_tz ();
localtime_r (&t, tm);
return 0;
|
libbarrelfish: Hakefile: libarrakis: build pmap_serialise.c | @@ -213,7 +213,7 @@ in
arch_include _ = ""
-- sources specific to the pmap implementation
- pmap_unified_srcs = [ "pmap_slab_mgmt.c" ]
+ pmap_unified_srcs = [ "pmap_slab_mgmt.c", "pmap_serialise.c" ]
pmap_srcs "x86_64" Config.LL = pmap_unified_srcs ++ [ "pmap_ll.c" ]
pmap_srcs "x86_64" Config.ARRAY = pmap_unified_srcs ++ [ "pmap_array.c" ]
pmap_srcs "k1om" Config.LL = pmap_unified_srcs ++ [ "pmap_ll.c" ]
|
Add optimization options in .travis.yml | @@ -2,19 +2,34 @@ sudo: required
language: c
compiler: gcc
env:
-- HOST=x86_64-linux-gnu
-- HOST=x86-linux-gnu
-- HOST=arm-linux-gnueabihf
-- HOST=aarch64-linux-gnu
-- HOST=mipsel-linux-gnu
-# Currently experiencing build failures here
-#- HOST=powerpc64-linux-gnu
+- HOST=x86_64-linux-gnu OPT=-O0
+- HOST=x86-linux-gnu OPT=-O0
+- HOST=arm-linux-gnueabihf OPT=-O0
+- HOST=aarch64-linux-gnu OPT=-O0
+- HOST=mipsel-linux-gnu OPT=-O0
+- HOST=powerpc64-linux-gnu OPT=-O0
+- HOST=x86_64-linux-gnu OPT=-O2
+- HOST=x86-linux-gnu OPT=-O2
+- HOST=arm-linux-gnueabihf OPT=-O2
+- HOST=aarch64-linux-gnu OPT=-O2
+- HOST=mipsel-linux-gnu OPT=-O2
+- HOST=powerpc64-linux-gnu OPT=-O2
+- HOST=x86_64-linux-gnu OPT=-O3
+- HOST=x86-linux-gnu OPT=-O3
+- HOST=arm-linux-gnueabihf OPT=-O3
+- HOST=aarch64-linux-gnu OPT=-O3
+- HOST=mipsel-linux-gnu OPT=-O3
+- HOST=powerpc64-linux-gnu OPT=-O3
linux-s390x: &linux-s390x
os: linux
arch: s390x
- env: BUILD=s390x-linux-gnu HOST=s390x-linux-gnu
+ env: HOST=s390x-linux-gnu BUILD=s390x-linux-gnu
script:
+ - |
+ CFLAGS="$OPT"
+ CXXFLAGS="$OPT"
+ export CFLAGS CXXFLAGS
- autoreconf -i
- ./configure
- make -j32
@@ -45,6 +60,10 @@ script:
CXX=$HOST-g++
export CC CXX
fi
+- |
+ CFLAGS="$CFLAGS $OPT"
+ CXXFLAGS="$CXXFLAGS $OPT"
+ export CFLAGS CXXFLAGS
- autoreconf -i
- ./configure CC=$CC CXX=$CXX CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" --build=$BUILD --host=$HOST
- make -j32
@@ -58,8 +77,8 @@ jobs:
include:
- <<: *linux-s390x
- <<: *windows-remote-only
- env: TARGET=x86_64-linux-gnu WINHOST=x64
+ env: WINHOST=x64 TARGET=x86_64-linux-gnu
- <<: *windows-remote-only
- env: TARGET=arm-linux-gnueabihf WINHOST=Win32
+ env: WINHOST=Win32 TARGET=arm-linux-gnueabihf
- <<: *windows-remote-only
- env: TARGET=aarch64-linux-gnu WINHOST=x64
+ env: WINHOST=x64 TARGET=aarch64-linux-gnu
|
Remove unused variable 'homebridgeUpdate' | @@ -3345,7 +3345,6 @@ int DeRestPluginPrivate::putHomebridgeUpdated(const ApiRequest &req, ApiResponse
QString homebridge;
QString homebridgePin;
QString homebridgeVersion;
- bool homebridgeUpdate;
bool changed = false;
if (map.contains("homebridge"))
|
Executable name matching package name to allow build for debian | },
"electronPackagerConfig": {
"name": "GB Studio",
- "executableName": "gbstudio",
+ "executableName": "gb-studio",
"packageManager": "yarn",
"icon": "src/images/app/icon/app_icon",
"darwinDarkModeSupport": true,
|
Fix sandbox_lib_detect_find_path._find function.
Function sandbox_lib_detect_find_path._find function currently searches
the first occurrence of substring path.pattern(path.translate(name))
within filepath. This behavior breaks in case one wants, e.g., to find
packages named libsomething. The correct behavior would be to find the
last occurrence of substring path.pattern(path.translate(name)) within
filepath. Hence this patch. | @@ -37,7 +37,18 @@ function sandbox_lib_detect_find_path._find(filedir, name)
local filepath = results[1]
if filepath then
-- we need translate name first, https://github.com/xmake-io/xmake-repo/issues/1315
- local p = filepath:find(path.pattern(path.translate(name)))
+ local to_search = path.pattern(path.translate(name))
+
+ -- need to find the last occurrence of substring to_search within filepath
+ local last_index = 0
+ local idx = 0
+ while true do
+ idx = filepath:find(to_search, idx+1)
+ if idx == nil then break end
+ last_index = idx
+ end
+
+ local p = filepath:find(to_search, last_index)
if p then
filepath = path.translate(filepath:sub(1, p - 1))
if os.isdir(filepath) then
|
release-script: fix issue where version codename not set on memcheck | @@ -13,6 +13,22 @@ BUILD_DIR="$SRC_DIR/build"
PACKAGE_REVISION=${1:-1}
+
+find_version_codename() {
+ VERSION_CODENAME=$(grep "VERSION_CODENAME=" /etc/os-release | awk -F= {' print $2'} | sed s/\"//g)
+ if [ -z ${VERSION_CODENAME} ]; then
+ OS_ID=$(grep "^ID=" /etc/os-release | awk -F= {' print $2'} | sed s/\"//g)
+ VERSION_ID=$(grep "VERSION_ID=" /etc/os-release | awk -F= {' print $2'} | sed s/\"//g)
+ if [ -z ${OS_ID} ] || [ -z ${VERSION_ID} ]; then
+ VERSION_CODENAME=$(lsb_release -a 2> /dev/null | grep "Codename:" | awk -F: {' print $2'} | sed -e 's/^[ \t]*//')
+ else
+ VERSION_CODENAME="$OS_ID$VERSION_ID"
+ fi
+ fi
+
+ echo "Version codename: ${VERSION_CODENAME}"
+}
+
install_elektra() {
echo "Installing elektra..."
rm -rf $BUILD_DIR
@@ -184,16 +200,6 @@ build_package() {
mkdir $BUILD_DIR
cd $BUILD_DIR
- if [ -z ${VERSION_CODENAME} ]; then
- OS_ID=$(grep "^ID=" /etc/os-release | awk -F= {' print $2'} | sed s/\"//g)
- VERSION_ID=$(grep "VERSION_ID=" /etc/os-release | awk -F= {' print $2'} | sed s/\"//g)
- if [ -z ${OS_ID} ] || [ -z ${VERSION_ID} ]; then
- VERSION_CODENAME=$(lsb_release -a 2> /dev/null | grep "Codename:" | awk -F: {' print $2'} | sed -e 's/^[ \t]*//')
- else
- VERSION_CODENAME="$OS_ID$VERSION_ID"
- fi
- fi
-
mkdir -p $BASE_DIR/$VERSION/$VERSION_CODENAME
$SCRIPTS_DIR/packaging/package.sh "$PACKAGE_REVISION" 2> $BASE_DIR/$VERSION/$VERSION_CODENAME/elektra_$PVERSION.build.error > $BASE_DIR/$VERSION/$VERSION_CODENAME/elektra_$PVERSION.build
@@ -219,7 +225,8 @@ cmemcheck() {
}
# get version codename
-VERSION_CODENAME=$(grep "VERSION_CODENAME=" /etc/os-release | awk -F= {' print $2'} | sed s/\"//g)
+VERSION_CODENAME=""
+find_version_codename
install_elektra
run_updates
git_tag
|
Added ksceKernelSetPermission
and changed ksceKernelEnterProcess to ksceKernelSetProcessId | @@ -2187,7 +2187,6 @@ modules:
ksceKernelDeleteMutex: 0x0A912340
ksceKernelDeleteSema: 0x16A35E58
ksceKernelDeleteThread: 0xAC834F3F
- ksceKernelEnterProcess: 0x0486F239
ksceKernelExitDeleteThread: 0x1D17DECF
ksceKernelExitThread: 0x0C8A38E1
ksceKernelGetCallbackCount: 0x0892D8DF
@@ -2215,6 +2214,8 @@ modules:
ksceKernelSetEvent: 0x9EA3A45C
ksceKernelSetEventFlag: 0xD4780C3E
ksceKernelSetTimerTimeWide: 0x85195A16
+ ksceKernelSetProcessId: 0x0486F239
+ ksceKernelSetPermission: 0x02EEDF17
ksceKernelSignalCond: 0xAC616150
ksceKernelSignalCondAll: 0x6EC78CD0
ksceKernelSignalCondTo: 0x61533DA9
|
otatool: Fix a crash when imported as external python lib
Closes: | @@ -31,7 +31,6 @@ try:
except ImportError:
COMPONENTS_PATH = os.path.expandvars(os.path.join('$IDF_PATH', 'components'))
PARTTOOL_DIR = os.path.join(COMPONENTS_PATH, 'partition_table')
-
sys.path.append(PARTTOOL_DIR)
from parttool import PARTITION_TABLE_OFFSET, PartitionName, PartitionType, ParttoolTarget
@@ -102,7 +101,6 @@ class OtatoolTarget():
def switch_ota_partition(self, ota_id):
self._check_otadata_partition()
- sys.path.append(PARTTOOL_DIR)
import gen_esp32part as gen
def is_otadata_info_valid(status):
|
stats: use vlib_stats_validate in collector
Type: refactor | #include <vlib/unix/unix.h>
#include <vlib/stats/stats.h>
-static void
-stat_validate_counter_vector2 (vlib_stats_entry_t *ep, u32 max1, u32 max2)
-{
- counter_t **counters = ep->data;
- int i;
- vec_validate_aligned (counters, max1, CLIB_CACHE_LINE_BYTES);
- for (i = 0; i <= max1; i++)
- vec_validate_aligned (counters[i], max2, CLIB_CACHE_LINE_BYTES);
-
- ep->data = counters;
-}
-
-static void
-stat_validate_counter_vector (vlib_stats_entry_t *ep, u32 max)
-{
- vlib_thread_main_t *tm = vlib_get_thread_main ();
- ASSERT (tm->n_vlib_mains > 0);
- stat_validate_counter_vector2 (ep, tm->n_vlib_mains, max);
-}
-
static inline void
update_node_counters (vlib_stats_segment_t *sm)
{
@@ -46,17 +26,14 @@ update_node_counters (vlib_stats_segment_t *sm)
*/
if (l > no_max_nodes)
{
+ u32 last_thread = vlib_get_n_threads ();
void *oldheap = clib_mem_set_heap (sm->heap);
vlib_stats_segment_lock ();
- stat_validate_counter_vector (
- &sm->directory_vector[STAT_COUNTER_NODE_CLOCKS], l - 1);
- stat_validate_counter_vector (
- &sm->directory_vector[STAT_COUNTER_NODE_VECTORS], l - 1);
- stat_validate_counter_vector (
- &sm->directory_vector[STAT_COUNTER_NODE_CALLS], l - 1);
- stat_validate_counter_vector (
- &sm->directory_vector[STAT_COUNTER_NODE_SUSPENDS], l - 1);
+ vlib_stats_validate (STAT_COUNTER_NODE_CLOCKS, last_thread, l - 1);
+ vlib_stats_validate (STAT_COUNTER_NODE_VECTORS, last_thread, l - 1);
+ vlib_stats_validate (STAT_COUNTER_NODE_CALLS, last_thread, l - 1);
+ vlib_stats_validate (STAT_COUNTER_NODE_SUSPENDS, last_thread, l - 1);
vec_validate (sm->nodes, l - 1);
vlib_stats_entry_t *ep;
|
Updated note for 16.04 cuda install | @@ -123,7 +123,7 @@ sudo install rock_dkms
sudo reboot
sudo usermod -a -G video $LOGNAME
```
-To build aomp with support for nvptx GPUs, you must first install cuda 10. We recommend cuda 10.0. Cuda 10.1 will not work till aomp moves to the trunk development of LLVM 9. Once you download cuda 10.0 local install file, these commands should complete the install of cuda.
+To build aomp with support for nvptx GPUs, you must first install cuda 10. We recommend cuda 10.0. Cuda 10.1 will not work till aomp moves to the trunk development of LLVM 9. Once you download cuda 10.0 local install file, these commands should complete the install of cuda. Note the first command references the install for Ubuntu 16.04.
```
sudo dpkg -i cuda-repo-ubuntu1604-10-0-local-10.0.130-410.48_1.0-1_amd64.deb
sudo apt-key add /var/cuda-repo-10-0-local-10.0.130-410.48/7fa2af80.pub
|
Fix menu again (lost in merge) | @@ -17,7 +17,7 @@ UBYTE *script_ptr = 0;
UWORD script_ptr_x = 0;
UWORD script_ptr_y = 0;
UBYTE *script_start_ptr = 0;
-UBYTE script_cmd_args[6] = {0};
+UBYTE script_cmd_args[7] = {0};
UBYTE script_cmd_args_len;
UBYTE (*script_update_fn)();
UBYTE script_stack_ptr = 0;
|
[kernel] change the simnpleMatrix display for the storage type | @@ -684,7 +684,7 @@ void SimpleMatrix::display() const
{
std::cout << "SimpleMatrix::display(): empty matrix" << std::endl;
}
- std::cout << "num = " << _num << "\t";
+ std::cout << "SimpleMatrix storage type - num = " << _num << "\n";
if (_num == 1)
{
Siconos::algebra::print_m(*mat.Dense);
|
change sensor_2c | @@ -224,7 +224,7 @@ pbc.assignD.get('i2c')['check_assign'] = function (py2block, node, targets, valu
var funcName = py2block.identifier(value.func.attr);
var moduleName = py2block.identifier(value.func.value.id);
if (value._astname === "Call" && ['MPU9250', 'SHT20', 'BMP280'].indexOf(funcName) != -1
- && ['mpu9250', 'sht20', 'bmp280'].indexOf(funcName) != -1 && value.args.length === 1)
+ && ['mpu9250', 'sht20', 'bmp280'].indexOf(moduleName) != -1 && value.args.length === 1)
return true;
return false;
|
Improve error message in HARNESS_FORK_END().
Also include expected exit status to make debugging easier. | @@ -205,7 +205,11 @@ End the fork block and check exit status for all child processes
THROW_SYS_ERROR_FMT(AssertError, "unable to find child process %u", processIdx); \
\
if (WEXITSTATUS(processStatus) != HARNESS_FORK_CHILD_EXPECTED_EXIT_STATUS(processIdx)) \
- THROW_FMT(AssertError, "child %u exited with error %d", processIdx, WEXITSTATUS(processStatus)); \
+ { \
+ THROW_FMT( \
+ AssertError, "child %u exited with error %d but expected %d", processIdx, WEXITSTATUS(processStatus), \
+ HARNESS_FORK_CHILD_EXPECTED_EXIT_STATUS(processIdx)); \
+ } \
} \
} \
while (0)
|
Bump ConBee I / RaspBee I firmware version to 0x26350500 | @@ -84,7 +84,7 @@ DEFINES += GIT_COMMMIT=\\\"$$GIT_COMMIT\\\"
# which shall be used in order to support all features for this software release (case sensitive)
DEFINES += GW_AUTO_UPDATE_AVR_FW_VERSION=0x260b0500
DEFINES += GW_AUTO_UPDATE_R21_FW_VERSION=0x26420700
-DEFINES += GW_MIN_AVR_FW_VERSION=0x26330500
+DEFINES += GW_MIN_AVR_FW_VERSION=0x26350500
DEFINES += GW_MIN_R21_FW_VERSION=0x26490700
# Minimum version of the deRFusb23E0X firmware
|
trace dump: add string and binary
NOTE_DUMP_STRING
NOTE_DUMP_BINARY
And incubator-nuttx[trace: and sched note dump is together | @@ -608,6 +608,39 @@ static int trace_dump_one(FAR FILE *out,
break;
#endif
+#ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP
+ case NOTE_DUMP_STRING:
+ {
+ FAR struct note_string_s *nst;
+
+ nst = (FAR struct note_string_s *)p;
+ trace_dump_header(out, note, ctx);
+ fprintf(out, "dump_string: %s\n",
+ nst->nst_data);
+ }
+ break;
+
+ case NOTE_DUMP_BINARY:
+ {
+ FAR struct note_binary_s *nbi;
+ uint8_t count;
+ int i;
+
+ nbi = (FAR struct note_binary_s *)p;
+ trace_dump_header(out, note, ctx);
+ count = note->nc_length - sizeof(struct note_binary_s) + 1;
+ fprintf(out, "dump_binary: module=%u event=%u count=%u",
+ nbi->nbi_module, nbi->nbi_event, count);
+ for (i = 0; i < count; i++)
+ {
+ fprintf(out, " 0x%x", nbi->nbi_data[i]);
+ }
+
+ fprintf(out, "\n");
+ }
+ break;
+#endif
+
default:
break;
}
|
In tail input, on 'Exit_On_EOF' case, call flb_engine_exit()
Formerly this was calling flb_engine_shutdown(), which had the
affect of not flushing/calling through the grace period. | @@ -139,8 +139,7 @@ static int in_tail_collect_static(struct flb_input_instance *i_ins,
case FLB_TAIL_WAIT:
if (file->config->exit_on_eof) {
flb_info("[in_tail] file=%s ended, stop", file->name);
- flb_engine_shutdown(config);
- exit(0);
+ flb_engine_exit(config);
}
/* Promote file to 'events' type handler */
flb_debug("[in_tail] file=%s promote to TAIL_EVENT", file->name);
|
motor_min_value: ensure we match previous versions | @@ -269,7 +269,8 @@ void motor_output_calc(float mix[4]) {
// only apply digital idle if we are armed and not in motor test
float motor_min_value = 0;
if (!flags.on_ground && flags.arm_state && !flags.motortest_override) {
- motor_min_value = (float)profile.motor.digital_idle * 0.01f;
+ // 0.0001 for legacy purposes, motor drivers downstream to round up
+ motor_min_value = 0.0001f + (float)profile.motor.digital_idle * 0.01f;
}
mix[i] = mapf(mix[i], 0.0f, 1.0f, motor_min_value, profile.motor.motor_limit * 0.01f);
|
graph-delete thread: properly remove entry from metadata-store and hook | (pure:m (need ugroup))
::
++ delete-graph
- |= rid=resource
+ |= [group-rid=resource rid=resource]
=/ m (strand ,~)
^- form:m
;< =bowl:spider bind:m get-bowl:strandio
(poke-our %graph-push-hook %push-hook-action !>([%remove rid]))
;< ~ bind:m
%+ poke-our %metadata-hook
- metadata-hook-action+!>([%remove (en-path:resource rid)])
- ;< ~ bind:m
- %+ poke-our %metadata-store
:- %metadata-action
!> :+ %remove
- (en-path:resource rid)
+ (en-path:resource group-rid)
[%graph (en-path:resource rid)]
(pure:m ~)
--
(scry-group u.ugroup-rid)
?. hidden.group
;< ~ bind:m
- (delete-graph rid.action)
+ (delete-graph u.ugroup-rid rid.action)
(pure:m !>(~))
;< ~ bind:m
(poke-our %group-store %group-action !>([%remove-group rid.action ~]))
;< ~ bind:m
(poke-our %group-push-hook %push-hook-action !>([%remove rid.action]))
-;< ~ bind:m (delete-graph rid.action)
+;< ~ bind:m (delete-graph u.ugroup-rid rid.action)
+;< ~ bind:m
+ %+ poke-our %metadata-hook
+ metadata-hook-action+!>([%remove (en-path:resource u.ugroup-rid)])
(pure:m !>(~))
|
man: small formatting update | .\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "KDB\-ELEKTRIFY\-GETENV" "1" "February 2018" "" ""
+.TH "KDB\-ELEKTRIFY\-GETENV" "1" "March 2019" "" ""
.
.SH "NAME"
\fBkdb\-elektrify\-getenv\fR \- elektrify the environment of applications
.
.SH "SYNOPSIS"
-\fBkdb elektrify\-getenv\fR \fIapplication\fR \fIoptions\fR
+.
+.nf
+
+kdb elektrify\-getenv <application> <options>
+.
+.fi
.
.SH "EXAMPLE"
.
@@ -213,7 +218,7 @@ Or to have a different lock/suspend program per computer (that all have the same
kdb mount\-info system/elektra/intercept/getenv/info # must be below /elektra/intercept/getenv to be available
kdb setmeta spec/elektra/intercept/getenv/layer/hostname override/#0 system/elektra/intercept/getenv/info/uname/nodename
kdb setmeta spec/elektra/intercept/getenv/override/lock context /elektra/intercept/getenv/info/lock/%hostname%
-kdb set user/elektra/intercept/getenv/info/lock/computer1 "systemctl suspend \-i
+kdb set user/elektra/intercept/getenv/info/lock/computer1 "systemctl suspend \-i"
kdb set user/elektra/intercept/getenv/info/lock/computer2 "xset dpms force off && xtrlock"
`kdb getenv lock` # call the appropriate lock method for the current computer
.
|
Add component_check_test_requires_psa_disabled used to check if some tests requiring PSA to be disabled are presemt | @@ -873,7 +873,12 @@ component_check_doxygen_warnings () {
tests/scripts/doxygen.sh
}
+component_check_test_requires_psa_disabled () {
+ msg "Check: tests requiring PSA to be disabled"
+ not grep -n 'depends.*!MBEDTLS_USE_PSA_CRYPTO' -R tests/suites/
+ not grep -n 'requires.*disabled.*USE_PSA' tests/ssl-opt.sh tests/opt-testcases/tls13-compat.sh
+}
################################################################
#### Build and test many configurations and targets
|
Better shim for scripts on windows.
Arguments should be passed in properly. | @@ -689,7 +689,8 @@ int main(int argc, const char **argv) {
# Create a dud batch file when on windows.
(when is-win
(def name (last (string/split sep main)))
- (def bat (string "@echo off\r\njanet %~dp0\\" name "%*"))
+ (def fullname (string binpath sep name))
+ (def bat (string "@echo off\r\njanet " fullname " %*"))
(def newname (string binpath sep name ".bat"))
(array/push (dyn :installed-files) newname)
(add-body "install"
|
cpfskmodem/example: removing used variables for carrier freq,phase offsets | @@ -29,8 +29,6 @@ void usage()
printf(" -b <rolloff> : filter roll-off, default: 0.35\n");
printf(" -n <num> : number of data symbols, default: 80\n");
printf(" -s <snr> : SNR [dB], default: 40\n");
- printf(" -F <freq> : carrier frequency offset, default: 0\n");
- printf(" -P <phase> : carrier phase offset, default: 0\n");
}
int main(int argc, char*argv[])
@@ -43,12 +41,10 @@ int main(int argc, char*argv[])
float beta = 0.35f; // GMSK bandwidth-time factor
unsigned int num_symbols = 20; // number of data symbols
float SNRdB = 40.0f; // signal-to-noise ratio [dB]
- float cfo = 0.0f; // carrier frequency offset
- float cpo = 0.0f; // carrier phase offset
int filter_type = LIQUID_CPFSK_SQUARE;
int dopt;
- while ((dopt = getopt(argc,argv,"ht:p:H:k:m:b:n:s:F:P:")) != EOF) {
+ while ((dopt = getopt(argc,argv,"ht:p:H:k:m:b:n:s:")) != EOF) {
switch (dopt) {
case 'h': usage(); return 0;
case 't':
@@ -72,8 +68,6 @@ int main(int argc, char*argv[])
case 'b': beta = atof(optarg); break;
case 'n': num_symbols = atoi(optarg); break;
case 's': SNRdB = atof(optarg); break;
- case 'F': cfo = atof(optarg); break;
- case 'P': cpo = atof(optarg); break;
default:
exit(1);
}
|
build/configs/qemu/tc_64k/defconfig:Disable tash commands by default
This patch eliminates the build error due to flash region overflow by '.text'
section by ~8KB, by disabling below tash commands:
- DATE
- ENV GET/SET/UNSET
- HEAPINFO/HEAPINFO_USER_GROUP
- PS
- UPTIME | @@ -776,20 +776,20 @@ CONFIG_SYSTEM_PREAPP_STACKSIZE=2048
CONFIG_SYSTEM_INFORMATION=y
CONFIG_KERNEL_CMDS=y
# CONFIG_FS_CMDS is not set
-CONFIG_ENABLE_DATE_CMD=y
-CONFIG_ENABLE_ENV_GET_CMD=y
-CONFIG_ENABLE_ENV_SET_CMD=y
-CONFIG_ENABLE_ENV_UNSET_CMD=y
+# CONFIG_ENABLE_DATE_CMD is not set
+# CONFIG_ENABLE_ENV_GET_CMD is not set
+# CONFIG_ENABLE_ENV_SET_CMD is not set
+# CONFIG_ENABLE_ENV_UNSET_CMD is not set
CONFIG_ENABLE_FREE_CMD=y
-CONFIG_ENABLE_HEAPINFO_CMD=y
-CONFIG_HEAPINFO_USER_GROUP=y
-CONFIG_HEAPINFO_USER_GROUP_LIST="heapinfo_task,heapinfo_task2/heapinfo_task3/heapinfo_pthread"
+# CONFIG_ENABLE_HEAPINFO_CMD is not set
+# CONFIG_HEAPINFO_USER_GROUP is not set
+# CONFIG_HEAPINFO_USER_GROUP_LIST is not set
# CONFIG_ENABLE_IRQINFO_CMD is not set
CONFIG_ENABLE_KILL_CMD=y
# CONFIG_ENABLE_KILLALL_CMD is not set
-CONFIG_ENABLE_PS_CMD=y
+# CONFIG_ENABLE_PS_CMD is not set
# CONFIG_ENABLE_STACKMONITOR_CMD is not set
-CONFIG_ENABLE_UPTIME_CMD=y
+# CONFIG_ENABLE_UPTIME_CMD is not set
# CONFIG_SYSTEM_VI is not set
#
|
framework/media: Correct null pointer checking | @@ -58,7 +58,7 @@ int stream_info_create(stream_policy_t stream_policy, stream_info_t **stream_inf
}
*stream_info = (stream_info_t *)calloc(1, sizeof(stream_info_t));
- if (stream_info == NULL) {
+ if (*stream_info == NULL) {
return -ENOMEM;
}
(*stream_info)->id = stream_info_id_generate();
|
spi_master: fix cmd test ci failure | @@ -838,7 +838,7 @@ void test_cmd_addr(spi_slave_task_context_t *slave_context, bool lsb_first)
}
//clean
- vRingbufferReturnItem(slave_context->data_received, buffer);
+ vRingbufferReturnItem(slave_context->data_received, rcv_data);
}
TEST_ASSERT(spi_bus_remove_device(spi) == ESP_OK);
|
Added GeoIP2 Country database link to default config file. | @@ -631,6 +631,10 @@ static-file .flv
# wget -N http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
# gunzip GeoLite2-City.mmdb.gz
#
+# For GeoIP2 Country database:
+# wget -N http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz
+# gunzip GeoLite2-Country.mmdb.gz
+#
# Note: `geoip-city-data` is an alias of `geoip-database`
#
#geoip-database /usr/local/share/GeoIP/GeoLiteCity.dat
|
Utility: Fix minor mistakes in documentation | @@ -34,7 +34,7 @@ char * elektraLskip (char const * const text)
* @brief This function removes trailing whitespace from the given string.
*
* The address stored in the parameter `end` of this function must either
- * point to the last character of the string (the one before `'0'`) or `NULL`.
+ * point to the last character of the string (the one before `'\0'`) or `NULL`.
*
* - If `end` is `NULL`, then the function determines the last character by
* calculating the length of the string.
@@ -42,7 +42,7 @@ char * elektraLskip (char const * const text)
* - If `end` is specified manually, then the function will cut of the given
* string right before the last consecutive whitespace character before
* the character stored in `*end`. After the call to this function
- * the variabel `*end` stores the address of the last character of the
+ * the variable `*end` stores the address of the last character of the
* stripped string.
*
* @pre The parameter `start` must not be `NULL`.
|
scripts: fix link | @@ -357,4 +357,4 @@ The build script basically builds the applications, runs tests, installs everyth
and restarts the backend. Finally, it can run the configuration script for the frontend,
which updates the website content.
-The current build script can be found [here](/scripts/build-homepage).
+The current build script can be found [here](/scripts/deploy/website).
|
doc:modfiy ubuntu build on 18.04 | @@ -95,7 +95,7 @@ Install the necessary tools for the following systems:
.. note::
Use ``gcc`` version 7.3.* or higher to avoid running into
- issue `#1396 <https://github.com/projectacrn/acrn-hypervisor/issues/1396>`_. Follow these instructions to install the ``gcc-7`` package on Ubuntu 16.04:
+ issue `#1396 <https://github.com/projectacrn/acrn-hypervisor/issues/1396>`_. Follow these instructions to install the ``gcc-7`` package on Ubuntu 18.04:
.. code-block:: none
@@ -108,20 +108,8 @@ Install the necessary tools for the following systems:
ACRN development requires ``binutils`` version 2.27 (or higher).
Verify your version of ``binutils`` with the command ``apt show binutils
- ``. While Ubuntu 18.04 has a new version of ``binutils``, the default
- version on Ubuntu 16.04 must be updated (see issue `#1133
- <https://github.com/projectacrn/acrn-hypervisor/issues/1133>`_).
+ ``.
- .. code-block:: none
-
- $ wget https://mirrors.ocf.berkeley.edu/gnu/binutils/binutils-2.27.tar.gz
- $ tar xzvf binutils-2.27.tar.gz && cd binutils-2.27
- $ ./configure
- $ make
- $ sudo make install
-
-
- Ubuntu 14.04 requires ``libsystemd-journal-dev`` instead of ``libsystemd-dev`` as indicated above.
* Fedora/Redhat development system:
|
init: Silence messages and call ourselves "OPAL" | @@ -808,8 +808,8 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt)
/* Call library constructors */
do_ctors();
- printf("SkiBoot %s starting...\n", version);
- printf("initial console log level: memory %d, driver %d\n",
+ prlog(PR_NOTICE, "OPAL %s starting...\n", version);
+ prlog(PR_DEBUG, "initial console log level: memory %d, driver %d\n",
(debug_descriptor.console_log_levels >> 4),
(debug_descriptor.console_log_levels & 0x0f));
prlog(PR_TRACE, "You will not see this\n");
|
Fix WARMUP_TIME define | @@ -8545,7 +8545,7 @@ void DeRestPluginPrivate::taskToLocalData(const TaskItem &task)
*/
void DeRestPluginPrivate::delayedFastEnddeviceProbe()
{
- if (getUptime() < WARMUP_TIME_S)
+ if (getUptime() < WARMUP_TIME)
{
return;
}
@@ -9770,7 +9770,7 @@ void DeRestPlugin::checkZclAttributeTimerFired()
LightNode *lightNode = &d->nodes[d->lightAttrIter];
d->lightAttrIter++;
- if (d->getUptime() < WARMUP_TIME_S)
+ if (d->getUptime() < WARMUP_TIME)
{
// warmup phase
}
|
Fix LogWindow helper InputText styling | @@ -78,9 +78,17 @@ void LogWindow::Draw(const ImVec2& size)
ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_Text));
}
+ ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0,0,0,0));
+ ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(0,0,0,0));
+ ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(0,0,0,0));
+ ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
+ ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0));
+
ImGui::SetNextItemWidth(listItemWidth);
ImGui::InputText(("##" + item).c_str(), item.data(), item.size(), ImGuiInputTextFlags_ReadOnly);
- ImGui::PopStyleColor();
+
+ ImGui::PopStyleVar(2);
+ ImGui::PopStyleColor(4);
}
}
|
Very minor readability improvement for ai_check_lie(). | @@ -29379,7 +29379,13 @@ int ai_check_warp()
int ai_check_lie()
{
- if(self->drop && self->position.y == self->base && !self->velocity.y && validanim(self, ANI_RISEATTACK) && ((rand32() % (self->stalltime - _time + 1)) < 3) && (self->energy_status.health_current > 0 && _time > self->staydown.riseattack_stall))
+ if(self->drop
+ && self->position.y == self->base
+ && !self->velocity.y
+ && validanim(self, ANI_RISEATTACK)
+ && ((rand32() % (self->stalltime - _time + 1)) < 3)
+ && (self->energy_status.health_current > 0
+ && _time > self->staydown.riseattack_stall))
{
common_try_riseattack();
return 1;
|
Get closer to typechecking generic args correctly. | @@ -638,7 +638,9 @@ tf(Type *orig)
t = tylookup(orig);
isgeneric = t->type == Tygeneric;
ingeneric += isgeneric;
+ pushenv(orig->env);
tyresolve(t);
+ popenv(orig->env);
/* If this is an instantiation of a generic type, we want the params to
* match the instantiation */
if (orig->type == Tyunres && t->type == Tygeneric) {
|
BugID:17569460: Remove multiple define for monitor. | @@ -165,10 +165,6 @@ extern "C"
* @param[in] with_fcs @n 80211 frame buffer include fcs(4 byte) or not
* @param[in] rssi @n rssi of packet
*/
- typedef int (*awss_recv_80211_frame_cb_t)(char *buf, int length,
- enum AWSS_LINK_TYPE link_type,
- int with_fcs, signed char rssi);
-
awss_recv_80211_frame_cb_t g_ieee80211_handler;
static void monitor_data_handler(uint8_t *buf, int len,
|
get_metadata() now works using an URI | @@ -209,8 +209,8 @@ typedef struct clap_preset_provider {
clap_preset_collection_info_t *out_info);
// reads metadata from the given file and passes them to the metadata receiver
- bool(CLAP_ABI *read_file_metadata)(const struct clap_preset_provider *provider,
- const char *file_path,
+ bool(CLAP_ABI *get_metadata)(const struct clap_preset_provider *provider,
+ const char *uri,
const clap_preset_metadata_receiver_t *metadata_receiver);
} clap_preset_provider_t;
|
send time correction through serial port always (will be controlled to print out in OV). | @@ -2226,11 +2226,7 @@ void synchronizePacket(PORT_RADIOTIMER_WIDTH timeReceived) {
// log a large timeCorrection
if (
- ieee154e_vars.isSync==TRUE &&
- (
- timeCorrection<-LIMITLARGETIMECORRECTION ||
- timeCorrection> LIMITLARGETIMECORRECTION
- )
+ ieee154e_vars.isSync==TRUE
) {
openserial_printError(COMPONENT_IEEE802154E,ERR_LARGE_TIMECORRECTION,
(errorparameter_t)timeCorrection,
@@ -2266,11 +2262,7 @@ void synchronizeAck(PORT_SIGNED_INT_WIDTH timeCorrection) {
#endif
// log a large timeCorrection
if (
- ieee154e_vars.isSync==TRUE &&
- (
- timeCorrection<-LIMITLARGETIMECORRECTION ||
- timeCorrection> LIMITLARGETIMECORRECTION
- )
+ ieee154e_vars.isSync==TRUE
) {
openserial_printError(COMPONENT_IEEE802154E,ERR_LARGE_TIMECORRECTION,
(errorparameter_t)timeCorrection,
|
examples/slsiwifi: Fix build error for new heap
replace mm_get_heap_info to mm_get_heap_with_index for checking heap information, because mm_get_heap needs allocated address for getting heap structure.
heapinfo_parse() was changed to pass 3-params | @@ -57,6 +57,7 @@ sem_t g_sem_result;
sem_t g_sem_join;
static uint8_t g_join_result = 0;
#define WPA_MAX_SSID_LEN (4*32+1) /* SSID encoded in a string - worst case is all 4-octet hex digits + '\0' */
+#define BASE_HEAP_INDEX 0
/****************************************************************************
* Defines
@@ -104,7 +105,7 @@ static struct mm_heap_s *g_user_heap;
int g_memstat_total = 0;
static int getMemUsage(void)
{
- g_user_heap = mm_get_heap_info();
+ g_user_heap = mm_get_heap_with_index(BASE_HEAP_INDEX);
printf("\n\tCurrent memory usage (total): %d bytes\n", g_user_heap->total_alloc_size);
return g_user_heap->total_alloc_size;
}
@@ -118,7 +119,7 @@ int getMemLeaks(void)
// situations where the the blocks are freed while
// exiting
//print heapinfo
- heapinfo_parse(mm_get_heap_info(), HEAPINFO_TRACE);
+ heapinfo_parse(mm_get_heap_with_index(BASE_HEAP_INDEX), HEAPINFO_DETAIL_ALL, HEAPINFO_PID_ALL);
printf(" ______________________________________________________________ \n");
printf("| |\n");
printf("| WARNING: %6.6d bytes leaked during this run |\n", result);
|
Look for the prog_tag over entire fdinfo | @@ -617,23 +617,18 @@ int bpf_prog_get_tag(int fd, unsigned long long *ptag)
/* fprintf(stderr, "failed to open fdinfo %s\n", strerror(errno));*/
return -1;
}
- fgets(fmt, sizeof(fmt), f); // pos
- fgets(fmt, sizeof(fmt), f); // flags
- fgets(fmt, sizeof(fmt), f); // mnt_id
- fgets(fmt, sizeof(fmt), f); // prog_type
- fgets(fmt, sizeof(fmt), f); // prog_jited
- fgets(fmt, sizeof(fmt), f); // prog_tag
- fclose(f);
- char *p = strchr(fmt, ':');
- if (!p) {
-/* fprintf(stderr, "broken fdinfo %s\n", fmt);*/
- return -2;
- }
unsigned long long tag = 0;
- sscanf(p + 1, "%llx", &tag);
+ // prog_tag: can appear in different lines
+ while (fgets(fmt, sizeof(fmt), f)) {
+ if (sscanf(fmt, "prog_tag:%llx", &tag) == 1) {
*ptag = tag;
+ fclose(f);
return 0;
}
+ }
+ fclose(f);
+ return -2;
+}
static int libbpf_bpf_prog_load(const struct bpf_load_program_attr *load_attr,
char *log_buf, size_t log_buf_sz)
|
correctly derive the levtype for lake (hydrology) vs other discipline for fixed surface combination 174/255 and 174/176 | 'o2d' = {typeOfFirstFixedSurface=170; typeOfSecondFixedSurface=255;}
'o2d' = {typeOfFirstFixedSurface=171; typeOfSecondFixedSurface=255;}
'o2d' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=255; discipline=1;}
'o2d' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=255;}
'o2d' = {typeOfFirstFixedSurface=176; typeOfSecondFixedSurface=255;}
'o2d' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=176;}
+'sfc' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=176; discipline=1;}
'o2d' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=176;}
'sfc' = {typeOfFirstFixedSurface=177; typeOfSecondFixedSurface=255;}
|
py/objint: Use MP_OBJ_IS_STR_OR_BYTES macro instead of 2 separate ones. | @@ -378,7 +378,7 @@ mp_obj_t mp_obj_int_binary_op_extra_cases(mp_binary_op_t op, mp_obj_t lhs_in, mp
// true acts as 0
return mp_binary_op(op, lhs_in, MP_OBJ_NEW_SMALL_INT(1));
} else if (op == MP_BINARY_OP_MULTIPLY) {
- if (MP_OBJ_IS_STR(rhs_in) || MP_OBJ_IS_TYPE(rhs_in, &mp_type_bytes) || MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple) || MP_OBJ_IS_TYPE(rhs_in, &mp_type_list)) {
+ if (MP_OBJ_IS_STR_OR_BYTES(rhs_in) || MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple) || MP_OBJ_IS_TYPE(rhs_in, &mp_type_list)) {
// multiply is commutative for these types, so delegate to them
return mp_binary_op(op, rhs_in, lhs_in);
}
|
Added lock around unsubscribing process. | @@ -44,6 +44,9 @@ static csp_thread_handle_t telem_rx_handle;
/* Mutex to lock subscribing process */
static csp_mutex_t subscribing_lock;
+/* Mutex to lock unsubscribing process */
+static csp_mutex_t unsubscribing_lock;
+
/* Bool flag used to indicate telemetry up/down, used to start cleanup process */
static bool telemetry_running = true;
@@ -66,6 +69,7 @@ void telemetry_init()
packet_queue = csp_queue_create(MESSAGE_QUEUE_SIZE, sizeof(telemetry_packet));
csp_mutex_create(&subscribing_lock);
+ csp_mutex_create(&unsubscribing_lock);
#ifdef DEBUG
csp_debug_toggle_level(CSP_ERROR);
@@ -222,6 +226,7 @@ bool telemetry_subscribe(pubsub_conn * client_conn, uint8_t sources)
void telemetry_unsubscribe(pubsub_conn * conn)
{
+ csp_mutex_lock(&unsubscribing_lock, CSP_INFINITY);
if (conn != NULL)
{
csp_close(conn->conn_handle);
@@ -238,6 +243,7 @@ void telemetry_unsubscribe(pubsub_conn * conn)
}
}
}
+ csp_mutex_unlock(&unsubscribing_lock);
}
int telemetry_num_subscribers()
|
Updated pre-defined Caddy log-format. | @@ -79,7 +79,7 @@ static const GPreConfLog logs = {
/* Caddy JSON */
"{\"ts\":\"%x.%^\",\"request\":{\"remote_addr\":\"%h:%^\",\"proto\":\"%H\","
"\"method\":\"%m\",\"host\":\"%v\",\"uri\":\"%U\","
- "\"headers\":{\"User-Agent\":[\"%u\",\"%^\"]},\"tls\":{\"cipher_suite\":\"%k\","
+ "\"headers\":{\"User-Agent\":[\"%u\"]},\"tls\":{\"cipher_suite\":\"%k\","
"\"proto\":\"%K\"}},\"duration\":\"%T\",\"size\":\"%b\",\"status\":\"%s\","
"\"resp_headers\":{\"Content-Type\":[\"%M\"]}}"
};
|
docs: Change ESP_ERR_CHECK to ESP_ERROR_CHECK in provisioning examples
Closes
Closes
Closes
Closes | @@ -22,7 +22,7 @@ Initialization
.scheme_event_handler = WIFI_PROV_SCHEME_BLE_EVENT_HANDLER_FREE_BTDM
};
- ESP_ERR_CHECK( wifi_prov_mgr_init(config) );
+ ESP_ERROR_CHECK( wifi_prov_mgr_init(config) );
The configuration structure ``wifi_prov_mgr_config_t`` has a few fields to specify the behavior desired of the manager :
@@ -105,7 +105,7 @@ If provisioning state needs to be reset, any of the following approaches may be
::
bool provisioned = false;
- ESP_ERR_CHECK( wifi_prov_mgr_is_provisioned(&provisioned) );
+ ESP_ERROR_CHECK( wifi_prov_mgr_is_provisioned(&provisioned) );
Start Provisioning Service
@@ -133,7 +133,7 @@ See :doc:`Provisioning<provisioning>` for details about the security features.
wifi_prov_security_t security = WIFI_PROV_SECURITY_1;
const char *pop = "abcd1234";
- ESP_ERR_CHECK( wifi_prov_mgr_start_provisioning(security, pop, service_name, service_key) );
+ ESP_ERROR_CHECK( wifi_prov_mgr_start_provisioning(security, pop, service_name, service_key) );
The provisioning service will automatically finish only if it receives valid Wi-Fi AP credentials followed by successfully connection of device to the AP (IP obtained). Regardless of that, the provisioning service can be stopped at any moment by making a call to :cpp:func:`wifi_prov_mgr_stop_provisioning()`.
@@ -155,7 +155,7 @@ There are two ways for making this possible. The simpler way is to use a blockin
::
// Start provisioning service
- ESP_ERR_CHECK( wifi_prov_mgr_start_provisioning(security, pop, service_name, service_key) );
+ ESP_ERROR_CHECK( wifi_prov_mgr_start_provisioning(security, pop, service_name, service_key) );
// Wait for service to complete
wifi_prov_mgr_wait();
|
jenkins: remove comment that no longer is true | @@ -1043,8 +1043,6 @@ def cmemcheck(kdbtests=true) {
}
/* Helper for ctest to run tests without tests tagged as kdbtests.
- * Also sets permissions on folders to be nonwriteable to see if any test
- * non flagged with kdbtests tries to write to them.
*/
def cnokdbtest() {
ctest("Test -LE kdbtests")
|
drag to other monitors tags | @@ -511,7 +511,6 @@ void animateclient(Client *c, int x, int y, int w, int h, int frames, int resetp
} else {
while (time < frames)
{
- fprintf(stderr, "float, %f", easeOutQuint(((double)time/frames)));
resize(c,
oldx + easeOutQuint(((double)time/frames)) * (x - oldx),
oldy + easeOutQuint(((double)time/frames)) * (y - oldy), width, height, 1);
@@ -2180,11 +2179,24 @@ movemouse(const Arg *arg)
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
resize(c, nx, ny, c->w, c->h, 1);
+ if (ev.xmotion.x_root < selmon->mx ||
+ ev.xmotion.x_root > selmon->mx + selmon->mw ||
+ ev.xmotion.y_root < selmon->my ||
+ ev.xmotion.y_root > selmon->my + selmon->mh) {
+ if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
+ XRaiseWindow(dpy, c->win);
+ fprintf(stderr, "x, %d", ev.xmotion.x_root);
+ sendmon(c, m);
+ selmon = m;
+ focus(NULL);
+ }
+ } else {
if (ev.xmotion.y_root < bh && tagx != getxtag(ev.xmotion.x_root)) {
tagx = getxtag(ev.xmotion.x_root);
selmon->gesture = tagx + 1;
drawbar(selmon);
}
+ }
break;
}
} while (ev.type != ButtonRelease);
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.