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
9bfd0feb
Commit
9bfd0feb
authored
6 years ago
by
Nadeem Shehzad
Browse files
Options
Downloads
Patches
Plain Diff
added few comments.
parent
a344cfef
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/DeviceModule.h
+5
-3
5 additions, 3 deletions
include/DeviceModule.h
with
5 additions
and
3 deletions
include/DeviceModule.h
+
5
−
3
View file @
9bfd0feb
...
...
@@ -83,7 +83,7 @@ class DeviceModule : public Module {
}
VersionNumber
currentVersionNumber
;
/
/ControlSystemModule
cs
;
/
*This function connects DeviceError Variable Group to
cs
*/
void
defineConnections
()
override
;
protected
:
// populate virtualisedModuleFromCatalog based on the information in the device's catalogue
...
...
@@ -97,7 +97,8 @@ class DeviceModule : public Module {
// List of sub modules accessed through the operator[]. This is mutable since it is little more than a cache and
// thus does not change the logical state of this module
mutable
std
::
map
<
std
::
string
,
DeviceModule
>
subModules
;
/* A VariableGroup for exception status and message*/
public
:
struct
DeviceError
:
public
VariableGroup
{
using
VariableGroup
::
VariableGroup
;
...
...
@@ -112,7 +113,8 @@ class DeviceModule : public Module {
cppext
::
future_queue
<
std
::
string
>
errorQueue
{
5
};
std
::
mutex
errorMutex
;
std
::
condition_variable
errorCondVar
;
/** This functions tries to open the device and set the deviceError.
* Once done it notifies the waiting thread(s) */
void
handleException
();
};
...
...
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