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

Unified Diff: src/IceBrowserCompileServer.cpp

Issue 1052833003: First attempt to capture parser/translation errors in browser. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Fix nit. Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: src/IceBrowserCompileServer.cpp
diff --git a/src/IceBrowserCompileServer.cpp b/src/IceBrowserCompileServer.cpp
index 85c2efe89ebc11ea1530bd54c89111a747744686..1cd479348c269c297636dd32bbdd20d5922cac5a 100644
--- a/src/IceBrowserCompileServer.cpp
+++ b/src/IceBrowserCompileServer.cpp
@@ -81,7 +81,9 @@ char *onEndCallback() {
// TODO(jvoung): Also return an error string, and UMA data.
// Set up a report_fatal_error handler to grab that string.
if (gCompileServer->getErrorCode().value()) {
- return strdup("Some error occurred");
+ std::string Error = ErrorStream->getContents();
+ return strdup(Error.empty() ? "Some error occurred" : Error.c_str());
+ return strdup(Message);
jvoung (off chromium) 2015/04/20 21:41:57 remove the dup'ed strdup: "return strdup(Message);
Karl 2015/04/22 22:23:50 Done.
}
return nullptr;
}
@@ -142,9 +144,10 @@ void BrowserCompileServer::startCompileThread(int ObjFD) {
LogStream->SetUnbuffered();
EmitStream = getOutputStream(ObjFD);
EmitStream->SetBufferSize(1 << 14);
+ ErrorStream = new StringStream();
ELFStream.reset(new ELFStreamer(*EmitStream.get()));
Ctx.reset(new GlobalContext(LogStream.get(), EmitStream.get(),
- ELFStream.get(), Flags));
+ ErrorStream.getStream(), ELFStream.get(), Flags);
CompileThread = std::thread([this]() {
Ctx->initParserThread();
this->getCompiler().run(ExtraFlags, *Ctx.get(),

Powered by Google App Engine
This is Rietveld 408576698