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

Side by Side Diff: components/cronet/android/cronet_bidirectional_stream_adapter.cc

Issue 1412243012: Initial implementation of CronetBidirectionalStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Self review. Created 4 years, 11 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 unified diff | Download patch
OLDNEW
(Empty)
1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "cronet_bidirectional_stream_adapter.h"
6
7 #include <string>
8 #include <vector>
9
10 #include "base/bind.h"
11 #include "base/location.h"
12 #include "base/logging.h"
13 #include "base/strings/string_number_conversions.h"
14 #include "components/cronet/android/cronet_url_request_context_adapter.h"
15 #include "jni/CronetBidirectionalStream_jni.h"
16 #include "net/base/io_buffer.h"
17 #include "net/base/net_errors.h"
18 #include "net/base/request_priority.h"
19 #include "net/cert/cert_status_flags.h"
20 #include "net/http/bidirectional_stream_request_info.h"
21 #include "net/http/http_network_session.h"
22 #include "net/http/http_response_headers.h"
23 #include "net/http/http_status_code.h"
24 #include "net/http/http_transaction_factory.h"
25 #include "net/http/http_util.h"
26 #include "net/spdy/spdy_header_block.h"
27 #include "net/ssl/ssl_info.h"
28 #include "net/url_request/redirect_info.h"
xunjieli 2016/01/21 19:13:07 not used.
mef 2016/01/22 14:33:43 Done.
29 #include "net/url_request/url_request_context.h"
xunjieli 2016/01/21 19:13:07 not used?
mef 2016/01/22 14:33:43 It is needed in cronet::CronetBidirectionalStreamA
xunjieli 2016/01/22 14:52:22 Acknowledged.
30
31 using base::android::ConvertUTF8ToJavaString;
32 using base::android::ConvertJavaStringToUTF8;
33
34 namespace cronet {
35
36 static jlong CreateBidirectionalStream(
37 JNIEnv* env,
38 const JavaParamRef<jobject>& jbidi_stream,
39 jlong jurl_request_context_adapter) {
40 CronetURLRequestContextAdapter* context_adapter =
41 reinterpret_cast<CronetURLRequestContextAdapter*>(
42 jurl_request_context_adapter);
43 DCHECK(context_adapter);
44
45 CronetBidirectionalStreamAdapter* adapter =
46 new CronetBidirectionalStreamAdapter(context_adapter, env, jbidi_stream);
47
48 return reinterpret_cast<jlong>(adapter);
49 }
50
51 // TODO(mef): Extract this and its original from cronet_url_request_adapter.cc
52 // into separate module.
53 // net::WrappedIOBuffer subclass for a buffer owned by a Java ByteBuffer. Keeps
54 // the ByteBuffer alive until destroyed. Uses WrappedIOBuffer because data() is
55 // owned by the embedder.
56 class CronetBidirectionalStreamAdapter::IOBufferWithByteBuffer
57 : public net::WrappedIOBuffer {
58 public:
59 // Creates a buffer wrapping the Java ByteBuffer |jbyte_buffer|. |data| points
60 // to the memory backed by the ByteBuffer, and position is the location to
xunjieli 2016/01/21 19:13:07 nit: s/position/|position|. Maybe also mention |li
mef 2016/01/22 14:33:43 Done.
61 // start writing.
62 IOBufferWithByteBuffer(JNIEnv* env,
63 const JavaParamRef<jobject>& jbyte_buffer,
64 void* data,
65 int position,
66 int limit)
67 : net::WrappedIOBuffer(static_cast<char*>(data) + position),
68 byte_buffer_(env, jbyte_buffer),
69 initial_position_(position),
70 initial_limit_(limit) {
71 DCHECK(data);
72 DCHECK_EQ(env->GetDirectBufferAddress(jbyte_buffer), data);
73 }
74
75 int initial_position() const { return initial_position_; }
76 int initial_limit() const { return initial_limit_; }
77
78 jobject byte_buffer() const { return byte_buffer_.obj(); }
xunjieli 2016/01/21 19:13:07 s/jobject/const JavaParamRef<jobject>& ?
mef 2016/01/22 14:33:43 Hrm, I'm not sure, JavaParamRef seems to suggest t
xunjieli 2016/01/22 14:52:22 Last time I talked to torne@, he said that we shou
mef 2016/01/22 17:36:06 Acknowledged.
79
80 private:
81 ~IOBufferWithByteBuffer() override {}
82
83 base::android::ScopedJavaGlobalRef<jobject> byte_buffer_;
84
85 const int initial_position_;
86 const int initial_limit_;
87 };
88
89 // static
90 bool CronetBidirectionalStreamAdapter::RegisterJni(JNIEnv* env) {
91 return RegisterNativesImpl(env);
92 }
93
94 CronetBidirectionalStreamAdapter::CronetBidirectionalStreamAdapter(
95 CronetURLRequestContextAdapter* context,
96 JNIEnv* env,
97 const JavaParamRef<jobject>& jbidi_stream)
98 : context_(context), owner_(env, jbidi_stream) {}
99
100 CronetBidirectionalStreamAdapter::~CronetBidirectionalStreamAdapter() {
101 DCHECK(context_->IsOnNetworkThread());
102 }
103
104 jint CronetBidirectionalStreamAdapter::Start(
105 JNIEnv* env,
106 const JavaParamRef<jobject>& jcaller,
107 const JavaParamRef<jstring>& jurl,
108 jint jpriority,
109 const JavaParamRef<jstring>& jmethod,
110 const JavaParamRef<jobjectArray>& jheaders,
111 jboolean jend_of_stream) {
112 // Prepare request info here to be able to return the error.
113 scoped_ptr<net::BidirectionalStreamRequestInfo> request_info(
114 new net::BidirectionalStreamRequestInfo());
115 request_info->url = GURL(ConvertJavaStringToUTF8(env, jurl));
116 request_info->priority = static_cast<net::RequestPriority>(jpriority);
117 // Http method is a token, just as header name.
118 request_info->method = ConvertJavaStringToUTF8(env, jmethod);
119 if (!net::HttpUtil::IsValidHeaderName(request_info->method))
120 return -1;
121
122 std::vector<std::string> headers;
123 base::android::AppendJavaStringArrayToStringVector(env, jheaders, &headers);
124 for (size_t i = 0; i < headers.size(); i += 2) {
125 std::string name(headers[i]);
126 std::string value(headers[i + 1]);
127 if (!net::HttpUtil::IsValidHeaderName(name) ||
128 !net::HttpUtil::IsValidHeaderValue(value)) {
129 return i + 1;
130 }
131
xunjieli 2016/01/21 19:13:07 nit: maybe remove this blank line.
mef 2016/01/22 14:33:43 Done.
132 request_info->extra_headers.SetHeader(name, value);
133 }
134 request_info->end_stream_on_headers = jend_of_stream;
135
136 context_->PostTaskToNetworkThread(
137 FROM_HERE,
138 base::Bind(&CronetBidirectionalStreamAdapter::StartOnNetworkThread,
139 base::Unretained(this), base::Passed(&request_info)));
140 return 0;
141 }
142
143 jboolean CronetBidirectionalStreamAdapter::ReadData(
144 JNIEnv* env,
145 const JavaParamRef<jobject>& jcaller,
146 const JavaParamRef<jobject>& jbyte_buffer,
147 jint jposition,
148 jint jlimit) {
149 DCHECK_LT(jposition, jlimit);
xunjieli 2016/01/21 19:13:07 Should we add a check to make sure we are not on t
mef 2016/01/22 14:33:43 Per discussion with Paul it could happen that they
xunjieli 2016/01/22 14:52:22 Acknowledged.
xunjieli 2016/01/22 14:55:40 Why would they want to use a direct executor? Are
150
151 void* data = env->GetDirectBufferAddress(jbyte_buffer);
152 if (!data)
153 return JNI_FALSE;
154
155 scoped_refptr<IOBufferWithByteBuffer> read_buffer(
156 new IOBufferWithByteBuffer(env, jbyte_buffer, data, jposition, jlimit));
157
158 int remaining_capacity = jlimit - jposition;
159
160 context_->PostTaskToNetworkThread(
161 FROM_HERE,
162 base::Bind(&CronetBidirectionalStreamAdapter::ReadDataOnNetworkThread,
163 base::Unretained(this), read_buffer, remaining_capacity));
164 return JNI_TRUE;
165 }
166
167 jboolean CronetBidirectionalStreamAdapter::WriteData(
168 JNIEnv* env,
169 const JavaParamRef<jobject>& jcaller,
170 const JavaParamRef<jobject>& jbyte_buffer,
171 jint jposition,
172 jint jlimit,
173 jboolean jend_of_stream) {
174 DCHECK_LE(jposition, jlimit);
175
176 void* data = env->GetDirectBufferAddress(jbyte_buffer);
177 if (!data)
178 return JNI_FALSE;
179
180 scoped_refptr<IOBufferWithByteBuffer> write_buffer(
181 new IOBufferWithByteBuffer(env, jbyte_buffer, data, jposition, jlimit));
182
183 int remaining_capacity = jlimit - jposition;
184
185 context_->PostTaskToNetworkThread(
186 FROM_HERE,
187 base::Bind(&CronetBidirectionalStreamAdapter::WriteDataOnNetworkThread,
188 base::Unretained(this), write_buffer, remaining_capacity,
189 jend_of_stream));
190 return JNI_TRUE;
191 }
192
193 void CronetBidirectionalStreamAdapter::Destroy(
194 JNIEnv* env,
195 const JavaParamRef<jobject>& jcaller,
196 jboolean jsend_on_canceled) {
197 // Destroy could be called from any thread, including network thread (if
198 // posting task to executor throws an exception), but is posted, so |this|
199 // is valid until calling task is complete. Destroy() is always called from
200 // within a synchronized java block that guarantees no future posts to the
201 // network thread with the adapter pointer.
202 context_->PostTaskToNetworkThread(
203 FROM_HERE,
204 base::Bind(&CronetBidirectionalStreamAdapter::DestroyOnNetworkThread,
205 base::Unretained(this), jsend_on_canceled));
206 }
207
208 // net::BidirectionalStream::Delegate overrides (called on network thread).
xunjieli 2016/01/21 19:13:07 nit: I haven't seen this annotation in cc file. Sh
mef 2016/01/22 14:33:43 Done.
209
210 void CronetBidirectionalStreamAdapter::OnHeadersSent() {
211 VLOG(1) << "OnHeadersSent";
xunjieli 2016/01/21 19:13:07 Debugging statements here and below. We might want
mef 2016/01/22 14:33:43 Done.
212 DCHECK(context_->IsOnNetworkThread());
213 JNIEnv* env = base::android::AttachCurrentThread();
214 cronet::Java_CronetBidirectionalStream_onRequestHeadersSent(env,
215 owner_.obj());
216 }
217
218 void CronetBidirectionalStreamAdapter::OnHeadersReceived(
219 const net::SpdyHeaderBlock& response_headers) {
220 VLOG(1) << "OnHeadersReceived";
221 DCHECK(context_->IsOnNetworkThread());
222 JNIEnv* env = base::android::AttachCurrentThread();
223 // Get http status code from response headers.
224 jint http_status_code = 0;
225 const auto http_status_header = response_headers.find(":status");
226 if (http_status_header != response_headers.end())
227 base::StringToInt(http_status_header->second, &http_status_code);
228
229 std::string protocol;
230 switch (bidi_stream_->GetProtocol()) {
231 case net::kProtoHTTP2:
232 protocol = "h2";
233 default:
234 break;
235 }
236
237 cronet::Java_CronetBidirectionalStream_onResponseHeadersReceived(
238 env, owner_.obj(), http_status_code,
239 ConvertUTF8ToJavaString(env, protocol).obj(),
240 GetHeadersArray(env, response_headers).obj(),
241 bidi_stream_->GetTotalReceivedBytes());
242 }
243
244 void CronetBidirectionalStreamAdapter::OnDataRead(int bytes_read) {
245 VLOG(1) << "OnDataRead:" << bytes_read;
246 DCHECK(context_->IsOnNetworkThread());
247 JNIEnv* env = base::android::AttachCurrentThread();
248 cronet::Java_CronetBidirectionalStream_onReadCompleted(
249 env, owner_.obj(), read_buffer_->byte_buffer(), bytes_read,
250 read_buffer_->initial_position(), read_buffer_->initial_limit(),
251 bidi_stream_->GetTotalReceivedBytes());
252 // Free the read buffer. This lets the Java ByteBuffer be freed, if the
253 // embedder releases it, too.
254 read_buffer_ = nullptr;
255 }
256
257 void CronetBidirectionalStreamAdapter::OnDataSent() {
258 DCHECK(context_->IsOnNetworkThread());
259 JNIEnv* env = base::android::AttachCurrentThread();
260 cronet::Java_CronetBidirectionalStream_onWriteCompleted(
261 env, owner_.obj(), write_buffer_->byte_buffer(),
262 write_buffer_->initial_position(), write_buffer_->initial_limit());
263 // Free the write buffer. This lets the Java ByteBuffer be freed, if the
264 // embedder releases it, too.
265 write_buffer_ = nullptr;
266 }
267
268 void CronetBidirectionalStreamAdapter::OnTrailersReceived(
269 const net::SpdyHeaderBlock& response_trailers) {
270 DCHECK(context_->IsOnNetworkThread());
271 JNIEnv* env = base::android::AttachCurrentThread();
272 cronet::Java_CronetBidirectionalStream_onResponseTrailersReceived(
273 env, owner_.obj(), GetHeadersArray(env, response_trailers).obj());
274 }
275
276 void CronetBidirectionalStreamAdapter::OnFailed(int error) {
277 DCHECK(context_->IsOnNetworkThread());
278 VLOG(1) << "OnFailed:" << error;
279 JNIEnv* env = base::android::AttachCurrentThread();
280 cronet::Java_CronetBidirectionalStream_onError(
281 env, owner_.obj(), error,
282 ConvertUTF8ToJavaString(env, net::ErrorToString(error)).obj(),
283 bidi_stream_->GetTotalReceivedBytes());
284 }
285
286 void CronetBidirectionalStreamAdapter::StartOnNetworkThread(
287 scoped_ptr<net::BidirectionalStreamRequestInfo> request_info) {
288 DCHECK(context_->IsOnNetworkThread());
xunjieli 2016/01/21 19:13:07 Maybe also DCHECK(!bidi_stream_)
mef 2016/01/22 14:33:43 Done.
289
290 VLOG(1) << "Starting bidirectional stream: "
291 << request_info->url.possibly_invalid_spec().c_str();
292
293 bidi_stream_.reset(new net::BidirectionalStream(
294 std::move(request_info), context_->GetURLRequestContext()
295 ->http_transaction_factory()
296 ->GetSession(),
297 this));
298 }
299
300 void CronetBidirectionalStreamAdapter::ReadDataOnNetworkThread(
301 scoped_refptr<IOBufferWithByteBuffer> read_buffer,
302 int buffer_size) {
303 DCHECK(context_->IsOnNetworkThread());
304 DCHECK(read_buffer);
305 DCHECK(!read_buffer_);
306
307 read_buffer_ = read_buffer;
308
309 int bytes_read = bidi_stream_->ReadData(read_buffer_.get(), buffer_size);
310 // If IO is pending, wait for the BidirectionalStream to call OnDataRead.
311 if (bytes_read == net::ERR_IO_PENDING)
312 return;
313
314 if (bytes_read < 0) {
315 OnFailed(bytes_read);
316 return;
317 }
318 OnDataRead(bytes_read);
319 }
320
321 void CronetBidirectionalStreamAdapter::WriteDataOnNetworkThread(
322 scoped_refptr<IOBufferWithByteBuffer> write_buffer,
323 int buffer_size,
324 bool end_of_stream) {
325 DCHECK(context_->IsOnNetworkThread());
326 DCHECK(write_buffer);
327 DCHECK(!write_buffer_);
328
329 write_buffer_ = write_buffer;
330 bidi_stream_->SendData(write_buffer_.get(), buffer_size, end_of_stream);
331 }
332
333 void CronetBidirectionalStreamAdapter::DestroyOnNetworkThread(
334 bool send_on_canceled) {
335 DCHECK(context_->IsOnNetworkThread());
336 if (send_on_canceled) {
337 JNIEnv* env = base::android::AttachCurrentThread();
338 cronet::Java_CronetBidirectionalStream_onCanceled(env, owner_.obj());
339 }
340 delete this;
341 }
342
343 base::android::ScopedJavaLocalRef<jobjectArray>
344 CronetBidirectionalStreamAdapter::GetHeadersArray(
345 JNIEnv* env,
346 const net::SpdyHeaderBlock& header_block) {
347 DCHECK(context_->IsOnNetworkThread());
348
349 std::vector<std::string> headers;
350 for (const auto& header : header_block) {
351 headers.push_back(header.first.as_string());
352 headers.push_back(header.second.as_string());
353 }
354 return base::android::ToJavaArrayOfStrings(env, headers);
355 }
356
357 } // namespace cronet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698