Merge pull request #27 from an-tao/dev

Add .clang-format

Author: an-tao

.clang-format

@@ -0,0 +1,150 @@
+---
+Language:        Cpp
+# BasedOnStyle:  Google
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false 
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Allman
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+DisableFormat:   false
+FixNamespaceComments: true
+ForEachMacros:   
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories: 
+  - Regex:           '^<ext/.*\.h>'
+    Priority:        2
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth:    4 
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Never
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 10000
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 10000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+RawStringFormats: 
+  - Language:        Cpp
+    Delimiters:      
+      - cc
+      - CC
+      - cpp
+      - Cpp
+      - CPP
+      - 'c++'
+      - 'C++'
+    CanonicalDelimiter: ''
+    BasedOnStyle:    google
+  - Language:        TextProto
+    Delimiters:      
+      - pb
+      - PB
+      - proto
+      - PROTO
+    EnclosingFunctions: 
+      - EqualsProto
+      - EquivToProto
+      - PARSE_PARTIAL_TEXT_PROTO
+      - PARSE_TEST_PROTO
+      - PARSE_TEXT_PROTO
+      - ParseTextOrDie
+      - ParseTextProtoOrDie
+    CanonicalDelimiter: ''
+    BasedOnStyle:    google
+ReflowComments:  true
+SortIncludes:    false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Auto
+StatementMacros: 
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        8
+UseTab:          Never
+...
+

.travis.yml

@@ -1,13 +1,14 @@
 os:
   - linux
   - osx
+
+osx_image: xcode10.1
+
 sudo: required
-dist: trusty
+
+dist: xenial
 
 language: cpp
-compiler:
-  - gcc
-  - clang
 
 addons:
   apt:

README.md

@@ -1,7 +1,6 @@
 # TRANTOR
 
 [![Build Status](https://travis-ci.org/an-tao/trantor.svg?branch=master)](https://travis-ci.org/an-tao/trantor)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/4bcc94325ba64c40b2172a0d44fd9406)](https://app.codacy.com/app/an-tao/trantor?utm_source=github.com&utm_medium=referral&utm_content=an-tao/trantor&utm_campaign=Badge_Grade_Dashboard)
 [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/an-tao/trantor.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/an-tao/trantor/context:cpp)
 
 A non-blocking I/O TCP network library, using C++14/17,    

build.sh

@@ -25,21 +25,22 @@ function build_trantor() {
 
     #If errors then exit
     if [ "$?" != "0" ]; then
-        exit
+        exit -1
     fi
 
     make
 
     #If errors then exit
     if [ "$?" != "0" ]; then
-        exit
+        exit -1 
     fi
 
     echo "Installing ..."
     sudo make install
 
     #Reback current directory
     cd $current_dir
+    exit 0
     #Ok!
 }
 

format.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+clang-format --version
+find trantor -name *.h -o -name *.cc|xargs clang-format -i -style=file

trantor/net/EventLoop.cc

@@ -77,11 +77,11 @@ EventLoop::EventLoop()
     assert(!r);
     fcntl(_wakeupFd[0], F_SETFL, O_NONBLOCK | O_CLOEXEC);
     fcntl(_wakeupFd[1], F_SETFL, O_NONBLOCK | O_CLOEXEC);
-    _wakeupChannelPtr = std::unique_ptr<Channel>(new Channel(this, _wakeupFd[0]));
+    _wakeupChannelPtr =
+        std::unique_ptr<Channel>(new Channel(this, _wakeupFd[0]));
 
 #endif
-    _wakeupChannelPtr->setReadCallback(
-        std::bind(&EventLoop::wakeupRead, this));
+    _wakeupChannelPtr->setReadCallback(std::bind(&EventLoop::wakeupRead, this));
     _wakeupChannelPtr->enableReading();
 }
 #ifdef __linux__
@@ -124,7 +124,9 @@ void EventLoop::removeChannel(Channel *channel)
     if (_eventHandling)
     {
         assert(_currentActiveChannel == channel ||
-               std::find(_activeChannels.begin(), _activeChannels.end(), channel) == _activeChannels.end());
+               std::find(_activeChannels.begin(),
+                         _activeChannels.end(),
+                         channel) == _activeChannels.end());
     }
     _poller->removeChannel(channel);
 }
@@ -156,24 +158,25 @@ void EventLoop::loop()
         _timerQueue->processTimers();
 #endif
         // TODO sort channel by priority
-        //std::cout<<"after ->poll()"<<std::endl;
+        // std::cout<<"after ->poll()"<<std::endl;
         _eventHandling = true;
-        for (auto it = _activeChannels.begin();
-             it != _activeChannels.end(); ++it)
+        for (auto it = _activeChannels.begin(); it != _activeChannels.end();
+             ++it)
         {
             _currentActiveChannel = *it;
             _currentActiveChannel->handleEvent();
         }
         _currentActiveChannel = NULL;
         _eventHandling = false;
-        //std::cout << "looping" << endl;
+        // std::cout << "looping" << endl;
         doRunInLoopFuncs();
     }
     _looping = false;
 }
 void EventLoop::abortNotInLoopThread()
 {
-    LOG_FATAL << "It is forbidden to run loop on threads other than event-loop thread";
+    LOG_FATAL << "It is forbidden to run loop on threads other than event-loop "
+                 "thread";
     exit(-1);
 }
 void EventLoop::runInLoop(const Func &cb)
@@ -237,7 +240,9 @@ TimerId EventLoop::runEvery(double interval, const Func &cb)
 }
 TimerId EventLoop::runEvery(double interval, Func &&cb)
 {
-    return _timerQueue->addTimer(std::move(cb), Date::date().after(interval), interval);
+    return _timerQueue->addTimer(std::move(cb),
+                                 Date::date().after(interval),
+                                 interval);
 }
 void EventLoop::invalidateTimer(TimerId id)
 {
@@ -268,7 +273,7 @@ void EventLoop::wakeup()
 #endif
     if (ret < 0)
     {
-        //LOG_SYSERR << "wakeup error";
+        // LOG_SYSERR << "wakeup error";
     }
 }
 void EventLoop::wakeupRead()
@@ -283,4 +288,4 @@ void EventLoop::wakeupRead()
     if (ret < 0)
         LOG_SYSERR << "wakeup read error";
 }
-} // namespace trantor
+}  // namespace trantor

trantor/net/EventLoop.h

@@ -29,7 +29,6 @@
 
 namespace trantor
 {
-
 class Poller;
 class TimerQueue;
 class Channel;
@@ -43,7 +42,7 @@ enum
 
 class EventLoop : NonCopyable
 {
-public:
+  public:
     EventLoop();
     ~EventLoop();
     void loop();
@@ -75,8 +74,8 @@ class EventLoop : NonCopyable
     // template <typename T>
     // const std::shared_ptr<ObjectPool<T>> &getObjectPool()
     // {
-    //     static std::shared_ptr<ObjectPool<T>> pool=std::make_shared<ObjectPool<T>>();
-    //     return pool;
+    //     static std::shared_ptr<ObjectPool<T>>
+    //     pool=std::make_shared<ObjectPool<T>>(); return pool;
     // }
     ///
     /// Runs callback at 'time'.
@@ -95,10 +94,11 @@ class EventLoop : NonCopyable
     /**
      * Users could use chrono literals to represent a time duration
      * For example:
-     * runAfter(5s, task); 
-     * runAfter(10min, task); 
+     * runAfter(5s, task);
+     * runAfter(10min, task);
      */
-    TimerId runAfter(const std::chrono::duration<long double> &delay, const Func &cb)
+    TimerId runAfter(const std::chrono::duration<long double> &delay,
+                     const Func &cb)
     {
         return runAfter(delay.count(), cb);
     }
@@ -117,26 +117,34 @@ class EventLoop : NonCopyable
     /**
      * Users could use chrono literals to represent a time duration
      * For example:
-     * runEvery(5s, task); 
-     * runEvery(10min, task); 
+     * runEvery(5s, task);
+     * runEvery(10min, task);
      * runEvery(0.1h, task);
      */
-    TimerId runEvery(const std::chrono::duration<long double> &interval, const Func &cb)
+    TimerId runEvery(const std::chrono::duration<long double> &interval,
+                     const Func &cb)
     {
         return runEvery(interval.count(), cb);
     }
-    TimerId runEvery(const std::chrono::duration<long double> &interval, Func &&cb)
+    TimerId runEvery(const std::chrono::duration<long double> &interval,
+                     Func &&cb)
     {
         return runEvery(interval.count(), std::move(cb));
     }
-    //int getAioEventFd();
-    //io_context_t getAioContext() {return ctx_;};
+    // int getAioEventFd();
+    // io_context_t getAioContext() {return ctx_;};
     void invalidateTimer(TimerId id);
 
-    bool isRunning() { return _looping && (!_quit); }
-    bool isCallingFunctions() { return _callingFuncs; }
+    bool isRunning()
+    {
+        return _looping && (!_quit);
+    }
+    bool isCallingFunctions()
+    {
+        return _callingFuncs;
+    }
 
-private:
+  private:
     void abortNotInLoopThread();
     bool _looping;
     const std::thread::id _threadId;
@@ -148,7 +156,7 @@ class EventLoop : NonCopyable
 
     bool _eventHandling;
 
-    //std::mutex _funcsMutex;
+    // std::mutex _funcsMutex;
 
     MpscQueue<Func> _funcs;
     std::unique_ptr<TimerQueue> _timerQueue;
@@ -163,4 +171,4 @@ class EventLoop : NonCopyable
     void doRunInLoopFuncs();
 };
 
-} // namespace trantor
+}  // namespace trantor