message
stringlengths
6
474
diff
stringlengths
8
5.22k
doc: add a few more API calls
@@ -40,6 +40,14 @@ Remove: - keyCurrentMeta - keyCompare - keyCompareMeta +- keyCopyAllMeta +- keyCopyMeta +- keyGetBaseName; +- keyGetBaseNameSize; +- keyGetBinary; +- keyGetMeta; +- keyGetName; +- keyGetNameSize; Make private:
Move fprintf after assignment to avoid crash. Thanks to David Vernet for reporting this.
@@ -2280,9 +2280,6 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt) /* SSLfatal() already called */ goto err; } -#ifdef SSL_DEBUG - fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md)); -#endif } else if (!tls1_set_peer_legacy_sigalg(s, pkey)) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR); @@ -2294,6 +2291,10 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt) ERR_R_INTERNAL_ERROR); goto err; } +#ifdef SSL_DEBUG + if (SSL_USE_SIGALGS(s)) + fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md)); +#endif if (!PACKET_get_length_prefixed_2(pkt, &signature) || PACKET_remaining(pkt) != 0) {
ResourceImporter. get_filename fix
@@ -160,7 +160,7 @@ class ResourceImporter(object): relpath = _relpath(mod_path(fullname)) if isinstance(relpath, bytes): relpath = utf_8_decode(relpath)[0] - return relpath + return relpath or modname # PEP-302 extension 3 of 3: packaging introspection. # Used by `linecache` (while printing tracebacks) unless module filename
OcPngLib: Print error code on failure
@@ -91,7 +91,7 @@ DecodePng ( Error = lodepng_decode ((unsigned char **) RawData, &W, &H, &State, Buffer, Size); if (Error != 0) { - DEBUG ((DEBUG_INFO, "OCPNG: Error while decoding PNG image\n")); + DEBUG ((DEBUG_INFO, "OCPNG: Error while decoding PNG image - %u\n", Error)); lodepng_state_cleanup (&State); return EFI_INVALID_PARAMETER; }
readme: update bridge URL [ci skip] Points at the Bridge repo's README rather than its releases page.
@@ -10,7 +10,7 @@ A personal server operating function. [azim]: https://etherscan.io/address/0x223c067f8cf28ae173ee5cafea60ca44c335fecb [aens]: https://etherscan.io/address/azimuth.eth -[brid]: https://github.com/urbit/bridge/releases +[brid]: https://github.com/urbit/bridge [arvo]: https://github.com/urbit/urbit/tree/master/pkg/arvo ## Install
In tcp_callback_writer(), don't disable time-out when changing to read.
@@ -1001,7 +1001,7 @@ tcp_callback_writer(struct comm_point* c) tcp_req_info_handle_writedone(c->tcp_req_info); } else { comm_point_stop_listening(c); - comm_point_start_listening(c, -1, -1); + comm_point_start_listening(c, -1, c->tcp_timeout_msec); } }
u3: reallocate hot jet state before gc in meld and cram
@@ -401,13 +401,16 @@ _cu_realloc(FILE* fil_u, ur_root_t** tor_u, ur_nvec_t* doc_u) // _cu_all_to_loom(rot_u, ken, &cod_u); + // allocate new hot jet state + // + u3j_boot(c3y); + // establish correct refcounts via tracing // u3m_grab(u3_none); - // allocate new hot jet state; re-establish warm + // re-establish warm jet state // - u3j_boot(c3y); u3j_ream(); // restore event number
edit diff CHANGE create op cannot be merged into create
@@ -2037,23 +2037,6 @@ sr_diff_merge_create(struct lyd_node *diff_match, enum edit_op cur_op, int cur_o return err_info; } - ret = lyd_change_leaf((struct lyd_node_leaf_list *)diff_match, sr_ly_leaf_value_str(src_node)); - assert(ret < 1); - if (ret < 0) { - sr_errinfo_new_ly(&err_info, lyd_node_module(diff_match)->ctx); - return err_info; - } - diff_match->dflt = src_node->dflt; - break; - case EDIT_CREATE: - assert(diff_match->schema->nodetype == LYS_LEAF); - if (val_equal) { - /* the exact same ndoes were created twice - impossible */ - SR_ERRINFO_INT(&err_info); - return err_info; - } - - /* just update the new value */ ret = lyd_change_leaf((struct lyd_node_leaf_list *)diff_match, sr_ly_leaf_value_str(src_node)); assert(ret < 1); if (ret < 0) { @@ -2063,7 +2046,7 @@ sr_diff_merge_create(struct lyd_node *diff_match, enum edit_op cur_op, int cur_o diff_match->dflt = src_node->dflt; break; default: - /* replace operation is not valid */ + /* create and replace operations are not valid */ SR_ERRINFO_INT(&err_info); return err_info; }
tests: suppress clang7 warning
@@ -986,7 +986,7 @@ TEST (test_contextual_basic, operators) ASSERT_EQ (n, 4 | 8 | 16); n = 8; - n = n; + n = *&n; // *& added to suppress clang warning m = n; ASSERT_EQ (n, 8); ASSERT_EQ (m, 8);
Simplify the code to avoid having to resort to atomic operations (thanks Kazuho for the idea)
@@ -151,7 +151,7 @@ static struct { char *error_log; int max_connections; size_t num_threads; - ssize_t num_quic_threads; + size_t num_quic_threads; int tfo_queues; time_t launch_time; struct { @@ -184,7 +184,7 @@ static struct { NULL, /* error_log */ 1024, /* max_connections */ 0, /* initialized in main() */ - -1, /* num_quic_threads, defaults to all */ + 0, /* num_quic_threads, defaults to all */ 0, /* initialized in main() */ 0, /* initialized in main() */ NULL, /* thread_ids */ @@ -1360,7 +1360,7 @@ static int on_config_num_threads(h2o_configurator_command_t *cmd, h2o_configurat static int on_config_num_quic_threads(h2o_configurator_command_t *cmd, h2o_configurator_context_t *ctx, yoml_t *node) { - if (h2o_configurator_scanf(cmd, node, "%zd", &conf.num_quic_threads) != 0) + if (h2o_configurator_scanf(cmd, node, "%zu", &conf.num_quic_threads) != 0) return -1; return 0; } @@ -1942,7 +1942,7 @@ H2O_NORETURN static void *run_loop(void *_thread_index) listeners[i].sock = h2o_evloop_socket_create(conf.threads[thread_index].ctx.loop, fd, H2O_SOCKET_FLAG_DONT_READ); listeners[i].sock->data = listeners + i; /* setup quic context and the unix socket to receive forwarded packets */ - if ((conf.num_quic_threads == -1 || __sync_fetch_and_sub(&conf.num_quic_threads, 1) > 0) && listener_config->quic.ctx != NULL) { + if ((conf.num_quic_threads == 0 || thread_index < conf.num_quic_threads) && listener_config->quic.ctx != NULL) { h2o_http3_init_context(&listeners[i].http3.ctx.super, conf.threads[thread_index].ctx.loop, listeners[i].sock, listener_config->quic.ctx, h2o_http3_server_accept, NULL); h2o_http3_set_context_identifier(&listeners[i].http3.ctx.super, (uint32_t)conf.num_threads, (uint32_t)thread_index, 0,
added information that hcxdumptool may not work as expected if pysical interface is shared
@@ -9299,7 +9299,7 @@ if((eapreqflag == true) && ((attackstatus &DISABLE_CLIENT_ATTACKS) == DISABLE_CL fprintf(stdout, "initialization of %s %s (this may take some time)...\n", basename(argv[0]), VERSION_TAG); if(phyinterfacename[0] != 0) { - if(isinterfaceshared() == true) fprintf(stderr, "\nwarning: interface %s (%s) is shared\n\n", interfacename, phyinterfacename); + if(isinterfaceshared() == true) fprintf(stderr, "\nwarning: interface %s (%s) is shared\nhcxdumptool may not work as expected on shared physical devices\n\n", interfacename, phyinterfacename); } if(checkdriverflag == true) fprintf(stdout, "starting driver test...\n"); if(globalinit() == false)
Fix threaded abstract cyclic references in marshalling. We forgot to mark threaded abstract types as "seen" when marshalling so we would mistakenly marshal them twice. This messed up unmarshalling.
@@ -384,6 +384,7 @@ static void marshal_one_abstract(MarshalState *st, Janet x, int flags) { janet_abstract_incref(abstract); pushbyte(st, LB_THREADED_ABSTRACT); pushbytes(st, (uint8_t *) &abstract, sizeof(abstract)); + MARK_SEEN(); return; } #endif
Add dist target to Makefile
@@ -113,6 +113,12 @@ ifeq ($(RSA_KEY_LENGTH),8192) CFLAGS += -DTHEMIS_RSA_KEY_LENGTH=RSA_KEY_LENGTH_8192 endif +GIT_VERSION := $(shell if [ -d ".git" ]; then git version; fi 2>/dev/null) +ifdef GIT_VERSION + THEMIS_VERSION = themis-$(shell git describe --tags $(shell git rev-list --tags --max-count=1))-$(shell git log --pretty=format:'%h' -n 1) +else + THEMIS_VERSION = themis-$(shell date -I) +endif PHP_VERSION := $(shell php --version 2>/dev/null) RUBY_GEM_VERSION := $(shell gem --version 2>/dev/null) PIP_VERSION := $(shell pip --version 2>/dev/null) @@ -173,6 +179,7 @@ endif all: err themis_static themis_shared + echo $(THEMIS_VERSION) test_all: err test ifdef PHP_VERSION @@ -322,6 +329,24 @@ install_shared_libs: err all make_install_dirs install: install_soter_headers install_themis_headers install_static_libs install_shared_libs +dist: + mkdir -p $(THEMIS_VERSION) + rsync -avz src $(THEMIS_VERSION) + rsync -avz docs $(THEMIS_VERSION) + rsync -avz gothemis $(THEMIS_VERSION) + rsync -avz gradle $(THEMIS_VERSION) + rsync -avz jni $(THEMIS_VERSION) + rsync -avz --exclude 'tests/soter/nist-sts/assess' tests $(THEMIS_VERSION) + rsync -avz CHANGELOG.md $(THEMIS_VERSION) + rsync -avz LICENSE $(THEMIS_VERSION) + rsync -avz Makefile $(THEMIS_VERSION) + rsync -avz README.md $(THEMIS_VERSION) + rsync -avz build.gradle $(THEMIS_VERSION) + rsync -avz gradlew $(THEMIS_VERSION) + rsync -avz themis.podspec $(THEMIS_VERSION) + tar -zcvf $(THEMIS_VERSION).tar.gz $(THEMIS_VERSION) + rm -rf $(THEMIS_VERSION) + phpthemis_uninstall: CMD = if [ -e src/wrappers/themis/php/Makefile ]; then cd src/wrappers/themis/php && make distclean ; fi; phpthemis_uninstall:
sdl/texture: Add helper function for updating texture with []uint32 instead of []byte
@@ -272,6 +272,17 @@ func (texture *Texture) Update(rect *Rect, pixels []byte, pitch int) error { C.int(pitch)))) } +// UpdateRGBA updates the given texture rectangle with new uint32 pixel data. +// (https://wiki.libsdl.org/SDL_UpdateTexture) +func (texture *Texture) UpdateRGBA(rect *Rect, pixels []uint32, pitch int) error { + return errorFromInt(int( + C.SDL_UpdateTexture( + texture.cptr(), + rect.cptr(), + unsafe.Pointer(&pixels[0]), + C.int(4*pitch)))) // 4 bytes in one uint32 +} + // UpdateYUV updates a rectangle within a planar YV12 or IYUV texture with new pixel data. // (https://wiki.libsdl.org/SDL_UpdateYUVTexture) func (texture *Texture) UpdateYUV(rect *Rect, yPlane []byte, yPitch int, uPlane []byte, uPitch int, vPlane []byte, vPitch int) error {
Remove old comments from lib/svg_attrs.gperf
%define slot-name from StringReplacement; -// "contentscripttype", "contentScriptType" -// "contentstyletype", "contentStyleType" -// "externalresourcesrequired", "externalResourcesRequired" -// "filterres", "filterRes" %% "attributename", "attributeName" "attributetype", "attributeType"
In debug PANIC for relcache decrement for bad reference count.
@@ -1701,7 +1701,15 @@ RelationDecrementReferenceCount(Relation rel) { if (rel->rd_refcnt <= 0) { + /* + * In CI intermittently ERROR is seen. To help debug the issue, just + * for debug builds elevating ERROR to PANIC. + */ +#ifdef USE_ASSERT_CHECKING + elog(PANIC, +#else elog(ERROR, +#endif "Relation decrement reference count found relation %u/%u/%u with bad count (reference count %d)", rel->rd_node.spcNode, rel->rd_node.dbNode,
Fixed code style and removed forgotten pritf's
@@ -415,13 +415,11 @@ set_test_mode(uint8_t enable, uint8_t modulated) was_on = (mode == RADIO_POWER_MODE_ON); off(); prev_FRMCTRL0 = REG(RFCORE_XREG_FRMCTRL0); - // This constantly transmits random data - printf("FRMCTRL0: %08X\n", (unsigned int)prev_FRMCTRL0); + /* This constantly transmits random data */ REG(RFCORE_XREG_FRMCTRL0) = 0x00000042; if(!modulated) { prev_MDMTEST1 = REG(RFCORE_XREG_MDMTEST1); - printf("MDMTEST1: %08X\n", (unsigned int)prev_MDMTEST1); - // ...adding this we send an unmodulated carrier instead + /* ...adding this we send an unmodulated carrier instead */ REG(RFCORE_XREG_MDMTEST1) = 0x00000018; } CC2538_RF_CSP_ISTXON();
test/mpu.c: Format with clang-format BRANCH=none TEST=none
@@ -17,22 +17,18 @@ struct mpu_info { }; #if defined(CHIP_VARIANT_STM32F412) -struct mpu_info mpu_info = { - .has_mpu = true, +struct mpu_info mpu_info = { .has_mpu = true, .num_mpu_regions = 8, - .mpu_is_unified = true -}; + .mpu_is_unified = true }; struct mpu_rw_regions expected_rw_regions = { .num_regions = 2, .addr = { 0x08060000, 0x08080000 }, .size = { 0x20000, 0x80000 } }; #elif defined(CHIP_VARIANT_STM32H7X3) -struct mpu_info mpu_info = { - .has_mpu = true, +struct mpu_info mpu_info = { .has_mpu = true, .num_mpu_regions = 16, - .mpu_is_unified = true -}; + .mpu_is_unified = true }; struct mpu_rw_regions expected_rw_regions = { .num_regions = 1, .addr = { 0x08100000,
cache: abort if dependencies not found
@@ -5,16 +5,19 @@ if (DEPENDENCY_PHASE) plugin_check_if_included ("resolver") if (NOT_INCLUDED) remove_plugin ("cache" "resolver plugin not found (${NOT_INCLUDED})") + return () endif (NOT_INCLUDED) plugin_check_if_included ("mmapstorage") if (NOT_INCLUDED) remove_plugin ("cache" "mmapstorage plugin not found (${NOT_INCLUDED})") + return () endif (NOT_INCLUDED) safe_check_symbol_exists (nftw "ftw.h" HAVE_NFTW) if (NOT HAVE_NFTW) remove_plugin ("cache" "nftw (ftw.h) not found") + return () endif (NOT HAVE_NFTW) if (BUILD_SHARED)
xfconf-plugin: Exclude from rwstorage
@@ -231,7 +231,8 @@ is_not_rw_storage() { -o "x$PLUGIN" = "xmini" \ -o "x$PLUGIN" = "xyamlcpp" \ -o "x$PLUGIN" = "xkconfig" \ - -o "x$PLUGIN" = "xtoml" + -o "x$PLUGIN" = "xtoml" \ + -o "x$PLUGIN" = "xxfconf" } is_plugin_available() {
skip setting the resource limits in debug builds if they are already greater than the maxconns
@@ -10039,12 +10039,18 @@ int main (int argc, char **argv) { fprintf(stderr, "failed to getrlimit number of files\n"); exit(EX_OSERR); } else { +#ifdef MEMCACHED_DEBUG + if (rlim.rlim_cur < settings.maxconns || rlim.rlim_max < settings.maxconns) { +#endif rlim.rlim_cur = settings.maxconns; rlim.rlim_max = settings.maxconns; if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { fprintf(stderr, "failed to set rlimit for open files. Try starting as root or requesting smaller maxconns value.\n"); exit(EX_OSERR); } +#ifdef MEMCACHED_DEBUG + } +#endif } /* lose root privileges if we have them */
messages: fixes mystery hamburger bouncing
@@ -122,10 +122,7 @@ export function ResourceSkeleton(props: ResourceSkeletonProps): ReactElement { ); const ExtraControls = () => { - if (workspace === '/messages') { - const resourceArr = association.resource.split('/'); - const resourceName = resourceArr[resourceArr.length - 1]; - if (!resourceName.startsWith('dm-')) { + if (workspace === '/messages' && !resource.startsWith('dm-')) { return ( <Dropdown flexShrink={0} @@ -152,7 +149,6 @@ export function ResourceSkeleton(props: ResourceSkeletonProps): ReactElement { </Dropdown> ); } - } if (canWrite) { return ( <Link to={resourcePath('/new')}> @@ -173,7 +169,7 @@ export function ResourceSkeleton(props: ResourceSkeletonProps): ReactElement { const actionsRef = useCallback((actionsRef) => { setActionsWidth(actionsRef?.getBoundingClientRect().width); - }, []); + }, [rid]); return ( <Col width='100%' height='100%' overflow='hidden'>
examples/mediaplayer: Set source at PLAYER_START Set datasource when isSourceSet is false and user input PLAYER_START
#include <tinyara/config.h> #include <iostream> +#include <functional> #include <tinyara/init.h> #include <apps/platform/cxxinitialize.h> @@ -65,6 +66,8 @@ private: MediaPlayer mp; uint8_t volume; std::shared_ptr<FocusRequest> mFocusRequest; + std::function<std::unique_ptr<InputDataSource>()> makeSource; + bool isSourceSet; }; bool MyMediaPlayer::init(int test) @@ -73,27 +76,39 @@ bool MyMediaPlayer::init(int test) cout << "Mediaplayer::create failed" << endl; return false; } - unique_ptr<FileInputDataSource> source; + switch (test) { case TEST_MP3: - source = std::move(unique_ptr<FileInputDataSource>(new FileInputDataSource("/rom/over_16000.mp3"))); + makeSource = []() { + auto source = std::move(unique_ptr<FileInputDataSource>(new FileInputDataSource("/rom/over_16000.mp3"))); source->setSampleRate(16000); source->setChannels(2); source->setPcmFormat(AUDIO_FORMAT_TYPE_S16_LE); + return std::move(source); + }; break; case TEST_AAC: - source = std::move(unique_ptr<FileInputDataSource>(new FileInputDataSource("/rom/play.mp4"))); + makeSource = []() { + auto source = std::move(unique_ptr<FileInputDataSource>(new FileInputDataSource("/rom/play.mp4"))); + return std::move(source); + }; break; case TEST_OPUS: - source = std::move(unique_ptr<FileInputDataSource>(new FileInputDataSource("/rom/res_16k.opus"))); + makeSource = []() { + auto source = std::move(unique_ptr<FileInputDataSource>(new FileInputDataSource("/rom/res_16k.opus"))); + return std::move(source); + }; break; default: - source = std::move(unique_ptr<FileInputDataSource>(new FileInputDataSource("/rom/44100.pcm"))); + makeSource = []() { + auto source = std::move(unique_ptr<FileInputDataSource>(new FileInputDataSource("/rom/44100.pcm"))); source->setSampleRate(44100); source->setChannels(2); source->setPcmFormat(AUDIO_FORMAT_TYPE_S16_LE); + return std::move(source); + }; } - mp.setDataSource(std::move(source)); + isSourceSet = false; mp.setObserver(shared_from_this()); mFocusRequest = FocusRequest::Builder().setFocusChangeListener(shared_from_this()).build(); @@ -106,6 +121,10 @@ void MyMediaPlayer::doCommand(int command) switch (command) { case PLAYER_START: cout << "PLAYER_START is selected" << endl; + if (isSourceSet == false) { + mp.setDataSource(makeSource()); + isSourceSet = true; + } focusManager.requestFocus(mFocusRequest); break; case PLAYER_PAUSE: @@ -130,6 +149,7 @@ void MyMediaPlayer::doCommand(int command) if (mp.unprepare() != PLAYER_OK) { cout << "Mediaplayer::unprepare failed" << endl; } + isSourceSet = false; break; case VOLUME_UP: cout << "VOLUME_UP is selected" << endl;
Small fixes in ++crow:enjs and ++atta:dejs
^- json %- pairs :~ loc+(grop loc.a) - rem+(mo rem.a tmp grop) + rem+(mo rem.a (cork circ:en-tape crip) grop) == :: ++ grop ::> group :: ++ atta ::> attache ^- $-(json (unit attache)) + %+ re *attache |. ~+ %- of :~ name+(ot nom+so tac+atta ~) text+(cu to-wain:format so)
chip/host/flash.c: Format with clang-format BRANCH=none TEST=none
@@ -26,8 +26,7 @@ test_mockable int flash_pre_op(void) static int flash_check_protect(int offset, int size) { int first_bank = offset / CONFIG_FLASH_BANK_SIZE; - int last_bank = DIV_ROUND_UP(offset + size, - CONFIG_FLASH_BANK_SIZE); + int last_bank = DIV_ROUND_UP(offset + size, CONFIG_FLASH_BANK_SIZE); int bank; for (bank = first_bank; bank < last_bank; ++bank) @@ -124,8 +123,7 @@ int crec_flash_physical_protect_now(int all) uint32_t crec_flash_physical_get_valid_flags(void) { - return EC_FLASH_PROTECT_RO_AT_BOOT | - EC_FLASH_PROTECT_RO_NOW | + return EC_FLASH_PROTECT_RO_AT_BOOT | EC_FLASH_PROTECT_RO_NOW | EC_FLASH_PROTECT_ALL_NOW; } @@ -163,7 +161,8 @@ int crec_flash_pre_init(void) */ if ((prot_flags & EC_FLASH_PROTECT_RO_AT_BOOT) && !(prot_flags & EC_FLASH_PROTECT_RO_NOW)) { - int rv = crec_flash_set_protect(EC_FLASH_PROTECT_RO_NOW, + int rv = + crec_flash_set_protect(EC_FLASH_PROTECT_RO_NOW, EC_FLASH_PROTECT_RO_NOW); if (rv) return rv;
Add support for struct and struct_ref types
@@ -14,14 +14,23 @@ namespace kdb namespace tools { -const std::set<std::string> supportedTypes{ - "enum", "short", "unsigned_short", "long", "unsigned_long", "long_long", "unsigned_long_long", "float", "double", +const std::set<std::string> supportedTypes{ "enum", + "short", + "unsigned_short", + "long", + "unsigned_long", + "long_long", + "unsigned_long_long", + "float", + "double", "long_double" "char", "boolean", "octet", - "any", "string" -}; + "any", + "string", + "struct_ref", + "struct" }; SpecBackendBuilder::SpecBackendBuilder (BackendBuilderInit const & bbi) : MountBackendBuilder (bbi), nodes (0) { @@ -217,12 +226,17 @@ void SpecReader::checkKey(const Key key) { if(std::find(supportedTypes.begin(), supportedTypes.end(), key.getMeta<std::string> ("type")) == supportedTypes.end()) { stringStream << "Type \"" << key.getMeta<std::string>("type") << "\" of key \"" << key.getName() << "\" is not supported in Elektra!"; } - // Check if "type" and "check/type" are equal - else if (key.hasMeta ("check/type") - && key.getMeta<std::string> ("check/type") != keyType) + // Check if "type" and "check/type" are equal. + else if (key.hasMeta ("check/type") && key.getMeta<std::string> ("check/type") != keyType) + { + // If type is "struct" or "struct_ref", it may also have "check/type"="any". See file + // doc/help/elektra-highlevel-gen.md. + if (!((keyType == "struct" || keyType == "struct_ref") && key.getMeta<std::string> ("check/type") == "any")) { stringStream << "Key " << key.getName () - << " has different values for \"type\" and \"check/type\". If both are specified, they must be equal!"; + << " has different values for \"type\" and \"check/type\". If both are specified, they must " + "be equal!"; + } } } if (stringStream.str().length() > 0) {
zuse: remove unnecessary line from +re
|* [gar=* sef=_|.(fist)] |= jon=json ^- (unit _gar) - =- ~! gar ~! (need -) - ((sef) jon) :: ++ sa :: string as tape
disable gpcloud for windows cl build
@@ -161,7 +161,7 @@ APU_CONFIG=--with-apu-config=$(BLD_THIRDPARTY_BIN_DIR)/apu-1-config CODEGEN_CONFIG=--enable-codegen --with-codegen-prefix=/opt/llvm-3.7.1 -win32_CONFIGFLAGS=--with-gssapi --without-libcurl --disable-orca $(APR_CONFIG) +win32_CONFIGFLAGS=--with-gssapi --without-libcurl --disable-orca --disable-gpcloud $(APR_CONFIG) sol10_x86_64_CONFIGFLAGS=--enable-snmp --with-libxml $(APR_CONFIG) rhel5_x86_32_CONFIGFLAGS=--host=i686-pc-linux-gnu --enable-snmp --enable-ddboost --with-gssapi --enable-netbackup --with-libxml $(APR_CONFIG) rhel5_x86_64_CONFIGFLAGS=--enable-snmp --enable-gpperfmon --enable-ddboost --with-gssapi --enable-netbackup ${ORCA_CONFIG} ${CODEGEN_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
HLS Sponge: Make testcase nicer
@@ -287,9 +287,11 @@ static struct sponge_t test_data[] = { /* NB_SLICES=64K NB_ROUND=64K */ { .nb_slices = 64 * 1024, .nb_round = 64 * 1024, - .pe = 0, .nb_pe = 1, .checksum = 0xed08548b49997520ull }, + .pe = 0, .nb_pe = 64 * 1024, .checksum = 0x8d24ed80cd6a0bd9ull }, { .nb_slices = 64 * 1024, .nb_round = 64 * 1024, .pe = 0, .nb_pe = 4 * 1024, .checksum = 0xd36463652392bddcull }, + { .nb_slices = 64 * 1024, .nb_round = 64 * 1024, + .pe = 0, .nb_pe = 1, .checksum = 0xed08548b49997520ull }, }; static int test_sponge(int card_no, int timeout, FILE *fp) @@ -339,7 +341,7 @@ static int test_sponge(int card_no, int timeout, FILE *fp) fprintf(stderr, " NB_SLICES = %d NB_ROUND = %d\n", nb_slices, nb_round); - fprintf(stderr, " pe=%d nb_pe=%d ... ", t->pe, t->nb_pe); + fprintf(stderr, " pe = %5d nb_pe = %5d ... ", t->pe, t->nb_pe); fprintf(stderr, "checksum = %016llx %8lld timer_ticks " "%8lld usec OK\n", (long long)checksum,
Activated OpenMP 5.0 tests in sollve and cleand up run_sollve.sh.
@@ -29,20 +29,31 @@ thisdir=$(getdname $0) AOMP_GPU=`$AOMP/bin/mygpu` export MY_SOLLVE_FLAGS="-fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -Xopenmp-target=amdgcn-amd-amdhsa -march=$AOMP_GPU" -patchrepo $AOMP_REPOS_TEST/$AOMP_SOLVV_REPO_NAME cd $AOMP_REPOS_TEST/$AOMP_SOLVV_REPO_NAME -if [ -d logs ] ; then - rm logs/*.log -fi -if [ -d results_report ] ; then - rm -rf results_report -fi -make clean +rm -rf results_report45 +rm -rf results_report50 +rm -rf combined-results.txt + +make tidy + +# Run OpenMP 4.5 Tests make CC=$AOMP/bin/clang CXX=$AOMP/bin/clang++ FC=$AOMP/bin/flang CFLAGS="-lm $MY_SOLLVE_FLAGS" CXXFLAGS="$MY_SOLLVE_FLAGS" FFLAGS="$MY_SOLLVE_FLAGS" LOG=1 LOG_ALL=1 VERBOSE_TESTS=1 VERBOSE=1 all +echo "--------------------------- OMP 4.5 Results ---------------------------" >> combined-results.txt +make report_html +make report_summary >> combined-results.txt + +mv results_report results_report45 + +# Run OpenMP 5.0 Tests +export MY_SOLLVE_FLAGS="$MY_SOLLVE_FLAGS -fopenmp-version=50" +make tidy +make CC=$AOMP/bin/clang CXX=$AOMP/bin/clang++ FC=$AOMP/bin/flang CFLAGS="-lm $MY_SOLLVE_FLAGS" CXXFLAGS="$MY_SOLLVE_FLAGS" FFLAGS="$MY_SOLLVE_FLAGS" OMP_VERSION=5.0 LOG=1 LOG_ALL=1 VERBOSE_TESTS=1 VERBOSE=1 all +echo "--------------------------- OMP 5.0 Results ---------------------------" >> combined-results.txt make report_html -make report_summary -removepatch $AOMP_REPOS_TEST/$AOMP_SOLVV_REPO_NAME +make report_summary >> combined-results.txt +mv results_report results_report50 +cat combined-results.txt
Fix if parentheses in xterm code.
@@ -206,7 +206,7 @@ static int xterm_handle_input(void *arg) { } int sym = ch; int mod = KMOD_NONE; - if isupper(ch) { + if (isupper(ch)) { sym = tolower(sym); mod = KMOD_SHIFT; }
fix ubsan warning on huge allocations (issue
@@ -762,7 +762,8 @@ static mi_page_t* mi_segment_span_allocate(mi_segment_t* segment, size_t slice_i } // and also for the last one (if not set already) (the last one is needed for coalescing) - mi_slice_t* last = &segment->slices[slice_index + slice_count - 1]; + // note: the cast is needed for ubsan since the index can be larger than MI_SLICES_PER_SEGMENT for huge allocations (see #543) + mi_slice_t* last = &((mi_slice_t*)segment->slices)[slice_index + slice_count - 1]; if (last < mi_segment_slices_end(segment) && last >= slice) { last->slice_offset = (uint32_t)(sizeof(mi_slice_t)*(slice_count-1)); last->slice_count = 0;
tests: runtime: filter_grep: adjust to expected errors
@@ -10,14 +10,6 @@ void flb_test_filter_grep_regex(void); void flb_test_filter_grep_exclude(void); void flb_test_filter_grep_invalid(void); -/* Test list */ -TEST_LIST = { - {"regex", flb_test_filter_grep_regex }, - {"exclude", flb_test_filter_grep_exclude }, - {"invalid", flb_test_filter_grep_invalid }, - {NULL, NULL} -}; - void flb_test_filter_grep_regex(void) { @@ -138,17 +130,23 @@ void flb_test_filter_grep_invalid(void) TEST_CHECK(ret == 0); ret = flb_start(ctx); - TEST_CHECK(ret == 0); + TEST_CHECK(ret == -1); for (i = 0; i < 256; i++) { memset(p, '\0', sizeof(p)); snprintf(p, sizeof(p), "[%d, {\"val\": \"%d\",\"END_KEY\": \"JSON_END\"}]", i, (i * i)); bytes = flb_lib_push(ctx, in_ffd, p, strlen(p)); - TEST_CHECK(bytes == strlen(p)); + TEST_CHECK(bytes == -1); } - sleep(1); /* waiting flush */ - flb_stop(ctx); flb_destroy(ctx); } + +/* Test list */ +TEST_LIST = { + {"regex", flb_test_filter_grep_regex }, + {"exclude", flb_test_filter_grep_exclude }, + {"invalid", flb_test_filter_grep_invalid }, + {NULL, NULL} +};
Better to just have a single way of making the preset->soundpack association
@@ -204,8 +204,6 @@ typedef struct clap_preset_discovery_soundpack { const char *homepage_url; // url to the pack's homepage const char *vendor; // sound pack's vendor const char *image_uri; // may be an image on disk or from an http server - const char *location_uri; // location on disk, optional. The indexer may assume that all files - // under this location belong to the soundpack. clap_timestamp_t release_timestamp; } clap_preset_discovery_soundpack_t;
If script running don't check for collisions
@@ -492,6 +492,12 @@ void SceneUpdateActorMovement_b(UBYTE i) actors[i].redraw = TRUE; + if (script_ptr != 0) + { + actors[i].moving = TRUE; + return; + } + next_tx = DIV_8(actors[i].pos.x) + actors[i].dir.x; next_ty = DIV_8(actors[i].pos.y) + actors[i].dir.y;
Some deabbreviations
@@ -578,7 +578,8 @@ Dump any field whose OID is not recognised by OpenSSL. B<sep_multiline> These options determine the field separators. The first character is -between RDNs and the second between multiple AVAs (multiple AVAs are +between Relative Distinguished Names (RDNs) and the second is between +multiple Attribute Value Assertions (AVAs, multiple AVAs are very rare and their use is discouraged). The options ending in "space" additionally place a space after the separator to make it more readable. The B<sep_multiline> uses a linefeed character for
Fix Mesh vertex map memory leak;
@@ -381,6 +381,7 @@ static int l_lovrMeshGetVertexMap(lua_State* L) { static int l_lovrMeshSetVertexMap(lua_State* L) { Mesh* mesh = luax_checktype(L, 1, Mesh); + Buffer* release = NULL; if (lua_isnoneornil(L, 2)) { lovrMeshSetIndexBuffer(mesh, NULL, 0, 0, 0); @@ -398,7 +399,7 @@ static int l_lovrMeshSetVertexMap(lua_State* L) { Buffer* vertexBuffer = lovrMeshGetVertexBuffer(mesh); BufferUsage usage = vertexBuffer ? lovrBufferGetUsage(vertexBuffer) : USAGE_DYNAMIC; bool readable = vertexBuffer ? lovrBufferIsReadable(vertexBuffer) : false; - indexBuffer = lovrBufferCreate(blob->size, blob->data, BUFFER_INDEX, usage, readable); + indexBuffer = release = lovrBufferCreate(blob->size, blob->data, BUFFER_INDEX, usage, readable); lovrMeshSetIndexBuffer(mesh, indexBuffer, count, size, 0); } else { void* indices = lovrBufferMap(indexBuffer, 0, false); @@ -416,7 +417,7 @@ static int l_lovrMeshSetVertexMap(lua_State* L) { Buffer* vertexBuffer = lovrMeshGetVertexBuffer(mesh); BufferUsage usage = vertexBuffer ? lovrBufferGetUsage(vertexBuffer) : USAGE_DYNAMIC; bool readable = vertexBuffer ? lovrBufferIsReadable(vertexBuffer) : false; - indexBuffer = lovrBufferCreate(count * size, NULL, BUFFER_INDEX, usage, readable); + indexBuffer = release = lovrBufferCreate(count * size, NULL, BUFFER_INDEX, usage, readable); } union { void* raw; uint16_t* shorts; uint32_t* ints; } indices = { .raw = lovrBufferMap(indexBuffer, 0, false) }; @@ -445,6 +446,7 @@ static int l_lovrMeshSetVertexMap(lua_State* L) { lovrBufferFlush(indexBuffer, 0, count * size); } + lovrRelease(release, lovrBufferDestroy); return 0; }
libcupsfilters: In cupsFindAttr() removed message output to stderr
@@ -63,42 +63,33 @@ cupsFindAttr(ppd_file_t *ppd, /* I - PPD file */ */ snprintf(spec, specsize, "%s.%s.%s", colormodel, media, resolution); - fprintf(stderr, "DEBUG2: Looking for \"*%s %s\"...\n", name, spec); if ((attr = ppdFindAttr(ppd, name, spec)) != NULL && attr->value != NULL) return (attr); snprintf(spec, specsize, "%s.%s", colormodel, resolution); - fprintf(stderr, "DEBUG2: Looking for \"*%s %s\"...\n", name, spec); if ((attr = ppdFindAttr(ppd, name, spec)) != NULL && attr->value != NULL) return (attr); snprintf(spec, specsize, "%s", colormodel); - fprintf(stderr, "DEBUG2: Looking for \"*%s %s\"...\n", name, spec); if ((attr = ppdFindAttr(ppd, name, spec)) != NULL && attr->value != NULL) return (attr); snprintf(spec, specsize, "%s.%s", media, resolution); - fprintf(stderr, "DEBUG2: Looking for \"*%s %s\"...\n", name, spec); if ((attr = ppdFindAttr(ppd, name, spec)) != NULL && attr->value != NULL) return (attr); snprintf(spec, specsize, "%s", media); - fprintf(stderr, "DEBUG2: Looking for \"*%s %s\"...\n", name, spec); if ((attr = ppdFindAttr(ppd, name, spec)) != NULL && attr->value != NULL) return (attr); snprintf(spec, specsize, "%s", resolution); - fprintf(stderr, "DEBUG2: Looking for \"*%s %s\"...\n", name, spec); if ((attr = ppdFindAttr(ppd, name, spec)) != NULL && attr->value != NULL) return (attr); spec[0] = '\0'; - fprintf(stderr, "DEBUG2: Looking for \"*%s\"...\n", name); if ((attr = ppdFindAttr(ppd, name, spec)) != NULL && attr->value != NULL) return (attr); - fprintf(stderr, "DEBUG2: No instance of \"*%s\" found...\n", name); - return (NULL); }
OcMachoLib: Make MachoGetNextCommand safer by checking it's entirely within the LC range.
@@ -77,6 +77,7 @@ MachoGetNextCommand64 ( ) { CONST MACH_LOAD_COMMAND *Command; + UINTN TopOfCommands; ASSERT (MachHeader != NULL); // @@ -88,16 +89,17 @@ MachoGetNextCommand64 ( return NULL; } - Command = NEXT_MACH_LOAD_COMMAND (LoadCommand); + TopOfCommands = ((UINTN)MachHeader->Commands + MachHeader->CommandsSize); - while ( - ((UINTN)Command - (UINTN)MachHeader->Commands) < MachHeader->CommandsSize + for ( + Command = NEXT_MACH_LOAD_COMMAND (LoadCommand); + ((UINTN)Command < TopOfCommands) + && (((UINTN)Command + Command->Size) <= TopOfCommands); + Command = NEXT_MACH_LOAD_COMMAND (Command) ) { if (Command->Type == LoadCommandType) { return (MACH_LOAD_COMMAND *)Command; } - - Command = NEXT_MACH_LOAD_COMMAND (Command); } return NULL;
hv: search additional argument when parsing seed from ABL Due to ABL design change, it will reword the "dev_sec_info.param_addr=" to "ABL.svnseed" in command line. Acked-by: Zhu Bing
@@ -22,7 +22,11 @@ struct dev_sec_info { struct abl_seed_info seed_list[ABL_SEED_LIST_MAX]; }; -static const char *dev_sec_info_arg = "dev_sec_info.param_addr="; +static const char *abl_seed_arg[] = { + "ABL.svnseed=", + "dev_sec_info.param_addr=", + NULL +}; static void parse_seed_list_abl(void *param_addr) { @@ -100,16 +104,21 @@ static void parse_seed_list_abl(void *param_addr) */ bool abl_seed_parse(struct acrn_vm *vm, char *cmdline, char *out_arg, uint32_t out_len) { - char *arg, *arg_end; + char *arg = NULL, *arg_end; char *param; void *param_addr; - uint32_t len; + uint32_t len = 0U, i; bool parse_success = false; if (cmdline != NULL) { - len = strnlen_s(dev_sec_info_arg, MEM_1K); - arg = strstr_s((const char *)cmdline, MEM_2K, dev_sec_info_arg, len); + for (i = 0U; abl_seed_arg[i] != NULL; i++) { + len = strnlen_s(abl_seed_arg[i], MEM_1K); + arg = strstr_s((const char *)cmdline, MEM_2K, abl_seed_arg[i], len); + if (arg != NULL) { + break; + } + } if (arg != NULL) { param = arg + len; @@ -129,7 +138,7 @@ bool abl_seed_parse(struct acrn_vm *vm, char *cmdline, char *out_arg, uint32_t o /* Convert the param_addr to SOS GPA and copy to caller */ if (out_arg != NULL) { snprintf(out_arg, out_len, "%s0x%X ", - dev_sec_info_arg, hva2gpa(vm, param_addr)); + abl_seed_arg[i], hva2gpa(vm, param_addr)); } parse_success = true;
doc: decision for vendor_spec
@@ -22,7 +22,10 @@ and being administer friendly. ## Decision -Provide means that a single specification can satisfy every distribution and administrator. +As found out during implementation of [specload](/src/plugins/specload), only a very limited subset can be modified safely, e.g.: + +- add/edit/remove `description`, `opt/help` and `comment` +- add/edit `default` ## Rationale
host/tests/l2cap_coc: use MYNEWT_VAL_L2CAP_COC_MTU
@@ -747,9 +747,9 @@ ble_l2cap_test_coc_connect(struct test_data *t) return; } - req.credits = htole16((t->mtu + (BLE_L2CAP_COC_MTU - 1) / 2) / - BLE_L2CAP_COC_MTU); - req.mps = htole16(BLE_L2CAP_COC_MTU); + req.credits = htole16((t->mtu + (MYNEWT_VAL(BLE_L2CAP_COC_MTU) - 1) / 2) / + MYNEWT_VAL(BLE_L2CAP_COC_MTU)); + req.mps = htole16(MYNEWT_VAL(BLE_L2CAP_COC_MTU)); req.mtu = htole16(t->mtu); req.psm = htole16(t->psm); req.scid = htole16(current_cid++); @@ -763,7 +763,7 @@ ble_l2cap_test_coc_connect(struct test_data *t) * only*/ rsp.credits = htole16(10); rsp.dcid = htole16(current_cid); - rsp.mps = htole16(BLE_L2CAP_COC_MTU + 16); + rsp.mps = htole16(MYNEWT_VAL(BLE_L2CAP_COC_MTU) + 16); rsp.mtu = htole16(t->mtu); rsp.result = htole16(ev->l2cap_status); @@ -790,7 +790,7 @@ ble_l2cap_test_coc_connect_by_peer(struct test_data *t) /* Use some different parameters for peer */ req.credits = htole16(30); - req.mps = htole16(BLE_L2CAP_COC_MTU + 16); + req.mps = htole16(MYNEWT_VAL(BLE_L2CAP_COC_MTU) + 16); req.mtu = htole16(t->mtu); req.psm = htole16(t->psm); req.scid = htole16(0x0040); @@ -812,10 +812,10 @@ ble_l2cap_test_coc_connect_by_peer(struct test_data *t) rsp.result = htole16(ev->l2cap_status); } else { /* Receive response from peer.*/ - rsp.credits = htole16((t->mtu + (BLE_L2CAP_COC_MTU - 1) / 2) / - BLE_L2CAP_COC_MTU); + rsp.credits = htole16((t->mtu + (MYNEWT_VAL(BLE_L2CAP_COC_MTU) - 1) / 2) / + MYNEWT_VAL(BLE_L2CAP_COC_MTU)); rsp.dcid = current_cid++; - rsp.mps = htole16(BLE_L2CAP_COC_MTU); + rsp.mps = htole16(MYNEWT_VAL(BLE_L2CAP_COC_MTU)); rsp.mtu = htole16(t->mtu); }
include/charge_state.h: Format with clang-format BRANCH=none TEST=none
@@ -61,21 +61,14 @@ enum charge_state { /* Debugging constants, in the same order as enum charge_state. This string * table was moved here to sync with enum above. */ -#define CHARGE_STATE_NAME_TABLE { \ - "unchange", \ - "init", \ - "reinit", \ - "idle0", \ - "idle", \ - "discharge", \ - "discharge_full", \ - "charge", \ - "charge_near_full", \ +#define CHARGE_STATE_NAME_TABLE \ + { \ + "unchange", "init", "reinit", "idle0", "idle", "discharge", \ + "discharge_full", "charge", "charge_near_full", \ "error" \ } /* End of CHARGE_STATE_NAME_TABLE macro */ - /** * Return current charge state. */ @@ -159,7 +152,6 @@ int charge_get_battery_temp(int idx, int *temp_ptr); */ const struct batt_params *charger_current_battery_params(void); - /* Config Charger */ #include "charge_state_v2.h"
BugID:25423292: update nghttp2 config.in
+if AOS_CREATE_PROJECT config AOS_COMP_SDK_NGHTTP2 - bool "FEATURE_HTTP_COMM_ENABLED" - default n - help - - - - + bool + default y +endif +if !AOS_CREATE_PROJECT +config AOS_COMP_SDK_NGHTTP2 + bool "FEATURE_NGHTTP2_ENABLED" + default n +endif
[FAT] fat_alloc_sector() remembers where it last found a free entry
@@ -103,14 +103,19 @@ typedef struct fat_entry_descriptor { } fat_entry_descriptor_t; void fat_alloc_sector(fat_drive_info_t drive_info, uint32_t next_fat_entry_idx_in_file, fat_entry_descriptor_t* out_desc) { + static int last_sector_with_free_space = 1; for (uint32_t i = 0; i < drive_info.fat_sector_count; i++) { uint32_t sector_index = drive_info.fat_head_sector + i; + if (sector_index < last_sector_with_free_space) { + continue; + } ata_sector_t* fat_sector = ata_read_sector(sector_index); fat_entry_t* fat_sector_data = (fat_entry_t*)fat_sector->data; for (uint32_t j = 0; j < drive_info.fat_entries_per_sector; j++) { if (fat_sector_data[j].allocated == false) { // Found a free FAT entry to allocate in + last_sector_with_free_space = sector_index; // Clear the data sector on disk so we don't leak data from deleted files uint32_t disk_sector = ((i * drive_info.fat_entries_per_sector) + j) + drive_info.fat_sector_slide;
Pulled subscriptions can no longer cause a story to be created. This doesn't seem to be an issue for other arms, but the fact that that isn't immediately clear is cause for mild concern.
|= pax/path ^- (quip move _+>) %- pre-bake - :_ ~ =+ qer=(path-to-query %circle pax) ?> ?=($circle -.qer) - :+ %story nom.qer - [%peer | src.bol qer] + ?. (~(has by stories) nom.qer) ~ + [%story nom.qer %peer | src.bol qer]~ :: ++ reap :> subscription n/ack
travis: Build qemu-arm with MP_ENDIANNESS_BIG=1 to test bigendian build. Eventually it would be good to run the full test suite on a big-endian system, but for now this will help to catch build errors with the big-endian configuration.
@@ -133,7 +133,9 @@ jobs: - qemu-system-arm --version script: - make ${MAKEOPTS} -C mpy-cross - - make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test || true + - make ${MAKEOPTS} -C ports/qemu-arm CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1 + - make ${MAKEOPTS} -C ports/qemu-arm clean + - make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test after_failure: - grep --text "FAIL" ports/qemu-arm/build/console.out
docs: Fix inappropriate statements issue
@@ -18,7 +18,7 @@ Assuming `<XY1100 Root>` to be the root directory of XinYi-XY1100 platform SDK: 4. Copy BoAT-X-Framework/vendor/platform/XinYi-XY1100/XY1100RootDirCode/demo/my_contract.h into `<XY1100 Root>/userapp/demo/boat_demo`. -5. Copy and overwrite BoAT-X-Framework/vendor/platform/XinYi-XY1100/XY1100RootDirCode/vendor/Makefile into `<XY1100 Root>/userapp/BoAT-X-Framework/vendor`. +5. Copy BoAT-X-Framework/vendor/platform/XinYi-XY1100/XY1100RootDirCode/vendor/Makefile into /userapp/BoAT-X-Framework/vendor and overwrite the original file. 6. Copy and overwrite BoAT-X-Framework/vendor/platform/XinYi-XY1100/XY1100RootDirCode/storage/persiststore.c into `<XY1100 Root>/userapp/BoAT-X-Framework/vendor/common/storage`.
unbreak build on OpenBSD due to undeclared identifier PATH_MAX in version 5.3.0, there was a PATH_MAX defined for APPLE and OpenBSD set to 255. Re-add PATH_MAX define for OpenBSD, as it is defined in sys/syslimits.h set to 1024
#include <openssl/hmac.h> #include <openssl/cmac.h> #if defined (__APPLE__) || defined(__OpenBSD__) +#if defined(__OpenBSD__) +#define PATH_MAX 1024 /* as defined in sys/syslimits.h */ +#endif #include <libgen.h> #include <sys/socket.h> #else
Print relation info in xlogdump for xl_heap_clean record type.
@@ -612,11 +612,10 @@ print_rmgr_standby(XLogRecPtr cur, XLogRecord *record, uint8 info) void print_rmgr_heap2(XLogRecPtr cur, XLogRecord *record, uint8 info) { -#if PG_VERSION_NUM >= 90000 char spaceName[NAMEDATALEN]; char dbName[NAMEDATALEN]; char relName[NAMEDATALEN]; -#endif + char buf[1024]; switch (info) @@ -650,6 +649,10 @@ print_rmgr_heap2(XLogRecPtr cur, XLogRecord *record, uint8 info) getSpaceName(xlrec.node.spcNode, spaceName, sizeof(spaceName)); getDbName(xlrec.node.dbNode, dbName, sizeof(dbName)); getRelName(xlrec.node.relNode, relName, sizeof(relName)); +#else + getSpaceName(xlrec.heapnode.node.spcNode, spaceName, sizeof(spaceName)); + getDbName(xlrec.heapnode.node.dbNode, dbName, sizeof(dbName)); + getRelName(xlrec.heapnode.node.relNode, relName, sizeof(relName)); #endif total_off = (record->xl_len - SizeOfHeapClean) / sizeof(OffsetNumber); @@ -662,8 +665,9 @@ print_rmgr_heap2(XLogRecPtr cur, XLogRecord *record, uint8 info) "", spaceName, dbName, relName, #else - snprintf(buf, sizeof(buf), "clean%s: block:%u redirected/dead/unused:%d/%d/%d", + snprintf(buf, sizeof(buf), "clean%s: s/d/r:%s/%s/%s block:%u redirected/dead/unused:%d/%d/%d", info == XLOG_HEAP2_CLEAN_MOVE ? "_move" : "", + spaceName, dbName, relName, #endif xlrec.block, xlrec.nredirected, xlrec.ndead, nunused
Remove debugging leftovers in apps/opt.c
* in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html */ - -/* #define COMPILE_STANDALONE_TEST_DRIVER */ #include "apps.h" #include <string.h> #if !defined(OPENSSL_SYS_MSDOS) @@ -888,90 +886,3 @@ void opt_help(const OPTIONS *list) BIO_printf(bio_err, "%s %s\n", start, help); } } - -#ifdef COMPILE_STANDALONE_TEST_DRIVER -# include <sys/stat.h> - -typedef enum OPTION_choice { - OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, - OPT_IN, OPT_INFORM, OPT_OUT, OPT_COUNT, OPT_U, OPT_FLAG, - OPT_STR, OPT_NOTUSED -} OPTION_CHOICE; - -static OPTIONS options[] = { - {OPT_HELP_STR, 1, '-', "Usage: %s flags\n"}, - {OPT_HELP_STR, 1, '-', "Valid options are:\n"}, - {"help", OPT_HELP, '-', "Display this summary"}, - {"in", OPT_IN, '<', "input file"}, - {OPT_MORE_STR, 1, '-', "more detail about input"}, - {"inform", OPT_INFORM, 'f', "input file format; defaults to pem"}, - {"out", OPT_OUT, '>', "output file"}, - {"count", OPT_COUNT, 'p', "a counter greater than zero"}, - {"u", OPT_U, 'u', "an unsigned number"}, - {"flag", OPT_FLAG, 0, "just some flag"}, - {"str", OPT_STR, 's', "the magic word"}, - {"areallyverylongoption", OPT_HELP, '-', "long way for help"}, - {NULL} -}; - -BIO *bio_err; - -int app_isdir(const char *name) -{ - struct stat sb; - - return name != NULL && stat(name, &sb) >= 0 && S_ISDIR(sb.st_mode); -} - -int main(int ac, char **av) -{ - OPTION_CHOICE o; - char **rest; - char *prog; - - bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT); - - prog = opt_init(ac, av, options); - while ((o = opt_next()) != OPT_EOF) { - switch (c) { - case OPT_NOTUSED: - case OPT_EOF: - case OPT_ERR: - printf("%s: Usage error; try -help.\n", prog); - return 1; - case OPT_HELP: - opt_help(options); - return 0; - case OPT_IN: - printf("in %s\n", opt_arg()); - break; - case OPT_INFORM: - printf("inform %s\n", opt_arg()); - break; - case OPT_OUT: - printf("out %s\n", opt_arg()); - break; - case OPT_COUNT: - printf("count %s\n", opt_arg()); - break; - case OPT_U: - printf("u %s\n", opt_arg()); - break; - case OPT_FLAG: - printf("flag\n"); - break; - case OPT_STR: - printf("str %s\n", opt_arg()); - break; - } - } - argc = opt_num_rest(); - argv = opt_rest(); - - printf("args = %d\n", argc); - if (argc) - while (*argv) - printf(" %s\n", *argv++); - return 0; -} -#endif
iommu: make driverkit work without an iommu
@@ -145,7 +145,7 @@ static errval_t alloc_common(int mode, int bits, int32_t nodeid2, uint64_t *node2addr, uint64_t *physaddr) { - DRIVERKIT_DEBUG("alloc_common for mode=%d, bits=%d, nodeid1=%d, nodeid2=%d", + debug_printf("alloc_common for mode=%d, bits=%d, nodeid1=%d, nodeid2=%d", mode, bits, nodeid1, nodeid2); errval_t err; @@ -161,8 +161,8 @@ static errval_t alloc_common(int mode, int bits, bits, *physaddr, nodeid1, nodeid2); } - if(err_is_fail(err)){ DEBUG_SKB_ERR(err,"in alloc_common"); + if(err_is_fail(err)){ skb_execute_query("dec_net_debug"); return err; } @@ -206,6 +206,8 @@ static inline errval_t iommu_alloc_ram(struct iommu_client *st, if (bytes < (LARGE_PAGE_SIZE)) { bytes = LARGE_PAGE_SIZE; } + int bits = log2ceil(bytes); + bytes = 1 << bits; debug_printf("iommu_alloc_ram bytes=%lu\n", bytes); @@ -221,8 +223,6 @@ static inline errval_t iommu_alloc_ram(struct iommu_client *st, int32_t my_nodeid = get_own_nodeid(); uint64_t base_addr=0; - int bits = log2ceil(bytes); - assert(1<<bits == bytes); err = alloc_common(MODE_ALLOC_COMMON, bits, device_nodeid, NULL, my_nodeid, NULL, &base_addr); if(err_is_fail(err)){ @@ -306,6 +306,12 @@ static inline errval_t iommu_alloc_vregion(struct iommu_client *st, return err; } + if(st == NULL){ + *device = id.base; + *driver = 0; + return SYS_ERR_OK; + } + assert(id.bytes >= LARGE_PAGE_SIZE); assert(st != NULL);
[GB] Make Gameboy members public
@@ -3,10 +3,10 @@ use std::{cell::RefCell, rc::Rc}; use crate::{cpu::CpuState, mmu::Mmu, ppu::Ppu}; pub struct GameBoy { - mmu: Rc<Mmu>, - cpu: RefCell<CpuState>, - ppu: Rc<Ppu>, - cpu_disabled: RefCell<bool>, + pub mmu: Rc<Mmu>, + pub cpu: RefCell<CpuState>, + pub ppu: Rc<Ppu>, + pub cpu_disabled: RefCell<bool>, } impl GameBoy {
(2) Fix crash of "scope scope".
@@ -340,6 +340,14 @@ main(int argc, char **argv, char **env) program_invocation_short_name = basename(argv[1]); + if (!is_go(ebuf->buf)) { + // We're getting here with upx-encoded binaries + // and any other static native apps... + // Start here when we support more static binaries + // than go. + execve(argv[1], &argv[1], environ); + } + if ((handle = dlopen(info->path, RTLD_LAZY)) == NULL) { fprintf(stderr, "%s\n", dlerror()); goto err;
VERSION bump to version 2.0.168
@@ -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 167) +set(LIBYANG_MICRO_VERSION 168) set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION}) # set version of the library set(LIBYANG_MAJOR_SOVERSION 2)
Improved diganostics.
@@ -380,9 +380,10 @@ u3a_reclaim(void) } old_w = u3a_open(u3R) + u3R->all.fre_w; - // suspected bug: infinite loop when cache is almost empty - // #if 1 + fprintf(stderr, "allocate: reclaim: half of %d entries\r\n", + u3to(u3h_root, u3R->cax.har_p)->use_w); + u3h_trim_to(u3R->cax.har_p, u3to(u3h_root, u3R->cax.har_p)->use_w / 2); #else /* brutal and guaranteed effective
proc: keep locks for longer when killing
@@ -157,16 +157,14 @@ void proc_kill(process_t *proc) init = proc_find(1); - proc_lockSet(&proc->lock); + proc_lockSet2(&init->lock, &proc->lock); if ((child = proc->children) != NULL) { do child->parent = init; while ((child = child->next) != proc->children); proc->children = NULL; - proc_lockClear(&proc->lock); - proc_lockSet(&init->lock); if (init->children == NULL) { init->children = child; } @@ -174,11 +172,9 @@ void proc_kill(process_t *proc) swap(init->children->next, child->prev->next); swap(child->prev->next->prev, child->prev); } - proc_lockClear(&init->lock); } - else { + proc_lockClear(&init->lock); proc_lockClear(&proc->lock); - } proc_lockSet(&process_common.lock); lib_rbRemove(&process_common.id, &proc->idlinkage);
doc: Fixed short docs version being the full version string and not Major.Minor
@@ -53,10 +53,10 @@ copyright = u'2015-2016, Franklin "Snaipe" Mathieu' # |version| and |release|, also used in various other places throughout the # built documents. # -# The short X.Y version. -version = '2.3.0' # The full version, including alpha/beta/rc tags. -release = version +release = '2.3.0' +# The short X.Y version. +version = re.search(r'\d+\.\d+', release).group(0) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.
Add Bazel to Travis setup
@@ -37,6 +37,16 @@ before_install: - cd .. && popd - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y clang-format-8 cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "linux" -a "$CC" = "gcc" -a "$TRAVIS_ARCH" = "amd64" ]; then pip install --user codecov; export CFLAGS="-coverage"; fi + - > + if [ "$TRAVIS_OS_NAME" = "linux" ]; then + # https://docs.bazel.build/versions/main/install-ubuntu.html + sudo apt install apt-transport-https curl gnupg + curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg + sudo mv bazel.gpg /etc/apt/trusted.gpg.d/ + echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list + sudo apt update && sudo apt install bazel + bazel --version + fi; script: - >
Fix clang compilation on aarch64: value size does not match register size. Fixes clang error: value size does not match register size specified by the constraint and modifier
@@ -147,7 +147,7 @@ os_cpu_clock_frequency (void) * to each core which has registers for reading the current counter value * as well as the clock frequency. The system counter is not clocked at * the same frequency as the core. */ - u32 hz; + u64 hz; asm volatile ("mrs %0, cntfrq_el0":"=r" (hz)); return (f64) hz; #endif
Fix self.pin when specifying lpin for readTemp()
@@ -29,10 +29,10 @@ return({ end, readTemp = function(self, cb, lpin) + if lpin then self.pin = lpin end local pin = self.pin self.cb = cb self.temp={} - if lpin then pin = lpin end ow.setup(pin) self.sens={}
fix: Added Ethereum test compilation options
-all: testfabric testvenachain testplatone testplaton +all: testethereum testfabric: make -C fabric all @@ -12,6 +12,9 @@ testplatone: testplaton: make -C platon all +testethereum: + make -C ethereum all + clean: make -C fabric clean make -C venachain clean
Add AgentAttribute
@@ -12,6 +12,7 @@ namespace FFXIVClientStructs.FFXIV.Client.UI.Agent // size = 0x4600 // ctor E8 ? ? ? ? EB 03 49 8B C4 45 33 C9 48 89 46 40 + [Agent(AgentId.Hud)] [StructLayout(LayoutKind.Explicit, Size = 0x4600)] public unsafe partial struct AgentHUD {
Fix destruction order.
@@ -2519,9 +2519,9 @@ static JanetEVGenericMessage janet_go_thread_subr(JanetEVGenericMessage args) { args.argp = "failed to start thread"; } } + janet_restore(&tstate); janet_buffer_deinit(buffer); janet_free(buffer); - janet_restore(&tstate); janet_deinit(); return args; }
Fix ObjectEquals
@@ -1159,12 +1159,18 @@ bool CLR_RT_HeapBlock::ObjectsEqual( bool fSameReference) { NATIVE_PROFILE_CLR_CORE(); + if (&pArgLeft == &pArgRight) + { return true; + } - if (pArgLeft.DataType() == pArgRight.DataType()) + CLR_DataType leftDataType = pArgLeft.DataType(); + CLR_DataType rightDataType = pArgRight.DataType(); + + if (leftDataType == rightDataType) { - switch (pArgLeft.DataType()) + switch (leftDataType) { case DATATYPE_VALUETYPE: if (pArgLeft.ObjectCls().m_data == pArgRight.ObjectCls().m_data) @@ -1190,15 +1196,20 @@ bool CLR_RT_HeapBlock::ObjectsEqual( { CLR_RT_HeapBlock *objLeft = pArgLeft.Dereference(); CLR_RT_HeapBlock *objRight = pArgRight.Dereference(); + if (objLeft == objRight) + { return true; + } if (objLeft && objRight) { if (!fSameReference || (objLeft->DataType() == DATATYPE_REFLECTION)) + { return ObjectsEqual(*objLeft, *objRight, false); } } + } break; case DATATYPE_SZARRAY: @@ -1226,10 +1237,14 @@ bool CLR_RT_HeapBlock::ObjectsEqual( } } break; + case DATATYPE_REFLECTION: if (pArgLeft.SameHeader(pArgRight)) + { return true; + } break; + default: if (fSameReference == false) { @@ -1248,6 +1263,44 @@ bool CLR_RT_HeapBlock::ObjectsEqual( break; } } + else + { + if ((leftDataType == DATATYPE_BYREF && rightDataType == DATATYPE_OBJECT)) + { + // this is to handle the special case for calls to callvirt with constrained type + // namely with Objects, ValueType and Enum. + // https://docs.microsoft.com/en-us/dotnet/api/system.reflection.emit.opcodes.constrained?view=net-6.0 + + CLR_RT_HeapBlock *leftObj = pArgLeft.Dereference(); + CLR_RT_HeapBlock *rightObj = pArgRight.Dereference(); + + if (rightObj->DataType() == DATATYPE_VALUETYPE) + { + CLR_RT_TypeDef_Instance inst; + CLR_RT_HeapBlock *obj; + + if (!inst.InitializeFromIndex(rightObj->ObjectCls())) + { + } + + if (inst.m_target->dataType != DATATYPE_VALUETYPE) + { + // boxed primitive or enum type + obj = &rightObj[1]; + } + + return ObjectsEqual(*leftObj, *obj, false); + } + else + { + return ObjectsEqual(*leftObj, *rightObj, false); + } + } + else + { + _ASSERTE(false); + } + } return false; }
add release notes and fix styling
@@ -97,6 +97,8 @@ The text below summarizes updates to the [C (and C++)-based libraries](https://w - Improve `keyReplacePrefix` by using new `keyCopy` function instead of manually copying the name of the `Key` _(@lawli3t)_ - Added else error to core for elektraGetCheckUpdateNeeded _(Aydan Ghazani @4ydan)_ +- Fix check for valid namespace in keyname creation _(@JakobWonisch)_ +- ### <<Library1>> - <<TODO>>
Benchmark: Add newline after usage messages
@@ -18,7 +18,7 @@ int main (int argc, char ** argv) { if (argc < 4 || argc > 5 || (argc == 5 && elektraStrCmp (argv[4], "get") != 0)) { - fprintf (stderr, "Usage: %s <path> <parent> <plugin> [get]", argv[0]); + fprintf (stderr, "Usage: %s <path> <parent> <plugin> [get]\n", argv[0]); return 1; }
VTL: vpp_papi_provider: Don't shortcircuit vpp_papi jasonfile detection. The detection login in vpp_papi is significantly more advanced than the implementation in vpp_papi_provider. Let's take full advantage of it and ensure consistent behavior.
@@ -75,14 +75,14 @@ class VppPapiProvider(object): self.test_class = test_class self._expect_api_retval = self._zero self._expect_stack = [] - jsonfiles = [] install_dir = os.getenv('VPP_INSTALL_PATH') - for root, dirnames, filenames in os.walk(install_dir): - for filename in fnmatch.filter(filenames, '*.api.json'): - jsonfiles.append(os.path.join(root, filename)) - self.vpp = VPP(jsonfiles, logger=test_class.logger, + # Vapi requires 'VPP_API_DIR', not set when run from Makefile. + if 'VPP_API_DIR' not in os.environ: + os.environ['VPP_API_DIR'] = os.getenv('VPP_INSTALL_PATH') + + self.vpp = VPP(logger=test_class.logger, read_timeout=read_timeout) self._events = deque()
components/freertos: removed some dead ifdefs
@@ -129,18 +129,11 @@ STRUCT_FIELD (long, 4, XT_STK_LEND, lend) STRUCT_FIELD (long, 4, XT_STK_LCOUNT, lcount) #endif #ifndef __XTENSA_CALL0_ABI__ -#ifdef CONFIG_FREERTOS_PORT_OPTIMIZE_INTERRUPT_HANDLING -/* Todo prepare the stack frame to receive all windows regisster */ -STRUCT_FIELD (long, 4, XT_STK_TMP0, tmp0) -STRUCT_FIELD (long, 4, XT_STK_TMP1, tmp1) -STRUCT_FIELD (long, 4, XT_STK_TMP2, tmp2) -#else /* Temporary space for saving stuff during window spill */ STRUCT_FIELD (long, 4, XT_STK_TMP0, tmp0) STRUCT_FIELD (long, 4, XT_STK_TMP1, tmp1) STRUCT_FIELD (long, 4, XT_STK_TMP2, tmp2) #endif -#endif #ifdef XT_USE_SWPRI /* Storage for virtual priority mask */ STRUCT_FIELD (long, 4, XT_STK_VPRI, vpri)
aomp12/amd-stg-open needs to use branch amd-stg-open on devicelib, not rocm-3.10.x
@@ -193,7 +193,11 @@ AOMP_ROCR_REPO_BRANCH=${AOMP_ROCR_REPO_BRANCH:-rocm-3.10.x} AOMP_ROCR_COMPONENT_NAME=${AOMP_ROCR_COMPONENT_NAME:-rocr} AOMP_LIBDEVICE_REPO_NAME=${AOMP_LIBDEVICE_REPO_NAME:-rocm-device-libs} AOMP_LIBDEVICE_COMPONENT_NAME=${AOMP_LIBDEVICE_COMPONENT_NAME:-rocdl} +if [ "$AOMP_VERSION" != "12.0" ] ; then AOMP_LIBDEVICE_REPO_BRANCH=${AOMP_LIBDEVICE_REPO_BRANCH:-rocm-3.10.x} +else +AOMP_LIBDEVICE_REPO_BRANCH=${AOMP_LIBDEVICE_REPO_BRANCH:-amd-stg-open} +fi DEVICELIBS_ROOT=${DEVICELIBS_ROOT:-$AOMP_REPOS/$AOMP_LIBDEVICE_REPO_NAME} AOMP_COMGR_REPO_NAME=${AOMP_COMGR_REPO_NAME:-rocm-compilersupport} AOMP_COMGR_REPO_BRANCH=${AOMP_COMGR_REPO_BRANCH:-amd-stg-open}
Use blasint for INTERFACE64 compatibility
@@ -76,9 +76,9 @@ float16to32 (bfloat16_bits f16) int main (int argc, char *argv[]) { - int m, n, k; + blasint m, n, k; int i, j, l; - int x; + blasint x; int ret = 0; int loop = 100; char transA = 'N', transB = 'N';
profile: pad and optimise on small viewports Fixes urbit/landscape#658
@@ -134,7 +134,13 @@ export function ProfileActions(props: any): ReactElement { history.push(`/~profile/${ship}/edit`); }} > - Edit {isPublic ? 'Public' : 'Private'} Profile + Edit + <Text + fontWeight='500' + cursor='pointer' + display={['none','inline']}> + {isPublic ? ' Public' : ' Private'} Profile + </Text> </Text> <SetStatusBarModal isControl @@ -183,7 +189,7 @@ export function Profile(props: any): ReactElement | null { } return ( - <Center p={[0, 4]} height='100%' width='100%'> + <Center p={[3, 4]} height='100%' width='100%'> <Box maxWidth='600px' width='100%' position='relative'> { isEdit ? ( <EditProfile
fix: Modify the acquire time function
@@ -60,7 +60,7 @@ uint32_t random32(void) static uint32_t seed = 0; if(seed == 0) { - seed = time(NULL); + seed = osiEpochSecond(); } // Linear congruential generator from Numerical Recipes // https://en.wikipedia.org/wiki/Linear_congruential_generator
rust: Display a backtrace in case of test failure
@@ -39,7 +39,9 @@ if (CARGO_EXECUTABLE) if ((NOT ENABLE_ASAN) AND BUILD_SHARED) add_test (NAME test_rust_elektra COMMAND ${CARGO_EXECUTABLE} test WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") - # The test executables need to know where they can find libelektra.so + # Display a backtrace in case a test fails + set_property (TEST test_rust_elektra PROPERTY ENVIRONMENT "RUST_BACKTRACE=1") + # The test executables need to know where they can find the dynamic libraries set_property (TEST test_rust_elektra PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib") set_property (TEST test_rust_elektra PROPERTY LABELS
commands/bind.c: remove unnecessary check
@@ -145,7 +145,7 @@ static struct cmd_results *identify_key(const char* name, bool first_key, cmd_results_new(CMD_INVALID, message); free(message); return error; - } else if (!button) { + } else { return cmd_results_new(CMD_INVALID, "Unknown button %s", name); } }
chore(ci): update check_style.yml Update failure message
@@ -25,7 +25,7 @@ jobs: run: | set -o pipefail if ! (git diff --exit-code --color=always | tee /tmp/lvgl_diff.patch); then - echo "Please apply the preceding diff to your code or run scripts/code-format.sh" + echo "Please apply the preceding diff to your code or run scripts/code-format.py" exit 1 fi - name: Comment PR
Use enumerate() to get line numbers
@@ -278,9 +278,7 @@ class NameCheck(object): self.log.debug("Looking for macros in {} files".format(len(header_files))) for header_file in header_files: with open(header_file, "r") as header: - line_no = 0 - for line in header: - line_no += 1 + for line_no, line in enumerate(header): for macro in re.finditer(MACRO_REGEX, line): if not macro.group("macro").startswith(NON_MACROS): macros.append(Match( @@ -306,9 +304,7 @@ class NameCheck(object): self.log.debug("Looking for MBED names in {} files".format(len(files))) for filename in files: with open(filename, "r") as fp: - line_no = 0 - for line in fp: - line_no += 1 + for line_no, line in enumerate(fp): # Ignore any names that are deliberately opted-out or in # legacy error directives if re.search(r"// *no-check-names|#error", line): @@ -344,9 +340,7 @@ class NameCheck(object): # 2 = almost inside enum state = 0 with open(header_file, "r") as header: - line_no = 0 - for line in header: - line_no += 1 + for line_no, line in enumerate(header): # Match typedefs and brackets only when they are at the # beginning of the line -- if they are indented, they might # be sub-structures within structs, etc. @@ -395,12 +389,10 @@ class NameCheck(object): self.log.debug("Looking for identifiers in {} files".format(len(header_files))) for header_file in header_files: with open(header_file, "r") as header: - line_no = 0 in_block_comment = False previous_line = None - for line in header: - line_no += 1 + for line_no, line in enumerate(header): # Skip parsing this line if a block comment ends on it, # but don't skip if it has just started -- there is a chance # it ends on the same line.
docs - minor fixes to GUC list
</li> <li><xref href="#default_text_search_config" format="dita"/></li> <li> - <xref href="#default_transction_deferrable"/> + <xref href="#default_transaction_deferrable"/> </li> <li> <xref href="#default_transaction_isolation"/> <xref href="#gp_gpperfmon_send_interval"/> </li> <li> - <xref href="#gpperfmon_log_alert_level"/> + <xref href="#gp_hashjoin_tuples_per_bucket"/> </li> + <li><xref href="#gp_vmem_protect_limit"/></li> + <li><xref href="#gp_vmem_idle_resource_timeout"/></li> <li> - <xref href="#gp_hashjoin_tuples_per_bucket"/> + <xref href="#gpperfmon_log_alert_level"/> </li> <li> <xref href="#gpperfmon_port"/>
Do not solve LPs in presence of permute preventing edges even in unclustered approach
@@ -311,6 +311,13 @@ void fcg_add_pairwise_edges(Graph *fcg, int v1, int v2, PlutoProg *prog, int *co * is because,even after satisfying the permute preventing dep, it might * still prevent fusion. */ if (colour[fcg_offset1 + i] == 0 || colour[fcg_offset1 + i] == current_colour) { + if(fcg->adj->val[fcg_offset1+i][fcg_offset1+i]==1) { + /* Do not solve LPs if a dimenion of a statement is not permutable */ + for(j=0;j<stmts[v2]->dim_orig; j++) { + fcg->adj->val[fcg_offset1+i][fcg_offset2+j]=1; + } + continue; + } /* Set the lower bound of i^th dimension of v1 to 1 */ conflictcst->val[row_offset + src_offset+i][CST_WIDTH-1] = -1; @@ -318,6 +325,11 @@ void fcg_add_pairwise_edges(Graph *fcg, int v1, int v2, PlutoProg *prog, int *co for (j=0; j<stmts[v2]->dim_orig; j++) { if (colour[fcg_offset2 + j] == 0 || colour[fcg_offset2 + j] == current_colour) { + if(fcg->adj->val[fcg_offset1+i][fcg_offset1+i]==1) { + fcg->adj->val[fcg_offset1+i][fcg_offset2+j]=1; + continue; + + } /* Set the lower bound of i^th dimension of v1 to 1 */ conflictcst->val[row_offset + dest_offset+j][CST_WIDTH-1] = -1;
hw: bsp: frdm-k82f: Fix QSPI flash definition Use correct syscfg to access QSPI flash.
@@ -162,7 +162,7 @@ hal_bsp_flash_dev(uint8_t id) if (id == 0) { return &kinetis_flash_dev; } -#if MYNEWT_VAL(ENC_FLASH_DEV) +#if MYNEWT_VAL(QSPI_ENABLE) if (id == 1) { return &nxp_qspi_dev; } @@ -196,7 +196,8 @@ hal_bsp_power_state(int state) * memory allocation failed. This function changes to compare __HeapLimit with * heap end. */ -void *_sbrk(int incr) +void * +_sbrk(int incr) { extern char end __asm("end"); extern char heap_limit __asm("__HeapLimit");
Fix potential native crash when thread pool is downsized
@@ -189,6 +189,7 @@ namespace carto { if (listWorker.get() == &worker) { // Remove thread and worker _workers.erase(it); + _threads.at(index)->detach(); _threads.erase(_threads.begin() + index); break; }
Fix memset parameter
@@ -142,8 +142,8 @@ static void set_frame_info(kvz_frame_info *const info, const encoder_state_t *co info->nal_unit_type = state->frame->pictype; info->slice_type = state->frame->slicetype; - memset(info->ref_list[0], 0, 16); - memset(info->ref_list[1], 0, 16); + memset(info->ref_list[0], 0, 16 * sizeof(int)); + memset(info->ref_list[1], 0, 16 * sizeof(int)); for (size_t i = 0; i < state->frame->ref_LX_size[0]; i++) { info->ref_list[0][i] = state->frame->ref->pocs[state->frame->ref_LX[0][i]];
scheduler/printers.c: Add warning when loading printers Since drivers and raw queues going are deprecated and going to be removed, this change will introduce a warning during cupsd's start. This way we have all print queue installation options covered - lpadmin and web ui were enhanced with warning in the past.
@@ -944,6 +944,8 @@ cupsdLoadAllPrinters(void) *value, /* Pointer to value */ *valueptr; /* Pointer into value */ cupsd_printer_t *p; /* Current printer */ + int found_raw = 0; /* Flag whether raw queue is installed */ + int found_driver = 0; /* Flag whether queue with classic driver is installed */ /* @@ -1019,6 +1021,30 @@ cupsdLoadAllPrinters(void) cupsdSetPrinterAttrs(p); + if ((p->device_uri && strncmp(p->device_uri, "ipp:", 4) && strncmp(p->device_uri, "ipps:", 5) && strncmp(p->device_uri, "implicitclass:", 14)) || + !p->make_model || + (p->make_model && strstr(p->make_model, "IPP Everywhere") == NULL && strstr(p->make_model, "driverless") == NULL)) + { + /* + * Warn users about printer drivers and raw queues will be deprecated. + * It will warn users in the following scenarios: + * - the queue doesn't use ipp, ipps or implicitclass backend, which means + * it doesn't communicate via IPP and is raw or uses a driver for sure + * - the queue doesn't have make_model - it is raw + * - the queue uses a correct backend, but the model is not IPP Everywhere/driverless + */ + if (!p->make_model) + { + cupsdLogMessage(CUPSD_LOG_DEBUG, "Queue %s is a raw queue, which is deprecated.", p->name); + found_raw = 1; + } + else + { + cupsdLogMessage(CUPSD_LOG_DEBUG, "Queue %s uses a printer driver, which is deprecated.", p->name); + found_driver = 1; + } + } + if (strncmp(p->device_uri, "file:", 5) && p->state != IPP_PRINTER_STOPPED) { /* @@ -1409,6 +1435,12 @@ cupsdLoadAllPrinters(void) } } + if (found_raw) + cupsdLogMessage(CUPSD_LOG_WARN, "Raw queues are deprecated and will stop working in a future version of CUPS. See https://github.com/OpenPrinting/cups/issues/103"); + + if (found_driver) + cupsdLogMessage(CUPSD_LOG_WARN, "Printer drivers are deprecated and will stop working in a future version of CUPS. See https://github.com/OpenPrinting/cups/issues/103"); + cupsFileClose(fp); }
sha2: add test for overlapping buffers
@@ -130,4 +130,21 @@ mod tests { assert!(ctx.is_null()); }; } + + /// Test that input and output can be the same buffer. + #[test] + fn test_overlapping() { + let mut input_and_output = *b"12345678901234567890123456789012"; + unsafe { + rust_sha256( + input_and_output.as_ptr() as *const _, + input_and_output.len(), + input_and_output.as_mut_ptr(), + ); + } + assert_eq!( + &input_and_output, + &Sha256::digest(b"12345678901234567890123456789012")[..], + ); + } }
Do not set kmod header size, as it is incompatible with __TEXT permissions
@@ -1472,11 +1472,16 @@ InternalPrelinkKext64 ( // Populate kmod information. // KmodInfo->Address = LoadAddress; - KmodInfo->HdrSize = ALIGN_VALUE ( - (sizeof (*MachHeader) + MachHeader->CommandsSize), - 4096 - ); - KmodInfo->Size = (KmodInfo->HdrSize + SegmentVmSizes); + // + // This is a hack borrowed from XNU. Real header size is equal to: + // sizeof (*MachHeader) + MachHeader->CommandsSize (often aligned to 4096) + // However, it cannot be set to this value unless it exists in a separate segment, + // and presently it is not the case on macOS. When header is put to __TEXT (as usual), + // XNU makes it read only, and this prevents __TEXT from gaining executable permission. + // See OSKext::setVMAttributes. + // + KmodInfo->HdrSize = 0; + KmodInfo->Size = KmodInfo->HdrSize + SegmentVmSizes; // // Adapt the Mach-O header to signal being prelinked. //
build: bump ipsecmb version to 1.0 Type: improvement
# See the License for the specific language governing permissions and # limitations under the License. -ipsec-mb_version := 0.55 +ipsec-mb_version := 1.0 ipsec-mb_tarball := v$(ipsec-mb_version).tar.gz -ipsec-mb_tarball_md5sum_0.49 := 3a2bee86f25f6c8ed720da5b4b8d4297 -ipsec-mb_tarball_md5sum_0.52 := 11ecfa6db4dc0c4ca6e5c616c141ac46 -ipsec-mb_tarball_md5sum_0.53 := e9b3507590efd1c23321518612b644cd ipsec-mb_tarball_md5sum_0.54 := 258941f7ba90c275fcf9d19c622d2d21 ipsec-mb_tarball_md5sum_0.55 := deca674bca7ae2282890e1fa7f953609 +ipsec-mb_tarball_md5sum_1.0 := 906e701937751e761671dc83a41cff65 ipsec-mb_tarball_md5sum := $(ipsec-mb_tarball_md5sum_$(ipsec-mb_version)) ipsec-mb_tarball_strip_dirs := 1
Mark base64 URIs as NYI;
@@ -395,6 +395,7 @@ ModelData* lovrModelDataInit(ModelData* model, Blob* source, ModelDataIO io) { } if (uri.data) { + lovrAssert(strncmp("data:", uri.data, strlen("data:")), "Base64 URIs aren't supported yet");; size_t bytesRead; char filename[1024]; lovrAssert(uri.length < 1024, "Buffer filename is too long"); @@ -576,8 +577,9 @@ ModelData* lovrModelDataInit(ModelData* model, Blob* source, ModelDataIO io) { } else if (STR_EQ(key, "uri")) { size_t size = 0; char filename[1024]; - gltfString path = NOM_STR(json, token); - snprintf(filename, 1024, "%s/%.*s%c", basePath, (int) path.length, path.data, 0); + gltfString uri = NOM_STR(json, token); + lovrAssert(strncmp("data:", uri.data, strlen("data:")), "Base64 URIs aren't supported yet");; + snprintf(filename, 1024, "%s/%.*s%c", basePath, (int) uri.length, uri.data, 0); void* data = io.read(filename, &size); lovrAssert(data && size > 0, "Unable to read image from '%s'", filename); Blob* blob = lovrBlobCreate(data, size, NULL);
Sync FreeBSD ID.
#ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_cc_functions.c 353488 2019-10-14 13:02:49Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_cc_functions.c 356660 2020-01-12 15:45:27Z tuexen $"); #endif #include <netinet/sctp_os.h>
Fix the signature newctx documentation The documentation omitted the propq parameter Fixes
@@ -18,7 +18,7 @@ provider-signature - The signature library E<lt>-E<gt> provider functions */ /* Context management */ - void *OSSL_FUNC_signature_newctx(void *provctx); + void *OSSL_FUNC_signature_newctx(void *provctx, const char *propq); void OSSL_FUNC_signature_freectx(void *ctx); void *OSSL_FUNC_signature_dupctx(void *ctx); @@ -104,7 +104,7 @@ function pointer from an B<OSSL_DISPATCH> element named B<OSSL_FUNC_{name}>. For example, the "function" OSSL_FUNC_signature_newctx() has these: - typedef void *(OSSL_FUNC_signature_newctx_fn)(void *provctx); + typedef void *(OSSL_FUNC_signature_newctx_fn)(void *provctx, const char *propq); static ossl_inline OSSL_FUNC_signature_newctx_fn OSSL_FUNC_signature_newctx(const OSSL_DISPATCH *opf); @@ -183,7 +183,9 @@ structure for holding context information during a signature operation. A pointer to this context will be passed back in a number of the other signature operation function calls. The parameter I<provctx> is the provider context generated during provider -initialisation (see L<provider(7)>). +initialisation (see L<provider(7)>). The I<propq> parameter is a property query +string that may be (optionally) used by the provider during any "fetches" that +it may perform (if it performs any). OSSL_FUNC_signature_freectx() is passed a pointer to the provider side signature context in the I<ctx> parameter.
Fix header color format check in lv_img_decoder_built_in_info
@@ -275,8 +275,7 @@ lv_res_t lv_img_decoder_built_in_info(lv_img_decoder_t * decoder, const void * s lv_fs_close(&file); } - lv_img_cf_t cf = ((lv_img_dsc_t *)src)->header.cf; - if(cf < CF_BUILT_IN_FIRST || cf > CF_BUILT_IN_LAST) return LV_RES_INV; + if(header->cf < CF_BUILT_IN_FIRST || header->cf > CF_BUILT_IN_LAST) return LV_RES_INV; } #endif
Fix hanging startup
@@ -127,7 +127,8 @@ void DeRestPluginPrivate::cleanUpDb() // delete duplicates in device_descriptors //"DELETE FROM device_descriptors WHERE rowid NOT IN" //" (SELECT max(rowid) FROM device_descriptors GROUP BY device_id,type,endpoint)", - //nullptr + + nullptr }; for (int i = 0; sql[i] != nullptr; i++)
Remove stupid comments.
@@ -946,14 +946,13 @@ mergetraits(Node *ctx, Type *a, Type *b) static int tyrank(Type *t) { - /* plain tyvar */ if (t->type == Tyvar) { + /* has associated iterator type */ if (hthas(seqbase, t)) return 1; else return 0; } - /* concrete type */ return 2; }
Edit GPCC section in resource group for gpcc changed terminology
</li> </ul></li> <li id="im16806gpcc" otherprops="pivotal"> - <xref href="#topic999" type="topic" format="dita"/> + <xref href="#topic999" format="dita"/> </li> <li id="im16806d"> <xref href="#topic71717999" type="topic" format="dita"/> @@ -497,23 +497,21 @@ rg_perseg_mem = ((RAM * (vm.overcommit_ratio / 100) + SWAP) * gp_resource_group_ </topic> <topic id="topic999" otherprops="pivotal" xml:lang="en"> - <title>Using Greenplum Command Center to Manage Workloads</title> + <title>Using Greenplum Command Center to Manage Resource Groups</title> <body> - <p>A Greenplum Database workload is a resource group with special assignment - capabilities. With Pivotal Greenplum Command Center, an administrator can - create and manage workloads, and can define the criteria under which a transaction - is assigned to a workload. This capability to assign transactions to workloads - based on attributes other than the submitting role is unique to Greenplum Command - Center.</p> - <p>When you install and configure Greenplum Command Center, Greenplum Database - defers the assignment of transactions to resource groups to the workload - management component of the tool. You can also define idle session kill rules - with Greenplum Command Center, specifying the maximum number of seconds that a - session can remain idle before it kills itself. Refer to the - <xref href="http://gpcc.docs.pivotal.io/latest" format="html" - scope="external">Greenplum Command Center documentation</xref> for more - information about creating and managing workloads, transaction assignment, - and session kill rules.</p> + <p>Using Pivotal Greenplum Command Center, an administrator can create and manage resource + groups, change roles' resource groups, and create workload management rules. </p> + <p>Workload management rules are defined in Command Center and stored in Greenplum Database. + When a transaction is submitted, Greenplum Database calls the workload management database + extension to evaluate and apply the rules. </p> + <p>Workload management assignment rules assign transactions to different resource groups based + on user-defined criteria. If no assignment rule is matched, Greenplum Database assigns the + transaction to the role's default resource group. Workload management idle session kill + rules set the maximum number of seconds that sessions managed by a resource group can remain + idle before they are terminated.</p> + <p>Refer to the <xref href="http://gpcc.docs.pivotal.io/latest" format="html" scope="external" + >Greenplum Command Center documentation</xref> for more information about creating and + managing resource groups and workload management rules. </p> </body> </topic>
Correct comment Change "for use with Visual Basic (C#)" to "for use with C#"
@@ -6,7 +6,7 @@ using System.Runtime.InteropServices; //Last updated on 17/09/2020 //Declarations of functions in the EPANET PROGRAMMERs TOOLKIT -//(EPANET2.DLL) for use with Visual Basic (C#) +//(EPANET2.DLL) for use with C# namespace EpanetCSharpLibrary
fixed escape if error occurs
@@ -1729,7 +1729,9 @@ static void processShortcuts(Studio* studio) ? setStudioMode(studio, studio->prevMode) : gotoMenu(studio); break; - case TIC_CONSOLE_MODE: setStudioMode(studio, studio->prevMode); break; + case TIC_CONSOLE_MODE: + setStudioMode(studio, TIC_CODE_MODE); + break; case TIC_CODE_MODE: if(studio->code->mode != TEXT_EDIT_MODE) {
esp32s2/soc: Fix periph_ll_periph_enabled Logs, before to go the deepsleep, were not completely flushed.
@@ -274,7 +274,7 @@ static inline void periph_ll_reset(periph_module_t periph) static inline bool IRAM_ATTR periph_ll_periph_enabled(periph_module_t periph) { - return DPORT_REG_GET_BIT(periph_ll_get_rst_en_reg(periph), periph_ll_get_rst_en_mask(periph, false)) != 0 && + return DPORT_REG_GET_BIT(periph_ll_get_rst_en_reg(periph), periph_ll_get_rst_en_mask(periph, false)) == 0 && DPORT_REG_GET_BIT(periph_ll_get_clk_en_reg(periph), periph_ll_get_clk_en_mask(periph)) != 0; }
Avoid questionable use of the value of a pointer that refers to space deallocated by a call to the free function in tls_decrypt_ticket.
@@ -1311,10 +1311,11 @@ TICKET_RETURN tls_decrypt_ticket(SSL *s, const unsigned char *etick, p = sdec; sess = d2i_SSL_SESSION(NULL, &p, slen); + slen -= p - sdec; OPENSSL_free(sdec); if (sess) { /* Some additional consistency checks */ - if (p != sdec + slen || sess->session_id_length != 0) { + if (slen != 0 || sess->session_id_length != 0) { SSL_SESSION_free(sess); return TICKET_NO_DECRYPT; }
Writing about FONT.BMP
@@ -182,7 +182,7 @@ to input underscore(_), press Shift+right Ctrl. BIOS files --- * bios.rom -* FONT.ROM (big letter) +* FONT.ROM (big letter) or FONT.BMP (big letter) * itf.rom * sound.rom * (bios9821.rom or d8000.rom But I never see good dump file.)
fix another ubsan issue
@@ -1287,7 +1287,7 @@ nn_t nn_sort_outputs_by_list_F(nn_t x, int N, const char* sorted_names[N]) int index = 0; - const char* nnames[N]; + const char* nnames[N?:1]; int NN = names_remove_double(N, nnames, sorted_names); for (int i = 0; i < OO; i++){
extmod/modrobotics: fix turn acceleration setter
@@ -234,7 +234,7 @@ STATIC mp_obj_t robotics_DriveBase_settings(size_t n_args, const mp_obj_t *pos_a self->straight_speed = pb_obj_get_default_int(straight_speed, self->straight_speed); self->straight_acceleration = pb_obj_get_default_int(straight_acceleration, self->straight_acceleration); self->turn_rate = pb_obj_get_default_int(turn_rate, self->turn_rate); - self->turn_acceleration = pb_obj_get_default_int(turn_rate, self->turn_acceleration); + self->turn_acceleration = pb_obj_get_default_int(turn_acceleration, self->turn_acceleration); return mp_const_none; }