message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
sdl/cpuinfo: Add HasAVX2() for SDL2 2.0.4 | @@ -19,6 +19,14 @@ static inline SDL_bool SDL_HasAVX()
}
#endif
+#if !(SDL_VERSION_ATLEAST(2,0,4))
+#pragma message("SDL_HasAVX2 is not supported before SDL 2.0.4")
+static inline SDL_bool SDL_HasAVX2()
+{
+ return SDL_FALSE;
+}
+#endif
+
*/
import "C"
@@ -102,3 +110,9 @@ func GetSystemRAM() int {
func HasAVX() bool {
return C.SDL_HasAVX() > 0
}
+
+// HasAVX2 reports whether the CPU has AVX2 features.
+// (https://wiki.libsdl.org/SDL_HasAVX2)
+func HasAVX2() bool {
+ return C.SDL_HasAVX2() > 0
+}
|
take care about hccapx converted from wpaclean | @@ -33,12 +33,6 @@ static const uint8_t nullnonce[] =
};
#define NULLNONCE_SIZE (sizeof(nullnonce))
-static const uint8_t nulliv[] =
-{
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-#define NULLIV_SIZE (sizeof(nulliv))
-
/*===========================================================================*/
static size_t chop(char *buffer, size_t len)
{
@@ -280,12 +274,6 @@ while(c < hcxrecords)
c++;
continue;
}
- if(memcmp(eap->keyid, &nulliv, 8) != 0)
- {
- rwerr++;
- c++;
- continue;
- }
if((fhhcx = fopen(repairedname, "ab")) == NULL)
{
|
Update SoloFeature_cellFiltering.cpp
I believe the `max` on line 20 should be a min, otherwise `nUMImin`
is almost _always_ simply determined by `nCB`, thus ignoring
`pSolo.cellFilter.topCells`. | @@ -17,7 +17,7 @@ void SoloFeature::cellFiltering()
uint32 nUMImax=0, nUMImin=0;
if (pSolo.cellFilter.type[0]=="TopCells") {
- nUMImin = nUMIperCBsorted[max(nCB-1,pSolo.cellFilter.topCells)];
+ nUMImin = nUMIperCBsorted[min(nCB-1,pSolo.cellFilter.topCells)];
} else {//other filtering types require simple filtering first
//find robust max
uint32 maxind=int(round(pSolo.cellFilter.knee.nExpectedCells*(1.0-pSolo.cellFilter.knee.maxPercentile)));//cell number for robust max
|
Update: NAL.h: missing comparison rules added | @@ -122,6 +122,10 @@ R2( (R --> (A * B)), (C <-> A), |-, (R --> (C * B)), Truth_Analogy )
R2( (R --> (A * B)), (B --> C), |-, (R --> (A * C)), Truth_Deduction )
R2( (R --> (A * B)), (C --> B), |-, (R --> (A * C)), Truth_Abduction )
R2( (R --> (A * B)), (C <-> B), |-, (R --> (A * C)), Truth_Analogy )
+R2( ((A * B) --> R), ((C * B) --> R), |-, (A <-> C), Truth_Comparison )
+R2( ((A * B) --> R), ((A * C) --> R), |-, (B <-> C), Truth_Comparison )
+R2( (R --> (A * B)), (R --> (C * B)), |-, (A <-> C), Truth_Comparison )
+R2( (R --> (A * B)), (R --> (A * C)), |-, (B <-> C), Truth_Comparison )
//NAL5 rules
R1( (! A), |-, A, Truth_Negation )
R1( (A && B), |-, A, Truth_StructuralDeduction )
|
Travis: Use newer version of `clang-format` | @@ -66,6 +66,10 @@ matrix:
- os: linux
compiler: clang
+ addons:
+ apt:
+ sources: [ llvm-toolchain-trusty-5.0 ]
+ packages: [ clang-format-5.0 ]
before_install:
- |
@@ -127,7 +131,6 @@ before_install:
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
[[ $ASAN == ON && $CC == gcc ]] && export CC=gcc-7 CXX=g++-7
sudo apt-get -qq update
- sudo apt-get install clang-format-3.8
sudo apt-get install ninja-build
sudo apt-get install libboost-all-dev
sudo apt-get install libyaml-cpp-dev
|
mangoapp: don't resize window if fps_only | @@ -227,7 +227,9 @@ static bool render(GLFWwindow* window) {
position_layer(sw_stats, params, window_size);
render_imgui(sw_stats, params, window_size, true);
overlay_end_frame();
+ if (!params.enabled[OVERLAY_PARAM_ENABLED_fps_only])
glfwSetWindowSize(window, window_size.x + 45.f, window_size.y + 325.f);
+
ImGui::EndFrame();
return last_window_size.x != window_size.x || last_window_size.y != window_size.y;
}
|
Poll manager: Always check ResourceItem pointer to guard against SEGV | @@ -278,7 +278,7 @@ void PollManager::pollTimerFired()
if (suffix == RStateOn)
{
item = r->item(RAttrModelId);
- if (item->toString() == QLatin1String("TS0601"))
+ if (item && item->toString() == QLatin1String("TS0601"))
{
//This device haven't cluster 0006, and use Cluster specific
}
@@ -404,7 +404,8 @@ void PollManager::pollTimerFired()
clusterId = METERING_CLUSTER_ID;
attributes.push_back(0x0000); // Current Summation Delivered
item = r->item(RAttrModelId);
- if (!item->toString().startsWith(QLatin1String("SP 120")) && // Attribute is not available
+ if (item &&
+ !item->toString().startsWith(QLatin1String("SP 120")) && // Attribute is not available
!item->toString().startsWith(QLatin1String("lumi.plug.ma")) &&
!item->toString().startsWith(QLatin1String("ZB-ONOFFPlug-D0005")) &&
!item->toString().startsWith(QLatin1String("TS0121")) &&
@@ -421,12 +422,12 @@ void PollManager::pollTimerFired()
clusterId = ELECTRICAL_MEASUREMENT_CLUSTER_ID;
attributes.push_back(0x050b); // Active Power
item = r->item(RAttrModelId);
- if (!item->toString().startsWith(QLatin1String("Plug"))) //Osram plug
+ if (item && !item->toString().startsWith(QLatin1String("Plug"))) //Osram plug
{
NotOnlyPower = false;
}
item = r->item(RAttrManufacturerName);
- if (!item->toString().startsWith(QLatin1String("Legrand"))) // All legrand Devices
+ if (item && !item->toString().startsWith(QLatin1String("Legrand"))) // All legrand Devices
{
NotOnlyPower = false;
}
|
u3: disables meld and cram under U3_MEMORY_DEEBUG | @@ -379,6 +379,10 @@ _cu_all_to_loom(ur_root_t* rot_u, ur_nref ken, ur_nvec_t* cod_u)
static ur_nref
_cu_realloc(FILE* fil_u, ur_root_t** tor_u, ur_nvec_t* doc_u)
{
+#ifdef U3_MEMORY_DEBUG
+ c3_assert(0);
+#endif
+
// bypassing page tracking as an optimization
//
// NB: u3e_yolo() will mark all as dirty, and
@@ -442,6 +446,13 @@ _cu_realloc(FILE* fil_u, ur_root_t** tor_u, ur_nvec_t* doc_u)
/* u3u_meld(): globally deduplicate memory.
*/
+#ifdef U3_MEMORY_DEBUG
+void
+u3u_meld(void)
+{
+ fprintf(stderr, "u3: unable to meld under U3_MEMORY_DEBUG\r\n");
+}
+#else
void
u3u_meld(void)
{
@@ -457,6 +468,7 @@ u3u_meld(void)
ur_nvec_free(&cod_u);
ur_root_free(rot_u);
}
+#endif
/* _cu_rock_path(): format rock path.
*/
@@ -624,6 +636,14 @@ _cu_rock_save(c3_c* dir_c, c3_d eve_d, c3_d len_d, c3_y* byt_y)
/* u3u_cram(): globably deduplicate memory, and write a rock to disk.
*/
+#ifdef U3_MEMORY_DEBUG
+c3_o
+u3u_cram(c3_c* dir_c, c3_d eve_d)
+{
+ fprintf(stderr, "u3: unable to cram under U3_MEMORY_DEBUG\r\n");
+ return c3n;
+}
+#else
c3_o
u3u_cram(c3_c* dir_c, c3_d eve_d)
{
@@ -670,6 +690,7 @@ u3u_cram(c3_c* dir_c, c3_d eve_d)
return ret_o;
}
+#endif
/* u3u_mmap_read(): open and mmap the file at [pat_c] for reading.
*/
|
fix HW cursor formatwq | @@ -429,8 +429,8 @@ NTSTATUS VioGpuDod::QueryAdapterInfo(_In_ CONST DXGKARG_QUERYADAPTERINFO* pQuery
if (IsPointerEnabled()) {
pDriverCaps->MaxPointerWidth = POINTER_SIZE;
pDriverCaps->MaxPointerHeight = POINTER_SIZE;
- pDriverCaps->PointerCaps.Value = 0;
pDriverCaps->PointerCaps.Color = 1;
+ pDriverCaps->PointerCaps.MaskedColor = 1;
}
pDriverCaps->SupportNonVGA = IsVgaDevice();
pDriverCaps->SupportSmoothRotation = TRUE;
@@ -2596,6 +2596,11 @@ NTSTATUS VioGpuAdapter::SetPointerShape(_In_ CONST DXGKARG_SETPOINTERSHAPE* pSet
pSetPointerShape->XHot,
pSetPointerShape->YHot));
+ if (pSetPointerShape->Flags.Monochrome) {
+ VioGpuDbgBreak();
+ return STATUS_UNSUCCESSFUL;
+ }
+
DestroyCursor();
if (CreateCursor(pSetPointerShape, pModeCur))
{
@@ -2619,7 +2624,6 @@ NTSTATUS VioGpuAdapter::SetPointerShape(_In_ CONST DXGKARG_SETPOINTERSHAPE* pSet
VioGpuDbgBreak();
}
DbgPrint(TRACE_LEVEL_ERROR, ("<--- %s Failed to create cursor\n", __FUNCTION__));
- VioGpuDbgBreak();
return STATUS_UNSUCCESSFUL;
}
@@ -3245,12 +3249,11 @@ BOOLEAN VioGpuAdapter::CreateCursor(_In_ CONST DXGKARG_SETPOINTERSHAPE* pSetPoin
UINT resid, format, size;
VioGpuObj* obj;
PAGED_CODE();
- UNREFERENCED_PARAMETER(pCurrentMode);
DbgPrint(TRACE_LEVEL_INFORMATION, ("---> %s - %d: (%d x %d - %d) (%d + %d)\n", __FUNCTION__, m_Id,
pSetPointerShape->Width, pSetPointerShape->Height, pSetPointerShape->Pitch, pSetPointerShape->XHot, pSetPointerShape->YHot));
ASSERT(m_pCursorBuf == NULL);
size = POINTER_SIZE * POINTER_SIZE * 4;
- format = ColorFormat(pCurrentMode->DispInfo.ColorFormat);
+ format = ColorFormat(D3DDDIFMT_A8R8G8B8);
DbgPrint(TRACE_LEVEL_INFORMATION, ("---> %s - (%x -> %x)\n", __FUNCTION__, pCurrentMode->DispInfo.ColorFormat, format));
resid = (UINT)m_Idr.GetId();
m_CtrlQueue.CreateResource(resid, format, POINTER_SIZE, POINTER_SIZE);
|
Load jvm and awt before loading tinysplinejava. | // Automatically load native library.
%pragma(java) jniclasscode=%{
static {
+ // Load dependencies
+ System.loadLibrary("jvm");
+ System.loadLibrary("awt");
+
// Determine platform.
final String os = System.getProperty("os.name").toLowerCase();
final String arch = System.getProperty("sun.arch.data.model");
try {
in = tinysplinejavaJNI.class.getResourceAsStream("/" + library);
if (in == null) {
- throw new java.io.FileNotFoundException(
- "Native library is not available");
+ throw new java.io.FileNotFoundException(String.format(
+ "Native library '%s' is not available", library));
}
tmp = java.io.File.createTempFile("tinyspline", null);
tmp.deleteOnExit();
while((read = in.read(buffer)) != -1) {
out.write(buffer, 0, read);
}
- } catch (final Throwable e) {
- throw new Error("Error while copying native library", e);
+ } catch (final Exception e) {
+ throw new Error(String.format(
+ "Error while copying native library '%s'", library), e);
} finally {
try {
if (in != null) {
|
luv_new_udp: Always turn on UV_UDP_RECVMMSG | @@ -28,11 +28,8 @@ static int luv_new_udp(lua_State* L) {
uv_udp_t* handle = (uv_udp_t*)luv_newuserdata(L, sizeof(*handle));
int ret;
#if LUV_UV_VERSION_GEQ(1, 7, 0)
- if (lua_isnoneornil(L, 1)) {
- ret = uv_udp_init(ctx->loop, handle);
- }
- else {
unsigned int flags = AF_UNSPEC;
+ if (!lua_isnoneornil(L, 1)) {
if (lua_isnumber(L, 1)) {
flags = lua_tointeger(L, 1);
}
@@ -46,8 +43,21 @@ static int luv_new_udp(lua_State* L) {
else {
luaL_argerror(L, 1, "expected string or integer");
}
- ret = uv_udp_init_ex(ctx->loop, handle, flags);
}
+#if LUV_UV_VERSION_GEQ(1, 37, 0)
+ // Libuv intended to enable this by default, but it caused a backwards-incompatibility with how
+ // the buffer is freed in udp_recv_cb, so it had to be put behind a flag to avoid breaking
+ // existing libuv users. However, because luv handles UV_UDP_MMSG_CHUNK in luv_udp_recv_cb, we can
+ // always enable this flag and get the benefits of recvmmsg for platforms that support it.
+ //
+ // Relevant links:
+ // - https://github.com/libuv/libuv/issues/2791
+ // - https://github.com/libuv/libuv/pull/2792
+ // - https://github.com/libuv/libuv/pull/2532
+ // - https://github.com/libuv/libuv/issues/419
+ flags |= UV_UDP_RECVMMSG;
+#endif
+ ret = uv_udp_init_ex(ctx->loop, handle, flags);
#else
ret = uv_udp_init(ctx->loop, handle);
#endif
|
Improve error on failure | @@ -160,8 +160,19 @@ mongoc_secure_channel_setup_certificate_from_file (const char *filename)
NULL, /* pvStructInfo */
&blob_private_len); /* pcbStructInfo */
if (!success) {
- MONGOC_ERROR ("Failed to parse private key. Error 0x%.8X",
- GetLastError ());
+ LPTSTR msg = NULL;
+ FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_ARGUMENT_ARRAY,
+ NULL,
+ GetLastError (),
+ LANG_NEUTRAL,
+ (LPTSTR) &msg,
+ 0,
+ NULL);
+ MONGOC_ERROR (
+ "Failed to parse private key. %s (0x%.8X)", msg, GetLastError ());
+ LocalFree (msg);
goto fail;
}
@@ -845,6 +856,7 @@ mongoc_secure_channel_handshake_step_2 (mongoc_stream_tls_t *tls,
default: {
LPTSTR msg = NULL;
+
FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_ARGUMENT_ARRAY,
|
Fixed test seg fault | @@ -80,6 +80,9 @@ FLT max_pos_error = .08, max_rot_error = .001;
static void external_pose_fn(SurviveContext *ctx, const char *name, const SurvivePose *pose) {
SurviveSimpleContext *actx = ctx->user_ptr;
+ if (actx == 0)
+ return;
+
struct replay_ctx *rctx = survive_simple_get_user(actx);
rctx->external_pose_fn(ctx, name, pose);
|
Eliminate false-sharing with active txn set buckets and reduce bucket count... | @@ -30,9 +30,9 @@ struct active_ctxn_set {
* buckets reasonably constrained w.r.t the number of active ctxns
* reduces the overhead required to maintain the horizon.
*/
-static const u8 active_ctxn_bkt_maskv[] = { 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 31, 31, 31, 31, 31, 31, 31, 31 };
+static const u8 active_ctxn_bkt_maskv[] = {
+ 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 15, 15, 15, 15, 15
+};
/**
* struct active_ctxn_bkt -
@@ -42,7 +42,7 @@ static const u8 active_ctxn_bkt_maskv[] = { 3, 3, 3, 3, 7, 7, 7, 7, 7,
struct active_ctxn_bkt {
struct active_ctxn_tree *acb_tree;
volatile u64 acb_min_view_sns;
-} __aligned(SMP_CACHE_BYTES);
+} __aligned(SMP_CACHE_BYTES * 2);
/**
* struct active_ctxn_set_impl
|
CLEANUP: updated the missed part in item dump refactoring. | @@ -1514,6 +1514,8 @@ ENGINE_ERROR_CODE item_dump_start(struct default_engine *engine,
mode = do_item_dump_mode_check(modestr);
if (mode == DUMP_MODE_MAX) {
+ logger->log(EXTENSION_LOG_INFO, NULL,
+ "NOT supported dump mode(%s)\n", modestr);
return ENGINE_ENOTSUP; /* NOT supported */
}
@@ -1596,11 +1598,11 @@ static void do_item_dump_stats(struct engine_dumper *dumper,
} else if (dumper->mode == DUMP_MODE_ITEM) {
add_stat("dumper:mode", 11, "item", 4, cookie);
} else if (dumper->mode == DUMP_MODE_RCOUNT) {
- add_stat("dumper:mode", 11, "rcount", 4, cookie);
+ add_stat("dumper:mode", 11, "rcount", 6, cookie);
} else if (dumper->mode == DUMP_MODE_SNAPSHOT) {
- add_stat("dumper:mode", 11, "snapshot", 4, cookie);
+ add_stat("dumper:mode", 11, "snapshot", 8, cookie);
} else {
- add_stat("dumper:mode", 11, "unknown", 4, cookie);
+ add_stat("dumper:mode", 11, "unknown", 7, cookie);
}
if (dumper->stopped != 0) {
time_t diff = dumper->stopped - dumper->started;
|
Do not read all the filesystem tree contents into memory: do it file-by-file. | @@ -137,9 +137,8 @@ static void err(status s)
rprintf("reported error\n");
}
-static buffer translate_contents(heap h, const char *target_root, value v)
+static buffer get_file_contents(heap h, const char *target_root, value v)
{
- if (tagof(v) == tag_tuple) {
value path = table_find((table)v, sym(host));
if (path) {
// seems like it wouldn't be to hard to arrange
@@ -148,8 +147,7 @@ static buffer translate_contents(heap h, const char *target_root, value v)
read_file(h, target_root, dest, path);
return dest;
}
- }
- return v;
+ return 0;
}
// dont really like the file/tuple duality, but we need to get something running today,
@@ -163,7 +161,7 @@ static value translate(heap h, vector worklist,
tuple out = allocate_tuple();
table_foreach((table)v, k, child) {
if (k == sym(contents)) {
- vector_push(worklist, build_vector(h, out, translate_contents(h, target_root, child)));
+ vector_push(worklist, build_vector(h, out, child));
} else {
table_set(out, k, translate(h, worklist, target_root, fs, child, sh));
}
@@ -197,9 +195,12 @@ static void fsc(heap h, descriptor out, const char *target_root, filesystem fs,
vector i;
vector_foreach(worklist, i) {
tuple f = vector_get(i, 0);
- buffer c = vector_get(i, 1);
+ buffer contents = get_file_contents(h, target_root, vector_get(i, 1));
+ if (contents) {
allocate_fsfile(fs, f);
- filesystem_write(fs, f, c, 0, ignore_io_status);
+ filesystem_write(fs, f, contents, 0, ignore_io_status);
+ deallocate_buffer(contents);
+ }
}
close(out);
}
|
graph-api: send all pokes to %graph-view | import BaseApi from './base';
+
class PrivateHelper extends BaseApi {
graphAction(data) {
console.log(data);
- this.action('graph-store', 'graph-action', data);
+ this.action('graph-view', 'graph-action', data);
}
addGraph(ship = 'zod', name = 'asdf', graph = {}) {
|
Fix ccl_sample_pkemu.c | @@ -20,7 +20,7 @@ int main(int argc, char * argv[])
*/
double Neff = 3.04;
double mnu[3] = {0.02, 0.02, 0.02};
- ccl_mnu_type_label mnutype = ccl_mnu_list;
+ ccl_mnu_convention mnutype = ccl_mnu_list;
/*In the case of the emulator without massive
neutrinos, we simply set:
*/
|
[examples] correct typos in CMakeLists.txt | @@ -99,7 +99,7 @@ else()
# Control component examples
if(${control_installed} GREATER -1)
- MESSAGE(STATUS "control component found")
+ message(STATUS "control component found")
set(EXAMPLES_DIRECTORIES
"${EXAMPLES_DIRECTORIES}"
Control
@@ -127,6 +127,7 @@ else()
)
if (${mechanics_installed} LESS 0)
+ message("mechanics component not found")
foreach(_dir ${mechanics_examples})
list(APPEND NO_TEST_FILES ${_dir})
endforeach()
@@ -183,7 +184,7 @@ else()
else()
file(GLOB EXAMPLES_P ${src_dir}/*.cpp)
endif()
- file(GLOB EXAMPLES_DATA ${src_dir}/*.ref$ {src_dir}/*.mat)
+ file(GLOB EXAMPLES_DATA ${src_dir}/*.ref ${src_dir}/*/*.mat)
if(EXAMPLES_P)
foreach(_P ${EXAMPLES_P})
# Full path to current file ...
@@ -204,7 +205,7 @@ else()
set(bin_dir ${CMAKE_CURRENT_BINARY_DIR}/${_D}/${_dir}/${EXAMPLE_NAME})
file(MAKE_DIRECTORY ${bin_dir})
foreach(datafile ${EXAMPLES_DATA})
- message_status("configure " ${datafile})
+ message(STATUS "configure " ${datafile})
configure_file(${datafile} ${bin_dir})
endforeach()
if(ext MATCHES ".py")
|
[CUDA] Fix constant address space update for globals | @@ -465,6 +465,8 @@ void pocl_fix_constant_address_space(llvm::Module *module)
for (auto G = globals.begin(); G != globals.end(); G++)
{
llvm::Type *type = (*G)->getType();
+ if (type->getPointerAddressSpace() != 4)
+ continue;
llvm::Type *new_type = type->getPointerElementType()->getPointerTo(1);
(*G)->mutateType(new_type);
pocl_update_users_address_space(*G);
|
Update test_project.cpp
Isolating bug on gcc | @@ -78,10 +78,10 @@ BOOST_AUTO_TEST_CASE(test_save)
error = EN_open(ph_save, DATA_PATH_NET1, DATA_PATH_RPT, DATA_PATH_OUT);
BOOST_REQUIRE(error == 0);
- error = EN_saveinpfile(ph_save, "test_reopen.inp");
- BOOST_REQUIRE(error == 0);
+// error = EN_saveinpfile(ph_save, "test_reopen.inp");
+// BOOST_REQUIRE(error == 0);
- BOOST_CHECK(boost::filesystem::exists("test_reopen.inp") == true);
+// BOOST_CHECK(boost::filesystem::exists("test_reopen.inp") == true);
error = EN_close(ph_save);
BOOST_REQUIRE(error == 0);
|
add kline debug support | @@ -455,7 +455,11 @@ class Panda(object):
# pulse low for wakeup
def kline_wakeup(self):
+ if DEBUG:
+ print("kline wakeup...")
self._handle.controlWrite(Panda.REQUEST_OUT, 0xf0, 0, 0, b'')
+ if DEBUG:
+ print("kline wakeup done")
def kline_drain(self, bus=2):
# drain buffer
@@ -470,7 +474,10 @@ class Panda(object):
def kline_ll_recv(self, cnt, bus=2):
echo = bytearray()
while len(echo) != cnt:
- echo += self._handle.controlRead(Panda.REQUEST_OUT, 0xe0, bus, 0, cnt-len(echo))
+ ret = str(self._handle.controlRead(Panda.REQUEST_OUT, 0xe0, bus, 0, cnt-len(echo)))
+ if DEBUG and len(ret) > 0:
+ print("kline recv: "+ret.encode("hex"))
+ echo += ret
return echo
def kline_send(self, x, bus=2, checksum=True):
@@ -484,6 +491,8 @@ class Panda(object):
x += get_checksum(x)
for i in range(0, len(x), 0xf):
ts = x[i:i+0xf]
+ if DEBUG:
+ print("kline send: "+ts.encode("hex"))
self._handle.bulkWrite(2, chr(bus).encode()+ts)
echo = self.kline_ll_recv(len(ts), bus=bus)
if echo != ts:
|
docs/library/builtins: Elaborate module title.
Mention that it also contains types, and spell out the module name in
the title. | -Builtin functions and exceptions
-================================
+Builtin types, functions and exceptions (:mod:`builtins`)
+=========================================================
All builtin functions and exceptions are described here. They are also
available via ``builtins`` module.
|
Fix format specifier in log_fr_connection_close()
ngtcp2_connection_close.reason_len is size_t, which is not necessarily 64-bit. | @@ -270,7 +270,7 @@ static void log_fr_connection_close(ngtcp2_log *log, const ngtcp2_pkt_hd *hd,
log->log_printf(log->user_data,
(NGTCP2_LOG_PKT
" CONNECTION_CLOSE(0x%02x) error_code=%s(0x%" PRIx64 ") "
- "frame_type=%" PRIx64 " reason_len=%" PRIu64 " reason=[%s]"),
+ "frame_type=%" PRIx64 " reason_len=%zu reason=[%s]"),
NGTCP2_LOG_FRM_HD_FIELDS(dir), fr->type,
fr->type == NGTCP2_FRAME_CONNECTION_CLOSE
? strerrorcode(fr->error_code)
|
Add extra debug for events testing. | @@ -35,7 +35,14 @@ def event_handler(name, **kwargs):
elif name == 'process_stopping':
print('SHUTDOWN', mod_wsgi.active_requests)
-print('EVENTS', mod_wsgi.event_callbacks)
+print('EVENTS#ALL', mod_wsgi.event_callbacks)
+
+mod_wsgi.subscribe_events(event_handler)
+
+def shutdown_handler(reason):
+ print('SHUTDOWN', reason)
+
+print('EVENTS#SHUTDOWN', mod_wsgi.event_callbacks)
mod_wsgi.subscribe_events(event_handler)
|
consistent layout indicator | @@ -1085,9 +1085,9 @@ drawbar(Monitor *m)
x += w;
}
- w = blw = TEXTW(m->ltsymbol);
+ w = blw = 60;
drw_setscheme(drw, scheme[SchemeNorm]);
- x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0, 0);
+ x = drw_text(drw, x, 0, w, bh, (w - TEXTW(m->ltsymbol)) * 0.5 + 10, m->ltsymbol, 0, 0);
if ((w = m->ww - sw - x - stw) > bh) {
if (n > 0) {
|
only pass CXXFLAGS through in oss-fuzz env | @@ -580,6 +580,6 @@ ELSE ()
ENDIF ()
# Retain CXX_FLAGS for std c++ compatiability across fuzz build/test environments
-IF (NOT BUILD_FUZZER)
+IF (NOT OSS_FUZZ)
SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
-ENDIF (NOT BUILD_FUZZER)
+ENDIF (NOT OSS_FUZZ)
|
remove dead code in rewrite.c | @@ -125,32 +125,6 @@ vnet_rewrite_for_sw_interface (vnet_main_t * vnm,
vec_free (rewrite);
}
-void
-vnet_rewrite_for_tunnel (vnet_main_t * vnm,
- u32 tx_sw_if_index,
- u32 rewrite_node_index,
- u32 post_rewrite_node_index,
- vnet_rewrite_header_t * rw,
- u8 * rewrite_data, u32 rewrite_length)
-{
- ip_adjacency_t *adj = 0;
- /*
- * Installed into vnet_buffer(b)->sw_if_index[VLIB_TX] e.g.
- * by ip4_rewrite_inline. If the post-rewrite node injects into
- * ipX-forward, this will be interpreted as a FIB number.
- */
- rw->sw_if_index = tx_sw_if_index;
- rw->next_index = vlib_node_add_next (vnm->vlib_main, rewrite_node_index,
- post_rewrite_node_index);
- /* we can't know at this point */
- rw->max_l3_packet_bytes = (u16) ~ 0;
-
- ASSERT (rewrite_length < sizeof (adj->rewrite_data));
- /* Leave room for ethernet + VLAN tag */
- vnet_rewrite_set_data_internal (rw, sizeof (adj->rewrite_data),
- rewrite_data, rewrite_length);
-}
-
void
serialize_vnet_rewrite (serialize_main_t * m, va_list * va)
{
|
Remove whitespace checker from CI build | @@ -52,17 +52,13 @@ Android_build:
- cd port/android
- make DYNAMIC=1 TCP=1 IPV4=1 SECURE=1 PKI=1 CLOUD=1 JAVA=1 DEBUG=0
-whitespace_and_doxygen:
+doxygen:
variables:
GIT_SUBMODULE_STRATEGY: none
stage: build
before_script:
- - apt update && apt -y install make autoconf doxygen clang-format
+ - apt update && apt -y install doxygen
script:
- - clang-format --version
- doxygen --version
- - cp tools/_clang-format _clang-format
- - cp tools/whitespace_commit_checker.sh whitespace_commit_checker.sh
- - ./whitespace_commit_checker.sh
- cd tools
- ./build_doc.sh
|
net/wireless: add support for netdev private ioctl | #define SIOCSIWPTAPRIO _WLIOC(0x0039) /* Set PTA priority type */
#define SIOCGIWPTAPRIO _WLIOC(0x003a) /* Get PTA priority type */
+/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */
+
+/* These 32 ioctl are wireless device private, for 16 commands.
+ * Each driver is free to use them for whatever purpose it chooses,
+ * however the driver *must* export the description of those ioctls
+ * with SIOCGIWPRIV and *must* use arguments as defined below.
+ */
+
+#define SIOCIWFIRSTPRIV _WLIOC(0x00e0)
+#define SIOCIWLASTPRIV _WLIOC(0x00ff)
+
+/* ------------------------- IOCTL STUFF ------------------------- */
+
+/* The first and the last (range) */
+
+#define SIOCIWFIRST _WLIOC(0x0000) /* First network command */
+#define SIOCIWLAST SIOCIWLASTPRIV /* 0x8bff */
+
+#define IW_IOCTL_IDX(cmd) ((cmd) - SIOCIWFIRST)
+
+/* Odd : get (world access), even : set (root access) */
+
+#define IW_IS_SET(cmd) (!((cmd) & 0x1))
+#define IW_IS_GET(cmd) ((cmd) & 0x1)
+
#define WL_IS80211POINTERCMD(cmd) ((cmd) == SIOCGIWSCAN || \
(cmd) == SIOCSIWSCAN || \
(cmd) == SIOCSIWCOUNTRY || \
(cmd) == SIOCGIWESSID || \
(cmd) == SIOCSIWESSID)
-/* Device-specific network IOCTL commands *******************************************/
-
-#define WL_NETFIRST 0x0000 /* First network command */
-#define WL_NNETCMDS 0x003b /* Number of network commands */
-
/* ------------------------------ WIRELESS EVENTS --------------------------------- */
/* Those are *NOT* ioctls, do not issue request on them !!! */
|
fix deb/rpm package generation | @@ -134,13 +134,11 @@ cd out
# .tgz package
CMAKE_PACKAGE_TYPE=tgz
-# .deb package
if [ -f /usr/bin/dpkg ]; then
+ # .deb package
export CMAKE_PACKAGE_TYPE=deb
-fi
-
+elif [ -f /usr/bin/rpmbuild ]; then
# .rpm package
-if [ -f /usr/bin/rpmbuild ]; then
export CMAKE_PACKAGE_TYPE=rpm
fi
@@ -167,14 +165,12 @@ rm -f *.deb *.rpm
# Build new package
make package
-# Debian / Ubuntu / Raspbian
+# Install newly generated package
if [ -f /usr/bin/dpkg ]; then
- # Install new package
+ # Ubuntu / Debian / Raspbian
[[ -z "$NOROOT" ]] && sudo dpkg -i *.deb || echo "No root: skipping package deployment."
-fi
-
-# RedHat / CentOS
-if [ -f /usr/bin/rpmbuild ]; then
+elif [ -f /usr/bin/rpmbuild ]; then
+ # Redhat / Centos
[[ -z "$NOROOT" ]] && sudo rpm -i --force -v *.rpm || echo "No root: skipping package deployment."
fi
|
vere: mingw: add smoke test to build action | @@ -134,3 +134,6 @@ jobs:
- run: make build/urbit build/urbit-worker
working-directory: ./pkg/urbit
+
+ - run: build/urbit -d -B ../../bin/brass.pill -F zod && curl -f --data '{"source":{"dojo":"+hood/exit"},"sink":{"app":"hood"}}' http://localhost:12321
+ working-directory: ./pkg/urbit
|
esp32/machine_uart: Return None from UART read if no data is available.
This is instead of returning an empty bytes object, and matches how other
ports handle non-blocking UART read behaviour. | @@ -297,7 +297,7 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
int bytes_read = uart_read_bytes(self->uart_num, buf_in, size, time_to_wait);
- if (bytes_read < 0) {
+ if (bytes_read <= 0) {
*errcode = MP_EAGAIN;
return MP_STREAM_ERROR;
}
|
Move Andy to emeritus approver status | @@ -3,7 +3,6 @@ approvers:
- gupta-ak
- achamayou
- anakrish
- - andschwa
- dthaler
- johnkord
- mikbras
@@ -13,7 +12,6 @@ reviewers:
- gupta-ak
- achamayou
- anakrish
- - andschwa
- dthaler
- johnkord
- mikbras
@@ -22,3 +20,4 @@ reviewers:
emeritus_approvers:
- jhand2 # 2020-11-05
- CodeMonkeyLeet #2021-04-05
+ - andschwa #2021-06-01
|
[kernel] add small comments on the update of Interactions within the Newton Loop | @@ -681,6 +681,13 @@ void TimeStepping::newtonSolve(double criterion, unsigned int maxStep)
// --
if(!_isNewtonConverge && _newtonNbIterations < maxStep)
{
+ // if you want to update the interactions within the Newton Loop,
+ // you can uncomment this line
+ // For stability reasons, we keep fix the interactions in the loop
+ // for a good Newton loop, we must have access the Hessian of constraints.
+ // updateInteractions();
+ // initializeNSDSChangelog();
+
updateOutput();
}
_isNewtonConverge = newtonCheckConvergence(criterion);
|
fix(sticky keys): use correct timestamp when clearing sticky key in timer | @@ -234,7 +234,7 @@ void behavior_sticky_key_timer_handler(struct k_work *item) {
if (sticky_key->timer_is_cancelled) {
sticky_key->timer_is_cancelled = false;
} else {
- release_sticky_key_behavior(sticky_key, k_uptime_get());
+ release_sticky_key_behavior(sticky_key, sticky_key->release_at);
clear_sticky_key(sticky_key);
}
}
|
Specify size for helpData array. | @@ -288,14 +288,15 @@ Output buffer to a file as a byte array
static void
bldHlpRenderHelpAutoC(const Storage *const storageRepo, const BldCfg bldCfg, const BldHlp bldHlp)
{
- // Convert pack to bytes
+ // Convert buffer to bytes
+ const Buffer *const buffer = bldHlpRenderHelpAutoCCmp(bldCfg, bldHlp);
+
String *const help = strNewFmt(
"%s"
- "static const unsigned char helpData[] =\n"
+ "static const unsigned char helpData[%zu] =\n"
"{\n",
- strZ(bldHeader("help", "Help Data")));
+ strZ(bldHeader("help", "Help Data")), bufUsed(buffer));
- const Buffer *const buffer = bldHlpRenderHelpAutoCCmp(bldCfg, bldHlp);
bool first = true;
size_t lineSize = 0;
char byteZ[4];
|
hoon: removes "road:new" printf from virtualized crash | =/ res (mule trap)
?- -.res
%& p.res
- %| (mean leaf+"road: new" p.res)
+ %| (mean p.res)
==
::
++ slew :: get axis in vase
|
Calls to neat_freelpaddrs(). | @@ -565,7 +565,7 @@ int nsa_getladdrs(int sockfd, neat_assoc_t id, struct sockaddr** addrs)
/* ###### NEAT nsa_freeladdrs() implementation ########################### */
void nsa_freeladdrs(struct sockaddr* addrs)
{
- free(addrs);
+ neat_freelpaddrs(addrs);
}
@@ -579,7 +579,7 @@ int nsa_getpaddrs(int sockfd, neat_assoc_t id, struct sockaddr** addrs)
/* ###### NEAT nsa_freepaddrs() implementation ########################### */
void nsa_freepaddrs(struct sockaddr* addrs)
{
- free(addrs);
+ neat_freelpaddrs(addrs);
}
|
Improve substitution rules for SYMBOLPREFIX and -SUFFIX addition | @@ -47,12 +47,18 @@ ifndef NO_CBLAS
@echo Generating cblas.h in $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
@cp cblas.h cblas.tmp
ifdef SYMBOLPREFIX
- @sed 's/cblas/$(SYMBOLPREFIX)cblas/g' cblas.tmp > cblas.tmp2
- @sed 's/openblas/$(SYMBOLPREFIX)openblas/g' cblas.tmp2 > cblas.tmp
+ @sed 's/cblas[^( ]*/$(SYMBOLPREFIX)&/g' cblas.tmp > cblas.tmp2
+ @sed 's/openblas[^( ]*/$(SYMBOLPREFIX)&/g' cblas.tmp2 > cblas.tmp
+ #change back any openblas_complex_float and double that got hit
+ @sed 's/$(SYMBOLPREFIX)openblas_complex_/openblas_complex_/g' cblas.tmp > cblas.tmp2
+ @sed 's/goto[^( ]*/$(SYMBOLPREFIX)&/g' cblas.tmp2 > cblas.tmp
endif
ifdef SYMBOLSUFFIX
- @sed 's/(OPENBLAS/$(SYMBOLSUFFIX)(OPENBLAS/g' cblas.tmp > cblas.tmp2
- @sed 's/(void)/$(SYMBOLSUFFIX)(void)/g' cblas.tmp2 > cblas.tmp
+ @sed 's/cblas[^( ]*/&$(SYMBOLSUFFIX)/g' cblas.tmp > cblas.tmp2
+ @sed 's/openblas[^( ]*/&$(SYMBOLSUFFIX)/g' cblas.tmp2 > cblas.tmp
+ #change back any openblas_complex_float and double that got hit
+ @sed 's/\(openblas_complex_\)\([^ ]*\)$(SYMBOLSUFFIX)/\1\2 /g' cblas.tmp > cblas.tmp2
+ @sed 's/goto[^( ]*/&$(SYMBOLSUFFIX)/g' cblas.tmp2 > cblas.tmp
endif
@sed 's/common/openblas_config/g' cblas.tmp > "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/cblas.h"
endif
|
get n'sync quicker | @@ -2478,7 +2478,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
}
}
- if(pindex->GetBlockTime() > GetTime() - 30*nCoinbaseMaturity && (pindex->nHeight < pindexBest->nHeight+20) && !IsInitialBlockDownload() && FortunastakePayments == true)
+ if(pindex->GetBlockTime() > GetTime() - 30*nCoinbaseMaturity && (pindex->nHeight < pindexBest->nHeight+5) && !IsInitialBlockDownload() && FortunastakePayments == true)
{
LOCK2(cs_main, mempool.cs);
|
python: don't init pluginprocess if config invalid | @@ -208,20 +208,20 @@ int PYTHON_PLUGIN_FUNCTION (Open) (ckdb::Plugin * handle, ckdb::Key * errorKey)
ElektraPluginProcess * pp = static_cast<ElektraPluginProcess *> (elektraPluginGetData (handle));
if (pp == nullptr)
{
- pp = elektraPluginProcessInit (errorKey);
- if (pp == nullptr) return ELEKTRA_PLUGIN_STATUS_ERROR;
moduleData * md = createModuleData (handle);
if (!md)
{
if (ksLookupByName (elektraPluginGetConfig (handle), "/module", 0) != nullptr)
{
- elektraPluginProcessClose (pp, errorKey);
return ELEKTRA_PLUGIN_STATUS_SUCCESS; // by convention: success if /module exists
}
ELEKTRA_SET_ERROR (111, errorKey, "No python script set, please pass a filename via /script");
return ELEKTRA_PLUGIN_STATUS_ERROR;
}
+
+ if ((pp = elektraPluginProcessInit (errorKey)) == nullptr) return ELEKTRA_PLUGIN_STATUS_ERROR;
+
elektraPluginProcessSetData (pp, md);
elektraPluginSetData (handle, pp);
if (!elektraPluginProcessIsParent (pp)) elektraPluginProcessStart (handle, pp);
|
docs/kernel-versions: add reference to powerpc64 constant blinding support
... introduced in v4.9 | @@ -15,6 +15,7 @@ ARM64 | 3.18 | [e54bcde3d69d](https://git.kernel.org/cgit/linux/kernel/git/torva
s390 | 4.1 | [054623105728](https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=054623105728b06852f077299e2bf1bf3d5f2b0b)
Constant blinding for JIT machines | 4.7 | [4f3446bb809f](https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=4f3446bb809f20ad56cadf712e6006815ae7a8f9)
PowerPC64 | 4.8 | [156d0e290e96](https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=156d0e290e969caba25f1851c52417c14d141b24)
+Constant blinding - PowerPC64 | 4.9 | [b7b7013cac55](https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=b7b7013cac55d794940bd9cb7b7c55c9dececac4)
## Main features
|
Added MultitrackStudio and QTractor to readme
Figured it's best to keep this up to date for when devs check the repo. | @@ -115,6 +115,8 @@ and use to get a basic plugin experience:
## Hosts
- [Bitwig](https://bitwig.com), you need at least _Bitwig Studio 4.3 Beta 5_
+- [Multitrackstudio](https://www.multitrackstudio.com/), you need at least _Multitrack Studio 10.4.1_
+- [QTractor](https://www.qtractor.org)
## Examples
|
Update Dockerfile
We actually need to run sgdk/bin/create-bin-wrappers.sh after cleaning it and making it executable. | @@ -25,6 +25,8 @@ ENV SGDK_DOCKER=y
RUN sed -i 's/\r$//' sgdk/bin/create-bin-wrappers.sh && \
chmod +x sgdk/bin/create-bin-wrappers.sh
+RUN sgdk/bin/create-bin-wrappers.sh
+
# Set-up mount point and make command
VOLUME /src
WORKDIR /src
|
Fix error handling in replacement pthread_barrier_init().
Commit incorrectly used an errno-style interface when supplying
missing pthread functionality (i.e. on macOS), but it should check for
and return error numbers directly. | int
pthread_barrier_init(pthread_barrier_t *barrier, const void *attr, int count)
{
+ int error;
+
barrier->sense = false;
barrier->count = count;
barrier->arrived = 0;
- if (pthread_cond_init(&barrier->cond, NULL) < 0)
- return -1;
- if (pthread_mutex_init(&barrier->mutex, NULL) < 0)
+ if ((error = pthread_cond_init(&barrier->cond, NULL)) != 0)
+ return error;
+ if ((error = pthread_mutex_init(&barrier->mutex, NULL)) != 0)
{
- int save_errno = errno;
-
pthread_cond_destroy(&barrier->cond);
- errno = save_errno;
-
- return -1;
+ return error;
}
return 0;
|
test: add platone test case test_002InitWallet_0003SetChainIdSuccess
fix the issue aitos-io#1176
teambition task id: | @@ -623,6 +623,26 @@ START_TEST(test_002InitWallet_0002SetEIP155CompFailureNullParam)
}
END_TEST
+START_TEST(test_002InitWallet_0003SetChainIdSuccess)
+{
+ BSINT32 rtnVal;
+ BoatPlatoneWallet *wallet_ptr = BoatMalloc(sizeof(BoatPlatoneWallet));
+ BoatPlatoneWalletConfig wallet = get_platone_wallet_settings();
+
+ ck_assert_ptr_ne(wallet_ptr, NULL);
+
+ /* 1. execute unit test */
+ rtnVal = BoatPlatoneWalletSetChainId(wallet_ptr, wallet.chain_id);
+ /* 2. verify test result */
+ /* 2-1. verify the return value */
+ ck_assert_int_eq(rtnVal, BOAT_SUCCESS);
+
+ /* 2-2. verify the global variables that be affected */
+ ck_assert(wallet_ptr->network_info.chain_id == wallet.chain_id);
+ BoatFree(wallet_ptr);
+}
+END_TEST
+
Suite *make_wallet_suite(void)
{
/* Create Suite */
@@ -655,6 +675,7 @@ Suite *make_wallet_suite(void)
tcase_add_test(tc_wallet_api, test_002InitWallet_0001SetEIP155CompSuccess);
tcase_add_test(tc_wallet_api, test_002InitWallet_0002SetEIP155CompFailureNullParam);
+ tcase_add_test(tc_wallet_api, test_002InitWallet_0003SetChainIdSuccess);
return s_wallet;
}
|
CBLK: Adding better statistics fixing error handling | @@ -886,6 +886,7 @@ static int check_request_timeouts(struct cblk_dev *c, struct timeval *etime,
errno = ETIME;
cblk_set_status(req, CBLK_ERROR);
+ if (req->use_wait_sem)
sem_post(&req->wait_sem);
}
}
@@ -1575,6 +1576,8 @@ static void _done(void)
" block_writes_4k: %ld\n"
" idle_wakeups: %ld\n"
" running: %ld usec\n"
+ " reading: %ld usec\n"
+ " writing: %ld usec\n"
" rbytes_total: %lld %.3f MiB/sec\n"
" wbytes_total: %lld %.3f MiB/sec\n"
" max_read_usecs: %ld usec\n"
@@ -1597,16 +1600,18 @@ static void _done(void)
c->block_writes_4k,
c->idle_wakeups,
(long int)usec,
+ c->avg_read_usecs,
+ c->avg_write_usecs,
c->rbytes_total, usec ? (double)c->rbytes_total / usec : 0.0,
c->wbytes_total, usec ? (double)c->wbytes_total / usec : 0.0,
c->max_read_usecs,
c->max_write_usecs,
- c->block_reads ? c->avg_read_usecs/c->block_reads : 0,
- c->block_writes ? c->avg_write_usecs/c->block_writes : 0,
+ c->hw_block_reads ? c->avg_read_usecs/c->hw_block_reads : 0,
+ c->hw_block_writes ? c->avg_write_usecs/c->hw_block_writes : 0,
c->min_read_usecs,
c->min_write_usecs,
- c->block_reads ? c->avg_hw_read_usecs/c->block_reads : 0,
- c->block_writes ? c->avg_hw_write_usecs/c->block_writes : 0);
+ c->hw_block_reads ? c->avg_hw_read_usecs/c->hw_block_reads : 0,
+ c->hw_block_writes ? c->avg_hw_write_usecs/c->hw_block_writes : 0);
fprintf(stderr, "Cache Info\n"
" entries/ways: %d/%d per block %d KiB\n"
|
Avoid server stacktraces on close
On close, the socket is closed by the client, and the server process is
killed.
This leads to (expected) exceptions, that should not be printed. | package com.genymobile.scrcpy;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
public final class ScrCpyServer {
@@ -20,7 +21,7 @@ public final class ScrCpyServer {
// synchronous
screenEncoder.streamScreen(device, connection.getOutputStream());
} catch (IOException e) {
- Ln.e("Screen streaming interrupted", e);
+ Ln.w("Screen streaming stopped");
}
}
}
@@ -32,7 +33,7 @@ public final class ScrCpyServer {
try {
new EventController(device, connection).control();
} catch (IOException e) {
- Ln.e("Exception from event controller", e);
+ Ln.w("Event controller stopped");
}
}
}).start();
@@ -60,6 +61,13 @@ public final class ScrCpyServer {
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override
public void uncaughtException(Thread t, Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InvocationTargetException) {
+ // WORKAROUND
+ // When we call a method of the framework by reflection, it may throw an InvocationTargetException
+ // (that we wrap into an AssertionError) if this process is being killed.
+ // To avoid the stacktrace on close, do not log these errors.
+ return;
+ }
Ln.e("Exception on thread " + t, e);
}
});
|
tcp_transport/test: Fix wrong use of transport in set-interface | @@ -416,7 +416,7 @@ TEST_CASE("ws_transport: Keep alive test", "[tcp_transport]")
// Bind device interface to loopback
TEST_TRANSPORT_BIND_IFNAME();
- esp_transport_ssl_set_interface_name(ws, &ifr);
+ esp_transport_ssl_set_interface_name(ssl, &ifr);
tcp_transport_keepalive_test(ws, &keep_alive_cfg);
|
ble_monitor; crashes if outputting uart receives any characters.
Add a routine to discard the data instead. | @@ -71,6 +71,12 @@ inc_and_wrap(int i, int max)
return (i + 1) & (max - 1);
}
+static int
+monitor_uart_rx_discard(void *arg, uint8_t ch)
+{
+ return 0;
+}
+
static int
monitor_uart_tx_char(void *arg)
{
@@ -295,7 +301,7 @@ ble_monitor_init(void)
.uc_parity = UART_PARITY_NONE,
.uc_flow_ctl = UART_FLOW_CTL_NONE,
.uc_tx_char = monitor_uart_tx_char,
- .uc_rx_char = NULL,
+ .uc_rx_char = monitor_uart_rx_discard,
.uc_cb_arg = NULL,
};
|
Check first if the board is already remounted by checking mode change and remount count
Removed old bootloader check, mbedls will do all remount check | @@ -522,21 +522,35 @@ class DaplinkBoard(object):
if data_crc != details_crc:
test_info.failure("Bootloader CRC is wrong")
- def wait_for_remount(self, parent_test, wait_time=1800):
+ def wait_for_remount(self, parent_test, wait_time=600):
mode = self._mode
count = self._remount_count
test_info = parent_test.create_subtest('wait_for_remount')
+
elapsed = 0
start = time.time()
+ remounted = False
while os.path.isdir(self.mount_point):
+ if self.update_board_info(False): #check info if it is already mounted
+ if mode is not None and self._mode is not None and mode is not self._mode:
+ remounted = True
+ test_info.info("already remounted with change mode")
+ break
+ elif count is not None and self._remount_count is not None and count != self._remount_count:
+ remounted = True
+ test_info.info("already remounted with change mount count")
+ break
if elapsed > wait_time:
raise Exception("Dismount timed out")
time.sleep(0.1)
- elapsed += 0.1
+ elapsed += 0.2
+ else:
stop = time.time()
test_info.info("unmount took %s s" % (stop - start))
+ elapsed = 0
start = time.time()
- while True:
+
+ while not remounted:
if self.update_board_info(False):
if os.path.isdir(self.mount_point):
# Information returned by mbed-ls could be old.
@@ -615,16 +629,8 @@ class DaplinkBoard(object):
mode_str = self.details_txt[DaplinkBoard.KEY_MODE]
self._mode = DETAILS_TO_MODE[mode_str]
else:
- # TODO - remove file check when old bootloader have been
- # updated
- check_bl_path = self.get_file_path('HELP_FAQ.HTM')
- check_if_path = self.get_file_path('MBED.HTM')
- if os.path.isfile(check_bl_path):
- self._mode = self.MODE_BL
- elif os.path.isfile(check_if_path):
- self._mode = self.MODE_IF
- else:
- raise Exception("Could not determine board mode!")
+ #check for race condition here
+ return False
return True
def test_details_txt(self, parent_test):
|
lv_txt enforce pretty wrapping when first word of a line is a long word. | @@ -149,6 +149,9 @@ void lv_txt_get_size(lv_point_t * size_res, const char * text, const lv_font_t *
* 3. Return i=9, pointing at breakchar '\n'
* 4. Parenting lv_txt_get_next_line() would detect subsequent '\0'
*
+ * TODO: Returned word_w_ptr may overestimate the returned word's width when
+ * max_width is reached. In current usage, this has no impact.
+ *
* @param txt a '\0' terminated string
* @param font pointer to a font
* @param letter_space letter space
@@ -232,19 +235,17 @@ static uint16_t lv_txt_get_next_word(const char * txt, const lv_font_t * font,
return i;
}
- if( force ) {
- return break_index;
- }
-
#if LV_TXT_LINE_BREAK_LONG_LEN > 0
/* Word doesn't fit in provided space, but isn't "long" */
if(word_len < LV_TXT_LINE_BREAK_LONG_LEN) {
+ if( force ) return break_index;
if(word_w_ptr != NULL) *word_w_ptr = 0; /* Return no word */
return 0;
}
/* Word is "long," but insufficient amounts can fit in provided space */
if(break_letter_count < LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN) {
+ if( force ) return break_index;
if(word_w_ptr != NULL) *word_w_ptr = 0;
return 0;
}
@@ -262,8 +263,9 @@ static uint16_t lv_txt_get_next_word(const char * txt, const lv_font_t * font,
}
return i;
#else
- (void) break_letter_count;
+ if( force ) return break_index;
if(word_w_ptr != NULL) *word_w_ptr = 0; /* Return no word */
+ (void) break_letter_count;
return 0;
#endif
}
|
gpu: properly expunge render passes and framebuffers; | @@ -2346,8 +2346,10 @@ static void expunge() {
case VK_OBJECT_TYPE_DESCRIPTOR_POOL: vkDestroyDescriptorPool(state.device, victim->handle, NULL); break;
case VK_OBJECT_TYPE_PIPELINE_LAYOUT: vkDestroyPipelineLayout(state.device, victim->handle, NULL); break;
case VK_OBJECT_TYPE_PIPELINE: vkDestroyPipeline(state.device, victim->handle, NULL); break;
+ case VK_OBJECT_TYPE_RENDER_PASS: vkDestroyRenderPass(state.device, victim->handle, NULL); break;
+ case VK_OBJECT_TYPE_FRAMEBUFFER: vkDestroyFramebuffer(state.device, victim->handle, NULL); break;
case VK_OBJECT_TYPE_DEVICE_MEMORY: vkFreeMemory(state.device, victim->handle, NULL); break;
- default: break;
+ default: check(false, "Unreachable"); break;
}
}
}
|
upstream: remove unused conditionals of flushing method | @@ -187,9 +187,6 @@ static struct flb_upstream_conn *get_conn(struct flb_upstream *u)
{
struct flb_upstream_conn *conn;
-#ifdef FLB_HAVE_FLUSH_PTHREADS
- pthread_mutex_lock(&u->mutex_queue);
-#endif
/* Get the first available connection and increase the counter */
conn = mk_list_entry_first(&u->av_queue,
struct flb_upstream_conn, _head);
@@ -199,10 +196,6 @@ static struct flb_upstream_conn *get_conn(struct flb_upstream *u)
mk_list_del(&conn->_head);
mk_list_add(&conn->_head, &u->busy_queue);
-#ifdef FLB_HAVE_FLUSH_PTHREADS
- pthread_mutex_unlock(&u->mutex_queue);
-#endif
-
return conn;
}
|
py/send_message: get & display firmware hashes in the bootloader | @@ -24,6 +24,7 @@ from typing import List, Any, Optional, Callable, Union, Tuple, Sequence
import hashlib
import base64
import binascii
+import textwrap
import requests
import hid
@@ -871,13 +872,25 @@ class SendMessageBootloader:
def _dont_show_fw_hash(self) -> None:
self._device.set_show_firmware_hash(False)
+ def _get_hashes(self) -> None:
+ firmware_hash, sigkeys_hash = self._device.get_hashes()
+ print("Firmware hash:")
+ print("\n".join(textwrap.wrap(firmware_hash.hex(), 16)))
+ if input("Display on device? y/[n]: ") == "y":
+ self._device.get_hashes(display_firmware_hash=True)
+ print("Signature keys hash:")
+ print("\n".join(textwrap.wrap(sigkeys_hash.hex(), 16)))
+ if input("Display on device? y/[n]: ") == "y":
+ self._device.get_hashes(display_signing_keydata_hash=True)
+
def _menu(self) -> None:
choices = (
("Boot", self._boot),
("Print versions", self._get_versions),
("Erase firmware", self._erase),
- ("Show firmware hash", self._show_fw_hash),
- ("Don't show firmware hash", self._dont_show_fw_hash),
+ ("Show firmware hash at startup", self._show_fw_hash),
+ ("Don't show firmware hash at startup", self._dont_show_fw_hash),
+ ("Get firmware & sigkey hashes", self._get_hashes),
)
choice = ask_user(choices)
if isinstance(choice, bool):
|
YAML CPP: Use common macro of logging facility | @@ -12,10 +12,6 @@ if (DEPENDENCY_PHASE)
if (APPLE AND CMAKE_COMPILER_IS_GNUCXX)
string (REPLACE "-Wshadow" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif (APPLE AND CMAKE_COMPILER_IS_GNUCXX)
-
- if (HAVE_LOGGER)
- add_definitions (-DLOGGING_ENABLED)
- endif (HAVE_LOGGER)
endif (NOT YAML-CPP_FOUND)
set (YAML_PLUGIN_INCLUDE_DIRS ${YAML-CPP_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
|
kdb-complete: add bookmark support | @@ -55,9 +55,10 @@ int CompleteCommand::execute (const Cmdline & cl)
const Key originalUnprocessedKey (originalInput, KEY_END);
KDB kdb;
// Determine the actual root key, as for completion purpose originalRoot may not exist
- // If we want to complete an initial namespace, everything done by cl.createKey is unnecessary and will fail
- const Key originalRoot = originalUnprocessedKey.isValid () ? cl.createKey (cl.arguments.size () - 1) : originalUnprocessedKey;
- Key root = originalUnprocessedKey.isValid () ? originalRoot : Key ("/", KEY_END);
+ // If the input is not a valid key, it could still be a bookmark or a namespace
+ const bool isArgumentValidKey = originalUnprocessedKey.isValid () || (!originalInput.empty () && originalInput[0] == '+');
+ const Key originalRoot = isArgumentValidKey ? cl.createKey (cl.arguments.size () - 1) : originalUnprocessedKey;
+ Key root = isArgumentValidKey ? originalRoot : Key ("/", KEY_END);
KeySet ks;
printWarnings (cerr, root);
|
host_exerciser: don't pull in IRQ mode | @@ -245,6 +245,7 @@ public:
he_interrupt_.VectorNum = host_exe_->he_interrupt_;
d_afu->write32(HE_INTERRUPT0, he_interrupt_.value);
ev = d_afu->register_interrupt(host_exe_->he_interrupt_);
+ std::cout << "Using Interrupts\n";
}
// Write to CSR_CTL
@@ -261,15 +262,6 @@ public:
if (he_lpbk_cfg_.IntrTestMode == 1) {
try {
d_afu->interrupt_wait(ev, 10000);
- while (0 == ((*status_ptr) & 0x1)) {
- usleep(HELPBK_TEST_SLEEP_INVL);
- if (--timeout == 0) {
- std::cout << "DSM read timeout" << std::endl;
- host_exerciser_errors();
- return -1;
- }
- }
-
if (he_lpbk_cfg_.TestMode == HOST_EXEMODE_LPBK1)
d_afu->compare(source_, destination_);
}
|
Enhance toString. | @@ -209,8 +209,8 @@ tinyspline::Domain::toString() const
{
std::ostringstream oss;
oss << "Domain{"
- << "min: " << m_min
- << ", max: " << m_max
+ << "min: " << min()
+ << ", max: " << max()
<< "}";
return oss.str();
}
@@ -572,10 +572,10 @@ tinyspline::Frame::toString() const
{
std::ostringstream oss;
oss << "Frame{"
- << "position: " << m_position.toString()
- << ", tangent: " << m_tangent.toString()
- << ", normal: " << m_normal.toString()
- << ", binormal: " << m_binormal.toString()
+ << "position: " << position().toString()
+ << ", tangent: " << tangent().toString()
+ << ", normal: " << normal().toString()
+ << ", binormal: " << binormal().toString()
<< "}";
return oss.str();
}
@@ -1129,13 +1129,13 @@ std::string tinyspline::BSpline::toString() const
{
Domain d = domain();
std::ostringstream oss;
- oss << "BSpline{";
- oss << "dimension: " << dimension();
- oss << ", degree: " << degree();
- oss << ", domain: [" << d.min() << ", " << d.max() << "]";
- oss << ", control points: " << numControlPoints();
- oss << ", knots: " << ts_bspline_num_knots(&spline);
- oss << "}";
+ oss << "BSpline{"
+ << "dimension: " << dimension()
+ << ", degree: " << degree()
+ << ", domain: [" << d.min() << ", " << d.max() << "]"
+ << ", control points: " << numControlPoints()
+ << ", knots: " << ts_bspline_num_knots(&spline)
+ << "}";
return oss.str();
}
@@ -1195,10 +1195,10 @@ tinyspline::Morphism::operator()(real t)
std::string tinyspline::Morphism::toString() const
{
std::ostringstream oss;
- oss << "Morphism{";
- oss << "buffer: " << buffer.toString();
- oss << ", epsilon: " << _epsilon;
- oss << "}";
+ oss << "Morphism{"
+ << "buffer: " << buffer.toString()
+ << ", epsilon: " << epsilon()
+ << "}";
return oss.str();
}
/*! @} */
|
fix crash when introspection_client_auth_bearer_token is not set | @@ -80,7 +80,9 @@ static apr_byte_t oidc_oauth_validate_access_token(request_rec *r, oidc_cfg *c,
apr_table_addn(params, c->oauth.introspection_token_param_name, token);
const char *bearer_access_token_auth =
- strcmp(c->oauth.introspection_client_auth_bearer_token, "") == 0 ?
+ ((c->oauth.introspection_client_auth_bearer_token != NULL)
+ && strcmp(c->oauth.introspection_client_auth_bearer_token,
+ "") == 0) ?
apr_table_get(params, token) :
c->oauth.introspection_client_auth_bearer_token;
|
Bump URF version. | @@ -975,7 +975,7 @@ make_attrs(
rs[32]; // RS (resolution) values
num_values = 0;
- svalues[num_values ++] = "V1.4";
+ svalues[num_values ++] = "V1.5";
svalues[num_values ++] = "W8";
if (data->raster_types & PAPPL_PWG_RASTER_TYPE_SRGB_8)
svalues[num_values ++] = "SRGB24";
|
set deviceID via oc_core_get_device_info | @@ -94,15 +94,14 @@ static int
app_init(void)
{
int ret = oc_init_platform(manufacturer, NULL, NULL);
- oc_device_info_t* d = oc_core_add_new_device("/oic/d", device_rt, device_name, spec_version,
+ ret |= oc_add_device("/oic/d", device_rt, device_name, spec_version,
data_model_version, NULL, NULL);
- if (!d) {
- return 1;
- }
- if (deviceid == NULL) {
- return 0;
+ if (ret || !deviceid) {
+ return ret;
}
- oc_str_to_uuid(deviceid, &d->di);
+
+ oc_device_info_t *info = oc_core_get_device_info(0);
+ oc_str_to_uuid(deviceid, &info->di);
return ret;
}
|
Fix bug when routing table is full | @@ -307,6 +307,8 @@ void RoutingTB_ComputeRoutingTableEntryNB(void)
return;
}
}
+ // Routing table space is full.
+ last_routing_table_entry = MAX_RTB_ENTRY - 1;
}
/******************************************************************************
* @brief manage container name increment to never have same alias
|
Use correct TLS alert code for QUIC_ERROR_CRYPTO_USER_CANCELED | #define QUIC_ERROR_CRYPTO_ERROR(TlsAlertCode) ((QUIC_VAR_INT)(0x100 | (TlsAlertCode)))
#define IS_QUIC_CRYPTO_ERROR(QuicCryptoError) ((QuicCryptoError & 0x100) == 0x100)
-#define QUIC_ERROR_CRYPTO_USER_CANCELED QUIC_ERROR_CRYPTO_ERROR(22) // TLS error code for 'user_canceled'
#define QUIC_ERROR_CRYPTO_HANDSHAKE_FAILURE QUIC_ERROR_CRYPTO_ERROR(40) // TLS error code for 'handshake_failure'
+#define QUIC_ERROR_CRYPTO_USER_CANCELED QUIC_ERROR_CRYPTO_ERROR(90) // TLS error code for 'user_canceled'
#define QUIC_ERROR_CRYPTO_NO_APPLICATION_PROTOCOL QUIC_ERROR_CRYPTO_ERROR(120) // TLS error code for 'no_application_protocol'
#define QUIC_ERROR_VERSION_NEGOTIATION_ERROR 0x53F8
|
sse: fixed incorrect mm_sfence define | @@ -2817,7 +2817,7 @@ simde_mm_sfence (void) {
#endif
}
#if defined(SIMDE_SSE_ENABLE_NATIVE_ALIASES)
-# define _mm_sfence_ps() simde_mm_sfence()
+# define _mm_sfence() simde_mm_sfence()
#endif
#define SIMDE_MM_SHUFFLE(z, y, x, w) (((z) << 6) | ((y) << 4) | ((x) << 2) | (w))
|
change exit code of cli auth test | @@ -11218,7 +11218,7 @@ requires_openssl_tls1_3
run_test "TLS 1.3: Server side check - openssl with client authentication" \
"$P_SRV debug_level=4 auth_mode=required crt_file=data_files/server5.crt key_file=data_files/server5.key force_version=tls13 tickets=0" \
"$O_NEXT_CLI -msg -debug -cert data_files/server5.crt -key data_files/server5.key -tls1_3 -no_middlebox" \
- 0 \
+ 1 \
-s "tls13 server state: MBEDTLS_SSL_CLIENT_HELLO" \
-s "tls13 server state: MBEDTLS_SSL_SERVER_HELLO" \
-s "tls13 server state: MBEDTLS_SSL_ENCRYPTED_EXTENSIONS" \
|
hslua-packaging: break up hslua_udnewindex into smaller functions | @@ -140,19 +140,19 @@ int hslua_udindex(lua_State *L)
}
/*
-** Sets a new value in the userdata caching table via a setter
-** functions.
-**
-** The actual assignment is performed by a setter function stored in the
-** `setter` metafield. Throws an error if no setter function can be
-** found.
+** Set value via a property alias. Assumes the stack to be in a state as
+** after __newindex is called. Returns 1 on success, and 0 otherwise.
*/
-int hslua_udnewindex(lua_State *L)
+int hsluaP_set_via_alias(lua_State *L)
{
- /* try aliases */
- if (luaL_getmetafield(L, 1, "aliases") == LUA_TTABLE) {
+ if (luaL_getmetafield(L, 1, "aliases") != LUA_TTABLE) {
+ return 0;
+ }
lua_pushvalue(L, 2);
- if (lua_rawget(L, -2) == LUA_TTABLE) { /* key is an alias */
+ if (lua_rawget(L, -2) != LUA_TTABLE) { /* key is an alias */
+ lua_pop(L, 2);
+ return 0;
+ }
lua_pushvalue(L, 1); /* start with the original object */
/* Iterate over properties; last object is on top of stack,
* list of properties is the second object. */
@@ -164,21 +164,47 @@ int hslua_udnewindex(lua_State *L)
lua_rawgeti(L, -2, lua_rawlen(L, -2)); /* last element */
lua_pushvalue(L, 3); /* new value */
lua_settable(L, -3);
- return 0;
- }
+ return 1;
}
- if (luaL_getmetafield(L, 1, "setters") == LUA_TTABLE) {
+
+/*
+** Set value via a property alias. Assumes the stack to be in a state as
+** after __newindex is called. Returns 1 on success, 0 if the object is
+** readonly, and throws an error if there is no setter for the given
+** key.
+*/
+int hsluaP_set_via_setter(lua_State *L)
+{
+ if (luaL_getmetafield(L, 1, "setters") != LUA_TTABLE)
+ return 0;
+
lua_pushvalue(L, 2); /* key */
- if (lua_rawget(L, -2) == LUA_TFUNCTION) {
+ if (lua_rawget(L, -2) != LUA_TFUNCTION) {
+ lua_pushliteral(L, "Cannot set unknown property.");
+ return lua_error(L);
+ }
+
lua_insert(L, 1);
lua_settop(L, 4); /* 1: setter, 2: ud, 3: key, 4: value */
lua_call(L, 3, 0);
+ return 1;
+}
+
+/*
+** Sets a new value in the userdata caching table via a setter
+** functions.
+**
+** The actual assignment is performed by a setter function stored in the
+** `setter` metafield. Throws an error if no setter function can be
+** found.
+ */
+int hslua_udnewindex(lua_State *L)
+{
+ if (hsluaP_set_via_alias(L) || hsluaP_set_via_setter(L)) {
return 0;
}
- lua_pushliteral(L, "Cannot set unknown property.");
- } else {
+
lua_pushliteral(L, "Cannot modify read-only object.");
- }
return lua_error(L);
}
|
hw/mcu/dialog: Enable cache retainability | @@ -96,6 +96,9 @@ void SystemInit(void)
g_mcu_pdc_combo_idx = idx;
CRG_TOP->PMU_CTRL_REG |= CRG_TOP_PMU_CTRL_REG_SYS_SLEEP_Msk;
+
+ /* Enable cache retainability */
+ CRG_TOP->PMU_CTRL_REG |= CRG_TOP_PMU_CTRL_REG_RETAIN_CACHE_Msk;
#endif
/* XXX temporarily enable PD_COM and PD_PER since we do not control them */
|
fix the issue for function:UtilityNative2PKCS | @@ -643,6 +643,20 @@ char *Utility_itoa(int num, char *str, int radix);
* return BOAT_ERROR.
*******************************************************************************/
BOAT_RESULT UtilityPKCS2Native(BCHAR *input,KeypairNative *keypair);
+
+/******************************************************************************
+* @brief Convert the key pair in Native format to the key in PKCS certificate format
+*
+* @details
+* Convert a key pair in Native format to a key in PKCS certificate format
+*
+* @param[in] keypair
+* The Native key pair that needs to be converted
+*
+* @return
+* If the conversion is successful, return the key in PKCS format, else
+* return NULL.
+*******************************************************************************/
BCHAR* UtilityNative2PKCS(KeypairNative keypair);
void UtilityFreeKeypair(KeypairNative keypair);
|
move DEV_DLL_PROXY module doc to internal module doc | @@ -1599,7 +1599,7 @@ module DLL: DLL_UNIT {
DLL_PROXY_CMD_MF=$GENERATE_MF && $COPY_CMD $AUTO_INPUT $TARGET
-### @usage: DEV_DLL_PROXY() # deprecated
+### @usage: DEV_DLL_PROXY() # internal
###
### The use of this module is strictly prohibited!!!
### This is a temporary and project-specific solution.
|
[ArgoUI] 0.2.1 | Pod::Spec.new do |s|
s.name = 'ArgoUI'
- s.version = '0.2.0'
+ s.version = '0.2.1'
s.summary = 'A lib of Momo Lua UI.'
# This description is used to generate tags and improve search results.
|
VERSION bump to version 0.8.28 | @@ -28,7 +28,7 @@ set(CMAKE_C_FLAGS_DEBUG "-g -O0")
# set version
set(LIBNETCONF2_MAJOR_VERSION 0)
set(LIBNETCONF2_MINOR_VERSION 8)
-set(LIBNETCONF2_MICRO_VERSION 27)
+set(LIBNETCONF2_MICRO_VERSION 28)
set(LIBNETCONF2_VERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION}.${LIBNETCONF2_MICRO_VERSION})
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION})
|
Update DataViewerCollection.hpp
Undo non-essential changes | @@ -27,7 +27,6 @@ namespace ARIASDK_NS_BEGIN {
virtual bool IsViewerEnabled() const noexcept override;
virtual ~DataViewerCollection() noexcept {};
-
private:
MATSDK_LOG_DECL_COMPONENT_CLASS();
|
Leaf: Split array parents in `set` direction | #include "leaf_delegate.hpp"
using std::accumulate;
+using std::ignore;
using std::make_pair;
using std::pair;
using std::range_error;
@@ -353,9 +354,12 @@ int LeafDelegate::convertToDirectories (CppKeySet & keys)
*/
int LeafDelegate::convertToLeaves (CppKeySet & keys)
{
+ CppKeySet notArrayParents;
CppKeySet directories;
CppKeySet leaves;
- tie (directories, leaves) = splitDirectoriesLeaves (keys);
+
+ tie (ignore, notArrayParents) = splitArrayParentsOther (keys);
+ tie (directories, leaves) = splitDirectoriesLeaves (notArrayParents);
bool status = directories.size () > 0 ? ELEKTRA_PLUGIN_STATUS_SUCCESS : ELEKTRA_PLUGIN_STATUS_NO_UPDATE;
auto directoryLeaves = convertDirectoriesToLeaves (directories);
|
schema compile BUGFIX deviate remove shorthand case
Fixes | @@ -3299,21 +3299,19 @@ lys_compile_node_choice_child(struct lysc_ctx *ctx, struct lysp_node *child_p, s
/* standard case under choice */
ret = lys_compile_node(ctx, child_p, node, 0, child_set);
} else {
- /* we need the implicit case first, so create a fake parsed case */
+ /* we need the implicit case first, so create a fake parsed (shorthand) case */
cs_p = calloc(1, sizeof *cs_p);
cs_p->nodetype = LYS_CASE;
- DUP_STRING_GOTO(ctx->ctx, child_p->name, cs_p->name, ret, free_fake_node);
+ DUP_STRING_GOTO(ctx->ctx, child_p->name, cs_p->name, ret, revert_sh_case);
cs_p->child = child_p;
/* make the child the only case child */
child_p->next = NULL;
/* compile it normally */
- ret = lys_compile_node(ctx, (struct lysp_node *)cs_p, node, 0, child_set);
-
-free_fake_node:
- /* free the fake parsed node and correct pointers back */
+ LY_CHECK_GOTO(ret = lys_compile_node(ctx, (struct lysp_node *)cs_p, node, 0, child_set), revert_sh_case);
+ if (((struct lysc_node_choice *)node)->cases) {
/* get last case node */
compiled_case = (struct lysc_node_case *)((struct lysc_node_choice *)node)->cases->prev;
@@ -3330,7 +3328,10 @@ free_fake_node:
compiled_case->flags &= ~LYS_STATUS_MASK;
compiled_case->flags |= LYS_STATUS_MASK & compiled_case->child->flags;
}
+ } /* else it was removed by a deviation */
+revert_sh_case:
+ /* free the parsed shorthand case and correct pointers back */
cs_p->child = NULL;
lysp_node_free(ctx->ctx, (struct lysp_node *)cs_p);
child_p->next = child_p_next;
|
ASN1: Fix d2i_KeyParams() to advance |pp| like all other d2i functions do | @@ -18,7 +18,6 @@ EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp,
long length)
{
EVP_PKEY *ret = NULL;
- const unsigned char *p = *pp;
if ((a == NULL) || (*a == NULL)) {
if ((ret = EVP_PKEY_new()) == NULL)
@@ -34,7 +33,7 @@ EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp,
goto err;
}
- if (!ret->ameth->param_decode(ret, &p, length))
+ if (!ret->ameth->param_decode(ret, pp, length))
goto err;
if (a != NULL)
|
Ok, I'll stop tinkering with this soon. | @@ -79,8 +79,9 @@ void Log(LogLevel level, const char* fmt, ...);
inline int FoldCase(int c)
{
// This generates branch-free code on GCC, Clang and MSVC
- int adjust = (c >= 'A' && c <= 'Z') ? 0x20 : 0;
- return c | adjust;
+ unsigned int x = (unsigned int) c - 'A';
+ int d = c + 0x20;
+ return (x < 26 ? d : c);
}
// Compute 32-bit DJB-2 hash of a string.
|
sysdeps/managarm: Pass mmap() hint to POSIX | @@ -626,6 +626,7 @@ int sys_vm_map(void *hint, size_t size, int prot, int flags, int fd, off_t offse
managarm::posix::CntRequest<MemoryAllocator> req(getSysdepsAllocator());
req.set_request_type(managarm::posix::CntReqType::VM_MAP);
+ req.set_address_hint(reinterpret_cast<uintptr_t>(hint));
req.set_size(size);
req.set_mode(prot);
req.set_flags(flags);
|
Fix year on recent commit messages. | -25 January 2018: Wouter
+25 January 2019: Wouter
- Fix that tcp for auth zone and outgoing does not remove and
then gets the ssl read again applied to the deleted commpoint.
- updated contrib/fastrpz.patch to cleanly diff.
- remove compile warnings from libnettle compile.
- output of newer lex 2.6.1 and bison 3.0.5.
-24 January 2018: Wouter
+24 January 2019: Wouter
- Newer aclocal and libtoolize used for generating configure scripts,
aclocal 1.16.1 and libtoolize 2.4.6.
- Fix unit test for python 3.7 new keyword 'async'.
declaration shadows a local variable in iterator.c
- Moved includes and make depend.
-23 January 2018: Wouter
+23 January 2019: Wouter
- Patch from Manabu Sonoda with tls-ciphers and tls-ciphersuites
options for unbound.conf.
- Fixes for the patch, and man page entry.
one as the first one.
- Fix for IXFR fallback to reset counter when IXFR does not timeout.
-22 January 2018: Wouter
+22 January 2019: Wouter
- Fix space calculation for tcp req buffer size.
- Doc for stream-wait-size and unit test.
- unbound-control stats has mem.streamwait that counts TCP and TLS
falls back to AXFR after IXFR gives several timeout failures.
- Fix that auth zone after IXFR fallback tries the same master.
-21 January 2018: Wouter
+21 January 2019: Wouter
- Fix tcp idle timeout test, for difference in the tcp reply code.
- Unit test for tcp request reorder and timeouts.
- Unit tests for ssl out of order processing.
memory used by waiting tcp and tls stream replies. This avoids
a denial of service where these replies use up all of the memory.
-17 January 2018: Wouter
+17 January 2019: Wouter
- For caps-for-id fallback, use the whitelist to avoid timeout
starting a fallback sequence for it.
- increase mesh max activation count for capsforid long fetches.
-16 January 2018: Ralph
+16 January 2019: Ralph
- Get ready for the DNS flag day: remove EDNS lame procedure, do not
re-query without EDNS after timeout.
-15 January 2018: Wouter
+15 January 2019: Wouter
- In the out of order processing, reset byte count for (potential)
partial read.
- Review fixes in out of order processing.
-14 January 2018: Wouter
+14 January 2019: Wouter
- streamtcp option -a send queries consecutively and prints answers
as they arrive.
- Fix for out of order processing administration quit cleanup.
- unit test for tcp out of order processing.
-11 January 2018: Wouter
+11 January 2019: Wouter
- Initial commit for out-of-order processing for TCP and TLS.
-9 January 2018: Wouter
+9 January 2019: Wouter
- Log query name for looping module errors.
-8 January 2018: Wouter
+8 January 2019: Wouter
- Fix syntax in comment of local alias processing.
- Fix NSEC3 record that is returned in wildcard replies from
auth-zone zones with NSEC3 and wildcards.
-7 January 2018: Wouter
+7 January 2019: Wouter
- On FreeBSD warn if systcl settings do not allow server TCP FASTOPEN,
and server tcp fastopen is enabled at compile time.
- Document interaction between the tls-upstream option in the server
|
OcConfigurationLib: DisableSingleUser was enabling wrong preference | @@ -149,7 +149,7 @@ OC_SCHEMA
mBooterQuirksSchema[] = {
OC_SCHEMA_BOOLEAN_IN ("AvoidRuntimeDefrag", OC_GLOBAL_CONFIG, Booter.Quirks.AvoidRuntimeDefrag),
OC_SCHEMA_BOOLEAN_IN ("DevirtualiseMmio", OC_GLOBAL_CONFIG, Booter.Quirks.DevirtualiseMmio),
- OC_SCHEMA_BOOLEAN_IN ("DisableSingleUser", OC_GLOBAL_CONFIG, Booter.Quirks.DisableVariableWrite),
+ OC_SCHEMA_BOOLEAN_IN ("DisableSingleUser", OC_GLOBAL_CONFIG, Booter.Quirks.DisableSingleUser),
OC_SCHEMA_BOOLEAN_IN ("DisableVariableWrite", OC_GLOBAL_CONFIG, Booter.Quirks.DisableVariableWrite),
OC_SCHEMA_BOOLEAN_IN ("DiscardHibernateMap", OC_GLOBAL_CONFIG, Booter.Quirks.DiscardHibernateMap),
OC_SCHEMA_BOOLEAN_IN ("EnableSafeModeSlide", OC_GLOBAL_CONFIG, Booter.Quirks.EnableSafeModeSlide),
|
Use relative links for docs
Also fix imgtool script link | @@ -41,12 +41,12 @@ https://runtimeco.atlassian.net/wiki/discover/all-updates
For more information in the source, here are some pointers:
-- [boot/bootutil](https://github.com/runtimeco/mcuboot/tree/master/boot/bootutil): The core of the bootloader itself.
-- [boot/boot\_serial](https://github.com/runtimeco/mcuboot/tree/master/boot/boot_serial): Support for serial upgrade within the bootloader itself.
-- [boot/zephyr](https://github.com/runtimeco/mcuboot/tree/master/boot/zephyr): Port of the bootloader to Zephyr
-- [boot/mynewt](https://github.com/runtimeco/mcuboot/tree/master/boot/mynewt): Mynewt bootloader app
-- [imgtool](https://github.com/runtimeco/mcuboot/tree/master/imgtool): A tool to securely sign firmware images for booting by mcuboot.
-- [sim](https://github.com/runtimeco/mcuboot/tree/master/sim): A bootloader simulator for testing and regression
+- [boot/bootutil](boot/bootutil): The core of the bootloader itself.
+- [boot/boot\_serial](boot/boot_serial): Support for serial upgrade within the bootloader itself.
+- [boot/zephyr](boot/zephyr): Port of the bootloader to Zephyr
+- [boot/mynewt](boot/mynewt): Mynewt bootloader app
+- [imgtool](scripts/imgtool.py): A tool to securely sign firmware images for booting by mcuboot.
+- [sim](sim): A bootloader simulator for testing and regression
## Joining
|
subprocess: better logic for timeouts with -T | @@ -380,16 +380,17 @@ void subproc_checkTimeLimit(honggfuzz_t * hfuzz, fuzzer_t * fuzzer)
int64_t curMillis = util_timeNowMillis();
int64_t diffMillis = curMillis - fuzzer->timeStartedMillis;
- if (diffMillis > (hfuzz->tmOut * 1000)) {
+
+ if (fuzzer->tmOutSignaled && (diffMillis > ((hfuzz->tmOut + 1) * 1000))) {
/* Has this instance been already signaled due to timeout? Just, SIGKILL it */
- if (fuzzer->tmOutSignaled) {
LOG_W("PID %d has already been signaled due to timeout. Killing it with SIGKILL",
fuzzer->pid);
kill(fuzzer->pid, SIGKILL);
return;
}
- fuzzer->tmOutSignaled = true;
+ if ((diffMillis > (hfuzz->tmOut * 1000)) && fuzzer->tmOutSignaled == false) {
+ fuzzer->tmOutSignaled = true;
LOG_W("PID %d took too much time (limit %ld s). Killing it with %s", fuzzer->pid,
hfuzz->tmOut, hfuzz->tmout_vtalrm ? "SIGVTALRM" : "SIGKILL");
if (hfuzz->tmout_vtalrm) {
|
Add branch coverage to genhtml. | @@ -50,6 +50,7 @@ if(TINYSPLINE_COVERAGE_AVAILABLE)
--extract ${TINYSPLINE_COVERAGE_INFO_FILE} '*tinyspline.c'
--output-file ${TINYSPLINE_COVERAGE_INFO_FILE}
COMMAND ${TINYSPLINE_GENHTML}
+ --rc genhtml_branch_coverage=1
-o ${TINYSPLINE_COVERAGE_OUTPUT_DIRECTORY}/c
${TINYSPLINE_COVERAGE_INFO_FILE}
COMMAND ${CMAKE_COMMAND}
|
pbio/trajectory: Fix assert for ramp intersection.
There is no objection to the angles being equal.
They'll just "intersect" precisely at that value. | @@ -230,9 +230,18 @@ static int32_t bind_w0(int32_t w_end, int32_t a, int32_t th) {
static int32_t intersect_ramp(int32_t th3, int32_t th0, int32_t a0, int32_t a2) {
assert_accel_angle(th3 - th0);
+
+ // If angles are equal, that's where they intersect.
+ // This avoids the acceleration ratio division, which
+ // is needed when a2 == a0, which is allowed in this
+ // scenario. This happens when the movement consists
+ // of just deceleration the whole way.
+ if (th3 == th0) {
+ return th0;
+ }
+
assert_accel(a0);
assert_accel(a2);
- assert(th3 != th0);
assert(a0 != a2);
if (pbio_math_abs(th3 - th0) > INT32_MAX / pbio_math_abs(a2)) {
|
OcAppleKernelLib: Remove faulty padslot relocation sanity check. | @@ -481,10 +481,10 @@ InternalCalculateTargetsIntel64 (
// MetaClass structure to find classes for patching, so an unpatched
// vtable means that there is an OSObject-dervied class that is missing
// its OSDeclare/OSDefine macros.
+ // - FIXME: This cannot currently be checked with the means of this
+ // library. KXLD creates copies of patched VTable symbols, marks
+ // the originals patched and then updates the referencing reloc.
//
- if (MachoSymbolNameIsPadslot (Name)) {
- return FALSE;
- }
if ((Vtable != NULL) && MachoSymbolNameIsVtable64 (Name)) {
*Vtable = InternalGetOcVtableByName (Context, Kext, Name, 0);
|
Separate ARM_PATH from UV4 variable | :: See the License for the specific language governing permissions and
:: limitations under the License.
::
-
+setlocal enabledelayedexpansion
@rem Script assumes working directory is workspace root. Force it.
cd %~dp0..\
@rem See if we can find uVision. This logic is consistent with progen
@if [%UV4%]==[] (
@echo UV4 variable is not set, trying to autodetect..
- @set ARM_PATH=C:\KEIL_V5\ARM\ARMCC
if EXIST c:\keil\uv4\uv4.exe (
set UV4=c:\keil\uv4\uv4.exe
- set ARM_PATH=C:\KEIL_V4\ARM\ARMCC
) else if EXIST c:\keil_v5\uv4\uv4.exe (
set UV4=c:\keil_v5\uv4\uv4.exe
- set ARM_PATH=C:\KEIL_V5\ARM\ARMCC
) else goto error_nomdk
)
-@echo USING UV4=%UV4% and ARM_PATH=%ARM_PATH%
+@echo USING UV4=%UV4%
@set project_tool=%1
@set env_folder=%2
@@ -62,11 +59,22 @@ if not [%requirements_file%]==[] pip install -r %requirements_file%
@if %project_tool%==mbedcli (
@REM setup mbed dependencies
echo Building for mbed cli
+
+ @if [%ARM_PATH%]==[] (
+ @echo ARM_PATH variable is not set, trying to autodetect..
+ if EXIST C:\KEIL_V4\ARM\ARMCC\ (
+ set ARM_PATH=C:\KEIL_V4\ARM\ARMCC
+ ) else if EXIST C:\KEIL_V5\ARM\ARMCC\ (
+ set ARM_PATH=C:\KEIL_V5\ARM\ARMCC
+ ) else goto error_armpath
+ )
+ @echo USING ARM_PATH=!ARM_PATH!
+
@REM uncomment these next two lines when the update to mbed-os merge the test dependency
@REM mbed deploy
@REM mbed update
mbed config root .
- mbed config ARM_PATH=%ARM_PATH%
+ mbed config ARM_PATH=!ARM_PATH!
python tools/mbedcli_compile.py --clean --release
@if %errorlevel% neq 0 exit /B %errorlevel%
python tools/copy_release_files.py --project-tool mbedcli
@@ -93,3 +101,8 @@ if not [%requirements_file%]==[] pip install -r %requirements_file%
@echo non-default location, you need to set environment variable UV4 to
@echo the path of the executable
@exit /B 1
+
+:error_armpath
+@echo Error: Need to set environment variable ARM_PATH to
+@echo the path of ARM compiler
+@exit /B 1
|
shouldn't have tools/B | # Technology used is ASAP7
vlsi.core.technology: asap7
vlsi.core.node: 7
-# Specify dir with ASAP7 tarball
-technology.asap7.tarball_dir: "/tools/B/asap7"
-# Specify extracted dir here if not using tarball
-technology.asap7.install_dir: "/tools/B/asap7"
+technology.asap7.tarball_dir: "SPECIFY DIR WITH ASAP7 TARBALL"
+technology.asap7.install_dir: "SPECIFY EXTRACTED DIR HERE IF NOT USING TARBALL"
vlsi.core.max_threads: 12
|
test-suite: fix configure summary alignment for extrae | @@ -58,8 +58,8 @@ echo
echo '-------------------------------------------------- SUMMARY --------------------------------------------------'
echo
echo Package version............... : $PACKAGE-$VERSION
-echo OHPC compiler toolchain........ : $LMOD_FAMILY_COMPILER
-echo OHPC MPI toolchain............. : $LMOD_FAMILY_MPI
+echo OHPC compiler toolchain....... : $LMOD_FAMILY_COMPILER
+echo OHPC MPI toolchain............ : $LMOD_FAMILY_MPI
echo
echo C compiler.................... : `which $CC`
echo Fortran compiler ............. : `which $FC`
|
fix: ci unsage repo zemu | @@ -45,7 +45,9 @@ jobs:
- uses: actions/checkout@v2
- name: Build testing binaries
- run: cd tests/zemu/ && ./build_local_test_elfs.sh
+ run: |
+ git config --global --add safe.directory "$GITHUB_WORKSPACE"
+ cd tests/zemu/ && ./build_local_test_elfs.sh
- name: Upload app binaries
uses: actions/upload-artifact@v2
|
lwip - Prevent rollover during time calculation.
Use a 64-bit integer to prevent rollover of the intermediate result. | @@ -101,13 +101,10 @@ sys_mutex_unlock(sys_mutex_t *mutex)
static inline uint32_t
sys_now(void)
{
- uint32_t t;
+ uint64_t t;
- /*
- * XXX not right when g_os_time rolls over
- */
- t = os_time_get() * 1000 / OS_TICKS_PER_SEC;
- return t;
+ t = os_time_get();
+ return t * 1000 / OS_TICKS_PER_SEC;
}
static inline err_t
|
VERSION bump o version 2.0.241 | @@ -61,7 +61,7 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
# set version of the project
set(LIBYANG_MAJOR_VERSION 2)
set(LIBYANG_MINOR_VERSION 0)
-set(LIBYANG_MICRO_VERSION 240)
+set(LIBYANG_MICRO_VERSION 241)
set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
# set version of the library
set(LIBYANG_MAJOR_SOVERSION 2)
|
serial-libs/plasma: shift openmp linking | @@ -72,12 +72,12 @@ export SHARED_OPT=-shared
%if %{compiler_family} == gnu8
export PIC_OPT=-fPIC
-export SONAME_OPT="-fopenmp -Wl,-soname"
+export SONAME_OPT="-Wl,-soname"
%endif
%if %{compiler_family} == intel
export PIC_OPT=-fpic
-export SONAME_OPT="-qopenmp -Xlinker -soname"
+export SONAME_OPT="-Xlinker -soname"
%endif
plasma-installer_%{version}/setup.py \
@@ -87,15 +87,15 @@ plasma-installer_%{version}/setup.py \
%if %{compiler_family} == gnu8
--cflags="${RPM_OPT_FLAGS} -fopenmp ${PIC_OPT} -I${OPENBLAS_INC}" \
--fflags="${RPM_OPT_FLAGS} -fopenmp ${PIC_OPT} -I${OPENBLAS_INC}" \
- --blaslib="-L${OPENBLAS_LIB} -lopenblas" \
- --cblaslib="-L${OPENBLAS_LIB} -lopenblas" \
+ --blaslib="-fopenmp -L${OPENBLAS_LIB} -lopenblas" \
+ --cblaslib="-fopenmp -L${OPENBLAS_LIB} -lopenblas" \
%endif
%if %{compiler_family} == intel
--cflags="${RPM_OPT_FLAGS} -qopenmp ${PIC_OPT}" \
--fflags="${RPM_OPT_FLAGS} -qopenmp ${PIC_OPT}" \
--blaslib="-L/intel/mkl/lib/em64t -lmkl_intel_lp64 -lmkl_sequential -lmkl_core" \
- --cblaslib="-L/intel/mkl/lib/em64t -lmkl_intel_lp64 -lmkl_sequential -lmkl_core" \
- --lapacklib="-L/intel/mkl/lib/em64t -lmkl_intel_lp64 -lmkl_sequential -lmkl_core" \
+ --cblaslib="-qopenmp -L/intel/mkl/lib/em64t -lmkl_intel_lp64 -lmkl_sequential -lmkl_core" \
+ --lapacklib="-qopenmp -L/intel/mkl/lib/em64t -lmkl_intel_lp64 -lmkl_sequential -lmkl_core" \
%endif
--downlapc
|
Use vector overprocess without loop tail | @@ -906,19 +906,12 @@ void compute_ideal_weights_for_decimation(
}
// Populate the interpolated weight grid based on the initital average
- // Process SIMD-width texel coordinates at at time while we can
- unsigned int is = 0;
- unsigned int clipped_texel_count = round_down_to_simd_multiple_vla(texel_count);
- for (/* */; is < clipped_texel_count; is += ASTCENC_SIMD_WIDTH)
- {
- vfloat weight = bilinear_infill_vla(di, dec_weight_ideal_value, is);
- storea(weight, infilled_weights + is);
- }
-
- // Loop tail
- for (/* */; is < texel_count; is++)
+ // Process SIMD-width texel coordinates at at time while we can. Safe to
+ // over-process full SIMD vectors - the tail is zeroed.
+ for (unsigned int i = 0; i < texel_count; i += ASTCENC_SIMD_WIDTH)
{
- infilled_weights[is] = bilinear_infill(di, dec_weight_ideal_value, is);
+ vfloat weight = bilinear_infill_vla(di, dec_weight_ideal_value, i);
+ storea(weight, infilled_weights + i);
}
// Perform a single iteration of refinement
|
feat(venachain):adapt third-party Makefile for venachain | all:
-# If BOAT_PROTOCOL_USE_ETHEREUM, BOAT_PROTOCOL_USE_PLATONE, BOAT_PROTOCOL_USE_PLATONE, BOAT_PROTOCOL_USE_FISCOBCOS has one setted to 1,
+# If BOAT_PROTOCOL_USE_ETHEREUM, BOAT_PROTOCOL_USE_PLATONE, BOAT_PROTOCOL_USE_PLATONE, BOAT_PROTOCOL_USE_FISCOBCOS BOAT_PROTOCOL_USE_VENACHAIN has one setted to 1,
# then build cJSON
-ifeq ($(findstring $(BOAT_PROTOCOL_USE_ETHEREUM)$(BOAT_PROTOCOL_USE_PLATON)$(BOAT_PROTOCOL_USE_PLATONE)$(BOAT_PROTOCOL_USE_FISCOBCOS), 0000),)
+ifeq ($(findstring $(BOAT_PROTOCOL_USE_ETHEREUM)$(BOAT_PROTOCOL_USE_PLATON)$(BOAT_PROTOCOL_USE_PLATONE)$(BOAT_PROTOCOL_USE_FISCOBCOS)$(BOAT_PROTOCOL_USE_VENACHAIN), 00000),)
ifeq ($(CJSON_LIBRARY),CJSON_DEFAULT)
make -C cJSON all
endif
|
Fix truncated assembler checks | @@ -15,7 +15,7 @@ ifeq ($(HOSTARCH), amd64)
HOSTARCH=x86_64
endif
-HAVE_GAS := $(shell as -v < /dev/null 2>&1 | grep GNU 2>&1 >/dev/null)
+HAVE_GAS := $(shell as -v < /dev/null 2>&1 | grep GNU 2>&1 >/dev/null ; echo $$?)
# Catch conflicting usage of ARCH in some BSD environments
ifeq ($(ARCH), amd64)
|
Add hat for mithon | <head>
<meta charset="utf-8">
<title>Mixly micro:bit</title>
- <script type="text/javascript" src="../../blockly_compressed_py.js"></script>
+ <script type="text/javascript" src="../../blockly_compressed_mithon.js"></script>
<script type="text/javascript" src="../../python_compressed.js"></script>
<script type="text/javascript" src="../../core/microbit_python/variables.js"></script>
<script type="text/javascript" src="../../core/procedures.js"></script>
|
build UPDATE libcrypt does not exist on MacOS
Refs | @@ -251,12 +251,12 @@ if(ENABLE_SSH)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNC_ENABLED_SSH")
# crypt
- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX")
- target_link_libraries(netconf2 -lcrypt)
- list(APPEND CMAKE_REQUIRED_LIBRARIES crypt)
- else()
+ if(${CMAKE_SYSTEM_NAME} MATCHES "QNX")
target_link_libraries(netconf2 -llogin)
list(APPEND CMAKE_REQUIRED_LIBRARIES login)
+ elseif(NOT APPLE)
+ target_link_libraries(netconf2 -lcrypt)
+ list(APPEND CMAKE_REQUIRED_LIBRARIES crypt)
endif()
# libpam
|
Allow using parent project's hdr_histogram_static target
Tested-by: Build Bot | @@ -111,13 +111,20 @@ IF(LCB_USE_PROFILER)
INCLUDE(cmake/Modules/FindProfiler.cmake)
ENDIF()
IF(LCB_USE_HDR_HISTOGRAM)
+ # Allow for building libcouchbase inside a larger CMake project that
+ # already includes HdrHistogram_c
+ IF (NOT TARGET hdr_histogram_static)
ADD_SUBDIRECTORY(contrib/HdrHistogram_c)
+ ENDIF ()
+
+ # Use #include files from wherever the hdr_histogram project was loaded
+ INCLUDE_DIRECTORIES(BEFORE SYSTEM "${hdr_histogram_SOURCE_DIR}/src")
+
# Given we are linking hdr_histogram_static into libcouchbase.so, need
# -fPIC set also on hdr_histogram_static.
SET_TARGET_PROPERTIES(hdr_histogram_static
PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
- INCLUDE_DIRECTORIES(contrib/HdrHistogram_c/src)
SET(LCB_HDR_HISTOGRAM_LINK hdr_histogram_static)
LIST(APPEND LCB_CORE_SRC "src/hdr_timings.c")
ELSE()
|
Disable random tests temporarily | */
import "random.du";
-import "select.du";
-import "range.du";
\ No newline at end of file
+// TODO: Look into these, seems the error percentage is off slightly
+// import "select.du";
+// import "range.du";
\ No newline at end of file
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.