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

Side by Side Diff: components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java

Issue 1926683003: [Cronet] Avoid crashing when CronetEngines are created on multiple threads (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address mef comments Created 4 years, 7 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
1 // Copyright 2015 The Chromium Authors. All rights reserved. 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 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.net; 5 package org.chromium.net;
6 6
7 import android.content.Context; 7 import android.content.Context;
8 import android.os.Handler; 8 import android.os.Handler;
9 import android.os.Looper; 9 import android.os.Looper;
10 10
11 import org.chromium.base.ContextUtils; 11 import org.chromium.base.ContextUtils;
12 import org.chromium.base.Log; 12 import org.chromium.base.Log;
13 import org.chromium.base.annotations.JNINamespace; 13 import org.chromium.base.annotations.JNINamespace;
14 14
15 /** 15 /**
16 * CronetLibraryLoader loads and initializes native library on main thread. 16 * CronetLibraryLoader loads and initializes native library on main thread.
17 */ 17 */
18 @JNINamespace("cronet") 18 @JNINamespace("cronet")
19 class CronetLibraryLoader { 19 class CronetLibraryLoader {
20 /** 20 // Synchronize initialization.
21 * Synchronize access to sInitTaskPosted and initialization routine.
22 */
23 private static final Object sLoadLock = new Object(); 21 private static final Object sLoadLock = new Object();
24 private static final String TAG = "CronetLibraryLoader"; 22 private static final String TAG = "CronetLibraryLoader";
25 private static boolean sInitTaskPosted = false; 23 // Has library loading commenced? Setting guarded by sLoadLock.
24 private static volatile boolean sInitStarted = false;
25 // Has ensureMainThreadInitialized() completed? Only accessed on main threa d.
26 private static boolean sMainThreadInitDone = false;
26 27
27 /** 28 /**
28 * Ensure that native library is loaded and initialized. Can be called from 29 * Ensure that native library is loaded and initialized. Can be called from
29 * any thread, the load and initialization is performed on main thread. 30 * any thread, the load and initialization is performed on main thread.
30 */ 31 */
31 public static void ensureInitialized( 32 static void ensureInitialized(final Context context, final CronetEngine.Buil der builder) {
32 final Context context, final CronetEngine.Builder builder) {
33 synchronized (sLoadLock) { 33 synchronized (sLoadLock) {
34 if (sInitTaskPosted) { 34 if (sInitStarted) {
35 return; 35 return;
36 } 36 }
37 sInitStarted = true;
37 builder.loadLibrary(); 38 builder.loadLibrary();
38 if (!Version.CRONET_VERSION.equals(nativeGetCronetVersion())) { 39 if (!Version.CRONET_VERSION.equals(nativeGetCronetVersion())) {
39 throw new RuntimeException(String.format( 40 throw new RuntimeException(String.format(
40 "Expected Cronet version number %s, " 41 "Expected Cronet version number %s, "
41 + "actual version number %s.", 42 + "actual version number %s.",
42 Version.CRONET_VERSION, 43 Version.CRONET_VERSION,
43 nativeGetCronetVersion())); 44 nativeGetCronetVersion()));
44 } 45 }
45 Log.i(TAG, "Cronet version: %s, arch: %s", 46 Log.i(TAG, "Cronet version: %s, arch: %s",
46 Version.CRONET_VERSION, System.getProperty("os.arch")); 47 Version.CRONET_VERSION, System.getProperty("os.arch"));
47 ContextUtils.initApplicationContext(context.getApplicationContext()) ; 48 ContextUtils.initApplicationContext(context.getApplicationContext()) ;
48 // Init native Chromium CronetEngine on Main UI thread. 49 // Init native Chromium CronetEngine on Main UI thread.
49 Runnable task = new Runnable() { 50 Runnable task = new Runnable() {
50 public void run() { 51 public void run() {
51 initOnMainThread(context); 52 ensureInitializedOnMainThread(context);
52 } 53 }
53 }; 54 };
54 // Run task immediately or post it to the UI thread. 55 // Run task immediately or post it to the UI thread.
55 if (Looper.getMainLooper() == Looper.myLooper()) { 56 if (Looper.getMainLooper() == Looper.myLooper()) {
56 task.run(); 57 task.run();
57 } else { 58 } else {
58 // The initOnMainThread will complete on the main thread prior 59 // The initOnMainThread will complete on the main thread prior
59 // to other tasks posted to the main thread. 60 // to other tasks posted to the main thread.
60 new Handler(Looper.getMainLooper()).post(task); 61 new Handler(Looper.getMainLooper()).post(task);
61 } 62 }
62 sInitTaskPosted = true;
63 } 63 }
64 } 64 }
65 65
66 private static void initOnMainThread(final Context context) { 66 /**
67 * Ensure that the main thread initialization has completed. Can only be cal led from
68 * the main thread. Ensures that the NetworkChangeNotifier is initialzied an d the
69 * main thread native MessageLoop is initialized.
70 */
71 static void ensureInitializedOnMainThread(Context context) {
72 assert sInitStarted;
73 assert Looper.getMainLooper() == Looper.myLooper();
74 if (sMainThreadInitDone) {
75 return;
76 }
67 NetworkChangeNotifier.init(context); 77 NetworkChangeNotifier.init(context);
68 // Registers to always receive network notifications. Note 78 // Registers to always receive network notifications. Note
69 // that this call is fine for Cronet because Cronet 79 // that this call is fine for Cronet because Cronet
70 // embedders do not have API access to create network change 80 // embedders do not have API access to create network change
71 // observers. Existing observers in the net stack do not 81 // observers. Existing observers in the net stack do not
72 // perform expensive work. 82 // perform expensive work.
73 NetworkChangeNotifier.registerToReceiveNotificationsAlways(); 83 NetworkChangeNotifier.registerToReceiveNotificationsAlways();
74 // registerToReceiveNotificationsAlways() is called before the native 84 // registerToReceiveNotificationsAlways() is called before the native
75 // NetworkChangeNotifierAndroid is created, so as to avoid receiving 85 // NetworkChangeNotifierAndroid is created, so as to avoid receiving
76 // the undesired initial network change observer notification, which 86 // the undesired initial network change observer notification, which
77 // will cause active requests to fail with ERR_NETWORK_CHANGED. 87 // will cause active requests to fail with ERR_NETWORK_CHANGED.
78 nativeCronetInitOnMainThread(); 88 nativeCronetInitOnMainThread();
89 sMainThreadInitDone = true;
79 } 90 }
80 91
81 // Native methods are implemented in cronet_library_loader.cc. 92 // Native methods are implemented in cronet_library_loader.cc.
82 private static native void nativeCronetInitOnMainThread(); 93 private static native void nativeCronetInitOnMainThread();
83 private static native String nativeGetCronetVersion(); 94 private static native String nativeGetCronetVersion();
84 } 95 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698