Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
margo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
17
Issues
17
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
sds
margo
Commits
2a8c6f6f
Commit
2a8c6f6f
authored
Apr 27, 2016
by
Philip Carns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use proper Mercury API for cancel
parent
8f775834
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
src/margo.c
src/margo.c
+1
-6
No files found.
src/margo.c
View file @
2a8c6f6f
...
...
@@ -17,11 +17,6 @@
#include "margo-timer.h"
#include "utlist.h"
/* TODO: including core.h for cancel definition, presumably this will be
* available in top level later?
*/
#include <mercury_core.h>
#define MERCURY_PROGRESS_TIMEOUT_UB 100
/* 100 milliseconds */
struct
margo_instance
...
...
@@ -276,7 +271,7 @@ static void margo_forward_timeout_cb(void *arg)
(
margo_forward_timeout_cb_dat
*
)
arg
;
/* cancel the Mercury op if the forward timed out */
HG_C
ore_c
ancel
(
timeout_cb_dat
->
handle
);
HG_Cancel
(
timeout_cb_dat
->
handle
);
return
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment