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

Unified Diff: runtime/bin/socket.cc

Issue 11338037: Start reading data from sockets directly into external byte arrays (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Addressed review comments from ager@ Created 8 years, 2 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 | « runtime/bin/io_buffer.cc ('k') | runtime/bin/socket_patch.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/socket.cc
diff --git a/runtime/bin/socket.cc b/runtime/bin/socket.cc
index 0f1c99a0ada7ddd77e4b274568a54e9d483ca420..394c43851260c364afd496f8506c2d944ead084c 100644
--- a/runtime/bin/socket.cc
+++ b/runtime/bin/socket.cc
@@ -2,6 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+#include "bin/io_buffer.h"
#include "bin/socket.h"
#include "bin/dartutils.h"
#include "bin/thread.h"
@@ -58,6 +59,52 @@ void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
}
+void FUNCTION_NAME(Socket_Read)(Dart_NativeArguments args) {
+ Dart_EnterScope();
+ Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
+ intptr_t socket = 0;
+ Socket::GetSocketIdNativeField(socket_obj, &socket);
+ intptr_t available = Socket::Available(socket);
+ if (available > 0) {
+ int64_t length = 0;
+ Dart_Handle length_obj = Dart_GetNativeArgument(args, 1);
+ if (DartUtils::GetInt64Value(length_obj, &length)) {
+ if (length == -1 || available < length) {
+ length = available;
+ }
+ uint8_t* buffer = NULL;
+ Dart_Handle result = IOBuffer::Allocate(length, &buffer);
+ if (Dart_IsError(result)) Dart_PropagateError(result);
+ ASSERT(buffer != NULL);
+ intptr_t bytes_read = Socket::Read(socket, buffer, length);
+ if (bytes_read == length) {
+ Dart_SetReturnValue(args, result);
+ } else if (bytes_read == 0) {
+ // On MacOS when reading from a tty Ctrl-D will result in one
+ // byte reported as available. Attempting to read it out will
+ // result in zero bytes read. When that happens there is no
+ // data which is indicated by a null return value.
+ Dart_SetReturnValue(args, Dart_Null());
+ } else {
+ ASSERT(bytes_read == -1);
+ Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+ }
+ } else {
+ OSError os_error(-1, "Invalid argument", OSError::kUnknown);
+ Dart_Handle err = DartUtils::NewDartOSError(&os_error);
+ if (Dart_IsError(err)) Dart_PropagateError(err);
+ Dart_SetReturnValue(args, err);
+ }
+ } else if (available == 0) {
+ Dart_SetReturnValue(args, Dart_Null());
+ } else {
+ Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+ }
+
+ Dart_ExitScope();
+}
+
+
void FUNCTION_NAME(Socket_ReadList)(Dart_NativeArguments args) {
Dart_EnterScope();
Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
« no previous file with comments | « runtime/bin/io_buffer.cc ('k') | runtime/bin/socket_patch.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698