Skip to content
Snippets Groups Projects

Simplify locking for HDF5

Merged Simplify locking for HDF5
simplify_lock into master
Merged Tammo Jan Dijkema requested to merge simplify_lock into master

Created by: tammojan

There was a case where the HDF5 mutex was not set when calling ApplyCal from nested threads. Rather than trying to pass the mutex around, I've introduced a static mutex, which also cleans up a bit. This mutex is used only for reading HDF5, so is not in any critical part of execution.

Solves #167 (closed)

Merge request reports

Approval is optional

Merged by avatar (Mar 14, 2025 5:08am UTC)

Merge details

  • Changes merged into master with c892c888 (commits were squashed).
  • Deleted the source branch.

  • Mentions issue #167 (closed)

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
DPPP/Predict.cc
434 434
435 435 // Call ApplyCal step
436 436 if (itsDoApplyCal) {
437 if(itsMeasuresMutex == nullptr)
438 itsApplyCalStep.process(itsTempBuffer);
439 else
440 itsApplyCalStep.process(itsTempBuffer, itsMeasuresMutex);
  • Tammo Jan Dijkema
    Tammo Jan Dijkema @dijkema ·
    Author Owner

    Created by: tammojan

    I don't know why itsMeasuresMutex was used here; it seems that an existing threading mutex was reused for HDF5.

  • Tammo Jan Dijkema
    Tammo Jan Dijkema @dijkema started a thread on commit c892c888
    • DPPP/Predict.cc
    434 434
    435 435 // Call ApplyCal step
    436 436 if (itsDoApplyCal) {
    437 if(itsMeasuresMutex == nullptr)
    438 itsApplyCalStep.process(itsTempBuffer);
    439 else
    440 itsApplyCalStep.process(itsTempBuffer, itsMeasuresMutex);
    Please register or sign in to reply