[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Add initial history-tracking backend code for reputation mo...
- To: or-cvs@freehaven.net
- Subject: [or-cvs] Add initial history-tracking backend code for reputation mo...
- From: nickm@seul.org (Nick Mathewson)
- Date: Fri, 19 Mar 2004 20:48:07 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Fri, 19 Mar 2004 20:48:32 -0500
- Reply-to: or-dev@freehaven.net
- Sender: owner-or-cvs@freehaven.net
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv27475/src/or
Modified Files:
Makefile.am or.h
Added Files:
rephist.c
Log Message:
Add initial history-tracking backend code for reputation module. Not called or tested yet.
--- NEW FILE: rephist.c ---
/* Copyright 2004 Roger Dingledine */
/* See LICENSE for licensing information */
/* $Id: rephist.c,v 1.1 2004/03/20 01:48:05 nickm Exp $ */
#include "or.h"
typedef struct link_history_t {
time_t since;
unsigned long n_extend_ok;
unsigned long n_extend_fail;
} link_history_t;
typedef struct or_history_t {
time_t since;
unsigned long n_conn_ok;
unsigned long n_conn_fail;
unsigned long uptime;
unsigned long downtime;
time_t up_since;
time_t down_since;
strmap_t *link_history_map;
} or_history_t;
static strmap_t *history_map;
static or_history_t *get_or_history(const char* nickname)
{
or_history_t *hist;
hist = (or_history_t*) strmap_get(history_map, nickname);
if (!hist) {
hist = tor_malloc_zero(sizeof(or_history_t));
hist->link_history_map = strmap_new();
hist->since = time(NULL);
strmap_set(history_map, nickname, hist);
}
return hist;
}
static link_history_t *get_link_history(const char *from_name,
const char *to_name)
{
or_history_t *orhist;
link_history_t *lhist;
orhist = get_or_history(from_name);
lhist = (link_history_t*) strmap_get(orhist->link_history_map, to_name);
if (!lhist) {
lhist = tor_malloc_zero(sizeof(link_history_t));
lhist->since = time(NULL);
strmap_set(orhist->link_history_map, to_name, lhist);
}
return lhist;
}
static void update_or_history(or_history_t *hist, time_t when)
{
assert(hist);
if (hist->up_since) {
assert(!hist->down_since);
hist->uptime += (when - hist->up_since);
hist->up_since = when;
} else if (hist->down_since) {
hist->downtime += (when - hist->down_since);
hist->down_since = when;
}
}
void rep_hist_init(void)
{
history_map = strmap_new();
}
void rep_hist_note_connect_failed(const char* nickname, time_t when)
{
or_history_t *hist;
hist = get_or_history(nickname);
++hist->n_conn_fail;
if (hist->up_since) {
hist->uptime += (when - hist->up_since);
hist->up_since = 0;
}
if (!hist->down_since)
hist->down_since = when;
}
void rep_hist_note_connect_succeeded(const char* nickname, time_t when)
{
or_history_t *hist;
hist = get_or_history(nickname);
++hist->n_conn_ok;
if (hist->down_since) {
hist->downtime += (when - hist->down_since);
hist->down_since = 0;
}
if (!hist->up_since)
hist->up_since = when;
}
void rep_hist_note_connection_died(const char* nickname, time_t when)
{
or_history_t *hist;
hist = get_or_history(nickname);
if (hist->up_since) {
hist->uptime += (when - hist->up_since);
hist->up_since = 0;
}
if (!hist->down_since)
hist->down_since = when;
}
void rep_hist_note_extend_succeeded(const char *from_name,
const char *to_name)
{
link_history_t *hist;
hist = get_link_history(from_name, to_name);
++hist->n_extend_ok;
}
void rep_hist_note_extend_failed(const char *from_name, const char *to_name)
{
link_history_t *hist;
hist = get_link_history(from_name, to_name);
++hist->n_extend_fail;
}
void rep_hist_dump_status(time_t now)
{
strmap_iter_t *lhist_it;
strmap_iter_t *orhist_it;
const char *name1, *name2;
or_history_t *or_history;
link_history_t *link_history;
double uptime;
char buffer[2048];
char *cp;
int len;
log(LOG_WARN, "--------------- Dumping history information:");
for (orhist_it = strmap_iter_init(history_map); !strmap_iter_done(orhist_it);
orhist_it = strmap_iter_next(history_map,orhist_it)) {
strmap_iter_get(orhist_it, &name1, (void**)&or_history);
update_or_history(or_history, now);
uptime = ((double)or_history->uptime) / or_history->downtime;
log(LOG_WARN, "OR %s: %ld/%ld good connection attempts; uptime %.2f%%",
name1,
or_history->n_conn_ok, or_history->n_conn_fail+or_history->n_conn_ok,
uptime*100.0);
strcpy(buffer, " Good extend attempts: ");
len = strlen(buffer);
for (lhist_it = strmap_iter_init(or_history->link_history_map);
!strmap_iter_done(lhist_it);
lhist_it = strmap_iter_next(or_history->link_history_map, lhist_it)) {
strmap_iter_get(lhist_it, &name2, (void**)&link_history);
len += snprintf(buffer+len, 2048-len, "%s(%ld/%ld); ", name2,
link_history->n_extend_ok,
link_history->n_extend_ok+link_history->n_extend_fail);
if (len >= 2048) {
buffer[2047]='\0';
break;
}
}
log(LOG_WARN, buffer);
}
}
/*
Local Variables:
mode:c
indent-tabs-mode:nil
c-basic-offset:2
End:
*/
Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/src/or/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile.am 25 Feb 2004 06:41:21 -0000 1.25
+++ Makefile.am 20 Mar 2004 01:48:05 -0000 1.26
@@ -7,7 +7,7 @@
tor_SOURCES = buffers.c circuit.c command.c connection.c \
connection_or.c config.c dirserv.c \
onion.c router.c routerlist.c directory.c dns.c connection_edge.c \
- cpuworker.c main.c tor_main.c
+ rephist.c cpuworker.c main.c tor_main.c
tor_LDADD = ../common/libor.a
Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- or.h 14 Mar 2004 17:06:29 -0000 1.253
+++ or.h 20 Mar 2004 01:48:05 -0000 1.254
@@ -900,6 +900,18 @@
size_t dirserv_get_directory(const char **cp);
+/********************************* rephist.c ***************************/
+
+void rep_hist_init(void);
+void rep_hist_note_connect_failed(const char* nickname, time_t when);
+void rep_hist_note_connect_succeeded(const char* nickname, time_t when);
+void rep_hist_note_connection_died(const char* nickname, time_t when);
+void rep_hist_note_extend_succeeded(const char *from_name,
+ const char *to_name);
+void rep_hist_note_extend_failed(const char *from_name, const char *to_name);
+void rep_hist_dump_status(time_t now);
+
+
#endif
/*