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/common jk_worker_status.c jk_registry.c jk_registry.h
Date Mon, 31 Dec 2001 20:37:01 GMT
costin      01/12/31 12:37:01

  Modified:    jk/native2/common jk_registry.c jk_registry.h
  Added:       jk/native2/common jk_worker_status.c
  Log:
  Last thing for this year, initial ( skeleton ) for the status worker,
  to display informations like mod_status. Usefull for debugging and
  monitoring.
  
  Revision  Changes    Path
  1.7       +2 -1      jakarta-tomcat-connectors/jk/native2/common/jk_registry.c
  
  Index: jk_registry.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jk_registry.c	13 Dec 2001 18:48:13 -0000	1.6
  +++ jk_registry.c	31 Dec 2001 20:37:01 -0000	1.7
  @@ -63,7 +63,7 @@
   #include "jk_registry.h"
   /***************************************************************************
    * Description: Worker list                                                *
  - * Version:     $Revision: 1.6 $                                           *
  + * Version:     $Revision: 1.7 $                                           *
    ***************************************************************************/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -111,6 +111,7 @@
     env->registerFactory( env, "worker", "ajp13", jk_worker_ajp14_factory );
     env->registerFactory( env, "worker", "ajp14", jk_worker_ajp14_factory );
     env->registerFactory( env, "worker", "lb",    jk_worker_lb_factory );
  +  env->registerFactory( env, "worker", "status", jk_worker_status_factory );
     env->registerFactory( env, "channel", "socket", jk_channel_socket_factory );
     env->registerFactory( env, "handler", "response", jk_handler_response_factory );
     env->registerFactory( env, "handler", "logon",   jk_handler_logon_factory );
  
  
  
  1.2       +5 -1      jakarta-tomcat-connectors/jk/native2/common/jk_registry.h
  
  Index: jk_registry.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_registry.h	13 Dec 2001 18:48:13 -0000	1.1
  +++ jk_registry.h	31 Dec 2001 20:37:01 -0000	1.2
  @@ -62,7 +62,7 @@
   
   /***************************************************************************
    * Description: Worker list                                                *
  - * Version:     $Revision: 1.1 $                                           *
  + * Version:     $Revision: 1.2 $                                           *
    ***************************************************************************/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -97,6 +97,10 @@
   int JK_METHOD jk_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
                                       void **result,
                                       const char *type, const char *name);
  +
  +int JK_METHOD jk_worker_status_factory(jk_env_t *env, jk_pool_t *pool,
  +                                       void **result,
  +                                       const char *type, const char *name);
   
   int JK_METHOD jk_worker_ajp12_factory(jk_env_t *env, jk_pool_t *pool,
                                         void **result,
  
  
  
  1.1                  jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
  
  Index: jk_worker_status.c
  ===================================================================
  /* ========================================================================= *
   *                                                                           *
   *                 The Apache Software License,  Version 1.1                 *
   *                                                                           *
   *          Copyright (c) 1999-2001 The Apache Software Foundation.          *
   *                           All rights reserved.                            *
   *                                                                           *
   * ========================================================================= *
   *                                                                           *
   * Redistribution and use in source and binary forms,  with or without modi- *
   * fication, are permitted provided that the following conditions are met:   *
   *                                                                           *
   * 1. Redistributions of source code  must retain the above copyright notice *
   *    notice, this list of conditions and the following disclaimer.          *
   *                                                                           *
   * 2. Redistributions  in binary  form  must  reproduce the  above copyright *
   *    notice,  this list of conditions  and the following  disclaimer in the *
   *    documentation and/or other materials provided with the distribution.   *
   *                                                                           *
   * 3. The end-user documentation  included with the redistribution,  if any, *
   *    must include the following acknowlegement:                             *
   *                                                                           *
   *       "This product includes  software developed  by the Apache  Software *
   *        Foundation <http://www.apache.org/>."                              *
   *                                                                           *
   *    Alternately, this acknowlegement may appear in the software itself, if *
   *    and wherever such third-party acknowlegements normally appear.         *
   *                                                                           *
   * 4. The names  "The  Jakarta  Project",  "Jk",  and  "Apache  Software     *
   *    Foundation"  must not be used  to endorse or promote  products derived *
   *    from this  software without  prior  written  permission.  For  written *
   *    permission, please contact <apache@apache.org>.                        *
   *                                                                           *
   * 5. Products derived from this software may not be called "Apache" nor may *
   *    "Apache" appear in their names without prior written permission of the *
   *    Apache Software Foundation.                                            *
   *                                                                           *
   * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
   * INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY *
   * AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL *
   * THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY *
   * DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL *
   * DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS *
   * OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) *
   * HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, *
   * STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
   * ANY  WAY  OUT OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF  ADVISED  OF THE *
   * POSSIBILITY OF SUCH DAMAGE.                                               *
   *                                                                           *
   * ========================================================================= *
   *                                                                           *
   * This software  consists of voluntary  contributions made  by many indivi- *
   * duals on behalf of the  Apache Software Foundation.  For more information *
   * on the Apache Software Foundation, please see <http://www.apache.org/>.   *
   *                                                                           *
   * ========================================================================= */
  
  /**
   * Status worker. It'll not connect to tomcat, but just generate response
   * itself, containing a simple xhtml page with the current jk info.
   *
   * Note that the html tags are using 'class' attribute. Someone with some
   * color taste can do a nice CSS and display it nicely, but more important is
   * that it should be easy to grep/xpath it programmatically.
   * 
   * @author Costin Manolache
   */
  
  #include "jk_pool.h"
  #include "jk_service.h"
  #include "jk_worker.h"
  #include "jk_logger.h"
  #include "jk_env.h"
  #include "jk_requtil.h"
  #include "jk_registry.h"
  
  #define JK_BUF_SIZE 4096
  
  typedef struct  {
      int pos;
      int size;
      
      char *buf;
  } jk_buff_t;
  
  
  static int JK_METHOD service(jk_env_t *env, jk_endpoint_t *e, 
                               jk_ws_service_t *s,
                               int *is_recoverable_error)
  {
      char *buff;
      int bsize=JK_BUF_SIZE;
      
      /* Generate the header */
      s->status=200;
      s->msg="OK";
      s->headers_out->put(env, s->headers_out,
                          "Content-Type", "text/html", NULL);
  
      fprintf(stderr, "Writing head \n");
      s->head(env, s );
      /* Body */
      buff=(char *)s->pool->alloc( env, s->pool, bsize );
      strcpy(buff, "Hello\n");
  
      fprintf(stderr, "Writing %s \n", buff);
      s->write( env, s, buff, strlen( buff ));
      
      s->afterRequest( env, s);
      fprintf(stderr, "After req %s \n", buff);
      return JK_TRUE;
  }
  
  static int JK_METHOD done(jk_env_t *env, jk_endpoint_t *e)
  {
      return JK_TRUE;
  }
  
  static int JK_METHOD validate(jk_env_t *env, jk_worker_t *_this,
                                jk_map_t *props, jk_workerEnv_t *we)
  {
      return JK_TRUE;
  }
  
  static int JK_METHOD init(jk_env_t *env, jk_worker_t *_this,
                            jk_map_t *props, jk_workerEnv_t *we)
  {
      return JK_TRUE;
  }
  
  static int JK_METHOD get_endpoint(jk_env_t *env, jk_worker_t *_this,
                                    jk_endpoint_t **pend)
  {
      jk_endpoint_t *e;
      jk_pool_t *endpointPool;
      
      if (_this->endpointCache != NULL ) {
  
          e=_this->endpointCache->get( env, _this->endpointCache );
          
          if (e!=NULL) {
              env->l->jkLog(env, env->l, JK_LOG_INFO,
                       "lb.getEndpoint(): Reusing endpoint\n");
              *pend = e;
              return JK_TRUE;
          }
      }
      
      endpointPool=_this->pool->create( env, _this->pool, HUGE_POOL_SIZE);
      
      e = (jk_endpoint_t *)endpointPool->calloc(env, endpointPool,
                                                sizeof(jk_endpoint_t));
      if(e==NULL) {
          env->l->jkLog(env, env->l, JK_LOG_ERROR, 
                        "lb_worker.getEndpoint() OutOfMemoryException\n");
          return JK_FALSE;
      }
  
      e->pool = endpointPool;
  
      e->cPool=endpointPool->create( env,endpointPool, HUGE_POOL_SIZE );
      
      e->worker = _this;
      e->service = service;
      e->done = done;
      e->channelData = NULL;
      *pend = e;
  
      env->l->jkLog(env, env->l, JK_LOG_INFO, "lb_worker.getEndpoint()\n");
      return JK_TRUE;
  }
  
  
  static int JK_METHOD destroy(jk_env_t *env, jk_worker_t *w)
  {
      int i = 0;
  
      if(w==NULL ) {
          env->l->jkLog(env, env->l, JK_LOG_ERROR,
                        "lb_worker.destroy() NullPointerException\n");
          return JK_FALSE;
      }
  
      for(i = 0 ; i < w->num_of_workers ; i++) {
          w->lb_workers[i]->destroy( env, w->lb_workers[i]);
      }
  
      if( w->endpointCache != NULL ) {
          
          for( i=0; i< w->endpointCache->ep_cache_sz; i++ ) {
              jk_endpoint_t *e;
              
              e= w->endpointCache->get( env, w->endpointCache );
              
              if( e==NULL ) {
                  // we finished all endpoints in the cache
                  break;
              }
  
              /* Nothing else to clean up ? */
              e->cPool->close( env, e->cPool );
              e->pool->close( env, e->pool );
          }
          w->endpointCache->destroy( env, w->endpointCache );
  
          env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                        "lb.destroy() closed %d cached endpoints\n",i);
      }
  
      w->pool->close(env, w->pool);    
  
      return JK_TRUE;
  }
  
  
  int JK_METHOD jk_worker_status_factory(jk_env_t *env, jk_pool_t *pool,
                                         void **result,
                                         const char *type, const char *name)
  {
      jk_worker_t *_this;
      
      if(NULL == name ) {
          env->l->jkLog(env, env->l, JK_LOG_ERROR,
                        "lb_worker.factory() NullPointerException\n");
          return JK_FALSE;
      }
      
      _this = (jk_worker_t *)pool->calloc(env, pool, sizeof(jk_worker_t));
  
      if(_this==NULL) {
          env->l->jkLog(env, env->l, JK_LOG_ERROR,
                        "lb_worker.factory() OutOfMemoryException\n");
          return JK_FALSE;
      }
  
      _this->name=(char *)name;
      _this->pool=pool;
  
      _this->lb_workers = NULL;
      _this->num_of_workers = 0;
      _this->worker_private = NULL;
      _this->validate       = validate;
      _this->init           = init;
      _this->get_endpoint   = get_endpoint;
      _this->destroy        = destroy;
      
      *result=_this;
  
      /*     env->l->jkLog(env, env->l, JK_LOG_INFO, */
      /*                   "lb_worker.factory() New lb worker\n"); */
      
      /* name, pool will be set by workerEnv ( our factory ) */
      
      return JK_TRUE;
  }
  
  
  
  

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