tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp13_worker.c jk_ajp14_worker.c jk_jni_worker.c jk_lb_worker.c jk_ajp13_worker.h jk_ajp14_worker.h jk_jni_worker.h jk_lb_worker.h
Date Wed, 07 Nov 2001 21:50:54 GMT
costin      01/11/07 13:50:54

  Modified:    jk/native/common jk_ajp13_worker.c jk_ajp14_worker.c
                        jk_jni_worker.c jk_lb_worker.c
  Removed:     jk/native/common jk_ajp13_worker.h jk_ajp14_worker.h
                        jk_jni_worker.h jk_lb_worker.h
  Log:
  Update for the new 'registration' mechanism for workers.
  
  The headers are not used ( we keep all the registration in jk_registry.c )
  
  Revision  Changes    Path
  1.7       +12 -2     jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
  
  Index: jk_ajp13_worker.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jk_ajp13_worker.c	2001/06/18 14:15:19	1.6
  +++ jk_ajp13_worker.c	2001/11/07 21:50:53	1.7
  @@ -60,10 +60,20 @@
    * Author:      Costin <costin@costin.dnt.ro>                              *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.6 $                                           *
  + * Version:     $Revision: 1.7 $                                           *
    ***************************************************************************/
   
  -#include "jk_ajp13_worker.h"
  +#include "jk_pool.h"
  +#include "jk_connect.h"
  +#include "jk_util.h"
  +#include "jk_msg_buff.h"
  +#include "jk_ajp_common.h"
  +#include "jk_ajp13.h"
  +#include "jk_logger.h"
  +
  +int JK_METHOD ajp13_worker_factory(jk_worker_t **w,
  +                                   const char *name,
  +                                   jk_logger_t *l);
   
   
   /* -------------------- Method -------------------- */
  
  
  
  1.12      +17 -2     jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c
  
  Index: jk_ajp14_worker.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_ajp14_worker.c	2001/10/13 18:46:45	1.11
  +++ jk_ajp14_worker.c	2001/11/07 21:50:53	1.12
  @@ -58,12 +58,27 @@
   /***************************************************************************
    * Description: AJP14 next generation Bi-directional protocol.             *
    * Author:      Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.11 $                                           *
  + * Version:     $Revision: 1.12 $                                           *
    ***************************************************************************/
   
   #include "jk_context.h"
  -#include "jk_ajp14_worker.h"
  +#include "jk_pool.h"
  +#include "jk_connect.h"
  +#include "jk_util.h"
  +#include "jk_msg_buff.h"
  +#include "jk_ajp13.h"
  +#include "jk_ajp14.h"
  +#include "jk_logger.h"
  +#include "jk_service.h"
   
  +int JK_METHOD ajp14_worker_factory(jk_worker_t **w,
  +                                   const char *name,
  +                                   jk_logger_t *l);
  +
  +#ifdef WIN32
  +/* define snprint to match windows version */
  +#define snprintf _snprintf
  +#endif
   
   /*
    * AJP14 Autoconf Phase
  
  
  
  1.5       +9 -2      jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
  
  Index: jk_jni_worker.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jk_jni_worker.c	2001/08/25 01:05:00	1.4
  +++ jk_jni_worker.c	2001/11/07 21:50:53	1.5
  @@ -59,7 +59,7 @@
    * Description: In process JNI worker                                      *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Based on:                                                               *
  - * Version:     $Revision: 1.4 $                                           *
  + * Version:     $Revision: 1.5 $                                           *
    ***************************************************************************/
   
   #if !defined(WIN32) && !defined(NETWARE)
  @@ -69,7 +69,6 @@
   #include <jni.h>
   
   #include "jk_pool.h"
  -#include "jk_jni_worker.h"
   #include "jk_util.h"
   
   #if defined LINUX && defined APACHE2_SIGHACK
  @@ -82,6 +81,14 @@
   #include <nwthread.h>
   #include <nwadv.h>
   #endif
  +#include "jk_logger.h"
  +#include "jk_service.h"
  +
  +int JK_METHOD jni_worker_factory(jk_worker_t **w,
  +                                 const char *name,
  +                                 jk_logger_t *l);
  +
  +
   
   #ifndef JNI_VERSION_1_1
   #define JNI_VERSION_1_1 0x00010001
  
  
  
  1.5       +8 -2      jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
  
  Index: jk_lb_worker.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jk_lb_worker.c	2001/06/18 14:15:45	1.4
  +++ jk_lb_worker.c	2001/11/07 21:50:53	1.5
  @@ -60,14 +60,20 @@
    *              several workers.                                           *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Based on:                                                               *
  - * Version:     $Revision: 1.4 $                                           *
  + * Version:     $Revision: 1.5 $                                           *
    ***************************************************************************/
   
   #include "jk_pool.h"
   #include "jk_service.h"
   #include "jk_util.h"
   #include "jk_worker.h"
  -#include "jk_lb_worker.h"
  +#include "jk_logger.h"
  +#include "jk_service.h"
  +
  +int JK_METHOD lb_worker_factory(jk_worker_t **w,
  +                                const char *name,
  +                                jk_logger_t *l);
  +
   
   /*
    * The load balancing code in this 
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message