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

Unified Diff: tools/pnacl-llc/SRPCStreamer.cpp

Issue 23753003: Report fatal translator errors to the browser (Closed) Base URL: http://git.chromium.org/native_client/pnacl-llvm.git@master
Patch Set: split errors from streamable readBytes and Header ReadPrefix Created 7 years, 3 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
« no previous file with comments | « tools/pnacl-llc/SRPCStreamer.h ('k') | tools/pnacl-llc/pnacl-llc.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/pnacl-llc/SRPCStreamer.cpp
diff --git a/tools/pnacl-llc/SRPCStreamer.cpp b/tools/pnacl-llc/SRPCStreamer.cpp
index e6546aef5f601eeb9c51cb8aba49c61bcb221486..ddec846d2c915a9d6a90874bb1595e3901c62435 100644
--- a/tools/pnacl-llc/SRPCStreamer.cpp
+++ b/tools/pnacl-llc/SRPCStreamer.cpp
@@ -119,19 +119,30 @@ llvm::DataStreamer *SRPCStreamer::init(void *(*Callback)(void *), void *arg,
}
size_t SRPCStreamer::gotChunk(unsigned char *bytes, size_t len) {
- if (Error) return 0;
+ if (__sync_fetch_and_add(&Error, 0)) return 0; // Atomic read.
return Q.PutBytes(bytes, len);
}
int SRPCStreamer::streamEnd(std::string *ErrMsg) {
Q.SetDone();
int err = pthread_join(CompileThread, NULL);
- if (err) {
+ __sync_synchronize();
+ if (Error) {
+ if (ErrMsg)
+ *ErrMsg = std::string("PNaCl Translator Error: " + ErrorMessage);
+ return 1;
+ } else if (err) {
if (ErrMsg) *ErrMsg = std::string(strerror(errno));
return err;
}
- if (Error && ErrMsg) *ErrMsg = std::string("compile failed.");
- return Error;
+ return 0;
+}
+
+void SRPCStreamer::setFatalError(const std::string& message) {
+ __sync_fetch_and_add(&Error, 1);
+ ErrorMessage = message;
+ __sync_synchronize();
+ pthread_exit(NULL);
}
#endif // __native_client__
« no previous file with comments | « tools/pnacl-llc/SRPCStreamer.h ('k') | tools/pnacl-llc/pnacl-llc.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698