mirror of
https://github.com/curl/curl.git
synced 2026-06-19 00:55:37 +03:00
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
419 lines
11 KiB
C
419 lines
11 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* 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
|
|
*
|
|
***************************************************************************/
|
|
|
|
/*
|
|
* The purpose of this test is to make sure that if CURLMOPT_SOCKETFUNCTION or
|
|
* CURLMOPT_TIMERFUNCTION returns error, the associated transfer should be
|
|
* aborted correctly.
|
|
*/
|
|
|
|
#include "first.h"
|
|
#include "testtrace.h"
|
|
|
|
static struct t530_ctx {
|
|
int socket_calls;
|
|
int max_socket_calls;
|
|
int timer_calls;
|
|
int max_timer_calls;
|
|
char buf[1024];
|
|
} t530_ctx;
|
|
|
|
static const char *t530_tag(void)
|
|
{
|
|
curl_msnprintf(t530_ctx.buf, sizeof(t530_ctx.buf),
|
|
"[T530-%d-%d] [%d/%d]",
|
|
t530_ctx.max_socket_calls, t530_ctx.max_timer_calls,
|
|
t530_ctx.socket_calls, t530_ctx.timer_calls);
|
|
return t530_ctx.buf;
|
|
}
|
|
|
|
static void t530_msg(const char *msg)
|
|
{
|
|
curl_mfprintf(stderr, "%s %s\n", t530_tag(), msg);
|
|
}
|
|
|
|
struct t530_Sockets {
|
|
curl_socket_t *sockets;
|
|
int count; /* number of sockets actually stored in array */
|
|
int max_count; /* max number of sockets that fit in allocated array */
|
|
};
|
|
|
|
struct t530_ReadWriteSockets {
|
|
struct t530_Sockets read, write;
|
|
};
|
|
|
|
/**
|
|
* Remove a file descriptor from a sockets array.
|
|
*/
|
|
static void t530_removeFd(struct t530_Sockets *sockets, curl_socket_t fd,
|
|
int mention)
|
|
{
|
|
int i;
|
|
|
|
if(mention)
|
|
curl_mfprintf(stderr, "%s remove socket fd %" FMT_SOCKET_T "\n",
|
|
t530_tag(), fd);
|
|
|
|
for(i = 0; i < sockets->count; ++i) {
|
|
if(sockets->sockets[i] == fd) {
|
|
if(i < sockets->count - 1)
|
|
memmove(&sockets->sockets[i], &sockets->sockets[i + 1],
|
|
sizeof(curl_socket_t) * (sockets->count - (i + 1)));
|
|
--sockets->count;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Add a file descriptor to a sockets array.
|
|
* Return 0 on success, 1 on error.
|
|
*/
|
|
static int t530_addFd(struct t530_Sockets *sockets, curl_socket_t fd,
|
|
const char *what)
|
|
{
|
|
/**
|
|
* To ensure we only have each file descriptor once, we remove it then add
|
|
* it again.
|
|
*/
|
|
curl_mfprintf(stderr, "%s add socket fd %" FMT_SOCKET_T " for %s\n",
|
|
t530_tag(), fd, what);
|
|
t530_removeFd(sockets, fd, 0);
|
|
/*
|
|
* Allocate array storage when required.
|
|
*/
|
|
if(!sockets->sockets) {
|
|
sockets->sockets = curlx_malloc(sizeof(curl_socket_t) * 20U);
|
|
if(!sockets->sockets)
|
|
return 1;
|
|
sockets->max_count = 20;
|
|
}
|
|
else if(sockets->count + 1 > sockets->max_count) {
|
|
curl_socket_t *ptr = curlx_realloc(sockets->sockets,
|
|
sizeof(curl_socket_t) *
|
|
(sockets->max_count + 20));
|
|
if(!ptr)
|
|
/* cleanup in test_cleanup */
|
|
return 1;
|
|
sockets->sockets = ptr;
|
|
sockets->max_count += 20;
|
|
}
|
|
/*
|
|
* Add file descriptor to array.
|
|
*/
|
|
sockets->sockets[sockets->count] = fd;
|
|
++sockets->count;
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Callback invoked by curl to poll reading / writing of a socket.
|
|
*/
|
|
static int t530_curlSocketCallback(CURL *curl, curl_socket_t s, int action,
|
|
void *userp, void *socketp)
|
|
{
|
|
struct t530_ReadWriteSockets *sockets = userp;
|
|
|
|
(void)curl;
|
|
(void)socketp;
|
|
|
|
t530_ctx.socket_calls++;
|
|
t530_msg("-> CURLMOPT_SOCKETFUNCTION");
|
|
if(t530_ctx.socket_calls == t530_ctx.max_socket_calls) {
|
|
t530_msg("<- CURLMOPT_SOCKETFUNCTION returns error");
|
|
return -1;
|
|
}
|
|
|
|
if(action == CURL_POLL_IN || action == CURL_POLL_INOUT)
|
|
if(t530_addFd(&sockets->read, s, "read"))
|
|
return -1; /* bail out */
|
|
|
|
if(action == CURL_POLL_OUT || action == CURL_POLL_INOUT)
|
|
if(t530_addFd(&sockets->write, s, "write"))
|
|
return -1;
|
|
|
|
if(action == CURL_POLL_REMOVE) {
|
|
t530_removeFd(&sockets->read, s, 1);
|
|
t530_removeFd(&sockets->write, s, 0);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Callback invoked by curl to set a timeout.
|
|
*/
|
|
static int t530_curlTimerCallback(CURLM *multi, long timeout_ms, void *userp)
|
|
{
|
|
struct curltime *timeout = userp;
|
|
|
|
(void)multi;
|
|
t530_ctx.timer_calls++;
|
|
t530_msg("-> CURLMOPT_TIMERFUNCTION");
|
|
if(t530_ctx.timer_calls == t530_ctx.max_timer_calls) {
|
|
t530_msg("<- CURLMOPT_TIMERFUNCTION returns error");
|
|
return -1;
|
|
}
|
|
if(timeout_ms != -1) {
|
|
*timeout = curlx_now();
|
|
timeout->tv_usec += (int)timeout_ms * 1000;
|
|
}
|
|
else {
|
|
timeout->tv_sec = -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Check for curl completion.
|
|
*/
|
|
static int t530_checkForCompletion(CURLM *multi, int *success)
|
|
{
|
|
int result = 0;
|
|
*success = 0;
|
|
while(1) {
|
|
int numMessages;
|
|
CURLMsg *message = curl_multi_info_read(multi, &numMessages);
|
|
if(!message)
|
|
break;
|
|
if(message->msg == CURLMSG_DONE) {
|
|
result = 1;
|
|
if(message->data.result == CURLE_OK)
|
|
*success = 1;
|
|
else
|
|
*success = 0;
|
|
}
|
|
else {
|
|
curl_mfprintf(stderr, "%s got an unexpected message from curl: %d\n",
|
|
t530_tag(), (int)message->msg);
|
|
result = 1;
|
|
*success = 0;
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static ssize_t t530_getMicroSecondTimeout(struct curltime *timeout)
|
|
{
|
|
struct curltime now;
|
|
ssize_t result;
|
|
now = curlx_now();
|
|
result = (ssize_t)(((timeout->tv_sec - now.tv_sec) * 1000000) +
|
|
timeout->tv_usec - now.tv_usec);
|
|
if(result < 0)
|
|
result = 0;
|
|
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Update a fd_set with all of the sockets in use.
|
|
*/
|
|
static void t530_updateFdSet(struct t530_Sockets *sockets, fd_set *fdset,
|
|
curl_socket_t *maxFd)
|
|
{
|
|
int i;
|
|
for(i = 0; i < sockets->count; ++i) {
|
|
FD_SET(sockets->sockets[i], fdset);
|
|
if(*maxFd < sockets->sockets[i] + 1) {
|
|
*maxFd = sockets->sockets[i] + 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
static CURLMcode socket_action(CURLM *multi, curl_socket_t s, int evBitmask,
|
|
const char *info)
|
|
{
|
|
int numhandles = 0;
|
|
CURLMcode mresult = curl_multi_socket_action(multi, s, evBitmask,
|
|
&numhandles);
|
|
if(mresult != CURLM_OK) {
|
|
curl_mfprintf(stderr, "%s curl error on %s (%d) %s\n",
|
|
t530_tag(), info, mresult, curl_multi_strerror(mresult));
|
|
}
|
|
return mresult;
|
|
}
|
|
|
|
/**
|
|
* Invoke curl when a file descriptor is set.
|
|
*/
|
|
static CURLMcode t530_checkFdSet(CURLM *multi, struct t530_Sockets *sockets,
|
|
fd_set *fdset, int evBitmask,
|
|
const char *name)
|
|
{
|
|
int i;
|
|
CURLMcode mresult = CURLM_OK;
|
|
for(i = 0; i < sockets->count; ++i) {
|
|
if(FD_ISSET(sockets->sockets[i], fdset)) {
|
|
mresult = socket_action(multi, sockets->sockets[i], evBitmask, name);
|
|
if(mresult)
|
|
break;
|
|
}
|
|
}
|
|
return mresult;
|
|
}
|
|
|
|
static CURLcode testone(const char *URL, int timer_fail_at, int socket_fail_at)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
CURL *curl = NULL;
|
|
CURLM *multi = NULL;
|
|
struct t530_ReadWriteSockets sockets = { { NULL, 0, 0 }, { NULL, 0, 0 } };
|
|
int success = 0;
|
|
struct curltime timeout = { 0 };
|
|
timeout.tv_sec = (time_t)-1;
|
|
|
|
/* set the limits */
|
|
memset(&t530_ctx, 0, sizeof(t530_ctx));
|
|
t530_ctx.max_timer_calls = timer_fail_at;
|
|
t530_ctx.max_socket_calls = socket_fail_at;
|
|
|
|
t530_msg("start");
|
|
start_test_timing();
|
|
|
|
res_global_init(CURL_GLOBAL_ALL);
|
|
if(result != CURLE_OK)
|
|
return result;
|
|
|
|
easy_init(curl);
|
|
|
|
/* specify target */
|
|
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);
|
|
|
|
multi_setopt(multi, CURLMOPT_SOCKETFUNCTION, t530_curlSocketCallback);
|
|
multi_setopt(multi, CURLMOPT_SOCKETDATA, &sockets);
|
|
|
|
multi_setopt(multi, CURLMOPT_TIMERFUNCTION, t530_curlTimerCallback);
|
|
multi_setopt(multi, CURLMOPT_TIMERDATA, &timeout);
|
|
|
|
multi_add_handle(multi, curl);
|
|
|
|
if(socket_action(multi, CURL_SOCKET_TIMEOUT, 0, "timeout")) {
|
|
result = TEST_ERR_MAJOR_BAD;
|
|
goto test_cleanup;
|
|
}
|
|
|
|
while(!t530_checkForCompletion(multi, &success)) {
|
|
fd_set readSet, writeSet;
|
|
curl_socket_t maxFd = 0;
|
|
struct timeval tv = { 0 };
|
|
tv.tv_sec = 10;
|
|
|
|
FD_ZERO(&readSet);
|
|
FD_ZERO(&writeSet);
|
|
t530_updateFdSet(&sockets.read, &readSet, &maxFd);
|
|
t530_updateFdSet(&sockets.write, &writeSet, &maxFd);
|
|
|
|
if(timeout.tv_sec != (time_t)-1) {
|
|
int usTimeout = curlx_sztosi(t530_getMicroSecondTimeout(&timeout));
|
|
tv.tv_sec = usTimeout / 1000000;
|
|
tv.tv_usec = usTimeout % 1000000;
|
|
}
|
|
else if(maxFd <= 0) {
|
|
tv.tv_sec = 0;
|
|
tv.tv_usec = 100000;
|
|
}
|
|
|
|
assert(maxFd);
|
|
select_test((int)maxFd, &readSet, &writeSet, NULL, &tv);
|
|
|
|
/* Check the sockets for reading / writing */
|
|
if(t530_checkFdSet(multi, &sockets.read, &readSet, CURL_CSELECT_IN,
|
|
"read")) {
|
|
result = TEST_ERR_MAJOR_BAD;
|
|
goto test_cleanup;
|
|
}
|
|
if(t530_checkFdSet(multi, &sockets.write, &writeSet, CURL_CSELECT_OUT,
|
|
"write")) {
|
|
result = TEST_ERR_MAJOR_BAD;
|
|
goto test_cleanup;
|
|
}
|
|
|
|
if(timeout.tv_sec != (time_t)-1 &&
|
|
t530_getMicroSecondTimeout(&timeout) == 0) {
|
|
/* curl's timer has elapsed. */
|
|
if(socket_action(multi, CURL_SOCKET_TIMEOUT, 0, "timeout")) {
|
|
result = TEST_ERR_BAD_TIMEOUT;
|
|
goto test_cleanup;
|
|
}
|
|
}
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
if(!success) {
|
|
t530_msg("Error getting file.");
|
|
result = TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
/* proper cleanup sequence */
|
|
t530_msg("cleanup");
|
|
curl_multi_remove_handle(multi, curl);
|
|
curl_easy_cleanup(curl);
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
|
|
/* free local memory */
|
|
curlx_free(sockets.read.sockets);
|
|
curlx_free(sockets.write.sockets);
|
|
t530_msg("done");
|
|
|
|
return result;
|
|
}
|
|
|
|
static CURLcode test_lib530(const char *URL)
|
|
{
|
|
CURLcode result;
|
|
/* rerun the same transfer multiple times and make it fail in different
|
|
callback calls */
|
|
result = testone(URL, 0, 0); /* no callback fails */
|
|
if(result)
|
|
curl_mfprintf(stderr, "%s FAILED: %d\n", t530_tag(), (int)result);
|
|
|
|
result = testone(URL, 1, 0); /* fail 1st call to timer callback */
|
|
if(!result)
|
|
curl_mfprintf(stderr, "%s FAILED: %d\n", t530_tag(), (int)result);
|
|
|
|
result = testone(URL, 2, 0); /* fail 2nd call to timer callback */
|
|
if(!result)
|
|
curl_mfprintf(stderr, "%s FAILED: %d\n", t530_tag(), (int)result);
|
|
|
|
result = testone(URL, 0, 2); /* fail 2nd call to socket callback */
|
|
if(!result)
|
|
curl_mfprintf(stderr, "%s FAILED: %d\n", t530_tag(), (int)result);
|
|
|
|
result = testone(URL, 0, 3); /* fail 3rd call to socket callback */
|
|
if(!result)
|
|
curl_mfprintf(stderr, "%s FAILED: %d\n", t530_tag(), (int)result);
|
|
|
|
return CURLE_OK;
|
|
}
|