WebSocket Pepper API: fix data corruption at ReceiveMessage in NaCl

ppapi/tests/test_websocket.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 "ppapi/tests/test_websocket.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <algorithm>
 #include <string>
@@ skipping 178 matching lines @@
   RUN_TEST_WITH_REFERENCE_CHECK(UninitializedPropertiesAccess, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(InvalidConnect, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(Protocols, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(GetURL, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(ValidConnect, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(InvalidClose, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(ValidClose, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(GetProtocol, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(TextSendReceive, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(BinarySendReceive, filter);
+  RUN_TEST_WITH_REFERENCE_CHECK(StressedSendReceive, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(BufferedAmount, filter);
 
   RUN_TEST_WITH_REFERENCE_CHECK(CcInterfaces, filter);
 
   RUN_TEST_WITH_REFERENCE_CHECK(UtilityInvalidConnect, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(UtilityProtocols, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(UtilityGetURL, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(UtilityValidConnect, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(UtilityInvalidClose, filter);
   RUN_TEST_WITH_REFERENCE_CHECK(UtilityValidClose, filter);
@@ skipping 421 matching lines @@
   if (result == PP_OK_COMPLETIONPENDING)
     result = callback.WaitForResult();
   ASSERT_EQ(PP_OK, result);
   ASSERT_TRUE(AreEqualWithBinary(received_message, binary));
   ReleaseVar(received_message);
   core_interface_->ReleaseResource(ws);
 
   PASS();
 }
 
+std::string TestWebSocket::TestStressedSendReceive() {
+  // Connect to test echo server.
+  int32_t connect_result;
+  PP_Resource ws = Connect(GetFullURL(kEchoServerURL), &connect_result, "");
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, connect_result);
+
+  // Prepare PP_Var objects to send.
+  const char* text = "hello pepper";
+  PP_Var text_var = CreateVarString(text);
+  std::vector<uint8_t> binary(256);
+  for (uint32_t i = 0; i < binary.size(); ++i)
+    binary[i] = i;
+  PP_Var binary_var = CreateVarBinary(binary);
+
+  // Send amounts of messages.

[dmichael (off chromium), 2012/03/23 17:38:14]

Did you mean something like: "Send many messages." ?

[Takashi Toyoshima, 2012/03/26 08:41:51]

Done.

+  for (int i = 0; i < 256; ++i) {
+    int32_t result = websocket_interface_->SendMessage(ws, text_var);
+    ASSERT_EQ(PP_OK, result);
+    result = websocket_interface_->SendMessage(ws, binary_var);
+    ASSERT_EQ(PP_OK, result);
+  }
+  ReleaseVar(text_var);
+  ReleaseVar(binary_var);
+
+  // Receive echoed binary.

[dmichael (off chromium), 2012/03/23 17:38:14]

binary -> data?

[Takashi Toyoshima, 2012/03/26 08:41:51]

Done.

+  for (int i = 0; i < 512; ++i) {
+    TestCompletionCallback callback(instance_->pp_instance(), force_async_);
+    PP_Var received_message;
+    int32_t result = websocket_interface_->ReceiveMessage(
+        ws, &received_message, static_cast<pp::CompletionCallback>(
+            callback).pp_completion_callback());
+    ASSERT_TRUE(result == PP_OK || result == PP_OK_COMPLETIONPENDING);
+    if (result == PP_OK_COMPLETIONPENDING)
+      result = callback.WaitForResult();
+    ASSERT_EQ(PP_OK, result);
+    if (i & 1) {
+      ASSERT_TRUE(AreEqualWithBinary(received_message, binary));
+    } else {
+      ASSERT_TRUE(AreEqualWithString(received_message, text));
+    }
+    ReleaseVar(received_message);
+  }
+  core_interface_->ReleaseResource(ws);
+
+  PASS();
+}
+
 std::string TestWebSocket::TestBufferedAmount() {
   // Connect to test echo server.
   int32_t connect_result;
   PP_Resource ws = Connect(GetFullURL(kEchoServerURL), &connect_result, "");
   ASSERT_TRUE(ws);
   ASSERT_EQ(PP_OK, connect_result);
 
   // Prepare a large message that is not aligned with the internal buffer
   // sizes.
   std::string message(8193, 'x');
@@ skipping 450 matching lines @@
   size_t last_event = events_on_closed - 1;
   for (uint32_t i = 1; i < last_event; ++i) {
     ASSERT_EQ(WebSocketEvent::EVENT_MESSAGE, events[i].event_type);
     ASSERT_TRUE(AreEqualWithString(events[i].var.pp_var(), message));
   }
   ASSERT_EQ(WebSocketEvent::EVENT_CLOSE, events[last_event].event_type);
   ASSERT_TRUE(events[last_event].was_clean);
 
   PASS();
 }