Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ApplicationCore
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ChimeraTK Mirror
ApplicationCore
Commits
64eb6185
Commit
64eb6185
authored
4 years ago
by
Martin Killenberg
Browse files
Options
Downloads
Patches
Plain Diff
TriggerFanOut: don't drop out of testable mode when waiting for device initialisation
parent
3018fc82
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/Application.h
+5
-3
5 additions, 3 deletions
include/Application.h
include/TriggerFanOut.h
+3
-0
3 additions, 0 deletions
include/TriggerFanOut.h
with
8 additions
and
3 deletions
include/Application.h
+
5
−
3
View file @
64eb6185
...
...
@@ -161,7 +161,7 @@ namespace ChimeraTK {
pthread_setname_np
(
pthread_self
(),
name
.
substr
(
0
,
std
::
min
<
std
::
string
::
size_type
>
(
name
.
length
(),
15
)).
c_str
());
}
void
debugMakeConnections
(){
enableDebugMakeConnections
=
true
;
};
void
debugMakeConnections
()
{
enableDebugMakeConnections
=
true
;
};
ModuleType
getModuleType
()
const
override
{
return
ModuleType
::
ModuleGroup
;
}
...
...
@@ -429,8 +429,10 @@ namespace ChimeraTK {
// testableMode_counter and the
// idMap
friend
class
TestFacility
;
// needs access to testableMode_variables
friend
class
DeviceModule
;
// needs access to testableMode_variables
friend
class
TestFacility
;
// needs access to testableMode_variables
friend
class
DeviceModule
;
// needs access to testableMode_variables
friend
class
DeviceModule
;
// needs access to testableMode_variables
friend
class
TriggerFanOut
;
// needs access to testableMode_variables
template
<
typename
UserType
>
friend
class
DebugPrintAccessorDecorator
;
// needs access to the idMap
...
...
This diff is collapsed.
Click to expand it.
include/TriggerFanOut.h
+
3
−
0
View file @
64eb6185
...
...
@@ -93,9 +93,12 @@ namespace ChimeraTK {
// Wait until the device has been initialised for the first time. This means it
// has been opened, and the check in TransferGroup::read() will not throw a logic_error
// We don't have to store the lock. Just need it as a synchronisation point.
// But we have to increase the testable mode counter because we don't want to fall out of testable mode at this point already.
++
Application
::
getInstance
().
testableMode_deviceInitialisationCounter
;
Application
::
testableModeUnlock
(
"WaitInitialValueLock"
);
(
void
)
_deviceModule
.
getInitialValueSharedLock
();
Application
::
testableModeLock
(
"Enter while loop"
);
--
Application
::
getInstance
().
testableMode_deviceInitialisationCounter
;
while
(
true
)
{
transferGroup
.
read
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment