Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 13 Mar 2002 12:25:32 -0000
Message-ID: <20020313122532.60798.qmail@icarus.apache.org>
From: trawick@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server scoreboard.c

trawick     02/03/13 04:25:31

  Modified:    .        CHANGES
               server   scoreboard.c
  Log:
  Fix the calculation of thread_num in the worker score structure.
  
  Submitted by:   Stas Bekman
  Reviewed by:    Jeff Trawick
  
  Revision  Changes    Path
  1.630     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.629
  retrieving revision 1.630
  diff -u -r1.629 -r1.630
  --- CHANGES	13 Mar 2002 03:59:21 -0000	1.629
  +++ CHANGES	13 Mar 2002 12:25:31 -0000	1.630
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0.34-dev
  +
  +  *) Fix the calculation of thread_num in the worker score structure.
  +     [Stas Bekman]
  +
     *) Use apr_atomic operations in managing the mod_mem_cache
        cache_objects for SMP scalability. (see USE_ATOMICS
        preprocessor directive in mod_file_cache)
  
  
  
  1.61      +1 -1      httpd-2.0/server/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- scoreboard.c	27 Feb 2002 04:10:19 -0000	1.60
  +++ scoreboard.c	13 Mar 2002 12:25:31 -0000	1.61
  @@ -429,7 +429,7 @@
       
       if (status == SERVER_READY
           && old_status == SERVER_STARTING) {
  -        ws->thread_num = child_num * server_limit + thread_num;
  +        ws->thread_num = child_num * thread_limit + thread_num;
           ps->generation = ap_my_generation;
       }