svn commit: r1342473 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/
Locked
 
|
Author: kkolinko
Date: Thu May 24 23:02:12 2012 New Revision: 1342473 URL: http://svn.apache.org/viewvc?rev=1342473&view=rev Log: Merged revision 1342320 from tomcat/trunk: Simplify. The "req" argument in processSendfile() is always true, and it is no more used since r1340215 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1342320 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1342473&r1=1342472&r2=1342473&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu May 24 23:02:12 2012 @@ -284,7 +284,7 @@ public class Http11NioProcessor extends socketWrapper.getSocket().getPoller().getSelector()); //do the first write on this thread, might as well openSocket = socketWrapper.getSocket().getPoller().processSendfile(key, - (KeyAttachment) socketWrapper, true, true); + (KeyAttachment) socketWrapper, true); return true; } return false; Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1342473&r1=1342472&r2=1342473&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu May 24 23:02:12 2012 @@ -1230,7 +1230,7 @@ public class NioEndpoint extends Abstrac NioChannel channel = attachment.getChannel(); if (sk.isReadable() || sk.isWritable() ) { if ( attachment.getSendfileData() != null ) { - processSendfile(sk,attachment,true, false); + processSendfile(sk,attachment, false); } else if ( attachment.getComet() ) { //check if thread is available if ( isWorkerAvailable() ) { @@ -1276,7 +1276,7 @@ public class NioEndpoint extends Abstrac return result; } - public boolean processSendfile(SelectionKey sk, KeyAttachment attachment, boolean reg, boolean event) { + public boolean processSendfile(SelectionKey sk, KeyAttachment attachment, boolean event) { NioChannel sc = null; try { unreg(sk, attachment, sk.readyOps()); --------------------------------------------------------------------- To unsubscribe, e-mail: [hidden email] For additional commands, e-mail: [hidden email] |
RE: svn commit: r1342473 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/
|
Changing a public API method is something I would do for trunk. I'm not sure about a .28 release that is considered stable.
Filip > -----Original Message----- > From: [hidden email] [mailto:[hidden email]] > Sent: Thursday, May 24, 2012 5:02 PM > To: [hidden email] > Subject: svn commit: r1342473 - in /tomcat/tc7.0.x/trunk: ./ > java/org/apache/coyote/http11/Http11NioProcessor.java > java/org/apache/tomcat/util/net/NioEndpoint.java > > Author: kkolinko > Date: Thu May 24 23:02:12 2012 > New Revision: 1342473 > > URL: http://svn.apache.org/viewvc?rev=1342473&view=rev > Log: > Merged revision 1342320 from tomcat/trunk: > Simplify. > The "req" argument in processSendfile() is always true, and it is no > more used since r1340215 > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > va > > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > > Propchange: tomcat/tc7.0.x/trunk/ > ------------------------------------------------------------------------ > ------ > Merged /tomcat/trunk:r1342320 > > Modified: > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > va > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote > /http11/Http11NioProcessor.java?rev=1342473&r1=1342472&r2=1342473&view=d > iff > ======================================================================== > ====== > --- > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > va (original) > +++ > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > va Thu May 24 23:02:12 2012 > @@ -284,7 +284,7 @@ public class Http11NioProcessor extends > > socketWrapper.getSocket().getPoller().getSelector()); > //do the first write on this thread, might as well > openSocket = > socketWrapper.getSocket().getPoller().processSendfile(key, > - (KeyAttachment) socketWrapper, true, true); > + (KeyAttachment) socketWrapper, true); > return true; > } > return false; > > Modified: > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat > /util/net/NioEndpoint.java?rev=1342473&r1=1342472&r2=1342473&view=diff > ======================================================================== > ====== > --- > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > (original) > +++ > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > Thu May 24 23:02:12 2012 > @@ -1230,7 +1230,7 @@ public class NioEndpoint extends Abstrac > NioChannel channel = attachment.getChannel(); > if (sk.isReadable() || sk.isWritable() ) { > if ( attachment.getSendfileData() != null ) { > - processSendfile(sk,attachment,true, false); > + processSendfile(sk,attachment, false); > } else if ( attachment.getComet() ) { > //check if thread is available > if ( isWorkerAvailable() ) { > @@ -1276,7 +1276,7 @@ public class NioEndpoint extends Abstrac > return result; > } > > - public boolean processSendfile(SelectionKey sk, KeyAttachment > attachment, boolean reg, boolean event) { > + public boolean processSendfile(SelectionKey sk, KeyAttachment > attachment, boolean event) { > NioChannel sc = null; > try { > unreg(sk, attachment, sk.readyOps()); > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [hidden email] > For additional commands, e-mail: [hidden email] --------------------------------------------------------------------- To unsubscribe, e-mail: [hidden email] For additional commands, e-mail: [hidden email] |
Re: svn commit: r1342473 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/
|
2012/5/30 Filip Hanik (mailing lists) <[hidden email]>:
> Changing a public API method is something I would do for trunk. I'm not sure about a .28 release that is considered stable. "API Stability" section of RELEASE-NOTES.txt says those are our internals and "may change without notice between point releases". Is there a scenario when 3-rd party code would call that method, that we may be concerned of? This processSendfile() method is undocumented and it feels tightly coupled with processing done elsewhere, and that overall feels like internals. I will add @deprecated version of processSendfile() method in NioEndpoint that will ignore one of its parameters and call the correct one. It feels waste, but it is not much to code. Thank you for review. Best regards, Konstantin Kolinko >> -----Original Message----- >> From: [hidden email] [mailto:[hidden email]] >> Sent: Thursday, May 24, 2012 5:02 PM >> To: [hidden email] >> Subject: svn commit: r1342473 - in /tomcat/tc7.0.x/trunk: ./ >> java/org/apache/coyote/http11/Http11NioProcessor.java >> java/org/apache/tomcat/util/net/NioEndpoint.java >> >> Author: kkolinko >> Date: Thu May 24 23:02:12 2012 >> New Revision: 1342473 >> >> URL: http://svn.apache.org/viewvc?rev=1342473&view=rev >> Log: >> Merged revision 1342320 from tomcat/trunk: >> Simplify. >> The "req" argument in processSendfile() is always true, and it is no >> more used since r1340215 >> >> Modified: >> tomcat/tc7.0.x/trunk/ (props changed) >> >> tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja >> va >> >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java >> >> Propchange: tomcat/tc7.0.x/trunk/ >> ------------------------------------------------------------------------ >> ------ >> Merged /tomcat/trunk:r1342320 >> >> Modified: >> tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja >> va >> URL: >> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote >> /http11/Http11NioProcessor.java?rev=1342473&r1=1342472&r2=1342473&view=d >> iff >> ======================================================================== >> ====== >> --- >> tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja >> va (original) >> +++ >> tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja >> va Thu May 24 23:02:12 2012 >> @@ -284,7 +284,7 @@ public class Http11NioProcessor extends >> >> socketWrapper.getSocket().getPoller().getSelector()); >> //do the first write on this thread, might as well >> openSocket = >> socketWrapper.getSocket().getPoller().processSendfile(key, >> - (KeyAttachment) socketWrapper, true, true); >> + (KeyAttachment) socketWrapper, true); >> return true; >> } >> return false; >> >> Modified: >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java >> URL: >> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat >> /util/net/NioEndpoint.java?rev=1342473&r1=1342472&r2=1342473&view=diff >> ======================================================================== >> ====== >> --- >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java >> (original) >> +++ >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java >> Thu May 24 23:02:12 2012 >> @@ -1230,7 +1230,7 @@ public class NioEndpoint extends Abstrac >> NioChannel channel = attachment.getChannel(); >> if (sk.isReadable() || sk.isWritable() ) { >> if ( attachment.getSendfileData() != null ) { >> - processSendfile(sk,attachment,true, false); >> + processSendfile(sk,attachment, false); >> } else if ( attachment.getComet() ) { >> //check if thread is available >> if ( isWorkerAvailable() ) { >> @@ -1276,7 +1276,7 @@ public class NioEndpoint extends Abstrac >> return result; >> } >> >> - public boolean processSendfile(SelectionKey sk, KeyAttachment >> attachment, boolean reg, boolean event) { >> + public boolean processSendfile(SelectionKey sk, KeyAttachment >> attachment, boolean event) { >> NioChannel sc = null; >> try { >> unreg(sk, attachment, sk.readyOps()); >> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [hidden email] >> For additional commands, e-mail: [hidden email] > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [hidden email] > For additional commands, e-mail: [hidden email] > --------------------------------------------------------------------- To unsubscribe, e-mail: [hidden email] For additional commands, e-mail: [hidden email] |
RE: svn commit: r1342473 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/
|
|
Yes, I only bring it up cause I feel we already change way to much in point
releases. Even at 7.0.27 do we have stability issues, and that is not something that happened with v5 and v6 where I felt we had a bit more stability that late into the releases. I feel that in trunk, that is where we continue development. Tomcat is known for stabilizing it's product with very little changes that late in the a release. Tomcat 7 has been far more volatile that I am used to. We have a trunk for that exact purpose, to clean up, to improve and to change API's. Filip > -----Original Message----- > From: Konstantin Kolinko [mailto:[hidden email]] > Sent: Wednesday, May 30, 2012 3:36 PM > To: Tomcat Developers List > Subject: Re: svn commit: r1342473 - in /tomcat/tc7.0.x/trunk: ./ > java/org/apache/coyote/http11/Http11NioProcessor.java > java/org/apache/tomcat/util/net/NioEndpoint.java > > 2012/5/30 Filip Hanik (mailing lists) <[hidden email]>: > > Changing a public API method is something I would do for trunk. I'm > not sure about a .28 release that is considered stable. > > "API Stability" section of RELEASE-NOTES.txt says those are our > internals and "may change without notice between point releases". > > Is there a scenario when 3-rd party code would call that method, that > we may be concerned of? > > This processSendfile() method is undocumented and it feels tightly > coupled with processing done elsewhere, and that overall feels like > internals. > > I will add @deprecated version of processSendfile() method in > NioEndpoint that will ignore one of its parameters and call the > correct one. It feels waste, but it is not much to code. > > Thank you for review. > > > Best regards, > Konstantin Kolinko > > >> -----Original Message----- > >> From: [hidden email] [mailto:[hidden email]] > >> Sent: Thursday, May 24, 2012 5:02 PM > >> To: [hidden email] > >> Subject: svn commit: r1342473 - in /tomcat/tc7.0.x/trunk: ./ > >> java/org/apache/coyote/http11/Http11NioProcessor.java > >> java/org/apache/tomcat/util/net/NioEndpoint.java > >> > >> Author: kkolinko > >> Date: Thu May 24 23:02:12 2012 > >> New Revision: 1342473 > >> > >> URL: http://svn.apache.org/viewvc?rev=1342473&view=rev > >> Log: > >> Merged revision 1342320 from tomcat/trunk: > >> Simplify. > >> The "req" argument in processSendfile() is always true, and it is no > >> more used since r1340215 > >> > >> Modified: > >> tomcat/tc7.0.x/trunk/ (props changed) > >> > >> > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > >> va > >> > >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > >> > >> Propchange: tomcat/tc7.0.x/trunk/ > >> --------------------------------------------------------------------- > --- > >> ------ > >> Merged /tomcat/trunk:r1342320 > >> > >> Modified: > >> > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > >> va > >> URL: > >> > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote > >> > /http11/Http11NioProcessor.java?rev=1342473&r1=1342472&r2=1342473&view=d > >> iff > >> > ======================================================================== > >> ====== > >> --- > >> > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > >> va (original) > >> +++ > >> > tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.ja > >> va Thu May 24 23:02:12 2012 > >> @@ -284,7 +284,7 @@ public class Http11NioProcessor extends > >> > >> socketWrapper.getSocket().getPoller().getSelector()); > >> //do the first write on this thread, might as well > >> openSocket = > >> socketWrapper.getSocket().getPoller().processSendfile(key, > >> - (KeyAttachment) socketWrapper, true, true); > >> + (KeyAttachment) socketWrapper, true); > >> return true; > >> } > >> return false; > >> > >> Modified: > >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > >> URL: > >> > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat > >> > /util/net/NioEndpoint.java?rev=1342473&r1=1342472&r2=1342473&view=diff > >> > ======================================================================== > >> ====== > >> --- > >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > >> (original) > >> +++ > >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java > >> Thu May 24 23:02:12 2012 > >> @@ -1230,7 +1230,7 @@ public class NioEndpoint extends Abstrac > >> NioChannel channel = attachment.getChannel(); > >> if (sk.isReadable() || sk.isWritable() ) { > >> if ( attachment.getSendfileData() != null ) > { > >> - processSendfile(sk,attachment,true, > false); > >> + processSendfile(sk,attachment, false); > >> } else if ( attachment.getComet() ) { > >> //check if thread is available > >> if ( isWorkerAvailable() ) { > >> @@ -1276,7 +1276,7 @@ public class NioEndpoint extends Abstrac > >> return result; > >> } > >> > >> - public boolean processSendfile(SelectionKey sk, > KeyAttachment > >> attachment, boolean reg, boolean event) { > >> + public boolean processSendfile(SelectionKey sk, > KeyAttachment > >> attachment, boolean event) { > >> NioChannel sc = null; > >> try { > >> unreg(sk, attachment, sk.readyOps()); > >> > >> > >> > >> --------------------------------------------------------------------- > >> To unsubscribe, e-mail: [hidden email] > >> For additional commands, e-mail: [hidden email] > > > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [hidden email] > > For additional commands, e-mail: [hidden email] > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [hidden email] > For additional commands, e-mail: [hidden email] --------------------------------------------------------------------- To unsubscribe, e-mail: [hidden email] For additional commands, e-mail: [hidden email] |
«
Return to Tomcat - Dev
|
1 view|%1 views
Loading...
| Powered by Nabble | Edit this page |