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/native2/include jk_bean.h jk_channel.h jk_endpoint.h jk_global.h jk_msg.h jk_worker.h jk_workerEnv.h
Date Thu, 16 May 2002 20:49:54 GMT
costin      02/05/16 13:49:54

  Modified:    jk/native2/include jk_bean.h jk_channel.h jk_endpoint.h
                        jk_global.h jk_msg.h jk_worker.h jk_workerEnv.h
  Log:
  Moved the 'id' to bean.
  
  Added a field for the processid. That's part of a very ugly workaround
  for the removal of child_num from Apache2 ( I hope I got it right )
  ( see next commits )
  
  Revision  Changes    Path
  1.3       +2 -0      jakarta-tomcat-connectors/jk/native2/include/jk_bean.h
  
  Index: jk_bean.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_bean.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_bean.h	9 May 2002 20:51:29 -0000	1.2
  +++ jk_bean.h	16 May 2002 20:49:53 -0000	1.3
  @@ -122,6 +122,8 @@
        */
       char *type;
   
  +    int id;
  +    
       /* Full name of the object ( "channel.socket:localhost:8080" ).
        * Used to construct the object.
        */
  
  
  
  1.11      +0 -2      jakarta-tomcat-connectors/jk/native2/include/jk_channel.h
  
  Index: jk_channel.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_channel.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_channel.h	15 May 2002 19:32:42 -0000	1.10
  +++ jk_channel.h	16 May 2002 20:49:53 -0000	1.11
  @@ -102,8 +102,6 @@
   struct jk_channel {
       struct jk_bean *mbean;
   
  -    int id;
  -
       /* JK_TRUE if the channel is 'stream' based, i.e. it works using
          send() followed by blocking reads().
          XXX make it type and define an enum of supported types ?
  
  
  
  1.15      +1 -3      jakarta-tomcat-connectors/jk/native2/include/jk_endpoint.h
  
  Index: jk_endpoint.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_endpoint.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_endpoint.h	15 May 2002 19:32:42 -0000	1.14
  +++ jk_endpoint.h	16 May 2002 20:49:53 -0000	1.15
  @@ -61,7 +61,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           
    * Author:      Dan Milstein <danmil@shore.net>                            
    * Author:      Henri Gomez <hgomez@slib.fr>                               
  - * Version:     $Revision: 1.14 $                                          
  + * Version:     $Revision: 1.15 $                                          
    ***************************************************************************/
   
   #ifndef JK_ENDPOINT_H
  @@ -122,8 +122,6 @@
    */
   struct jk_endpoint {
       struct jk_bean *mbean;
  -
  -    int id;
   
       /* Parent
        */
  
  
  
  1.12      +2 -1      jakarta-tomcat-connectors/jk/native2/include/jk_global.h
  
  Index: jk_global.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_global.h	15 May 2002 19:32:42 -0000	1.11
  +++ jk_global.h	16 May 2002 20:49:53 -0000	1.12
  @@ -59,7 +59,7 @@
    * Description: Global definitions and include files that should exist     *
    *              anywhere                                                   *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.11 $                                               *
  + * Version:     $Revision: 1.12 $                                               *
    ***************************************************************************/
   
   #ifndef JK_GLOBAL_H
  @@ -238,6 +238,7 @@
       #ifndef strncasecmp 
           #define strncasecmp strnicmp
   	#endif
  +
   	#ifndef vsnprintf
   		#define vsnprintf _vsnprintf
   	#endif
  
  
  
  1.8       +0 -3      jakarta-tomcat-connectors/jk/native2/include/jk_msg.h
  
  Index: jk_msg.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_msg.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_msg.h	3 May 2002 17:36:46 -0000	1.7
  +++ jk_msg.h	16 May 2002 20:49:53 -0000	1.8
  @@ -94,9 +94,6 @@
    *     On receive - it will be recycled after reset() or equiv.
    *     Same as on the java side.
    *
  - * XXX JNI: this was specially designed so it can be used for a JNI
  - * channel. It'll collect the params and convert them to java types.
  - *
    * @author Costin Manolache
    */
   struct jk_msg {
  
  
  
  1.23      +1 -2      jakarta-tomcat-connectors/jk/native2/include/jk_worker.h
  
  Index: jk_worker.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_worker.h,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- jk_worker.h	15 May 2002 19:32:42 -0000	1.22
  +++ jk_worker.h	16 May 2002 20:49:53 -0000	1.23
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: Workers controller header file                             *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           * 
  - * Version:     $Revision: 1.22 $                                           *
  + * Version:     $Revision: 1.23 $                                           *
    ***************************************************************************/
   
   #ifndef JK_WORKER_H
  @@ -139,7 +139,6 @@
       
       struct jk_workerEnv *workerEnv;
   
  -    int id;
       /* 
        * A 'this' pointer which is used by the subclasses of this class to
        * point to data/functions which are specific to a given protocol 
  
  
  
  1.22      +2 -1      jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h
  
  Index: jk_workerEnv.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- jk_workerEnv.h	15 May 2002 19:32:42 -0000	1.21
  +++ jk_workerEnv.h	16 May 2002 20:49:53 -0000	1.22
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: Workers controller header file                             *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           * 
  - * Version:     $Revision: 1.21 $                                           *
  + * Version:     $Revision: 1.22 $                                           *
    ***************************************************************************/
   
   #ifndef JK_WORKERENV_H
  @@ -156,6 +156,7 @@
          If -1 - shm is disabled.
       */
       int childId;
  +    int childProcessId;
   
       struct jk_env *globalEnv;
   
  
  
  

--
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