Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 1668 invoked from network); 4 Jun 2006 08:44:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Jun 2006 08:44:46 -0000 Received: (qmail 5051 invoked by uid 500); 4 Jun 2006 08:44:43 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 4539 invoked by uid 500); 4 Jun 2006 08:44:41 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 4527 invoked by uid 500); 4 Jun 2006 08:44:41 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 4518 invoked by uid 99); 4 Jun 2006 08:44:41 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Jun 2006 01:44:41 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Jun 2006 01:44:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9B9B41A9842; Sun, 4 Jun 2006 01:44:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r411539 - in /tomcat/connectors/trunk/jk/native/common: jk_util.c jk_util.h Date: Sun, 04 Jun 2006 08:44:20 -0000 To: tomcat-dev@jakarta.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060604084420.9B9B41A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mturk Date: Sun Jun 4 01:44:19 2006 New Revision: 411539 URL: http://svn.apache.org/viewvc?rev=411539&view=rev Log: Add connection_min_poll_size directive. Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c tomcat/connectors/trunk/jk/native/common/jk_util.h Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?rev=411539&r1=411538&r2=411539&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_util.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Jun 4 01:44:19 2006 @@ -48,6 +48,7 @@ #define TYPE_OF_WORKER ("type") #define CACHE_OF_WORKER_DEPRECATED ("cachesize") #define CACHE_OF_WORKER ("connection_pool_size") +#define CACHE_OF_WORKER_MIN ("connection_min_pool_size") #define CACHE_TIMEOUT_OF_WORKER ("cache_timeout") #define RECOVERY_OPTS_OF_WORKER ("recovery_options") #define CONNECT_TIMEOUT_OF_WORKER ("connect_timeout") @@ -525,6 +526,18 @@ return jk_map_get_int(m, buf, def); } +int jk_get_worker_cache_size_min(jk_map_t *m, const char *wname, int def) +{ + char buf[1024]; + + if (!m || !wname) { + return -1; + } + + MAKE_WORKER_PARAM(CACHE_OF_WORKER_MIN); + return jk_map_get_int(m, buf, def); +} + int jk_get_worker_socket_timeout(jk_map_t *m, const char *wname, int def) { char buf[1024]; @@ -1069,6 +1082,8 @@ TYPE_OF_WORKER, CACHE_OF_WORKER, CACHE_OF_WORKER_DEPRECATED, + CACHE_OF_WORKER, + CACHE_OF_WORKER_MIN, CACHE_TIMEOUT_OF_WORKER, RECOVERY_OPTS_OF_WORKER, CONNECT_TIMEOUT_OF_WORKER, @@ -1094,9 +1109,33 @@ NULL }; +static const char *deprecated_properties[] = { + CACHE_OF_WORKER_DEPRECATED, + MX_OF_WORKER, + MS_OF_WORKER, + CP_OF_WORKER, + BRIDGE_OF_WORKER, + JVM_OF_WORKER, + LIBPATH_OF_WORKER, + CMD_LINE_OF_WORKER, + NATIVE_LIB_OF_WORKER, + NULL +}; + int jk_is_unique_property(const char *prp_name) { const char **props = &unique_properties[0]; + while (*props) { + if (jk_is_some_property(prp_name, *props)) + return JK_TRUE; + props++; + } + return JK_FALSE; +} + +int jk_is_deprecated_property(const char *prp_name) +{ + const char **props = &deprecated_properties[0]; while (*props) { if (jk_is_some_property(prp_name, *props)) return JK_TRUE; Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?rev=411539&r1=411538&r2=411539&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_util.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_util.h Sun Jun 4 01:44:19 2006 @@ -55,6 +55,8 @@ int jk_get_worker_cache_size(jk_map_t *m, const char *wname, int def); +int jk_get_worker_cache_size_min(jk_map_t *m, const char *wname, int def); + int jk_get_worker_socket_timeout(jk_map_t *m, const char *wname, int def); int jk_get_worker_socket_buffer(jk_map_t *m, const char *wname, int def); @@ -136,6 +138,8 @@ int jk_is_cmd_line_poperty(const char *prp_name); int jk_is_unique_property(const char *prp_name); + +int jk_is_deprecated_property(const char *prp_name); int jk_get_worker_stdout(jk_map_t *m, const char *wname, const char **stdout_name); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org