mirror of
https://github.com/curl/curl.git
synced 2026-08-14 23:53:38 +03:00
multi: xfers_really_alive
Yes, we were counting the "live" transfers before, but were they *really* alive? When determining to add the wakeup socket to fdset/waitfds etc, we should only do that when the multi handle is actually processing transfers. Other wise, the application could wait on the wakeup socket forever. For this, we counted `multi->xfers_alive` (e.g. the "running" number returned by `curl_multi_perform()`). This was almost correct. The problem is that added easy handles are counted as "alive" right away on the addition. But the processing has not started yet. They did not trigger any DNS resolves or opened any sockets yet. Add two fields in multi and easy handle: * `multi->xfers_really_alive`: counts the "alive" transfers that have passed `MSTATE_INIT` (at least once) * `data->state.really_alive`: to track if the transfer has been counted Add test 2412 to check that adding transfers without perform will not trigger the wakeup socket to be added. Fixes #22050 Reported-by: Bryan Henderson Closes #22066
This commit is contained in:
Stefan Eissing
Daniel Stenberg
parent
abad1c9e48
commit
f0be417635
8 changed files with 182 additions and 13 deletions
|
|
@ -262,7 +262,7 @@ test2300 test2301 test2302 test2303 test2304 test2306 test2307 test2308 \
|
|||
test2309 test2310 test2311 \
|
||||
\
|
||||
test2400 test2401 test2402 test2403 test2404 test2405 test2406 test2407 \
|
||||
test2408 test2409 test2410 test2411 \
|
||||
test2408 test2409 test2410 test2411 test2412 \
|
||||
\
|
||||
test2500 test2501 test2502 test2503 test2504 test2505 test2506 \
|
||||
\
|
||||
|
|
|
|||
50
tests/data/test2412
Normal file
50
tests/data/test2412
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
<?xml version="1.0" encoding="US-ASCII"?>
|
||||
<testcase>
|
||||
<info>
|
||||
<keywords>
|
||||
multi
|
||||
</keywords>
|
||||
</info>
|
||||
|
||||
# Server-side
|
||||
<reply>
|
||||
<data nocheck="yes">
|
||||
HTTP/1.1 200 OK
|
||||
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
|
||||
ETag: "21025-dc7-39462498"
|
||||
Accept-Ranges: bytes
|
||||
Content-Length: 6007
|
||||
Connection: close
|
||||
Content-Type: text/html
|
||||
Funny-head: yesyes
|
||||
|
||||
-foo-
|
||||
%repeat[1000 x foobar]%
|
||||
</data>
|
||||
</reply>
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
<features>
|
||||
wakeup
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
</server>
|
||||
<tool>
|
||||
lib%TESTNUMBER
|
||||
</tool>
|
||||
<name>
|
||||
checking curl_multi_fdset on nothing to do
|
||||
</name>
|
||||
<command>
|
||||
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
|
||||
</command>
|
||||
</client>
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
</verify>
|
||||
</testcase>
|
||||
|
|
@ -115,6 +115,7 @@ TESTS_C = \
|
|||
lib2023.c lib2032.c lib2082.c \
|
||||
lib2301.c lib2302.c lib2304.c lib2306.c lib2308.c lib2309.c \
|
||||
lib2402.c lib2404.c lib2405.c \
|
||||
lib2412.c \
|
||||
lib2502.c lib2504.c lib2505.c lib2506.c \
|
||||
lib2700.c \
|
||||
lib3010.c lib3025.c lib3026.c lib3027.c lib3033.c lib3034.c \
|
||||
|
|
|
|||
95
tests/libtest/lib2412.c
Normal file
95
tests/libtest/lib2412.c
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
/***************************************************************************
|
||||
* _ _ ____ _
|
||||
* Project ___| | | | _ \| |
|
||||
* / __| | | | |_) | |
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) Dmitry Karpov <dkarpov1970@gmail.com>
|
||||
*
|
||||
* This software is licensed as described in the file COPYING, which
|
||||
* you should have received as part of this distribution. The terms
|
||||
* are also available at https://curl.se/docs/copyright.html.
|
||||
*
|
||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
||||
* copies of the Software, and permit persons to whom the Software is
|
||||
* furnished to do so, under the terms of the COPYING file.
|
||||
*
|
||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
* KIND, either express or implied.
|
||||
*
|
||||
* SPDX-License-Identifier: curl
|
||||
*
|
||||
***************************************************************************/
|
||||
|
||||
#include "first.h"
|
||||
#include "testtrace.h"
|
||||
|
||||
static CURLcode test_lib2412(const char *URL)
|
||||
{
|
||||
CURLcode result = CURLE_OK;
|
||||
CURLM *multi = NULL;
|
||||
CURL *easy = NULL;
|
||||
CURLMcode rc;
|
||||
fd_set readFdSet, writeFdSet, exceptFdSet;
|
||||
int maxFd;
|
||||
|
||||
(void)URL;
|
||||
global_init(CURL_GLOBAL_ALL);
|
||||
|
||||
multi = curl_multi_init();
|
||||
if(!multi) {
|
||||
curl_mfprintf(stderr, "curl_multi_init() failed\n");
|
||||
result = TEST_ERR_MAJOR_BAD;
|
||||
goto test_cleanup;
|
||||
}
|
||||
|
||||
easy = curl_easy_init();
|
||||
if(!easy) {
|
||||
curl_mfprintf(stderr, "curl_easy_init() failed\n");
|
||||
result = TEST_ERR_MAJOR_BAD;
|
||||
goto test_cleanup;
|
||||
}
|
||||
debug_config.nohex = TRUE;
|
||||
debug_config.tracetime = TRUE;
|
||||
easy_setopt(easy, CURLOPT_DEBUGDATA, &debug_config);
|
||||
easy_setopt(easy, CURLOPT_DEBUGFUNCTION, libtest_debug_cb);
|
||||
easy_setopt(easy, CURLOPT_VERBOSE, 1L);
|
||||
|
||||
rc = curl_multi_add_handle(multi, easy);
|
||||
if(rc) {
|
||||
curl_mfprintf(stderr, "curl_multi_add_handle() failed: %d\n", rc);
|
||||
result = TEST_ERR_MAJOR_BAD;
|
||||
goto test_cleanup;
|
||||
}
|
||||
|
||||
FD_ZERO(&readFdSet);
|
||||
FD_ZERO(&writeFdSet);
|
||||
FD_ZERO(&exceptFdSet);
|
||||
maxFd = -1;
|
||||
rc = curl_multi_fdset(multi, &readFdSet, &writeFdSet, &exceptFdSet,
|
||||
&maxFd);
|
||||
if(rc) {
|
||||
curl_mfprintf(stderr, "curl_multi_fdset() failed: %d\n", rc);
|
||||
result = TEST_ERR_MAJOR_BAD;
|
||||
goto test_cleanup;
|
||||
}
|
||||
|
||||
if(maxFd == -1)
|
||||
curl_mfprintf(stderr, "There are no file descriptors to wait for\n");
|
||||
else {
|
||||
curl_mfprintf(stderr, "libcurl supplied a file descriptor to "
|
||||
"wait for (maxFd=%d). Waiting now ...\n", maxFd);
|
||||
result = TEST_ERR_FAILURE;
|
||||
}
|
||||
|
||||
test_cleanup:
|
||||
if(easy) {
|
||||
curl_multi_remove_handle(multi, easy);
|
||||
curl_easy_cleanup(easy);
|
||||
}
|
||||
if(multi)
|
||||
curl_multi_cleanup(multi);
|
||||
curl_global_cleanup();
|
||||
return result;
|
||||
}
|
||||
|
|
@ -29,6 +29,7 @@
|
|||
*/
|
||||
|
||||
#include "first.h"
|
||||
#include "testtrace.h"
|
||||
|
||||
static struct t530_ctx {
|
||||
int socket_calls;
|
||||
|
|
@ -300,6 +301,8 @@ static CURLcode testone(const char *URL, int timer_fail_at, int socket_fail_at)
|
|||
easy_setopt(curl, CURLOPT_URL, URL);
|
||||
|
||||
/* go verbose */
|
||||
easy_setopt(curl, CURLOPT_DEBUGDATA, &debug_config);
|
||||
easy_setopt(curl, CURLOPT_DEBUGFUNCTION, libtest_debug_cb);
|
||||
easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
||||
|
||||
multi_init(multi);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue