Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteProcessor.java

2002-03-15 Thread Remy Maucherat

 Ok, now you've got me really confused.  It looks like I should have a
single
 instance of Processor (and thus a single instance of Adapter).  At the
 moment, both are per-Thread in tomcat3.  But I can't see how this can work
 even in o.a.c.tomcat4, since the tomcat4 Adapter uses the same instance of
 req/resp for all requests.

 If (as is likely) this is just my lack of knowledge of Catalina's
threading
 model, please mention a package to look at when you blow me off. ;)

AFAIK, it's the same model than in TC 3.
1 thread - 1 processor (1 adapter + 1 processor here) - 1 req/resp.

Remy

  remm02/03/14 21:31:50
 
Modified:coyote/src/java/org/apache/coyote ActionCode.java
 coyote/src/java/org/apache/coyote/tomcat4
  CoyoteProcessor.java
Log:
- Add some start and stop actions in the (temporary) interface used
  for messaging.
- Use the actions to start and stop the processor.
 
Revision  ChangesPath
1.3   +6 -0

jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/ActionCode.java
 
Index: ActionCode.java
===
RCS file:

/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Action
 Code.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActionCode.java 1 Oct 2001 01:09:54 - 1.2
+++ ActionCode.java 15 Mar 2002 05:31:50 - 1.3
@@ -85,6 +85,12 @@
 public static final ActionCode ACTION_RESET = new ActionCode();
 
 
+public static final ActionCode ACTION_START = new ActionCode();
+
+
+public static final ActionCode ACTION_STOP = new ActionCode();
+
+
 // ---
 Constructors
 
 
 
 
 
1.14  +14 -4

jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyotePr
 ocessor.java
 
Index: CoyoteProcessor.java
===
RCS file:

/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
 4/CoyoteProcessor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CoyoteProcessor.java 14 Mar 2002 20:52:29 - 1.13
+++ CoyoteProcessor.java 15 Mar 2002 05:31:50 - 1.14
@@ -1,6 +1,6 @@
-/* * $Header:

/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
 4/CoyoteProcessor.java,v 1.13 2002/03/14 20:52:29 remm Exp $
- * $Revision: 1.13 $
- * $Date: 2002/03/14 20:52:29 $
+/* * $Header:

/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
 4/CoyoteProcessor.java,v 1.14 2002/03/15 05:31:50 remm Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/03/15 05:31:50 $
  *
  *

  *
@@ -85,6 +85,8 @@
 
 import org.apache.tomcat.util.buf.MessageBytes;
 
+import org.apache.coyote.ActionCode;
+import org.apache.coyote.ActionHook;
 import org.apache.coyote.Adapter;
 import org.apache.coyote.InputBuffer;
 import org.apache.coyote.OutputBuffer;
@@ -114,7 +116,7 @@
  *
  * @author Craig R. McClanahan
  * @author Remy Maucherat
- * @version $Revision: 1.13 $ $Date: 2002/03/14 20:52:29 $
+ * @version $Revision: 1.14 $ $Date: 2002/03/15 05:31:50 $
  */
 
 final class CoyoteProcessor
@@ -925,6 +927,10 @@
 
 threadStart();
 
+if (processor instanceof ActionHook) {
+((ActionHook) processor).action(ActionCode.ACTION_START,
 null);
+}
+
 }
 
 
@@ -940,6 +946,10 @@
 (sm.getString(coyoteProcessor.notStarted));
 lifecycle.fireLifecycleEvent(STOP_EVENT, null);
 started = false;
+
+if (processor instanceof ActionHook) {
+((ActionHook) processor).action(ActionCode.ACTION_STOP,
 null);
+}
 
 threadStop();
 
 
 
 
 
  --
  To unsubscribe, e-mail:
 mailto:[EMAIL PROTECTED]
  For additional commands, e-mail:
 mailto:[EMAIL PROTECTED]
 


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



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




Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteProcessor.java

2002-03-15 Thread Bill Barker

Yeah, my mistake was trying to read commit messages when I was in the middle
of doing something else. :-)  Just my usual confusion about the 2-state vs.
4-state Lifecycle.
- Original Message -
From: Remy Maucherat [EMAIL PROTECTED]
To: Tomcat Developers List [EMAIL PROTECTED]
Sent: Friday, March 15, 2002 1:07 AM
Subject: Re: cvs commit:
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4
CoyoteProcessor.java


  Ok, now you've got me really confused.  It looks like I should have a
 single
  instance of Processor (and thus a single instance of Adapter).  At the
  moment, both are per-Thread in tomcat3.  But I can't see how this can
work
  even in o.a.c.tomcat4, since the tomcat4 Adapter uses the same instance
of
  req/resp for all requests.
 
  If (as is likely) this is just my lack of knowledge of Catalina's
 threading
  model, please mention a package to look at when you blow me off. ;)

 AFAIK, it's the same model than in TC 3.
 1 thread - 1 processor (1 adapter + 1 processor here) - 1 req/resp.

 Remy

   remm02/03/14 21:31:50
  
 Modified:coyote/src/java/org/apache/coyote ActionCode.java
  coyote/src/java/org/apache/coyote/tomcat4
   CoyoteProcessor.java
 Log:
 - Add some start and stop actions in the (temporary) interface used
   for messaging.
 - Use the actions to start and stop the processor.
  
 Revision  ChangesPath
 1.3   +6 -0
 

jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/ActionCode.java
  
 Index: ActionCode.java
 ===
 RCS file:
 

/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Action
  Code.java,v
 retrieving revision 1.2
 retrieving revision 1.3
 diff -u -r1.2 -r1.3
 --- ActionCode.java 1 Oct 2001 01:09:54 - 1.2
 +++ ActionCode.java 15 Mar 2002 05:31:50 - 1.3
 @@ -85,6 +85,12 @@
  public static final ActionCode ACTION_RESET = new ActionCode();
  
  
 +public static final ActionCode ACTION_START = new ActionCode();
 +
 +
 +public static final ActionCode ACTION_STOP = new ActionCode();
 +
 +
  // ---
  Constructors
  
  
  
  
  
 1.14  +14 -4
 

jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyotePr
  ocessor.java
  
 Index: CoyoteProcessor.java
 ===
 RCS file:
 

/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
  4/CoyoteProcessor.java,v
 retrieving revision 1.13
 retrieving revision 1.14
 diff -u -r1.13 -r1.14
 --- CoyoteProcessor.java 14 Mar 2002 20:52:29 - 1.13
 +++ CoyoteProcessor.java 15 Mar 2002 05:31:50 - 1.14
 @@ -1,6 +1,6 @@
 -/* * $Header:
 

/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
  4/CoyoteProcessor.java,v 1.13 2002/03/14 20:52:29 remm Exp $
 - * $Revision: 1.13 $
 - * $Date: 2002/03/14 20:52:29 $
 +/* * $Header:
 

/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
  4/CoyoteProcessor.java,v 1.14 2002/03/15 05:31:50 remm Exp $
 + * $Revision: 1.14 $
 + * $Date: 2002/03/15 05:31:50 $
   *
   *
 
   *
 @@ -85,6 +85,8 @@
  
  import org.apache.tomcat.util.buf.MessageBytes;
  
 +import org.apache.coyote.ActionCode;
 +import org.apache.coyote.ActionHook;
  import org.apache.coyote.Adapter;
  import org.apache.coyote.InputBuffer;
  import org.apache.coyote.OutputBuffer;
 @@ -114,7 +116,7 @@
   *
   * @author Craig R. McClanahan
   * @author Remy Maucherat
 - * @version $Revision: 1.13 $ $Date: 2002/03/14 20:52:29 $
 + * @version $Revision: 1.14 $ $Date: 2002/03/15 05:31:50 $
   */
  
  final class CoyoteProcessor
 @@ -925,6 +927,10 @@
  
  threadStart();
  
 +if (processor instanceof ActionHook) {
 +((ActionHook)
processor).action(ActionCode.ACTION_START,
  null);
 +}
 +
  }
  
  
 @@ -940,6 +946,10 @@
  (sm.getString(coyoteProcessor.notStarted));
  lifecycle.fireLifecycleEvent(STOP_EVENT, null);
  started = false;
 +
 +if (processor instanceof ActionHook) {
 +((ActionHook) processor).action(ActionCode.ACTION_STOP,
  null);
 +}
  
  threadStop();
  
  
  
  
  
   --
   To unsubscribe, e-mail:
  mailto:[EMAIL PROTECTED]
   For additional commands, e-mail:
  mailto:[EMAIL PROTECTED]
  
 
 
  --
  To unsubscribe, e-mail:
 mailto:[EMAIL PROTECTED]
  For additional commands, e-mail:
 mailto:[EMAIL PROTECTED]
 


 --
 To unsubscribe, e-mail:
mailto:[EMAIL PROTECTED

Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteProcessor.java

2002-03-14 Thread Bill Barker

Ok, now you've got me really confused.  It looks like I should have a single
instance of Processor (and thus a single instance of Adapter).  At the
moment, both are per-Thread in tomcat3.  But I can't see how this can work
even in o.a.c.tomcat4, since the tomcat4 Adapter uses the same instance of
req/resp for all requests.

If (as is likely) this is just my lack of knowledge of Catalina's threading
model, please mention a package to look at when you blow me off. ;)
- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Thursday, March 14, 2002 9:31 PM
Subject: cvs commit:
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4
CoyoteProcessor.java


 remm02/03/14 21:31:50

   Modified:coyote/src/java/org/apache/coyote ActionCode.java
coyote/src/java/org/apache/coyote/tomcat4
 CoyoteProcessor.java
   Log:
   - Add some start and stop actions in the (temporary) interface used
 for messaging.
   - Use the actions to start and stop the processor.

   Revision  ChangesPath
   1.3   +6 -0
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/ActionCode.java

   Index: ActionCode.java
   ===
   RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Action
Code.java,v
   retrieving revision 1.2
   retrieving revision 1.3
   diff -u -r1.2 -r1.3
   --- ActionCode.java 1 Oct 2001 01:09:54 - 1.2
   +++ ActionCode.java 15 Mar 2002 05:31:50 - 1.3
   @@ -85,6 +85,12 @@
public static final ActionCode ACTION_RESET = new ActionCode();


   +public static final ActionCode ACTION_START = new ActionCode();
   +
   +
   +public static final ActionCode ACTION_STOP = new ActionCode();
   +
   +
// ---
Constructors





   1.14  +14 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyotePr
ocessor.java

   Index: CoyoteProcessor.java
   ===
   RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
4/CoyoteProcessor.java,v
   retrieving revision 1.13
   retrieving revision 1.14
   diff -u -r1.13 -r1.14
   --- CoyoteProcessor.java 14 Mar 2002 20:52:29 - 1.13
   +++ CoyoteProcessor.java 15 Mar 2002 05:31:50 - 1.14
   @@ -1,6 +1,6 @@
   -/* * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
4/CoyoteProcessor.java,v 1.13 2002/03/14 20:52:29 remm Exp $
   - * $Revision: 1.13 $
   - * $Date: 2002/03/14 20:52:29 $
   +/* * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
4/CoyoteProcessor.java,v 1.14 2002/03/15 05:31:50 remm Exp $
   + * $Revision: 1.14 $
   + * $Date: 2002/03/15 05:31:50 $
 *
 * 
 *
   @@ -85,6 +85,8 @@

import org.apache.tomcat.util.buf.MessageBytes;

   +import org.apache.coyote.ActionCode;
   +import org.apache.coyote.ActionHook;
import org.apache.coyote.Adapter;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.OutputBuffer;
   @@ -114,7 +116,7 @@
 *
 * @author Craig R. McClanahan
 * @author Remy Maucherat
   - * @version $Revision: 1.13 $ $Date: 2002/03/14 20:52:29 $
   + * @version $Revision: 1.14 $ $Date: 2002/03/15 05:31:50 $
 */

final class CoyoteProcessor
   @@ -925,6 +927,10 @@

threadStart();

   +if (processor instanceof ActionHook) {
   +((ActionHook) processor).action(ActionCode.ACTION_START,
null);
   +}
   +
}


   @@ -940,6 +946,10 @@
(sm.getString(coyoteProcessor.notStarted));
lifecycle.fireLifecycleEvent(STOP_EVENT, null);
started = false;
   +
   +if (processor instanceof ActionHook) {
   +((ActionHook) processor).action(ActionCode.ACTION_STOP,
null);
   +}

threadStop();





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



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