httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Mon, 15 Mar 2004 23:08:42 GMT
trawick     2004/03/15 15:08:41

  Modified:    .        CHANGES
               include  mpm_common.h
               server   core.c mpm_common.c
               server/mpm/experimental/leader leader.c
               server/mpm/experimental/perchild perchild.c
               server/mpm/experimental/threadpool threadpool.c
               server/mpm/winnt child.c
               server/mpm/worker worker.c
  Log:
  use existing directive name ThreadStackSize instead of
  WorkerStackSize
  
  as made obvious by: Brad Nicholes
  
  Revision  Changes    Path
  1.1426    +5 -4      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1425
  retrieving revision 1.1426
  diff -u -r1.1425 -r1.1426
  --- CHANGES	15 Mar 2004 20:00:13 -0000	1.1425
  +++ CHANGES	15 Mar 2004 23:08:41 -0000	1.1426
  @@ -15,10 +15,11 @@
        "ProxyErrorOverride On" is configured.  PR 20183.
        [Marcus Janson <marcus.janson tre.se>, Joe Orton]
   
  -  *) Threaded MPMs for Unix and Win32: Add WorkerStackSize directive
  -     to override default thread stack size for threads which handle
  -     client connections.  Required for some third-party modules on
  -     platforms with small default thread stack size.  [Jeff Trawick]
  +  *) Threaded MPMs for Unix and Win32: Add support for ThreadStackSize 
  +     directive (previously NetWare-only) to override default thread 
  +     stack size for threads which handle client connections.  Required 
  +     for some third-party modules on platforms with small default 
  +     thread stack size.  [Jeff Trawick]
   
     *) Win32: Tweak worker thread accounting routines to eliminate
        server hang when number of Listen directives in httpd.conf
  
  
  
  1.49      +2 -2      httpd-2.0/include/mpm_common.h
  
  Index: mpm_common.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/mpm_common.h,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- mpm_common.h	11 Mar 2004 03:57:49 -0000	1.48
  +++ mpm_common.h	15 Mar 2004 23:08:41 -0000	1.49
  @@ -249,8 +249,8 @@
   #endif
   
   #ifdef AP_MPM_WANT_SET_STACKSIZE
  -extern apr_size_t ap_worker_stacksize;
  -extern const char *ap_mpm_set_worker_stacksize(cmd_parms *cmd, void *dummy,
  +extern apr_size_t ap_thread_stacksize;
  +extern const char *ap_mpm_set_thread_stacksize(cmd_parms *cmd, void *dummy,
                                                  const char *arg);
   #endif
   
  
  
  
  1.267     +1 -1      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.266
  retrieving revision 1.267
  diff -u -r1.266 -r1.267
  --- core.c	14 Mar 2004 16:24:55 -0000	1.266
  +++ core.c	15 Mar 2004 23:08:41 -0000	1.267
  @@ -3240,7 +3240,7 @@
                 "Maximum number of 1k blocks a particular childs allocator may hold."),
   #endif
   #ifdef AP_MPM_WANT_SET_STACKSIZE
  -AP_INIT_TAKE1("WorkerStackSize", ap_mpm_set_worker_stacksize, NULL, RSRC_CONF,
  +AP_INIT_TAKE1("ThreadStackSize", ap_mpm_set_thread_stacksize, NULL, RSRC_CONF,
                 "Size in bytes of stack used by threads handling client connections"),
   #endif
   #if AP_ENABLE_EXCEPTION_HOOK
  
  
  
  1.120     +4 -4      httpd-2.0/server/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- mpm_common.c	11 Mar 2004 03:57:49 -0000	1.119
  +++ mpm_common.c	15 Mar 2004 23:08:41 -0000	1.120
  @@ -871,9 +871,9 @@
   #endif /* AP_MPM_WANT_SET_MAX_MEM_FREE */
   
   #ifdef AP_MPM_WANT_SET_STACKSIZE
  -apr_size_t ap_worker_stacksize = 0; /* use system default */
  +apr_size_t ap_thread_stacksize = 0; /* use system default */
   
  -const char *ap_mpm_set_worker_stacksize(cmd_parms *cmd, void *dummy,
  +const char *ap_mpm_set_thread_stacksize(cmd_parms *cmd, void *dummy,
                                           const char *arg)
   {
       long value;
  @@ -884,10 +884,10 @@
       
       value = strtol(arg, NULL, 0);
       if (value < 0 || errno == ERANGE)
  -        return apr_pstrcat(cmd->pool, "Invalid WorkerStackSize value: ", 
  +        return apr_pstrcat(cmd->pool, "Invalid ThreadStackSize value: ", 
                              arg, NULL);
   
  -    ap_worker_stacksize = (apr_size_t)value;
  +    ap_thread_stacksize = (apr_size_t)value;
   
       return NULL;
   }
  
  
  
  1.42      +2 -2      httpd-2.0/server/mpm/experimental/leader/leader.c
  
  Index: leader.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/leader/leader.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- leader.c	11 Mar 2004 03:57:49 -0000	1.41
  +++ leader.c	15 Mar 2004 23:08:41 -0000	1.42
  @@ -1074,8 +1074,8 @@
       apr_threadattr_create(&thread_attr, pchild);
       /* 0 means PTHREAD_CREATE_JOINABLE */
       apr_threadattr_detach_set(thread_attr, 0);
  -    if (ap_worker_stacksize != 0) {
  -        apr_threadattr_stacksize_set(thread_attr, ap_worker_stacksize);
  +    if (ap_thread_stacksize != 0) {
  +        apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
       }
   
       ts->threads = threads;
  
  
  
  1.147     +3 -2      httpd-2.0/server/mpm/experimental/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/perchild.c,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -u -r1.146 -r1.147
  --- perchild.c	11 Mar 2004 03:57:50 -0000	1.146
  +++ perchild.c	15 Mar 2004 23:08:41 -0000	1.147
  @@ -982,8 +982,9 @@
                       APR_THREAD_MUTEX_DEFAULT, pchild);
   
       apr_threadattr_create(&worker_thread_attr, pchild);
  -    apr_threadattr_detach_set(worker_thread_attr, 1);                               if
(ap_worker_stacksize != 0) {
  -        apr_threadattr_stacksize_set(thread_attr, ap_worker_stacksize);
  +    apr_threadattr_detach_set(worker_thread_attr, 1);
  +    if (ap_thread_stacksize != 0) {
  +        apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
       }
   
       /* We are creating worker threads right now */
  
  
  
  1.30      +2 -2      httpd-2.0/server/mpm/experimental/threadpool/threadpool.c
  
  Index: threadpool.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/threadpool/threadpool.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- threadpool.c	11 Mar 2004 03:57:50 -0000	1.29
  +++ threadpool.c	15 Mar 2004 23:08:41 -0000	1.30
  @@ -1289,8 +1289,8 @@
       apr_threadattr_create(&thread_attr, pchild);
       /* 0 means PTHREAD_CREATE_JOINABLE */
       apr_threadattr_detach_set(thread_attr, 0);
  -    if (ap_worker_stacksize != 0) {
  -        apr_threadattr_stacksize_set(thread_attr, ap_worker_stacksize);
  +    if (ap_thread_stacksize != 0) {
  +        apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
       }
   
       ts->threads = threads;
  
  
  
  1.35      +1 -1      httpd-2.0/server/mpm/winnt/child.c
  
  Index: child.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/child.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- child.c	11 Mar 2004 03:57:50 -0000	1.34
  +++ child.c	15 Mar 2004 23:08:41 -0000	1.35
  @@ -928,7 +928,7 @@
                   continue;
               }
               ap_update_child_status_from_indexes(0, i, SERVER_STARTING, NULL);
  -            child_handles[i] = (HANDLE) _beginthreadex(NULL, (unsigned)ap_worker_stacksize,
  +            child_handles[i] = (HANDLE) _beginthreadex(NULL, (unsigned)ap_thread_stacksize,
                                                          (LPTHREAD_START_ROUTINE) worker_main,
                                                          (void *) i, 0, &tid);
               if (child_handles[i] == 0) {
  
  
  
  1.151     +2 -2      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.150
  retrieving revision 1.151
  diff -u -r1.150 -r1.151
  --- worker.c	11 Mar 2004 03:57:50 -0000	1.150
  +++ worker.c	15 Mar 2004 23:08:41 -0000	1.151
  @@ -1164,8 +1164,8 @@
       /* 0 means PTHREAD_CREATE_JOINABLE */
       apr_threadattr_detach_set(thread_attr, 0);
   
  -    if (ap_worker_stacksize != 0) {
  -        apr_threadattr_stacksize_set(thread_attr, ap_worker_stacksize);
  +    if (ap_thread_stacksize != 0) {
  +        apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
       }
       
       ts->threads = threads;
  
  
  

Mime
View raw message