Re: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java

[Remy Maucherat]

[EMAIL PROTECTED] wrote:

mturk   2005/05/26 11:34:50

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  Set TCP_DEFER_ACCEPT socket option. This dramatically improves
  performance on linux by more then 20% for small files because the
  accept is not fired untill data is present.


It doesn't change anything for me performance wise. It seems to add some 
robustness, so it doesn't need to be configurable.


Rémy

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

cvs commit: jakarta-tomcat-4.0/catalina/src/conf server-noexamples.xml.config

[markt]

markt   2005/05/26 14:34:48

  Modified:catalina/src/conf server-noexamples.xml.config
  Log:
  Tweak server-noexamples.xml to align it with the connector doc changes.
  
  Revision  ChangesPath
  1.10  +2 -2  
jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config
  
  Index: server-noexamples.xml.config
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- server-noexamples.xml.config  8 May 2004 17:06:47 -   1.9
  +++ server-noexamples.xml.config  26 May 2005 21:34:48 -  1.10
  @@ -79,7 +79,7 @@
   
   -->
   
  -
  +
   
   
  -
  +
   

cvs commit: jakarta-tomcat-4.0/catalina/src/conf server.xml

[markt]

markt   2005/05/26 14:32:35

  Modified:catalina/src/conf server.xml
  Log:
  Tweak server.xml to align it with the connector doc changes.
  
  Revision  ChangesPath
  1.73  +2 -2  jakarta-tomcat-4.0/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- server.xml21 Jan 2004 23:59:49 -  1.72
  +++ server.xml26 May 2005 21:32:35 -  1.73
  @@ -109,7 +109,7 @@
   
   -->
   
  -
  +
   
   
  -
  +
   

cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs tomcat-docs.xsl

[markt]

markt   2005/05/26 14:12:21

  Modified:webapps/tomcat-docs/config connectors.xml coyote.xml
http11.xml jk.xml jk2.xml project.xml webapp.xml
   webapps/tomcat-docs tomcat-docs.xsl
  Added:   webapps/tomcat-docs/config ajp13.xml coyotejk.xml
  Log:
  Improve the TC4 connector documentation
   - separate web server side connectors and tomcat side connectors for JK/AJP
   - seperate current and deprecated connectors
   - fix various typos
  
  Revision  ChangesPath
  1.5   +36 -24
jakarta-tomcat-4.0/webapps/tomcat-docs/config/connectors.xml
  
  Index: connectors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/connectors.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- connectors.xml14 Apr 2005 19:02:52 -  1.4
  +++ connectors.xml26 May 2005 21:12:20 -  1.5
  @@ -61,9 +61,10 @@
   HTTP Connectors for Tomcat 4.x
   ClientProtocolTomcat 
classNameNotes
   
  -Ancient browserHTTP/1.0
  - org.apache.catalina.connector.http10.HttpConnector
  - DeprecatedSee  HTTP/1.1
  +Modern browserHTTP/1.1
  + org.apache.coyote.tomcat4.CoyoteConnector
  + Current practiceSee  Coyote HTTP/1.1
  +
   
   
   Modern browserHTTP/1.1
  @@ -71,15 +72,33 @@
DeprecatedSee  HTTP/1.1
   
   
  -Modern browserHTTP/1.1
  - org.apache.coyote.tomcat4.CoyoteConnector
  - Current practiceSee  Coyote HTTP/1.1
  -
  +Ancient browserHTTP/1.0
  + org.apache.catalina.connector.http10.HttpConnector
  + DeprecatedSee  HTTP/1.1
   
   
  +
   Web Server Connectors
   
  -Web Server SideProtocolTomcat 
SiteNotes
  +Web Server SideProtocolTomcat 
SideNotes
  +
  +
  + JKAJP/1.3
  + CoyoteConnector with JkCoyoteHandler
  + Currentmod_jk supports load balancing.
  +Enabled by default in 4.1; works in 4.0. See JK
  +and Coyote JK.
  +
  +
  +
  +
  + mod_proxy with AJP enabledAJP/1.3
  + CoyoteConnector with JkCoyoteHandler
  + CurrentAvailable for Apache httpd 2.x and included by default 
with
  +2.2. See http://httpd.apache.org/docs-2.1/mod/mod_proxy_ajp.html";>
  +mod_proxy_ajp and Coyote JK
  +
  +
   
   
mod_jservAJP/1.2
  @@ -89,19 +108,19 @@
   
   
   
  - mod_jkAJP/1.3
  + JK2AJP/1.3
CoyoteConnector with JkCoyoteHandler
  - Currentmod_jk supports load balancing.
  -Enabled by default in 4.1; works in 4.0. See Coyote JK
  + DeprecatedEnabled by default in 4.1.
  + mod_jk2 supports in-process JVM and load balancing.
  +See JK2
   
   
   
   
  - mod_jk2AJP/1.3
  - CoyoteConnector with JkCoyoteHandler
  - DeprecatedEnabled by default in 4.1.
  - mod_jk2 supports in-process JVM and load balancing.
  -See Coyote JK
  + JK or JK2AJP/1.3
  + org.apache.ajp.tomcat4.Ajp13Connector
  + Deprecated
  +See AJP/1.3
   
   
   
  @@ -110,18 +129,11 @@
WarpConnector
DeprecatedNot for Win32; no in-process nor load balancing; 
   works in 4.x.
  -Use http://apr.apache.org/";>APR.
  +Uses http://apr.apache.org/";>APR.
   Supported Apache-2.0 and Apache-1.3).
   See Webapp
   
   
  -
  - mod_proxy with AJP enabledAJP/1.3
  - CoyoteConnector with JkCoyoteHandler
  - CurrentAvailable for Apache httd 2.x and included by default 
with
  -2.2. See Coyote JK
  -
  -
   
   
   
  
  
  
  1.11  +2 -2  jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyote.xml
  
  Index: coyote.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyote.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- coyote.xml14 Apr 2005 19:02:52 -  1.10
  +++ coyote.xml26 May 2005 21:12:20 -  1.11
  @@ -27,8 +27,8 @@
 request processing and create the response.
   
 If you wish to configure the Connector that is used
  -  for connections to web servers using the AJP protocol (such as the
  -  JK connector), see here instead.
  +  for connections to web servers using the AJP protocol see the
  +  Coyote JK Conector instead.
   
 At server startup time, this Connector will create a
 number of request processing threads (based on the value configured for
  
  
  
  1.8   +1 -1  jakarta-tomcat-4.0/webapps/tomcat-docs/config/http11.xml
  
  Index: http11.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/http11.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- http11.xml21 Feb 2005 22:54:23 -  1.7
  +++ http11.xml26 May 2005 21:12

Re: Tomcat build question

[Bill Barker]

This is a known bug with Ant 1.6.4.  See:
http://issues.apache.org/bugzilla/show_bug.cgi?id=31031
  and
http://issues.apache.org/bugzilla/show_bug.cgi?id=35061

The solution is to use a different version of Ant.

- Original Message -
From: <[EMAIL PROTECTED]>
To: 
Sent: Thursday, May 26, 2005 1:06 PM
Subject: Tomcat build question


> I am new to this list. I download the main build.xml script from
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/building.html and try to use
ant to buld it. I got an error:
>
> build.xml:717: Cannot replace directory
\usr\share\java\tomcat-deps\src\java\org\apache\tomcat\dbcp with directory
\usr\share\java\tomcat-deps\src\java\org\apache\commons
>
> Do I need modify this main build script?
>
> When I click UML sequence diagram of request process, I get errors in PDF
file too.
>
> Can anyone tell me what's wrong?
>
> Thank you
>
> James
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>



This message is intended only for the use of the person(s) listed above as the 
intended recipient(s), and may contain information that is PRIVILEGED and 
CONFIDENTIAL.  If you are not an intended recipient, you may not read, copy, or 
distribute this message or any attachment. If you received this communication 
in error, please notify us immediately by e-mail and then delete all copies of 
this message and any attachments.

In addition you should be aware that ordinary (unencrypted) e-mail sent through 
the Internet is not secure. Do not send confidential or sensitive information, 
such as social security numbers, account numbers, personal identification 
numbers and passwords, to us via ordinary (unencrypted) e-mail.


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

Re: Tomcat build question

[Ian F. Darwin]

[EMAIL PROTECTED] wrote:


I am new to this list. I download the main build.xml script from 
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/building.html and try to use 
ant to buld it. I got an error:

build.xml:717: Cannot replace directory 
\usr\share\java\tomcat-deps\src\java\org\apache\tomcat\dbcp with directory 
\usr\share\java\tomcat-deps\src\java\org\apache\commons

Do I need modify this main build script?
 


If you are using ant version 1.64, choose an earlier or later version.

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

Tomcat build question

[jamesintomcat]

I am new to this list. I download the main build.xml script from 
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/building.html and try to use 
ant to buld it. I got an error:

build.xml:717: Cannot replace directory 
\usr\share\java\tomcat-deps\src\java\org\apache\tomcat\dbcp with directory 
\usr\share\java\tomcat-deps\src\java\org\apache\commons

Do I need modify this main build script?

When I click UML sequence diagram of request process, I get errors in PDF file 
too.

Can anyone tell me what's wrong?

Thank you

James

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

DO NOT REPLY [Bug 35079] - Should be able to specify DNS lookup timeout

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=35079





--- Additional Comments From [EMAIL PROTECTED]  2005-05-26 22:03 ---
I tried placing jndi.properties in \common\classes with the new DNS
timeout settings but it did not work. Any ideas?

I don't mind patching this application-wide like you recommended, but I don't
see this working. Worse yet, I see no mention anywhere of anyone else getting it
to work, on Google.

Lastly, by handling the issue directly in Tomcat, we'd be addressing it in a
portable manner which I think might be quite appropriate given the fact that
this isn't standardized or adequetly handled at any other level at this point.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 29777] - HttpServletRequest#getParameterNames problem

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=29777


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 OS/Version|Solaris |All
 Resolution||WONTFIX
Version|4.1.30  |4.1.31




--- Additional Comments From [EMAIL PROTECTED]  2005-05-26 21:50 ---
I have done some testing and I can repeat this on both Linux and Win32.

The bug is in the parameter handling of the
org.apache.ajp.tomcat4.Ajp13Connector connector, as you correctly point out. The
fix is to use the newer org.apache.coyote.tomcat4.CoyoteConnector connector with
the org.apache.jk.server.JkCoyoteHandler

The connector documentation is not as clear about which connectors are
deprecated and which are not and as a result I have re-written large chunks of
the documentation as a result.

I will update the website soon, but I need to filter out changes in the docs
that relate to features implemented post 4.1.31 first.

Since the connector with the bug is deprecated, this bug is WONTFIX.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java

[mturk]

mturk   2005/05/26 11:34:50

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  Set TCP_DEFER_ACCEPT socket option. This dramatically improves
  performance on linux by more then 20% for small files because the
  accept is not fired untill data is present.
  
  Revision  ChangesPath
  1.35  +4 -0  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- AprEndpoint.java  26 May 2005 15:29:55 -  1.34
  +++ AprEndpoint.java  26 May 2005 18:34:50 -  1.35
  @@ -407,6 +407,10 @@
   log.warn(sm.getString("endpoint.sendfile.nosupport"));
   useSendfile = false;
   }
  +
  +// Delay accepting of new connections until data is available
  +// TODO: Make that configurable   
  + Socket.optSet(serverSock, Socket.APR_TCP_DEFER_ACCEPT, 1);
   
   initialized = true;
   
  
  
  

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

DO NOT REPLY [Bug 35079] - Should be able to specify DNS lookup timeout

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=35079


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |NEEDINFO




--- Additional Comments From [EMAIL PROTECTED]  2005-05-26 20:04 ---
IMHO, adding a DNS Provider to Tomcat is outside the scope of the project.  
It's very unlikely to be implemented in any case without a patch.

If you are using Sun's default DNS Provider, you need to configure this at the 
OS level.  You could also try googling to see if any of the ones floating 
around meet your needs.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

cvs commit: jakarta-tomcat-site/xdocs/stylesheets project.xml

[yoavs]

yoavs   2005/05/26 10:28:13

  Modified:docs bugreport.html index.html irc.html resources.html
   xdocs/stylesheets project.xml
  Log:
  Using updatd download pages, not direct links to archive.apache.org.
  
  Revision  ChangesPath
  1.33  +10 -10jakarta-tomcat-site/docs/bugreport.html
  
  Index: bugreport.html
  ===
  RCS file: /home/cvs/jakarta-tomcat-site/docs/bugreport.html,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- bugreport.html16 May 2005 11:19:38 -  1.32
  +++ bugreport.html26 May 2005 17:28:13 -  1.33
  @@ -33,7 +33,7 @@
   
   
   
  -Tomcat
  +Apache Tomcat
   
   
   
  @@ -57,16 +57,16 @@
   
   
   
  -Tomcat 5.5
  +Apache Tomcat 5.5
   
   
  -Tomcat 5.0
  +Apache Tomcat 5.0
   
   
  -Tomcat 4.1
  +Apache Tomcat 4.1
   
   
  -Tomcat 3.3
  +Apache Tomcat 3.3
   
   
   
  @@ -77,13 +77,13 @@
   http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Current 
Releases
   
   
  -http://archive.apache.org/dist/jakarta/tomcat-5/";>Tomcat 5.x
  +http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Apache 
Tomcat 5.x
   
   
  -http://archive.apache.org/dist/jakarta/tomcat-4/";>Tomcat 4.x
  +http://jakarta.apache.org/site/downloads/downloads_tomcat-4.cgi";>Apache 
Tomcat 4.x
   
   
  -http://archive.apache.org/dist/jakarta/tomcat-3/";>Tomcat 3.x
  +http://jakarta.apache.org/site/downloads/downloads_tomcat-3.cgi";>Apache 
Tomcat 3.x
   
   
   
  @@ -91,10 +91,10 @@
   
   
   
  -Tomcat 4.0
  +Apache Tomcat 4.0
   
   
  -Tomcat 3.2
  +Apache Tomcat 3.2
   
   
   
  
  
  
  1.80  +3 -3  jakarta-tomcat-site/docs/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- index.html16 May 2005 11:19:38 -  1.79
  +++ index.html26 May 2005 17:28:13 -  1.80
  @@ -79,13 +79,13 @@
   http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Current 
Releases
   
   
  -http://archive.apache.org/dist/jakarta/tomcat-5/";>Apache Tomcat 
5.x
  +http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Apache 
Tomcat 5.x
   
   
  -http://archive.apache.org/dist/jakarta/tomcat-4/";>Apache Tomcat 
4.x
  +http://jakarta.apache.org/site/downloads/downloads_tomcat-4.cgi";>Apache 
Tomcat 4.x
   
   
  -http://archive.apache.org/dist/jakarta/tomcat-3/";>Apache Tomcat 
3.x
  +http://jakarta.apache.org/site/downloads/downloads_tomcat-3.cgi";>Apache 
Tomcat 3.x
   
   
   
  
  
  
  1.31  +10 -10jakarta-tomcat-site/docs/irc.html
  
  Index: irc.html
  ===
  RCS file: /home/cvs/jakarta-tomcat-site/docs/irc.html,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- irc.html  16 May 2005 11:19:38 -  1.30
  +++ irc.html  26 May 2005 17:28:13 -  1.31
  @@ -33,7 +33,7 @@
   
   
   
  -Tomcat
  +Apache Tomcat
   
   
   
  @@ -57,16 +57,16 @@
   
   
   
  -Tomcat 5.5
  +Apache Tomcat 5.5
   
   
  -Tomcat 5.0
  +Apache Tomcat 5.0
   
   
  -Tomcat 4.1
  +Apache Tomcat 4.1
   
   
  -Tomcat 3.3
  +Apache Tomcat 3.3
   
   
   
  @@ -77,13 +77,13 @@
   http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Current 
Releases
   
   
  -http://archive.apache.org/dist/jakarta/tomcat-5/";>Tomcat 5.x
  +http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Apache 
Tomcat 5.x
   
   
  -http://archive.apache.org/dist/jakarta/tomcat-4/";>Tomcat 4.x
  +http://jakarta.apache.org/site/downloads/downloads_tomcat-4.cgi";>Apache 
Tomcat 4.x
   
   
  -http://archive.apache.org/dist/jakarta/tomcat-3/";>Tomcat 3.x
  +http://jakarta.apache.org/site/downloads/downloads_tomcat-3.cgi";>Apache 
Tomcat 3.x
   
   
   
  @@ -91,10 +91,10 @@
   
   
   
  -Tomcat 4.0
  +Apache Tomcat 4.0
   
   
  -Tomcat 3.2
  +Apache Tomcat 3.2
   
   
   
  
  
  
  1.36  +10 -10jakarta-tomcat-site/docs/resources.html
  
  Index: resources.html
  ===
  RCS file: /home/cvs/jakarta-tomcat-site/docs/resources.html,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- resources.html16 May 2005 11:19:38 -  1.35
  +++ resources.html26 May 2005 17:28:13 -  1.36
  @@ -33,7 +33,7 @@
   
   
   
  -Tomcat
  +Apache Tomcat
   
   
   
  @@ -57,16 +57,16 @@
   
   
   
  -Tomcat 5.5
  +Apache Tomcat 5.5
   
   
  -Tomcat 5.0
  +Apache Tomcat 5.0
   
   
  -Tomcat 4.1
  +Apache Tomcat 4.1
   
   
  -Tomcat 3.3
  +Apache Tomcat 3.3
   
   
   
  @@ -77,13 +77,13 @@
   http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Current 
Releases
   
   
  -http://archive

Re: AjpAprProtocol.java

[Remy Maucherat]

Tim Funk wrote:

Is there such a class as org.apache.coyote.ajp.AjpAprProtocol?


It's an APR version of AJP, not done yet.

Rémy

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

AjpAprProtocol.java

[Tim Funk]

Is there such a class as org.apache.coyote.ajp.AjpAprProtocol?

I see a reference in org.apache.catalina.connector.Connector to this class 
but nothing else.




-Tim

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

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java

[funkman]

funkman 2005/05/26 08:29:55

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  bonehead move - I don't need to concatenate an empty string to a string
  
  Revision  ChangesPath
  1.34  +1 -1  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- AprEndpoint.java  26 May 2005 15:21:04 -  1.33
  +++ AprEndpoint.java  26 May 2005 15:29:55 -  1.34
  @@ -390,7 +390,7 @@
   if (address == null) {
   addressStr = null;
   } else {
  -addressStr = "" + address.getHostAddress();
  +addressStr = address.getHostAddress();
   }
   long inetAddress = Address.info(addressStr, Socket.APR_INET,
   port, 0, rootPool);
  
  
  

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

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java

[funkman]

funkman 2005/05/26 08:21:04

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  String concatentation (of InetAddress) doesn't work to bind to
  specific IP address
  
  Revision  ChangesPath
  1.33  +17 -17
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- AprEndpoint.java  26 May 2005 14:43:09 -  1.32
  +++ AprEndpoint.java  26 May 2005 15:21:04 -  1.33
  @@ -43,10 +43,10 @@
* Sendfile thread
* Worker threads pool
* 
  - * 
  - * When switching to Java 5, there's an opportunity to use the virtual 
  + *
  + * When switching to Java 5, there's an opportunity to use the virtual
* machine's thread pool.
  - * 
  + *
* @author Mladen Turk
* @author Remy Maucherat
*/
  @@ -390,7 +390,7 @@
   if (address == null) {
   addressStr = null;
   } else {
  -addressStr = "" + address;
  +addressStr = "" + address.getHostAddress();
   }
   long inetAddress = Address.info(addressStr, Socket.APR_INET,
   port, 0, rootPool);
  @@ -401,12 +401,12 @@
   Socket.bind(serverSock, inetAddress);
   // Start listening on the server socket
   Socket.listen(serverSock, backlog);
  -
  +
   // Sendfile usage on systems which don't support it cause major 
problems
   if (useSendfile && !Library.APR_HAS_SENDFILE) {
   log.warn(sm.getString("endpoint.sendfile.nosupport"));
   useSendfile = false;
  -} 
  +}
   
   initialized = true;
   
  @@ -463,7 +463,7 @@
   
   
   /**
  - * Resume the endpoint, which will make it start accepting new sockets 
  + * Resume the endpoint, which will make it start accepting new sockets
* again.
*/
   public void resume() {
  @@ -472,7 +472,7 @@
   }
   }
   
  -
  +
   /**
* Stop the endpoint. This will cause all processing threads to stop.
*/
  @@ -795,13 +795,13 @@
* be added to a temporary array, and polled first after a maximum 
amount
* of time equal to pollTime (in most cases, latency will be much 
lower,
* however).
  - * 
  + *
* @param socket to add to the poller
* @param pool reprenting the memory used for the socket
*/
   public void add(long socket, long pool) {
   synchronized (addS) {
  -// Add socket to the list. Newly added sockets will wait 
  +// Add socket to the list. Newly added sockets will wait
   // at most for pollTime before being polled
   if (addCount >= addS.length) {
   // Can't do anything: close the socket right away
  @@ -1108,11 +1108,11 @@
   /**
* Add the sendfile data to the sendfile poller. Note that in most 
cases,
* the initial non blocking calls to sendfile will return right 
away, and
  - * will be handled asynchronously inside the kernel. As a result, 
  + * will be handled asynchronously inside the kernel. As a result,
* the poller will never be used.
  - * 
  + *
* @param data containing the reference to the data which should be 
snet
  - * @return true if all the data has been sent right away, and false 
  + * @return true if all the data has been sent right away, and false
*  otherwise
*/
   public boolean add(SendfileData data) {
  @@ -1135,7 +1135,7 @@
   return false;
   } else {
   // Break the loop and add the socket to poller.
  -break;
  +break;
   }
   } else {
   data.pos = data.pos + nw;
  @@ -1152,7 +1152,7 @@
   log.error(sm.getString("endpoint.sendfile.error"), e);
   return false;
   }
  -// Add socket to the list. Newly added sockets will wait 
  +// Add socket to the list. Newly added sockets will wait
   // at most for pollTime before being polled
   synchronized (addS) {
   addS.add(sendfileData);
  @@ -1163,7 +1163,7 @@
   
   /**
* Remove socket from the poller.
  - * 
  + *
* @param data the sendfile data which should be removed
*/
   protected void remove(SendfileData data) {
  @@ -

Re: cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProtocol.java

[Remy Maucherat]

[EMAIL PROTECTED] wrote:

remm2005/05/26 07:43:10

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
   http11/src/java/org/apache/coyote/http11
Http11AprProtocol.java
  Log:
  - Allow configuring pollTime.
  - Use wait/notify for the poller.


/usr/sbin/ab.exe -n 2 -c 20 -k http://127.0.0.1:8080/tomcat.gif with 
the different configuration options that I added.
I used JDK 1.4.2 client, since it's easier. JDK 5 server gives closer 
results for the last two (slightly faster JNI, I guess).


Right now, with localhost testing (no gigabit here, so no other solution):
a) APR with firstReadTimeout="0" pollTime="2000" (= all keepalive 
requests go to the poller without any blocking read; note: the default 
"5000" pollTime is a few %s slower - more latency - but will probably 
save a little CPU): 6100 req/s

b) default APR settings: 7700 req/s
c) regular connector: 8000 req/s

Rémy

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

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProtocol.java

[remm]

remm2005/05/26 07:43:10

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
   http11/src/java/org/apache/coyote/http11
Http11AprProtocol.java
  Log:
  - Allow configuring pollTime.
  - Use wait/notify for the poller.
  
  Revision  ChangesPath
  1.32  +8 -2  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- AprEndpoint.java  26 May 2005 09:06:16 -  1.31
  +++ AprEndpoint.java  26 May 2005 14:43:09 -  1.32
  @@ -811,6 +811,7 @@
   addS[addCount] = socket;
   addP[addCount] = pool;
   addCount++;
  +addS.notify();
   }
   }
   
  @@ -834,7 +835,9 @@
   
   while (keepAliveCount < 1 && addCount < 1) {
   try {
  -Thread.sleep(10);
  +synchronized (addS) {
  +addS.wait();
  +}
   } catch (InterruptedException e) {
   // Ignore
   }
  @@ -1153,6 +1156,7 @@
   // at most for pollTime before being polled
   synchronized (addS) {
   addS.add(sendfileData);
  +addS.notify();
   }
   return false;
   }
  @@ -1192,7 +1196,9 @@
   
   while (sendfileCount < 1 && addS.size() < 1) {
   try {
  -Thread.sleep(10);
  +synchronized (addS) {
  +addS.wait();
  +}
   } catch (InterruptedException e) {
   // Ignore
   }
  
  
  
  1.7   +9 -0  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
  
  Index: Http11AprProtocol.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Http11AprProtocol.java25 May 2005 10:39:28 -  1.6
  +++ Http11AprProtocol.java26 May 2005 14:43:09 -  1.7
  @@ -287,6 +287,15 @@
   setAttribute("firstReadTimeout", "" + i);
   }
   
  +public int getPollTime() {
  +return ep.getPollTime();
  +}
  +
  +public void setPollTime( int i ) {
  +ep.setPollTime(i);
  +setAttribute("pollTime", "" + i);
  +}
  +
   public boolean getUseSendfile() {
   return ep.getUseSendfile();
   }
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c

[mturk]

mturk   2005/05/26 07:39:37

  Modified:jk/native/common jk_connect.c
  Log:
  Add nonblocking detection for socket connections from pre 1.2.8
  for non winsock platform.
  Also check for EAGAIN while reading data.
  Thanks to Kresimir Kukulj and his intensive testing for transient errors.
  
  Revision  ChangesPath
  1.60  +34 -7 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
  
  Index: jk_connect.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- jk_connect.c  13 May 2005 08:23:11 -  1.59
  +++ jk_connect.c  26 May 2005 14:39:37 -  1.60
  @@ -552,7 +552,7 @@
   #else
   wr = write(sd, b + sent, len - sent);
   #endif
  -} while (wr == -1 && errno == EINTR);
  +} while (wr == -1 && (errno == EINTR || errno == EAGAIN));
   
   if (wr == -1)
   return (errno > 0) ? -errno : errno;
  @@ -587,7 +587,7 @@
   #else
   rd = read(sd, (char *)b + rdlen, len - rdlen);
   #endif
  -} while (rd == -1 && errno == EINTR);
  +} while (rd == -1 && (errno == EINTR || errno == EAGAIN));
   
   if (rd == -1)
   return (errno > 0) ? -errno : errno;
  @@ -615,6 +615,7 @@
   return buf;
   }
   
  +#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
   int jk_is_socket_connected(int sd)
   {
   fd_set fd;
  @@ -629,15 +630,41 @@
   tv.tv_usec = 1;
   
   /* If we get a timeout, then we are still connected */
  -if ((rc = select(1, &fd, NULL, NULL, &tv)) == 0)
  +if ((rc = select(1, &fd, NULL, NULL, &tv)) == 0) {
  +errno = 0;
   return 1;
  +}
   else {
  -#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
   if (rc == SOCKET_ERROR)
   errno = WSAGetLastError() - WSABASEERR;
   else
  -errno = 0;
  -#endif
  +errno = EOF;
   return 0;
   }
   }
  +#else
  +int jk_is_socket_connected(int sd)
  +{
  +char test_buffer[1];
  +int  rd;
  +int  saved_errno;
  +
  +errno = 0;
  +/* Set socket to nonblocking */
  +if (sononblock(sd) != 0)
  +return 0;
  +do {
  +rd = read(sd, test_buffer, 1);
  +} while (rd == -1 && errno == EINTR);
  +saved_errno = errno;
  +soblock(sd);
  +if (rd == -1 && saved_errno == EWOULDBLOCK) {
  +errno = 0;
  +return 1;
  +}
  +else {
  +errno = saved_errno ? saved_errno : EOF;
  +return 0;
  +}
  +}
  +#endif
  
  
  

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

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c

[mturk]

mturk   2005/05/26 07:36:14

  Modified:jk/native/common jk_ajp_common.c
  Log:
  Simplify cping/cpong input event.
  Set default socket buffer size to 8K.
  
  Revision  ChangesPath
  1.119 +19 -12
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
  
  Index: jk_ajp_common.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- jk_ajp_common.c   19 May 2005 10:14:29 -  1.118
  +++ jk_ajp_common.c   26 May 2005 14:36:14 -  1.119
  @@ -766,27 +766,34 @@
   static int ajp_is_input_event(ajp_endpoint_t * ae, int timeout, jk_logger_t 
*l)
   {
   fd_set rset;
  -fd_set eset;
   struct timeval tv;
   int rc;
   
   FD_ZERO(&rset);
  -FD_ZERO(&eset);
   FD_SET(ae->sd, &rset);
  -FD_SET(ae->sd, &eset);
  -
   tv.tv_sec = timeout / 1000;
   tv.tv_usec = (timeout % 1000) * 1000;
   
  -rc = select(ae->sd + 1, &rset, NULL, &eset, &tv);
  -
  -if ((rc < 0) || (FD_ISSET(ae->sd, &eset))) {
  +do {
  +rc = select(ae->sd + 1, &rset, NULL, NULL, &tv);
  +} while (rc < 0 && errno == EINTR);
  +
  +if (rc == 0) {
  +/* Timeout. Set the errno to timeout */
  +#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
  +errno = WSAETIMEDOUT - WSABASEERR;
  +#else
  +errno = ETIMEDOUT;
  +#endif
  +return JK_FALSE;
  +}
  +else if (rc < 0) {
   jk_log(l, JK_LOG_WARNING,
  -   "error during select [%d]", rc);
  +   "error during select err=%d", errno);
   return JK_FALSE;
   }
  -
  -return ((FD_ISSET(ae->sd, &rset)) ? JK_TRUE : JK_FALSE);
  +else
  +return JK_TRUE;
   }
   
   
  @@ -1880,7 +1887,7 @@
   jk_get_worker_socket_timeout(props, p->name, 
AJP_DEF_SOCKET_TIMEOUT);
   
   p->socket_buf =
  -jk_get_worker_socket_buffer(props, p->name, 512);
  +jk_get_worker_socket_buffer(props, p->name, 8192);
   
   p->keepalive =
   jk_get_worker_socket_keepalive(props, p->name, JK_FALSE);
  
  
  

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

DO NOT REPLY [Bug 35090] New: - Documentation typo

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=35090

   Summary: Documentation typo
   Product: Tomcat 5
   Version: Unknown
  Platform: All
   URL: http://jakarta.apache.org/tomcat/tomcat-5.0-
doc/index.html
OS/Version: All
Status: NEW
  Severity: trivial
  Priority: P2
 Component: Unknown
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


On the page mentioned above you find "JK Documenation" that obviously should
read "JK Documentation"

Greetings,

Martin

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProcessor.java

[remm]

remm2005/05/26 02:06:16

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
   http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java
  Log:
  - Allow using a firstRead value <= 0 to specify to always use the poller for
keepalive. The first request processed by the processor will always wait a
little before going back to the poller.
  - Also use 5ms instead of 100ms for pollTime (it doesn't seem to have any
performance impact, or it's just that my computer is fast). 1ms does have a
(very small) performance impact, however.
  
  Revision  ChangesPath
  1.31  +1 -1  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- AprEndpoint.java  23 May 2005 06:04:02 -  1.30
  +++ AprEndpoint.java  26 May 2005 09:06:16 -  1.31
  @@ -255,7 +255,7 @@
* Poll interval, in microseconds. The smaller the value, the more CPU 
the poller
* will use, but the more responsive to activity it will be.
*/
  -protected int pollTime = 10;
  +protected int pollTime = 5000;
   public int getPollTime() { return pollTime; }
   public void setPollTime(int pollTime) { this.pollTime = pollTime; }
   
  
  
  
  1.14  +12 -4 
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
  
  Index: Http11AprProcessor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Http11AprProcessor.java   25 May 2005 12:45:38 -  1.13
  +++ Http11AprProcessor.java   26 May 2005 09:06:16 -  1.14
  @@ -77,8 +77,12 @@
   this.endpoint = endpoint;
   
   request = new Request();
  -inputBuffer = new InternalAprInputBuffer(request, headerBufferSize, 
  -endpoint.getFirstReadTimeout());
  +int readTimeout = endpoint.getFirstReadTimeout();
  +if (readTimeout <= 0) {
  +readTimeout = 100;
  +}
  +inputBuffer = new InternalAprInputBuffer(request, headerBufferSize,
  +readTimeout);
   request.setInputBuffer(inputBuffer);
   
   response = new Response();
  @@ -752,7 +756,10 @@
   int keepAliveLeft = maxKeepAliveRequests;
   long soTimeout = endpoint.getSoTimeout();
   
  -int limit = (endpoint.getMaxThreads() * 3) / 4;
  +int limit = 0;
  +if (endpoint.getFirstReadTimeout() > 0) {
  +limit = (endpoint.getMaxThreads() * 3) / 4;
  +}
   
   boolean keptAlive = false;
   boolean openSocket = false;
  @@ -764,7 +771,8 @@
   if( !disableUploadTimeout && keptAlive && soTimeout > 0 ) {
   Socket.timeoutSet(socket, soTimeout * 1000);
   }
  -if 
(!inputBuffer.parseRequestLine(endpoint.getCurrentThreadsBusy() > limit)) {
  +if (!inputBuffer.parseRequestLine
  +(keptAlive && (endpoint.getCurrentThreadsBusy() > 
limit))) {
   // This means that no data is available right now
   // (long keepalive), so that the processor should be 
recycled
   // and the method should return true
  
  
  

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

Re: Hybrid (NIO+Multithread, SSL enabled) architecture for Coyote

[Remy Maucherat]

Vicenc Beltran Querol wrote:

It has been a pleasure to post this information, and to receive constructive
and technically-reasoned answers like yours. Deciding which parameters
define the performance of a server is a great and never-ending discussion topic.
Anyway, feel free to send my any questions you may have about the benchmarking 
environment I've used for my experiments.


By the way, this is my last post about this topic. I've perfectly
understood Remy's messages (in the list and in my personal address), 
so I will not waste your time anymore.


The two problems were you got in a loop implying that:
a) your solution was perfect (sorry, it's a nice experiment, but it's 
perfectible)

b) your use case and test scenario was the only legitimate one

At this point, I am personally done on the issue, that's all.

Rémy

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