Skip to content

Commit 55c6488

Browse files
committed
Update signal timer.
1 parent 8b807d1 commit 55c6488

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

examples/server.php

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
$serv = new swoole_server("0.0.0.0", 9501);
33
// $serv->addlistener('0.0.0.0', 9502, SWOOLE_SOCK_UDP);
44
$serv->set(array(
5-
'worker_num' => 4,
5+
'worker_num' => 1,
66
//'open_eof_check' => true,
77
//'package_eof' => "\r\n",
88
//'ipc_mode' => 2,
9-
//'task_worker_num' => 2,
9+
'task_worker_num' => 1,
1010
//'task_ipc_mode' => 1,
1111
//'dispatch_mode' => 1,
1212
//'daemonize' => 1,
@@ -34,6 +34,7 @@ function my_onShutdown($serv)
3434

3535
function my_onTimer($serv, $interval)
3636
{
37+
//echo microtime(true)."\n";
3738
my_log("Server:Timer Call.Interval=$interval");
3839
}
3940

@@ -51,18 +52,22 @@ function my_onConnect($serv, $fd, $from_id)
5152
function my_onWorkerStart($serv, $worker_id)
5253
{
5354
global $argv;
54-
if($worker_id >= $serv->setting['worker_num']) {
55+
if($worker_id >= $serv->setting['worker_num'])
56+
{
5557
swoole_set_process_name("php {$argv[0]}: task");
56-
} else {
58+
}
59+
else
60+
{
5761
swoole_set_process_name("php {$argv[0]}: worker");
5862
}
5963
echo "WorkerStart: MasterPid={$serv->master_pid}|Manager_pid={$serv->manager_pid}";
6064
echo "|WorkerId={$serv->worker_id}|WorkerPid={$serv->worker_pid}\n";
6165

62-
if ($worker_id == 0)
66+
if ($worker_id == 1)
6367
{
64-
$serv->addtimer(2000); //500ms
65-
//$serv->addtimer(6000); //500ms
68+
$serv->addtimer(2000);
69+
$serv->addtimer(6000);
70+
//echo microtime(true)."\n";
6671
//var_dump($serv->gettimer());
6772
}
6873
}

examples/udp_server.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
$serv = new swoole_server("127.0.0.1", 9502, SWOOLE_PROCESS, SWOOLE_SOCK_UDP);
2+
$serv = new swoole_server("0.0.0.0", 9502, SWOOLE_PROCESS, SWOOLE_SOCK_UDP);
33
$serv->set(array(
44
'worker_num' => 1, //worker process num
55
//'log_file' => '/tmp/swoole.log',

src/os/timer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ static int swTimer_signal_set(swTimer *timer, int interval)
148148
timer_set.it_interval.tv_sec = sec;
149149
timer_set.it_interval.tv_usec = msec * 1000;
150150

151-
timer_set.it_value.tv_sec = now.tv_sec + sec;
152-
timer_set.it_value.tv_usec = now.tv_usec + timer_set.it_interval.tv_usec;
151+
timer_set.it_value.tv_sec = sec;
152+
timer_set.it_value.tv_usec = timer_set.it_interval.tv_usec;
153153

154154
if (timer_set.it_value.tv_usec > 1e6)
155155
{

0 commit comments

Comments
 (0)