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 Fri, 08 Nov 1996 13:50:50 GMT
jim         96/11/08 05:50:50

  Modified:    src       http_main.c mod_status.c scoreboard.h
  Log:
  remove Ptime stuff
  
  Revision  Changes    Path
  1.86      +0 -4      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -C3 -r1.85 -r1.86
  *** http_main.c	1996/11/04 18:09:59	1.85
  --- http_main.c	1996/11/08 13:50:47	1.86
  ***************
  *** 776,782 ****
    	new_score_rec.my_bytes_served = 0L;
    	new_score_rec.conn_count = (unsigned short)0;
    	new_score_rec.conn_bytes = (unsigned long)0;
  - 	new_score_rec.how_long = (unsigned short)0;
        }
        if (r) {
    	int slot_size;
  --- 776,781 ----
  ***************
  *** 858,864 ****
    void increment_counts (int child_num, request_rec *r, int flag)
    {
        long int bs=0;
  -     time_t now;
        short_score new_score_rec;
    
        sync_scoreboard_image();
  --- 857,862 ----
  ***************
  *** 879,886 ****
    
        times(&new_score_rec.times);
    
  -     now=time(NULL);
  -     new_score_rec.how_long = now - new_score_rec.last_used;
    
    #if defined(HAVE_MMAP) || defined(HAVE_SHMGET)
        memcpy(&scoreboard_image->servers[child_num], &new_score_rec, sizeof(short_score));
  --- 877,882 ----
  
  
  
  1.33      +5 -8      apache/src/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_status.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -C3 -r1.32 -r1.33
  *** mod_status.c	1996/10/23 13:15:26	1.32
  --- mod_status.c	1996/11/08 13:50:47	1.33
  ***************
  *** 406,412 ****
        	if(no_table_report)
                rputs("<p><hr><h2>Server Details</h2>\n\n",r);
    	else
  !             rputs("<p>\n\n<table border=0><tr><th>Srv<th>PID<th>Acc<th>M<th>CPU\n<th>SS<th>Ptime<th>Conn<th>Child<th>Slot<th>Host<th>VHost<th>Request</tr>\n\n",r);
    
    
        for (i = 0; i<HARD_SERVER_LIMIT; ++i)
  --- 406,412 ----
        	if(no_table_report)
                rputs("<p><hr><h2>Server Details</h2>\n\n",r);
    	else
  !             rputs("<p>\n\n<table border=0><tr><th>Srv<th>PID<th>Acc<th>M<th>CPU\n<th>SS<th>Conn<th>Child<th>Slot<th>Host<th>VHost<th>Request</tr>\n\n",r);
    
    
        for (i = 0; i<HARD_SERVER_LIMIT; ++i)
  ***************
  *** 455,467 ****
    		            rputs("Dead",r);
    		            break;
    		    }
  ! 		    rprintf(r,"] u%g s%g cu%g cs%g\n %s (%d",
    			    score_record.times.tms_utime/tick,
    			    score_record.times.tms_stime/tick,
    			    score_record.times.tms_cutime/tick,
    			    score_record.times.tms_cstime/tick,
  ! 			    asctime(localtime(&score_record.last_used)),
  ! 			    (int)score_record.how_long);
    		    format_byte_out(r,conn_bytes);
    		    rputs("|",r);
    		    format_byte_out(r,my_bytes);
  --- 455,466 ----
    		            rputs("Dead",r);
    		            break;
    		    }
  ! 		    rprintf(r,"] u%g s%g cu%g cs%g\n %s (",
    			    score_record.times.tms_utime/tick,
    			    score_record.times.tms_stime/tick,
    			    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);
  ***************
  *** 503,515 ****
    		            rputs("<td>.",r);
    		            break;
    		    }
  ! 		    rprintf(r,"\n<td>%.2f<td>%.0f<td>%d",
    			    (score_record.times.tms_utime +
    			    score_record.times.tms_stime +
    			    score_record.times.tms_cutime +
    			    score_record.times.tms_cstime)/tick,
  ! 			    difftime(nowtime, score_record.last_used),
  ! 			    (int)score_record.how_long);
    		    rprintf(r,"<td>%-1.1f<td>%-2.2f<td>%-2.2f\n",
    			(float)conn_bytes/KBYTE, (float)my_bytes/MBYTE,
    			(float)bytes/MBYTE);
  --- 502,513 ----
    		            rputs("<td>.",r);
    		            break;
    		    }
  ! 		    rprintf(r,"\n<td>%.2f<td>%.0f",
    			    (score_record.times.tms_utime +
    			    score_record.times.tms_stime +
    			    score_record.times.tms_cutime +
    			    score_record.times.tms_cstime)/tick,
  ! 			    difftime(nowtime, score_record.last_used));
    		    rprintf(r,"<td>%-1.1f<td>%-2.2f<td>%-2.2f\n",
    			(float)conn_bytes/KBYTE, (float)my_bytes/MBYTE,
    			(float)bytes/MBYTE);
  ***************
  *** 532,538 ****
    <tr><th>M<td>Mode of operation\n \
    <tr><th>CPU<td>CPU usage, number of seconds\n \
    <tr><th>SS<td>Seconds since beginning of most recent request\n \
  - <tr><th>Ptime<td>Seconds to process the recent request\n \
    <tr><th>Conn<td>Kilobytes transferred this connection\n \
    <tr><th>Child<td>Megabytes transferred this child\n \
    <tr><th>Slot<td>Total megabytes transferred this slot\n \
  --- 530,535 ----
  
  
  
  1.18      +0 -1      apache/src/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/scoreboard.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -C3 -r1.17 -r1.18
  *** scoreboard.h	1996/11/03 21:25:10	1.17
  --- scoreboard.h	1996/11/08 13:50:47	1.18
  ***************
  *** 82,88 ****
        unsigned long my_bytes_served;
        unsigned long conn_bytes;
        unsigned short conn_count;
  -     unsigned short how_long;
        struct tms times;
        time_t last_used;
        char client[32];	/* Keep 'em small... */
  --- 82,87 ----
  
  
  

Mime
View raw message