Changeset 9774 for lang/cplusplus

Timestamp:

04/18/08 23:42:14 (5 years ago)

Author:

kazuho

Message:

strip out transfer logic to separate class

Location:

lang/cplusplus/friends_framework/trunk

Files:

• include/CoopSocket.h (modified) (1 diff)
• include/CoopTransfer.h (added)
• include/friends_framework.h (modified) (1 diff)
• lib/CoopTransfer.cpp (added)
• test/proxy.cpp (modified) (1 diff)

lang/cplusplus/friends_framework/trunk/include/CoopSocket.h

@@ -4 +4 @@
 #include <sys/types.h>
 #include <sys/socket.h>
+#include "CoopThread.h"
 #include "CoopBuffer.h"
 

lang/cplusplus/friends_framework/trunk/include/friends_framework.h

@@ -8 +8 @@
 #include "CoopSocket.h"
 #include "CoopListener.h"
+#include "CoopTransfer.h"
 
 #endif

lang/cplusplus/friends_framework/trunk/test/proxy.cpp

@@ -33 +33 @@
   void OnClientRead(CoopSocketReader *) {
     ResetTimeout();
-    dataToServer = clientRead.Read();
-    if (dataToServer.Size() == 0) {
+    if (! CoopTransfer::OnRead(&clientRead, &serverWrite, dataToServer))
       delete this;
-      return;
-    }
-    serverWrite.isActive = true;
-    clientRead.isActive = false;
   }
-  void OnServerWrite(CoopSocketWriter *s) {
+  void OnServerWrite(CoopSocketWriter *) {
     ResetTimeout();
-    if (! serverWrite.Write(dataToServer)) {
+    if (! CoopTransfer::OnWrite(&clientRead, &serverWrite, dataToServer))
       delete this;
-      return;
-    }
-    if (dataToServer.Size() == 0) {
-      clientRead.isActive = true;
-      serverWrite.isActive = false;
-    }
   }
   void OnServerRead(CoopSocketReader *) {
     ResetTimeout();
-    dataToClient = serverRead.Read();
-    if (dataToClient.Size() == 0) {
+    if (! CoopTransfer::OnRead(&serverRead, &clientWrite, dataToClient))
       delete this;
-      return;
-    }
-    clientWrite.isActive = true;
-    serverRead.isActive = false;
   }
   void OnClientWrite(CoopSocketWriter *) {
     ResetTimeout();
-    if (! clientWrite.Write(dataToClient)) {
+    if (! CoopTransfer::OnWrite(&serverRead, &clientWrite, dataToClient))
       delete this;
-      return;
-    }
-    if (dataToClient.Size() == 0) {
-      serverRead.isActive = true;
-      clientWrite.isActive = false;
-    }
   }
 };