Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed JEvent use check when it is returning to pool #379

Merged
merged 3 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.16)
cmake_policy(SET CMP0074 NEW) # find_package() uses <PackageName>_ROOT implicit hints

project(jana2 VERSION 2.3.2)
project(jana2 VERSION 2.3.3)

set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Enable -fPIC for all targets

Expand Down
19 changes: 19 additions & 0 deletions docs/Download.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,25 @@
- [See online doxygen documentation](http://www.jlab.org/JANA/jana_doc_latest/index.html)
- [Download doxygen documentation](http://www.jlab.org/JANA/jana_doc_latest.tar.gz)

### 2.3.3

#### Bugfixes
* Fix problem with user-defined factory generators (#366)
* JEventProcessor::Process() called before BeginRun() (#367)
* Lock overwrite in RootFillLock() (#369)
* JFactory::Finish() is called (#377)

#### Features
* JTopologyBuilder supports topologies with arbitrarily nested levels (#346)
* Barrier events are back (#371)

#### Refactoring
* Improved log output (#368)
* JTest uses new-style component interfaces (#374)
* JArrows now fire on individual events (#375, #378)

- [See release on GitHub](https://github.com/JeffersonLab/JANA2/releases/tag/v2.3.3)

### 2.3.2
This release includes the following:

Expand Down
5 changes: 0 additions & 5 deletions src/libraries/JANA/Topology/JEventPool.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,6 @@ class JEventPool {
// Do any necessary teardown within the item itself
item->Clear();
}
auto use_count = item->shared_from_this().use_count();
if (use_count > 2) {
// Use count should be 2 because there's the shared_ptr in `m_owned_events`, and there's the temporary shared_ptr created just now
throw JException("Attempted to return a JEvent to the pool while it is still being used! use_count=%d", use_count);
}

LocalPool& pool = *(m_pools[location]);

Expand Down
Loading