Format in Google code style

acxmx · Nov 2, 2019 · a96a3c1 · a96a3c1
1 parent 1b862ed
commit a96a3c1
Show file tree

Hide file tree

Showing 40 changed files with 2,253 additions and 2,763 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,2 @@
+Language: Cpp
+BasedOnStyle: Google
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(WebServer CXX)
 
 if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release")
+    set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
 set(CXX_FLAGS
@@ -17,7 +17,7 @@ set(CXX_FLAGS
 
 set(CMAKE_CXX_COMPILER "g++")
 set(CMAKE_CXX_FLAGS_DEBUG "-O0")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+set(CMAKE_CXX_FLAGS_RELEASE "-O0")
 
 string(REPLACE ";" " " CMAKE_CXX_FLAGS "${CXX_FLAGS}")
 

diff --git a/WebServer/Channel.cpp b/WebServer/Channel.cpp
@@ -1,64 +1,47 @@
 // @Author Lin Ya
 // @Email [email protected]
 #include "Channel.h"
-#include "Util.h"
-#include "Epoll.h"
-#include "EventLoop.h"
+
 #include <unistd.h>
-#include <queue>
 #include <cstdlib>
 #include <iostream>
+
+#include <queue>
+
+#include "Epoll.h"
+#include "EventLoop.h"
+#include "Util.h"
+
 using namespace std;
 
-Channel::Channel(EventLoop *loop):
-    loop_(loop),
-    events_(0),
-    lastEvents_(0),
-    fd_(0)
-{ }
+Channel::Channel(EventLoop *loop)
+    : loop_(loop), events_(0), lastEvents_(0), fd_(0) {}
 
-Channel::Channel(EventLoop *loop, int fd):
-    loop_(loop),
-    fd_(fd), 
-    events_(0),
-    lastEvents_(0)
-{ }
+Channel::Channel(EventLoop *loop, int fd)
+    : loop_(loop), fd_(fd), events_(0), lastEvents_(0) {}
 
-Channel::~Channel()
-{
-    //loop_->poller_->epoll_del(fd, events_);
-    //close(fd_);
+Channel::~Channel() {
+  // loop_->poller_->epoll_del(fd, events_);
+  // close(fd_);
 }
 
-int Channel::getFd()
-{
-    return fd_;
-}
-void Channel::setFd(int fd)
-{
-    fd_ = fd;
-}
+int Channel::getFd() { return fd_; }
+void Channel::setFd(int fd) { fd_ = fd; }
 
-void Channel::handleRead()
-{
-    if (readHandler_)
-    {
-        readHandler_();
-    }
+void Channel::handleRead() {
+  if (readHandler_) {
+    readHandler_();
+  }
 }
 
-void Channel::handleWrite()
-{
-    if (writeHandler_)
-    {
-        writeHandler_();
-    }
+void Channel::handleWrite() {
+  if (writeHandler_) {
+    writeHandler_();
+  }
 }
 
-void Channel::handleConn()
-{
-    if (connHandler_)
-    {
-        connHandler_();
-    }
+void Channel::handleConn() {
+  if (connHandler_) {
+    connHandler_();
+  }
 }
diff --git a/WebServer/Channel.h b/WebServer/Channel.h
@@ -1,131 +1,97 @@
 // @Author Lin Ya
 // @Email [email protected]
 #pragma once
-#include "Timer.h"
-#include <string>
-#include <unordered_map>
-#include <memory>
 #include <sys/epoll.h>
-#include <functional>
 #include <sys/epoll.h>
-
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include "Timer.h"
 
 class EventLoop;
 class HttpData;
 
-
-class Channel
-{
-private:
-    typedef std::function<void()> CallBack;
-    EventLoop *loop_;
-    int fd_;
-    __uint32_t events_;
-    __uint32_t revents_;
-    __uint32_t lastEvents_;
-
-    // 方便找到上层持有该Channel的对象
-    std::weak_ptr<HttpData> holder_;
-
-private:
-    int parse_URI();
-    int parse_Headers();
-    int analysisRequest();
-
-    CallBack readHandler_;
-    CallBack writeHandler_;
-    CallBack errorHandler_;
-    CallBack connHandler_;
-
-public:
-    Channel(EventLoop *loop);
-    Channel(EventLoop *loop, int fd);
-    ~Channel();
-    int getFd();
-    void setFd(int fd);
-
-    void setHolder(std::shared_ptr<HttpData> holder)
-    {
-        holder_ = holder;
-    }
-    std::shared_ptr<HttpData> getHolder()
-    {
-        std::shared_ptr<HttpData> ret(holder_.lock());
-        return ret;
-    }
-
-    void setReadHandler(CallBack &&readHandler)
-    {
-        readHandler_ = readHandler;
-    }
-    void setWriteHandler(CallBack &&writeHandler)
-    {
-        writeHandler_ = writeHandler;
+class Channel {
+ private:
+  typedef std::function<void()> CallBack;
+  EventLoop *loop_;
+  int fd_;
+  __uint32_t events_;
+  __uint32_t revents_;
+  __uint32_t lastEvents_;
+
+  // 方便找到上层持有该Channel的对象
+  std::weak_ptr<HttpData> holder_;
+
+ private:
+  int parse_URI();
+  int parse_Headers();
+  int analysisRequest();
+
+  CallBack readHandler_;
+  CallBack writeHandler_;
+  CallBack errorHandler_;
+  CallBack connHandler_;
+
+ public:
+  Channel(EventLoop *loop);
+  Channel(EventLoop *loop, int fd);
+  ~Channel();
+  int getFd();
+  void setFd(int fd);
+
+  void setHolder(std::shared_ptr<HttpData> holder) { holder_ = holder; }
+  std::shared_ptr<HttpData> getHolder() {
+    std::shared_ptr<HttpData> ret(holder_.lock());
+    return ret;
+  }
+
+  void setReadHandler(CallBack &&readHandler) { readHandler_ = readHandler; }
+  void setWriteHandler(CallBack &&writeHandler) {
+    writeHandler_ = writeHandler;
+  }
+  void setErrorHandler(CallBack &&errorHandler) {
+    errorHandler_ = errorHandler;
+  }
+  void setConnHandler(CallBack &&connHandler) { connHandler_ = connHandler; }
+
+  void handleEvents() {
+    events_ = 0;
+    if ((revents_ & EPOLLHUP) && !(revents_ & EPOLLIN)) {
+      events_ = 0;
+      return;
     }
-    void setErrorHandler(CallBack &&errorHandler)
-    {
-        errorHandler_ = errorHandler;
+    if (revents_ & EPOLLERR) {
+      if (errorHandler_) errorHandler_();
+      events_ = 0;
+      return;
     }
-    void setConnHandler(CallBack &&connHandler)
-    {
-        connHandler_ = connHandler;
+    if (revents_ & (EPOLLIN | EPOLLPRI | EPOLLRDHUP)) {
+      handleRead();
     }
-
-    void handleEvents()
-    {
-        events_ = 0;
-        if ((revents_ & EPOLLHUP) && !(revents_ & EPOLLIN))
-        {
-            events_ = 0;
-            return;
-        }
-        if (revents_ & EPOLLERR)
-        {
-            if (errorHandler_) errorHandler_();
-            events_ = 0;
-            return;
-        }
-        if (revents_ & (EPOLLIN | EPOLLPRI | EPOLLRDHUP))
-        {
-            handleRead();
-        }
-        if (revents_ & EPOLLOUT)
-        {
-            handleWrite();
-        }
-        handleConn();
+    if (revents_ & EPOLLOUT) {
+      handleWrite();
     }
-    void handleRead();
-    void handleWrite();
-    void handleError(int fd, int err_num, std::string short_msg);
-    void handleConn();
+    handleConn();
+  }
+  void handleRead();
+  void handleWrite();
+  void handleError(int fd, int err_num, std::string short_msg);
+  void handleConn();
 
-    void setRevents(__uint32_t ev)
-    {
-        revents_ = ev;
-    }
+  void setRevents(__uint32_t ev) { revents_ = ev; }
 
-    void setEvents(__uint32_t ev)
-    {
-        events_ = ev;
-    }
-    __uint32_t& getEvents()
-    {
-        return events_;
-    }
+  void setEvents(__uint32_t ev) { events_ = ev; }
+  __uint32_t &getEvents() { return events_; }
 
-    bool EqualAndUpdateLastEvents()
-    {
-        bool ret = (lastEvents_ == events_);
-        lastEvents_ = events_;
-        return ret;
-    }
-
-    __uint32_t getLastEvents()
-    {
-        return lastEvents_;
-    }
+  bool EqualAndUpdateLastEvents() {
+    bool ret = (lastEvents_ == events_);
+    lastEvents_ = events_;
+    return ret;
+  }
 
+  __uint32_t getLastEvents() { return lastEvents_; }
 };
 
 typedef std::shared_ptr<Channel> SP_Channel;