Author: rhs
Date: Wed Jul 9 18:15:43 2008
New Revision: 675397
URL: http://svn.apache.org/viewvc?rev=675397&view=rev
Log:
QPID-1062: moved channel id into the ProtocolEvent interface and removed
ConnectionEvent, this removes the overhead of creating ConnectionEvents
Removed:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionEvent.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Data.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Header.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Method.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolError.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolEvent.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolHeader.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
Wed Jul 9 18:15:43 2008
@@ -40,7 +40,6 @@
import org.apache.qpidity.transport.ConnectionClose;
import org.apache.qpidity.transport.ConnectionCloseCode;
import org.apache.qpidity.transport.ConnectionCloseOk;
-import org.apache.qpidity.transport.ConnectionEvent;
import org.apache.qpidity.transport.TransportConstants;
import org.apache.qpidity.transport.ProtocolHeader;
import org.apache.qpidity.transport.SessionDelegate;
@@ -186,8 +185,8 @@
}
// XXX: hardcoded version numbers
- _conn.send(new ConnectionEvent(0, new ProtocolHeader(1,
TransportConstants.getVersionMajor(),
- TransportConstants.getVersionMinor())));
+ _conn.send(new ProtocolHeader(1, TransportConstants.getVersionMajor(),
+ TransportConstants.getVersionMinor()));
try
{
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
Wed Jul 9 18:15:43 2008
@@ -75,9 +75,10 @@
}
public void closed() {}
});
- conn.send(new ConnectionEvent(0, new ProtocolHeader(1,
- TransportConstants.getVersionMajor(),
- TransportConstants.getVersionMinor())));
+ conn.send(new ProtocolHeader
+ (1,
+ TransportConstants.getVersionMajor(),
+ TransportConstants.getVersionMinor()));
Channel ch = conn.getChannel(0);
Session ssn = new Session("my-session".getBytes());
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
Wed Jul 9 18:15:43 2008
@@ -151,7 +151,8 @@
private void emit(ProtocolEvent event)
{
- connection.send(new ConnectionEvent(channel, event));
+ event.setChannel(channel);
+ connection.send(event);
}
public void method(Method m)
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
Wed Jul 9 18:15:43 2008
@@ -41,12 +41,12 @@
*/
public class Connection
- implements Receiver<ConnectionEvent>, Sender<ConnectionEvent>
+ implements Receiver<ProtocolEvent>, Sender<ProtocolEvent>
{
private static final Logger log = Logger.get(Connection.class);
- final private Sender<ConnectionEvent> sender;
+ final private Sender<ProtocolEvent> sender;
final private ConnectionDelegate delegate;
private int channelMax = 1;
// want to make this final
@@ -54,7 +54,7 @@
final private Map<Integer,Channel> channels = new
HashMap<Integer,Channel>();
- public Connection(Sender<ConnectionEvent> sender,
+ public Connection(Sender<ProtocolEvent> sender,
ConnectionDelegate delegate)
{
this.sender = sender;
@@ -76,14 +76,14 @@
return delegate;
}
- public void received(ConnectionEvent event)
+ public void received(ProtocolEvent event)
{
log.debug("RECV: [%s] %s", this, event);
Channel channel = getChannel(event.getChannel());
- channel.received(event.getProtocolEvent());
+ channel.received(event);
}
- public void send(ConnectionEvent event)
+ public void send(ProtocolEvent event)
{
log.debug("SEND: [%s] %s", this, event);
sender.send(event);
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
Wed Jul 9 18:15:43 2008
@@ -82,18 +82,18 @@
public void init(Channel ch, ProtocolHeader hdr)
{
- ch.getConnection().send(new ConnectionEvent(0, new ProtocolHeader
- (1,
-
TransportConstants.getVersionMajor(),
-
TransportConstants.getVersionMinor())));
+ ch.getConnection().send(new ProtocolHeader
+ (1,
+ TransportConstants.getVersionMajor(),
+ TransportConstants.getVersionMinor()));
if (hdr.getMajor() != TransportConstants.getVersionMajor() &&
hdr.getMinor() != TransportConstants.getVersionMinor())
{
// XXX
- ch.getConnection().send(new ConnectionEvent(0, new ProtocolHeader
- (1,
-
TransportConstants.getVersionMajor(),
-
TransportConstants.getVersionMinor())));
+ ch.getConnection().send(new ProtocolHeader
+ (1,
+ TransportConstants.getVersionMajor(),
+ TransportConstants.getVersionMinor()));
ch.getConnection().close();
}
else
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Data.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Data.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Data.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Data.java
Wed Jul 9 18:15:43 2008
@@ -40,6 +40,7 @@
private final ByteBuffer data;
private final boolean first;
private final boolean last;
+ private int channel;
public Data(ByteBuffer data, boolean first, boolean last)
{
@@ -63,6 +64,16 @@
return last;
}
+ public final int getChannel()
+ {
+ return channel;
+ }
+
+ public final void setChannel(int channel)
+ {
+ this.channel = channel;
+ }
+
public byte getEncodedTrack()
{
return Frame.L4;
@@ -76,6 +87,8 @@
public String toString()
{
StringBuffer str = new StringBuffer();
+ str.append("ch=");
+ str.append(" ");
str.append("Data(");
str.append(str(data, 64));
str.append(")");
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Header.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Header.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Header.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Header.java
Wed Jul 9 18:15:43 2008
@@ -37,6 +37,7 @@
private final List<Struct> structs;
private ByteBuffer _buf;
private boolean _noPayload;
+ private int channel;
public Header(List<Struct> structs, boolean lastframe)
{
@@ -71,6 +72,16 @@
return null;
}
+ public final int getChannel()
+ {
+ return channel;
+ }
+
+ public final void setChannel(int channel)
+ {
+ this.channel = channel;
+ }
+
public byte getEncodedTrack()
{
return Frame.L4;
@@ -82,15 +93,16 @@
}
public boolean hasNoPayload()
- {
- return _noPayload;
- }
-
+ {
+ return _noPayload;
+ }
public String toString()
{
StringBuffer str = new StringBuffer();
- str.append("Header(");
+ str.append("ch=");
+ str.append(channel);
+ str.append(" Header(");
boolean first = true;
for (Struct s : structs)
{
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Method.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Method.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Method.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Method.java
Wed Jul 9 18:15:43 2008
@@ -40,6 +40,7 @@
// XXX: command subclass?
private int id;
+ private int channel;
private boolean idSet = false;
private boolean sync = false;
private boolean batch = false;
@@ -55,6 +56,16 @@
this.idSet = true;
}
+ public final int getChannel()
+ {
+ return channel;
+ }
+
+ public final void setChannel(int channel)
+ {
+ this.channel = channel;
+ }
+
public final boolean isSync()
{
return sync;
@@ -97,18 +108,18 @@
{
StringBuilder str = new StringBuilder();
+ str.append("ch=");
+ str.append(channel);
+
if (getEncodedTrack() == Frame.L4 && idSet)
{
- str.append("id=");
+ str.append(" id=");
str.append(id);
}
if (sync || batch)
{
- if (str.length() > 0)
- {
- str.append(" ");
- }
+ str.append(" ");
str.append("[");
if (sync)
{
@@ -121,11 +132,9 @@
str.append("]");
}
- if (str.length() > 0)
- {
- str.append(" ");
- }
+ str.append(" ");
str.append(super.toString());
+
return str.toString();
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolError.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolError.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolError.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolError.java
Wed Jul 9 18:15:43 2008
@@ -30,9 +30,10 @@
* @author Rafael H. Schloming
*/
-public class ProtocolError implements NetworkEvent, ProtocolEvent
+public final class ProtocolError implements NetworkEvent, ProtocolEvent
{
+ private int channel;
private final byte track;
private final String format;
private final Object[] args;
@@ -44,6 +45,16 @@
this.args = args;
}
+ public int getChannel()
+ {
+ return channel;
+ }
+
+ public void setChannel(int channel)
+ {
+ this.channel = channel;
+ }
+
public byte getEncodedTrack()
{
return track;
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolEvent.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolEvent.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolEvent.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolEvent.java
Wed Jul 9 18:15:43 2008
@@ -29,6 +29,10 @@
public interface ProtocolEvent
{
+ int getChannel();
+
+ void setChannel(int channel);
+
byte getEncodedTrack();
<C> void delegate(C context, ProtocolDelegate<C> delegate);
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolHeader.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolHeader.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolHeader.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ProtocolHeader.java
Wed Jul 9 18:15:43 2008
@@ -33,9 +33,7 @@
* @author Rafael H. Schloming
*/
-//RA making this public until we sort out the package issues
-
-public class ProtocolHeader implements NetworkEvent, ProtocolEvent
+public final class ProtocolHeader implements NetworkEvent, ProtocolEvent
{
private static final byte[] AMQP = {'A', 'M', 'Q', 'P' };
@@ -44,6 +42,7 @@
final private byte instance;
final private byte major;
final private byte minor;
+ private int channel;
public ProtocolHeader(byte instance, byte major, byte minor)
{
@@ -72,6 +71,16 @@
return minor;
}
+ public int getChannel()
+ {
+ return channel;
+ }
+
+ public void setChannel(int channel)
+ {
+ this.channel = channel;
+ }
+
public byte getEncodedTrack()
{
return Frame.L1;
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
Wed Jul 9 18:15:43 2008
@@ -30,7 +30,6 @@
import org.apache.qpidity.transport.codec.BBDecoder;
import org.apache.qpidity.transport.codec.Decoder;
-import org.apache.qpidity.transport.ConnectionEvent;
import org.apache.qpidity.transport.Data;
import org.apache.qpidity.transport.Header;
import org.apache.qpidity.transport.Method;
@@ -50,7 +49,7 @@
public class Assembler implements Receiver<NetworkEvent>, NetworkDelegate
{
- private final Receiver<ConnectionEvent> receiver;
+ private final Receiver<ProtocolEvent> receiver;
private final Map<Integer,List<Frame>> segments;
private final ThreadLocal<BBDecoder> decoder = new ThreadLocal<BBDecoder>()
{
@@ -60,7 +59,7 @@
}
};
- public Assembler(Receiver<ConnectionEvent> receiver)
+ public Assembler(Receiver<ProtocolEvent> receiver)
{
this.receiver = receiver;
segments = new HashMap<Integer,List<Frame>>();
@@ -94,7 +93,8 @@
private void emit(int channel, ProtocolEvent event)
{
- receiver.received(new ConnectionEvent(channel, event));
+ event.setChannel(channel);
+ receiver.received(event);
}
private void emit(Frame frame, ProtocolEvent event)
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
Wed Jul 9 18:15:43 2008
@@ -22,7 +22,6 @@
import org.apache.qpidity.transport.codec.BBEncoder;
-import org.apache.qpidity.transport.ConnectionEvent;
import org.apache.qpidity.transport.Data;
import org.apache.qpidity.transport.Header;
import org.apache.qpidity.transport.Method;
@@ -47,8 +46,8 @@
*
*/
-public class Disassembler implements Sender<ConnectionEvent>,
- ProtocolDelegate<ConnectionEvent>
+public class Disassembler implements Sender<ProtocolEvent>,
+ ProtocolDelegate<Void>
{
private final Sender<NetworkEvent> sender;
@@ -73,9 +72,9 @@
}
- public void send(ConnectionEvent event)
+ public void send(ProtocolEvent event)
{
- event.getProtocolEvent().delegate(event, this);
+ event.delegate(null, this);
}
public void flush()
@@ -88,10 +87,10 @@
sender.close();
}
- private void fragment(byte flags, SegmentType type, ConnectionEvent event,
+ private void fragment(byte flags, SegmentType type, ProtocolEvent event,
ByteBuffer buf, boolean first, boolean last)
{
- byte track = event.getProtocolEvent().getEncodedTrack() == Frame.L4 ?
(byte) 1 : (byte) 0;
+ byte track = event.getEncodedTrack() == Frame.L4 ? (byte) 1 : (byte) 0;
if(!buf.hasRemaining())
{
@@ -131,19 +130,19 @@
}
}
- public void init(ConnectionEvent event, ProtocolHeader header)
+ public void init(Void v, ProtocolHeader header)
{
sender.send(header);
}
- public void control(ConnectionEvent event, Method method)
+ public void control(Void v, Method method)
{
- method(event, method, SegmentType.CONTROL);
+ method(method, SegmentType.CONTROL);
}
- public void command(ConnectionEvent event, Method method)
+ public void command(Void v, Method method)
{
- method(event, method, SegmentType.COMMAND);
+ method(method, SegmentType.COMMAND);
}
private ByteBuffer copy(ByteBuffer src)
@@ -154,7 +153,7 @@
return buf;
}
- private void method(ConnectionEvent event, Method method, SegmentType type)
+ private void method(Method method, SegmentType type)
{
BBEncoder enc = encoder.get();
enc.init();
@@ -180,10 +179,10 @@
flags |= LAST_SEG;
}
- fragment(flags, type, event, buf, true, true);
+ fragment(flags, type, method, buf, true, true);
}
- public void header(ConnectionEvent event, Header header)
+ public void header(Void v, Header header)
{
ByteBuffer buf;
if (header.getBuf() == null)
@@ -202,15 +201,15 @@
buf = header.getBuf();
buf.flip();
}
- fragment((byte) 0x0, SegmentType.HEADER, event, buf, true, true);
+ fragment((byte) 0x0, SegmentType.HEADER, header, buf, true, true);
}
- public void data(ConnectionEvent event, Data data)
+ public void data(Void v, Data data)
{
- fragment(LAST_SEG, SegmentType.BODY, event, data.getData(),
data.isFirst(), data.isLast());
+ fragment(LAST_SEG, SegmentType.BODY, data, data.getData(),
data.isFirst(), data.isLast());
}
- public void error(ConnectionEvent event, ProtocolError error)
+ public void error(Void v, ProtocolError error)
{
sender.send(error);
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java?rev=675397&r1=675396&r2=675397&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java
Wed Jul 9 18:15:43 2008
@@ -86,7 +86,7 @@
}
});
- conn.send(new ConnectionEvent(0, new ProtocolHeader(1, 0, 10)));
+ conn.send(new ProtocolHeader(1, 0, 10));
return conn;
}
