github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-03-14 20:00:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix thread resources leak.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2012-10-06 15:49:14 +02:00
parent c24dce1d07
commit 7c8735a6ee
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2012-10-07 Giuseppe Scrivano <gscrivano@gnu.org>
* wget.h (enum): Add THREADS_ERR and SEM_ERR.
* recur.c (retrieve_tree): Use `pthread_join' to free a terminated
thread resources.
2012-09-18 Ilim Ugur <ilimugur@gmail.com>
* metalink.c (elect_resources): Rewrite function definition, correcting
faulty logic in branching statements.

1
src/multi.h
View File

@ -42,6 +42,7 @@ as that of the covered work. */
struct s_thread_ctx
{
pthread_t thread;
int used;
int terminated;
int dt, url_err;

30
src/recur.c
View File

@ -263,16 +263,13 @@ retrieve_tree (struct url *start_url_parsed, struct iri *pi)
char *file = NULL;
bool is_css = false;
bool dash_p_leaf_HTML = false;
#ifndef ENABLE_THREADS
char *url, *referer;
int depth;
bool html_allowed, css_allowed;
#else
int index = 0;
char *url = NULL, *referer;
int depth;
bool html_allowed, css_allowed;
#ifdef ENABLE_THREADS
int index = 0;
#endif
if (opt.quota && total_downloaded_bytes > opt.quota)
break;
if (status == FWRITEERR)
@ -350,7 +347,6 @@ retrieve_tree (struct url *start_url_parsed, struct iri *pi)
status = retrieve_url (url_parsed, url, &file, &redirected, referer,
&dt, false, i, true);
#else
pthread_t thread;
int j;
retry:
if (! url)
@ -371,6 +367,7 @@ retry:
if (url && free_threads)
{
int err;
for (j = 0; j < N_THREADS; j++)
if (! thread_ctx[j].used)
{
@ -380,6 +377,7 @@ retry:
thread_ctx[j].terminated = 0;
break;
}
assert (j < N_THREADS);
thread_ctx[index].file = file;
thread_ctx[index].referer = referer;
@ -393,8 +391,18 @@ retry:
&thread_ctx[index].url_err,
i, true);
next_url = NULL;
pthread_create (&thread, NULL, start_retrieve_url, &thread_ctx[index]);
err = pthread_create (&thread_ctx[index].thread, NULL,
start_retrieve_url, &thread_ctx[index]);
if (err == 0)
next_url = NULL;
else
{
logprintf (LOG_NOTQUIET, "pthread_create: %s\n", strerror (errno));
url_free (thread_ctx[index].url_parsed);
thread_ctx[index].used = 0;
free_threads++;
return THREADS_ERR;
}
continue;
}
@ -404,6 +412,7 @@ retry:
{
index = j;
thread_ctx[j].used = 0;
pthread_join (thread_ctx[j].thread, NULL);
free_threads++;
break;
}
@ -414,7 +423,8 @@ retry:
do
ret = sem_wait (&retr_sem);
while (ret < 0 && errno == EINTR);
if (ret < 0); /*TODO barf*/
if (ret < 0)
return SEM_ERR;
goto retry;
}

7
src/wget.h
View File

@ -353,9 +353,10 @@ typedef enum
PROXERR,
/* 50 */
AUTHFAILED, QUOTEXC, WRITEFAILED, SSLINITFAILED, VERIFCERTERR,
UNLINKERR, NEWLOCATION_KEEP_POST, CLOSEFAILED,
WARC_ERR, WARC_TMP_FOPENERR, WARC_TMP_FWRITEERR
UNLINKERR, NEWLOCATION_KEEP_POST, CLOSEFAILED, WARC_ERR,
WARC_TMP_FOPENERR,
/* 60 */
WARC_TMP_FWRITEERR, THREADS_ERR, SEM_ERR
} uerr_t;
struct range {