bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The stats structure has been moved into a shared memory block since it

Browse Source 
needs to be shared by all the children.
This commit is contained in:
Robert James Kaes 2002-05-26 18:53:14 +00:00
parent a67fb30bdf
commit 49b21c7e2f
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/stats.c
View File

@ -1,9 +1,9 @@
/* $Id: stats.c,v 1.9 2002-05-24 04:45:32 rjkaes Exp $ /* $Id: stats.c,v 1.10 2002-05-26 18:53:14 rjkaes Exp $
* *
* This module handles the statistics for tinyproxy. There are only two * This module handles the statistics for tinyproxy. There are only two
* public API functions. The reason for the functions, rather than just a * public API functions. The reason for the functions, rather than just a
* external structure is that tinyproxy is now multi-threaded and we can * external structure is that tinyproxy is now multi-threaded and we can
* not allow more than one thread to access the statistics at the same * not allow more than one child to access the statistics at the same
* time. This is prevented by a mutex. If there is a need for more * time. This is prevented by a mutex. If there is a need for more
* statistics in the future, just add to the structure, enum (in the header), * statistics in the future, just add to the structure, enum (in the header),
* and the switch statement in update_stats(). * and the switch statement in update_stats().
@ -36,15 +36,7 @@ struct stat_s {
unsigned long int num_denied; unsigned long int num_denied;
}; };
static struct stat_s stats; static struct stat_s *stats;
/*
* Locking when we're accessing the statistics, since I don't want multiple
* threads changing the information at the same time.
*/
pthread_mutex_t stats_mutex = PTHREAD_MUTEX_INITIALIZER;
#define LOCK() pthread_mutex_lock(&stats_mutex)
#define UNLOCK() pthread_mutex_unlock(&stats_mutex)
/* /*
* Initialize the statistics information to zero. * Initialize the statistics information to zero.
@ -52,9 +44,11 @@ pthread_mutex_t stats_mutex = PTHREAD_MUTEX_INITIALIZER;
void void
init_stats(void) init_stats(void)
{ {
LOCK(); stats = malloc_shared_memory(sizeof(struct stat));
memset(&stats, 0, sizeof(stats)); if (!stats)
UNLOCK(); return;
memset(stats, 0, sizeof(struct stat));
} }
/* /*
@ -81,13 +75,11 @@ showstats(struct conn_s *connptr)
if (!message_buffer) if (!message_buffer)
return -1; return -1;
LOCK();
snprintf(message_buffer, MAXBUFFSIZE, msg, snprintf(message_buffer, MAXBUFFSIZE, msg,
PACKAGE, VERSION, PACKAGE, VERSION, PACKAGE, VERSION, PACKAGE, VERSION,
stats.num_open, stats->num_open,
stats.num_reqs, stats->num_reqs,
stats.num_badcons, stats.num_denied, stats.num_refused); stats->num_badcons, stats->num_denied, stats->num_refused);
UNLOCK();
if (send_http_message(connptr, 200, "OK", message_buffer) < 0) { if (send_http_message(connptr, 200, "OK", message_buffer) < 0) {
safefree(message_buffer); safefree(message_buffer);
@ -105,29 +97,26 @@ showstats(struct conn_s *connptr)
int int
update_stats(status_t update_level) update_stats(status_t update_level)
{ {
LOCK();
switch (update_level) { switch (update_level) {
case STAT_BADCONN: case STAT_BADCONN:
stats.num_badcons++; ++stats->num_badcons;
break; break;
case STAT_OPEN: case STAT_OPEN:
stats.num_open++; ++stats->num_open;
stats.num_reqs++; ++stats->num_reqs;
break; break;
case STAT_CLOSE: case STAT_CLOSE:
stats.num_open--; --stats->num_open;
break; break;
case STAT_REFUSE: case STAT_REFUSE:
stats.num_refused++; ++stats->num_refused;
break; break;
case STAT_DENIED: case STAT_DENIED:
stats.num_denied++; ++stats->num_denied;
break; break;
default: default:
UNLOCK();
return -1; return -1;
} }
UNLOCK();
return 0; return 0;
} }