Release: Update stable to alpha 7.153.3#2927
Merged
WhoBrokeTheBuild merged 198 commits intostablefrom Jun 30, 2025
Merged
Conversation
WhoBrokeTheBuild
requested review from
GabrieleManduchi,
heidthecamp,
joshStillerman,
mwinkel-dev and
santorofer
WhoBrokeTheBuild
added
the
branch/stable
* Fix:improve error messages * Some minor fixes Co-authored-by: GabrieleManduchi <andrea.rgn@gmail.com>
* Fix: explicitly setting the WRTD_TICKNS from tree node value * Modify some node options * Clean the node entries for better readability
A user wants to call xlate_logicalname in camshr. New entrypoint added to expose this routine. Closes issue: #2319
Default Wait mode does not seem to work in all circumstances. this commit changes it to 'Busy' wait instead. Also: Encode strings for Python3 compatability.
…plus node (#2348) * Feature: New TDI python fun to read data from Influxdb from an MDSplus tree * Only use getTimeContext. Query was improved to be more general * Add small comment * Read credentials from file * Change input order. Add address and credentials * Address and credentials input as MDSplus tree nodes * Add small comment * Consolidate WHERE and time start and end tiime * Refactor code * Several changes to input parameters and variable names * Fix to the 435st class so that the trig_time node is correctly populated with the star time of the shot * Add file in kernel packaging list
User reported that #pragma once, which is a nonstandard feature is not supported by their compiler. As it is 'nonstandard' it seemed sensible to revert to #ifndef _FILENAME_EXT instead
Co-authored-by: mdsplus <mdsplus@scdevail.rfx.local>
…he ACQ2106 WRTD TICKNS. (#2355) * Fix: Set the WRTD_TICKNS from loaded clock plan * Fix the value of the 5M12 frequency * Improve some comments * Improve error handling * Remove 2 unused nodes * Remove un-necessary check logic and use sync_role query to check plan * Remove a small bug when building the plan string
* Refactor code to include Influx aggregation parameter to deal with setTimeContext() delta step * Add debug statements * Add comment remove TODO * Add changes to 435st and 423st so that the start time is recorded at the beginning
i merge it now so i have time to fix it in case it does not work
* Fix: matlab support for 2021a; removed deprecated stuff * Build: upodated matlab packages
manually tested with and without setuptools,
* Updates to support library for National Devices * Fix:required changes for trees in threads These changes are required aftera MDSplus update that requests reopening a tree for every created thread * New and updated devices * Update rpm * Fix wrong nid * Fix wrong nid * Python3 compatibility * Ermove commented * e Please enter the commit message for ynund comments r changes. Lines starting * type * Wrong fix * MARTE2_SUPERVISOR improvements * Further devices * Updated pkg * Open tree in every thread * clang-format * somee python cleanup Co-authored-by: mdsplus <mdsplus@mcpsl.nbtf> Co-authored-by: GabrieleManduchi <andrea.rgn@gmail.com> Co-authored-by: cloud <timo.schroeder@ipp.mpg.de>
* Fix: on some systems UIDs are > 16 bits On systems using active directory uids can be constructed from AD SIDs and may have bits in their high word set. This PR addresses #2375 If their are bits set in the high word of the UID then do not or in the group. When displaying in TCL, if the the low 16 bits of the owner do not translate to a user, then try to translate all 32 bits to an owner * Fix: remove grp from tcl and added flag2 bit for 32uid * Tests: fixed owner to show uid only Co-authored-by: Josh Stillerman <jas@psfc.mit.edu>
* Fix: add list fall-back implementation to support older servers MdsIpTunnel is special MdsIpFile, support space ' ' as %20 * Fix: handle Process stream closed * Fix: fixed/suppressed all warnings * Build: added possible suppression for existing definite in dlopen * Fix: check message header before trying to read MSGLEN more bytes
* Fix:change incorrect jScope property file * Fix:handle tree context in different threads A diffent tree context is now created whenever the the thread owning the tree object has changed * Fix:tree context in multithreaded applications This version computes the correct, thread-dependent, context * Fix error compiler * Fix compiler error * Make sure ctx vector is empty * Windows portability * Windows compiler issues * Remove Finalize() * Fix leaks Co-authored-by: GabrieleManduchi <andrea.rgn@gmail.com>
* Fix : Asynchronous data segments acquisition fixed. : * Fix: Add device reset, nisync_reset, in init operation * Added devices * Add3ed MARTe2 devices * Fix: Added delay of 500ms in the trigger method to ensure the correct synchronization of timing signals. * Updared interface * Updated deployment Co-authored-by: mdsplus <mdsplus@mcpsl.nbtf> Co-authored-by: GabrieleManduchi <andrea.rgn@gmail.com>
* Feature: add NCI attribute compression_method
Use the NCI field spare2 to hold a 1 byte compression_method which
will be used to determine which of the supported (distributed)
compression methods will be used to compress this node.
1 --> 'standard'
2 --> 'gip'
this is a work in progress.
Still need:
tcl_set_node - keep a stack of error strings since now we have a
warning, which will keep going.
tcl dir/full - display this
tdi SETNCI and GETNCI
treeshr (use the compression method)
*
Use the NCI field spare2 to hold a 1 byte compression_method which
will be used to determine which of the supported (distributed)
compression methods will be used to compress this node.
1 --> 'standard'
2 --> 'gip'
this is a work in progress.
Still need:
tcl_set_node - keep a stack of error strings since now we have a
warning, which will keep going.
tcl dir/full - display this
tdi SETNCI and GETNCI
treeshr (use the compression method)
* python Tree createPulse - now possible to pass optional arguments to _TreeCreatePulseFile. A bit related to issue #1326 * createPulse: use isinstance(...TreeNode); cast int(...) node_or_nid; copy_only_this Boolean by default * updated header to reflect copy_only_this is Boolean
Update `strtok` to `strtok_r` in `ReplaceAliasTrees` to prevent issues when multithreading. The internal `saveptr` was being clobbered, so this moves it into the function, and therefore safely in the thread. Reorder the `io_disconnect` function for the thread backend. The cleanup of the last request/response messages were being interrupted by the `pthread_cancel`, which is fixed by moving the `pipe_close` calls above it, matching the windows implementation.
* MdsLib: include libroutines.h * MACOS_ARM64: calling LibCallgFfi * LibCallgFfi: added the function * LibCallgFfi: enums defined * LibCallgFfi: enum members renamed VA_N_FIXED_ARGS * LibCallgFfi: define MDSPLUS_USE_FFI * LibCallgFfi: revisions as per review of PR 2877 * LibCallgFfi: added status = to the t4012.c device to prevent compiler errors on alpha * fixed_args: changes to TdiCall.c * LibCallgFfi: now uses NOT_VARIADIC in TdiCall.c * TdiCall: switch to MDSPLUS_USE_FFI, etc * TdiCall: fix indentation * fixed_args: change to lex * fixed_args: update Java and TDI tests * TdiCall: refactor the LibCallg sections * LibCallgFfi: eliminate MDS_BYPASS_FFI define by adding boolean parameter to interlude() * TdiCall: ignore compiler warning about unused parameter * TdiCall: remove unnecessary strdup and strtok * LibCallgFfi: add comments about limitations * TdiCall: changes reviewer suggested re tdi_call() * TdiCall: fix bypass_ffi declaration * TdiCall: fix num_fixed_args declaration * TdiExtFunction: now only executes TDI *.fun files * TdiExtFunction: remove rest of unneded code
…2889) * Fix: remote_submit_helper.fun now accepts zero id and has a timeout * Fix: MdsConnect.fun now has correct check for invalid connection id * Fix: correct typo in MdsConnect.fun
* LibCallg: similar edits to LibCallgFfi * Fix: assert() replaced with abort() in LibCallg* routines
* Fix:remove race conditions leading to deadlock Removed several useless synchronized methods and moved waveform computatuon to mai thread * Fix:insufficient timing precision due to the usage of float instead of double A new routine has been added (GetXYSignalDoubleTimes) receiving time window inof as double. This will be used by the new jScope versions, still retaining the older one for previlus jScope versions. * Fix:remove race conditions leading to deadlock Added small suggested changes. * Fix:remove race conditions leading to deadlock Added forgotten import * Fix:remove race conditions leading to deadlock reported suggested small changes --------- Co-authored-by: mdsplus administrator <mdsplus@aidevel.rfx.local>
- Set `dlen` after potentially flipping the bytes in `msglen` - Correctly pass the compressed length to `uncompress()` - Use the correct type (unsigned) for the compressed message length
Having 'javax.swing' in MdsConnection was adversly affecting other areas of the code
* Fix: added fix for the mdsip spinning issues * Changed the way we checked nbytes to avoid mdsip services from becoming zombies
* Feature: Add python copyTo method to Tree and TreeNode
This adds the copyTo method to Tree and TreeNode in the python API
copyTo allows you to copy a portion of a tree to another tree, optionally:
* Filtering unwanted nodes
* Copying data
* Copying tags
* Copying XNCIs
* Copying NCIs
Example:
```
t1 = Tree('testsrc', -1, 'READONLY')
t2 = Tree('testdst', -1, 'EDIT')
def skip_devices(node):
return (node.conglomerate_elt == 0)
t1.BRANCH.copyTo(t2.SECTION, node_filter=skip_devices, copy_xnci=False)
t1.close()
t2.write()
t2.close()
```
* Remove python 3.6 f-strings, replace mdsExceptions with _exc
* Fix Typos
* Rename src to self and add an alias
* Fix Tree.copyTo extra argument
* Update docstring for TreeNode.copyTo
* Further sanitize tag names
* Update TreeNode.copyTo to update tree paths in data
Remove decompile/compile for node data, as this lost floating point precision
Add _update_tree_paths which recursively finds tree nodes in data structures and rewrites them to point at the destination tree
* Add missing getDefault() to _update_tree_paths
* Add workaround for weird Tree/NID scenario
This appears to be some more efficient approach to array creation that was previously handled by a while loop.
* Fix: some upgrades to comply with Python3 * Change to using factory() instead of Acq2106_TIGA * Change transition times to be in 1/10 of usec * Improve comments and readability of parts array * Add wrpg device with signals as outputs instead * Add wrpg device with signals as outputs * Remove print statements and comment on the limits of STL states * Remove print statements, comment on the limits of STL states and add device to noarch packages * Remove print statements, comment on the limits of STL states and add device to noarch packages * Remove forgotten print statements and comments
fix the text about returning from the map
#2835) * Fix: dispatching any action causes actmon/actlog to crash with SIGSEGV * Rename Svr -> Srv * Always use 2 arguments for callback_done signature * Fix: recursive calls to CheckIn * Fix: Amend CommandDone and action_done signature * Fix: Add actlog test
* Fix: fix typo using addEvent instead of removeEvent * Fix: start test for java remote event handling * Fix: Test wfevent with local and remote events * Fix: Fix copy data from remote event * Fix: typos and uninitialized memory * Skip wfevent tests * Skip java tests as well
WhoBrokeTheBuild
force-pushed
the
update-stable-7-153-3
branch
from
1514a69 to
dc75a09
Compare
joshStillerman
previously approved these changes
Jun 30, 2025
Contributor
joshStillerman
left a comment
joshStillerman
left a comment
There was a problem hiding this comment.
I trust that the thorough review that you all did when assembling this PR was good and sufficient!
New Stable! Yea!
mwinkel-dev
approved these changes
Jun 30, 2025
Contributor
mwinkel-dev
left a comment
mwinkel-dev
left a comment
There was a problem hiding this comment.
The only change after Josh's approval was the patch for NumPy 2.3 and greater.
I visually compared that patch with PR #2928 and confirmed that the changes are identical.
Furthermore, in recent days I have installed and used the current "alpha" on various development systems without any problem. Because this PR promotes that snapshot of "alpha" to the new "stable", all should be OK.
Thus, am approving this PR.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.