Browse Source

stats fuer sync

master
Denis Ahrens 13 years ago
parent
commit
8614b83456
  1. 4
      ot_http.c
  2. 5
      ot_livesync.c
  3. 1
      ot_mutex.h
  4. 24
      ot_stats.c
  5. 1
      ot_stats.h

4
ot_http.c

@ -215,6 +215,8 @@ static ssize_t http_handle_stats( const int64 client_socket, char *data, char *d
mode = TASK_STATS_TOP10;
else if( !byte_diff(data,5,"renew"))
mode = TASK_STATS_RENEW;
else if( !byte_diff(data,5,"syncs"))
mode = TASK_STATS_SYNCS;
else
HTTPERROR_400_PARAM;
break;
@ -554,4 +556,4 @@ ssize_t http_handle_request( const int64 client_socket, char *data, size_t recv_
return reply_size;
}
const char *g_version_http_c = "$Source: /home/cvsroot/opentracker/ot_http.c,v $: $Revision: 1.18 $\n";
const char *g_version_http_c = "$Source: /home/cvsroot/opentracker/ot_http.c,v $: $Revision: 1.19 $\n";

5
ot_livesync.c

@ -17,6 +17,7 @@
#include "trackerlogic.h"
#include "ot_livesync.h"
#include "ot_accesslist.h"
#include "ot_stats.h"
#ifdef WANT_SYNC_LIVE
@ -152,10 +153,12 @@ static void * livesync_worker( void * args ) {
off += sizeof( ot_hash ) + sizeof( ot_peer );
}
stats_issue_event(EVENT_SYNC, 0, datalen / ((ssize_t)sizeof( ot_hash ) + (ssize_t)sizeof( ot_peer )));
}
/* Never returns. */
return NULL;
}
#endif
const char *g_version_livesync_c = "$Source: /home/cvsroot/opentracker/ot_livesync.c,v $: $Revision: 1.6 $\n";
const char *g_version_livesync_c = "$Source: /home/cvsroot/opentracker/ot_livesync.c,v $: $Revision: 1.7 $\n";

1
ot_mutex.h

@ -30,6 +30,7 @@ typedef enum {
TASK_STATS_VERSION = 0x000a,
TASK_STATS_BUSY_NETWORKS = 0x000b,
TASK_STATS_RENEW = 0x000c,
TASK_STATS_SYNCS = 0x000d,
TASK_STATS = 0x0100, /* Mask */
TASK_STATS_TORRENTS = 0x0101,

24
ot_stats.c

@ -47,6 +47,7 @@ static unsigned long long ot_full_scrape_request_count = 0;
static unsigned long long ot_full_scrape_size = 0;
static unsigned long long ot_failed_request_counts[CODE_HTTPERROR_COUNT];
static unsigned long long ot_renewed[OT_PEER_TIMEOUT];
static unsigned long long ot_overall_sync_count;
static time_t ot_start_time;
@ -465,6 +466,20 @@ static size_t stats_return_renew_bucket( char * reply ) {
return r - reply;
}
static size_t stats_return_sync_mrtg( char * reply )
{
ot_time t = time( NULL ) - ot_start_time;
return sprintf( reply,
"%llu\n%llu\n%i seconds (%i hours)\nopentracker connections, %lu conns/s :: %lu success/s.",
ot_overall_sync_count,
0,
(int)t,
(int)(t / 3600),
events_per_time( ot_overall_tcp_connections+ot_overall_udp_connections, t ),
events_per_time( ot_overall_tcp_successfulannounces+ot_overall_udp_successfulannounces+ot_overall_udp_connects, t )
);
}
extern const char
*g_version_opentracker_c, *g_version_accesslist_c, *g_version_clean_c, *g_version_fullscrape_c, *g_version_http_c,
*g_version_iovec_c, *g_version_mutex_c, *g_version_stats_c, *g_version_udp_c, *g_version_vector_c,
@ -500,6 +515,8 @@ size_t return_stats_for_tracker( char *reply, int mode, int format ) {
return stats_return_tracker_version( reply );
case TASK_STATS_RENEW:
return stats_return_renew_bucket( reply );
case TASK_STATS_SYNCS:
return stats_return_sync_mrtg( reply );
#ifdef WANT_LOG_NETWORKS
case TASK_STATS_BUSY_NETWORKS:
return stats_return_busy_networks( reply );
@ -566,9 +583,12 @@ void stats_issue_event( ot_status_event event, PROTO_FLAG proto, uint32_t event_
case EVENT_FAILED:
ot_failed_request_counts[event_data]++;
break;
case EVENT_RENEW:
case EVENT_RENEW:
ot_renewed[event_data]++;
break;
case EVENT_SYNC:
ot_overall_sync_count+=event_data;
break;
default:
break;
}
@ -604,4 +624,4 @@ void stats_deinit( ) {
pthread_cancel( thread_id );
}
const char *g_version_stats_c = "$Source: /home/cvsroot/opentracker/ot_stats.c,v $: $Revision: 1.30 $\n";
const char *g_version_stats_c = "$Source: /home/cvsroot/opentracker/ot_stats.c,v $: $Revision: 1.31 $\n";

1
ot_stats.h

@ -12,6 +12,7 @@ typedef enum {
EVENT_CONNECT, /* UDP only */
EVENT_ANNOUNCE,
EVENT_RENEW,
EVENT_SYNC,
EVENT_SCRAPE,
EVENT_FULLSCRAPE_REQUEST,
EVENT_FULLSCRAPE_REQUEST_GZIP,

Loading…
Cancel
Save