From 49ba269b9d09746e90e153f3e245eaf3f97e35cc Mon Sep 17 00:00:00 2001 From: erdgeist <> Date: Mon, 19 Nov 2007 21:10:53 +0000 Subject: [PATCH] Cleanup now moved to its own thread, too --- opentracker.c | 12 ++++++---- ot_clean.c | 59 ++++++++++++++++++++++++++++---------------------- ot_mutex.c | 24 ++++++++++++++++++++ ot_mutex.h | 7 ++++-- trackerlogic.c | 10 +++++++-- 5 files changed, 78 insertions(+), 34 deletions(-) diff --git a/opentracker.c b/opentracker.c index 59b561b..642815a 100644 --- a/opentracker.c +++ b/opentracker.c @@ -40,12 +40,14 @@ #include "ot_iovec.h" #include "ot_accesslist.h" #include "ot_mutex.h" +#include "ot_clean.h" /* Globals */ static const size_t SUCCESS_HTTP_HEADER_LENGTH = 80; static const size_t SUCCESS_HTTP_SIZE_OFF = 17; static uint32_t g_adminip_addresses[OT_ADMINIP_MAX]; static unsigned int g_adminip_count = 0; +static time_t ot_last_clean_time; time_t ot_start_time; time_t g_now; @@ -623,6 +625,7 @@ ANNOUNCE_WORKAROUND: static void signal_handler( int s ) { if( s == SIGINT ) { signal( SIGINT, SIG_IGN); + trackerlogic_deinit(); exit( 0 ); } else if( s == SIGALRM ) { @@ -783,7 +786,10 @@ static void server_mainloop( ) { } /* See if we need to move our pools */ - clean_all_torrents(); + if( g_now != ot_last_clean_time ) { + ot_last_clean_time = g_now; + clean_all_torrents(); + } } } @@ -872,9 +878,7 @@ int main( int argc, char **argv ) { if( trackerlogic_init( serverdir ) == -1 ) panic( "Logic not started" ); - fullscrape_init( ); - - g_now = ot_start_time = time( NULL ); + g_now = ot_start_time = ot_last_clean_time = time( NULL ); alarm(5); server_mainloop( ); diff --git a/ot_clean.c b/ot_clean.c index 509dd2e..625e94a 100644 --- a/ot_clean.c +++ b/ot_clean.c @@ -4,6 +4,7 @@ /* System */ #include #include +#include /* Libowfat */ #include "byte.h" @@ -12,9 +13,6 @@ #include "trackerlogic.h" #include "ot_mutex.h" -/* To remember, when we last cleaned up */ -static ot_time all_torrents_clean[OT_BUCKET_COUNT]; - /* Clean a single torrent return 1 if torrent timed out */ @@ -83,37 +81,46 @@ int clean_single_torrent( ot_torrent *torrent ) { return 0; } -/* Clean up all peers in current bucket, remove timedout pools and - torrents */ -void clean_all_torrents( void ) { - ot_vector *torrents_list; - size_t i; - static int bucket; - ot_time time_now = NOW; - - /* Search for an uncleaned bucked */ - while( ( all_torrents_clean[bucket] == time_now ) && ( ++bucket < OT_BUCKET_COUNT ) ); - if( bucket >= OT_BUCKET_COUNT ) { - bucket = 0; return; - } +static void clean_make() { + int bucket; - all_torrents_clean[bucket] = time_now; + for( bucket = OT_BUCKET_COUNT - 1; bucket >= 0; --bucket ) { + ot_vector *torrents_list = mutex_bucket_lock( bucket ); + size_t toffs; - torrents_list = mutex_bucket_lock( bucket ); - for( i=0; isize; ++i ) { - ot_torrent *torrent = ((ot_torrent*)(torrents_list->data)) + i; - if( clean_single_torrent( torrent ) ) { - vector_remove_torrent( torrents_list, torrent ); - --i; continue; + for( toffs=0; toffssize; ++toffs ) { + ot_torrent *torrent = ((ot_torrent*)(torrents_list->data)) + toffs; + if( clean_single_torrent( torrent ) ) { + vector_remove_torrent( torrents_list, torrent ); + --toffs; continue; + } } + mutex_bucket_unlock( bucket ); } - mutex_bucket_unlock( bucket ); } +/* Clean up all peers in current bucket, remove timedout pools and + torrents */ +static void * clean_worker( void * args ) { + args = args; + while( 1 ) { + ot_tasktype tasktype = TASK_CLEAN; + ot_taskid taskid = mutex_workqueue_poptask( &tasktype ); + clean_make( ); + mutex_workqueue_pushsuccess( taskid ); + } + return NULL; +} + +void clean_all_torrents( ) { + mutex_workqueue_pushtask( 0, TASK_CLEAN ); +} + +static pthread_t thread_id; void clean_init( void ) { - byte_zero( all_torrents_clean, sizeof( all_torrents_clean ) ); + pthread_create( &thread_id, NULL, clean_worker, NULL ); } void clean_deinit( void ) { - byte_zero( all_torrents_clean, sizeof( all_torrents_clean ) ); + pthread_cancel( thread_id ); } diff --git a/ot_mutex.c b/ot_mutex.c index a08b5ef..b01bb4a 100644 --- a/ot_mutex.c +++ b/ot_mutex.c @@ -218,6 +218,30 @@ ot_taskid mutex_workqueue_poptask( ot_tasktype *tasktype ) { return taskid; } +void mutex_workqueue_pushsuccess( ot_taskid taskid ) { + struct ot_task ** task; + + /* Want exclusive access to tasklist */ + MTX_DBG( "pushsuccess locks.\n" ); + pthread_mutex_lock( &tasklist_mutex ); + MTX_DBG( "pushsuccess locked.\n" ); + + task = &tasklist; + while( *task && ( (*task)->taskid != taskid ) ) + *task = (*task)->next; + + if( *task && ( (*task)->taskid == taskid ) ) { + struct ot_task *ptask = *task; + *task = (*task)->next; + free( ptask ); + } + + /* Release lock */ + MTX_DBG( "pushsuccess unlocks.\n" ); + pthread_mutex_unlock( &tasklist_mutex ); + MTX_DBG( "pushsuccess unlocked.\n" ); +} + int mutex_workqueue_pushresult( ot_taskid taskid, int iovec_entries, struct iovec *iovec ) { struct ot_task * task; /* Want exclusive access to tasklist */ diff --git a/ot_mutex.h b/ot_mutex.h index 8c2e356..b2668ce 100644 --- a/ot_mutex.h +++ b/ot_mutex.h @@ -32,9 +32,11 @@ typedef enum { TASK_FULLSCRAPE_TPB_ASCII = 0x0202, TASK_FULLSCRAPE_TPB_URLENCODED = 0x0203, - TASK_SYNC = 0x0300, + TASK_CLEAN = 0x0300, - TASK_DMEM = 0x0400, + TASK_SYNC = 0x0400, + + TASK_DMEM = 0x0500, TASK_DONE = 0x0f00, TASK_MASK = 0xff00 @@ -44,6 +46,7 @@ typedef unsigned long ot_taskid; int mutex_workqueue_pushtask( int64 socket, ot_tasktype tasktype ); void mutex_workqueue_canceltask( int64 socket ); +void mutex_workqueue_pushsuccess( ot_taskid taskid ); ot_taskid mutex_workqueue_poptask( ot_tasktype *tasktype ); int mutex_workqueue_pushresult( ot_taskid taskid, int iovec_entries, struct iovec *iovector ); int64 mutex_workqueue_popresult( int *iovec_entries, struct iovec ** iovector ); diff --git a/trackerlogic.c b/trackerlogic.c index d0d5235..e4dc3a6 100644 --- a/trackerlogic.c +++ b/trackerlogic.c @@ -22,6 +22,7 @@ #include "ot_stats.h" #include "ot_clean.h" #include "ot_accesslist.h" +#include "ot_fullscrape.h" void free_peerlist( ot_peerlist *peer_list ) { size_t i; @@ -321,8 +322,10 @@ int trackerlogic_init( const char * const serverdir ) { srandom( time(NULL) ); - clean_init( ); + /* Initialise background worker threads */ mutex_init( ); + clean_init( ); + fullscrape_init( ); return 0; } @@ -343,6 +346,9 @@ void trackerlogic_deinit( void ) { } mutex_bucket_unlock( bucket ); } - mutex_deinit( ); + + /* Deinitialise background worker threads */ + fullscrape_init( ); clean_deinit( ); + mutex_deinit( ); }