Mercurial > hg > nginx-quic
annotate src/os/win32/ngx_thread.c @ 8910:f3510cb959d1
Events: fixed EPOLLRDHUP with FIONREAD (ticket #2367).
When reading exactly rev->available bytes, rev->available might become 0
after FIONREAD usage introduction in efd71d49bde0. On the next call of
ngx_readv_chain() on systems with EPOLLRDHUP this resulted in return without
any actions, that is, with rev->ready set, and this in turn resulted in no
timers set in event pipe, leading to socket leaks.
Fix is to reset rev->ready in ngx_readv_chain() when returning due to
rev->available being 0 with EPOLLRDHUP, much like it is already done in
ngx_unix_recv(). This ensures that if rev->available will become 0, on
systems with EPOLLRDHUP support appropriate EPOLLRDHUP-specific handling
will happen on the next ngx_readv_chain() call.
While here, also synced ngx_readv_chain() to match ngx_unix_recv() and
reset rev->ready when returning due to rev->available being 0 with kqueue.
This is mostly cosmetic change, as rev->ready is anyway reset when
rev->available is set to 0.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 15 Jul 2022 15:19:32 +0300 |
parents | 537259db5af4 |
children |
rev | line source |
---|---|
461 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
461 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 | |
11 | |
563 | 12 ngx_err_t |
13 ngx_create_thread(ngx_tid_t *tid, | |
14 ngx_thread_value_t (__stdcall *func)(void *arg), void *arg, ngx_log_t *log) | |
461 | 15 { |
2725 | 16 u_long id; |
461 | 17 ngx_err_t err; |
18 | |
6111
537259db5af4
Removed "worker_threads" and "thread_stack_size" directives.
Ruslan Ermilov <ru@nginx.com>
parents:
6110
diff
changeset
|
19 *tid = CreateThread(NULL, 0, func, arg, 0, &id); |
461 | 20 |
21 if (*tid != NULL) { | |
2725 | 22 ngx_log_error(NGX_LOG_NOTICE, log, 0, |
23 "create thread " NGX_TID_T_FMT, id); | |
461 | 24 return 0; |
25 } | |
26 | |
27 err = ngx_errno; | |
28 ngx_log_error(NGX_LOG_ALERT, log, err, "CreateThread() failed"); | |
29 return err; | |
30 } |