Restart of ceee_broker on crash.

ceee/ie/broker/broker_rpc_server.cc

Index: ceee/ie/broker/broker_rpc_server.cc
===================================================================
--- ceee/ie/broker/broker_rpc_server.cc	(revision 67655)
+++ ceee/ie/broker/broker_rpc_server.cc	(working copy)
@@ -7,8 +7,9 @@
 #include "ceee/ie/broker/broker_rpc_server.h"
 
 #include "base/atomic_sequence_num.h"
+#include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/logging.h"
+#include "base/process_util.h"
 #include "base/win_util.h"
 #include "broker_rpc_lib.h"  // NOLINT
 #include "ceee/common/com_utils.h"
@@ -16,10 +17,34 @@
 #include "ceee/ie/broker/broker_rpc_utils.h"
 #include "ceee/ie/broker/chrome_postman.h"
 
+
+namespace {
 // This lock ensures that histograms created by the broker are thread safe.
 // The histograms created here can be initialized on multiple threads.
 Lock g_metrics_lock;
 
+RPC_STATUS PrepareEndpoint(std::wstring endpoint) {
+  std::wstring protocol = kRpcProtocol;
+  DCHECK(!protocol.empty());

[MAD, 2010/12/01 16:35:23]

Again, I don't understand why we put the static const into a local var???

[Vitaly Buka corp, 2010/12/01 19:06:04]

To avoid const in ::RpcServerUseProtseqEp(
On 2010/12/01 16:35:23, MAD wrote:

+  DCHECK(!endpoint.empty());
+  if (protocol.empty() || endpoint.empty())
+    return false;
+  LOG(INFO) << "RPC server is starting. Endpoint: " << endpoint;
+  // Tell RPC runtime to use local interprocess communication for given
+  // end point.
+  RPC_STATUS status = ::RpcServerUseProtseqEp(
+      reinterpret_cast<RPC_WSTR>(&protocol[0]),
+      RPC_C_PROTSEQ_MAX_REQS_DEFAULT,
+      reinterpret_cast<RPC_WSTR>(&endpoint[0]),
+      NULL);
+  LOG_IF(ERROR, RPC_S_OK != status && RPC_S_DUPLICATE_ENDPOINT != status) <<
+      "Failed to set protocol for RPC end point. RPC_STATUS=0x" <<
+      com::LogWe(status);
+  return status;
+}
+
+}  // namespace
+
 BrokerRpcServer::BrokerRpcServer()
     : is_started_(false),
       current_thread_(::GetCurrentThreadId()) {
@@ -36,24 +61,9 @@
   if (is_started())
     return true;
 
-  std::wstring end_point = GetRpcEndPointAddress();
-  std::wstring protocol = kRpcProtocol;
-  DCHECK(!protocol.empty());
-  DCHECK(!end_point.empty());
-  if (protocol.empty() || end_point.empty())
-    return false;
+  std::wstring endpoint = GetRpcEndpointAddress();
+  RPC_STATUS status = PrepareEndpoint(endpoint);
 
-  LOG(INFO) << "RPC server is starting. Endpoint: " << end_point;
-  // Tell RPC runtime to use local interprocess communication for given
-  // end point.
-  RPC_STATUS status = ::RpcServerUseProtseqEp(
-      reinterpret_cast<RPC_WSTR>(&protocol[0]),
-      RPC_C_PROTSEQ_MAX_REQS_DEFAULT,
-      reinterpret_cast<RPC_WSTR>(&end_point[0]),
-      NULL);
-  LOG_IF(ERROR, RPC_S_OK != status && RPC_S_DUPLICATE_ENDPOINT != status) <<
-      "Failed to set protocol for RPC end point. RPC_STATUS=0x" <<
-      com::LogWe(status);
   if (RPC_S_OK == status || RPC_S_DUPLICATE_ENDPOINT == status) {

[MAD, 2010/12/01 16:35:23]

Please add a comment stating why RPC_S_DUPLICATE_ENDPOINT is OK.

[Vitaly Buka corp, 2010/12/01 19:06:04]

Done. See PrepareEndpoint()

[MAD, 2010/12/01 19:59:40]

Thanks! :-)

     // Register RPC interface with the RPC runtime.
     status = ::RpcServerRegisterIfEx(BrokerRpcServer_CeeeBroker_v1_1_s_ifspec,
@@ -66,7 +76,7 @@
       LOG_IF(ERROR, RPC_S_OK != status) <<
           "Failed to start listening. RPC_STATUS=0x" << com::LogWe(status);
       if (RPC_S_OK == status) {
-        LOG(INFO) << "RPC server is started. Endpoint: " << end_point;
+        LOG(INFO) << "RPC server is started. Endpoints: " << endpoint;

[Sigurður Ásgeirsson, 2010/12/01 14:23:54]

Endpoints->Endpoint

[Vitaly Buka corp, 2010/12/01 19:06:04]

Done.

         is_started_ = true;
       }
     }
@@ -93,6 +103,7 @@
       BrokerRpcServer_CeeeBroker_v1_1_s_ifspec, NULL, FALSE);
   LOG_IF(WARNING, RPC_S_OK != status) <<

[Sigurður Ásgeirsson, 2010/12/01 14:23:54]

Nit: I've seen this warning logged when the broker is registered, maybe there
should be a guard against this?

[Vitaly Buka corp, 2010/12/01 19:06:04]

Done.

          "Failed to unregister interface. RPC_STATUS=0x" << com::LogWe(status);
+
   return RPC_S_OK == status;
 }
 
@@ -127,6 +138,7 @@
 
 void BrokerRpcServer_FireEvent(
     handle_t binding_handle,
+    BrokerContextHandle context,
     const char* event_name,
     const char* event_args) {
   DCHECK(ChromePostman::GetInstance());