Commit Graph

2787 Commits

Author SHA1 Message Date
Trustin Lee
c62b47228e Fix build failure 2012-02-29 13:26:35 -08:00
Norman Maurer
1589dadcce Better handling of canceling. See #210 and #209 2012-02-29 21:37:26 +01:00
Norman Maurer
a545157f4b Respect canceled tasks. See #209 and #210 2012-02-29 21:23:31 +01:00
Norman Maurer
8579f09c59 Merge pull request #210 from netty/threading_fix
Merge in fix for threading (related to #140 and #187). This also includes the new feature that allow to submit a Runnable that gets executed later in the io thread.
2012-02-29 12:11:46 -08:00
Norman Maurer
5f465da38d Add final keyword 2012-02-29 21:08:18 +01:00
Norman Maurer
4df3c61233 Allow to submit a Runnable that get execute in the io-thread. This is
also used to workout flaws in the thread-model. See #209 #140 #187
2012-02-29 21:07:02 +01:00
Trustin Lee
689c47980b Make ReplayingDecoder.newCumulationBuffer() overridable / Make Replaying|FrameDecoder allocate at least 256 bytes by default 2012-02-29 10:04:05 -08:00
Trustin Lee
c46593266d Optimize ReplayingDecoder even further
* If checkpoint is non-zero, do not copy the whole input into cumulation but copy only the part after the checkpoint
2012-02-29 09:40:34 -08:00
Trustin Lee
8ab9451086 Fix #208 - SslHandler does not use ChannelBufferFactory to create a new buffer
* Also fixed build failure caused by wrong fork mode
2012-02-29 09:19:18 -08:00
Trustin Lee
fb4ee5207c Remove shameful System.out.println 2012-02-28 16:47:12 -08:00
Trustin Lee
c2d2f0b254 Optimize FrameDecoder and ReplayingDecoder
* Overall code cleanup on FrameDecoder and ReplayingDecoder
* FrameDecoder discards readableBytes only when it has to
* Replaced createCumulationDynamicBuffer with newCumulationBuffer with
  an additional hint
* ReplayingDecoder does not perform memory copy if possible
2012-02-28 16:39:24 -08:00
Trustin Lee
2f6d02da60 Run tests in random order 2012-02-28 10:38:45 -08:00
Norman Maurer
0d66a36a14 Merge branch 'master' of ssh://github.com/netty/netty 2012-02-28 16:53:28 +01:00
Norman Maurer
40771f6faf add empty line 2012-02-28 14:21:47 +01:00
Norman Maurer
19358ee246 Workaround for JDK NIO bug. See #203 2012-02-28 14:19:29 +01:00
Trustin Lee
2984f26f97 Decreased all selector timeout from 500 ms to 10 ms
See #204
2012-02-27 13:02:42 -08:00
Trustin Lee
4612568687 Fix #204 - Increate the granularity of connect timeout in NIO
* Changed the Selector timeout from 500 to 10 so that the timeout is checked every 10 milliseconds
2012-02-27 12:56:18 -08:00
Norman Maurer
b6700fbe58 Fix naming of class. Thanks Trustin for review 2012-02-27 20:46:40 +01:00
Norman Maurer
0beaa107b4 Fix assert usage. Thanks Trustin for review 2012-02-27 20:45:46 +01:00
Norman Maurer
2b9df060dd Add support to wrap primitives via ChannelBuffers.wrap*(..) easily. See
#167
2012-02-26 20:51:53 +01:00
Norman Maurer
03cb43140c Only log if loglevel is enabled. 2012-02-26 18:15:42 +01:00
Norman Maurer
d0a962422e Add back missing HttpTunnelingServlet. See #148 2012-02-26 18:14:05 +01:00
Norman Maurer
16fada5c23 Remove bogus constructor. See #173 2012-02-26 11:06:14 +01:00
Norman Maurer
5e43e879f2 Add OrderedDownstreamThreadPoolExecutor which can be used when using the
new feature of ExecutionHandler to also handle downstream events. This
is mainly useful for SEDA like stuff. See #173
2012-02-26 11:00:30 +01:00
Norman Maurer
cfe7b49594 Cleaner impl of AbstractNioChannelSink and AbstractOioChannelSink. See
#140 and #187
2012-02-25 17:11:14 +01:00
Norman Maurer
68066c5e4b Make sure that ChannelDownstreamHandler impl fire exception caughts
later via the io-worker. See #140 and #187
2012-02-25 16:05:41 +01:00
Norman Maurer
f2d1f1e8ad Also fix the exception handling if a ChannelHandler throws an Exception
based of if its a io thread or not. See #187 and #140
2012-02-25 15:54:33 +01:00
Norman Maurer
ef64e8c332 oio and nio transport now make sure that a upstream event get only
executed from an io thread. See #140 and #187
2012-02-25 15:12:58 +01:00
Norman Maurer
c4a437e16b Fix later sending of exceptionCaught events. See #187 and #140 2012-02-25 14:30:10 +01:00
Norman Maurer
04a6ff92af Add static helper methods to fire upstream events later. See #187 and
#140
2012-02-25 14:28:43 +01:00
Norman Maurer
301a17c029 Rename method to better reflect its usage and update some javadocs. See
#187 and #140
2012-02-25 14:19:11 +01:00
Norman Maurer
c2bc463d61 Optimize the handling of fireEventLater if the current thread is the
worker thread. See #187 and #140
2012-02-24 22:03:32 +01:00
Norman Maurer
5fdd2dea12 Make it possible to schedule upstream events to get fired later in the
io-thread. This is the first part of #140 and #187
2012-02-24 20:26:50 +01:00
norman
2304913341 Merge branch 'master' of github.com:netty/netty 2012-02-21 08:28:01 +01:00
norman
2e36932097 Merge branch 'master' into remove_duplication
Conflicts:
	transport/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java
	transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java
2012-02-21 08:25:59 +01:00
Norman Maurer
aa3b3d4a5b Merge pull request #198 from boldt/code-cleaning
Organized imports.
2012-02-20 23:05:34 -08:00
Dennis Boldt
b3cc305578 Organized imports. 2012-02-21 03:06:26 +01:00
Trustin Lee
a715220556 Fix a compilation error with the SCTP module in Mac 2012-02-20 16:04:46 -08:00
Trustin Lee
97b4876c08 Fix build errors with m2e 2012-02-20 16:01:28 -08:00
Norman Maurer
7bf049b1d4 Merge pull request #197 from echarles/master
Fix compilation issue due to jdk bug in older jdk versions
2012-02-20 02:56:00 -08:00
Eric Charles
bb6d140220 Fix compilation issue due to jdk bug Inference fails for type variable return constraint, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954 2012-02-20 10:28:40 +01:00
Jestan Nirojan
6eabd343c4 SCTP association shutdown cleanup 2012-02-20 01:39:42 +05:30
Norman Maurer
eafd8343eb Remove some casting. See #186 2012-02-19 13:59:09 +01:00
Norman Maurer
c5582a14b8 Merge pull request #194 from jabley/patch-2
Fix checkstyle warning
2012-02-19 00:24:37 -08:00
Norman Maurer
ebc7ae8090 Merge pull request #193 from jabley/patch-1
Fix checkstyle warning
2012-02-19 00:23:29 -08:00
Jestan Nirojan
fe1d51f1d5 Merge pull request #185 from jestan/master
Merge SCTP Transport Testsuite with netty/master.
2012-02-19 00:03:41 -08:00
Jestan Nirojan
0bb1fe2656 Skipped SCTP Transport tests in the build (Java SCTP is only available for Linux and Solaris) 2012-02-19 13:30:24 +05:30
Jestan Nirojan
0148658bcc Merge branch 'master' of github.com:jestan/netty 2012-02-19 12:40:30 +05:30
Jestan Nirojan
7dbb8d2b8f fixed checkstyle build failures 2012-02-19 12:38:39 +05:30
Jestan Nirojan
20d7379c53 merge upstream master 2012-02-19 12:37:50 +05:30