mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-04 02:28:03 +00:00
Code Issues Releases Wiki Activity

(libT) don't start the web thread until we have a task to feed to curl

Browse source
This commit is contained in:
Jordan Lee 2013-02-15 01:52:47 +00:00
parent 58862d0fc4
commit fcdec9a8bc
4 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libtransmission/session.c
View file

@ -728,10 +728,6 @@ tr_sessionInitImpl (void * vdata)
tr_statsInit (session); tr_statsInit (session);
tr_webInit (session);
while (session->web == NULL)
tr_wait_msec (50);
tr_sessionSet (session, &settings); tr_sessionSet (session, &settings);
tr_udpInit (session); tr_udpInit (session);
@ -1756,6 +1752,8 @@ sessionCloseImpl (void * vsession)
assert (tr_isSession (session)); assert (tr_isSession (session));
session->isClosing = true;
free_incoming_peer_port (session); free_incoming_peer_port (session);
if (session->isLPDEnabled) if (session->isLPDEnabled)

1
libtransmission/session.h
View file

@ -110,6 +110,7 @@ struct tr_session
bool isBlocklistEnabled; bool isBlocklistEnabled;
bool isPrefetchEnabled; bool isPrefetchEnabled;
bool isTorrentDoneScriptEnabled; bool isTorrentDoneScriptEnabled;
bool isClosing;
bool isClosed; bool isClosed;
bool isIncompleteFileNamingEnabled; bool isIncompleteFileNamingEnabled;
bool isRatioLimited; bool isRatioLimited;

32
libtransmission/web.c
View file

@ -247,6 +247,8 @@ tr_webRun (tr_session * session,
NULL); NULL);
} }
static void tr_webThreadFunc (void * vsession);
struct tr_web_task * struct tr_web_task *
tr_webRunWithBuffer (tr_session * session, tr_webRunWithBuffer (tr_session * session,
const char * url, const char * url,
@ -256,12 +258,20 @@ tr_webRunWithBuffer (tr_session * session,
void * done_func_user_data, void * done_func_user_data,
struct evbuffer * buffer) struct evbuffer * buffer)
{ {
struct tr_web * web = session->web; struct tr_web_task * task = NULL;
if (web != NULL) if (!session->isClosing)
{ {
struct tr_web_task * task = tr_new0 (struct tr_web_task, 1); if (session->web == NULL)
{
tr_threadNew (tr_webThreadFunc, session);
while (session->web == NULL)
tr_wait_msec (20);
}
task = tr_new0 (struct tr_web_task, 1);
task = tr_new0 (struct tr_web_task, 1);
task->session = session; task->session = session;
task->url = tr_strdup (url); task->url = tr_strdup (url);
task->range = tr_strdup (range); task->range = tr_strdup (range);
@ -271,14 +281,13 @@ tr_webRunWithBuffer (tr_session * session,
task->response = buffer ? buffer : evbuffer_new (); task->response = buffer ? buffer : evbuffer_new ();
task->freebuf = buffer ? NULL : task->response; task->freebuf = buffer ? NULL : task->response;
tr_lockLock (web->taskLock); tr_lockLock (session->web->taskLock);
task->next = web->tasks; task->next = session->web->tasks;
web->tasks = task; session->web->tasks = task;
tr_lockUnlock (web->taskLock); tr_lockUnlock (session->web->taskLock);
return task;
} }
return NULL; return task;
} }
/** /**
@ -450,11 +459,6 @@ tr_webThreadFunc (void * vsession)
session->web = NULL; session->web = NULL;
} }
void
tr_webInit (tr_session * session)
{
tr_threadNew (tr_webThreadFunc, session);
}
void void
tr_webClose (tr_session * session, tr_web_close_mode close_mode) tr_webClose (tr_session * session, tr_web_close_mode close_mode)

2
libtransmission/web.h
View file

@ -30,8 +30,6 @@ typedef enum
} }
tr_web_task_info; tr_web_task_info;
void tr_webInit (tr_session * session);
typedef enum typedef enum
{ {
TR_WEB_CLOSE_WHEN_IDLE, TR_WEB_CLOSE_WHEN_IDLE,