httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apache-2.0/apache-nspr/modules/standard mod_status.c
Date Tue, 22 Sep 1998 16:12:08 GMT
dgaudet     98/09/22 09:12:07

  Modified:    apache-nspr Configuration
               apache-nspr/include scoreboard.h
               apache-nspr/main http_main.c
               apache-nspr/modules/standard mod_status.c
  Log:
  get rid of some NSPR defines... this code can only be built for NSPR
  
  Revision  Changes    Path
  1.3       +4 -4      apache-2.0/apache-nspr/Attic/Configuration
  
  
  
  
  1.3       +2 -1      apache-2.0/apache-nspr/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/apache-nspr/include/scoreboard.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- scoreboard.h	1998/06/30 08:57:06	1.2
  +++ scoreboard.h	1998/09/22 16:12:06	1.3
  @@ -97,7 +97,8 @@
       unsigned short conn_count;
       PRTime start_time;
       PRTime stop_time;
  -#ifndef NSPR
  +    /* XXX: need process time support under NSPR */
  +#if 0
       struct tms times;
   #endif
       char client[32];		/* Keep 'em small... */
  
  
  
  1.3       +0 -3      apache-2.0/apache-nspr/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/apache-nspr/main/http_main.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- http_main.c	1998/06/30 08:57:07	1.2
  +++ http_main.c	1998/09/22 16:12:06	1.3
  @@ -707,9 +707,6 @@
       if (r->sent_bodyct)
   	ap_bgetopt(r->connection->client, BO_BYTECT, &bs);
   
  -#ifndef NSPR
  -    times(&ss->times);
  -#endif
       ss->access_count++;
       ss->my_access_count++;
       ss->conn_count++;
  
  
  
  1.3       +5 -9      apache-2.0/apache-nspr/modules/standard/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/apache-nspr/modules/standard/mod_status.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_status.c	1998/06/30 08:57:13	1.2
  +++ mod_status.c	1998/09/22 16:12:07	1.3
  @@ -118,12 +118,9 @@
   #include "scoreboard.h"
   #include "http_log.h"
   
  -#ifdef NSPR
  +/* XXX: should be able to fix this, no? */
   #define NO_TIMES
  -#endif
  -
   
  -
   #ifdef NEXT
   #if (NX_CURRENT_COMPILER_RELEASE == 410)
   #ifdef m68k
  @@ -291,9 +288,6 @@
       if (r->header_only)
   	return 0;
   
  -#ifndef NSPR
  -    ap_sync_scoreboard_image();
  -#endif
       for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
   	score_record = ap_scoreboard_image->servers[i];
   	ps_record = ap_scoreboard_image->parent[i];
  @@ -520,7 +514,8 @@
   			    score_record.times.tms_cutime / tick,
   			    score_record.times.tms_cstime / tick,
   #endif
  -#ifdef NSPR
  +			    /* XXX: need process time support under nspr */
  +#if 1
   			    0,
   #else
   			    difftime(nowtime, ps_record.last_rtime),
  @@ -576,7 +571,8 @@
   			ap_rputs("<td>?", r);
   			break;
   		    }
  -#ifdef NSPR
  +		    /* XXX: need process time support under NSPR */
  +#if 1
   		    ap_rprintf(r, "\n<td>%.0f<td>%ld",
   			       (float)(nowtime-score_record.start_time)/
   			       PR_USEC_PER_SEC, (long)req_time);
  
  
  

Mime
View raw message