ppapi_proxy: Make DebugPrintf more usable....

src/shared/ppapi_proxy/plugin_ppp_impl.cc

 // Copyright (c) 2010 The Native Client Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdarg.h>
 
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/portability_process.h"
 #include "srpcgen/ppp_rpc.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_getinterface.h"
@@ skipping 32 matching lines @@
   NaClSrpcServiceDtor(service);
   channel->client = NULL;
   ppapi_proxy::SetMainSrpcChannel(NULL);
 }
 
 // The plugin will make asynchronous calls to the browser on other threads.
 // The service exported on this channel will be gotten by service discovery.
 bool StartUpcallSrpcChannel(NaClSrpcImcDescType upcall_channel_desc) {
   // Create the upcall srpc client.
   if (upcall_channel_desc == -1) {
-    DebugPrintf("  Bad upcall_channel_desc\n");
     return false;
   }
   NaClSrpcChannel* upcall_channel = reinterpret_cast<NaClSrpcChannel*>(
       calloc(1, sizeof(*upcall_channel)));
   if (NULL == upcall_channel) {
     return false;
   }
   if (!NaClSrpcClientCtor(upcall_channel, upcall_channel_desc)) {
     free(upcall_channel);
     return false;
@@ skipping 18 matching lines @@
     NaClSrpcRpc* rpc,
     NaClSrpcClosure* done,
     int32_t pid,
     int64_t module,
     NaClSrpcImcDescType upcall_channel_desc,
     char* service_description,
     int32_t* nacl_pid,
     int32_t* success) {
   NaClSrpcClosureRunner runner(done);
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
-  DebugPrintf("PPP_InitializeModule: %s\n", service_description);
+  DebugPrintf("Plugin::PPP_InitializeModule: %s\n", service_description);
   // Set up the service for calling back into the browser.
   if (!StartMainSrpcChannel(const_cast<const char*>(service_description),
                             rpc->channel)) {
-    DebugPrintf("  Failed to export service on main channel\n");
+    DebugPrintf("Plugin::PPP_InitializeModule: "
+                "failed to export service on main channel\n");
     return;
   }
   // Set up the upcall channel for calling back into the browser.
   if (!StartUpcallSrpcChannel(upcall_channel_desc)) {
-    DebugPrintf("  Failed to construct upcall channel\n");
+    DebugPrintf("Plugin::PPP_InitializeModule: "
+                "failed to construct upcall channel\n");
     StopMainSrpcChannel();
     return;
   }
   ppapi_proxy::SetModuleIdForSrpcChannel(rpc->channel, module);
   *success = ::PPP_InitializeModule(module, ppapi_proxy::GetInterfaceProxy);
   *nacl_pid = GETPID();
   rpc->result = NACL_SRPC_RESULT_OK;
 }
 
 void PppRpcServer::PPP_ShutdownModule(NaClSrpcRpc* rpc,
                                       NaClSrpcClosure* done) {
   NaClSrpcClosureRunner runner(done);
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
-  DebugPrintf("PPP_ShutdownModule\n");
+  DebugPrintf("Plugin::PPP_ShutdownModule\n");
   ::PPP_ShutdownModule();
   ppapi_proxy::UnsetModuleIdForSrpcChannel(rpc->channel);
   StopUpcallSrpcChannel();
   StopMainSrpcChannel();
   rpc->result = NACL_SRPC_RESULT_OK;
 }
 
 void PppRpcServer::PPP_GetInterface(NaClSrpcRpc* rpc,
                                     NaClSrpcClosure* done,
                                     char* interface_name,
                                     int32_t* exports_interface_name) {
   NaClSrpcClosureRunner runner(done);
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
-  DebugPrintf("PPP_GetInterface(%s)\n", interface_name);
+  DebugPrintf("Plugin::PPP_GetInterface(%s)\n", interface_name);
   // Since the proxy will make calls to proxied interfaces, we need simply
   // to know whether the plugin exports a given interface.
   const void* plugin_interface = ::PPP_GetInterface(interface_name);
   *exports_interface_name = (plugin_interface != NULL);
   rpc->result = NACL_SRPC_RESULT_OK;
 }