mirror
/
opentracker
mirror of git://erdgeist.org/opentracker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-implement logging busy networks to handle v6 API.

Browse Source 
Implement a state dump for later reparsing.
dynamic-accesslists
erdgeist 16 years ago
parent 255ac58971
commit eec51a872c
4 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File

9
ot_fullscrape.c
Unescape Escape View File

@ -162,14 +162,13 @@ static void fullscrape_make( int *iovec_entries, struct iovec **iovector, ot_tas
switch( mode & TASK_TASK_MASK ) { switch( mode & TASK_TASK_MASK ) {
case TASK_FULLSCRAPE: case TASK_FULLSCRAPE:
default: default:
/* push hash as bencoded string */ /* push hash as bencoded string */
*r++='2'; *r++='0'; *r++=':'; *r++='2'; *r++='0'; *r++=':';
memcpy( r, hash, sizeof(ot_hash) ); r += sizeof(ot_hash); memcpy( r, hash, sizeof(ot_hash) ); r += sizeof(ot_hash);
/* push rest of the scrape string */ /* push rest of the scrape string */
r += sprintf( r, "d8:completei%zde10:downloadedi%zde10:incompletei%zdee", peer_list->seed_count, peer_list->down_count, peer_list->peer_count-peer_list->seed_count ); r += sprintf( r, "d8:completei%zde10:downloadedi%zde10:incompletei%zdee", peer_list->seed_count, peer_list->down_count, peer_list->peer_count-peer_list->seed_count );
break; break;
case TASK_FULLSCRAPE_TPB_ASCII: case TASK_FULLSCRAPE_TPB_ASCII:
to_hex( r, *hash ); r+= 2 * sizeof(ot_hash); to_hex( r, *hash ); r+= 2 * sizeof(ot_hash);
r += sprintf( r, ":%zd:%zd\n", peer_list->seed_count, peer_list->peer_count-peer_list->seed_count ); r += sprintf( r, ":%zd:%zd\n", peer_list->seed_count, peer_list->peer_count-peer_list->seed_count );
@ -184,6 +183,12 @@ static void fullscrape_make( int *iovec_entries, struct iovec **iovector, ot_tas
r += fmt_urlencoded( r, (char *)*hash, 20 ); r += fmt_urlencoded( r, (char *)*hash, 20 );
r += sprintf( r, ":%zd:%zd\n", peer_list->seed_count, peer_list->peer_count-peer_list->seed_count ); r += sprintf( r, ":%zd:%zd\n", peer_list->seed_count, peer_list->peer_count-peer_list->seed_count );
break; break;
case TASK_FULLSCRAPE_TRACKERSTATE:
memcpy( r, *hash, sizeof(ot_hash) ); r += sizeof(ot_hash);
uint64_pack_big( r, (uint64_t)peer_list->down_count );
uint64_pack_big( r + 8, (uint64_t)peer_list->base );
r += 16;
break;
} }
#ifdef WANT_COMPRESSION_GZIP #ifdef WANT_COMPRESSION_GZIP

2
ot_http.c
Unescape Escape View File

@ -165,7 +165,7 @@ static const ot_keywords keywords_mode[] =
{ "busy", TASK_STATS_BUSY_NETWORKS }, { "torr", TASK_STATS_TORRENTS }, { "fscr", TASK_STATS_FULLSCRAPE }, { "busy", TASK_STATS_BUSY_NETWORKS }, { "torr", TASK_STATS_TORRENTS }, { "fscr", TASK_STATS_FULLSCRAPE },
{ "s24s", TASK_STATS_SLASH24S }, { "tpbs", TASK_STATS_TPB }, { "herr", TASK_STATS_HTTPERRORS }, { "s24s", TASK_STATS_SLASH24S }, { "tpbs", TASK_STATS_TPB }, { "herr", TASK_STATS_HTTPERRORS },
{ "top10", TASK_STATS_TOP10 }, { "renew", TASK_STATS_RENEW }, { "syncs", TASK_STATS_SYNCS }, { "version", TASK_STATS_VERSION }, { "top10", TASK_STATS_TOP10 }, { "renew", TASK_STATS_RENEW }, { "syncs", TASK_STATS_SYNCS }, { "version", TASK_STATS_VERSION },
{ "everything", TASK_STATS_EVERYTHING }, { NULL, -3 } }; { "everything", TASK_STATS_EVERYTHING }, { "statedump", TASK_FULLSCRAPE_TPB_URLENCODED }, { NULL, -3 } };
static const ot_keywords keywords_format[] = static const ot_keywords keywords_format[] =
{ { "bin", TASK_FULLSCRAPE_TPB_BINARY }, { "ben", TASK_FULLSCRAPE }, { "url", TASK_FULLSCRAPE_TPB_URLENCODED }, { { "bin", TASK_FULLSCRAPE_TPB_BINARY }, { "ben", TASK_FULLSCRAPE }, { "url", TASK_FULLSCRAPE_TPB_URLENCODED },
{ "txt", TASK_FULLSCRAPE_TPB_ASCII }, { NULL, -3 } }; { "txt", TASK_FULLSCRAPE_TPB_ASCII }, { NULL, -3 } };

1
ot_mutex.h
Unescape Escape View File

@ -43,6 +43,7 @@ typedef enum {
TASK_FULLSCRAPE_TPB_BINARY = 0x0201, TASK_FULLSCRAPE_TPB_BINARY = 0x0201,
TASK_FULLSCRAPE_TPB_ASCII = 0x0202, TASK_FULLSCRAPE_TPB_ASCII = 0x0202,
TASK_FULLSCRAPE_TPB_URLENCODED = 0x0203, TASK_FULLSCRAPE_TPB_URLENCODED = 0x0203,
TASK_FULLSCRAPE_TRACKERSTATE = 0x0204,
TASK_DMEM = 0x0300, TASK_DMEM = 0x0300,

41
ot_stats.c
Unescape Escape View File

@ -57,11 +57,15 @@ static time_t ot_start_time;
#ifdef WANT_LOG_NETWORKS #ifdef WANT_LOG_NETWORKS
#define STATS_NETWORK_NODE_BITWIDTH 8 #define STATS_NETWORK_NODE_BITWIDTH 8
#define STATS_NETWORK_NODE_MAXDEPTH 16
#define STATS_NETWORK_NODE_BITMASK ((1<<STATS_NETWORK_NODE_BITWIDTH)-1)
#define STATS_NETWORK_NODE_COUNT (1<<STATS_NETWORK_NODE_BITWIDTH) #define STATS_NETWORK_NODE_COUNT (1<<STATS_NETWORK_NODE_BITWIDTH)
#ifdef WANT_V6
#define STATS_NETWORK_NODE_MAXDEPTH (48/8-1)
#else
#define STATS_NETWORK_NODE_MAXDEPTH (12+24/8-1)
#endif
typedef union stats_network_node stats_network_node; typedef union stats_network_node stats_network_node;
union stats_network_node { union stats_network_node {
int counters[STATS_NETWORK_NODE_COUNT]; int counters[STATS_NETWORK_NODE_COUNT];
@ -71,8 +75,8 @@ union stats_network_node {
static stats_network_node *stats_network_counters_root = NULL; static stats_network_node *stats_network_counters_root = NULL;
static int stat_increase_network_count( stats_network_node **node, int depth, uintptr_t ip ) { static int stat_increase_network_count( stats_network_node **node, int depth, uintptr_t ip ) {
ot_ip6 *_ip = (ot_ip6*)ip; uint8_t *_ip = (uint8_t*)ip;
int foo = (*_ip)[depth]; int foo = _ip[++depth];
if( !*node ) { if( !*node ) {
*node = malloc( sizeof( stats_network_node ) ); *node = malloc( sizeof( stats_network_node ) );
@ -115,7 +119,8 @@ static int stats_shift_down_network_count( stats_network_node **node, int depth,
return rest; return rest;
} }
static void stats_get_highscore_networks( stats_network_node *node, int depth, uint32_t node_value, int *scores, uint32_t *networks, int network_count ) { static void stats_get_highscore_networks( stats_network_node *node, int depth, ot_ip6 node_value, int *scores, ot_ip6 *networks, int network_count ) {
uint8_t *_node_value = (uint8_t*)node_value;
int i; int i;
if( !node ) return; if( !node ) return;
@ -127,33 +132,40 @@ static void stats_get_highscore_networks( stats_network_node *node, int depth, u
if( depth < STATS_NETWORK_NODE_MAXDEPTH ) { if( depth < STATS_NETWORK_NODE_MAXDEPTH ) {
for( i=0; i<STATS_NETWORK_NODE_COUNT; ++i ) for( i=0; i<STATS_NETWORK_NODE_COUNT; ++i )
if( node->children[i] ) if( node->children[i] ) {
stats_get_highscore_networks( node->children[i], depth, node_value | ( i << ( 32 - depth * STATS_NETWORK_NODE_BITWIDTH ) ), scores, networks, network_count ); _node_value[depth] = i;
stats_get_highscore_networks( node->children[i], depth, node_value, scores, networks, network_count );
}
} else } else
for( i=0; i<STATS_NETWORK_NODE_COUNT; ++i ) { for( i=0; i<STATS_NETWORK_NODE_COUNT; ++i ) {
int j=1; int j=1;
if( node->counters[i] <= scores[0] ) continue; if( node->counters[i] <= scores[0] ) continue;
_node_value[depth] = i;
while( (j<network_count) && (node->counters[i]>scores[j] ) ) ++j; while( (j<network_count) && (node->counters[i]>scores[j] ) ) ++j;
--j; --j;
memcpy( scores, scores + 1, j * sizeof( *scores ) ); memcpy( scores, scores + 1, j * sizeof( *scores ) );
memcpy( networks, networks + 1, j * sizeof( *networks ) ); memcpy( networks, networks + 1, j * sizeof( *networks ) );
scores[ j ] = node->counters[ i ]; scores[ j ] = node->counters[ i ];
networks[ j ] = node_value | ( i << ( 32 - depth * STATS_NETWORK_NODE_BITWIDTH ) ); memcpy( networks + j, _node_value, sizeof( *networks ) );
} }
} }
static size_t stats_return_busy_networks( char * reply ) { static size_t stats_return_busy_networks( char * reply ) {
uint32_t networks[16]; ot_ip6 networks[256];
int scores[16]; ot_ip6 node_value;
int scores[256];
int i; int i;
char * r = reply; char * r = reply;
stats_get_highscore_networks( stats_network_counters_root, 0, 0, scores, networks, 16 ); stats_get_highscore_networks( stats_network_counters_root, 0, node_value, scores, networks, 256 );
for( i=15; i>=0; --i) for( i=255; i>=0; --i) {
r += sprintf( r, "%08i: %d.%d.%d.0/24\n", scores[i], (networks[i]>>24)&0xff, (networks[i]>>16)&0xff, (networks[i]>>8)&0xff ); r += sprintf( r, "%08i: ", scores[i] );
r += fmt_ip6c( r, networks[i] );
*r++ = '\n';
}
return r - reply; return r - reply;
} }
@ -442,6 +454,7 @@ static size_t stats_return_everything( char * reply ) {
iterate_all_torrents( torrent_statter, (uintptr_t)&stats ); iterate_all_torrents( torrent_statter, (uintptr_t)&stats );
r += sprintf( r, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" );
r += sprintf( r, "<version>\n" ); r += stats_return_tracker_version( r ); r += sprintf( r, "</version>\n" ); r += sprintf( r, "<version>\n" ); r += stats_return_tracker_version( r ); r += sprintf( r, "</version>\n" );
r += sprintf( r, "<stats>\n" ); r += sprintf( r, "<stats>\n" );
r += sprintf( r, " <uptime>%llu</uptime>\n", (unsigned long long)(time( NULL ) - ot_start_time) ); r += sprintf( r, " <uptime>%llu</uptime>\n", (unsigned long long)(time( NULL ) - ot_start_time) );

Write Preview
Loading…
Cancel
Save