Merge "remove wiki.baidu.com from source files"

src/brpc/builtin/common.cpp

@@ -292,12 +292,12 @@ const char* TabsHead() {
 
 const char* logo() {
     return
-        "     __          _     __\n"
-        "    / /_  ____ _(_)___/ /_  __      _________  _____\n"
-        "   / __ \\/ __ `/ / __  / / / /_____/ ___/ __ \\/ ___/\n"
-        "  / /_/ / /_/ / / /_/ / /_/ /_____/ /  / /_/ / /__  \n"
-        " /_.___/\\__,_/_/\\__,_/\\__,_/     /_/  / .___/\\___/  \n"
-        "                                     /_/            ";
+        "    __\n"
+        "   / /_  _________  _____\n"
+        "  / __ \\/ ___/ __ \\/ ___/\n"
+        " / /_/ / /  / /_/ / /__\n"
+        "/_.___/_/  / .___/\\___/\n"
+        "          /_/\n";
 }
 
 const char* ProfilingType2String(ProfilingType t) {

src/brpc/builtin/hotspots_service.cpp

@@ -738,8 +738,7 @@ static void StartProfiling(ProfilingType type,
         if (!enabled) {
             os << "Error: " << type_str << " profiler is not enabled yet.\n"
                 "To enable all profilers, link tcmalloc and define macros BRPC_ENABLE_CPU_PROFILER and BRPC_ENABLE_HEAP_PROFILER\n"
-                "Or read the wiki for more details:\n"
-                "    http://wiki.baidu.com/display/RPC/Builtin+Services#BuiltinServices-Onlineprofiler\n";
+                "Or read the docs: docs/cn/{cpu_profiler.md,heap_profiler.md}\n";
             os.move_to(cntl->response_attachment());
             cntl->http_response().set_status_code(HTTP_STATUS_FORBIDDEN);
             return;
@@ -982,9 +981,9 @@ static void StartProfiling(ProfilingType type,
         os << "<p><span style='color:red'>Error:</span> "
            << type_str << " profiler is not enabled yet.</p>"
             "<p>To enable all profilers, link tcmalloc and define macros BRPC_ENABLE_CPU_PROFILER and BRPC_ENABLE_HEAP_PROFILER"
-            "</p><p>Or read <a href='"
-            "http://wiki.baidu.com/display/RPC/Builtin+Services#BuiltinServices-Onlineprofiler"
-            "'>wiki</a> for more details.</p></body></html>";
+            "</p><p>Or read docs: <a href='http://icode.baidu.com/repo/baidu/opensource/baidu-rpc/files/master/blob/docs/cn/cpu_profiler.md'>cpu_profiler.md</a>
+            " and <a href='http://icode.baidu.com/repo/baidu/opensource/baidu-rpc/files/master/blob/docs/cn/heap_profiler.md'>heap_profiler.md</a>
+            "</p></body></html>";
         os.move_to(cntl->response_attachment());
         cntl->http_response().set_status_code(HTTP_STATUS_FORBIDDEN);
         return;

src/brpc/builtin/index_service.cpp

@@ -87,9 +87,9 @@ void IndexService::default_method(::google::protobuf::RpcController* controller,
     }
     os << '\n';
     if (use_html) {
-        os << "<a href=\"http://wiki.baidu.com/display/RPC\">User Manual</a>";
+        os << "<a href=\"http://icode.baidu.com/repo/baidu/opensource/baidu-rpc/files/master/tree/\">Repo</a>";
     } else {
-        os << "User Manual : http://wiki.baidu.com/display/RPC";
+        os << "Repo : http://icode.baidu.com/repo/baidu/opensource/baidu-rpc/files/master/tree/";
     }
     os << NL << NL;
     if (!as_more) {

src/brpc/builtin/pprof_service.cpp

@@ -97,7 +97,7 @@ void PProfService::profile(
     cntl->http_response().set_content_type("text/plain");
     if ((void*)ProfilerStart == NULL || (void*)ProfilerStop == NULL) {
         cntl->SetFailed(ENOMETHOD, "%s, to enable cpu profiler, check out "
-                        "http://wiki.baidu.com/display/RPC",
+                        "docs/cn/cpu_profiler.md",
                         berror(ENOMETHOD));
         return;
     }    
@@ -206,7 +206,7 @@ void PProfService::heap(
     Controller* cntl = static_cast<Controller*>(controller_base);
     if ((void*)TCMallocGetHeapSample == NULL) {
         cntl->SetFailed(ENOMETHOD, "%s, to enable heap profiler, check out "
-                        "http://wiki.baidu.com/display/RPC",
+                        "docs/cn/heap_profiler.md",
                         berror(ENOMETHOD));
         return;
     }
@@ -234,7 +234,7 @@ void PProfService::growth(
     Controller* cntl = static_cast<Controller*>(controller_base);
     if ((void*)TCMallocGetHeapGrowthStacks == NULL) {
         cntl->SetFailed(ENOMETHOD, "%s, to enable growth profiler, check out "
-                        "http://wiki.baidu.com/display/RPC",
+                        "docs/cn/heap_profiler.md",
                         berror(ENOMETHOD));
         return;
     }

src/brpc/policy/locality_aware_load_balancer.h

@@ -34,11 +34,8 @@ DECLARE_int64(min_weight);
 DECLARE_int64(dev_multiple);
 
 // Locality-aware is an iterative algorithm to send requests to servers which
-// have lowest expected latencies. Read following link to get a peek at the
-// algorithm.
-//   http://wiki.baidu.com/display/RPC/Locality-aware+load+balancing
-// The implemention is complex. It may take you some time to understand
-// correctness and subtlety of the algorithm.
+// have lowest expected latencies. Read docs/cn/lalb.md to get a peek at the
+// algorithm. The implemention is complex.
 class LocalityAwareLoadBalancer : public LoadBalancer {
 public:
     LocalityAwareLoadBalancer();

src/brpc/server.cpp

@@ -1602,7 +1602,7 @@ void Server::PrintTabsBody(std::ostream& os,
                     current_tab_name);
         }
     }
-    os << "<li id='http://wiki.baidu.com/display/RPC/Builtin+Services' "
+    os << "<li id='http://icode.baidu.com/repo/baidu/opensource/baidu-rpc/files/master/blob/docs/cn/builtin_service.md' "
         "class='help'>?</li>\n</ul>\n"
         "<div style='height:40px;'></div>";  // placeholder
 }

src/brpc/server.h

@@ -252,7 +252,7 @@ struct ServerOptions {
     int internal_port;
 
     // Contain a set of builtin services to ease monitoring/debugging.
-    // Read http://wiki.baidu.com/display/RPC/Builtin+Services for details.
+    // Read docs/cn/builtin_service.md for details.
     // DO NOT set this option to false if you don't even know what builtin
     // services are. They're very helpful for addressing runtime problems.
     // Setting to false makes -internal_port ineffective.

src/idl_options.proto

@@ -6,8 +6,6 @@ syntax="proto2";
 
 import "google/protobuf/descriptor.proto";
 
-// Doc: http://wiki.baidu.com/display/RPC/idl+%3C%3D%3E+protobuf
-
 extend google.protobuf.FileOptions {
   // True to generate mcpack parsing/serializing code
   optional bool idl_support = 91000;

src/json2pb/json_to_pb.h

@@ -19,8 +19,6 @@ struct Json2PbOptions {
     bool base64_to_bytes;
 };
 
-// Rules: http://wiki.baidu.com/display/RPC/Json+%3C%3D%3E+Protobuf
-
 // Convert `json' to protobuf `message'.
 // Returns true on success. `error' (if not NULL) will be set with error
 // message on failure.

src/json2pb/pb_to_json.h

@@ -40,8 +40,6 @@ struct Pb2JsonOptions {
     bool bytes_to_base64;
 };
 
-// Rules: http://wiki.baidu.com/display/RPC/Json+%3C%3D%3E+Protobuf
-
 // Convert protobuf `messge' to `json' according to `options'.
 // Returns true on success. `error' (if not NULL) will be set with error
 // message on failure.

tools/patch_from_svn

@@ -34,6 +34,7 @@ fi
 
 cat $PATCHFILE | sed -e 's/src\/baidu\/rpc\//src\/brpc\//g' \
             -e 's/\<baidu\/rpc\//brpc\//g' \
+            -e 's/\<baidu\-rpc\([^-]\)/brpc\1/g' \
             -e 's/\<src\/brpc\/test\/test_\(.*\)\.cpp/test\/brpc_\1_unittest.cpp/g' \
             -e 's/\<test\/test_bthread\.cpp/test\/bthread_unittest.cpp/g' \
             -e 's/\<test\/test_object_pool\.cpp/test\/object_pool_unittest.cpp/g' \