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
8e6a215a
Commit
8e6a215a
authored
Apr 19, 2016
by
Shane Snyder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
detect cases where sleep is issued from prog. pool
parent
969b53fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
14 deletions
+25
-14
src/margo.c
src/margo.c
+25
-14
No files found.
src/margo.c
View file @
8e6a215a
...
...
@@ -56,7 +56,7 @@ static int handler_mapping_table_size = 0;
static
struct
margo_handler_mapping
handler_mapping_table
[
MAX_HANDLER_MAPPING
]
=
{
0
};
static
void
hg_progress_fn
(
void
*
foo
);
static
int
margo_xstream_is_in_progress_pool
(
margo_instance_id
mid
);
struct
handler_entry
{
...
...
@@ -154,22 +154,12 @@ void margo_finalize(margo_instance_id mid)
void
margo_wait_for_finalize
(
margo_instance_id
mid
)
{
ABT_xstream
xstream
;
ABT_pool
pool
;
int
ret
;
int
in_pool
=
0
;
ret
=
ABT_xstream_self
(
&
xstream
);
if
(
ret
!=
0
)
return
;
ret
=
ABT_xstream_get_main_pools
(
xstream
,
1
,
&
pool
);
if
(
ret
!=
0
)
return
;
/* Is this waiter in the same pool as the pool running the progress
* thread?
*/
if
(
pool
==
mid
->
progress_pool
)
if
(
margo_xstream_is_in_progress_pool
(
mid
)
)
in_pool
=
1
;
ABT_mutex_lock
(
mid
->
finalize_mutex
);
...
...
@@ -519,6 +509,7 @@ void margo_thread_sleep(
margo_instance_id
mid
,
double
timeout_ms
)
{
int
in_pool
=
0
;
margo_timer_t
sleep_timer
;
margo_thread_sleep_cb_dat
sleep_cb_dat
;
...
...
@@ -532,9 +523,12 @@ void margo_thread_sleep(
margo_timer_init
(
mid
,
&
sleep_timer
,
margo_thread_sleep_cb
,
&
sleep_cb_dat
,
timeout_ms
);
if
(
margo_xstream_is_in_progress_pool
(
mid
))
in_pool
=
1
;
/* increment number of waiting threads */
ABT_mutex_lock
(
mid
->
finalize_mutex
);
mid
->
finalize_waiters_in_progress_pool
++
;
mid
->
finalize_waiters_in_progress_pool
+=
in_pool
;
ABT_mutex_unlock
(
mid
->
finalize_mutex
);
/* yield thread for specified timeout */
...
...
@@ -546,7 +540,6 @@ void margo_thread_sleep(
return
;
}
margo_instance_id
margo_hg_class_to_instance
(
hg_class_t
*
cl
)
{
int
i
;
...
...
@@ -558,3 +551,21 @@ margo_instance_id margo_hg_class_to_instance(hg_class_t *cl)
}
return
(
NULL
);
}
/* returns 1 if current xstream is in the progress pool, 0 if not */
static
int
margo_xstream_is_in_progress_pool
(
margo_instance_id
mid
)
{
int
ret
;
ABT_xstream
xstream
;
ABT_pool
pool
;
ret
=
ABT_xstream_self
(
&
xstream
);
assert
(
ret
==
ABT_SUCCESS
);
ret
=
ABT_xstream_get_main_pools
(
xstream
,
1
,
&
pool
);
assert
(
ret
==
ABT_SUCCESS
);
if
(
pool
==
mid
->
progress_pool
)
return
(
1
);
else
return
(
0
);
}
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