tidycoder · Jan 8, 2017 · Jan 8, 2017 · Jan 9, 2017 · Jan 9, 2017 · Jan 9, 2017
Showing 2,452 changed files with 651,802 additions and 230,236 deletions.
diff --git a/.code.yaml b/.code.yaml
@@ -0,0 +1,17 @@
+source:
+  # 文件或目录使用绝对路径，绝对路径按代码库根目录计算，以/开头。
+  # 提供产品代码库中编写的测试代码存放目录或文件名格式,以便后续代码统计环节进行排除等特殊处理
+  # 不要使用.*/等正则表达式屏蔽掉所有代码，会导致部门代码量骤减从而影响部门代码得分，还会导致Coverity扫不到任何代码而失败
+  # 请勿使用Tab键，将会导致yaml解析出错
+  #  test_source:
+  #    #用于匹配文件; 匹配方式为正则表达式。
+  #    filepath_regex: [".*/java/test/.*", ".*/test.java"]
+  # 提供产品代码库中工具或框架自动生成的且在代码库中的代码，没有可为空。以便后续代码统计环节进行排除等特殊处理。
+  #  auto_generate_source:
+  #    # 自动生成代码文件的正则表达式，若无统一标识格式，可以指定具体目录，样例可参考test_source举例
+  #    filepath_regex:
+  # 提供产品代码库中直接以源码形式存在的第三方代码目录或代码文件名的正则表达。
+  # 此处备注的第三方代码在后续统计代码量环节会被排除，若代码库中不存在需要排除的第三方代码，该项配置标识可为空
+  third_party_source:
+    #第三方代码文件的正则表达式，若无统一标识格式，可以指定具体目录，样例可参考test_source举例
+    filepath_regex:[".*/mars/zstd/.*", ".*/mars/googletest/.*", ".*/mars/googlemock/.*", ".*/mars/boost/.*"]
diff --git a/.gitignore b/.gitignore
@@ -6,13 +6,12 @@
 build/
 /mars/captures
 obj/
-
+.vscode/
 *.swp
 *.pyc
 xcuserdata
 xcshareddata
 
-/mars/comm/verinfo.h
 /mars/libraries/*/
 /mars/*/libs/
 !/mars/boost/libs/
@@ -56,7 +55,7 @@ xcshareddata
 /mars/log/win32proj/Debug/*.pdb
 /mars/log/win32proj/Debug/log.tlog/*.tlog
 /mars/log/win32proj/Debug/log.tlog/*.lastbuildstate
-/mars/log/win32proj/Debug/log.tlog/*
+/mars/xlog/win32proj/Debug/log.tlog/*
 /samples/win32test/Debug/*.obj
 /samples/win32test/Debug/*.idb
 /samples/win32test/Debug/*.pdb
@@ -89,3 +88,31 @@ xcshareddata
 .autotools
 .cproject
 .project
+*.lib
+*.pdb
+mars/win32proj/Debug/mars.lastbuildstate
+mars/win32proj/Debug/mars.unsuccessfulbuild
+mars/comm/verinfo.h
+
+# cmake
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+.vs
+mars/*/Win32/Debug
+mars/Win32/Debug
+*.dir
+*.out
+Debug-iphonesimulator
+*.xcodeproj
+*.build
+cmake_build
+*.settings
+mars/cmake-build-debug
+mars/openssl/include/openssl/*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -19,21 +19,21 @@ There are three main branches here:
 1. `master` branch.
 	1. It is the latest (pre-)release branch. We use `master` for tags, with version number `1.1.0`, `1.2.0`, `1.3.0`...
 	2. **Don't submit any PR on `master` branch.**
-2. `dev` branch. 
-	1. It is our stable developing branch. After full testing, `dev` will be merged to `master` branch for the next release.
-	2. **You are recommended to submit bugfix or feature PR on `dev` branch.**
+2. `develop` branch. 
+	1. It is our stable developing branch. After full testing, `develop` will be merged to `master` branch for the next release.
+	2. **You are recommended to submit bugfix or feature PR on `develop` branch.**
 3. `hotfix` branch. 
 	1. It is the latest tag version for hot fix. If we accept your pull request, we may just tag with version number `1.1.1`, `1.2.3`.
 	2. **Only submit urgent PR on `hotfix` branch for next specific release.**
 
-Normal bugfix or feature request should be submitted to `dev` branch. After full testing, we will merge them to `master` branch for the next release. 
+Normal bugfix or feature request should be submitted to `develop` branch. After full testing, we will merge them to `master` branch for the next release. 
 
-If you have some urgent bugfixes on a published version, but the `master` branch have already far away with the latest tag version, you can submit a PR on hotfix. And it will be cherry picked to `dev` branch if it is possible.
+If you have some urgent bugfixes on a published version, but the `master` branch have already far away with the latest tag version, you can submit a PR on hotfix. And it will be cherry picked to `develop` branch if it is possible.
 
 ```
 master
  ↑
-dev        <--- hotfix PR
+develop        <--- hotfix PR
  ↑ 
 feature/bugfix PR
 ```  
@@ -48,7 +48,7 @@ Before submitting a pull request, please make sure the followings are done:
 3. Add the copyright notice to the top of any new files you've added.
 4. Check your code lints and checkstyles.
 5. Test and test again your code.
-6. Now, you can submit your pull request on `dev` or `hotfix` branch.
+6. Now, you can submit your pull request on `develop` or `hotfix` branch.
 
 ## Code Style Guide
 Use [Code Style for C/C++](http://zh-google-styleguide.readthedocs.io/en/latest/google-cpp-styleguide/).

diff --git a/LICENSE b/LICENSE
@@ -31,6 +31,9 @@ All rights reserved.
 Copyright(c)2004,Cisco URP imburses and Network Information Center in Beijing University of Posts and Telecommunications researches
 All right reserved
 
+5. google protobuf
+Copyright 2014, Google Inc.  All rights reserved.
+
 
 Terms of the BSD 3-Clause License:
 --------------------------------------------------------------------
@@ -262,3 +265,22 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+
+
+BSD 2-clause "Simplified" License
+--------------------------------------------------------------------
+micro-ecc
+
+Copyright (c) 2014, Kenneth MacKay
+All rights reserved.
+
+
+Terms of the BSD 2-clause "Simplified" License:
+--------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.