andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename method to better reflect its usage and update some javadocs. See

Browse Source 
#187 and #140
This commit is contained in:
Norman Maurer 2012-02-25 14:19:11 +01:00
parent c2bc463d61
commit 301a17c029
15 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/src/main/java/io/netty/handler/codec/embedder/AbstractCodecEmbedder.java
View File

@ -226,7 +226,7 @@ abstract class AbstractCodecEmbedder<E> implements CodecEmbedder<E> {
}
@Override
public void fireEventLater(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
public void fireUpstreamEventLater(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
handleEvent(e);
}
}

2
transport-http/src/main/java/io/netty/channel/socket/http/AbstractHttpChannelSink.java
View File

@ -23,7 +23,7 @@ import io.netty.channel.ChannelPipeline;
public abstract class AbstractHttpChannelSink extends AbstractChannelSink{
@Override
public void fireEventLater(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
public void fireUpstreamEventLater(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
pipeline.sendUpstream(e);
}

2
transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannelSink.java
View File

@ -334,7 +334,7 @@ public class RxtxChannelSink extends AbstractChannelSink {
* Just fire the event now by calling {@link ChannelPipeline#sendUpstream(ChannelEvent)} as this implementation does not support it otherwise
*/
@Override
public void fireEventLater(ChannelPipeline pipeline, ChannelEvent event) throws Exception {
public void fireUpstreamEventLater(ChannelPipeline pipeline, ChannelEvent event) throws Exception {
pipeline.sendUpstream(event);
}
}

4
transport-sctp/src/main/java/io/netty/channel/sctp/AbstractScptChannelSink.java
View File

@ -24,13 +24,13 @@ import io.netty.channel.ChannelPipeline;
public abstract class AbstractScptChannelSink extends AbstractChannelSink{
@Override
public void fireEventLater(final ChannelPipeline pipeline, final ChannelEvent e) throws Exception {
public void fireUpstreamEventLater(final ChannelPipeline pipeline, final ChannelEvent e) throws Exception {
Channel ch = e.getChannel();
if (ch instanceof SctpChannelImpl) {
SctpChannelImpl channel = (SctpChannelImpl) ch;
// check if the current thread is a worker thread, and only fire the event later if thats not the case
if (channel.worker.thread != Thread.currentThread()) {
channel.worker.fireEventLater(new Runnable() {
channel.worker.executeInIoThread(new Runnable() {
@Override
public void run() {

3
transport-sctp/src/main/java/io/netty/channel/sctp/SctpWorker.java
View File

@ -245,7 +245,8 @@ class SctpWorker implements Worker {
}
}
public void fireEventLater(Runnable eventRunnable) {
@Override
public void executeInIoThread(Runnable eventRunnable) {
assert eventQueue.offer(eventRunnable);
// wake up the selector to speed things

5
transport/src/main/java/io/netty/channel/ChannelSink.java
View File

@ -38,5 +38,8 @@ public interface ChannelSink {
*/
void exceptionCaught(ChannelPipeline pipeline, ChannelEvent e, ChannelPipelineException cause) throws Exception;
void fireEventLater(ChannelPipeline pipeline, ChannelEvent e) throws Exception;
/**
* Schedule the given {@link ChannelEvent} for later execution (in the io-thread). Some implementation may not support his and just fire it directly
*/
void fireUpstreamEventLater(ChannelPipeline pipeline, ChannelEvent e) throws Exception;
}

4
transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
View File

@ -586,7 +586,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
@Override
public void sendUpstreamLater(ChannelEvent e) {
try {
getSink().fireEventLater(this, e);
getSink().fireUpstreamEventLater(this, e);
} catch (Throwable t) {
notifyHandlerException(e, t);
}
@ -843,7 +843,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public void fireEventLater(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
public void fireUpstreamEventLater(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
if (logger.isWarnEnabled()) {
logger.warn("Not attached yet; discarding: " + e);
}

2
transport/src/main/java/io/netty/channel/iostream/IoStreamChannelSink.java
View File

@ -182,7 +182,7 @@ public class IoStreamChannelSink extends AbstractChannelSink {
* This just calls {@link ChannelPipeline#sendUpstream(ChannelEvent)} as the transport does not support it
*/
@Override
public void fireEventLater(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
public void fireUpstreamEventLater(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
pipeline.sendUpstream(e);
}
}

2
transport/src/main/java/io/netty/channel/local/LocalClientChannelSink.java
View File

@ -89,7 +89,7 @@ final class LocalClientChannelSink extends AbstractChannelSink {
* Just fire the event now by calling {@link ChannelPipeline#sendUpstream(ChannelEvent)} as this implementation does not support it otherwise
*/
@Override
public void fireEventLater(ChannelPipeline pipeline, ChannelEvent event) throws Exception {
public void fireUpstreamEventLater(ChannelPipeline pipeline, ChannelEvent event) throws Exception {
pipeline.sendUpstream(event);
}

2
transport/src/main/java/io/netty/channel/local/LocalServerChannelSink.java
View File

@ -46,7 +46,7 @@ final class LocalServerChannelSink extends AbstractChannelSink {
* Just fire the event now by calling {@link ChannelPipeline#sendUpstream(ChannelEvent)} as this implementation does not support it otherwise
*/
@Override
public void fireEventLater(ChannelPipeline pipeline, ChannelEvent event) throws Exception {
public void fireUpstreamEventLater(ChannelPipeline pipeline, ChannelEvent event) throws Exception {
pipeline.sendUpstream(event);
}

11
transport/src/main/java/io/netty/channel/socket/Worker.java
View File

@ -16,7 +16,16 @@
package io.netty.channel.socket;
/**
* A {@link Worker} is responsible to dispatch IO operations
*
*/
public interface Worker extends Runnable{
void fireEventLater(Runnable eventRunnable);
/**
* Execute the given {@link Runnable} in the IO-Thread. This may be now or later once the IO-Thread do some other work.
*
* @param task the {@link Runnable} to execute
*/
void executeInIoThread(Runnable task);
}

4
transport/src/main/java/io/netty/channel/socket/nio/AbstractNioChannelSink.java
View File

@ -24,13 +24,13 @@ import io.netty.channel.ChannelPipeline;
public abstract class AbstractNioChannelSink extends AbstractChannelSink{
@Override
public void fireEventLater(final ChannelPipeline pipeline, final ChannelEvent e) throws Exception {
public void fireUpstreamEventLater(final ChannelPipeline pipeline, final ChannelEvent e) throws Exception {
Channel ch = e.getChannel();
if (ch instanceof AbstractNioChannel<?>) {
AbstractNioChannel<?> channel = (AbstractNioChannel<?>) ch;
// check if the current thread is a worker thread if so we can send the event now
if (channel.worker.thread != Thread.currentThread()) {
channel.worker.fireEventLater(new Runnable() {
channel.worker.executeInIoThread(new Runnable() {
@Override
public void run() {

3
transport/src/main/java/io/netty/channel/socket/nio/AbstractNioWorker.java
View File

@ -271,7 +271,8 @@ abstract class AbstractNioWorker implements Worker {
}
}
public void fireEventLater(Runnable eventRunnable) {
@Override
public void executeInIoThread(Runnable eventRunnable) {
assert eventQueue.offer(eventRunnable);
// wake up the selector to speed things

4
transport/src/main/java/io/netty/channel/socket/oio/AbstractOioChannelSink.java
View File

@ -25,13 +25,13 @@ import io.netty.channel.socket.Worker;
public abstract class AbstractOioChannelSink extends AbstractChannelSink{
@Override
public void fireEventLater(final ChannelPipeline pipeline, final ChannelEvent e) throws Exception {
public void fireUpstreamEventLater(final ChannelPipeline pipeline, final ChannelEvent e) throws Exception {
Channel ch = e.getChannel();
if (ch instanceof AbstractOioChannel) {
AbstractOioChannel channel = (AbstractOioChannel) ch;
Worker worker = channel.worker;
if (worker != null && channel.workerThread != Thread.currentThread()) {
channel.worker.fireEventLater(new Runnable() {
channel.worker.executeInIoThread(new Runnable() {
@Override
public void run() {

4
transport/src/main/java/io/netty/channel/socket/oio/AbstractOioWorker.java
View File

@ -91,8 +91,10 @@ abstract class AbstractOioWorker<C extends AbstractOioChannel> implements Worker
@Override
public void fireEventLater(Runnable eventRunnable) {
public void executeInIoThread(Runnable eventRunnable) {
assert eventQueue.offer(eventRunnable);
// as we set the SO_TIMEOUT to 1 second this task will get picked up in 1 second at latest
}
private void processEventQueue() throws IOException {