[NaCl SDK] nacl_io: Add flow control the JavaScript pipes.

native_client_sdk/src/libraries/ppapi_simple/ps_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <termios.h>
 
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
 #include <sstream>
 #include <string>
 #include <vector>
 
 #include "nacl_io/ioctl.h"
 #include "nacl_io/kernel_wrap.h"
+#include "nacl_io/log.h"
 #include "nacl_io/nacl_io.h"
 
 #include "ppapi/c/ppb_var.h"
 
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/message_loop.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/size.h"
 #include "ppapi/cpp/touch_point.h"
@@ skipping 236 matching lines @@
             HandleResize(cols, rows);
         }
       }
       else if (tty_rows || tty_cols) {
         Error("PS_TTY_ROWS and PS_TTY_COLS must be set together");
       }
 
       tioc_nacl_output handler;
       handler.handler = TtyOutputHandlerStatic;
       handler.user_data = this;
-      ioctl(tty_fd_, TIOCNACLOUTPUT, reinterpret_cast<char*>(&handler));
+      ioctl(tty_fd_, TIOCNACLOUTPUT, &handler);
     } else {
       Error("Failed to open /dev/tty.\n");
     }
   }
 
+  RegisterMessageHandler("jspipe1", MessageHandlerInputStatic, this);
+  RegisterMessageHandler("jspipe2", MessageHandlerInputStatic, this);
+  RegisterMessageHandler("jspipe3", MessageHandlerInputStatic, this);
+
   exit_message_ = getenv("PS_EXIT_MESSAGE");
 
   // If PS_EXIT_MESSAGE is set in the envionment then we perform a handshake
   // with JavaScript when program exits.
   if (exit_message_ != NULL)
     nacl_io_register_exit_handler(HandleExitStatic, this);
 
   // Set line buffering on stdout and stderr
 #if !defined(WIN32)
   setvbuf(stderr, NULL, _IOLBF, 0);
@@ skipping 97 matching lines @@
   return count;
 }
 
 void PSInstance::MessageHandlerExit(const pp::Var& message) {
   assert(message.is_string());
   pthread_mutex_lock(&exit_lock_);
   pthread_cond_signal(&exit_cond_);
   pthread_mutex_unlock(&exit_lock_);
 }
 
-void PSInstance::MessageHandlerInput(const pp::Var& message) {
-  // Since our message may contain null characters, we can't send it as a
-  // naked C string, so we package it up in this struct before sending it
-  // to the ioctl.
-  assert(message.is_string());
-  std::string buffer = message.AsString();
+void PSInstance::MessageHandlerInput(const pp::Var& key,
+                                     const pp::Var& message) {
+  std::string key_string = key.AsString();
 
-  struct tioc_nacl_input_string ioctl_message;
-  ioctl_message.length = buffer.size();
-  ioctl_message.buffer = buffer.c_str();
-  int ret =
-    ioctl(tty_fd_, TIOCNACLINPUT, reinterpret_cast<char*>(&ioctl_message));
-  if (ret != 0 && errno != ENOTTY) {
-    Error("ioctl returned unexpected error: %d.\n", ret);
+  // Legacy support for passing TTY data as a string, rather than a array
+  // buffer. TODO(sbc): remove this in a future release.
+  if (message.is_string() && key_string == tty_prefix_) {
+    std::string buffer = message.AsString();
+    Warn("Passing TTY input as a string is deprected.  Please use a "
+         "JavaScript ArrayBuffer instead");
+
+    // Since our message may contain null characters, we can't send it as a
+    // naked C string, so we package it up in this struct before sending it
+    // to the ioctl.
+    struct tioc_nacl_input_string ioctl_message;
+    ioctl_message.length = buffer.size();
+    ioctl_message.buffer = buffer.c_str();
+    int ret =
+      ioctl(tty_fd_, TIOCNACLINPUT, &ioctl_message);
+    if (ret != 0 && errno != ENOTTY) {
+      Error("ioctl returned unexpected error: %d.\n", ret);
+    }
+  }
+
+  if (!message.is_array_buffer()) {
+    Error("Expected ArrayBuffer object but got: %d", message.pp_var().type);
+    return;
+  }
+
+  const char* filename = NULL;
+  if (key_string == tty_prefix_) {
+    filename = "/dev/tty";
+  } else if (key_string == "jspipe1") {
+    filename = "/dev/jspipe1";
+  } else if (key_string == "jspipe2") {
+    filename = "/dev/jspipe2";
+  } else if (key_string == "jspipe3") {
+    filename = "/dev/jspipe3";
+  } else {
+    Error("unexpected input key: %s", key_string.c_str());
+    return;
+  }
+
+  int fd = open(filename, O_RDONLY);
+  if (fd < 0) {
+    Error("error opening file: %s (%s)", filename, strerror(errno));
+    return;
+  }
+
+  int ret = ioctl(fd, NACL_IOC_HANDLEMESSAGE, &message.pp_var());

[binji, 2014/05/01 20:22:31]

did you add this functionality to the ttynode?

[Sam Clegg, 2014/05/01 22:16:55]

No.  TTY still uses the legacy code above for now.  Should I extent this CL to
include TTY?

+  if (ret != 0) {
+    Error("ioctl on %s failed: %d.\n", filename, ret);
+    return;
   }
 }
 
 void PSInstance::HandleExitStatic(int status, void* user_data) {
   PSInstance* instance = reinterpret_cast<PSInstance*>(user_data);
   instance->ExitHandshake(status);
 }
 
 void PSInstance::HandleResize(int width, int height) {
   struct winsize size;
   memset(&size, 0, sizeof(size));
   size.ws_col = width;
   size.ws_row = height;
-  ioctl(tty_fd_, TIOCSWINSZ, reinterpret_cast<char*>(&size));
+  ioctl(tty_fd_, TIOCSWINSZ, &size);
 }
 
 void PSInstance::MessageHandlerResize(const pp::Var& message) {
   assert(message.is_array());
   pp::VarArray array(message);
   assert(array.GetLength() == 2);
 
   int width = array.Get(0).AsInt();
   int height = array.Get(1).AsInt();
   HandleResize(width, height);
@@ skipping 10 matching lines @@
                                           const pp::Var& value,
                                           void* user_data) {
   PSInstance* instance = reinterpret_cast<PSInstance*>(user_data);
   instance->MessageHandlerExit(value);
 }
 
 void PSInstance::MessageHandlerInputStatic(const pp::Var& key,
                                            const pp::Var& value,
                                            void* user_data) {
   PSInstance* instance = reinterpret_cast<PSInstance*>(user_data);
-  instance->MessageHandlerInput(value);
+  instance->MessageHandlerInput(key, value);
 }
 
 void PSInstance::MessageHandlerResizeStatic(const pp::Var& key,
                                             const pp::Var& value,
                                             void* user_data) {
   PSInstance* instance = reinterpret_cast<PSInstance*>(user_data);
   instance->MessageHandlerResize(value);
 }
 
 void PSInstance::RegisterMessageHandler(std::string message_name,
                                         MessageHandler_t handler,
                                         void* user_data) {
+  Trace("registering msg handler: %s", message_name.c_str());
   if (handler == NULL) {
     message_handlers_.erase(message_name);
     return;
   }
 
   MessageHandler message_handler = { handler, user_data };
   message_handlers_[message_name] = message_handler;
 }
 
 void PSInstance::PostEvent(PSEventType type, const PP_Var& var) {
   assert(PSE_INSTANCE_HANDLEMESSAGE == type);
 
-  // If the user has specified a tty_prefix_, then filter out the
-  // matching message here and pass them to the tty node via
-  // ioctl() rather then adding them to the event queue.
   pp::Var event(var);
+  // Legacy support for passing TTY input as a string <prefix>:<payload>
+  // TODO(sbc): remove this in a future release.
   if (tty_fd_ >= 0 && event.is_string()) {
+    Warn("passing TTY data using a string prefix is deprected."
+         " Use a JavaScript dictionary instead.");
     std::string message = event.AsString();
     size_t prefix_len = strlen(tty_prefix_);
     if (message.size() > prefix_len) {
       if (!strncmp(message.c_str(), tty_prefix_, prefix_len)) {
-        MessageHandlerInput(pp::Var(message.substr(prefix_len)));
+        MessageHandlerInput(pp::Var(message.substr(0, prefix_len)),
+                            pp::Var(message.substr(prefix_len)));
         return;
       }
     }
   }
 
   // If the message is a dictionary then see if it matches one
   // of the specific handlers, then call that handler rather than
   // queuing an event.
   if (event.is_dictionary()) {
     pp::VarDictionary dictionary(var);
     pp::VarArray keys = dictionary.GetKeys();
     if (keys.GetLength() == 1) {
       pp::Var key = keys.Get(0);
+      Trace("calling handler for: %s", key.AsString().c_str());
       MessageHandlerMap::iterator iter =
           message_handlers_.find(key.AsString());
       if (iter != message_handlers_.end()) {
         MessageHandler_t handler = iter->second.handler;
         void* user_data = iter->second.user_data;
         handler(key, dictionary.Get(key), user_data);
         return;
       }
     }
   }
@@ skipping 74 matching lines @@
 
 void PSInstance::Graphics3DContextLost() {
   Log("Graphics3DContextLost\n");
   PostEvent(PSE_GRAPHICS3D_GRAPHICS3DCONTEXTLOST);
 }
 
 void PSInstance::MouseLockLost() {
   Log("MouseLockLost\n");
   PostEvent(PSE_MOUSELOCK_MOUSELOCKLOST);
 }