areaDetector / ADCore

41%

master: 39%

LAST BUILD ON BRANCH fix-capture

branch: fix-capture

CHANGE BRANCH

x

Reset

• fix-capture
• NDArray_changes
• NDPluginPva_removedestroy
• R2-6
• R3-10
• R3-11
• R3-2
• R3-3
• R3-3-1
• R3-3-2
• R3-4
• R3-5
• R3-6
• R3-7
• R3-8
• R3-9
• ROI_Collapse_Dims
• Remove_MAX_ATTRIBUTE_STRING_SIZE
• Without_shareLib
• add_bitshuffle
• attrString_change
• attribute_improvements
• bad_pixel_plugin
• build_NDPluginSupport_dbd
• ci_fixes
• codec_improvements
• fft_average
• fix-350
• fixAcquireBusy2
• fixHDF5
• fix_AcquireBusy
• fix_chunking
• fix_hdf5_leaks
• fix_hdf5_string_size
• fix_queued_arrays
• hdf5_string2
• improve_disconnect
• issue-116
• issue-145-NDattributes-optional
• issue-227-AsynPortClientContainer
• lz4_filter
• master
• nanohttp_stream
• no_ADBinaries
• overlay_enhancements
• overlay_fix
• plugin_count
• pool_multiset
• prjemian-patch-1
• prjemian-patch-2
• process_plugin
• pva_fixes
• queue_size_fix
• rate-limit
• revert-string-type
• scatter_gather
• stats_time_series
• swmr_integration
• thread_pool
• travis-tweaks
• travis-valgrind
• unittest_fixes
• v4-plugin
• when_attribute_issue_304

Build # 856

Build Type

push

travis-ci

Committed by MarkRivers

Commit Message

Changed Capture mode.  Previously it created NumCapture NDArrays using the "new" operator.
As NDArrays arrived it copied the data and attributes into these arrays.
This had several problems:
- The NDArrays were not allocated from the NDArrayPool, so memory limits were not enforced.
- Because they were not allocated from the NDArrayPool if they were passed to other functions
  or plugins there would be problems with attempts to called NDArray::reserve() or release().
- The copy operation is inefficient and not a good idea.
The change was to simply allocate an array of NumCapture pointers.  As NDArrays arrive
their reference count is incremented with reserve() and the pointer is copied to the array.
After the files are written the cleanup routine now simply decrements the reference counter
with release(), rather than having to delete the NDArray.
The new scheme is much cleaner.  It will require setting the memory and array limits
for the NDArrayPool to be large enough to buffer NumCapture frames, whereas previously
this would not have been required.  It may thus require some changes to startup scripts.

Run Details

4304 of 10524 relevant lines covered (40.9%)

307.07 hits per line