Merge pull request #1 from brpc/master

sync with master

.github/stale.yml

@@ -0,0 +1,21 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - discussion
+  - enhancement
+  - bug
+  - security
+  - official
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it's inactive for a long time.
+  It will be closed if no further activity occurs, reopen if you have further ideas.
+  Thank you for your contributions!
+  由于很久没有活跃，此Issue已被自动标记为过期。之后几天仍无变化的话将会被关闭，若你有新想法则可重新打开。感谢你的贡献!
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -11,6 +11,7 @@
 *.pb.h
 *.prof
 *.so
+*.dylib
 /output
 /test/output
 

.travis.yml

@@ -11,13 +11,19 @@ env:
 - PURPOSE=unittest
 - PURPOSE=compile-with-bazel
 
+before_script:
+- ulimit -c unlimited -S       # enable core dumps
+
 before_install:
 - wget --no-clobber https://github.com/bazelbuild/bazel/releases/download/0.8.1/bazel_0.8.1-linux-x86_64.deb
 - sudo dpkg -i bazel_0.8.1-linux-x86_64.deb
+- wget http://www.us.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz && tar -xf thrift-0.11.0.tar.gz && cd thrift-0.11.0/ &&  ./configure --prefix=/usr --with-ruby=no --with-python=no --with-java=no --with-go=no --with-perl=no --with-php=no --with-csharp=no --with-erlang=no --with-lua=no --with-nodejs=no && make CPPFLAGS=-DFORCE_BOOST_SMART_PTR -j 3 -s && sudo make install && cd -
 
 install:
-- sudo apt-get install -qq realpath libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev
+- sudo apt-get install -qq realpath libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev libboost-dev libssl-dev libevent-dev libboost-test-dev
 - sudo apt-get install libgtest-dev && cd /usr/src/gtest && sudo env "PATH=$PATH" cmake . && sudo make && sudo mv libgtest* /usr/lib/ && cd -
+- sudo apt-get install -y gdb  # install gdb
 
 script:
+- if [[ "$PURPOSE" == "compile-with-bazel" ]]; then bazel build -j 12 -c opt --copt -DHAVE_ZLIB=1 //...          ; fi
 - sh build_in_travis_ci.sh

BUILD

@@ -10,11 +10,29 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "with_thrift",
+    define_values = {"with_thrift": "true"},
+    visibility = ["//visibility:public"],
+)
+
 config_setting(
     name = "unittest",
     define_values = {"unittest": "true"},
 )
 
+config_setting(
+    name = "darwin",
+    values = {"cpu": "darwin"},
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "linux",
+    values = {"cpu": "linux"},
+    visibility = ["//visibility:public"],
+)
+
 COPTS = [
     "-DBTHREAD_USE_FAST_PTHREAD_MUTEX",
     "-D__const__=",
@@ -28,16 +46,40 @@ COPTS = [
 ] + select({
     ":with_glog": ["-DBRPC_WITH_GLOG=1"],
     "//conditions:default": ["-DBRPC_WITH_GLOG=0"],
+}) + select({
+    ":with_thrift": ["-DENABLE_THRIFT_FRAMED_PROTOCOL=1"],
+    "//conditions:default": [""],
 })
 
 LINKOPTS = [
     "-lpthread",
-    "-lrt",
+    "-ldl",
+    "-lz", 
     "-lssl",
     "-lcrypto",
-    "-ldl",
-    "-lz",
-]
+] + select({
+    ":darwin": [
+        "-framework CoreFoundation",
+        "-framework CoreGraphics",
+        "-framework CoreData",
+        "-framework CoreText",
+        "-framework Security",
+        "-framework Foundation",
+        "-Wl,-U,_MallocExtension_ReleaseFreeMemory",
+        "-Wl,-U,_ProfilerStart",
+        "-Wl,-U,_ProfilerStop",
+        "-Wl,-U,_RegisterThriftProtocol",
+    ],
+    "//conditions:default": [
+      "-lrt",
+    ],
+}) + select({
+    ":with_thrift": [
+        "-lthriftnb",
+        "-levent",
+        "-lthrift"],
+    "//conditions:default": [],
+})
 
 genrule(
     name = "config_h",
@@ -103,7 +145,6 @@ BUTIL_SRCS = [
     "src/butil/files/scoped_file.cc",
     "src/butil/files/scoped_temp_dir.cc",
     "src/butil/file_util.cc",
-    "src/butil/file_util_linux.cc",
     "src/butil/file_util_posix.cc",
     "src/butil/guid.cc",
     "src/butil/guid_posix.cc",
@@ -118,6 +159,7 @@ BUTIL_SRCS = [
     "src/butil/memory/weak_ptr.cc",
     "src/butil/posix/file_descriptor_shuffle.cc",
     "src/butil/posix/global_descriptors.cc",
+    "src/butil/process_util.cc",
     "src/butil/rand_util.cc",
     "src/butil/rand_util_posix.cc",
     "src/butil/fast_rand.cpp",
@@ -133,15 +175,13 @@ BUTIL_SRCS = [
     "src/butil/strings/string_util.cc",
     "src/butil/strings/string_util_constants.cc",
     "src/butil/strings/stringprintf.cc",
-    "src/butil/strings/sys_string_conversions_posix.cc",
     "src/butil/strings/utf_offset_string_conversions.cc",
     "src/butil/strings/utf_string_conversion_utils.cc",
     "src/butil/strings/utf_string_conversions.cc",
     "src/butil/synchronization/cancellation_flag.cc",
     "src/butil/synchronization/condition_variable_posix.cc",
     "src/butil/synchronization/waitable_event_posix.cc",
     "src/butil/threading/non_thread_safe_impl.cc",
-    "src/butil/threading/platform_thread_linux.cc",
     "src/butil/threading/platform_thread_posix.cc",
     "src/butil/threading/simple_thread.cc",
     "src/butil/threading/thread_checker_impl.cc",
@@ -177,8 +217,82 @@ BUTIL_SRCS = [
     "src/butil/containers/case_ignored_flat_map.cpp",
     "src/butil/iobuf.cpp",
     "src/butil/popen.cpp",
-]
+] + select({
+        ":darwin": [
+            "src/butil/time/time_mac.cc",
+            "src/butil/mac/scoped_mach_port.cc",
+        ],
+        "//conditions:default": [
+            "src/butil/file_util_linux.cc",
+            "src/butil/threading/platform_thread_linux.cc",
+            "src/butil/strings/sys_string_conversions_posix.cc",
+        ],
+})
 
+objc_library(
+    name = "macos_lib",
+    hdrs = [":config_h",
+        "src/butil/atomicops.h",
+        "src/butil/atomicops_internals_atomicword_compat.h",
+        "src/butil/atomicops_internals_mac.h",
+        "src/butil/base_export.h",        
+        "src/butil/basictypes.h",
+        "src/butil/build_config.h",
+        "src/butil/compat.h",
+        "src/butil/compiler_specific.h",
+        "src/butil/containers/hash_tables.h",
+        "src/butil/debug/debugger.h",
+        "src/butil/debug/leak_annotations.h",
+        "src/butil/file_util.h",
+        "src/butil/file_descriptor_posix.h",
+        "src/butil/files/file_path.h",
+        "src/butil/files/file.h",
+        "src/butil/files/scoped_file.h",
+        "src/butil/lazy_instance.h",
+        "src/butil/logging.h",
+        "src/butil/mac/bundle_locations.h",
+        "src/butil/mac/foundation_util.h",
+        "src/butil/mac/scoped_cftyperef.h",
+        "src/butil/mac/scoped_typeref.h",
+        "src/butil/macros.h",
+        "src/butil/memory/aligned_memory.h",
+        "src/butil/memory/scoped_policy.h",
+        "src/butil/memory/scoped_ptr.h",
+        "src/butil/move.h",
+        "src/butil/port.h",
+        "src/butil/posix/eintr_wrapper.h",
+        "src/butil/scoped_generic.h",
+        "src/butil/strings/string16.h",
+        "src/butil/strings/string_piece.h",
+        "src/butil/strings/string_util.h",
+        "src/butil/strings/string_util_posix.h",
+        "src/butil/strings/sys_string_conversions.h",
+        "src/butil/synchronization/lock.h",
+        "src/butil/time/time.h",
+        "src/butil/time.h",        
+        "src/butil/third_party/dynamic_annotations/dynamic_annotations.h",
+        "src/butil/threading/platform_thread.h",
+        "src/butil/threading/thread_restrictions.h",
+        "src/butil/threading/thread_id_name_manager.h",
+        "src/butil/type_traits.h",
+    ],
+    non_arc_srcs = [
+        "src/butil/mac/bundle_locations.mm",
+        "src/butil/mac/foundation_util.mm",
+        "src/butil/file_util_mac.mm",
+        "src/butil/threading/platform_thread_mac.mm",
+        "src/butil/strings/sys_string_conversions_mac.mm",
+    ],
+    deps = [
+        "@com_github_gflags_gflags//:gflags",
+    ] + select({
+        ":with_glog": ["@com_github_google_glog//:glog"],
+        "//conditions:default": [],
+    }),
+    includes = ["src/"],
+    enable_modules = True,
+    tags = ["manual"],
+)
 
 cc_library(
     name = "butil",
@@ -199,6 +313,7 @@ cc_library(
         "@com_github_gflags_gflags//:gflags",
     ] + select({
         ":with_glog": ["@com_github_google_glog//:glog"],
+        ":darwin": [":macos_lib"],
         "//conditions:default": [],
     }),
     includes = [
@@ -343,7 +458,17 @@ cc_library(
     srcs = glob([
         "src/brpc/*.cpp",
         "src/brpc/**/*.cpp",
-    ]),
+    ],
+    exclude = [
+        "src/brpc/thrift_service.cpp",
+        "src/brpc/thrift_message.cpp",
+        "src/brpc/policy/thrift_protocol.cpp",
+    ]) + select({
+        ":with_thrift" : glob([
+            "src/brpc/thrift*.cpp",
+            "src/brpc/**/thrift*.cpp"]),
+        "//conditions:default" : [],
+    }),
     hdrs = glob([
         "src/brpc/*.h",
         "src/brpc/**/*.h"