Skip to content

Commit 074d9bf

Browse files
committed
Make macro unnecessary by using timespec directly
AIX lacks this macro; no need to do the conversion if the second field of timeval or timespec would be 0 anyways
1 parent 34866e9 commit 074d9bf

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

sapi/cli/php_cli_server.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -835,11 +835,9 @@ static void php_cli_server_poller_remove(php_cli_server_poller *poller, int mode
835835
php_poll_remove(poller->poll_ctx, fd);
836836
} /* }}} */
837837

838-
static int php_cli_server_poller_poll(php_cli_server_poller *poller, struct timeval *tv) /* {{{ */
838+
static int php_cli_server_poller_poll(php_cli_server_poller *poller, struct timespec *ts) /* {{{ */
839839
{
840-
struct timespec ts;
841-
TIMEVAL_TO_TIMESPEC(tv, &ts);
842-
return php_poll_wait(poller->poll_ctx, poller->events, poller->count, &ts);
840+
return php_poll_wait(poller->poll_ctx, poller->events, poller->count, ts);
843841
} /* }}} */
844842

845843
static zend_result php_cli_server_poller_iter_on_active(php_cli_server_poller *poller, void *opaque, zend_result(*callback)(void *, php_socket_t fd, int events)) /* {{{ */
@@ -2689,8 +2687,8 @@ static zend_result php_cli_server_do_event_loop(php_cli_server *server) /* {{{ *
26892687
{
26902688
zend_result retval = SUCCESS;
26912689
while (server->is_running) {
2692-
struct timeval tv = { 1, 0 };
2693-
int n = php_cli_server_poller_poll(&server->poller, &tv);
2690+
struct timespec ts = { 1, 0 };
2691+
int n = php_cli_server_poller_poll(&server->poller, &ts);
26942692
if (n > 0) {
26952693
php_cli_server_do_event_for_each_fd(server,
26962694
php_cli_server_recv_event_read_request,

0 commit comments

Comments
 (0)