Belated code review regarding pexe content handler.
Adds logging statement for translation process, and fixes
incorrect comment regarding parent class of NaCl content handlers.
See https://codereview.chromium.org/1382713002/ for original CL.
BUG=#396
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1429953003 .
diff --git a/mojo/nacl/nonsfi/irt_pnacl_translator_compile.cc b/mojo/nacl/nonsfi/irt_pnacl_translator_compile.cc
index a49fbda..844f2bf 100644
--- a/mojo/nacl/nonsfi/irt_pnacl_translator_compile.cc
+++ b/mojo/nacl/nonsfi/irt_pnacl_translator_compile.cc
@@ -55,6 +55,9 @@
LOG(FATAL) << "Could not unlink temporary pexe file";
if (pexe_file_stream == nullptr)
LOG(FATAL) << "Could not open pexe for reading";
+ // TODO(smklein): Remove these LOG statements once translation speed
+ // is improved.
+ LOG(INFO) << "Starting compilation of pexe into nexe";
for (;;) {
size_t num_bytes_from_pexe = fread(buf.get(), 1, kBufferSize,
pexe_file_stream);
@@ -65,6 +68,7 @@
break;
}
funcs_->data_callback(buf.get(), num_bytes_from_pexe);
+ LOG(INFO) << "Compiled " << num_bytes_from_pexe << " bytes";
}
buf.reset();
diff --git a/services/nacl/content_handler_main.cc b/services/nacl/content_handler_main.cc
index 1b8886b..bce8bfd 100644
--- a/services/nacl/content_handler_main.cc
+++ b/services/nacl/content_handler_main.cc
@@ -119,7 +119,7 @@
return true;
}
- // Overridden from ContentHandlerFactory::ManagedDelegate:
+ // Overridden from ContentHandlerFactory::Delegate:
void RunApplication(
mojo::InterfaceRequest<mojo::Application> application_request,
mojo::URLResponsePtr response) override {
diff --git a/services/nacl/content_handler_main_nonsfi.cc b/services/nacl/content_handler_main_nonsfi.cc
index 5eee675..86b0ad5 100644
--- a/services/nacl/content_handler_main_nonsfi.cc
+++ b/services/nacl/content_handler_main_nonsfi.cc
@@ -32,7 +32,7 @@
return true;
}
- // Overridden from ContentHandlerFactory::ManagedDelegate:
+ // Overridden from ContentHandlerFactory::Delegate:
void RunApplication(
mojo::InterfaceRequest<mojo::Application> application_request,
mojo::URLResponsePtr response) override {
diff --git a/services/nacl/content_handler_main_nonsfi_pexe.cc b/services/nacl/content_handler_main_nonsfi_pexe.cc
index 6a503d6..ad88a45 100644
--- a/services/nacl/content_handler_main_nonsfi_pexe.cc
+++ b/services/nacl/content_handler_main_nonsfi_pexe.cc
@@ -81,7 +81,7 @@
return true;
}
- // Overridden from ContentHandlerFactory::ManagedDelegate:
+ // Overridden from ContentHandlerFactory::Delegate:
void RunApplication(
mojo::InterfaceRequest<mojo::Application> application_request,
mojo::URLResponsePtr response) override {
