costin 2002/06/11 15:48:46
Modified: jk/java/org/apache/jk/apr AprImpl.java
jk/java/org/apache/jk/common JniHandler.java MsgAjp.java
Log:
Few fixes, moved the signal and user out of AprImpl ( will use
the same mechanism as all other components )
Revision Changes Path
1.21 +0 -17 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
Index: AprImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AprImpl.java 10 Jun 2002 21:26:25 -0000 1.20
+++ AprImpl.java 11 Jun 2002 22:48:46 -0000 1.21
@@ -249,23 +249,6 @@
}
}
- /** Set the user id, to avoid running as root. Should be called after we
- * aquire all resources ( i.e. open files and sockets ).
- */
- public native int setUser( String user, String group );
-
- /** Return the process id of the java process
- */
- public native int setPid();
-
- /** Intercept the given signal. ( whenever this is possible )
- */
- public native int signal(int sig);
-
- /** Send the given singal to a process
- */
- public native void sendSignal( int pid, int sig );
-
public void loadNative(String libPath) {
try {
System.load( libPath );
1.10 +10 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java
Index: JniHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JniHandler.java 6 Jun 2002 00:59:10 -0000 1.9
+++ JniHandler.java 11 Jun 2002 22:48:46 -0000 1.10
@@ -74,7 +74,16 @@
/**
- * Proxy for the Jk native component.
+ * Base class for components using native code ( libjkjni.so ).
+ * It allows to access the jk_env and wrap ( 'box' ? ) a native
+ * jk component, and call it's methods.
+ *
+ * Note that get/setAttribute are expensive ( Strings, etc ),
+ * invoke() is were all optimizations are done. We do recycle
+ * all memory on both C and java sides ( the only exception is
+ * when we attempt pinning but the VM doesn't support it ). The
+ * low level optimizations from ByteBuffer, etc are used to
+ * reduce the overhead of passing strings.
*
* @author Costin Manolache
*/
1.9 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/MsgAjp.java
Index: MsgAjp.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/MsgAjp.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MsgAjp.java 1 Jun 2002 02:55:55 -0000 1.8
+++ MsgAjp.java 11 Jun 2002 22:48:46 -0000 1.9
@@ -286,7 +286,7 @@
int length = getInt();
if( length > buf.length ) {
// XXX Should be if(pos + length > buff.legth)?
- log.error("Try to get data after the end of the buffer");
+ log.error("getBytes() buffer overflow " + length + " " + buf.length );
}
if( (length == 0xFFFF) || (length == -1) ) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
