Commit 9c5cbd5

committed

poll: introduce php_poll_msleep for win compat

1 parent 3916377 commit 9c5cbd5Copy full SHA for 9c5cbd5

File tree

+20

-7

lines changed

+20

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`#include "php_poll_internal.h"`
`16`	`16`
`17`		`-#ifdef _WIN32`
	`17`	`+#ifdef PHP_WIN32`
`18`	`18`
`19`	`19`	`#include <winsock2.h>`
`20`	`20`	`#include <ws2tcpip.h>`
`@@ -391,4 +391,4 @@ const php_poll_backend_ops php_poll_backend_iocp_ops = {`
`391`	`391`	`.supports_et = true /* IOCP provides completion-based model which is naturally edge-triggered */`
`392`	`392`	`};`
`393`	`393`
`394`		`-#endif /* _WIN32 */`
	`394`	`+#endif /* PHP_WIN32 */`

Lines changed: 17 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -180,17 +180,30 @@ static bool poll_build_fds_callback(int fd, php_poll_fd_entry entry, void user`
`180`	`180`	`return true;`
`181`	`181`	`}`
`182`	`182`
	`183`	`+static void php_poll_msleep(int timeout_ms)`
	`184`	`+{`
	`185`	`+ if (timeout_ms <= 0) {`
	`186`	`+ return;`
	`187`	`+ }`
	`188`	`+`
	`189`	`+#ifdef PHP_WIN32`
	`190`	`+ Sleep(timeout_ms);`
	`191`	`+#else`
	`192`	`+ struct timespec ts;`
	`193`	`+ ts.tv_sec = timeout_ms / 1000;`
	`194`	`+ ts.tv_nsec = (timeout_ms % 1000) * 1000000;`
	`195`	`+ nanosleep(&ts, NULL);`
	`196`	`+#endif`
	`197`	`+}`
	`198`	`+`
`183`	`199`	`static int poll_backend_wait(php_poll_ctx ctx, php_poll_event events, int max_events, int timeout)`
`184`	`200`	`{`
`185`	`201`	`poll_backend_data_t backend_data = (poll_backend_data_t ) ctx->backend_data;`
`186`	`202`
`187`	`203`	`int fd_count = php_poll_fd_table_count(backend_data->fd_table);`
`188`	`204`	`if (fd_count == 0) {`
`189`	`205`	`if (timeout > 0) {`
`190`		`- struct timespec ts;`
`191`		`- ts.tv_sec = timeout / 1000;`
`192`		`- ts.tv_nsec = (timeout % 1000) * 1000000;`
`193`		`- nanosleep(&ts, NULL);`
	`206`	`+ php_poll_msleep(timeout);`
`194`	`207`	`}`
`195`	`208`	`return 0;`
`196`	`209`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ extern const php_poll_backend_ops php_poll_backend_kqueue_ops;`
`29`	`29`	`#ifdef HAVE_EVENT_PORTS`
`30`	`30`	`extern const php_poll_backend_ops php_poll_backend_eventport_ops;`
`31`	`31`	`#endif`
`32`		`-#ifdef _WIN32`
	`32`	`+#ifdef PHP_WIN32`
`33`	`33`	`extern const php_poll_backend_ops php_poll_backend_iocp_ops;`
`34`	`34`	`#endif`
`35`	`35`	`extern const php_poll_backend_ops php_poll_backend_poll_ops;`

Comments

(0)