|
@@ -466,10 +466,8 @@ class Worker
|
|
|
* @var array
|
|
* @var array
|
|
|
*/
|
|
*/
|
|
|
protected static $_availableEventLoops = array(
|
|
protected static $_availableEventLoops = array(
|
|
|
- 'libevent' => '\Workerman\Events\Libevent',
|
|
|
|
|
- 'event' => '\Workerman\Events\Event'
|
|
|
|
|
- // Temporarily removed swoole because it is not stable enough
|
|
|
|
|
- //'swoole' => '\Workerman\Events\Swoole'
|
|
|
|
|
|
|
+ 'event' => '\Workerman\Events\Event',
|
|
|
|
|
+ 'libevent' => '\Workerman\Events\Libevent'
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -535,13 +533,11 @@ class Worker
|
|
|
{
|
|
{
|
|
|
static::checkSapiEnv();
|
|
static::checkSapiEnv();
|
|
|
static::init();
|
|
static::init();
|
|
|
- static::lock();
|
|
|
|
|
static::parseCommand();
|
|
static::parseCommand();
|
|
|
static::daemonize();
|
|
static::daemonize();
|
|
|
static::initWorkers();
|
|
static::initWorkers();
|
|
|
static::installSignal();
|
|
static::installSignal();
|
|
|
static::saveMasterPid();
|
|
static::saveMasterPid();
|
|
|
- static::unlock();
|
|
|
|
|
static::displayUI();
|
|
static::displayUI();
|
|
|
static::forkWorkers();
|
|
static::forkWorkers();
|
|
|
static::resetStd();
|
|
static::resetStd();
|