virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 75)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 114
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=114&view=rev
Author:   alllee
Date:     2009-04-20 20:21:13 +0000 (Mon, 20 Apr 2009)

Log Message:
-----------
working on NioDispatcher again for new set of experiments.  It appears to be working
OK but we need to test it with several clients to be sure.  Still unresolved issues
with the read buffer size and handling requests that are too big to fit within one
sent buffer.  Mike Spille's blog here has some good info on NIO:
http://www.jroller.com/pyrasun/entry/practical_nio

Modified Paths:
--------------
    csidex/trunk/src/main/java/edu/asu/commons/net/DispatcherFactory.java
    csidex/trunk/src/main/java/edu/asu/commons/net/NioDispatcher.java

Modified: csidex/trunk/src/main/java/edu/asu/commons/net/DispatcherFactory.java
===================================================================

--- csidex/trunk/src/main/java/edu/asu/commons/net/DispatcherFactory.java	2009-04-20 05:24:33 UTC (rev 113)
+++ csidex/trunk/src/main/java/edu/asu/commons/net/DispatcherFactory.java	2009-04-20 20:21:13 UTC (rev 114)
@@ -23,7 +23,8 @@
     }
     
     public ClientDispatcher createClientDispatcher(EventChannel channel) {
-        return new ClientSocketDispatcher(channel);
+//        return new ClientSocketDispatcher(channel);
+    	return new NioDispatcher(channel, 1);
     }
     
     public ServerDispatcher createServerDispatcher(EventChannel channel) {
@@ -31,7 +32,7 @@
     }
           
     public ServerDispatcher createServerDispatcher(EventChannel channel, int workerPoolSize) {
-        // return new NioDispatcher(sink, workerPoolSize);
-        return new ServerSocketDispatcher(channel, workerPoolSize);
+         return new NioDispatcher(channel, workerPoolSize);
+//        return new ServerSocketDispatcher(channel, workerPoolSize);
     }
 }

Modified: csidex/trunk/src/main/java/edu/asu/commons/net/NioDispatcher.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/net/NioDispatcher.java	2009-04-20 05:24:33 UTC (rev 113)
+++ csidex/trunk/src/main/java/edu/asu/commons/net/NioDispatcher.java	2009-04-20 20:21:13 UTC (rev 114)
@@ -21,6 +21,7 @@
 import edu.asu.commons.event.EventChannel;
 import edu.asu.commons.net.event.ConnectionEvent;
 import edu.asu.commons.net.event.DisconnectionEvent;
+import edu.asu.commons.util.Duration;
 
 
 /**
@@ -32,6 +33,7 @@
  * The NioDispatcher is both a client and a server dispatcher, allowing p2p 
  * connections.
  * 
+ * 
  * FIXME: replace WorkerPool implementation with 1.5 concurrency constructs
  * instead from java.util.concurrent.
  *
@@ -40,7 +42,8 @@
  */
 public class NioDispatcher extends AbstractServerDispatcher implements ClientDispatcher {
 
-    private final static int READ_BUFFER_SIZE = 8192;
+	// FIXME: this is a potential source of bugs
+    private final static int READ_BUFFER_SIZE = 32768;
     
     private final static int BYTES_PER_INT = 4;
     
@@ -106,8 +109,10 @@
     public Identifier connect(InetSocketAddress address) {
         try {
             SocketChannel connection = SocketChannel.open(address);
+            connection.configureBlocking(true);
 //          block until we've read the socket identifier from server.
             Identifier id = readConnectionEvent(connection);
+            connection.configureBlocking(false);
             worker.process(connection);
             // XXX: we return an Identifier that's .equals() with the
             // Identifiers used on the Server side.
@@ -122,9 +127,9 @@
     }
 
     private Identifier readConnectionEvent(SocketChannel connection) throws IOException {
-        connection.configureBlocking(true);
         InputStream in = connection.socket().getInputStream();
         // read past the int header
+        
         in.read();        in.read();        in.read();        in.read();
         ObjectInputStream ois = new ObjectInputStream(in);
         try {
@@ -209,6 +214,7 @@
         }
     }    
         
+//    private Duration duration = Duration.create(1).start();
     /**
      * Writes the given byte array to the SocketChannel identified by this id.
      */
@@ -223,19 +229,21 @@
         }
         synchronized (channel) {
             final int objectSize = data.length;
+//            if (duration.hasExpired()) {
+//            	System.err.println("object size: " + objectSize);
+//            	duration.restart();
+//            }
             // FIXME: could be a performance bottle-neck in the future, allocation
             // can be expensive.
-            // allocate enough space for the object and the int header, which is
-            // defined by the language spec to be 32-bits (4 bytes).  See if
-            // there's a way to dynamically/reliably determine the size of an int
-            // in Java, i.e., equivalent to sizeof operator in C. Then again,
-            // maybe Java will never change from having 32-bit ints.
+            // allocate enough space for the object and the int header.  
+            // ints in Java are defined by the language spec to always 
+            // be 32-bits (4 bytes)
             ByteBuffer buffer = ByteBuffer.allocate(objectSize + BYTES_PER_INT);
             // int header specifying how big the object is is needed so that the
             // other side can know how much data to expect to read.
             buffer.putInt(objectSize);
             buffer.put(data);
-            buffer.clear();
+            buffer.flip();
             channel.write(buffer);
         }
     }
@@ -262,10 +270,7 @@
             buffer.flip();
             
             if (buffer.remaining() == 0) {
-                // FIXME: add some notification to all objects as well,
-                // perhaps pump a DisconnectionEvent into the client-side
-                // EventChannel?
-                getLogger().info("buffer of size 0 for id: " + id + " - disconnecting!");
+                getLogger().warning("buffer of size 0 for id: " + id + " - disconnecting!");
                 disconnect(id, channel);
                 return;
             }
@@ -296,6 +301,7 @@
         // FIXME: assumes that the int itself won't get interrupted!
         int expectedSize = buffer.getInt();
         int actualSize = buffer.remaining();
+//        System.err.println("expected size: " + expectedSize);
         byte[] data = new byte[expectedSize];
         
         if (actualSize >= expectedSize) {
@@ -316,6 +322,7 @@
             // XXX: we are guaranteed that the pending clients doesn't
             // contain the id already, otherwise handleRequest wouldn't have
             // gotten called.
+//            System.err.println("creating new pending data buffer for " + id + " with actual size " + actualSize);
             pendingClients.put(id, new PendingDataBuffer(actualSize, data));
         }
     }
@@ -393,7 +400,7 @@
             @Override
             public void run() {
                 Identifier id = worker.process(incoming);
-                System.err.println("generated id" + id);
+//                System.err.println("generated id" + id);
                 addMapping(id, incoming);
                 // send the newly generated Identifier to the client dispatcher, 
                 // which should be blocked, waiting for it.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2008	Jan	Feb	Mar	Apr	May	Jun (1)	Jul (21)	Aug (31)	Sep (6)	Oct (15)	Nov (2)	Dec (9)
2009	Jan (4)	Feb (6)	Mar (12)	Apr (52)	May (14)	Jun (19)	Jul (81)	Aug (115)	Sep (36)	Oct (88)	Nov (46)	Dec (58)
2010	Jan (52)	Feb (55)	Mar (48)	Apr (15)	May (5)	Jun (38)	Jul (27)	Aug (24)	Sep (28)	Oct (1)	Nov (2)	Dec (29)
2011	Jan (87)	Feb (39)	Mar (63)	Apr (42)	May (26)	Jun (53)	Jul (23)	Aug (43)	Sep (37)	Oct (25)	Nov (4)	Dec (7)
2012	Jan (73)	Feb (79)	Mar (62)	Apr (28)	May (12)	Jun (2)	Jul (9)	Aug (1)	Sep (8)	Oct	Nov (3)	Dec (3)
2013	Jan (8)	Feb (16)	Mar (38)	Apr (74)	May (62)	Jun (15)	Jul (49)	Aug (19)	Sep (9)	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr (2)	May (25)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 75)

virtualcommons-svn — Virtual Commons source control (SVN/HG) commit traffic