Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
ac0d6a8e
Commit
ac0d6a8e
authored
2 months ago
by
Timo Birr
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api
parents
c4b3c0d5
2bf69c0f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#22313
failed
2 months ago
Stage: build-and-test
Stage: deploy
Stage: post-deploy-test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/libraries/armem_grasping/server/KnownGraspProviderSegment.cpp
+6
-4
6 additions, 4 deletions
...aries/armem_grasping/server/KnownGraspProviderSegment.cpp
with
6 additions
and
4 deletions
source/RobotAPI/libraries/armem_grasping/server/KnownGraspProviderSegment.cpp
+
6
−
4
View file @
ac0d6a8e
...
...
@@ -70,7 +70,7 @@ namespace armarx::armem::grasping::segment
return
std
::
nullopt
;
// file does not exist
}
ARMARX_
INFO
<<
"
l
oading "
<<
graspFilePath
;
ARMARX_
VERBOSE
<<
"
L
oading
`
"
<<
graspFilePath
<<
"`."
;
try
{
const
std
::
string
objectClassName
=
graspFileInfo
.
objectId
.
className
();
...
...
@@ -324,13 +324,13 @@ namespace armarx::armem::grasping::segment
<<
graspFileInfo
.
fileLocInfo
.
absolutePath
<<
"` failed."
;
}
ARMARX_
INFO
<<
"inotify_add_watch for grasp file: "
ARMARX_
VERBOSE
<<
"inotify_add_watch for grasp file: "
<<
graspFileInfo
.
fileLocInfo
.
absolutePath
<<
"` added."
;
wds
.
emplace
(
wd
,
graspFileInfo
);
}
}
ARMARX_INFO
<<
"Set up "
<<
wds
.
size
()
<<
" inotify events."
;
ARMARX_INFO
<<
"Set up "
<<
wds
.
size
()
<<
" inotify events
to watch for file changes
."
;
fileWatcherTask
=
new
SimpleRunningTask
<>
(
[
this
,
inotifyFd
,
wds
]()
...
...
@@ -362,9 +362,11 @@ namespace armarx::armem::grasping::segment
auto
*
event
=
reinterpret_cast
<
inotify_event
*>
(
p
);
const
auto
&
graspFileInfo
=
wds
.
at
(
event
->
wd
);
ARMARX_
INFO
<<
"File changed: "
ARMARX_
VERBOSE
<<
"File changed: "
<<
VAROUT
(
graspFileInfo
.
fileLocInfo
.
absolutePath
);
ARMARX_INFO
<<
"Reloading file for object `"
<<
graspFileInfo
.
objectId
<<
"`."
;
p
+=
sizeof
(
struct
inotify_event
)
+
event
->
len
;
const
bool
lockMemory
=
true
;
...
...
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