Changeset 259:25cafbcbb963

Timestamp:

04/30/2010 07:52:30 AM (4 months ago)

Author:

dcaoyuan

Branch:

default

Message:

Name refactoring

Location:

blogbird/src/main/scala/org/aiotrade/httpd

Files:

• ClientConnection.scala (modified) (5 diffs)
• HttpdActors.scala (modified) (5 diffs)
• SelectActor.scala (moved) (moved from blogbird/src/main/scala/org/aiotrade/httpd/ConnectionSelector.scala) (3 diffs)
• coroutine/HttpdRoutines.scala (modified) (8 diffs)

blogbird/src/main/scala/org/aiotrade/httpd/ClientConnection.scala

@@ -9 +9 @@
 
 
-case class Read (callback: Boolean => Unit)
-case class Write(callback: Boolean => Unit)
-
 /**
  * Represents an open HTTP connection coming from a client.
  */
-class ClientConnection(val socketChannel: SocketChannel) extends Actor with WithSocketChannel {
+class ClientConnection(val channel: SocketChannel) extends Actor with WithSelectableChannel {
   private var _isOpen = true
   private var requestParser = new HttpRequestParser
@@ -25 +22 @@
    * Is this connection currentnly open?
    */
-  def isOpen = _isOpen && socketChannel.isOpen && socketChannel.isConnected
+  def isOpen = _isOpen && channel.isOpen && channel.isConnected
 
   /**
@@ -32 +29 @@
   def close {
     _isOpen = false
-    socketChannel.close
+    channel.close
     super.exit
   }
@@ -87 +84 @@
     var numRead = -1
     try {
-      numRead = socketChannel.read(readBuf)
+      numRead = channel.read(readBuf)
     } catch {
       case ioe: IOException =>
@@ -143 +140 @@
       if (writeBuffers.head.remaining > 0) {
         try {
-          socketChannel.write(writeBuffers.head)
+          channel.write(writeBuffers.head)
         } catch {
           case ioe: IOException =>

blogbird/src/main/scala/org/aiotrade/httpd/HttpdActors.scala

@@ -18 +18 @@
   debugln ("PortListener initializing...")
 
-  connectionSelector.start
+  acceptActor.start
 
   def stop {
-    connectionSelector.stop
+    acceptActor.stop
   }
 
-  private object connectionSelector extends Actor {
+  private object acceptActor extends Actor {
     val serverChannel = ServerSocketChannel.open
     serverChannel.socket.bind(new InetSocketAddress(localAddress, port))
@@ -59 +59 @@
   debugln("Connection Manager initializing...")
   
-  connectionSelector.start
+  selectActor.start
 
   def stop {
-    connectionSelector.stop
+    selectActor.stop
   }
 
-  private object connectionSelector extends ConnectionSelector[ClientConnection] {
-    val intersOpts = SelectionKey.OP_READ
+  private object selectActor extends SelectActor[ClientConnection](SelectionKey.OP_READ) {
 
     def fireEvent(key: SelectionKey, conn: ClientConnection) {
@@ -86 +85 @@
 
     val conn = new ClientConnection(socketChannel)
-    connectionSelector.addListener(conn)
+    selectActor.addListener(conn)
   }
 }
@@ -122 +121 @@
   debugln("Reply Sender initializing...")
 
-  connectionSelector.start
+  selectActor.start
 
   def stop {
-    connectionSelector.stop
+    selectActor.stop
   }
 
-  private object connectionSelector extends ConnectionSelector[ClientConnection] {
-    val intersOpts = SelectionKey.OP_WRITE
+  private object selectActor extends SelectActor[ClientConnection](SelectionKey.OP_WRITE) {
 
     def fireEvent(key: SelectionKey, conn: ClientConnection) {
@@ -151 +149 @@
     conn.send(reply)
     debugln(" * Sending a reply.")
-    connectionSelector.addListener(conn)
+    selectActor.addListener(conn)
   }
 }

blogbird/src/main/scala/org/aiotrade/httpd/SelectActor.scala

@@ -10 +10 @@
 import scala.collection.JavaConversions._
 
-trait ConnectionSelector[T <: WithSocketChannel] extends Actor {
-  val intersOpts: Int
+
+case class Read (callback: Boolean => Unit)
+case class Write(callback: Boolean => Unit)
+
+abstract class SelectActor[T <: WithSelectableChannel](ops: Int) extends Actor {
   def fireEvent(key: SelectionKey, listerner: T)
 
@@ -64 +67 @@
       for (listener <- listeners.iterator if listener.isOpen) {
         try {
-          listener.socketChannel.register(selector, intersOpts, listener)
+          listener.channel.register(selector, ops, listener)
         } catch {case ex: CancelledKeyException => ex.printStackTrace}
       }
@@ -72 +75 @@
 }
 
-trait WithSocketChannel {
+trait WithSelectableChannel extends Actor {
   def isOpen: Boolean
-  def socketChannel: SelectableChannel
+  def channel: SelectableChannel
 }

blogbird/src/main/scala/org/aiotrade/httpd/coroutine/HttpdRoutines.scala

@@ -70 +70 @@
 import org.aiotrade.httpd.Request
 import org.aiotrade.httpd.ClientConnection
-import org.aiotrade.httpd.ConnectionSelector
+import org.aiotrade.httpd.SelectActor
 import org.aiotrade.httpd.Debugger._
 import scala.actors.Actor
@@ -88 +88 @@
   }
 
-  private object connectionSelector extends Actor {
+  private object acceptActor extends Actor {
 
     /**
@@ -111 +111 @@
     debugln ("PortListener initializing...")
 
-    connectionSelector.start
+    acceptActor.start
   }
 }
@@ -124 +124 @@
   def stop {
     done = true
-    connectionSelector.stop
-  }
-
-  private object connectionSelector extends ConnectionSelector[ClientConnection] {
-    val intersOpts = SelectionKey.OP_READ
+    selectActor.stop
+  }
+
+  private object selectActor extends SelectActor[ClientConnection](SelectionKey.OP_READ) {
 
     def fireEvent(key: SelectionKey, conn: ClientConnection) {
@@ -147 +146 @@
     debugln("Connection Manager initializing...")
     
-    connectionSelector.start
+    selectActor.start
     while (!done) {
       val socketChannel = consume
       val conn = new ClientConnection(socketChannel)
       debugln(" * Got a requesting connection.")
-      connectionSelector.addListener(conn)
+      selectActor.addListener(conn)
     }
   }
@@ -201 +200 @@
   def stop {
     done = true
-    connectionSelector.stop
-  }
-
-  private object connectionSelector extends ConnectionSelector[ClientConnection] {
+    selectActor.stop
+  }
+
+  private object selectActor extends SelectActor[ClientConnection](SelectionKey.OP_WRITE) {
     val intersOpts = SelectionKey.OP_WRITE
 
@@ -226 +225 @@
     debugln("Reply Sender initializing...")
 
-    connectionSelector.start
+    selectActor.start
     while (!done) {
       val reply = consume
@@ -232 +231 @@
       conn.send(reply)
       debugln(" * Sending a reply.")
-      connectionSelector.addListener(conn)
-    }
-  }
-}
+      selectActor.addListener(conn)
+    }
+  }
+}