add support for TCP

include/tick_conn.h

@@ -3,7 +3,36 @@
 
 class TickConn
 {
+public:
     TickConn(int fd);
-}
+    /*
+     * Set the fd to nonblock && set the flag_ the the fd flag
+     */
+    bool SetNonblock();
+
+private:
+
+    int fd_;
+    int flag_;
+    /*
+     * These functions parse the message from client
+     */
+    Status TickReadHeader(rio_t *rio);
+    Status TickReadCode(rio_t *rio);
+    Status TickReadPacket(rio_t *rio);
+
+    /*
+     * The Variable need by read the buf,
+     * We allocate the memory when we start the server
+     */
+    int header_len_;
+    int32_t r_opcode_;
+    char* rbuf_;
+    int32_t rbuf_len_;
+
+    char* wbuf_;
+    int32_t wbuf_len_;
+    TickThread *thread;
+};
 
 #endif

include/tick_server.h

@@ -17,13 +17,11 @@
 #include "tick_define.h"
 #include "status.h"
 
-
 class TickThread;
 class TickEpoll;
 
 class TickServer
 {
-
 public:
     TickServer();
     ~TickServer();
@@ -35,12 +33,6 @@ class TickServer
 private:
 
     Status SetBlockType(BlockType type);
-    /*
-     * These functions parse the message from client
-     */
-    Status TickReadHeader(rio_t *rio);
-    Status TickReadCode(rio_t *rio);
-    Status TickReadPacket(rio_t *rio);
 
     Status BuildObuf();
     /*
@@ -56,14 +48,9 @@ class TickServer
      */
     TickEpoll *tickEpoll_;
 
-    int header_len_;
-    int32_t r_opcode_;
-    char* rbuf_;
-    int32_t rbuf_len_;
-
 
     /*
-     * Here we used auto poll to find the next work thread, 
+     * Here we used auto poll to find the next work thread,
      * last_thread_ is the last work thread
      */
     int last_thread_;
@@ -78,5 +65,4 @@ class TickServer
 
 };
 
-
 #endif

include/tick_thread.h

@@ -52,7 +52,7 @@ class TickThread
     /*
      * The TickItem queue is the fd queue, receive from master thread
      */
-    std::queue<TickItem *> conn_queue_;
+    std::queue<TickItem> conn_queue_;
 
     /*
      * The epoll handler

include/tick_util.h

@@ -1,6 +1,6 @@
 #ifndef __TICK_UTIL_H__
 #define __TICK_UTIL_H__
 
-int setnonblocking(int sockfd);
+int Setnonblocking(int sockfd);
 
 #endif

src/tick_conn.cc

@@ -1,4 +1,98 @@
-#include "tick_conn"
+#include "tick_conn.h"
+#include "tick_util.h"
 
+TickConn::TickConn(int fd) :
+    fd_(fd)
+{
+    thread_ = NULL;
+}
 
+bool Tick::SetNonblock()
+{
+    flag_ = Setnonblocking(fd_);
+    if (flag_ == -1) {
+        return false;
+    }
+    return true;
+}
 
+Status TickConn::TickReadHeader(rio_t *rio)
+{
+    Status s;
+    char buf[1024];
+    int32_t integer = 0;
+    ssize_t nread;
+    header_len_ = 0;
+    while (1) {
+        nread = rio_readnb(rio, buf, COMMAND_HEADER_LENGTH);
+        // log_info("nread %d", nread);
+        if (nread == -1) {
+            if ((errno == EAGAIN && !(flags_ & O_NONBLOCK)) || (errno == EINTR)) {
+                continue;
+            } else {
+                s = Status::IOError("Read command header error");
+                return s;
+            }
+        } else if (nread == 0){
+            return Status::Corruption("Connect has interrupt");
+        } else {
+            break;
+        }
+    }
+    memcpy((char *)(&integer), buf, sizeof(int32_t));
+    header_len_ = ntohl(integer);
+    return Status::OK();
+}
+
+Status TickServer::TickReadCode(rio_t *rio)
+{
+    Status s;
+    char buf[1024];
+    int32_t integer = 0;
+    ssize_t nread = 0;
+    r_opcode_ = 0;
+    while (1) {
+        nread = rio_readnb(rio, buf, COMMAND_CODE_LENGTH);
+        if (nread == -1) {
+            if ((errno == EAGAIN && !(flags_ & O_NONBLOCK)) || (errno == EINTR)) {
+                continue;
+            } else {
+                s = Status::IOError("Read command code error");
+                return s;
+            }
+        } else if (nread == 0){
+            return Status::Corruption("Connect has interrupt");
+        } else {
+            break;
+        }
+    }
+    memcpy((char *)(&integer), buf, sizeof(int32_t));
+    r_opcode_ = ntohl(integer);
+    return Status::OK();
+}
+
+Status TickServer::TickReadPacket(rio_t *rio)
+{
+    Status s;
+    int nread = 0;
+    if (header_len_ < 4) {
+        return Status::Corruption("The packet no integrity");
+    }
+    while (1) {
+        nread = rio_readnb(rio, (void *)(rbuf_ + COMMAND_HEADER_LENGTH + COMMAND_CODE_LENGTH), header_len_ - 4);
+        if (nread == -1) {
+            if ((errno == EAGAIN && !(flags_ & O_NONBLOCK)) || (errno == EINTR)) {
+                continue;
+            } else {
+                s = Status::IOError("Read data error");
+                return s;
+            }
+        } else if (nread == 0) {
+            return Status::Corruption("Connect has interrupt");
+        } else {
+            break;
+        }
+    }
+    rbuf_len_ = nread;
+    return Status::OK();
+}

src/tick_item.cc

@@ -6,14 +6,11 @@
 #include <unistd.h>
 #include "csapp.h"
 
-TickItem::TickItem(const char* str, int len) :
-    len_(len)
+TickItem::TickItem(int fd) :
+    fd_(fd)
 {
-    msg_ = (char *)malloc(sizeof(char) * len_);
-    memcpy(msg_, str, len_);
 }
 
 TickItem::~TickItem()
 {
-    free(msg_);
 }