mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk libT) don't use tr_list for the tr_web_task queue

This commit is contained in:
Jordan Lee 2011-06-19 18:18:48 +00:00
parent 5124d87a5b
commit 437ebe32c7
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libtransmission/web.c
View File

@ -24,7 +24,6 @@
#include <event2/buffer.h>
#include "transmission.h"
#include "list.h"
#include "net.h" /* tr_address */
#include "platform.h" /* mutex */
#include "session.h"
@ -56,20 +55,6 @@ enum
} while( 0 )
#endif
/***
****
***/
struct tr_web
{
bool curl_verbose;
int close_mode;
tr_list * tasks;
tr_lock * taskLock;
char * cookie_filename;
};
/***
****
***/
@ -88,6 +73,7 @@ struct tr_web_task
tr_session * session;
tr_web_done_func * done_func;
void * done_func_user_data;
struct tr_web_task * next;
};
static void
@ -105,6 +91,19 @@ task_free( struct tr_web_task * task )
****
***/
struct tr_web
{
bool curl_verbose;
int close_mode;
struct tr_web_task * tasks;
tr_lock * taskLock;
char * cookie_filename;
};
/***
****
***/
static size_t
writeFunc( void * ptr, size_t size, size_t nmemb, void * vtask )
{
@ -258,7 +257,8 @@ tr_webRunWithBuffer( tr_session * session,
task->freebuf = buffer ? NULL : task->response;
tr_lockLock( web->taskLock );
tr_list_append( &web->tasks, task );
task->next = web->tasks;
web->tasks = task;
tr_lockUnlock( web->taskLock );
}
}
@ -334,8 +334,13 @@ tr_webThreadFunc( void * vsession )
/* add tasks from the queue */
tr_lockLock( web->taskLock );
while(( task = tr_list_pop_front( &web->tasks )))
while( web->tasks != NULL )
{
/* pop the task */
task = web->tasks;
web->tasks = task->next;
task->next = NULL;
dbgmsg( "adding task to curl: [%s]", task->url );
curl_multi_add_handle( multi, createEasy( session, web, task ));
/*fprintf( stderr, "adding a task.. taskCount is now %d\n", taskCount );*/
@ -399,20 +404,13 @@ tr_webThreadFunc( void * vsession )
--taskCount;
}
}
#if 0
{
tr_list * l;
for( l=web->tasks; l!=NULL; l=l->next )
fprintf( stderr, "still pending: %s\n", ((struct tr_web_task*)l->data)->url );
}
fprintf( stderr, "loop is ending... web is closing\n" );
#endif
}
/* Discard any remaining tasks.
* This is rare, but can happen on shutdown with unresponsive trackers. */
while(( task = tr_list_pop_front( &web->tasks ))) {
while( web->tasks != NULL ) {
task = web->tasks;
web->tasks = task->next;
dbgmsg( "Discarding task \"%s\"", task->url );
task_free( task );
}