Skip to content

Fixed subpool_map to register the pool's main greenlet #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sylvinus merged 1 commit into from
Jan 3, 2016
Merged

Fixed subpool_map to register the pool's main greenlet #109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion mrq/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,10 @@ def subpool_map(pool_size, func, iterable):
current_job = get_current_job()

def inner_func(*args):
""" As each call to 'func' will be done in a random greenlet of the subpool, we need to
register their IDs with set_current_job() to make get_current_job() calls work properly
inside 'func'.
"""
next(counter)
if current_job:
set_current_job(current_job)
Expand All @@ -219,9 +223,20 @@ def inner_func(*args):
set_current_job(None)
return ret

def inner_iterable():
""" This will be called inside the pool's main greenlet, which ID also needs to be registered """
if current_job:
set_current_job(current_job)

for x in iterable:
yield x

if current_job:
set_current_job(None)

start_time = time.time()
pool = gevent.pool.Pool(size=pool_size)
ret = pool.map(inner_func, iterable)
ret = pool.map(inner_func, inner_iterable())
pool.join(raise_error=True)
total_time = time.time() - start_time

Expand Down