mirror of
git://erdgeist.org/opentracker
synced 2025-01-12 07:50:52 +00:00
Fixed 24h clean bug. Allocate less memory for full scrape. Free torrents without any downloaders immediately.
This commit is contained in:
parent
28d88e3380
commit
c730a24d0a
@ -312,7 +312,7 @@ size_t return_fullscrape_for_tracker( char **reply ) {
|
|||||||
torrent_count += all_torrents[i].size;
|
torrent_count += all_torrents[i].size;
|
||||||
|
|
||||||
// one extra for pro- and epilogue
|
// one extra for pro- and epilogue
|
||||||
if( !( r = *reply = malloc( 128*(1+torrent_count) ) ) ) return 0;
|
if( !( r = *reply = malloc( 100*(1+torrent_count) ) ) ) return 0;
|
||||||
|
|
||||||
memmove( r, "d5:filesd", 9 ); r += 9;
|
memmove( r, "d5:filesd", 9 ); r += 9;
|
||||||
for( i=0; i<256; ++i ) {
|
for( i=0; i<256; ++i ) {
|
||||||
@ -325,7 +325,7 @@ size_t return_fullscrape_for_tracker( char **reply ) {
|
|||||||
peers += peer_list->peers[k].size;
|
peers += peer_list->peers[k].size;
|
||||||
seeds += peer_list->seed_count[k];
|
seeds += peer_list->seed_count[k];
|
||||||
}
|
}
|
||||||
if( peers ) {
|
if( peers || peer_list->downloaded ) {
|
||||||
*r++='2'; *r++='0'; *r++=':';
|
*r++='2'; *r++='0'; *r++=':';
|
||||||
memmove( r, hash, 20 ); r+=20;
|
memmove( r, hash, 20 ); r+=20;
|
||||||
r += sprintf( r, "d8:completei%zde10:downloadedi%zde10:incompletei%zdee", seeds, peer_list->downloaded, peers-seeds );
|
r += sprintf( r, "d8:completei%zde10:downloadedi%zde10:incompletei%zdee", seeds, peer_list->downloaded, peers-seeds );
|
||||||
@ -548,7 +548,7 @@ void clean_all_torrents( void ) {
|
|||||||
/* Torrent has idled out */
|
/* Torrent has idled out */
|
||||||
if( timedout > OT_TORRENT_TIMEOUT ) {
|
if( timedout > OT_TORRENT_TIMEOUT ) {
|
||||||
vector_remove_torrent( torrents_list, hash );
|
vector_remove_torrent( torrents_list, hash );
|
||||||
--j;
|
--j; continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If nothing to be cleaned here, handle next torrent */
|
/* If nothing to be cleaned here, handle next torrent */
|
||||||
@ -558,8 +558,13 @@ void clean_all_torrents( void ) {
|
|||||||
for( k = 0; k < OT_POOLS_COUNT; ++k )
|
for( k = 0; k < OT_POOLS_COUNT; ++k )
|
||||||
peers_count += peer_list->peers[k].size;
|
peers_count += peer_list->peers[k].size;
|
||||||
|
|
||||||
if( !peers_count )
|
if( !peers_count ) {
|
||||||
|
if( !peer_list->downloaded ) {
|
||||||
|
vector_remove_torrent( torrents_list, hash );
|
||||||
|
--j;
|
||||||
|
}
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
timedout = OT_POOLS_COUNT;
|
timedout = OT_POOLS_COUNT;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user