Use clang-format to change the code style to google c++ style (#3461)

* add clang-format and CPPLINT.cfg

* indent: 4 char, line width: 120 char

* batch operation

* fix tests

Author: matyhtf

.clang-format

@@ -0,0 +1,111 @@
+---
+Language:        Cpp
+# BasedOnStyle:  Google
+AccessModifierOffset: -1
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+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: Attach
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:      120
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: 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: false
+IndentPPDirectives: None
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Auto
+TabWidth:        8
+UseTab:          Never

CODE-STYLE.md

@@ -0,0 +1,6 @@
+Code Style
+=======
+* Google C++ Style
+* Indent adjusted to 4 characters
+* Line width adjusted to 120 characters
+

CPPLINT.cfg

@@ -0,0 +1,4 @@
+set noparent
+filter=-build/include_alpha,-build/include_subdir,-build/include_what_you_use,-legal/copyright,-readability/nolint
+braces=4
+linelength=120

code_format.sh

@@ -0,0 +1,34 @@
+# core source file
+clang-format -i src/core/*.cc
+clang-format -i src/coroutine/*.cc
+clang-format -i src/lock/*.cc
+clang-format -i src/memory/*.cc
+clang-format -i src/network/*.cc
+clang-format -i src/os/*.cc
+clang-format -i src/pipe/*.cc
+clang-format -i src/protocol/*.cc
+clang-format -i src/reactor/*.cc
+clang-format -i src/server/*.cc
+clang-format -i src/wrapper/*.cc
+# core header file
+clang-format -i include/*.h
+
+# ext source file
+clang-format -i *.cc
+
+
+clang-format -i examples/cpp/*.cc
+
+# core-tests source file
+clang-format -i core-tests/src/client/*.cpp
+clang-format -i core-tests/src/core/*.cpp
+clang-format -i core-tests/src/coroutine/*.cpp
+clang-format -i core-tests/src/lock/*.cpp
+clang-format -i core-tests/src/memory/*.cpp
+clang-format -i core-tests/src/network/*.cpp
+clang-format -i core-tests/src/os/*.cpp
+clang-format -i core-tests/src/process/*.cpp
+clang-format -i core-tests/src/protocol/*.cpp
+clang-format -i core-tests/src/reactor/*.cpp
+clang-format -i core-tests/src/server/*.cpp
+clang-format -i core-tests/src/main.cpp

core-tests/src/client/client.cpp

@@ -6,36 +6,33 @@
 #define GREETER "Hello Swoole"
 #define GREETER_SIZE sizeof(GREETER)
 
+using swoole::AsyncClient;
 using swoole::test::Process;
 using swoole::test::Server;
-using swoole::AsyncClient;
 
-TEST(client, tcp)
-{
+TEST(client, tcp) {
     int ret;
     swClient cli;
     char buf[128];
 
     pid_t pid;
 
-    Process proc([](Process *proc)
-    {
-        on_receive_lambda_type receive_fn = [](ON_RECEIVE_PARAMS)
-        {
+    Process proc([](Process *proc) {
+        on_receive_lambda_type receive_fn = [](ON_RECEIVE_PARAMS) {
             char *data_ptr = NULL;
             size_t data_len = SERVER_THIS->get_packet(req, (char **) &data_ptr);
 
             SERVER_THIS->send(req->info.fd, data_ptr, data_len);
         };
-        
+
         Server serv(TEST_HOST, TEST_PORT, SW_MODE_BASE, SW_SOCK_TCP);
         serv.on("onReceive", (void *) receive_fn);
         serv.start();
     });
 
     pid = proc.start();
 
-    sleep(1); // wait for the test server to start
+    sleep(1);  // wait for the test server to start
 
     ret = swClient_create(&cli, SW_SOCK_TCP, SW_SOCK_SYNC);
     ASSERT_EQ(ret, 0);
@@ -50,18 +47,15 @@ TEST(client, tcp)
     kill(pid, SIGKILL);
 }
 
-TEST(client, udp)
-{
+TEST(client, udp) {
     int ret;
     swClient cli;
     char buf[128];
 
     pid_t pid;
 
-    Process proc([](Process *proc)
-    {
-        on_packet_lambda_type packet_fn = [](ON_PACKET_PARAMS)
-        {
+    Process proc([](Process *proc) {
+        on_packet_lambda_type packet_fn = [](ON_PACKET_PARAMS) {
             swDgramPacket *packet = nullptr;
             SERVER_THIS->get_packet(req, (char **) &packet);
 
@@ -75,7 +69,7 @@ TEST(client, udp)
 
     pid = proc.start();
 
-    sleep(1); // wait for the test server to start
+    sleep(1);  // wait for the test server to start
 
     ret = swClient_create(&cli, SW_SOCK_UDP, SW_SOCK_SYNC);
     ASSERT_EQ(ret, 0);
@@ -90,17 +84,14 @@ TEST(client, udp)
     kill(pid, SIGKILL);
 }
 
-TEST(client, async_tcp)
-{
+TEST(client, async_tcp) {
     pid_t pid;
 
     swPipe p;
     ASSERT_EQ(swPipeNotify_auto(&p, 1, 1), 0);
 
-    Process proc([&p](Process *proc)
-    {
-        on_receive_lambda_type receive_fn = [](ON_RECEIVE_PARAMS)
-        {
+    Process proc([&p](Process *proc) {
+        on_receive_lambda_type receive_fn = [](ON_RECEIVE_PARAMS) {
             char *data_ptr = NULL;
             size_t data_len = SERVER_THIS->get_packet(req, (char **) &data_ptr);
 
@@ -113,8 +104,7 @@ TEST(client, async_tcp)
 
         serv.on("onReceive", (void *) receive_fn);
 
-        on_workerstart_lambda_type worker_start_fn = [] (ON_WORKERSTART_PARAMS)
-        {
+        on_workerstart_lambda_type worker_start_fn = [](ON_WORKERSTART_PARAMS) {
             swPipe *p = (swPipe *) SERVER_THIS->get_private_data("pipe");
             int64_t value = 1;
             p->write(p, &value, sizeof(value));
@@ -135,22 +125,16 @@ TEST(client, async_tcp)
 
     AsyncClient ac(SW_SOCK_TCP);
 
-    ac.on_connect([](AsyncClient *ac)
-    {
-        ac->send(SW_STRS(GREETER));
-    });
+    ac.on_connect([](AsyncClient *ac) { ac->send(SW_STRS(GREETER)); });
 
-    ac.on_close([](AsyncClient *ac)
-    {
+    ac.on_close([](AsyncClient *ac) {
 
     });
-    ac.on_error([](AsyncClient *ac)
-    {
+    ac.on_error([](AsyncClient *ac) {
 
     });
 
-    ac.on_receive([](AsyncClient *ac, const char *data, size_t len)
-    {
+    ac.on_receive([](AsyncClient *ac, const char *data, size_t len) {
         ASSERT_EQ(len, GREETER_SIZE);
         ASSERT_STREQ(GREETER, data);
         ac->close();

core-tests/src/core/base.cpp

@@ -20,7 +20,7 @@
 #include "tests.h"
 
 TEST(base, DataHead_dump) {
-    swDataHead data = { };
+    swDataHead data = {};
     data.fd = 123;
     char buf[128];
     size_t n = data.dump(buf, sizeof(buf));

core-tests/src/core/channel.cpp

@@ -45,13 +45,12 @@ TEST(channel, push) {
 
     swTrace("size=%d\n", m.size());
 
-    thread t1([&]()
-    {
+    thread t1([&]() {
         auto next = m.find(0);
         int index = 1;
         size_t bytes = 0;
 
-        while(bytes < N) {
+        while (bytes < N) {
             if (c->push(next->second.c_str(), next->second.length()) == SW_OK) {
                 swTrace("[PUSH] index=%d, size=%d\n", index, next->second.length());
                 bytes += next->second.length();
@@ -65,12 +64,11 @@ TEST(channel, push) {
         }
     });
 
-    thread t2([&]()
-    {
+    thread t2([&]() {
         char buf[8000];
         size_t bytes = 0;
         int index = 0;
-        while(bytes < N) {
+        while (bytes < N) {
             int retval = c->pop(buf, sizeof(buf));
             if (retval > 0) {
                 swTrace("[POP] index=%d, size=%ld\n", index, retval);

core-tests/src/core/heap.cpp

@@ -1,16 +1,14 @@
 #include "tests.h"
 #include <map>
 
-typedef struct node_t
-{
+typedef struct node_t {
     int pri;
     int val;
 } node_t;
 
-#define SIZE    100
+#define SIZE 100
 
-TEST(heap, random)
-{
+TEST(heap, random) {
     swHeap *pq;
     node_t *ns;
     node_t *n;
@@ -21,18 +19,16 @@ TEST(heap, random)
     std::map<int, int> _map;
 
     int i;
-    for (i = 0; i < SIZE - 1; i++)
-    {
+    for (i = 0; i < SIZE - 1; i++) {
         int pri = swoole_system_random(10000, 99999);
-        ns = (node_t*) malloc(sizeof(node_t));
+        ns = (node_t *) malloc(sizeof(node_t));
         ns->val = i;
         ns->pri = pri;
         swHeap_push(pq, pri, ns);
         _map[i] = pri;
     }
 
-    while ((n = (node_t*) swHeap_pop(pq)))
-    {
+    while ((n = (node_t *) swHeap_pop(pq))) {
         ASSERT_EQ(_map[n->val], n->pri);
         free(n);
     }