[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/socket ...
Ovidiu Feodorov
ovidiu.feodorov at jboss.com
Mon Jan 15 19:29:29 EST 2007
User: ovidiu
Date: 07/01/15 19:29:29
Modified: src/main/org/jboss/remoting/transport/socket Tag:
remoting_2_x ClientSocketWrapper.java
ServerSocketWrapper.java ServerThread.java
SocketServerInvoker.java SocketWrapper.java
Log:
more TRACE logging and tests
Revision Changes Path
No revision
No revision
1.15.10.3 +12 -5 JBossRemoting/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClientSocketWrapper.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java,v
retrieving revision 1.15.10.2
retrieving revision 1.15.10.3
diff -u -b -r1.15.10.2 -r1.15.10.3
--- ClientSocketWrapper.java 9 Nov 2006 20:33:59 -0000 1.15.10.2
+++ ClientSocketWrapper.java 16 Jan 2007 00:29:29 -0000 1.15.10.3
@@ -22,23 +22,23 @@
package org.jboss.remoting.transport.socket;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.util.Map;
import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.serialization.SerializationStreamFactory;
+import org.jboss.logging.Logger;
/**
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
*/
public class ClientSocketWrapper extends SocketWrapper
{
+ private static final Logger log = Logger.getLogger(ClientSocketWrapper.class);
+
+ private static boolean trace = log.isTraceEnabled();
+
private InputStream in;
private OutputStream out;
@@ -82,6 +82,7 @@
// BufferedInputStream bin = new BufferedInputStream(socket.getInputStream());
// ObjectInputStream oin = SerializationStreamFactory.getManagerInstance(serializationType).createInput(bin, null);
// return oin;
+ if (trace) { log.trace(this + " getting input stream from " + socket); }
return socket.getInputStream();
}
@@ -91,6 +92,7 @@
// BufferedOutputStream bout = new BufferedOutputStream(socket.getOutputStream());
// ObjectOutputStream oout = SerializationStreamFactory.getManagerInstance(serializationType).createOutput(bout);
// return oout;
+ if (trace) { log.trace(this + " getting output stream from " + socket); }
return socket.getOutputStream();
}
@@ -118,4 +120,9 @@
out.flush();
in.read();
}
+
+ public String toString()
+ {
+ return "ClientSocketWrapper[" + getSocket() + "]";
+ }
}
1.14.6.3 +10 -5 JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerSocketWrapper.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerSocketWrapper.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerSocketWrapper.java,v
retrieving revision 1.14.6.2
retrieving revision 1.14.6.3
diff -u -b -r1.14.6.2 -r1.14.6.3
--- ServerSocketWrapper.java 9 Nov 2006 20:33:59 -0000 1.14.6.2
+++ ServerSocketWrapper.java 16 Jan 2007 00:29:29 -0000 1.14.6.3
@@ -22,18 +22,13 @@
package org.jboss.remoting.transport.socket;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
import java.io.EOFException;
import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.util.Map;
import org.jboss.logging.Logger;
-import org.jboss.remoting.serialization.SerializationStreamFactory;
/**
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
@@ -42,6 +37,8 @@
{
final static private Logger log = Logger.getLogger(ServerSocketWrapper.class);
+ private static boolean trace = log.isTraceEnabled();
+
public ServerSocketWrapper(Socket socket) throws Exception
{
super(socket);
@@ -57,6 +54,7 @@
// BufferedInputStream bin = new BufferedInputStream(socket.getInputStream());
// ObjectInputStream oin = SerializationStreamFactory.getManagerInstance(serializationType).createInput(bin, null);
// return oin;
+ if (trace) { log.trace(this + " getting input stream from " + socket); }
return socket.getInputStream();
}
@@ -67,6 +65,7 @@
// ObjectOutputStream oout = SerializationStreamFactory.getManagerInstance(serializationType).createOutput(bout);
// oout.flush();
// return oout;
+ if (trace) { log.trace(this + " getting output stream from " + socket); }
return socket.getOutputStream();
}
@@ -112,4 +111,10 @@
out.write(ACK);
out.flush();
}
+
+ public String toString()
+ {
+ return "ServerSocketWrapper[" + getSocket() + "]";
+ }
+
}
1.29.2.7 +14 -4 JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerThread.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerThread.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerThread.java,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -b -r1.29.2.6 -r1.29.2.7
--- ServerThread.java 13 Jan 2007 12:42:36 -0000 1.29.2.6
+++ ServerThread.java 16 Jan 2007 00:29:29 -0000 1.29.2.7
@@ -61,7 +61,7 @@
* @author <a href="mailto:tom at jboss.org">Tom Elrod</a>
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
*
- * @version $Revision: 1.29.2.6 $
+ * @version $Revision: 1.29.2.7 $
*/
public class ServerThread extends Thread
{
@@ -440,8 +440,13 @@
getUnMarshaller(invoker.getDataType(), invoker.getSerializationType());
}
- if(trace) { log.trace("performing versioned read from the input stream"); }
- return unmarshaller.read(inputStream, null);
+ if(trace) { log.trace("blocking to read invocation from the input stream"); }
+
+ Object o = unmarshaller.read(inputStream, null);
+
+ if(trace) { log.trace("read " + o + " from input stream"); }
+
+ return o;
}
default:
{
@@ -620,7 +625,12 @@
private int readVersion(InputStream inputStream) throws IOException
{
if(trace) { log.trace("blocking to read version from input stream"); }
- return inputStream.read();
+
+ int version = inputStream.read();
+
+ if(trace) { log.trace("read version " + version + " from input stream"); }
+
+ return version;
}
private void writeVersion(OutputStream outputStream, int version) throws IOException
1.30.2.6 +2 -1 JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketServerInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java,v
retrieving revision 1.30.2.5
retrieving revision 1.30.2.6
diff -u -b -r1.30.2.5 -r1.30.2.6
--- SocketServerInvoker.java 13 Jan 2007 12:42:36 -0000 1.30.2.5
+++ SocketServerInvoker.java 16 Jan 2007 00:29:29 -0000 1.30.2.6
@@ -49,7 +49,7 @@
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
*
- * @version $Revision: 1.30.2.5 $
+ * @version $Revision: 1.30.2.6 $
* @jmx:mbean
*/
public class SocketServerInvoker extends ServerInvoker implements Runnable, SocketServerInvokerMBean
@@ -549,6 +549,7 @@
if(trace) { log.trace(this + (thread == null ? " found NO threads in pool" : " got " + thread + " from pool")); }
}
+ else if (trace) { { log.trace(this + " has an empty thread pool"); } }
}
if(thread == null)
1.8.10.1 +10 -0 JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketWrapper.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketWrapper.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketWrapper.java,v
retrieving revision 1.8
retrieving revision 1.8.10.1
diff -u -b -r1.8 -r1.8.10.1
--- SocketWrapper.java 30 Dec 2005 05:26:38 -0000 1.8
+++ SocketWrapper.java 16 Jan 2007 00:29:29 -0000 1.8.10.1
@@ -22,6 +22,8 @@
package org.jboss.remoting.transport.socket;
+import org.jboss.logging.Logger;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -33,16 +35,24 @@
*/
public abstract class SocketWrapper
{
+ private static final Logger log = Logger.getLogger(SocketWrapper.class);
+
+ private static boolean trace = log.isTraceEnabled();
+
private Socket socket;
private int timeout;
protected SocketWrapper(Socket socket)
{
+ if (trace) { log.trace("creating SocketWrapper for " + socket); }
+
this.socket = socket;
}
protected SocketWrapper(Socket socket, Integer timeoutInt) throws SocketException
{
+ if (trace) { log.trace("creating SocketWrapper for " + socket + ", using timeout " + timeoutInt); }
+
this.socket = socket;
if(timeoutInt != null)
{
More information about the jboss-cvs-commits
mailing list