Changeset 15355 for lang/cplusplus

Timestamp:

07/07/08 13:56:27 (5 years ago)

Author:

kazuho

Message:

merge CoopSocketReader? and Writer

Files:

• lang/cplusplus/friends_framework/trunk/test/proxy.cpp (modified) (3 diffs)

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

@@ -6 +6 @@
 
 struct ProxyConn {
-  CoopRunnable<CoopSocketReader, ProxyConn> clientRead;
-  CoopRunnable<CoopSocketWriter, ProxyConn> clientWrite;
-  CoopRunnable<CoopSocketReader, ProxyConn> serverRead;
-  CoopRunnable<CoopSocketWriter, ProxyConn> serverWrite;
-  CoopRunnable<CoopSleeper, ProxyConn> timeout;
+  CoopRunnableSocket<ProxyConn> clientSock;
+  CoopRunnableSocket<ProxyConn> serverSock;
+  CoopRunnableSleeper<ProxyConn> timeout;
   CoopBuffer dataToServer;
   CoopBuffer dataToClient;
-  ProxyConn(int clientSock, sockaddr *, socklen_t);
-  ~ProxyConn() {
-    close(clientRead.sock);
-    close(serverRead.sock);
+  ProxyConn(int clientFd, sockaddr *, socklen_t)
+  : clientSock(this, &ProxyConn::OnClientRead, &ProxyConn::OnClientWrite),
+    serverSock(this, &ProxyConn::OnServerRead, &ProxyConn::OnServerConnect),
+    timeout(this, &ProxyConn::OnTimeout) {
+    clientSock.SetSock(clientFd);
   }
   ProxyConn *Init();
@@ -25 +24 @@
     delete this;
   }
-  void OnServerConnect(CoopSocketWriter *) {
+  void OnServerConnect(CoopSocket *) {
     ResetTimeout();
-    clientRead.isActive = true;
-    serverRead.isActive = true;
-    serverWrite.func = &ProxyConn::OnServerWrite;
+    clientSock.SetState(CoopSocket::WaitForRead);
+    serverSock.SetState(CoopSocket::WaitForRead);
+    serverSock.writef = &ProxyConn::OnServerWrite;
   }
-  void OnClientRead(CoopSocketReader *) {
+  void OnClientRead(CoopSocket *) {
     ResetTimeout();
-    if (! CoopTransfer::OnRead(&clientRead, &serverWrite, dataToServer))
+    if (! CoopTransfer::OnRead(&clientSock, &serverSock, dataToServer))
       delete this;
   }
-  void OnServerWrite(CoopSocketWriter *) {
+  void OnServerWrite(CoopSocket *) {
     ResetTimeout();
-    if (! CoopTransfer::OnWrite(&clientRead, &serverWrite, dataToServer))
+    if (! CoopTransfer::OnWrite(&clientSock, &serverSock, dataToServer))
       delete this;
   }
-  void OnServerRead(CoopSocketReader *) {
+  void OnServerRead(CoopSocket *) {
     ResetTimeout();
-    if (! CoopTransfer::OnRead(&serverRead, &clientWrite, dataToClient))
+    if (! CoopTransfer::OnRead(&serverSock, &clientSock, dataToClient))
       delete this;
   }
-  void OnClientWrite(CoopSocketWriter *) {
+  void OnClientWrite(CoopSocket *) {
     ResetTimeout();
-    if (! CoopTransfer::OnWrite(&serverRead, &clientWrite, dataToClient))
+    if (! CoopTransfer::OnWrite(&serverSock, &clientSock, dataToClient))
       delete this;
   }
 };
 
-ProxyConn::ProxyConn(int clientSock, sockaddr *, socklen_t)
-: clientRead(this, &ProxyConn::OnClientRead),
-  clientWrite(this, &ProxyConn::OnClientWrite),
-  serverRead(this, &ProxyConn::OnServerRead),
-  serverWrite(this, &ProxyConn::OnServerConnect),
-  timeout(this, &ProxyConn::OnTimeout)
-{
-  clientRead.sock = clientWrite.sock = clientSock;
-  serverRead.sock = serverWrite.sock = ::socket(AF_INET, SOCK_STREAM, 0);
-  assert(serverRead.sock != -1);
-}
-
 ProxyConn *ProxyConn::Init()
 {
-  ::fcntl(serverRead.sock, O_NONBLOCK);
-  if (::connect(serverRead.sock, reinterpret_cast<sockaddr*>(&server_addr),
-              sizeof(server_addr)) == -1) {
+  serverSock.SetSock(::socket(AF_INET, SOCK_STREAM, 0));
+  assert(serverSock.GetSock() != -1);
+  ::fcntl(serverSock.GetSock(), O_NONBLOCK);
+  if (::connect(serverSock.GetSock(), reinterpret_cast<sockaddr*>(&server_addr),
+                sizeof(server_addr)) == -1) {
     switch (errno) {
     case EWOULDBLOCK:
-      serverWrite.isActive = true;
+      serverSock.SetState(serverSock.GetState() | CoopSocket::WaitForWrite);
       break;
     default:
@@ -80 +69 @@
       }
   } else {
-    OnServerConnect(&serverWrite);
+    OnServerConnect(&serverSock);
   }
   ResetTimeout();