Pepper: Clarify end-of-bitcode-stream behavior.

The PutBytes() method in PnaclTranslateThread is used for two purposes: giving
data to the translator processes and signaling the end of the stream.  The way
it's currently done is a bit confusing; this breaks the method into two
for clarity. This is to make code review easier to read for an upcoming change
which removes FileDownloader from the trusted plugin.

BUG=370556

Review URL: https://codereview.chromium.org/383213005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282734 0039d316-1c4b-4281-b951-d872f2087c98

ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc

@@ -444,10 +444,15 @@ void PnaclCoordinator::BitcodeStreamGotData(int32_t pp_error,
                  NACL_PRId32 ", data=%p)\n", pp_error, data ? &(*data)[0] : 0));
   DCHECK(translate_thread_.get());
 
-  translate_thread_->PutBytes(data, pp_error);
-  // If pp_error > 0, then it represents the number of bytes received.
-  if (data && pp_error > 0)
+  // When we have received data, pp_error is set to the number of bytes
+  // received.
+  if (pp_error > 0) {
+    CHECK(data);
+    translate_thread_->PutBytes(data, pp_error);
     pexe_size_ += pp_error;
+  } else {
+    translate_thread_->EndStream();
+  }
 }
 
 StreamCallback PnaclCoordinator::GetCallback() {

ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc

@@ -111,21 +111,11 @@ void PnaclTranslateThread::RunTranslate(
 }
 
 // Called from main thread to send bytes to the translator.
-void PnaclTranslateThread::PutBytes(std::vector<char>* bytes,
-                                             int count) {
+void PnaclTranslateThread::PutBytes(std::vector<char>* bytes, int count) {
   PLUGIN_PRINTF(("PutBytes (this=%p, bytes=%p, size=%" NACL_PRIuS
                  ", count=%d)\n",
                  this, bytes, bytes ? bytes->size() : 0, count));
   size_t buffer_size = 0;
-  // If we are done (error or not), Signal the translation thread to stop.
-  if (count <= PP_OK) {
-    NaClXMutexLock(&cond_mu_);
-    done_ = true;
-    NaClXCondVarSignal(&buffer_cond_);
-    NaClXMutexUnlock(&cond_mu_);
-    return;
-  }
-
   CHECK(bytes != NULL);
   // Ensure that the buffer we send to the translation thread is the right size
   // (count can be < the buffer size). This can be done without the lock.
@@ -144,6 +134,13 @@ void PnaclTranslateThread::PutBytes(std::vector<char>* bytes,
   bytes->resize(buffer_size);
 }
 
+void PnaclTranslateThread::EndStream() {
+  NaClXMutexLock(&cond_mu_);
+  done_ = true;
+  NaClXCondVarSignal(&buffer_cond_);
+  NaClXMutexUnlock(&cond_mu_);
+}
+
 void WINAPI PnaclTranslateThread::DoTranslateThread(void* arg) {
   PnaclTranslateThread* translator =
       reinterpret_cast<PnaclTranslateThread*>(arg);

ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h

@@ -63,6 +63,10 @@ class PnaclTranslateThread {
   // Send bitcode bytes to the translator. Called from the main thread.
   void PutBytes(std::vector<char>* data, int count);
 
+  // Notify the translator that the end of the bitcode stream has been reached.
+  // Called from the main thread.
+  void EndStream();
+
   int64_t GetCompileTime() const { return compile_time_; }
 
  private: