message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Better sorting of util/other.syms | @@ -53,23 +53,23 @@ EVP_RAND datatype
EVP_RAND_CTX datatype
EVP_SIGNATURE datatype
GEN_SESSION_CB datatype
-OPENSSL_Applink external
-OSSL_LIB_CTX datatype
NAMING_AUTHORITY datatype
+OPENSSL_Applink external
OSSL_DECODER datatype
OSSL_DECODER_CTX datatype
OSSL_DECODER_CONSTRUCT datatype
OSSL_DECODER_CLEANUP datatype
OSSL_DECODER_INSTANCE datatype
-OSSL_HTTP_bio_cb_t datatype
-OSSL_PARAM datatype
-OSSL_PROVIDER datatype
OSSL_ENCODER datatype
OSSL_ENCODER_CTX datatype
OSSL_ENCODER_CONSTRUCT datatype
OSSL_ENCODER_CLEANUP datatype
OSSL_ENCODER_INSTANCE datatype
+OSSL_HTTP_bio_cb_t datatype
OSSL_HTTP_REQ_CTX datatype
+OSSL_LIB_CTX datatype
+OSSL_PARAM datatype
+OSSL_PROVIDER datatype
OSSL_STORE_CTX datatype
OSSL_STORE_INFO datatype
OSSL_STORE_LOADER datatype
|
l2_output:skip processing if no features are enabled | @@ -260,8 +260,12 @@ l2output_process_batch (vlib_main_t * vm, vlib_node_runtime_t * node,
{
u32 feature_bitmap = config->feature_bitmap & ~L2OUTPUT_FEAT_OUTPUT;
if (config->shg == 0 && feature_bitmap == 0)
+ {
+ if ((l2_efp | l2_vtr | l2_pbb) == 0)
+ return;
l2output_process_batch_inline (vm, node, config, b, cdo, next, n_left,
l2_efp, l2_vtr, l2_pbb, 0, 0);
+ }
else if (config->shg == 0)
l2output_process_batch_inline (vm, node, config, b, cdo, next, n_left,
l2_efp, l2_vtr, l2_pbb, 0, 1);
|
Rework `run_pending_requests` to avoid re-ordering requests
We now iterate through all the items in `_pending_reqs`, and exit when
we're done iterating it, or if `can_run_requests` returns false. | @@ -173,19 +173,16 @@ static int can_run_requests(h2o_http2_conn_t *conn)
static void run_pending_requests(h2o_http2_conn_t *conn)
{
- h2o_linklist_t tmp;
+ h2o_linklist_t *link, *lnext;
- h2o_linklist_init_anchor(&tmp);
-
- while (!h2o_linklist_is_empty(&conn->_pending_reqs) && can_run_requests(conn)) {
+ for (link = conn->_pending_reqs.next; link != &conn->_pending_reqs && can_run_requests(conn); link = lnext) {
/* fetch and detach a pending stream */
- h2o_http2_stream_t *stream = H2O_STRUCT_FROM_MEMBER(h2o_http2_stream_t, _refs.link, conn->_pending_reqs.next);
+ h2o_http2_stream_t *stream = H2O_STRUCT_FROM_MEMBER(h2o_http2_stream_t, _refs.link, link);
- h2o_linklist_unlink(&stream->_refs.link);
+ lnext = link->next;
if (stream->req._write_req_chunk_done != NULL) {
if (conn->num_streams._request_body_in_progress) {
- h2o_linklist_insert(&tmp, &stream->_refs.link);
continue;
}
conn->num_streams._request_body_in_progress++;
@@ -197,17 +194,13 @@ static void run_pending_requests(h2o_http2_conn_t *conn)
}
}
+ h2o_linklist_unlink(&stream->_refs.link);
+
/* handle it */
if (!h2o_http2_stream_is_push(stream->stream_id) && conn->pull_stream_ids.max_processed < stream->stream_id)
conn->pull_stream_ids.max_processed = stream->stream_id;
h2o_process_request(&stream->req);
}
-
- while (!h2o_linklist_is_empty(&tmp)) {
- h2o_http2_stream_t *stream = H2O_STRUCT_FROM_MEMBER(h2o_http2_stream_t, _refs.link, tmp.next);
- h2o_linklist_unlink(&stream->_refs.link);
- h2o_linklist_insert(&conn->_pending_reqs, &stream->_refs.link);
- }
}
static void execute_or_enqueue_request(h2o_http2_conn_t *conn, h2o_http2_stream_t *stream)
|
Fix define for use with Visual Studio. | // Tell 'em we actually want to do that, it's not an accident.
#if defined __GNUC__ || defined __clang__ || defined __MINGW32__ || defined __MINGW64__
#define FIX_UNUSED __attribute__((unused))
+#else
+ #define FIX_UNUSED
#endif
#define FIX_NOINLINE FIX_W32 FIX_UNUSED
|
port: remove unimplemented function | extern "C" {
#endif
-struct ble_npl_eventq *npl_freertos_eventq_dflt_get(void);
-
struct ble_npl_event *npl_freertos_eventq_get(struct ble_npl_eventq *evq,
ble_npl_time_t tmo);
|
ToolStatus: Fix capitalization | static PH_KEY_VALUE_PAIR GraphTypePairs[] =
{
{ L"None", (PVOID)TASKBAR_ICON_NONE },
- { L"CPU History", (PVOID)TASKBAR_ICON_CPU_HISTORY },
- { L"CPU Usage", (PVOID)TASKBAR_ICON_CPU_USAGE },
- { L"I/O History", (PVOID)TASKBAR_ICON_IO_HISTORY },
- { L"Commit History", (PVOID)TASKBAR_ICON_COMMIT_HISTORY },
- { L"Physical Memory History", (PVOID)TASKBAR_ICON_PHYSICAL_HISTORY },
+ { L"CPU usage", (PVOID)TASKBAR_ICON_CPU_USAGE },
+ { L"CPU history", (PVOID)TASKBAR_ICON_CPU_HISTORY },
+ { L"I/O history", (PVOID)TASKBAR_ICON_IO_HISTORY },
+ { L"Commit charge history", (PVOID)TASKBAR_ICON_COMMIT_HISTORY },
+ { L"Physical memory history", (PVOID)TASKBAR_ICON_PHYSICAL_HISTORY },
};
static PWSTR GraphTypeStrings[] =
{
L"None",
- L"CPU History",
- L"CPU Usage",
- L"I/O History",
- L"Commit History",
- L"Physical Memory History"
+ L"CPU usage",
+ L"CPU history",
+ L"I/O history",
+ L"Commit charge history",
+ L"Physical memory history"
};
PWSTR GraphTypeGetTypeString(
|
openssl ca: make index.txt parsing error more verbose
If index.txt exists but has some problems (like for example a single \n character in it) openssl will just exit without any error message.
Bug at least expirienced twice: | @@ -556,8 +556,10 @@ end_of_options:
goto end;
db = load_index(dbfile, &db_attr);
- if (db == NULL)
+ if (db == NULL) {
+ BIO_printf(bio_err, "Problem with index file: %s (could not load/parse file)\n", dbfile);
goto end;
+ }
if (index_index(db) <= 0)
goto end;
@@ -684,8 +686,10 @@ end_of_options:
goto end;
db = load_index(dbfile, &db_attr);
- if (db == NULL)
+ if (db == NULL) {
+ BIO_printf(bio_err, "Problem with index file: %s (could not load/parse file)\n", dbfile);
goto end;
+ }
/* Lets check some fields */
for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
|
Use HE script. | * Usage: http_client remote_addr remote_port [local_port] [local_encaps_port] [remote_encaps_port] [uri]
*
* Example
- * Client: $ ./http_client 212.201.121.100 80 0 9899 9899 /index.html
+ * Client: $ ./http_client 212.201.121.100 80 0 9899 9899 /cgi-bin/he
*/
#ifdef _WIN32
|
out_loki: improve performance by removing record counter
This patch makes a little performance improvement by removing the
record counter and replacing it value with the new struct flb_event_chunk
total_chunks value.
note: test formatter uses old approach since it's not exposed to
struct flb_event_chunk. | @@ -1027,11 +1027,11 @@ static int cb_loki_init(struct flb_output_instance *ins,
}
static flb_sds_t loki_compose_payload(struct flb_loki *ctx,
+ int total_records,
char *tag, int tag_len,
const void *data, size_t bytes)
{
int mp_ok = MSGPACK_UNPACK_SUCCESS;
- int total_records;
size_t off = 0;
flb_sds_t json;
struct flb_time tms;
@@ -1059,9 +1059,6 @@ static flb_sds_t loki_compose_payload(struct flb_loki *ctx,
* }
*/
- /* Count number of records */
- total_records = flb_mp_count(data, bytes);
-
/* Initialize msgpack buffers */
msgpack_unpacked_init(&result);
msgpack_sbuffer_init(&mp_sbuf);
@@ -1169,6 +1166,7 @@ static void cb_loki_flush(struct flb_event_chunk *event_chunk,
/* Format the data to the expected Newrelic Payload */
payload = loki_compose_payload(ctx,
+ event_chunk->total_events,
(char *) event_chunk->tag,
flb_sds_len(event_chunk->tag),
event_chunk->data, event_chunk->size);
@@ -1386,10 +1384,15 @@ static int cb_loki_format_test(struct flb_config *config,
const void *data, size_t bytes,
void **out_data, size_t *out_size)
{
+ int total_records;
flb_sds_t payload = NULL;
struct flb_loki *ctx = plugin_context;
- payload = loki_compose_payload(ctx, (char *) tag, tag_len, data, bytes);
+ /* Count number of records */
+ total_records = flb_mp_count(data, bytes);
+
+ payload = loki_compose_payload(ctx, total_records,
+ (char *) tag, tag_len, data, bytes);
if (payload == NULL) {
return -1;
}
|
more responsive animation button | @@ -28,7 +28,7 @@ class InputOverlay(FrameObject):
self.scoreentry = scoreentry
self.holding = False
- self.oldclick = True
+ self.oldclick = False
self.n = 0
@@ -46,13 +46,15 @@ class InputOverlay(FrameObject):
self.holding = True
def add_to_frame(self, background, x_offset, y_offset, alpha=1):
- if self.holding:
+ if self.holding or (self.frame_index < len(self.frames) - 1 and self.oldclick):
self.frame_index += 1
if self.frame_index >= len(self.frames):
self.frame_index -= 1
- else:
+ elif self.frame_index >= len(self.frames) - 1:
self.oldclick = False
+
+ if not self.oldclick:
self.frame_index -= 1
if self.frame_index < 0:
self.frame_index += 1
|
build: remove comment | // XXX add missing jobs
// TODO have a per plugin/binding deps in Dockerfile for easier maintanence
// TODO add warnings plugins to scan for compiler warnings
-// XXX setup way to determine what tests should run
-// regex on env.ghprbCommentBody
// # Set Variables #
CMPVERSION = '0.8.22'
|
fix reload binding memory issue: copy current_binding_mode | @@ -845,7 +845,7 @@ CommandResult *run_binding(Binding *bind, Con *con) {
Binding *bind_cp = binding_copy(bind);
/* The "mode" command might change the current mode, so back it up to
* correctly produce an event later. */
- const char *modename = current_binding_mode;
+ char *modename = sstrdup(current_binding_mode);
CommandResult *result = parse_command(command, NULL, NULL);
free(command);
@@ -873,6 +873,7 @@ CommandResult *run_binding(Binding *bind, Con *con) {
}
ipc_send_binding_event("run", bind_cp, modename);
+ FREE(modename);
binding_free(bind_cp);
return result;
|
meta: fix meta delete
compared cas token was always zero... | @@ -1551,7 +1551,6 @@ error:
static void process_mdelete_command(conn *c, token_t *tokens, const size_t ntokens) {
char *key;
size_t nkey;
- uint64_t req_cas_id = 0;
item *it = NULL;
int i;
uint32_t hv;
@@ -1611,7 +1610,7 @@ static void process_mdelete_command(conn *c, token_t *tokens, const size_t ntoke
MEMCACHED_COMMAND_DELETE(c->sfd, ITEM_key(it), it->nkey);
// allow only deleting/marking if a CAS value matches.
- if (of.has_cas && ITEM_get_cas(it) != req_cas_id) {
+ if (of.has_cas && ITEM_get_cas(it) != of.req_cas_id) {
pthread_mutex_lock(&c->thread->stats.mutex);
c->thread->stats.delete_misses++;
pthread_mutex_unlock(&c->thread->stats.mutex);
|
cirrus: upgrade fedora image to 33 | -FROM fedora:32
+FROM fedora:33
-RUN dnf upgrade -y && dnf install -y \
+RUN dnf upgrade --refresh -y && dnf install -y \
augeas-devel \
bison \
boost-devel \
@@ -31,7 +31,7 @@ RUN dnf upgrade -y && dnf install -y \
openssl-devel \
procps-ng \
python3-devel \
- qt5-devel \
+ qt5-qtbase-devel \
ruby-devel \
rubygem-test-unit \
swig \
@@ -51,3 +51,4 @@ RUN mkdir -p ${GTEST_ROOT} \
-L https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz \
&& tar -zxvf gtest.tar.gz --strip-components=1 -C ${GTEST_ROOT} \
&& rm gtest.tar.gz
+
|
Add missing register string
Closes | @@ -285,5 +285,6 @@ static const ZydisShortString STR_REGISTER[] =
// Uncategorized
ZYDIS_MAKE_SHORTSTRING("mxcsr"),
ZYDIS_MAKE_SHORTSTRING("pkru"),
- ZYDIS_MAKE_SHORTSTRING("xcr0")
+ ZYDIS_MAKE_SHORTSTRING("xcr0"),
+ ZYDIS_MAKE_SHORTSTRING("uif")
};
|
porting: fix transport init in nimble_port.c | #include "nimble/nimble_port.h"
#if NIMBLE_CFG_CONTROLLER
#include "controller/ble_ll.h"
-#include "transport/ram/ble_hci_ram.h"
+#include "nimble/transport.h"
#endif
static struct ble_npl_eventq g_eventq_dflt;
@@ -46,7 +46,6 @@ nimble_port_init(void)
ble_transport_hs_init();
#if NIMBLE_CFG_CONTROLLER
- ble_hci_ram_init();
#ifndef RIOT_VERSION
hal_timer_init(5, NULL);
os_cputime_init(32768);
|
checker: set type of return statement | @@ -229,6 +229,7 @@ function checkstat(node, st, errors)
checkexp(node.exp, st, errors, tret)
node.exp = trycoerce(node.exp, tret)
checkmatch("return", tret, node.exp._type, errors, node.exp._pos)
+ node._type = tret
return true
elseif tag == "Stat_If" then
local ret = true
|
Comment back the ets_print call
This needs to be disabled for now. See nanoframework/Home#389. | @@ -14,11 +14,14 @@ uint32_t GenericPort_Write( int portNum, const char* data, size_t size )
char* p = (char*)data;
int counter = 0;
- // send characters directly to the trace port
- while(*p != '\0' || counter < (int)size)
- {
- ets_printf( "%c", *p++);
- counter++;
- }
- return counter;
+ // TODO fix this when working https://github.com/nanoframework/Home/issues/389
+ //// send characters directly to the trace port
+ //while(*p != '\0' || counter < (int)size)
+ //{
+ // ets_printf( "%c", *p++);
+ // counter++;
+ //}
+ //return counter;
+
+ return (uint32_t)size;
}
|
TSCH: optimize tsch_tx_process_pending | @@ -529,6 +529,7 @@ tsch_rx_process_pending()
static void
tsch_tx_process_pending(void)
{
+ uint16_t num_packets_freed = 0;
int16_t dequeued_index;
/* Loop on accessing (without removing) a pending input packet */
while((dequeued_index = ringbufindex_peek_get(&dequeued_ringbuf)) != -1) {
@@ -543,10 +544,14 @@ tsch_tx_process_pending(void)
mac_call_sent_callback(p->sent, p->ptr, p->ret, p->transmissions);
/* Free packet queuebuf */
tsch_queue_free_packet(p);
- /* Free all unused neighbors */
- tsch_queue_free_unused_neighbors();
/* Remove dequeued packet from ringbuf */
ringbufindex_get(&dequeued_ringbuf);
+ num_packets_freed++;
+ }
+
+ if(num_packets_freed > 0) {
+ /* Free all unused neighbors */
+ tsch_queue_free_unused_neighbors();
}
}
/*---------------------------------------------------------------------------*/
|
Minor optimzation/cleanup to ethernet-input node | @@ -229,8 +229,6 @@ determine_next_node (ethernet_main_t * em,
u32 is_l20,
u32 type0, vlib_buffer_t * b0, u8 * error0, u8 * next0)
{
- u32 eth_start = vnet_buffer (b0)->l2_hdr_offset;
- vnet_buffer (b0)->l2.l2_len = b0->current_data - eth_start;
if (PREDICT_FALSE (*error0 != ETHERNET_ERROR_NONE))
{
// some error occurred
@@ -238,8 +236,10 @@ determine_next_node (ethernet_main_t * em,
}
else if (is_l20)
{
- *next0 = em->l2_next;
// record the L2 len and reset the buffer so the L2 header is preserved
+ u32 eth_start = vnet_buffer (b0)->l2_hdr_offset;
+ vnet_buffer (b0)->l2.l2_len = b0->current_data - eth_start;
+ *next0 = em->l2_next;
ASSERT (vnet_buffer (b0)->l2.l2_len ==
ethernet_buffer_header_size (b0));
vlib_buffer_advance (b0, -ethernet_buffer_header_size (b0));
@@ -430,12 +430,12 @@ ethernet_input_inline (vlib_main_t * vm,
(hi->hw_address != 0) &&
!eth_mac_equal ((u8 *) e1, hi->hw_address))
error1 = ETHERNET_ERROR_L3_MAC_MISMATCH;
+ vlib_buffer_advance (b0, sizeof (ethernet_header_t));
determine_next_node (em, variant, 0, type0, b0,
&error0, &next0);
- vlib_buffer_advance (b0, sizeof (ethernet_header_t));
+ vlib_buffer_advance (b1, sizeof (ethernet_header_t));
determine_next_node (em, variant, 0, type1, b1,
&error1, &next1);
- vlib_buffer_advance (b1, sizeof (ethernet_header_t));
}
goto ship_it01;
}
|
netkvm: introduce work item to finish adapter attach
This is preparation patch, this work item will be spawned
when VFIO adapter enters its operational state. | @@ -286,6 +286,7 @@ public:
void SetOidAsync(ULONG oid, PVOID data, ULONG size);
void SetOid(ULONG oid, PVOID data, ULONG size);
private:
+ void OnOpStateChange(bool State);
void OnLastReferenceGone() override;
CParaNdisProtocol& m_Protocol;
NDIS_HANDLE m_BindContext;
@@ -339,6 +340,35 @@ private:
bool udp;
} checksumRx;
} m_Capabilies = {};
+ class COperationWorkItem : public CNdisAllocatable<COperationWorkItem, 'IWRP'>
+ {
+ public:
+ COperationWorkItem(CProtocolBinding *Binding, bool State, NDIS_HANDLE AdapterHandle);
+ ~COperationWorkItem();
+ bool Run()
+ {
+ if (m_Handle)
+ {
+ NdisQueueIoWorkItem(m_Handle, [](PVOID WorkItemContext, NDIS_HANDLE NdisIoWorkItemHandle)
+ {
+ COperationWorkItem *wi = (COperationWorkItem *)WorkItemContext;
+ UNREFERENCED_PARAMETER(NdisIoWorkItemHandle);
+ wi->Fired();
+ }, this);
+ }
+ return m_Handle;
+ }
+ void Fired()
+ {
+ m_Binding->OnOpStateChange(m_State);
+ Destroy(this, m_Binding->m_BindingHandle);
+ }
+ private:
+ NDIS_HANDLE m_Handle;
+ CProtocolBinding *m_Binding;
+ bool m_State;
+ };
+ friend class COperationWorkItem;
};
static CParaNdisProtocol *ProtocolData = NULL;
@@ -587,6 +617,7 @@ public:
}
NDIS_HANDLE DriverHandle() const { return m_DriverHandle; }
NDIS_HANDLE ProtocolHandle() const { return m_ProtocolHandle; }
+ operator CMutexProtectedAccess& () { return m_Mutex; }
private:
CNdisList<CAdapterEntry, CRawAccess, CCountingObject> m_Adapters;
// there are procedures with several operations on the list,
@@ -981,6 +1012,35 @@ void CProtocolBinding::QueryCapabilities(PNDIS_BIND_PARAMETERS BindParameters)
TraceNoPrefix(0, "[%s] Best guess for NDIS revision: 6.%d\n", __FUNCTION__, m_Capabilies.NdisMinor);
}
+CProtocolBinding::COperationWorkItem::COperationWorkItem(CProtocolBinding *Binding, bool State, NDIS_HANDLE AdapterHandle) :
+ m_State(State), m_Binding(Binding)
+{
+ TraceNoPrefix(0, "[%s]\n", __FUNCTION__);
+ m_Handle = NdisAllocateIoWorkItem(AdapterHandle);
+ m_Binding->AddRef();
+ m_Binding->m_Protocol.AddRef();
+}
+
+CProtocolBinding::COperationWorkItem::~COperationWorkItem()
+{
+ TraceNoPrefix(0, "[%s]\n", __FUNCTION__);
+ if (m_Handle)
+ {
+ NdisFreeIoWorkItem(m_Handle);
+ }
+ m_Binding->m_Protocol.Release();
+ m_Binding->Release();
+}
+
+void CProtocolBinding::OnOpStateChange(bool State)
+{
+ CMutexLockedContext protect(m_Protocol);
+ if (State && !m_Started && m_BoundAdapter)
+ {
+ OnAdapterAttached();
+ }
+}
+
#else
void ParaNdis_ProtocolUnregisterAdapter(PARANDIS_ADAPTER *) { }
|
options/posix: Define a response for _SC_LINE_MAX | @@ -666,6 +666,9 @@ unsigned long sysconf(int number) {
case _SC_NGROUPS_MAX:
// On linux, it is defined to 65536 in most cases, so define it to be 65536
return 65536;
+ case _SC_LINE_MAX:
+ // Linux defines it as 2048.
+ return 2048;
default:
mlibc::panicLogger() << "\e[31mmlibc: sysconf() call is not implemented, number: " << number << "\e[39m" << frg::endlog;
__builtin_unreachable();
|
Workaround crash in LLVM's SDNode when lowering zeroinitializer
SDNode would crash if the zeroinitializer has more than 2^16 items.
For now, put in a simple workaround that limits the max size of
single global scope variable to 64K. If needed, this limit can be
later fixed by splitting the initializer. | @@ -1235,11 +1235,12 @@ pocl_set_buffer_image_limits(cl_device_id device)
/* set program scope variable device limits.
* only the max_size is an actual limit.
* for CPU devices there is no hardware limit.
- * TODO what should we set them to ? */
+ * TODO what should we set them to ?
+ * setting this to >= 2^16 causes LLVM to crash in SDNode */
if (device->program_scope_variables_pass)
{
- device->global_var_max_size = device->max_constant_buffer_size;
- device->global_var_pref_size = device->max_constant_buffer_size;
+ device->global_var_max_size = 64 * 1000;
+ device->global_var_pref_size = max(64 * 1000, device->max_constant_buffer_size);
}
/* We don't have hardware limitations on the buffer-backed image sizes,
|
[ya.conf.json] update the sandbox_id for Arc VCS
Note: mandatory check (NEED_CHECK) was skipped | },
"arc": {
"formula": {
- "sandbox_id": [514978561],
+ "sandbox_id": [525245833],
"match": "arc"
},
"executable": {
|
jenkins: reuse exiting test case for format checks | @@ -561,15 +561,10 @@ def buildFormatChecks() {
return [(stageName): {
stage(stageName) {
withDockerEnv(DOCKER_IMAGES.sid, [DOCKER_OPTS.MOUNT_MIRROR]) {
- def tmpDir = 'build'
- dir(tmpDir) {
- sh """\
-tail -n +3 '../tests/shell/check_formatting.sh' > './check_formatting.sh'
-chmod +x ./check_formatting.sh"""
- }
- sh "${tmpDir}/check_formatting.sh"
- dir(tmpDir) {
+ dir('build') {
deleteDir()
+ cmake(env.WORKSPACE, [:])
+ ctest("Test -R testscr_check_formatting")
}
}
}
|
fix aomp_common_vars oopsie | @@ -19,7 +19,7 @@ ROCM_VERSION=${ROCM_VERSION:-3.7.0}
# Set the AOMP VERSION STRING and AOMP_PROJECT_REPO_BRANCH.
AOMP_VERSION=${AOMP_VERSION:-"12.0"}
-AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"1"}
+AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"0"}
AOMP_VERSION_STRING=${AOMP_VERSION_STRING:-"$AOMP_VERSION-$AOMP_VERSION_MOD"}
export AOMP_VERSION_STRING AOMP_VERSION AOMP_VERSION_MOD ROCM_VERSION
@@ -142,8 +142,8 @@ GITKHRONOS="https://github.com/KhronosGroup"
# These aomp development repositories
AOMP_REPO_NAME=${AOMP_REPO_NAME:-aomp}
AOMP_REPO_BRANCH=${AOMP_REPO_BRANCH:-amd-stg-openmp}
-AOMP_PROJECT_REPO_NAME=${AOMP_PROJECT_REPO_NAME:-llvm-project}
-AOMP_PROJECT_REPO_BRANCH=${AOMP_PROJECT_REPO_BRANCH:-amd-stg-open}
+AOMP_PROJECT_REPO_NAME=${AOMP_PROJECT_REPO_NAME:-amd-llvm-project}
+AOMP_PROJECT_REPO_BRANCH=${AOMP_PROJECT_REPO_BRANCH:-aomp12}
AOMP_EXTRAS_REPO_NAME=${AOMP_EXTRAS_REPO_NAME:-aomp-extras}
AOMP_EXTRAS_REPO_BRANCH=${AOMP_EXTRAS_REPO_BRANCH:-amd-stg-openmp}
AOMP_FLANG_REPO_NAME=${AOMP_FLANG_REPO_NAME:-flang}
|
Remove fixme in qp_correlated_query.
The commit fix the fallback but forget to remove
FIXME. | @@ -3719,9 +3719,6 @@ EXPLAIN SELECT a FROM qp_tab1 f1 LEFT JOIN qp_tab2 on a=c WHERE NOT EXISTS(SELEC
Optimizer: Pivotal Optimizer (GPORCA) version 3.83.0
(11 rows)
--- start_ignore
-GPDB_12_MERGE_FIXME: Fallsback due to unsupported exec location.
--- end_ignore
EXPLAIN SELECT DISTINCT a FROM qp_tab1 WHERE NOT (SELECT TRUE FROM qp_tab2 WHERE EXISTS (SELECT * FROM qp_tab3 WHERE qp_tab2.c = qp_tab3.e));
QUERY PLAN
------------------------------------------------------------------------------------------------------------------------------------
|
opal-ci: qemu: Use the powernv-3.0 branch
This is based off the current development version of Qemu, and
importantly it contains the patch that allows skiboot and Linux to clear
the PCR that we require to boot.
[stewart: use the open-power/qemu.git tree for prosterity] | set -e
set -vx
-git clone --depth=1 -b powernv-2.12 git://github.com/legoater/qemu.git
+git clone --depth=1 -b qemu-powernv-for-skiboot-5 git://github.com/open-power/qemu.git
cd qemu
git submodule update --init dtc
export CC="ccache gcc"
|
Performance / release CI | @@ -10,18 +10,27 @@ dist: xenial
jobs:
include:
- os: linux
+ env: USE_ASAN=ON CONFIG=Debug
+ - os: linux
+ env: USE_ASAN=OFF CONFIG=Release
- os: windows
+ env: CONFIG=Debug
before_install:
- if [[ "$TRAVIS_OS_NAME" != 'windows' ]]; then sudo apt-get update -qq; fi
- if [[ "$TRAVIS_OS_NAME" != 'windows' ]]; then sudo apt-get install -y p7zip-full build-essential zlib1g-dev libx11-dev libusb-1.0-0-dev freeglut3-dev liblapacke-dev libopenblas-dev libatlas-base-dev libpcap-dev; fi
+stages:
+ - build
+ - test
+ - performance test
+
script:
- mkdir -p bin
- cd bin
- - cmake -DENABLE_TESTS=ON -DUSE_ASAN=ON ..
+ - cmake -DENABLE_TESTS=ON -DUSE_ASAN=${USE_ASAN} -DCMAKE_BUILD_TYPE=${CONFIG} ..
- cmake --build .
- - ctest . -C Debug --output-on-failure
+ - ctest . -C ${CONFIG} --output-on-failure
before_deploy:
- if [[ "$TRAVIS_OS_NAME" == 'linux' ]]; then 7z a ../libsurvive-$TRAVIS_TAG-$TRAVIS_OS_NAME.7z . -xr@../travis-exclusion.lst; fi
|
s_client starttls: fix handling of multiline reply
Fixes | @@ -2277,7 +2277,7 @@ int s_client_main(int argc, char **argv)
do {
mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
}
- while (mbuf_len > 3 && mbuf[3] == '-');
+ while (mbuf_len > 3 && (!isdigit(mbuf[0]) || !isdigit(mbuf[1]) || !isdigit(mbuf[2]) || mbuf[3] != ' '));
(void)BIO_flush(fbio);
BIO_pop(fbio);
BIO_free(fbio);
|
Extra brackets removed
Removed some extra brackets:
the code is clear but this allows the copy paste of the code to work :)
Thank you,
Riccardo | @@ -76,13 +76,13 @@ below::
status = '200 OK'
output = b'Hello World!'
- print("application debug #1", file=environ['wsgi.errors']))
+ print("application debug #1", file=environ['wsgi.errors'])
response_headers = [('Content-type', 'text/plain'),
('Content-Length', str(len(output)))]
start_response(status, response_headers)
- print("application debug #2", file=environ['wsgi.errors']))
+ print("application debug #2", file=environ['wsgi.errors'])
return [output]
@@ -95,7 +95,7 @@ below::
Alternatively, always use `print` as a statement rather than a function::
- print >> environ['wsgi.errors']), "application debug #N"
+ print >> environ['wsgi.errors'], "application debug #N"
If 'wsgi.errors' is not available to the code which needs to output log
messages, then it should explicitly direct output from 'print'
|
WebpToSDL(): fix the return value in case of error
spotted Diego Casorran | @@ -40,7 +40,7 @@ int WebpToSDL(const char* data, unsigned int data_size) {
if (!WebPInitDecoderConfig(&config)) {
fprintf(stderr, "Library version mismatch!\n");
- return 1;
+ return 0;
}
if (!init_ok) {
|
Fix printf warnings.
Use safer buffer sizes. | @@ -72,14 +72,14 @@ static bool string_copy(char* dest, const char* source, int len) {
}
void TCOD_parser_error(const char* msg, ...) {
- char buf[2048] = "";
- char buf2[2048] = "";
va_list ap;
va_start(ap, msg);
- vsnprintf(buf, sizeof(buf), msg, ap);
+ char error_partial[2048] = "";
+ vsnprintf(error_partial, sizeof(error_partial), msg, ap);
va_end(ap);
- snprintf(buf2, sizeof(buf2), "error in %s line %d : %s", lex->filename, lex->file_line, buf);
- listener->error(buf2);
+ char error_final[4096] = "";
+ snprintf(error_final, sizeof(error_final), "error in %s line %d : %s", lex->filename, lex->file_line, error_partial);
+ listener->error(error_final);
lex->token_type = TCOD_LEX_ERROR;
}
@@ -204,7 +204,7 @@ TCOD_value_t TCOD_parse_string_value(void) {
slen += strlen(*s);
}
TCOD_value_t ret = {.s = calloc(sizeof(*ret.s), slen + 1)};
- if (!ret.s) TCOD_parser_error("parseStringValue : out of memory allocating string of length %d.", slen + 1);
+ if (!ret.s) TCOD_parser_error("parseStringValue : out of memory allocating string of length %ld.", slen + 1);
for (char** s = (void*)TCOD_list_begin(l); s != (void*)TCOD_list_end(l); ++s) {
if (ret.s) strcat(ret.s, *s);
free(*s);
@@ -780,7 +780,7 @@ static bool default_new_struct(TCOD_ParserStruct* str, const char* name) {
}
static bool default_new_flag(const char* name) {
- char tmp[512] = "";
+ char tmp[1024] = "";
snprintf(tmp, sizeof(tmp), "%s.%s", cur_prop_name, name);
prop_t* prop = calloc(sizeof(*prop), 1);
prop->name = TCOD_strdup(tmp);
@@ -791,7 +791,7 @@ static bool default_new_flag(const char* name) {
}
static bool default_new_property(const char* propname, TCOD_value_type_t type, TCOD_value_t value) {
- char tmp[512] = "";
+ char tmp[1024] = "";
snprintf(tmp, sizeof(tmp), "%s.%s", cur_prop_name, propname);
prop_t* prop = calloc(sizeof(*prop), 1);
prop->name = TCOD_strdup(tmp);
|
CI: remove Alpine build tasks for crypto, fcrypt and gpgme tests | @@ -737,18 +737,6 @@ def generateFullBuildStages() {
[TEST.CRYPTOS]
)
- tasks << buildAndTest(
- "alpine-cryptoplugins",
- DOCKER_IMAGES.alpine,
- CMAKE_FLAGS_BUILD_ALL+
- CMAKE_FLAGS_DEBUG + [
- 'PLUGINS': 'dump;resolver_fm_hpu_b;list;spec;sync;crypto;fcrypt;gpgme',
- 'TOOLS': 'gen-gpg-testkey',
- 'BINDINGS': '',
- ],
- [TEST.CRYPTOS]
- )
-
// We need the webui_base image to build webui images later
tasks << buildImageStage(DOCKER_IMAGES.webui_base)
|
remove LPC54608 from travis-ci | @@ -41,7 +41,7 @@ env:
- RTT_BSP='lpc43xx/M4' RTT_TOOL_CHAIN='sourcery-arm'
- RTT_BSP='lpc408x' RTT_TOOL_CHAIN='sourcery-arm'
- RTT_BSP='lpc5410x' RTT_TOOL_CHAIN='sourcery-arm'
- - RTT_BSP='lpc54608-LPCXpresso' RTT_TOOL_CHAIN='sourcery-arm'
+# - RTT_BSP='lpc54608-LPCXpresso' RTT_TOOL_CHAIN='sourcery-arm'
- RTT_BSP='ls1bdev' RTT_TOOL_CHAIN='sourcery-mips'
- RTT_BSP='ls1cdev' RTT_TOOL_CHAIN='sourcery-mips'
- RTT_BSP='imx6sx/cortex-a9' RTT_TOOL_CHAIN='sourcery-arm'
|
Simplify nested block | @@ -4898,13 +4898,11 @@ static int handle_new_connection_id_frame(quicly_conn_t *conn, struct st_quicly_
* This order is important as it is possible to receive a NEW_CONNECTION_ID frame
* such that it retires active_connection_id_limit CIDs and then installs
* one new CID. */
- if (spare_cid->sequence < frame.retire_prior_to) {
- if (spare_cid->is_active) {
+ if (spare_cid->sequence < frame.retire_prior_to && spare_cid->is_active) {
schedule_retire_connection_id(conn, spare_cid->sequence);
spare_cid->is_active = 0;
spare_cid->sequence = ++conn->super.peer.largest_sequence_expected;
}
- }
if (spare_cid->is_active) {
if (verify_new_cid(spare_cid->sequence, &spare_cid->cid, spare_cid->stateless_reset_token, &frame, &ret))
return ret;
|
android: fixing apk upload error handling | @@ -503,7 +503,7 @@ def load_app_and_run(device_flag, apkfile, pkgname)
poutres = ""
perrres = ""
begin
- status = Timeout::timeout(300) do
+ status = Timeout::timeout(600) do
@@logger.debug "CMD: #{cmd}"
Open3.popen3(cmd) do |pin,pout,perr,wait_thr|
@@ -524,7 +524,7 @@ def load_app_and_run(device_flag, apkfile, pkgname)
@@logger.error "Timeout error, killing #{child}"
Process.kill 9, child if child
- if theoutput == ""
+ if (poutres == "") and (perrres == "")
@@logger.error "Timeout reached while empty output: killing adb server and retrying..."
`#{$adb} kill-server`
count += 1
|
dpdk: define MACHINE before it is used
This fixes build on non-x86 platforms like arm64. | @@ -33,6 +33,7 @@ DPDK_17.02_TARBALL_MD5_CKSUM := 6b9f7387c35641f4e8dbba3e528f2376
DPDK_17.05_TARBALL_MD5_CKSUM := 0a68c31cd6a6cabeed0a4331073e4c05
DPDK_17.08_TARBALL_MD5_CKSUM := 0641f59ea8ea98afefa7cfa2699f6241
DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
+MACHINE=$(shell uname -m)
ifeq ($(MACHINE),$(filter $(MACHINE),x86_64))
AESNI := y
@@ -58,8 +59,6 @@ else
DPDK_CC=gcc
endif
-MACHINE=$(shell uname -m)
-
##############################################################################
# Intel x86
##############################################################################
|
print warning if BPF is unset | @@ -7093,6 +7093,7 @@ if(bpf.len > 0)
{
if(setsockopt(fd_socket, SOL_SOCKET, SO_ATTACH_FILTER, &bpf, sizeof(bpf)) < 0) perror("failed to set Berkeley Packet Filter");
}
+else fprintf(stderr, "BPF is unset. Make sure hcxdumptool is running in a 100%% controlled environment!\n");
memset(&ifr_old, 0, sizeof(ifr));
memcpy(&ifr_old.ifr_name, interfacename, IFNAMSIZ);
if(ioctl(fd_socket, SIOCGIFFLAGS, &ifr_old) < 0)
|
Note that 2.x branch is no longer getting fixes | @@ -90,12 +90,12 @@ to be a stable branch for the latest major release series, but as it is used
for ongoing development expect it to have some volatility. We recommend using
the latest stable release tag for production development.
-The `2.x` and `3.x` branches are a stable branches for the 2.x and 3.x release
-series. They are no longer under active development, but are supported branches
-that will continue to get backported bug fixes.
+The `3.x` branch is a stable branch for the 3.x release series. It is no longer
+under active development, but is a supported branch that continues to get
+backported bug fixes.
-The `1.x` branch is a stable branch for the 1.x release series. It is no longer
-under active development or getting bug fixes.
+The `1.x` and `2.x` branches are stable branches for older releases. They are
+no longer under active development or getting bug fixes.
Any other branches you might find are development branches for new features or
optimizations, so might be interesting to play with but should be considered
|
ToolStatus: Fix statusbar issue with timezones | @@ -258,14 +258,14 @@ VOID StatusBarUpdate(
// Reset max. widths for Max. CPU Process and Max. I/O Process parts once in a while.
{
- LARGE_INTEGER tickCount;
+ ULONG64 tickCount;
- PhQuerySystemTime(&tickCount);
+ tickCount = NtGetTickCount64();
- if (tickCount.QuadPart - lastTickCount >= 10 * PH_TICKS_PER_SEC)
+ if (tickCount - lastTickCount >= 10 * 1000)
{
resetMaxWidths = TRUE;
- lastTickCount = tickCount.QuadPart;
+ lastTickCount = tickCount;
}
}
|
nbu_ddboost pipeline Bump CCP to 1.4.2 for bug fixes | @@ -30,7 +30,7 @@ resources:
branch: {{ccp-git-branch}}
private_key: {{ccp-git-key}}
uri: {{ccp-git-remote}}
- tag_filter: 1.0.0
+ tag_filter: 1.4.2
- name: terraform
type: terraform
|
Set retry seed as part of context creation | @@ -310,6 +310,8 @@ picoquic_quic_t* picoquic_create(uint32_t nb_connections,
picoquic_crypto_random(quic, quic->reset_seed, sizeof(quic->reset_seed));
else
memcpy(quic->reset_seed, reset_seed, sizeof(quic->reset_seed));
+
+ picoquic_crypto_random(quic, quic->retry_seed, sizeof(quic->retry_seed));
}
}
@@ -476,14 +478,12 @@ void picoquic_set_cookie_mode(picoquic_quic_t* quic, int cookie_mode)
{
if (cookie_mode&1) {
quic->check_token = 1;
- picoquic_crypto_random(quic, quic->retry_seed, PICOQUIC_RETRY_SECRET_SIZE);
} else {
quic->check_token = 0;
}
if (cookie_mode & 2) {
quic->provide_token = 1;
- picoquic_crypto_random(quic, quic->retry_seed, PICOQUIC_RETRY_SECRET_SIZE);
}
else {
quic->provide_token = 0;
|
Note for Tegra users | @@ -91,3 +91,8 @@ A few tests are included.
They can be launched with `ctest`
They are very basic and don't test much for now.
+----
+
+Note about devices with Tegra X1 and newer.
+
+Nvidia don't provide armhf libraries for their GPU drivers at this moment so there is no special variable to compile it for them as it would be missleading for many people. If you still want to use it wihout GPU acceleration, building it with RPI4 configuration should work just fine. As instalation of Mesa can break Nvidia driver, safest option is usage of chroot.
|
content.length to content_length | @@ -98,8 +98,8 @@ In AppScope 1.0.0, a few event and metric schema elements, namely `title` and `d
**HTTP**
- [http.req](#metrichttpreq)
-- [http.request.content.length](#metrichttpreqcontentlength)
-- [http.response.content.length](#metrichttprespcontentlength)
+- [http.request.content_length](#metrichttpreqcontentlength)
+- [http.response.content_length](#metrichttprespcontentlength)
- [http.duration.client](#metrichttpdurationclient)
- [http.duration.server](#metrichttpdurationserver)
@@ -2654,7 +2654,7 @@ Structure of the `http.duration.client` metric
<hr/>
-### http.request.content.length [^](#schema-reference) {#metrichttpreqcontentlength}
+### http.request.content_length [^](#schema-reference) {#metrichttpreqcontentlength}
Structure of the `http.req.content_length` metric
@@ -2679,14 +2679,14 @@ Structure of the `http.req.content_length` metric
}
```
-#### `http.request.content.length` properties {#metrichttpreqcontentlengthprops}
+#### `http.request.content_length` properties {#metrichttpreqcontentlengthprops}
| Property | Description |
|---|---|
| `type` _required_ (`string`) | Distinguishes metrics from events.<br/><br/>Value must be `metric`. |
| `body` _required_ (`object`) | body<br/><br/>_Details [below](#metrichttpreqcontentlengthbody)._ |
-#### `http.request.content.length.body` properties {#metrichttpreqcontentlengthbody}
+#### `http.request.content_length.body` properties {#metrichttpreqcontentlengthbody}
| Property | Description |
|---|---|
@@ -2773,7 +2773,7 @@ Structure of the `http.req` metric
<hr/>
-### http.response.content.length [^](#schema-reference) {#metrichttprespcontentlength}
+### http.response.content_length [^](#schema-reference) {#metrichttprespcontentlength}
Structure of the `http.resp.content_length` metric
@@ -2817,14 +2817,14 @@ Structure of the `http.resp.content_length` metric
}
```
-#### `http.response.content.length` properties {#metrichttprespcontentlengthprops}
+#### `http.response.content_length` properties {#metrichttprespcontentlengthprops}
| Property | Description |
|---|---|
| `type` _required_ (`string`) | Distinguishes metrics from events.<br/><br/>Value must be `metric`. |
| `body` _required_ (`object`) | body<br/><br/>_Details [below](#metrichttprespcontentlengthbody)._ |
-#### `http.response.content.length.body` properties {#metrichttprespcontentlengthbody}
+#### `http.response.content_length.body` properties {#metrichttprespcontentlengthbody}
| Property | Description |
|---|---|
|
update new setup | #include <OMManager.h>
-#include <OMMath.h>
+#define WORLD 0
+#define BASE 1
+#define SHOULDER 2
+#define UPPER_ARM 3
+#define LOWER_ARM 4
+#define WRIST 5
+#define GRIPPER 6
+
+#define NONE -1
+
+void setup()
+{
+ Manipulator manipulator;
+ manipulator.addComponent(WORLD, NONE, BASE, mass, inertia_tensor, relative_position, relative_orientation, axis_of_rotation);
+ manipulator.addComponent(WORLD, NONE, BASE, mass, inertia_tensor, relative_position, relative_orientation, axis_of_rotation);
+ manipulator.addComponent(WORLD, NONE, BASE, mass, inertia_tensor, relative_position, relative_orientation, axis_of_rotation);
+ manipulator.addComponent(WORLD, NONE, BASE, mass, inertia_tensor, relative_position, relative_orientation, axis_of_rotation);
+ manipulator.addComponent(WORLD, NONE, BASE, mass, inertia_tensor, relative_position, relative_orientation, axis_of_rotation);
+
+}
+
+void loop()
+{
+
+}
+
+
+
+#if 0
void setup()
{
OMMath math_;
@@ -76,3 +104,4 @@ void loop()
{
}
+#endif
\ No newline at end of file
|
log CHANGE use ly_vecode only if really necessary
avoid getting data when they are not necessary needed | @@ -313,10 +313,6 @@ log_vprintf(const struct ly_ctx *ctx, LY_LOG_LEVEL level, LY_ERR no, LY_VECODE v
return;
}
- if (((no & ~LY_EPLUGIN) == LY_EVALID) && (vecode == LYVE_SUCCESS)) {
- /* assume we are inheriting the error, so inherit vecode as well */
- vecode = ly_vecode(ctx);
- }
/* store the error/warning (if we need to store errors internally, it does not matter what are the user log options) */
if ((level < LY_LLVRB) && ctx && (ly_log_opts & LY_LOSTORE)) {
@@ -326,6 +322,10 @@ log_vprintf(const struct ly_ctx *ctx, LY_LOG_LEVEL level, LY_ERR no, LY_VECODE v
free(path);
return;
}
+ if (((no & ~LY_EPLUGIN) == LY_EVALID) && (vecode == LYVE_SUCCESS)) {
+ /* assume we are inheriting the error, so inherit vecode as well */
+ vecode = ly_vecode(ctx);
+ }
if (log_store(ctx, level, no, vecode, msg, path, NULL)) {
return;
}
|
if a folder is disabled, lock all the child attributes in Maya. | @@ -1336,7 +1336,15 @@ GetAttrOperation::leaf(const HAPI_ParmInfo &parmInfo)
&& parentParmInfo
&& parentParmInfo->rampType != HAPI_RAMPTYPE_INVALID)) {
- if(parmInfo.disabled) {
+ bool disabledAncestor = false;
+ for(auto olderParmInfo : myParentParmInfos) {
+ if( olderParmInfo && olderParmInfo->disabled) {
+ disabledAncestor = true;
+ break;
+ }
+ }
+
+ if(parmInfo.disabled || disabledAncestor) {
plug.setLocked(true);
} else {
if(plug.isLocked()) {
|
Add compatibility macro for the inline keyword in error.h
MSVC is not fully compliant with C99 where the 'inline' keyword is defined.
Add a macro to define an alternative for non-compliant compilers. | #include <stddef.h>
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+ !defined(inline) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
/**
* Error code layout.
*
|
Fix device tick enter fast polling mode during permit join enabled
The signal wasn't actually connected, after EventEmitter was introduced. | @@ -942,7 +942,7 @@ DeRestPluginPrivate::DeRestPluginPrivate(QObject *parent) :
connect(pollManager, &PollManager::done, this, &DeRestPluginPrivate::pollNextDevice);
auto *deviceTick = new DeviceTick(m_devices, this);
- connect(this, &DeRestPluginPrivate::eventNotify, deviceTick, &DeviceTick::handleEvent);
+ connect(eventEmitter, &EventEmitter::eventNotify, deviceTick, &DeviceTick::handleEvent);
connect(deviceTick, &DeviceTick::eventNotify, eventEmitter, &EventEmitter::enqueueEvent);
const deCONZ::Node *node;
@@ -17794,6 +17794,15 @@ Resource *DEV_AddResource(const Sensor &sensor)
plugin->sensors.push_back(sensor);
r = &plugin->sensors.back();
r->setHandle(R_CreateResourceHandle(r, plugin->sensors.size() - 1));
+
+ if (plugin->searchSensorsState == DeRestPluginPrivate::SearchSensorsActive || plugin->permitJoinFlag)
+ {
+ const ResourceItem *idItem = r->item(RAttrId);
+ if (idItem)
+ {
+ enqueueEvent(Event(sensor.prefix(), REventAdded, idItem->toString()));
+ }
+ }
}
return r;
@@ -17810,6 +17819,15 @@ Resource *DEV_AddResource(const LightNode &lightNode)
plugin->nodes.push_back(lightNode);
r = &plugin->nodes.back();
r->setHandle(R_CreateResourceHandle(r, plugin->nodes.size() - 1));
+
+ if (plugin->searchLightsState == DeRestPluginPrivate::SearchLightsActive || plugin->permitJoinFlag)
+ {
+ const ResourceItem *idItem = r->item(RAttrId);
+ if (idItem)
+ {
+ enqueueEvent(Event(r->prefix(), REventAdded, idItem->toString()));
+ }
+ }
}
return r;
|
BugID:22272003: Fix iperf crash issue | @@ -97,16 +97,13 @@ static void _cli_iperf_server_command( int argc, char **argv )
break;
}
}
- if ( strcmp( argv[i], "-u" ) != 0 ) {
+
+ if ( is_create_task != 1 ) {
LWIP_DEBUGF( IPERF_DEBUG, ("Iperf TCP Server: Start!" ));
LWIP_DEBUGF( IPERF_DEBUG, ("Iperf TCP Server Receive Timeout = 20 (secs)" ));
aos_task_new_ext(&aos_iperf_task, IPERF_NAME, iperf_tcp_run_server_thread, (void*)g_iperf_param, IPERF_STACKSIZE, IPERF_PRIO);
- is_create_task = 1;
}
- if ( is_create_task == 0 ) {
- free( g_iperf_param );
- }
}
static void _cli_iperf_client_command( int argc, char **argv )
@@ -137,15 +134,11 @@ static void _cli_iperf_client_command( int argc, char **argv )
}
}
- if ( strcmp( argv[i], "-u" ) != 0 ) {
+ if ( is_create_task != 1 ) {
LWIP_DEBUGF( IPERF_DEBUG, ("Iperf TCP Client: Start!" ));
aos_task_new_ext(&aos_iperf_task, IPERF_NAME, iperf_tcp_run_client_thread, (void*)g_iperf_param, IPERF_STACKSIZE, IPERF_PRIO);
- is_create_task = 1;
}
- if ( is_create_task == 0 ) {
- free( g_iperf_param );
- }
}
static void _cli_iperf_help_command( int argc, char **argv )
|
secvar/backend: add EFI_CERT_RSA2048_GUID
This isn't currently used in skiboot but may be used by external
users of skiboot's secvar code. | @@ -83,6 +83,8 @@ static const uuid_t EFI_CERT_SHA384_GUID = {{ 0x07, 0x53, 0x3e, 0xff, 0xd0, 0x9f
static const uuid_t EFI_CERT_SHA512_GUID = {{ 0xae, 0x0f, 0x3e, 0x09, 0xc4, 0xa6, 0x50, 0x4f, 0x9f, 0x1b, 0xd4, 0x1e, 0x2b, 0x89, 0xc1, 0x9a }};
+static const uuid_t EFI_CERT_RSA2048_GUID = {{ 0xe8, 0x66, 0x57, 0x3c, 0x9c, 0x26, 0x34, 0x4e, 0xaa, 0x14, 0xed, 0x77, 0x6e, 0x85, 0xb3, 0xb6 }};
+
#define EFI_VARIABLE_NON_VOLATILE 0x00000001
#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002
#define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004
|
oops, removed a breakpoint in makeplot for earth climate | @@ -50,7 +50,6 @@ def comp2huybers(plname,dir='.',xrange=False,show=True):
for ii in np.arange(nfiles):
out = vplot.GetOutput(dir[ii])
- import pdb; pdb.set_trace()
#pdb.set_trace()
ctmp = 0
|
gsctool: fix error processing logic
The error processing logic is reversed, which results in missing error
values when errors actually happen.
BRANCH=none
TEST=verified that errors values are now reported properly. | @@ -1596,7 +1596,7 @@ static void process_password(struct transfer_descriptor *td)
return;
fprintf(stderr, "Error setting password: rv %d, response %d\n",
- rv, response_size ? 0 : response);
+ rv, response_size ? response : 0);
exit(update_error);
}
|
Check if getpwuid_r failed to find a password entry
Check if getpwuid_r failed to find a password entry
([arc::pullid] 4d84fecf-25d8a32a-8cd9018d-2e828d76) | @@ -38,13 +38,12 @@ TString GetUsername() {
passwd pwd;
passwd* tmpPwd;
int err = getpwuid_r(geteuid(), &pwd, nameBuf.Data(), nameBuf.Size(), &tmpPwd);
- if (err) {
- if (err == ERANGE)
+ if (err == 0 && tmpPwd) {
+ return TString(pwd.pw_name);
+ } else if (err == ERANGE) {
nameBuf = TTempBuf(nameBuf.Size() * 2);
- else
- ythrow TSystemError(err) << " getpwuid_r failed";
} else {
- return TString(pwd.pw_name);
+ ythrow TSystemError(err) << " getpwuid_r failed";
}
#endif
}
|
update testshell_markdown_range | @@ -58,25 +58,25 @@ None.
sudo kdb mount range.ecf /tests/range range dump
# should succeed
-kdb set /tests/range/value 5
-kdb meta-set /tests/range/value check/range "1-10"
+kdb set user:/tests/range/value 5
+kdb meta-set user:/tests/range/value check/range "1-10"
# RET: 0
# should fail
-kdb set /tests/range/value 11
+kdb set user:/tests/range/value 11
# RET:5
# should also fail
-kdb set /tests/range/value "\-1"
+kdb set user:/tests/range/value "\-1"
# RET:5
# we can also allow only individual values:
-kdb meta-set /tests/range/value check/range "1,2,4,8"
+kdb meta-set user:/tests/range/value check/range "1,2,4,8"
-kdb set /tests/range/value 7
+kdb set user:/tests/range/value 7
# RET:5
-kdb set /tests/range/value 2
+kdb set user:/tests/range/value 2
# RET:0
kdb rm -r /tests/range
|
[kernel] add doxygen comment | @@ -118,7 +118,9 @@ protected:
*/
ACCEPT_SERIALIZATION(NewtonEulerDS);
-
+ /** Common code for constructors
+ * should be replaced in C++11 by delegating constructors
+ */
void init();
|
amdgpu: fixed incorrect gpu load for centipercent | @@ -16,8 +16,8 @@ std::string metrics_path = "";
*/
struct amdgpu_common_metrics {
/* Load level: averaged across the sampling period */
- uint8_t gpu_load_percent;
- // uint8_t mem_load_percent;
+ uint16_t gpu_load_percent;
+ // uint16_t mem_load_percent;
/* Power usage: averaged across the sampling period */
float average_gfx_power_w;
@@ -140,6 +140,10 @@ void amdgpu_metrics_polling_thread() {
// Initial poll of the metrics, so that we have values to display as fast as possible
amdgpu_get_instant_metrics(&amdgpu_common_metrics);
+ if (amdgpu_common_metrics.gpu_load_percent > 100){
+ gpu_load_needs_dividing = true;
+ amdgpu_common_metrics.gpu_load_percent /= 100;
+ }
while (1) {
// Get all the samples
|
nufft: document maxiter for inverse nuFFT | @@ -77,7 +77,7 @@ int main_nufft(int argc, char* argv[argc])
OPT_CLEAR('r', &conf.toeplitz, "turn-off Toeplitz embedding for inverse NUFFT"),
OPT_SET('c', &precond, "Preconditioning for inverse NUFFT"),
OPT_FLOAT('l', &lambda, "lambda", "l2 regularization"),
- OPT_UINT('m', &cgconf.maxiter, "", "()"),
+ OPT_UINT('m', &cgconf.maxiter, "iter", "max. number of iterations (inverse only)"),
OPT_SET('P', &conf.periodic, "periodic k-space"),
OPT_SET('s', &dft, "DFT"),
OPT_SET('g', &use_gpu, "GPU (only inverse)"),
|
Mercator: save 'txlen' as an expected value | @@ -236,6 +236,7 @@ void serial_rx_REQ_RX(void) {
req = (REQ_RX_ht*)mercator_vars.uartbufrx;
// save the expected values
+ mercator_vars.txpk_len = req->txlength;
mercator_vars.txpk_transctr = htons(req->transctr);
mercator_vars.txpk_txfillbyte = req->txfillbyte;
memcpy(mercator_vars.txpk_srcmac, req->srcmac, 8);
|
Add RtlAddResourceAttributeAce, RtlAddScopedPolicyIDAce | @@ -2580,6 +2580,7 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS
ULONG_PTR EnvironmentSize;
ULONG_PTR EnvironmentVersion;
+
PVOID PackageDependencyData;
ULONG ProcessGroupId;
ULONG LoaderThreads;
@@ -6550,6 +6551,32 @@ RtlAddMandatoryAce(
);
#endif
+#if (PHNT_VERSION >= PHNT_WIN8)
+NTSYSAPI
+NTSTATUS
+NTAPI
+RtlAddResourceAttributeAce(
+ _Inout_ PACL Acl,
+ _In_ ULONG AceRevision,
+ _In_ ULONG AceFlags,
+ _In_ ULONG AccessMask,
+ _In_ PSID Sid,
+ _In_ PCLAIM_SECURITY_ATTRIBUTES_INFORMATION AttributeInfo,
+ _Out_ PULONG ReturnLength
+ );
+
+NTSYSAPI
+NTSTATUS
+NTAPI
+RtlAddScopedPolicyIDAce(
+ _Inout_ PACL Acl,
+ _In_ ULONG AceRevision,
+ _In_ ULONG AceFlags,
+ _In_ ULONG AccessMask,
+ _In_ PSID Sid
+ );
+#endif
+
// Named pipes
NTSYSAPI
|
Remove unused code, Update copyright text | * tree new (tree list control)
*
* Copyright (C) 2011-2016 wj32
- * Copyright (C) 2017 dmex
+ * Copyright (C) 2017-2018 dmex
*
* This file is part of Process Hacker.
*
@@ -4984,7 +4984,6 @@ VOID PhTnpPaint(
LONG normalUpdateRightIndex;
LONG normalTotalX;
RECT cellRect;
- HBRUSH backBrush;
HRGN oldClipRegion;
PhTnpInitializeThemeData(Context);
@@ -5074,7 +5073,6 @@ VOID PhTnpPaint(
PhTnpPrepareRowForDraw(Context, hdc, node);
-
if (node->Selected)
{
if (i == Context->HotNodeIndex)
@@ -5101,7 +5099,6 @@ VOID PhTnpPaint(
{
SetTextColor(hdc, Context->CustomTextColor);
SetDCBrushColor(hdc, Context->CustomSelectedColor);
- backBrush = GetStockObject(DC_BRUSH);
}
break;
case TREIS_HOT:
@@ -5109,14 +5106,12 @@ VOID PhTnpPaint(
{
SetTextColor(hdc, Context->CustomTextColor);
SetDCBrushColor(hdc, Context->CustomFocusColor);
- backBrush = GetStockObject(DC_BRUSH);
}
break;
default:
{
SetTextColor(hdc, node->s.DrawForeColor);
SetDCBrushColor(hdc, node->s.DrawBackColor);
- backBrush = GetStockObject(DC_BRUSH);
}
break;
}
@@ -5125,10 +5120,9 @@ VOID PhTnpPaint(
{
SetTextColor(hdc, node->s.DrawForeColor);
SetDCBrushColor(hdc, node->s.DrawBackColor);
- backBrush = GetStockObject(DC_BRUSH);
}
- FillRect(hdc, &rowRect, backBrush);
+ FillRect(hdc, &rowRect, GetStockObject(DC_BRUSH));
if (!Context->CustomColors && Context->ThemeHasItemBackground)
{
|
[chainmaker][#436]add cer len exceed test | @@ -490,7 +490,7 @@ START_TEST(test_001CreateWallet_0016_CreateOneTimeWalletFailurePrikeyError)
BSINT32 rtnVal;
BoatHlchainmakerWallet *g_chaninmaker_wallet_ptr = NULL;
BoatHlchainmakerWalletConfig wallet_config = get_chainmaker_wallet_settings();
- wallet_config.user_prikey_cfg.prikey_content.field_ptr = "testprikey";
+ wallet_config.user_prikey_cfg.prikey_content.field_ptr = "testPrikey";
extern BoatIotSdkContext g_boat_iot_sdk_context;
/* 1. execute unit test */
@@ -507,6 +507,29 @@ START_TEST(test_001CreateWallet_0016_CreateOneTimeWalletFailurePrikeyError)
}
END_TEST
+START_TEST(test_001CreateWallet_0017_CreateOneTimeWalletFailureCertLenExceed)
+{
+ BSINT32 rtnVal;
+ BoatHlchainmakerWallet *g_chaninmaker_wallet_ptr = NULL;
+ BoatHlchainmakerWalletConfig wallet_config = get_chainmaker_wallet_settings();
+ wallet_config.user_cert_cfg.length = 1025;
+ extern BoatIotSdkContext g_boat_iot_sdk_context;
+
+ // /* 1. execute unit test */
+ rtnVal = BoatWalletCreate(BOAT_PROTOCOL_CHAINMAKER, NULL, &wallet_config, sizeof(BoatHlchainmakerWalletConfig));
+
+ /* 2. verify test result */
+ /* 2-1. verify the return value */
+ ck_assert_int_eq(rtnVal, BOAT_ERROR);
+
+ /* 2-2. verify the global variables that be affected */
+ ck_assert(g_boat_iot_sdk_context.wallet_list[0].is_used == false);
+ g_chaninmaker_wallet_ptr = BoatGetWalletByIndex(rtnVal);
+ ck_assert(g_chaninmaker_wallet_ptr == NULL);
+}
+END_TEST
+
+
START_TEST(test_002DeleteWallet_0001DeleteWalletFailureNullFleName)
{
BoatWalletDelete(NULL);
@@ -555,6 +578,7 @@ Suite *make_wallet_suite(void)
tcase_add_test(tc_wallet_api, test_001CreateWallet_0014_CreateOneTimeWalletFailureChainIdLenExceed);
tcase_add_test(tc_wallet_api, test_001CreateWallet_0015_CreateOneTimeWalletFailureOrgIdLenExceed);
tcase_add_test(tc_wallet_api, test_001CreateWallet_0016_CreateOneTimeWalletFailurePrikeyError);
+ tcase_add_test(tc_wallet_api, test_001CreateWallet_0017_CreateOneTimeWalletFailureCertLenExceed);
tcase_add_test(tc_wallet_api, test_002DeleteWallet_0001DeleteWalletFailureNullFleName);
tcase_add_test(tc_wallet_api, test_002DeleteWallet_0002DeleteWalletFailureNoExistingFile);
tcase_add_test(tc_wallet_api, test_002DeleteWallet_0003DeleteWalletSucessExistingFile);
|
Add a file:/// example | @@ -139,6 +139,7 @@ typedef struct clap_preset_location {
// URI
// - file:/// for pointing to a file or directory; directories are scanned recursively
+ // eg: file:///home/abique/.u-he/Diva/presets/
// - plugin://<clap-plugin-id> for presets which are bundled inside the plugin itself
char uri[CLAP_URI_SIZE];
} clap_preset_location_t;
|
Add group-by and partition-by to the core.
Semantics are mostly emulated from Clojure. | (set (freqs x) (if n (+ 1 n) 1)))
freqs)
+(defn group-by
+ ``Group elements of `ind` by a function `f` and put the results into a table. The keys of
+ the table are the distinct return values of `f`, and the values are arrays of all elements of `ind`
+ that are equal to that value.``
+ [f ind]
+ (def ret @{})
+ (each x ind
+ (def y (f x))
+ (if-let [arr (get ret y)]
+ (array/push arr x)
+ (put ret y @[x])))
+ ret)
+
+(defn partition-by
+ ``Partition elements of a sequential data structure by a representative function `f`. Partitions
+ split when `(f x)` changes values when iterating to the next element `x` of `ind`. Returns a new array
+ of arrays.``
+ [f ind]
+ (def ret @[])
+ (var span nil)
+ (var category nil)
+ (var is-new true)
+ (each x ind
+ (def y (f x))
+ (cond
+ is-new (do (set is-new false) (set category y) (set span @[x]) (array/push ret span))
+ (= y category) (array/push span x)
+ (do (set category y) (set span @[x]) (array/push ret span))))
+ ret)
+
(defn interleave
"Returns an array of the first elements of each col, then the second, etc."
[& cols]
|
sys/baselibc: Cleanup in tinyprintf
Missing #include and break makes Eclipse CDT complain about it, so let's
just add it as it does not change anything here. | @@ -61,6 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* PRINTF_SUPPORT_LONG because int == long.
*/
+#include <stdarg.h>
#include <stdio.h>
#include <inttypes.h>
@@ -337,6 +338,7 @@ size_t tfp_format(FILE *putp, const char *fmt, va_list va)
break;
case '%':
written += putf(putp, ch);
+ break;
default:
break;
}
|
Rename data-placeholder to placeholder | @@ -853,7 +853,7 @@ static void TextEdit_OnReady( LCUI_Widget w, LCUI_WidgetEvent e, void *arg )
static void TextEdit_SetAttr( LCUI_Widget w, const char *name,
const char *val )
{
- if( strcasecmp( name, "data-placeholder" ) == 0 ) {
+ if( strcmp( name, "placeholder" ) == 0 ) {
TextEdit_SetPlaceHolder( w, val );
}
}
|
p8dtu: Enable HIOMAP support | @@ -230,6 +230,7 @@ static bool p8dtu2u_probe(void)
static const struct bmc_sw_config bmc_sw_smc = {
.ipmi_oem_partial_add_esel = IPMI_CODE(0x3a, 0xf0),
.ipmi_oem_pnor_access_status = IPMI_CODE(0x3a, 0x07),
+ .ipmi_oem_hiomap_cmd = IPMI_CODE(0x3a, 0x5a),
};
static const struct bmc_platform bmc_plat_ast2400_smc = {
|
PHP: using nxt_unit_default_init() for module structure init.
Using this function in all language modules helps to avoid code duplication
and reduce the size of future patches. | @@ -265,8 +265,6 @@ nxt_php_start(nxt_task_t *task, nxt_process_data_t *data)
nxt_str_t ini_path, name;
nxt_int_t ret;
nxt_uint_t n;
- nxt_port_t *my_port, *main_port;
- nxt_runtime_t *rt;
nxt_unit_ctx_t *unit_ctx;
nxt_unit_init_t php_init;
nxt_conf_value_t *value;
@@ -363,39 +361,13 @@ nxt_php_start(nxt_task_t *task, nxt_process_data_t *data)
nxt_php_set_options(task, value, ZEND_INI_USER);
}
- rt = task->thread->runtime;
-
- main_port = rt->port_by_type[NXT_PROCESS_MAIN];
- if (nxt_slow_path(main_port == NULL)) {
- nxt_alert(task, "main process not found");
- return NXT_ERROR;
- }
-
- my_port = nxt_runtime_port_find(rt, nxt_pid, 0);
- if (nxt_slow_path(my_port == NULL)) {
- nxt_alert(task, "my_port not found");
- return NXT_ERROR;
+ ret = nxt_unit_default_init(task, &php_init);
+ if (nxt_slow_path(ret != NXT_OK)) {
+ nxt_alert(task, "nxt_unit_default_init() failed");
+ return ret;
}
- nxt_memzero(&php_init, sizeof(nxt_unit_init_t));
-
php_init.callbacks.request_handler = nxt_php_request_handler;
-
- php_init.ready_port.id.pid = main_port->pid;
- php_init.ready_port.id.id = main_port->id;
- php_init.ready_port.out_fd = main_port->pair[1];
-
- nxt_fd_blocking(task, main_port->pair[1]);
-
- php_init.ready_stream = my_port->process->stream;
-
- php_init.read_port.id.pid = my_port->pid;
- php_init.read_port.id.id = my_port->id;
- php_init.read_port.in_fd = my_port->pair[0];
-
- nxt_fd_blocking(task, my_port->pair[0]);
-
- php_init.log_fd = 2;
php_init.shm_limit = conf->shm_limit;
unit_ctx = nxt_unit_init(&php_init);
|
Fix argument order in ocf_metadata_set_partition_id() call | @@ -1158,7 +1158,7 @@ static void _recovery_rebuild_cline_metadata(ocf_cache_t cache,
part_id = PARTITION_DEFAULT;
part = cache->user_parts[part_id].part.runtime;
- ocf_metadata_set_partition_id(cache, part_id, cache_line);
+ ocf_metadata_set_partition_id(cache, cache_line, part_id);
env_atomic_inc(&part->curr_size);
hash_index = ocf_metadata_hash_func(cache, core_line, core_id);
|
BugID:25059354: Disable netmgr when ethernet is enabled | @@ -2,7 +2,7 @@ config AOS_BOARD_STM32F429ZI_NUCLEO
bool "STM32F429ZI_Nucleo"
select AOS_MCU_STM32F4XX_CUBE
select AOS_COMP_KERNEL_INIT
- select AOS_COMP_NETMGR
+ select AOS_COMP_NETMGR if BSP_SUPPORT_EXTERNAL_MODULE
select CONFIG_AOS_TCPIP if !BSP_SUPPORT_EXTERNAL_MODULE
select CONFIG_NO_TCPIP if BSP_SUPPORT_EXTERNAL_MODULE
help
|
typo in testlist | n=0 # count amount of tests executed (exception for subsecond calls)
max_rc=0 # track the maximum RC to return at the end
loops=1;
- rnd10= $(((RANDOM%9+2))
+ rnd10= $(((RANDOM%9)+2))
rndeven20=$(((RANDOM%5)*2+10))
rnd20= $(((RANDOM%19)+2))
rnd32= $(((RANDOM%31)+2))
|
proc: set appropriate locks before accessing children list | @@ -573,6 +573,7 @@ void proc_zombie(process_t *proc)
unsigned int ppid = parent->id;
if (parent != NULL) {
+ proc_lockSet(&proc->lock);
hal_spinlockSet(&parent->waitsl);
proc->state = ZOMBIE;
LIST_REMOVE(&parent->children, proc);
@@ -582,6 +583,7 @@ void proc_zombie(process_t *proc)
proc_threadWakeup(&parent->waitq);
hal_spinlockClear(&parent->waitsl);
+ proc_lockClear(&proc->lock);
posix_sigchild(ppid);
}
@@ -813,6 +815,7 @@ int proc_waitpid(int pid, int *stat, int options)
process_t *z, *proc = proc_current()->process;
proc_threadUnprotect();
+ proc_lockSet(&proc->lock);
hal_spinlockSet(&proc->waitsl);
proc->waitpid = pid;
@@ -849,6 +852,7 @@ int proc_waitpid(int pid, int *stat, int options)
proc->waitpid = 0;
hal_spinlockClear(&proc->waitsl);
+ proc_lockClear(&proc->lock);
proc_threadProtect();
if (z != NULL)
|
[examples] use ioMatrix::CompRef | @@ -214,18 +214,10 @@ int main(int argc, char* argv[])
// dataPlot (ascii) output
ioMatrix::write("DiodeBridge.dat", "ascii", dataPlot, "noDim");
-
- SimpleMatrix dataPlotRef(dataPlot);
- dataPlotRef.zero();
- ioMatrix::read("result.ref", "ascii", dataPlotRef);
- std::cout << (dataPlot - dataPlotRef).normInf() << std::endl;
- if ((dataPlot - dataPlotRef).normInf() > 1e-12)
- {
- std::cout <<
- "Warning. The result is rather different from the reference file."
- << std::endl;
+ double error=0.0, eps=1e-12;
+ if (ioMatrix::compareRefFile(dataPlot, "DiodeBridge.ref", eps, error)
+ && error > eps)
return 1;
- }
}
// --- Exceptions handling ---
|
build: replace set -e with direct exit calls
This is necessary, because cov script returns failure status code, despite actually submitting the build. | @@ -28,14 +28,11 @@ matrix:
compiler: clang
before_install:
- - set -e
- - curl -Ls https://entrust.com/root-certificates/entrust_l1k.cer -o ~/entrust_l1k.crt
- - curl -LS https://curl.haxx.se/ca/cacert.pem -o ~/cacert.pem
- - cat ~/entrust_l1k.crt >> ~/cacert.pem
- - if [ -f ~/.curlrc ]; then echo "Dropping old ~/.curlrc:" ; cat ~/.curlrc ; fi
- - echo "cacert=\"$HOME/cacert.pem\"" > ~/.curlrc
- - if [ -f ~/.wgetrc ]; then echo "Dropping old ~/.wgetrc:" ; cat ~/.wgetrc ; fi
- - echo "ca_certificate=$HOME/cacert.pem" > ~/.wgetrc
+ - curl -Ls https://entrust.com/root-certificates/entrust_l1k.cer -o ~/entrust_l1k.crt || exit 1
+ - curl -LS https://curl.haxx.se/ca/cacert.pem -o ~/cacert.pem || exit 1
+ - cat ~/entrust_l1k.crt >> ~/cacert.pem || exit 1
+ - echo "cacert=\"$HOME/cacert.pem\"" > ~/.curlrc || exit 1
+ - echo "ca_certificate=$HOME/cacert.pem" > ~/.wgetrc || exit 1
script:
- echo "This script runs coverity..."
|
Add some VIEWs | @@ -74,12 +74,19 @@ RETURNS SETOF record
AS 'MODULE_PATHNAME', 'pipeline_get_views'
LANGUAGE C IMMUTABLE;
+CREATE VIEW pipelinedb.views AS
+ SELECT * FROM pipelinedb.get_views();
+
CREATE OR REPLACE FUNCTION pipelinedb.get_transforms(
OUT id oid, OUT schema text, OUT name text, OUT active bool, OUT tgfunc text, OUT tgargs text[], OUT query text)
RETURNS SETOF record
AS 'MODULE_PATHNAME', 'pipeline_get_transforms'
LANGUAGE C IMMUTABLE;
+CREATE VIEW pipelinedb.transforms AS
+ SELECT * FROM pipelinedb.get_transforms();
+
+
CREATE OR REPLACE FUNCTION pipelinedb.hash_group(VARIADIC "any")
RETURNS integer
AS 'MODULE_PATHNAME', 'hash_group'
|
pflash: include ccan/list/list.c to be able to build -DDEBUG
This enables some extra linked list checking | @@ -4,8 +4,11 @@ override CFLAGS += -O2 -Wall -I.
LIBFLASH_FILES := libflash.c libffs.c ecc.c blocklevel.c file.c
LIBFLASH_OBJS := $(addprefix libflash-, $(LIBFLASH_FILES:.c=.o))
LIBFLASH_SRC := $(addprefix libflash/,$(LIBFLASH_FILES))
+CCAN_FILES := list.c
+CCAN_OBJS := $(addprefix ccan-list-, $(CCAN_FILES:.c=.o))
+CCAN_SRC := $(addprefix ccan/list/,$(CCAN_FILES))
PFLASH_OBJS := pflash.o progress.o version.o common-arch_flash.o
-OBJS := $(PFLASH_OBJS) $(LIBFLASH_OBJS)
+OBJS := $(PFLASH_OBJS) $(LIBFLASH_OBJS) $(CCAN_OBJS)
EXE := pflash
sbindir ?= /usr/sbin
@@ -37,9 +40,14 @@ version.c: .version
$(LIBFLASH_SRC): | links
+$(CCAN_SRC): | links
+
$(LIBFLASH_OBJS): libflash-%.o : libflash/%.c
$(Q_CC)$(CC) $(CFLAGS) -c $< -o $@
+$(CCAN_OBJS): ccan-list-%.o: ccan/list/%.c
+ $(Q_CC)$(CC) $(CFLAGS) -c $< -o $@
+
$(EXE): $(OBJS)
$(Q_CC)$(CC) $(LDFLAGS) $(CFLAGS) $^ -lrt -o $@
|
bugID:16974841:breeze:misc MARCO change. | @@ -10,7 +10,6 @@ $(NAME)_COMPONENTS := yloop bluetooth.breeze cli
GLOBAL_DEFINES += DEBUG
GLOBAL_DEFINES += CONFIG_BLE_LINK_PARAMETERS
-#GLOBAL_DEFINES += CONFIG_MODEL_SECURITY
GLOBAL_DEFINES += BUILD_AOS
|
Fixed pip/python report error after `source greenplum_path.sh`
If no python in $GPHOME/ext/python/bin/python, $PYTHONHOME will be set
to empty string, which make python env wrong. | @@ -44,6 +44,7 @@ cat <<EOF
#setup PYTHONHOME
if [ -x \$GPHOME/ext/python/bin/python ]; then
PYTHONHOME="\$GPHOME/ext/python"
+ export PYTHONHOME
fi
EOF
@@ -100,6 +101,5 @@ EOF
cat <<EOF
export PYTHONPATH
-export PYTHONHOME
EOF
|
implicitclass: Added error handling when call of IPP backend fails. | @@ -393,6 +393,9 @@ main(int argc, /* I - Number of command-line args */
fprintf(stderr, "DEBUG: Started IPP Backend (%s) with pid: %d\n",
buf, getpid());
execv(buf, argv_nt);
+ fprintf(stderr, "ERROR: Could not start IPP Backend (%s)\n",
+ buf);
+ return CUPS_BACKEND_FAILED;
} else {
int status;
waitpid(pid, &status, 0);
|
fix defrag test looking at the wrong latency metric
the latency event was renamed in and the outcome was that the test was
ineffective (unable to measure the max latency, always seeing 0) | @@ -130,7 +130,7 @@ start_server {tags {"defrag external:skip"} overrides {appendonly yes auto-aof-r
set max_latency 0
foreach event [r latency latest] {
lassign $event eventname time latency max
- if {$eventname == "loading-cron"} {
+ if {$eventname == "while-blocked-cron"} {
set max_latency $max
}
}
@@ -141,7 +141,7 @@ start_server {tags {"defrag external:skip"} overrides {appendonly yes auto-aof-r
puts "misses: $misses"
puts "max latency $max_latency"
puts [r latency latest]
- puts [r latency history loading-cron]
+ puts [r latency history "while-blocked-cron"]
}
# make sure we had defrag hits during AOF loading
assert {$hits > 100000}
|
Simplify porting guide `Formatter` section | ### Formatter
- Added arguments to accommodate the new decoder API changes
- - The signature of `ZydisFormatterFormatInstruction` changed
- - The functionality of `ZydisFormatterFormatInstructionEx` was integrated into the non-`Ex`
- variant of the function
- - The signature of `ZydisFormatterFormatOperand` changed
- - The functionality of `ZydisFormatterFormatOperandEx` was integrated into the non-`Ex`
- variant of the function
- - The signature of `ZydisFormatterTokenizeInstruction` changed
- - The functionality of `ZydisFormatterTokenizeInstructionEx` was integrated into the non-`Ex`
- variant of the function
- - The signature of `ZydisFormatterTokenizeOperand` changed
- - The functionality of `ZydisFormatterTokenizeOperandEx` was integrated into the non-`Ex`
- variant of the function
+- Arguments from `Ex` variants of various functions were integrated into the non-`Ex` variant
+ - All of these varied by only a single argument and didn't warrant the additional complexity
+- As a result, the signature of the following functions changed:
+ - `ZydisFormatterFormatInstruction`
+ - `ZydisFormatterFormatOperand`
+ - `ZydisFormatterTokenizeInstruction`
+ - `ZydisFormatterTokenizeOperand`
### Utils
|
Fix XDP Cleanup on Init Failure Crash | @@ -143,6 +143,7 @@ CxPlatDataPathInitialize(
return QUIC_STATUS_OUT_OF_MEMORY;
}
CxPlatZeroMemory(DataPath, DatapathSize);
+ CXPLAT_FRE_ASSERT(CxPlatRundownAcquire(&CxPlatWorkerRundown));
if (UdpCallbacks) {
DataPath->UdpHandlers = *UdpCallbacks;
@@ -165,7 +166,6 @@ CxPlatDataPathInitialize(
goto Error;
}
- CXPLAT_FRE_ASSERT(CxPlatRundownAcquire(&CxPlatWorkerRundown));
*NewDataPath = DataPath;
DataPath = NULL;
@@ -182,6 +182,7 @@ Error:
CxPlatSockPoolUninitialize(&DataPath->SocketPool);
}
CXPLAT_FREE(DataPath, QUIC_POOL_DATAPATH);
+ CxPlatRundownRelease(&CxPlatWorkerRundown);
}
}
|
nautilus: Lower VCCIO from 0.975V to 0.850V
CQ-DEPEND=CL:*602341
BRANCH=poppy
TEST=None
Commit-Ready: Furquan Shaikh
Tested-by: Furquan Shaikh | @@ -323,11 +323,11 @@ static void board_pmic_disable_slp_s0_vr_decay(void)
/*
* VCCIOCNT:
* Bit 6 (0) - Disable decay of VCCIO on SLP_S0# assertion
- * Bits 5:4 (00) - Nominal output voltage: 0.975V
+ * Bits 5:4 (11) - Nominal output voltage: 0.850V
* Bits 3:2 (10) - VR set to AUTO on SLP_S0# de-assertion
* Bits 1:0 (10) - VR set to AUTO operating mode
*/
- i2c_write8(I2C_PORT_PMIC, I2C_ADDR_BD99992, 0x30, 0xa);
+ i2c_write8(I2C_PORT_PMIC, I2C_ADDR_BD99992, 0x30, 0x3a);
/*
* V18ACNT:
@@ -362,11 +362,11 @@ static void board_pmic_enable_slp_s0_vr_decay(void)
/*
* VCCIOCNT:
* Bit 6 (1) - Enable decay of VCCIO on SLP_S0# assertion
- * Bits 5:4 (00) - Nominal output voltage: 0.975V
+ * Bits 5:4 (11) - Nominal output voltage: 0.850V
* Bits 3:2 (10) - VR set to AUTO on SLP_S0# de-assertion
* Bits 1:0 (10) - VR set to AUTO operating mode
*/
- i2c_write8(I2C_PORT_PMIC, I2C_ADDR_BD99992, 0x30, 0x4a);
+ i2c_write8(I2C_PORT_PMIC, I2C_ADDR_BD99992, 0x30, 0x7a);
/*
* V18ACNT:
|
replace __FUNCTION__ by __func__ | @@ -127,7 +127,7 @@ int picoquic_get_input_path(char * target_file_path, size_t file_path_max, const
#define DBG_PRINTF(fmt, ...) \
debug_printf("%s:%u [%s]: " fmt "\n", \
&__FILE__[MAX(DBG_PRINTF_FILENAME_MAX, sizeof(__FILE__)) - DBG_PRINTF_FILENAME_MAX], \
- __LINE__, __FUNCTION__, __VA_ARGS__)
+ __LINE__, __func__ , __VA_ARGS__)
#define DBG_FATAL_PRINTF(fmt, ...) \
do { \
|
HLS: Fixing up testbench for hashjoin example | @@ -160,7 +160,7 @@ static void snap_4KiB_get(snap_4KiB_t *buf, snap_membus_t *line)
#if defined(CONFIG_4KIB_DEBUG)
fprintf(stderr, "4KiB buffer %d lines, reading %d bytes\n",
- tocopy, tocopy * sizeof(snap_membus_t));
+ tocopy, tocopy * (int)sizeof(snap_membus_t));
#endif
switch (tocopy) {
case 0: /* NOTE: Avoid read/write 0 bytes, HLS bug */
@@ -196,8 +196,8 @@ static void snap_4KiB_flush(snap_4KiB_t *buf)
#if defined(CONFIG_4KIB_DEBUG)
fprintf(stderr, "4KiB buffer %d lines, writing %d bytes "
"free: %d bmax: %d mmax: %d\n",
- tocopy, tocopy * sizeof(snap_membus_t),
- free_lines, SNAP_4KiB_WORDS, buf->max_lines);
+ tocopy, tocopy * (int)sizeof(snap_membus_t),
+ (int)free_lines, SNAP_4KiB_WORDS, buf->max_lines);
#endif
switch (tocopy) {
case 0: /* NOTE: Avoid read/write 0 bytes, HLS bug */
@@ -530,6 +530,18 @@ int main(void)
unsigned int t3_found;
unsigned int table3_found = 0;
+ /* Query ACTION_TYPE ... */
+ Action_Register.Control.flags = 0x0;
+ hls_action(din_gmem, dout_gmem, d_ddrmem, &Action_Register, &Action_Config);
+ fprintf(stderr,
+ "ACTION_TYPE: %08x\n"
+ "RELEASE_LEVEL: %08x\n"
+ "RETC: %04x\n",
+ (unsigned int)Action_Config.action_type,
+ (unsigned int)Action_Config.release_level,
+ (unsigned int)Action_Register.Control.Retc);
+
+ Action_Register.Control.flags = 0x1; /* just not 0x0 */
memset(din_gmem, 0, sizeof(din_gmem));
memset(dout_gmem, 0, sizeof(dout_gmem));
memset(d_ddrmem, 0, sizeof(d_ddrmem));
|
corrects +muk jet comment | key_y = u3a_calloc(sizeof(c3_y), len_w);
}
+ // Efficiency: unnecessary copy.
+ //
+ // We could calculate the hash directly against
+ // the atom internals, a la u3r_mug
+ //
u3r_bytes(0, len_w, key_y, key);
- // XX we could skip the copy and use _mur_words() instead
- //
MurmurHash3_x86_32(key_y, len_w, seed_w, &out_w);
u3a_free(key_y);
|
more reliability for flashing, print bootstub version | @@ -155,9 +155,17 @@ class Panda(object):
except Exception:
pass
if not enter_bootloader:
+ self.close()
time.sleep(1.0)
+ try:
+ self.connect()
+ except Exception:
+ # retry after 5 seconds
+ print("connecting to bootstub is taking a while...")
+ time.sleep(5.0)
self.connect()
+
def flash(self, fn=None):
if not self.bootstub:
self.reset(enter_bootstub=True)
@@ -172,6 +180,9 @@ class Panda(object):
with open(fn) as f:
dat = f.read()
+ # get version
+ print("flash: version is "+self.get_version())
+
# confirm flasher is present
fr = self._handle.controlRead(Panda.REQUEST_IN, 0xb0, 0, 0, 0xc)
assert fr[4:8] == "\xde\xad\xd0\x0d"
@@ -247,6 +258,9 @@ class Panda(object):
print(e)
pass
+ def get_version(self):
+ return self._handle.controlRead(Panda.REQUEST_IN, 0xd6, 0, 0, 0x40)
+
def get_serial(self):
dat = self._handle.controlRead(Panda.REQUEST_IN, 0xd0, 0, 0, 0x20)
hashsig, calc_hash = dat[0x1c:], hashlib.sha1(dat[0:0x1c]).digest()[0:4]
|
Fix service elevation prompt regression from commit | @@ -1656,6 +1656,9 @@ VOID PhMwpOnCommand(
PhGetSelectedServiceItems(&serviceItems, &numberOfServiceItems);
PhReferenceObjects(serviceItems, numberOfServiceItems);
+ if (numberOfServiceItems == 1) // phsvc elevation (dmex)
+ PhUiStartService(WindowHandle, serviceItems[0]);
+ else
PhUiStartServices(WindowHandle, serviceItems, numberOfServiceItems);
PhDereferenceObjects(serviceItems, numberOfServiceItems);
@@ -1670,6 +1673,9 @@ VOID PhMwpOnCommand(
PhGetSelectedServiceItems(&serviceItems, &numberOfServiceItems);
PhReferenceObjects(serviceItems, numberOfServiceItems);
+ if (numberOfServiceItems == 1) // phsvc elevation (dmex)
+ PhUiContinueService(WindowHandle, serviceItems[0]);
+ else
PhUiContinueServices(WindowHandle, serviceItems, numberOfServiceItems);
PhDereferenceObjects(serviceItems, numberOfServiceItems);
@@ -1684,6 +1690,9 @@ VOID PhMwpOnCommand(
PhGetSelectedServiceItems(&serviceItems, &numberOfServiceItems);
PhReferenceObjects(serviceItems, numberOfServiceItems);
+ if (numberOfServiceItems == 1) // phsvc elevation (dmex)
+ PhUiPauseService(WindowHandle, serviceItems[0]);
+ else
PhUiPauseServices(WindowHandle, serviceItems, numberOfServiceItems);
PhDereferenceObjects(serviceItems, numberOfServiceItems);
@@ -1698,6 +1707,9 @@ VOID PhMwpOnCommand(
PhGetSelectedServiceItems(&serviceItems, &numberOfServiceItems);
PhReferenceObjects(serviceItems, numberOfServiceItems);
+ if (numberOfServiceItems == 1) // phsvc elevation (dmex)
+ PhUiStopService(WindowHandle, serviceItems[0]);
+ else
PhUiStopServices(WindowHandle, serviceItems, numberOfServiceItems);
PhDereferenceObjects(serviceItems, numberOfServiceItems);
|
Fix BLE_ADDR_IS_NRPA and BLE_ADDR_IS_STATIC define | @@ -261,9 +261,9 @@ int ble_err_from_os(int os_err);
#define BLE_ADDR_IS_RPA(addr) (((addr)->type == BLE_ADDR_RANDOM) && \
((addr)->val[5] & 0xc0) == 0x40)
#define BLE_ADDR_IS_NRPA(addr) (((addr)->type == BLE_ADDR_RANDOM) && \
- (((addr)->val[5] & 0xc0) == 0x00)
+ ((addr)->val[5] & 0xc0) == 0x00)
#define BLE_ADDR_IS_STATIC(addr) (((addr)->type == BLE_ADDR_RANDOM) && \
- (((addr)->val[5] & 0xc0) == 0xc0)
+ ((addr)->val[5] & 0xc0) == 0xc0)
typedef struct {
uint8_t type;
|
docs: age break cleanup | @@ -184,6 +184,7 @@ repository, which is shipped with CentOS and is enabled by default.
\subsubsection{Additional Customization ({\em optional})} \label{sec:addl_customizations}
\input{common/compute_customizations_intro}
+\clearpage
\paragraph{Enable \InfiniBand{} drivers}
\input{common/ibsupport_compute_centos.tex}
@@ -231,9 +232,10 @@ repository, which is shipped with CentOS and is enabled by default.
%\clearpage
\subsubsection{Import files} \label{sec:file_import}
\input{common/import_ww_files}
+\vspace*{0.3cm}
\input{common/import_ww_files_slurm}
\input{common/import_ww_files_ib_centos}
-\vspace*{0.3cm}
+%\vspace*{0.3cm}
\input{common/finalize_provisioning}
\input{common/add_ww_hosts_intro}
\input{common/add_ww_hosts_slurm}
|
wlanhcx2psk: Allow running without hcx input (just output all the generic
stuff). Also makes the generic "weak passwords" optional (-w), in case
user *only* wants stuff actually derived from input data. | @@ -27,6 +27,7 @@ hcx_t *hcxdata = NULL;
bool stdoutflag = false;
bool fileflag = false;
+bool weakflag = false;
bool wpsflag = false;
bool eudateflag = false;
bool usdateflag = false;
@@ -1038,6 +1039,7 @@ printf("%s %s (C) %s ZeroBeat\n"
"-i <file> : input hccapx file\n"
"-o <file> : output plainkeys to file\n"
"-s : output plainkeys to stdout (pipe to hashcat)\n"
+ "-w : include generic weak passwords\n"
"-W : include complete wps keys\n"
"-D : include complete european dates\n"
"-d : include complete american dates\n"
@@ -1062,7 +1064,7 @@ eigenpfadname = strdupa(argv[0]);
eigenname = basename(eigenpfadname);
setbuf(stdout, NULL);
-while ((auswahl = getopt(argc, argv, "i:o:sWDdNhv")) != -1)
+while ((auswahl = getopt(argc, argv, "i:o:swWDdNhv")) != -1)
{
switch (auswahl)
{
@@ -1079,6 +1081,10 @@ while ((auswahl = getopt(argc, argv, "i:o:sWDdNhv")) != -1)
stdoutflag = true;
break;
+ case 'w':
+ weakflag = true;
+ break;
+
case 'W':
wpsflag = true;
break;
@@ -1106,6 +1112,8 @@ if(globalinit() == false)
exit(EXIT_FAILURE);
}
+if (hcxinname != NULL)
+ {
hcxorgrecords = readhccapx(hcxinname);
if(hcxorgrecords == 0)
@@ -1113,6 +1121,7 @@ if(hcxorgrecords == 0)
fprintf(stderr, "%ld records loaded\n", hcxorgrecords);
return EXIT_SUCCESS;
}
+ }
if(pskfilename != NULL)
{
@@ -1125,9 +1134,13 @@ if(pskfilename != NULL)
if((stdoutflag == true) || (fileflag == true))
{
+ if(weakflag == true)
keywriteweakpass();
+ if(hcxorgrecords > 0)
+ {
processbssid(hcxorgrecords);
processessid(hcxorgrecords);
+ }
if(wpsflag == true)
keywriteallwpskeys();
if(eudateflag == true)
|
Break build on sha256sum mismatch | @@ -7,7 +7,7 @@ case "$1" in
case "${BUILD_SYSTEM}" in
"bazel")
wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel_0.4.5-linux-x86_64.deb
- echo "b494d0a413e4703b6cd5312403bea4d92246d6425b3be68c9bfbeb8cc4db8a55 bazel_0.4.5-linux-x86_64.deb" | sha256sum -c --strict
+ echo 'b494d0a413e4703b6cd5312403bea4d92246d6425b3be68c9bfbeb8cc4db8a55 bazel_0.4.5-linux-x86_64.deb' | sha256sum -c --strict || exit 1
sudo dpkg -i bazel_0.4.5-linux-x86_64.deb
;;
esac
@@ -40,7 +40,9 @@ case "$1" in
"linux")
case "${CC}" in
"pgcc")
- wget -q -O /dev/stdout 'https://raw.githubusercontent.com/nemequ/pgi-travis/master/install-pgi.sh' | /bin/sh
+ wget 'https://raw.githubusercontent.com/nemequ/pgi-travis/de6212d94fd0e7d07a6ef730c23548c337c436a7/install-pgi.sh'
+ echo 'acd3ef995ad93cfb87d26f65147395dcbedd4c3c844ee6ec39616f1a347c8df5 install-pgi.sh' | sha256sum -c --strict || exit 1
+ /bin/sh install-pgi.sh
;;
esac
;;
|
tests: internal: network: prevent Infinite loop for no IPv6 environment
With no IPv6 supported environment, the current implementation causes
infinite loop to wait ev events for network testing.
We should prevent such protocol glitching issue on test to prevent
stucking test cases. | @@ -63,6 +63,10 @@ static void test_client_server(int is_ipv6)
/* Create client and server sockets */
fd_client = flb_net_socket_create(family, FLB_TRUE);
+ if (errno == EAFNOSUPPORT) {
+ TEST_MSG("This protocol is not supported in this platform");
+ return;
+ }
TEST_CHECK(fd_client != -1);
fd_server = flb_net_server(TEST_PORT, host);
@@ -94,6 +98,10 @@ static void test_client_server(int is_ipv6)
/* Event loop */
while (1) {
+ /* Break immediately for invalid status */
+ if (fd_client == -1 || fd_server == -1) {
+ break;
+ }
mk_event_wait(evl);
mk_event_foreach(e_item, evl) {
if (e_item->type == TEST_EV_CLIENT) {
|
board/cherry/board.h: Format with clang-format
BRANCH=none
TEST=none | #define CONFIG_LED_ONOFF_STATES_BAT_LOW 10
/* PD / USB-C / PPC */
-#undef CONFIG_USB_PD_DEBUG_LEVEL /* default to 1, configurable in ec console */
+#undef CONFIG_USB_PD_DEBUG_LEVEL /* default to 1, configurable in ec console \
+ */
/* Optional console commands */
#define CONFIG_CMD_FLASH
|
conf: merge 'split_line' property | # Lines to read. If sets, in_head works like 'head -n'
Lines 10
+ # Split_line
+ # ====
+ # If true, in_head splits lines into k-v pairs
+ Split_line true
[OUTPUT]
Name stdout
|
host/mesh: fix mesh_adv_thread
Solved issues with adv_timeout. | @@ -48,6 +48,7 @@ static os_membuf_t adv_buf_mem[OS_MEMPOOL_SIZE(
MYNEWT_VAL(BLE_MESH_ADV_BUF_COUNT),
BT_MESH_ADV_DATA_SIZE + BT_MESH_MBUF_HEADER_SIZE)];
static struct os_mempool adv_buf_mempool;
+static int32_t adv_timeout;
static inline void adv_send(struct os_mbuf *buf)
{
@@ -134,9 +135,6 @@ mesh_adv_thread(void *args)
{
static struct ble_npl_event *ev;
struct os_mbuf *buf;
-#if (MYNEWT_VAL(BLE_MESH_PROXY))
- int32_t timeout;
-#endif
BT_DBG("started");
@@ -144,22 +142,21 @@ mesh_adv_thread(void *args)
#if (MYNEWT_VAL(BLE_MESH_PROXY))
ev = ble_npl_eventq_get(&bt_mesh_adv_queue, 0);
while (!ev) {
+ /* Adv timeout may be set by a call from proxy
+ * to bt_mesh_adv_start:
+ */
+ adv_timeout = K_FOREVER;
if (bt_mesh_is_provisioned()) {
if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) {
- timeout = bt_mesh_proxy_adv_start();
- BT_DBG("Proxy Advertising up to %d ms", (int) timeout);
+ (void)bt_mesh_proxy_adv_start();
+ BT_DBG("Proxy Advertising up to %d ms", (int) adv_timeout);
}
} else if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) {
- timeout = bt_mesh_pb_gatt_adv_start();
- BT_DBG("PB-GATT Advertising up to %d ms", (int) timeout);
- }
-
- // FIXME: should we redefine K_SECONDS macro instead in glue?
- if (timeout != K_FOREVER) {
- timeout = ble_npl_time_ms_to_ticks32(timeout);
+ (void)bt_mesh_pb_gatt_adv_start();
+ BT_DBG("PB-GATT Advertising up to %d ms", (int) adv_timeout);
}
- ev = ble_npl_eventq_get(&bt_mesh_adv_queue, timeout);
+ ev = ble_npl_eventq_get(&bt_mesh_adv_queue, adv_timeout);
bt_le_adv_stop();
}
#else
@@ -244,6 +241,7 @@ int bt_mesh_adv_start(const struct ble_gap_adv_params *param, int32_t duration,
const struct bt_data *ad, size_t ad_len,
const struct bt_data *sd, size_t sd_len)
{
+ adv_timeout = duration;
return bt_le_adv_start(param, duration, ad, ad_len, sd, sd_len);
}
#endif
\ No newline at end of file
|
timesched: chk timer is non-empty before removing | @@ -140,7 +140,9 @@ timesched_timer_stop(struct timesched_timer *timer)
OS_ENTER_CRITICAL(sr);
+ if (timer->link.tqe_prev != NULL) {
TAILQ_REMOVE(&g_timesched_q, timer, link);
+ }
OS_EXIT_CRITICAL(sr);
|
include/rgb_keyboard.h: Format with clang-format
BRANCH=none
TEST=none | @@ -85,8 +85,8 @@ struct rgbkbd_drv {
* @param len Length of LEDs to be set.
* @return enum ec_error_list
*/
- int (*set_scale)(struct rgbkbd *ctx, uint8_t offset,
- struct rgb_s scale, uint8_t len);
+ int (*set_scale)(struct rgbkbd *ctx, uint8_t offset, struct rgb_s scale,
+ uint8_t len);
/**
* Set global current control.
*
|
Default code signing identity should be '-' for adhoc. | @@ -22,7 +22,7 @@ ASAN_OPTIONS = leak_check_at_exit=false
CC = @CC@
CFLAGS = -I.. @CFLAGS@ $(OPTIM)
CODE_SIGN = @CODE_SIGN@
-CODESIGN_IDENTITY = Developer ID
+CODESIGN_IDENTITY = -
DSOFLAGS = @DSOFLAGS@ $(CFLAGS)
INSTALL = @INSTALL@
LDFLAGS = @LDFLAGS@ $(OPTIM)
|
Subsets and Splits