You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/01/26 07:20:10 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_endpoint.h
costin 02/01/25 22:20:10
Modified: jk/native2/include jk_endpoint.h
Log:
Added few more fields needed to store data associated with the endpoint. We really
need some 'notes' or generic attributes here.
Removed the old interface methods. Service is now part of worker, where it belongs.
Having it in endpoint required the worker implementation to also implement an
endpoint and made things complex.
Aquiring and releasing endpoints ( or even using endpoints at all ) is also
left to the worker - as it was in the past, except that now it's not required.
In fact most 'non-protocol' workers do not need that at all. ( see next commits )
Revision Changes Path
1.10 +10 -20 jakarta-tomcat-connectors/jk/native2/include/jk_endpoint.h
Index: jk_endpoint.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_endpoint.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_endpoint.h 31 Dec 2001 19:15:12 -0000 1.9
+++ jk_endpoint.h 26 Jan 2002 06:20:10 -0000 1.10
@@ -61,7 +61,7 @@
* Author: Gal Shachor <sh...@il.ibm.com>
* Author: Dan Milstein <da...@shore.net>
* Author: Henri Gomez <hg...@slib.fr>
- * Version: $Revision: 1.9 $
+ * Version: $Revision: 1.10 $
***************************************************************************/
#ifndef JK_ENDPOINT_H
@@ -128,6 +128,15 @@
*/
void *channelData;
+ /* Ok, this is going to be a Notes - similar with what we have on the
+ * java side. Various channels need to be able to store private data.
+ */
+ void *currentData;
+ int currentOffset;
+ int currentLen;
+
+ struct jk_ws_service *currentRequest;
+
struct jk_worker *worker;
/** 'main' pool for this endpoint. Used to store properties of the
@@ -172,25 +181,6 @@
unsigned long negociated;
char *servletContainerName;
-
- /*
- * Forward a request to the servlet engine. The request is described
- * by the jk_ws_service_t object. I'm not sure exactly how
- * is_recoverable_error is being used.
- */
- int (JK_METHOD *service)(struct jk_env *env, jk_endpoint_t *_this,
- struct jk_ws_service *s,
- int *is_recoverable_error);
-
- /*
- * Called when this particular endpoint has finished processing a
- * request. For some protocols (e.g. ajp12), this frees the memory
- * associated with the endpoint. For others (e.g. ajp13/ajp14), this can
- * return the endpoint to a cache of already opened endpoints.
- * XXX This is the 'pair' of worker.getEndpoint - it should be part of
- * worker.
- */
- int (JK_METHOD *done)(struct jk_env *env, jk_endpoint_t *p );
};
#ifdef __cplusplus
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>