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
451c6cfd
Commit
451c6cfd
authored
4 years ago
by
Martin Killenberg
Browse files
Options
Downloads
Patches
Plain Diff
some code cleanup and docu improvements
parent
b8b271f7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/DeviceModule.h
+5
-3
5 additions, 3 deletions
include/DeviceModule.h
include/TriggerFanOut.h
+0
-1
0 additions, 1 deletion
include/TriggerFanOut.h
src/ExceptionHandlingDecorator.cc
+0
-1
0 additions, 1 deletion
src/ExceptionHandlingDecorator.cc
with
5 additions
and
5 deletions
include/DeviceModule.h
+
5
−
3
View file @
451c6cfd
...
...
@@ -112,10 +112,12 @@ 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.
* This functions is blocking until the Device reports isFunctional() again.*/
* device. It is primarily used by the ExceptionHandlingDecorator, but also user modules
* can report exception and trigger the recovery mechanism like this. */
void
reportException
(
std
::
string
errMsg
);
/** This functions is blocking until the device has been opened, initialsed and all recovery accessors
* have been written. If the device is not in an error state, the function will return immediately. */
void
waitForRecovery
();
void
prepare
()
override
;
...
...
This diff is collapsed.
Click to expand it.
include/TriggerFanOut.h
+
0
−
1
View file @
451c6cfd
...
...
@@ -108,7 +108,6 @@ namespace ChimeraTK {
lastValidity
=
DataValidity
::
faulty
;
boost
::
fusion
::
for_each
(
fanOutMap
.
table
,
SendDataToConsumers
(
version
,
lastValidity
));
}
// _deviceModule.reportException(e.what());
_deviceModule
.
reportException
(
e
.
what
());
_deviceModule
.
waitForRecovery
();
goto
retry
;
...
...
This diff is collapsed.
Click to expand it.
src/ExceptionHandlingDecorator.cc
+
0
−
1
View file @
451c6cfd
...
...
@@ -76,7 +76,6 @@ namespace ChimeraTK {
}
catch
(
ChimeraTK
::
runtime_error
&
e
)
{
setOwnerValidityFunction
(
/*hasExceptionNow = */
true
);
// deviceModule.reportException(e.what());
deviceModule
.
reportException
(
e
.
what
());
deviceModule
.
waitForRecovery
();
}
...
...
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