Search
j0ke.net Open Build Service
>
Projects
>
Apache
:
Modules
>
apache2-bw_mod
> bw_mod-0.6-apr1.dif
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File bw_mod-0.6-apr1.dif of Package apache2-bw_mod
Files bw_mod-0.6.orig/.bw_mod-0.6.c.swp and bw_mod-0.6/.bw_mod-0.6.c.swp differ diff -uNr bw_mod-0.6.orig/bw_mod-0.6.c bw_mod-0.6/bw_mod-0.6.c --- bw_mod-0.6.orig/bw_mod-0.6.c 2005-02-28 18:53:58.000000000 +0100 +++ bw_mod-0.6/bw_mod-0.6.c 2006-01-31 14:43:18.729591324 +0100 @@ -81,10 +81,10 @@ */ typedef struct { int id; - int connection_count; + apr_uint32_t connection_count; double bandwidth; - unsigned int bytes_count; - volatile int lock; + apr_uint32_t bytes_count; + volatile apr_uint32_t lock; apr_time_t time; } bw_data; @@ -510,7 +510,7 @@ nowtime = apr_time_now(); if ( bwstat->time < (nowtime - 1000000) ) { /* And if we got lock */ - if ( apr_atomic_cas( &bwstat->lock, 1, 0 ) == 0 ) { + if ( apr_atomic_cas32( &bwstat->lock, 1, 0 ) == 0 ) { /* Calculate bw used in the last timeinterval */ bwstat->bandwidth = ( bwstat->bytes_count / (double)(nowtime - bwstat->time)) * 1000000 ; @@ -522,7 +522,7 @@ bwstat->time = apr_time_now(); /* Release lock */ - apr_atomic_set( &bwstat->lock, 0 ); + apr_atomic_set32( &bwstat->lock, 0 ); } } } @@ -653,7 +653,7 @@ else bwmaxconn = bwstat; /* Add 1 active connection to the record */ - apr_atomic_inc( &bwmaxconn->connection_count ); + apr_atomic_inc32( &bwmaxconn->connection_count ); /* Verbose Output */ if (sconf->debug == BANDWIDTH_ENABLED) { @@ -682,7 +682,7 @@ ap_pass_brigade(f->next, ctx->bb); /* Delete 1 active connection */ - apr_atomic_dec( &bwmaxconn->connection_count ); + apr_atomic_dec32( &bwmaxconn->connection_count ); return APR_SUCCESS; } @@ -750,14 +750,14 @@ b = APR_BRIGADE_FIRST(bb); /* Add the number of bytes transferred, so we can get an estimated bw usage */ - apr_atomic_add( &bwstat->bytes_count, packet); + apr_atomic_add32( &bwstat->bytes_count, packet); /* If the connection goes to hell... go with it ! */ if (r->connection->aborted) { /* Verbose. Tells when the connection was ended */ if (sconf->debug == BANDWIDTH_ENABLED) ap_log_error(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0,NULL,"[W] Connection to hell"); - apr_atomic_dec( &bwmaxconn->connection_count ); + apr_atomic_dec32( &bwmaxconn->connection_count ); return APR_SUCCESS; } @@ -774,14 +774,14 @@ b = APR_BRIGADE_FIRST(bb); /* Add the number of bytes to the counter */ - apr_atomic_add( &bwstat->bytes_count, bytes); + apr_atomic_add32( &bwstat->bytes_count, bytes); /* Pass the final brigade */ ap_pass_brigade(f->next, ctx->bb); } /* Delete 1 active connection to the record */ - apr_atomic_dec( &bwmaxconn->connection_count ); + apr_atomic_dec32( &bwmaxconn->connection_count ); /* Verbose, tells when we ended the Filter */ if (sconf->debug == BANDWIDTH_ENABLED)
