Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

advLigoRTS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Incidents

Snippets Groups Projects

500a1506

Commit 500a1506 authored 4 years ago by Erik von Reis

Downloads
- Plain Diff

Merge branch 'daqd_not_exiting_issue_96' into 'master'

Daqd not exiting issue 96

See merge request cds/advligorts!115

parents 3770a87e f1d072a8

No related branches found

No related tags found

1 merge request!115Daqd not exiting issue 96

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/daqd/CMakeLists.txt 3 additions, 3 deletions

src/daqd/CMakeLists.txt
src/daqd/circ.cc 48 additions, 3 deletions

src/daqd/circ.cc
src/daqd/circ.hh 1 addition, 0 deletions

src/daqd/circ.hh
src/daqd/daqd.cc 1 addition, 1 deletion

src/daqd/daqd.cc
src/daqd/daqd_thread.cc 23 additions, 5 deletions

src/daqd/daqd_thread.cc
src/daqd/daqd_thread.hh 198 additions, 0 deletions

src/daqd/daqd_thread.hh
src/daqd/producer_shmem.cc 1 addition, 1 deletion

src/daqd/producer_shmem.cc
src/daqd/tests/test_daqd_thread.cc 1 addition, 1 deletion

src/daqd/tests/test_daqd_thread.cc
src/daqd/thread_launcher.hh 0 additions, 28 deletions

src/daqd/thread_launcher.hh
src/daqd/trend.cc 115 additions, 213 deletions

src/daqd/trend.cc
src/daqd/trend.hh 71 additions, 65 deletions

src/daqd/trend.hh

with 462 additions and 320 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment