costin 02/05/23 21:24:51
Added: jk/native2/include jk_mutex.h
jk/native2/common jk_mutex.c
Log:
Moved the mutex code from jni to it's own separate component.
JNI can call it using 'normal' dispatch.
This looks more and more like (XP)COM/XPConnect/blackwood - that may
only mean that we are on the good path :-)
Revision Changes Path
1.1 jakarta-tomcat-connectors/jk/native2/include/jk_mutex.h
Index: jk_mutex.h
===================================================================
/* ========================================================================= *
* *
* 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/>. *
* *
* ========================================================================= */
#ifndef JK_MUTEX_H
#define JK_MUTEX_H
#include "jk_global.h"
#include "jk_env.h"
#include "jk_logger.h"
#include "jk_pool.h"
#include "jk_msg.h"
#include "jk_service.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
struct jk_env;
struct jk_mutex;
typedef struct jk_mutex jk_mutex_t;
/**
* Interprocess mutex support. This is a wrapper to APR.
*
* @author Costin Manolache
*/
struct jk_mutex {
struct jk_bean *mbean;
struct jk_pool *pool;
/** Name of the mutex */
char *fname;
/** APR mechanism */
int mechanism;
/**
*/
int (JK_METHOD *lock)(struct jk_env *env, struct jk_mutex *mutex);
/**
*/
int (JK_METHOD *tryLock)(struct jk_env *env, struct jk_mutex *mutex);
/**
*/
int (JK_METHOD *unLock)(struct jk_env *env, struct jk_mutex *mutex);
/* Private data */
void *privateData;
};
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif
1.1 jakarta-tomcat-connectors/jk/native2/common/jk_mutex.c
Index: jk_mutex.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/>. *
* *
* ========================================================================= */
/**
* Mutex support.
*
* @author Costin Manolache
*/
#include "jk_global.h"
#include "jk_map.h"
#include "jk_pool.h"
#include "jk_mutex.h"
#ifdef HAS_APR
#include "apr_proc_mutex.h"
#define MUTEX_SET_ATTRIBUTE 0
#define MUTEX_INIT 2
#define MUTEX_DESTROY 3
#define MUTEX_LOCK 4
#define MUTEX_TRYLOCK 5
#define MUTEX_UNLOCK 6
static int JK_METHOD jk2_mutex_init(jk_env_t *env, jk_bean_t *mutexB)
{
jk_mutex_t *jkMutex=mutexB->object;
apr_proc_mutex_t *mutex;
apr_lockmech_e mech=(apr_lockmech_e)jkMutex->mechanism;
apr_pool_t *pool=(apr_pool_t *)env->getAprPool(env);
apr_status_t st;
char *fname=jkMutex->fname;
st=apr_proc_mutex_create( &mutex, fname, mech, pool );
jkMutex->privateData=mutex;
return st;
}
static int JK_METHOD
jk2_mutex_destroy(jk_env_t *env, jk_bean_t *mutexB)
{
jk_mutex_t *jkMutex=mutexB->object;
apr_proc_mutex_t *mutex=(apr_proc_mutex_t *)jkMutex->privateData;
apr_status_t st;
if( mutex!= NULL )
st=apr_proc_mutex_destroy( mutex );
return st;
}
static int JK_METHOD
jk2_mutex_lock(jk_env_t *env, jk_mutex_t *jkMutex)
{
apr_proc_mutex_t *mutex=(apr_proc_mutex_t *)jkMutex->privateData;
apr_status_t st;
st=apr_proc_mutex_lock( mutex );
return st;
}
static int JK_METHOD
jk2_mutex_tryLock(jk_env_t *env, jk_mutex_t *jkMutex)
{
apr_proc_mutex_t *mutex=(apr_proc_mutex_t *)jkMutex->privateData;
apr_status_t st;
st=apr_proc_mutex_trylock( mutex );
return st;
}
static int JK_METHOD
jk2_mutex_unLock(jk_env_t *env, jk_mutex_t *jkMutex)
{
apr_proc_mutex_t *mutex=(apr_proc_mutex_t *)jkMutex->privateData;
apr_status_t st;
st=apr_proc_mutex_unlock( mutex );
return st;
}
static int JK_METHOD jk2_mutex_setAttribute( jk_env_t *env, jk_bean_t *mbean, char
*name, void *valueP ) {
jk_mutex_t *mutex=(jk_mutex_t *)mbean->object;
char *value=(char *)valueP;
if( strcmp( "file", name ) == 0 ) {
mutex->fname=value;
} else if( strcmp( "mechanism", name ) == 0 ) {
mutex->mechanism=atoi(value);
} else {
return JK_ERR;
}
return JK_OK;
}
/* ==================== Dispatch messages from java ==================== */
/** Called by java. Will call the right mutex method.
*/
static int JK_METHOD jk2_mutex_dispatch(jk_env_t *env, void *target, jk_endpoint_t
*ep, jk_msg_t *msg)
{
jk_bean_t *bean=(jk_bean_t *)target;
jk_mutex_t *mutex=(jk_mutex_t *)bean->object;
int rc;
int code=msg->getByte(env, msg );
if( mutex->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
"mutex.%d() \n", code);
switch( code ) {
case MUTEX_SET_ATTRIBUTE: {
char *name=msg->getString( env, msg );
char *value=msg->getString( env, msg );
if( mutex->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
"mutex.setAttribute() %s %s %p\n", name, value,
bean->setAttribute);
if( bean->setAttribute != NULL)
bean->setAttribute(env, bean, name, value );
return JK_OK;
}
case MUTEX_INIT: {
if( mutex->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO, "mutex.init()\n");
rc=mutex->mbean->init(env, mutex->mbean);
return rc;
}
case MUTEX_DESTROY: {
if( mutex->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO, "mutex.destroy()\n");
rc=mutex->mbean->destroy(env, mutex->mbean);
return rc;
}
case MUTEX_LOCK: {
if( mutex->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO, "mutex.lock()\n");
rc=mutex->lock(env, mutex);
return rc;
}
case MUTEX_TRYLOCK: {
if( mutex->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO, "mutex.tryLock()\n");
rc=mutex->tryLock(env, mutex);
return rc;
}
case MUTEX_UNLOCK: {
if( mutex->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO, "mutex.unLock()\n");
rc=mutex->unLock(env, mutex);
return rc;
}
}/* switch */
return JK_ERR;
}
static int JK_METHOD jk2_mutex_setWorkerEnv( jk_env_t *env, jk_mutex_t *mutex,
jk_workerEnv_t *wEnv ) {
wEnv->registerHandler( env, wEnv, "mutex",
"mutexDispatch", JK_HANDLE_MUTEX_DISPATCH,
jk2_mutex_dispatch, NULL );
return JK_OK;
}
int JK_METHOD jk2_mutex_factory( jk_env_t *env ,jk_pool_t *pool,
jk_bean_t *result,
const char *type, const char *name)
{
jk_mutex_t *mutex;
jk_workerEnv_t *wEnv;
mutex=(jk_mutex_t *)pool->calloc(env, pool, sizeof(jk_mutex_t));
if( mutex == NULL )
return JK_ERR;
mutex->pool=pool;
mutex->privateData=NULL;
result->setAttribute=jk2_mutex_setAttribute;
/* result->getAttribute=jk2_mutex_getAttribute; */
mutex->mbean=result;
result->object=mutex;
result->init=jk2_mutex_init;
result->destroy=jk2_mutex_destroy;
mutex->lock=jk2_mutex_lock;
mutex->tryLock=jk2_mutex_tryLock;
mutex->unLock=jk2_mutex_unLock;
wEnv=env->getByName( env, "workerEnv" );
jk2_mutex_setWorkerEnv( env, mutex, wEnv );
return JK_OK;
}
#else
int JK_METHOD jk2_mutex_factory( jk_env_t *env ,jk_pool_t *pool,
jk_bean_t *result,
const char *type, const char *name)
{
result->disabled=1;
return JK_OK;
}
#endif
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
