Skip to content

Fix #2890 #2892

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
merged 2 commits into from
Oct 17, 2019
Merged

Fix #2890 #2892

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed67f09
Fix #2890
twose Oct 17, 2019
8784114
Do not enable coroutine without workerStart
twose Oct 17, 2019
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
18 changes: 8 additions & 10 deletions swoole_process_pool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,27 +103,25 @@ void php_swoole_process_pool_minit(int module_number)
static void pool_onWorkerStart(swProcessPool *pool, int worker_id)
{
zval *zobject = (zval *) pool->ptr;

process_pool_property *pp = (process_pool_property *) swoole_get_property(zobject, 0);
if (pp->onWorkerStart == NULL)
{
return;
}

php_swoole_process_clean();
SwooleWG.id = worker_id;
current_pool = pool;

zval args[2];
args[0] = *zobject;
ZVAL_LONG(&args[1], worker_id);

//main function
if (!pp->onWorkerStart)
{
return;
}
//eventloop create
if (pp->enable_coroutine && php_swoole_reactor_init() < 0)
{
return;
}
//main function
zval args[2];
args[0] = *zobject;
ZVAL_LONG(&args[1], worker_id);
if (UNEXPECTED(!zend::function::call(pp->onWorkerStart, 2, args, NULL, pp->enable_coroutine)))
{
php_swoole_error(E_WARNING, "%s->onWorkerStart handler error", SW_Z_OBJCE_NAME_VAL_P(zobject));
Expand Down