httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.com>
Subject cvs commit: apache/src http_main.c mod_status.c scoreboard.h
Date Tue, 28 May 1996 09:14:27 GMT
jim         96/05/28 02:14:27

  Modified:    src       http_main.c mod_status.c scoreboard.h
  Log:
  expand conn_bytes from short to long
  
  Revision  Changes    Path
  1.30      +3 -3      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -C3 -r1.29 -r1.30
  *** http_main.c	1996/05/28 03:02:30	1.29
  --- http_main.c	1996/05/28 09:14:24	1.30
  ***************
  *** 679,685 ****
    	new_score_rec.my_access_count = 0L;
    	new_score_rec.my_bytes_served = 0L;
    	new_score_rec.conn_count = (unsigned short)0;
  ! 	new_score_rec.conn_bytes = (unsigned short)0;
        }
        if (r) {
    	int slot_size;
  --- 679,685 ----
    	new_score_rec.my_access_count = 0L;
    	new_score_rec.my_bytes_served = 0L;
    	new_score_rec.conn_count = (unsigned short)0;
  ! 	new_score_rec.conn_bytes = (unsigned long)0;
        }
        if (r) {
    	int slot_size;
  ***************
  *** 744,757 ****
    
        if (flag) {
    	new_score_rec.conn_count = (unsigned short)0;
  ! 	new_score_rec.conn_bytes = (unsigned short)0;
        }
        new_score_rec.access_count ++;
        new_score_rec.my_access_count ++;
        new_score_rec.conn_count ++;
        new_score_rec.bytes_served += (unsigned long)bs;
        new_score_rec.my_bytes_served += (unsigned long)bs;
  !     new_score_rec.conn_bytes += (unsigned short)bs;
    
        times(&new_score_rec.times);
    
  --- 744,757 ----
    
        if (flag) {
    	new_score_rec.conn_count = (unsigned short)0;
  ! 	new_score_rec.conn_bytes = (unsigned long)0;
        }
        new_score_rec.access_count ++;
        new_score_rec.my_access_count ++;
        new_score_rec.conn_count ++;
        new_score_rec.bytes_served += (unsigned long)bs;
        new_score_rec.my_bytes_served += (unsigned long)bs;
  !     new_score_rec.conn_bytes += (unsigned long)bs;
    
        times(&new_score_rec.times);
    
  
  
  
  1.20      +3 -3      apache/src/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_status.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -C3 -r1.19 -r1.20
  *** mod_status.c	1996/05/28 02:49:08	1.19
  --- mod_status.c	1996/05/28 09:14:25	1.20
  ***************
  *** 170,177 ****
    #if defined(STATUS)
        unsigned long count=0;
        unsigned long lres,bytes;
  !     unsigned long my_lres,my_bytes;
  !     unsigned short conn_lres,conn_bytes;
        unsigned long bcount=0;
        float tick=sysconf(_SC_CLK_TCK);
    #endif /* STATUS */
  --- 170,177 ----
    #if defined(STATUS)
        unsigned long count=0;
        unsigned long lres,bytes;
  !     unsigned long my_lres,my_bytes,conn_bytes;
  !     unsigned short conn_lres;
        unsigned long bcount=0;
        float tick=sysconf(_SC_CLK_TCK);
    #endif /* STATUS */
  ***************
  *** 429,435 ****
    			    score_record.times.tms_cutime/tick,
    			    score_record.times.tms_cstime/tick,
    			    asctime(localtime(&score_record.last_used)));
  ! 		    format_byte_out(r,(unsigned long)conn_bytes);
    		    rputs("|",r);
    		    format_byte_out(r,my_bytes);
    		    rputs("|",r);
  --- 429,435 ----
    			    score_record.times.tms_cutime/tick,
    			    score_record.times.tms_cstime/tick,
    			    asctime(localtime(&score_record.last_used)));
  ! 		    format_byte_out(r,conn_bytes);
    		    rputs("|",r);
    		    format_byte_out(r,my_bytes);
    		    rputs("|",r);
  
  
  
  1.11      +1 -1      apache/src/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/scoreboard.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -C3 -r1.10 -r1.11
  *** scoreboard.h	1996/05/22 17:35:39	1.10
  --- scoreboard.h	1996/05/28 09:14:25	1.11
  ***************
  *** 81,88 ****
        unsigned long bytes_served;
        unsigned long my_access_count;
        unsigned long my_bytes_served;
        unsigned short conn_count;
  -     unsigned short conn_bytes;
        struct tms times;
        time_t last_used;
        char client[32];	/* Keep 'em small... */
  --- 81,88 ----
        unsigned long bytes_served;
        unsigned long my_access_count;
        unsigned long my_bytes_served;
  +     unsigned long conn_bytes;
        unsigned short conn_count;
        struct tms times;
        time_t last_used;
        char client[32];	/* Keep 'em small... */
  
  
  

Mime
View raw message