Skip to content

Commit 7ba7743

Browse files
committed
Merge pull request #33 from pkwarren/remove_capped
Remove CappedFiberFactory from Node.
2 parents 982373d + 7638945 commit 7ba7743

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>org.jetlang</groupId>
2222
<artifactId>jetlang</artifactId>
23-
<version>0.2.10-capped</version>
23+
<version>0.2.12</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>org.jboss.netty</groupId>
@@ -117,7 +117,6 @@
117117
</executions>
118118
<configuration>
119119
<args>
120-
<arg>-optimise</arg>
121120
<arg>-unchecked</arg>
122121
<arg>-deprecation</arg>
123122
</args>

src/main/scala/scalang/Node.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import overlock.atomicmap._
2929
import org.jetlang._
3030
import core._
3131
import java.io._
32-
import fibers.CappedFiberFactory
3332
import core.BatchExecutorImpl
3433
import netty.handler.execution.ExecutionHandler
3534
import scala.collection.JavaConversions._
@@ -42,6 +41,7 @@ import org.jboss.netty.logging._
4241
import netty.util.HashedWheelTimer
4342
import com.yammer.metrics.scala._
4443
import java.nio.channels.ClosedChannelException
44+
import org.jetlang.fibers.PoolFiberFactory
4545

4646
object Node {
4747
val random = SecureRandom.getInstance("SHA1PRNG")
@@ -201,7 +201,7 @@ class ErlangNode(val name : Symbol, val cookie : String, config : NodeConfig) ex
201201
val pidCount = new AtomicInteger(0)
202202
val pidSerial = new AtomicInteger(0)
203203
val executor = poolFactory.createActorPool
204-
val factory = new CappedFiberFactory(executor, 1000)
204+
val factory = new PoolFiberFactory(executor)
205205
val executionHandler = new ExecutionHandler(poolFactory.createExecutorPool)
206206
val server = new ErlangNodeServer(this,config.typeFactory, config.typeEncoder, config.typeDecoder)
207207
val localEpmd = Epmd("localhost")

0 commit comments

Comments
 (0)