cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool.c

[jfclere]

jfclere 2004/02/03 08:17:24

  Removed: jk/native2/common jk_pool.c
  Log:
  Remove depricated file.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool.c

[hgomez]

hgomez  2002/09/25 01:44:20

  Modified:jk/native2/common jk_pool.c
  Log:
  Correct typos before Mladen or Bojan detect them ;)
  
  Revision  ChangesPath
  1.13  +4 -4  jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
  
  Index: jk_pool.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jk_pool.c 25 Sep 2002 07:42:29 -  1.12
  +++ jk_pool.c 25 Sep 2002 08:44:20 -  1.13
  @@ -288,17 +288,17 @@
   
   static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s)
   {
  - return (jk2_pool_a_strdup(env, p, s, 0);
  + return (jk2_pool_a_strdup(env, p, s, 0));
   }
   
   static void *jk2_pool_strdup2ascii(jk_env_t *env, jk_pool_t *p, const char *s)
   {
  - return (jk2_pool_a_strdup(env, p, s, 1);
  + return (jk2_pool_a_strdup(env, p, s, 1));
   }
   
   static void *jk2_pool_strdup2ebcdic(jk_env_t *env, jk_pool_t *p, const char *s)
   {
  - return (jk2_pool_a_strdup(env, p, s, 2);
  + return (jk2_pool_a_strdup(env, p, s, 2));
   }
   
   /*
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool.c jk_config_file.c jk_channel_jni.c

[hgomez]

hgomez  2002/09/25 00:42:29

  Modified:jk/native2/common jk_pool.c jk_config_file.c
jk_channel_jni.c
  Log:
  More AS/400/BS2000 back ports, notably to help JNI on EBCDIC systems
  
  Revision  ChangesPath
  1.12  +28 -2 jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
  
  Index: jk_pool.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_pool.c 24 Sep 2002 22:40:02 -  1.11
  +++ jk_pool.c 25 Sep 2002 07:42:29 -  1.12
  @@ -103,6 +103,10 @@
   
   static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s);
   
  +static void *jk2_pool_strdup2ascii(jk_env_t *env, jk_pool_t *p, const char *s);
  +
  +static void *jk2_pool_strdup2ebcdic(jk_env_t *env, jk_pool_t *p, const char *s);
  +
   static void *jk2_pool_realloc(jk_env_t *env, jk_pool_t *p, size_t sz,const void 
*old,
 size_t old_sz);
   
  @@ -139,6 +143,8 @@
   _this->alloc=jk2_pool_alloc;
   _this->calloc=jk2_pool_calloc;
   _this->pstrdup=jk2_pool_strdup;
  +_this->pstrdup2ascii=jk2_pool_strdup2ascii;
  +_this->pstrdup2ebcdic=jk2_pool_strdup2ebcdic;
   _this->realloc=jk2_pool_realloc;
   
   *newPool = _this;
  @@ -255,7 +261,7 @@
   return rc;
   }
   
  -static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s)
  +static void *jk2_pool_a_strdup(jk_env_t *env, jk_pool_t *p, const char *s, int 
convmode)
   {
   char *rc = NULL;
   if(s && p) {
  @@ -270,9 +276,29 @@
   memcpy(rc, s, size);
   }
   rc[size]='\0';
  +
  +if (convmode == 1)
  + jk_xlate_to_ascii(rc, size);
  +else if (convmode == 2)
  + jk_xlate_from_ascii(rc, size);
   }
   
   return rc;
  +}
  +
  +static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s)
  +{
  + return (jk2_pool_a_strdup(env, p, s, 0);
  +}
  +
  +static void *jk2_pool_strdup2ascii(jk_env_t *env, jk_pool_t *p, const char *s)
  +{
  + return (jk2_pool_a_strdup(env, p, s, 1);
  +}
  +
  +static void *jk2_pool_strdup2ebcdic(jk_env_t *env, jk_pool_t *p, const char *s)
  +{
  + return (jk2_pool_a_strdup(env, p, s, 2);
   }
   
   /*
  
  
  
  1.6   +10 -0 jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c
  
  Index: jk_config_file.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jk_config_file.c  24 Sep 2002 22:37:13 -  1.5
  +++ jk_config_file.c  25 Sep 2002 07:42:29 -  1.6
  @@ -62,6 +62,10 @@
* @author: Costin Manolache
*/
   
  +#ifdef AS400
  +#include "apr_xlate.h"
  +#endif
  +
   #include "jk_global.h"
   #include "jk_map.h"
   #include "jk_pool.h"
  @@ -136,7 +140,13 @@
   
   static void jk2_trim_prp_comment(char *prp)
   {
  +#ifdef AS400
  +char *comment;
  +  /* lots of lines that translate a '#' realtime deleted   */
  +comment = strchr(prp, *APR_NUMBERSIGN); 
  +#else
   char *comment = strchr(prp, '#');
  +#endif
   if(comment) {
   *comment = '\0';
   }
  
  
  
  1.34  +28 -7 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
  
  Index: jk_channel_jni.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- jk_channel_jni.c  14 Jul 2002 13:36:03 -  1.33
  +++ jk_channel_jni.c  25 Sep 2002 07:42:29 -  1.34
  @@ -78,6 +78,7 @@
   #include 
   
   /* default only, is configurable now */
  +
   #define JAVA_BRIDGE_CLASS_NAME ("org/apache/jk/apr/AprImpl")
   
   #define JNI_TOMCAT_STARTED 2
  @@ -108,6 +109,19 @@
   } jk_ch_jni_ep_private_t;
   
   
  +/*
  +   Duplicate string and convert it to ASCII on EBDIC based systems
  +   Needed for at least AS/400 and BS2000 but what about other EBDIC systems ?
  +*/
  +static void *strdup_ascii(jk_env_t *env, 
  +  char *s)
  +{
  +#if defined(AS400) || defined(_OSD_POSIX)
  + return (env->tmpPool->pstrdup2ascii(env, env->tmpPool, s));
  +#else
  + return (env->tmpPool->pstrdup(env, env->tmpPool, s));
  +#endif
  +}
   
   static int JK_METHOD jk2_channel_jni_init(jk_env_t *env,
 jk_bean_t *jniWB)
  @@ -188,7 +202,8 @@
   
   endpoint->channelData=epData;
   
  -jniCh->jniBridge = (*jniEnv)->FindClass(jniEnv, jniCh->className );
  +/* AS400/BS2000 need EBCDIC to ASCII conversion for JNI */
  +jniCh->jniBridge = (*jniEnv)->FindC

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool.c

[hgomez]

hgomez  2002/09/24 15:40:02

  Modified:jk/native2/common jk_pool.c
  Log:
  AS/400 back port from 1.2.0.
  
  Revision  ChangesPath
  1.11  +10 -5 jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
  
  Index: jk_pool.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_pool.c 10 Jun 2002 21:55:06 -  1.10
  +++ jk_pool.c 24 Sep 2002 22:40:02 -  1.11
  @@ -215,10 +215,15 @@
   
   pp=(jk_pool_private_t *)p->_private;
   
  -/* Round size to the upper mult of 8. */
  -size -= 1;
  -size /= 8;
  -size = (size + 1) * 8;
  +/* Round size to the upper mult of 8 (or 16 on iSeries) */
  + size--;
  +#ifdef AS400
  +size /= 16;
  +size = (size + 1) * 16;
  +#else
  +size /= 8;
  +size = (size + 1) * 8;
  +#endif
   
   if((pp->size - pp->pos) >= (int)size) {
   /* We have space */
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool.c

[costin]

costin  02/04/11 17:01:06

  Modified:jk/native2/common jk_pool.c
  Log:
  Stop debugging.
  
  Revision  ChangesPath
  1.8   +2 -2  jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
  
  Index: jk_pool.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_pool.c 19 Mar 2002 04:53:40 -  1.7
  +++ jk_pool.c 12 Apr 2002 00:01:06 -  1.8
  @@ -58,14 +58,14 @@
   /***
* Description: Simple memory pool *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.7 $   *
  + * Version: $Revision: 1.8 $   *
***/
   
   #include "jk_pool.h"
   #include "jk_env.h"
   
   #define DEFAULT_DYNAMIC 10
  -#define JK_DEBUG_POOL 1
  +/* #define JK_DEBUG_POOL 1 */
   
   /* Private data for jk pools
*/
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool.c

[costin]

costin  01/12/06 14:59:03

  Modified:jk/native2/common jk_pool.c
  Log:
  Moved the private data inside.
  
  It compiles and seems to work fine - but for now it's not enabled, I want to
  test APR pools.
  
  When I start porting the other server adapters ( hopefully next week I'll be done
  with most refactoring ) I'll go back to test the 'common' pool.
  
  Revision  ChangesPath
  1.4   +159 -103  jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
  
  Index: jk_pool.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_pool.c 2001/12/05 20:48:20 1.3
  +++ jk_pool.c 2001/12/06 22:59:03 1.4
  @@ -58,56 +58,144 @@
   /***
* Description: Simple memory pool *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.3 $   *
  + * Version: $Revision: 1.4 $   *
***/
   
   #include "jk_pool.h"
   #include "jk_env.h"
   
   #define DEFAULT_DYNAMIC 10
  +#define JK_DEBUG_POOL 1
   
  +/* Private data for jk pools
  + */
  +struct jk_pool_private {
  +jk_pool_t *parent;
  +int size;  
  +int pos;   
  +int dyn_size;  
  +int dyn_pos;   
  +void **dynamic;
  +char  *buf;
  +};
  +
  +typedef struct jk_pool_private jk_pool_private_t;
  +
  +int jk_pool_create( jk_pool_t **newPool, jk_pool_t *parent, int size );
  +
   int JK_METHOD jk_pool_factory( jk_env_t *env, void **result,
  char *type, char *name);
   
  +static jk_pool_t *jk_pool_createChild( jk_pool_t *parent, int size );
  +
   static void *jk_pool_dyn_alloc(jk_pool_t *p, 
  size_t size);
   
  -static void jk_reset_pool(jk_pool_t *p);
  +static void jk_pool_reset(jk_pool_t *p);
   
  -static void jk_close_pool(jk_pool_t *p);
  +static void jk_pool_close(jk_pool_t *p);
   
  -static void *jk_pool_alloc(jk_pool_t *p, 
  -   size_t size);
  +static void *jk_pool_alloc(jk_pool_t *p, size_t size);
  +
  +static void *jk_pool_calloc(jk_pool_t *p, size_t size);
  +
  +static void *jk_pool_strdup(jk_pool_t *p, const char *s);
  +
  +static void *jk_pool_realloc(jk_pool_t *p, size_t sz,const void *old,
  + size_t old_sz);
  +
  +
  +int jk_pool_create( jk_pool_t **newPool, jk_pool_t *parent, int size ) {
  +jk_pool_private_t *pp;
  +
  +jk_pool_t *_this=(jk_pool_t *)malloc( sizeof( jk_pool_t ));
  +/* jk_pool_t *_this=(jk_pool_t *)malloc( sizeof( jk_pool_t ) + */
  +/*   sizeof( jk_pool_private_t ) +*/
  +/*   size ); */
  +pp=(jk_pool_private_t *)malloc( sizeof( jk_pool_private_t ));
  +
  +_this->_private=pp;
  +
  +/* XXX strange, but I assume the size is in bytes, not atom_t */
  +pp->buf=(char *)malloc( size );
  +
  +pp->pos  = 0;
  +pp->size = size;
  +
  +pp->dyn_pos = 0;
  +pp->dynamic = NULL;
  +pp->dyn_size = 0;
  +pp->parent=parent;
  +
  +/* methods */
  +_this->create=jk_pool_createChild;
  +_this->close=jk_pool_close;
  +_this->reset=jk_pool_reset;
  +
  +_this->alloc=jk_pool_alloc;
  +_this->calloc=jk_pool_calloc;
  +_this->pstrdup=jk_pool_strdup;
  +_this->realloc=jk_pool_realloc;
  +
  +*newPool = _this;
  +
  +return JK_TRUE;
  +}
   
  -static void jk_close_pool(jk_pool_t *p)
  +static jk_pool_t *jk_pool_createChild( jk_pool_t *parent, int size ) {
  +jk_pool_t *newPool;
  +
  +jk_pool_create( &newPool, parent, size );
  +return newPool;
  +}
  +
  +static void jk_pool_close(jk_pool_t *p)
   {
  -if(p) {
  -jk_reset_pool(p);
  -if(p->dynamic) {
  -free(p->dynamic);
  -}
  +jk_pool_private_t *pp;
  +
  +if(p==NULL || p->_private==NULL)
  +return;
  +
  +pp=(jk_pool_private_t *)p->_private;
  +
  +jk_pool_reset(p);
  +if(pp->dynamic) {
  +free(pp->dynamic);
   }
  +if( pp->buf )
  +free( pp->buf );
  +free( pp );
  +free( p );
   }
   
  -static void jk_reset_pool(jk_pool_t *p)
  +static void jk_pool_reset(jk_pool_t *p)
   {
  -if(p && p->dyn_pos && p->dynamic) {
  -unsigned i;
  -for(i = 0 ; i < p->dyn_pos ; i++) {
  -if(p->dynamic[i]) {
  -free(p->dynamic[i]);
  +jk_pool_private_t *pp;
  +
  +if(p==NULL || p->_private ==NULL )
  +return;
  +
  +pp=(jk_pool_private_t *