From ac07ec5b9c77be3f04ba27b4ea1287a92862fd67 Mon Sep 17 00:00:00 2001 From: "teravest@chromium.org" Date: Mon, 22 Apr 2013 17:32:45 +0000 Subject: Pepper: Add VLOG support for NaCl plugins. Previously, VLOG statements would never log anything to the console, since there was no way for state from the "v" and "vmodule" flags to be passed to the untrusted NaCl process. This change passes the values of the "v" and "vmodule" flags to the untrusted process as part of channel creation, and then re-initializes the logging subsystem to parse the new flag values. BUG=181607 R=dmichael Review URL: https://codereview.chromium.org/13866034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195541 0039d316-1c4b-4281-b951-d872f2087c98 --- base/logging.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'base/logging.cc') diff --git a/base/logging.cc b/base/logging.cc index b5e4999..0c4a302 100644 --- a/base/logging.cc +++ b/base/logging.cc @@ -163,6 +163,8 @@ void CloseFile(FileHandle log) { void DeleteFilePath(const PathString& log_name) { #if defined(OS_WIN) DeleteFile(log_name.c_str()); +#elif defined (OS_NACL) + // Do nothing; unlink() isn't supported on NaCl. #else unlink(log_name.c_str()); #endif @@ -348,9 +350,11 @@ bool BaseInitLoggingImpl(const PathChar* new_log_file, LogLockingState lock_log, OldFileDeletionState delete_old, DcheckState dcheck_state) { +#if defined(OS_NACL) + CHECK(logging_dest == LOG_NONE || + logging_dest == LOG_ONLY_TO_SYSTEM_DEBUG_LOG); +#endif g_dcheck_state = dcheck_state; -// TODO(bbudge) Hook this up to NaCl logging. -#if !defined(OS_NACL) CommandLine* command_line = CommandLine::ForCurrentProcess(); // Don't bother initializing g_vlog_info unless we use one of the // vlog switches. @@ -393,10 +397,6 @@ bool BaseInitLoggingImpl(const PathChar* new_log_file, DeleteFilePath(*log_file_name); return InitializeLogFileHandle(); -#else - (void) g_vlog_info_prev; - return true; -#endif // !defined(OS_NACL) } void SetMinLogLevel(int level) { -- cgit v1.1