costin 01/12/04 16:11:27 Added: jk/native2/server/apache2 jk_pool_apr.c Log: Initial implementation for the apr pool. This will allow use of native pools if apache is used ( or apr ). Non-apr code will work as before, using jk pools. Note that for Apache1.3 we also have the option to use apache1.3 pools - but probably it's not worth the effort ( it's easier to use jk_pool and better to use apr pools ) Revision Changes Path 1.1 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_pool_apr.c Index: jk_pool_apr.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 <[EMAIL PROTECTED]>. * * * * 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/>. * * * * ========================================================================= */ /** * Pool using APR. * * @author Costin Manolache */ #include "jk_pool.h" #include "jk_env.h" #include "apr_pools.h" /** Nothing - apache will take care */ static void jk_close_pool(jk_pool_t *p) { } /** Nothing - apache will take care. XXX with jk pools we can implement 'recycling', not sure what's the equivalent for apache */ static void jk_reset_pool(jk_pool_t *p) { } static void *jk_pool_apr_calloc(jk_pool_t *p, size_t size) { /* assert( p->_private != NULL ) */ return apr_pcalloc( (apr_pool_t *)p->_private, (apr_size_t)size); } static void *jk_pool_apr_alloc(jk_pool_t *p, size_t size) { return apr_palloc( (apr_pool_t *)p->_private, (apr_size_t)size); } static void *jk_pool_apr_realloc(jk_pool_t *p, size_t sz, const void *old, size_t old_sz) { void *rc; if(!p || (!old && old_sz)) { return NULL; } rc = jk_pool_apr_alloc(p, sz); if(rc) { memcpy(rc, old, old_sz); } return rc; } static void *jk_pool_apr_strdup(jk_pool_t *p, const char *s) { return apr_pstrdup( (apr_pool_t *)p->_private, s); } /* Not implemented yet */ int jk_pool_apr_create( jk_pool_t **newPool, jk_pool_t *parent ) { return JK_TRUE; } static void init_methods(jk_pool_t *_this ) { _this->open=jk_open_pool; _this->close=jk_close_pool; _this->reset=jk_reset_pool; _this->alloc=jk_pool_apr_alloc; _this->calloc=jk_pool_apr_calloc; _this->pstrdup=jk_pool_apr_strdup; _this->realloc=jk_pool_apr_realloc; } /* Not used yet */ int JK_METHOD jk_pool_apr_factory(jk_env_t *env, void **result, char *type, char *name) { jk_pool_t *_this=(jk_pool_t *)calloc( 1, sizeof(jk_pool_t)); init_methods(_this ); *result=_this; return JK_TRUE; } /* that's what jk use to create pools. Deprecated! */ void jk_pool_apr_open(jk_pool_t *_this, apr_pool_t *realPool ) { _this->_private=realPool; init_methods( _this ); }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
