Changeset 15397 for lang/cplusplus/friends_framework/trunk/include/CoopSocket.h

Timestamp:

07/07/08 21:41:05 (5 years ago)

Author:

kazuho

Message:

switch to edge-trigger-based design

Files:

• lang/cplusplus/friends_framework/trunk/include/CoopSocket.h (modified) (3 diffs)

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

@@ -2 +2 @@
 #define COOPSOCKET_H
 
+#include <errno.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include "CoopThread.h"
 #include "CoopBuffer.h"
+#include "CoopSocketMgr.h"
 
 class CoopSocket : public CoopThread {
+  friend class CoopSocketMgr;
 public:
   enum {
-    WaitForRead = 0x1,
-    WaitForWrite = 0x2
+    WaitForRead    = 0x1,
+    WaitForWrite   = 0x2,
+    ReadBufIsEmpty = 0x4,
+    WriteBufIsFull = 0x8
   };
 protected:
@@ -17 +23 @@
   int state;
 public:
-  CoopSocket(CoopThreadMgr *m) : CoopThread(m), sock(-1), state(0) {}
+  CoopSocket(CoopThreadMgr *m) : CoopThread(m), sock(-1), state(0) {
+  }
   virtual ~CoopSocket() {
-    if (sock != -1)
+    if (sock != -1) {
+      mgr->GetSocketMgr()->DetachThread(this);
       ::close(sock);
+    }
   }
   int GetSock() const { return sock; }
-  void SetSock(int s) { assert(sock == -1) ; sock = s; }
-  int GetState() const { return state; }
-  void SetState(int s) { state = s; }
+  void SetSock(int s) {
+    assert(sock == -1);
+    ::fcntl(s, F_SETFL, O_NONBLOCK);
+    sock = s;
+    mgr->GetSocketMgr()->AttachThread(this);
+  }
+  void SetWaitForRead() { state |= WaitForRead; }
+  void ClearWaitForRead() { state &= ~WaitForRead; }
+  void SetWaitForWrite() { state |= WaitForWrite; }
+  void ClearWaitForWrite() { state &= ~WaitForWrite; }
   int Accept(struct sockaddr *addr = NULL, socklen_t *addrlen = NULL) {
     return accept(sock, addr, addrlen);
   }
-  CoopBuffer Read() {
-    CoopBuffer buf;
+  bool Read(CoopBuffer &buf) {
+    if (buf.Size() != 0)
+      return true;
+    if ((state & ReadBufIsEmpty) != 0)
+      return true;
     ssize_t bytesRead = read(sock, buf.Bytes(), buf.Capacity());
     if (bytesRead > 0)
-      buf.SetSize(bytesRead);
-    return buf;
-  }
-  bool Write(CoopBuffer& buf) {
-    ssize_t bytesWritten = write(sock, buf.Bytes(), buf.Size());
-    if (bytesWritten <= 0)
+      buf.AdjustSize(bytesRead);
+    else if (bytesRead == -1 && errno == EAGAIN)
+      state |= ReadBufIsEmpty;
+    else
       return false;
-    buf.PopBytes(bytesWritten);
     return true;
   }
-  virtual void SetupSelect(int *nfds, fd_set *readFds, fd_set *writeFds,
-                           timeval *) {
-    if ((state & WaitForRead) != 0) {
-      *nfds = std::max(*nfds, sock + 1);
-      FD_SET(sock, readFds);
-    }
-    if ((state & WaitForWrite) != 0) {
-      *nfds = std::max(*nfds, sock + 1);
-      FD_SET(sock, writeFds);
-    }
+  bool Write(CoopBuffer &buf) {
+    if ((state & WriteBufIsFull) != 0)
+      return true;
+    ssize_t bytesWritten = write(sock, buf.Bytes(), buf.Size());
+    if (bytesWritten > 0)
+      buf.PopBytes(bytesWritten);
+    else if (bytesWritten == -1 && errno == EAGAIN)
+        state |= WriteBufIsFull;
+    else
+      return false;
+    return true;
   }
+  virtual void Run(bool is_read) = 0;
 };
 
@@ -65 +83 @@
                      void (Impl::*wf)(CoopSocket *))
   : CoopSocket(m), impl(i), readf(rf), writef(wf) {}
-  virtual void Run(fd_set *readFds, fd_set *writeFds) {
-    if ((state & WaitForRead) != 0 && FD_ISSET(sock, readFds)) {
+  virtual void Run(bool is_read) {
+    if (is_read)
       (impl->*readf)(this);
-    } else if ((state & WaitForWrite) != 0 && FD_ISSET(sock, writeFds)) {
+    else
       (impl->*writef)(this);
-    }
   }
 };