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
6f4bca74
Commit
6f4bca74
authored
2 years ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Patches
Plain Diff
fix typos in comment, remove debug output
parent
ef840487
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
src/ExceptionHandlingDecorator.cc
+4
-4
4 additions, 4 deletions
src/ExceptionHandlingDecorator.cc
tests/executables_src/testExceptionHandling.cc
+0
-2
0 additions, 2 deletions
tests/executables_src/testExceptionHandling.cc
with
4 additions
and
6 deletions
src/ExceptionHandlingDecorator.cc
+
4
−
4
View file @
6f4bca74
...
...
@@ -25,7 +25,7 @@ namespace ChimeraTK {
if
(
_direction
.
dir
==
VariableDirection
::
consuming
)
{
deviceManager
->
_writeRegisterPaths
.
push_back
(
registerName
);
// writable registers get a recoveryAccessor
// writ
e
able registers get a recoveryAccessor
// Notice: There will be write-accessors without recovery accessors in future (intentionally turned off by the
// application programmer). When this feature is added the VariableNetworkNode will get a new data member to
// indicate this.
...
...
@@ -61,12 +61,12 @@ namespace ChimeraTK {
void
ExceptionHandlingDecorator
<
UserType
>::
doPreWrite
(
TransferType
type
,
VersionNumber
versionNumber
)
{
auto
deviceManager
=
_deviceManager
.
lock
();
/* For writable accessors, copy data to the recoveryAcessor before perf
r
oming the write.
/* For writ
e
able accessors, copy data to the recoveryAc
c
essor before perfo
r
ming the write.
* Otherwise, the decorated accessor may have swapped the data out of the user buffer already.
* This obtains a shared lock from the DeviceModule, hence, the regular writing happeni
i
n here
* This obtains a shared lock from the DeviceModule, hence, the regular writing happenin
g
here
* can be performed in shared mode of the mutex and accessors are not blocking each other.
* In case of recovery, the DeviceModule thread will take an exclusive lock so that this thread can not
* modify the recoveryAcessor's user buffer while data is written to the device.
* modify the recoveryAc
c
essor's user buffer while data is written to the device.
*/
{
_inhibitWriteTransfer
=
false
;
...
...
This diff is collapsed.
Click to expand it.
tests/executables_src/testExceptionHandling.cc
+
0
−
2
View file @
6f4bca74
...
...
@@ -239,8 +239,6 @@ BOOST_FIXTURE_TEST_CASE(B_2_2_3_TriggerFanOut, Fixture) {
BOOST_FIXTURE_TEST_CASE
(
B_2_2_4_blocking
,
Fixture
)
{
std
::
cout
<<
"B_2_2_4_blocking - first skip of blocking read"
<<
std
::
endl
;
application
.
getModel
().
writeGraphViz
(
"FixtureDummyApp.dot"
);
pushVariable
.
readLatest
();
// go to exception state
...
...
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