update workerman to 3.3.4

This commit is contained in:
walkor
2016-09-20 21:27:41 +08:00
parent a3d823d04a
commit 58dc935eb0
25 changed files with 4159 additions and 2500 deletions
+82 -82
View File
@@ -1,146 +1,142 @@
<?php
/**
* This file is part of workerman.
*
* Licensed under The MIT License
* For full copyright and license information, please see the MIT-LICENSE.txt
* Redistributions of files must retain the above copyright notice.
*
* @author walkor<walkor@workerman.net>
* @copyright walkor<walkor@workerman.net>
* @link http://www.workerman.net/
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace Workerman\Lib;
use \Workerman\Events\EventInterface;
use \Exception;
use Workerman\Events\EventInterface;
use Exception;
/**
*
* 定时器
*
* <b>example:</b>
* <pre>
* <code>
* Workerman\Lib\Timer::init();
* Timer.
*
* example:
* Workerman\Lib\Timer::add($time_interval, callback, array($arg1, $arg2..));
* <code>
* </pre>
* @author walkor <walkor@workerman.net>
*/
class Timer
class Timer
{
/**
* 基于ALARM信号的任务
* Tasks that based on ALARM signal.
* [
* run_time => [[$func, $args, $persistent, time_interval],[$func, $args, $persistent, time_interval],..]],
* run_time => [[$func, $args, $persistent, time_interval],[$func, $args, $persistent, time_interval],..]],
* ..
* ..
* ]
*
* @var array
*/
protected static $_tasks = array();
/**
* event
* @var event
*
* @var \Workerman\Events\EventInterface
*/
protected static $_event = null;
/**
* 初始化
* Init.
*
* @param \Workerman\Events\EventInterface $event
* @return void
*/
public static function init($event = null)
{
if($event)
{
if ($event) {
self::$_event = $event;
}
else
{
} else {
pcntl_signal(SIGALRM, array('\Workerman\Lib\Timer', 'signalHandle'), false);
}
}
/**
* 信号处理函数,只处理ALARM事件
* ALARM signal handler.
*
* @return void
*/
public static function signalHandle()
{
if(!self::$_event)
{
if (!self::$_event) {
pcntl_alarm(1);
self::tick();
}
}
/**
* 添加一个定时器
* @param int $time_interval
* Add a timer.
*
* @param int $time_interval
* @param callback $func
* @param mix $args
* @return void
* @param mixed $args
* @param bool $persistent
* @return bool
*/
public static function add($time_interval, $func, $args = array(), $persistent = true)
{
if($time_interval <= 0)
{
if ($time_interval <= 0) {
echo new Exception("bad time_interval");
return false;
}
if(self::$_event)
{
return self::$_event->add($time_interval, $persistent ? EventInterface::EV_TIMER : EventInterface::EV_TIMER_ONCE , $func, $args);
if (self::$_event) {
return self::$_event->add($time_interval,
$persistent ? EventInterface::EV_TIMER : EventInterface::EV_TIMER_ONCE, $func, $args);
}
if(!is_callable($func))
{
if (!is_callable($func)) {
echo new Exception("not callable");
return false;
}
if(empty(self::$_tasks))
{
if (empty(self::$_tasks)) {
pcntl_alarm(1);
}
$time_now = time();
$run_time = $time_now + $time_interval;
if(!isset(self::$_tasks[$run_time]))
{
if (!isset(self::$_tasks[$run_time])) {
self::$_tasks[$run_time] = array();
}
self::$_tasks[$run_time][] = array($func, $args, $persistent, $time_interval);
self::$_tasks[$run_time][] = array($func, (array)$args, $persistent, $time_interval);
return true;
}
/**
* 尝试触发定时回调
* Tick.
*
* @return void
*/
public static function tick()
{
if(empty(self::$_tasks))
{
if (empty(self::$_tasks)) {
pcntl_alarm(0);
return;
}
$time_now = time();
foreach (self::$_tasks as $run_time=>$task_data)
{
if($time_now >= $run_time)
{
foreach($task_data as $index=>$one_task)
{
$task_func = $one_task[0];
$task_args = $one_task[1];
$persistent = $one_task[2];
foreach (self::$_tasks as $run_time => $task_data) {
if ($time_now >= $run_time) {
foreach ($task_data as $index => $one_task) {
$task_func = $one_task[0];
$task_args = $one_task[1];
$persistent = $one_task[2];
$time_interval = $one_task[3];
try
{
try {
call_user_func_array($task_func, $task_args);
}
catch(\Exception $e)
{
} catch (\Exception $e) {
echo $e;
}
if($persistent)
{
if ($persistent) {
self::add($time_interval, $task_func, $task_args);
}
}
@@ -148,28 +144,32 @@ class Timer
}
}
}
/**
* 删除定时器
* @param $timer_id
* Remove a timer.
*
* @param mixed $timer_id
* @return bool
*/
public static function del($timer_id)
{
if(self::$_event)
{
if (self::$_event) {
return self::$_event->del($timer_id, EventInterface::EV_TIMER);
}
return false;
}
/**
* 删除所有定时
* Remove all timers.
*
* @return void
*/
public static function delAll()
{
self::$_tasks = array();
pcntl_alarm(0);
if(self::$_event)
{
if (self::$_event) {
self::$_event->clearAllTimer();
}
}