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
8885d55c
Commit
8885d55c
authored
5 years ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Patches
Plain Diff
changed code formatting
parent
f2f906bb
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/DeviceModule.h
+2
-2
2 additions, 2 deletions
include/DeviceModule.h
src/DeviceModule.cc
+2
-2
2 additions, 2 deletions
src/DeviceModule.cc
with
4 additions
and
4 deletions
include/DeviceModule.h
+
2
−
2
View file @
8885d55c
...
...
@@ -110,7 +110,7 @@ namespace ChimeraTK {
/** Use this function to report an exception. It should be called whenever a
* ChimeraTK::runtime_error has been caught when trying to interact with this
* device. This function shall not be called by the user, all exception
* handling is done internally by ApplicationCore.
* handling is done internally by ApplicationCore.
* This functions is blocking until the Device reports isFunctional() again.*/
void
reportException
(
std
::
string
errMsg
);
...
...
@@ -153,7 +153,7 @@ namespace ChimeraTK {
* Initialisation handlers are called after the device has been opended, or after the device is recovering
* from an error (i.e. an accessor has thrown an exception and Device::isFunctional() returns true afterwards).
*
* You can add mupltiple handlers. They are executed in the sequence in which they are registered. If a handler
* You can add mupltiple handlers. They are executed in the sequence in which they are registered. If a handler
* has been registered in the constructor, it is called first.
*
* The handler function is called from the DeviceModule thread (not from the thread with the accessor that threw the exception).
...
...
This diff is collapsed.
Click to expand it.
src/DeviceModule.cc
+
2
−
2
View file @
8885d55c
...
...
@@ -314,8 +314,8 @@ namespace ChimeraTK {
// Just check the condition variable.
std
::
unique_lock
<
std
::
mutex
>
errorLock
(
errorMutex
);
while
(
!
deviceHasError
)
{
boost
::
this_thread
::
interruption_point
();
// Make sure not to start waiting for the condition variable if
interruption was requested.
boost
::
this_thread
::
interruption_point
();
// Make sure not to start waiting for the condition variable if
//
interruption was requested.
errorIsReportedCondVar
.
wait
(
errorLock
);
// this releases the mutex while waiting
boost
::
this_thread
::
interruption_point
();
// we need an interruption point in the waiting loop
}
...
...
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