Skip to content
Snippets Groups Projects

xAODRootAccess: make TStore const-aware

Merged xAODRootAccess: make TStore const-aware
fwinkl/athena:xaodroot_const into master
All threads resolved!
Merged Frank Winklmeier requested to merge fwinkl/athena:xaodroot_const into master
All threads resolved!

In order to avoid the many const_cast in xAODRootAccess we make the TStore and THolder aware of the const-ness of the recorded object. We still only hold non-const void* but we check on retrieval for const-violations. This is the same logic as implemented in StoreGate.

This MR consists of two commits. The first one contains the actual functional changes. The second commit is just following through with making the code const-correct.

In a nutshell the changes are:

  1. Add THolder( const void*, ...) constructors in addition to the non-const versions. If the const version is used we cast it away but remember that it was const in a new boolean m_const flag.
  2. Similarly we add TStore::record methods that take const pointers.

One of the consequences of enforcing const-correctness is that the retrieval of a non-const ConstDataVector is no longer allowed (the unit test has been adjusted accordingly). That's the same behavior as in StoreGate.

Relates to ATEAM-863 and @akraszna will certainly want to review this.

Edited by Frank Winklmeier

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Attila Krasznahorkay
  • Attila Krasznahorkay
  • Attila Krasznahorkay
  • Attila Krasznahorkay
    Attila Krasznahorkay @akraszna ·
    Maintainer

    Apart from some minor technical comments, I give my blessing. It looks reasonable as much as I can tell.

  • Attila Krasznahorkay resolved all threads

    resolved all threads

  • Frank Winklmeier removed review-pending-level-1 label

    removed review-pending-level-1 label

  • Frank Winklmeier added review-user-action-required label

    added review-user-action-required label

  • Frank Winklmeier resolved all threads

    resolved all threads

  • Frank Winklmeier added 58 commits

    added 58 commits

    • 25110e9b...c92f8746 - 56 commits from branch atlas:master
    • f4ff7dc9 - xAODRootAccess: keep track of const-ness in TStore
    • 7695b085 - xAODRootAccess: minor const fixes to object retrieval

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :pencil: Build area was cleaned as per request posted in the DB. The full software build will be performed

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Control/xAODRootAccess

    This merge request affects 23 files:

    • Control/xAODRootAccess/Root/TAuxBranchManager.cxx
    • Control/xAODRootAccess/Root/TAuxManager.cxx
    • Control/xAODRootAccess/Root/TEvent.cxx
    • Control/xAODRootAccess/Root/THolder.cxx
    • Control/xAODRootAccess/Root/TObjectManager.cxx
    • Control/xAODRootAccess/Root/TPrimitiveAuxBranchManager.cxx
    • Control/xAODRootAccess/Root/TPyStore.cxx
    • Control/xAODRootAccess/Root/TStore.cxx
    • Control/xAODRootAccess/Root/xAODTEventBranch.cxx
    • Control/xAODRootAccess/Root/xAODTMetaBranch.cxx
    • Control/xAODRootAccess/test/ut_xaodrootaccess_tevent_test.cxx
    • Control/xAODRootAccess/test/ut_xaodrootaccess_tstore_test.cxx
    • Control/xAODRootAccess/xAODRootAccess/TStore.h
    • Control/xAODRootAccess/xAODRootAccess/TStore.icc
    • Control/xAODRootAccess/xAODRootAccess/tools/TAuxBranchManager.h
    • Control/xAODRootAccess/xAODRootAccess/tools/TAuxManager.h
    • Control/xAODRootAccess/xAODRootAccess/tools/TCDVHolderT.icc
    • Control/xAODRootAccess/xAODRootAccess/tools/THolder.h
    • Control/xAODRootAccess/xAODRootAccess/tools/TObjectManager.h
    • Control/xAODRootAccess/xAODRootAccess/tools/TPrimitiveAuxBranchManager.h
    • Control/xAODRootAccess/xAODRootAccess/tools/TVirtualManager.h
    • Control/xAODRootAccess/xAODRootAccess/tools/xAODTEventBranch.h
    • Control/xAODRootAccess/xAODRootAccess/tools/xAODTMetaBranch.h

    Adding @akraszna ,@ssnyder as watchers

  • ATLAS Robot added review-pending-level-1 label and removed review-user-action-required label

    added review-pending-level-1 label and removed review-user-action-required label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 140K in file Control/xAODRootAccess/Root/TEvent.cxx

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :x: CI Result FAILURE (hash 7695b085)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    tests :o: :white_check_mark: :white_check_mark: :white_check_mark: :o:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 64886]

  • Frank Winklmeier
    Frank Winklmeier @fwinkl ·
    Author Maintainer

    Failures are unrelated and the same as in the full nightly build.

  • Jason Robert Veatch
    Jason Robert Veatch @jveatch ·
    Developer

    The changes look fine and the CI issues are unrelated. Approving.

    Jason (L1)

  • Jason Robert Veatch added review-approved label and removed review-pending-level-1 label

    added review-approved label and removed review-pending-level-1 label

  • Julien Maurer added review-approved-tier0 label

    added review-approved-tier0 label

  • Rui Yuan added analysis-review-approved label and removed analysis-review-required label

    added analysis-review-approved label and removed analysis-review-required label

  • Adam Edward Barton merged

    merged

  • Adam Edward Barton mentioned in commit bfde3e12

    mentioned in commit bfde3e12

  • Atlas Nightlybuild added sweep:ignore label

    added sweep:ignore label

  • Philipp Gadow mentioned in merge request svanstro/training-dataset-dumper!4 (merged)

    mentioned in merge request svanstro/training-dataset-dumper!4 (merged)

    • Please register or sign in to reply