Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(521)

Side by Side Diff: ppapi/native_client/src/trusted/plugin/plugin.cc

Issue 469423002: NaCl: Send fatal log messages via shared memory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove commented out line Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ppapi/native_client/src/trusted/plugin/plugin.h" 5 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
6 6
7 #include <sys/stat.h> 7 #include <sys/stat.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 pp_instance(), nexe_size, nexe_size); 354 pp_instance(), nexe_size, nexe_size);
355 } else { 355 } else {
356 NaClLog(4, "NexeFileDidOpenContinuation: failed."); 356 NaClLog(4, "NexeFileDidOpenContinuation: failed.");
357 } 357 }
358 NaClLog(4, "Leaving NexeFileDidOpenContinuation\n"); 358 NaClLog(4, "Leaving NexeFileDidOpenContinuation\n");
359 } 359 }
360 360
361 void Plugin::NexeDidCrash(int32_t pp_error) { 361 void Plugin::NexeDidCrash(int32_t pp_error) {
362 PLUGIN_PRINTF(("Plugin::NexeDidCrash (pp_error=%" NACL_PRId32 ")\n", 362 PLUGIN_PRINTF(("Plugin::NexeDidCrash (pp_error=%" NACL_PRId32 ")\n",
363 pp_error)); 363 pp_error));
364 364 nacl_interface_->NexeDidCrash(pp_instance());
365 std::string crash_log =
366 main_subprocess_.service_runtime()->GetCrashLogOutput();
367 nacl_interface_->NexeDidCrash(pp_instance(), crash_log.c_str());
368 } 365 }
369 366
370 void Plugin::BitcodeDidTranslate(int32_t pp_error) { 367 void Plugin::BitcodeDidTranslate(int32_t pp_error) {
371 PLUGIN_PRINTF(("Plugin::BitcodeDidTranslate (pp_error=%" NACL_PRId32 ")\n", 368 PLUGIN_PRINTF(("Plugin::BitcodeDidTranslate (pp_error=%" NACL_PRId32 ")\n",
372 pp_error)); 369 pp_error));
373 if (pp_error != PP_OK) { 370 if (pp_error != PP_OK) {
374 // Error should have been reported by pnacl. Just return. 371 // Error should have been reported by pnacl. Just return.
375 return; 372 return;
376 } 373 }
377 374
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 466
470 void Plugin::SetExitStatusOnMainThread(int32_t pp_error, 467 void Plugin::SetExitStatusOnMainThread(int32_t pp_error,
471 int exit_status) { 468 int exit_status) {
472 DCHECK(pp::Module::Get()->core()->IsMainThread()); 469 DCHECK(pp::Module::Get()->core()->IsMainThread());
473 DCHECK(nacl_interface_); 470 DCHECK(nacl_interface_);
474 nacl_interface_->SetExitStatus(pp_instance(), exit_status); 471 nacl_interface_->SetExitStatus(pp_instance(), exit_status);
475 } 472 }
476 473
477 474
478 } // namespace plugin 475 } // namespace plugin
OLDNEW
« no previous file with comments | « ppapi/c/private/ppb_nacl_private.h ('k') | ppapi/native_client/src/trusted/plugin/service_runtime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698