Added Network Quality Estimator Real-time interface to Cronet

components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java

 // Copyright 2014 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.
 
 package org.chromium.net;
 
 import android.content.Context;
 import android.os.Build;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.util.Log;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.NativeClassQualifiedName;
+import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.UsedByReflection;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * UrlRequest context using Chromium HTTP stack implementation.
  */
 @JNINamespace("cronet")
 @UsedByReflection("UrlRequestContext.java")
 public class CronetUrlRequestContext extends UrlRequestContext  {
     private static final int LOG_NONE = 3;  // LOG(FATAL), no VLOG.
     private static final int LOG_DEBUG = -1;  // LOG(FATAL...INFO), VLOG(1)
     private static final int LOG_VERBOSE = -2;  // LOG(FATAL...INFO), VLOG(2)
     static final String LOG_TAG = "ChromiumNetwork";
 
     /**
      * Synchronize access to mUrlRequestContextAdapter and shutdown routine.
      */
     private final Object mLock = new Object();
     private final ConditionVariable mInitCompleted = new ConditionVariable(false);
     private final AtomicInteger mActiveRequestCount = new AtomicInteger(0);
 
     private long mUrlRequestContextAdapter = 0;
     private Thread mNetworkThread;
 
+    private ObserverList<RTTObserver> mRTTObserverList =

[mef, 2015/08/11 17:16:26]

final

[bengr, 2015/08/25 23:43:34]

Done.

+            new ObserverList<RTTObserver>();
+    private ObserverList<BandwidthObserver> mBandwidthObserverList =
+            new ObserverList<BandwidthObserver>();
+
     @UsedByReflection("UrlRequestContext.java")
     public CronetUrlRequestContext(Context context,
                                    UrlRequestContextConfig config) {
         CronetLibraryLoader.ensureInitialized(context, config);
         nativeSetMinLogLevel(getLoggingLevel());
         mUrlRequestContextAdapter = nativeCreateRequestContextAdapter(config.toString());
         if (mUrlRequestContextAdapter == 0) {
             throw new NullPointerException("Context Adapter creation failed.");
         }
 
@@ skipping 86 matching lines @@
     }
 
     @Override
     public void stopNetLog() {
         synchronized (mLock) {
             checkHaveAdapter();
             nativeStopNetLog(mUrlRequestContextAdapter);
         }
     }
 
+    @Override
+    public void configureNetworkQualityEstimator(
+            boolean useLocalHostRequests, boolean useSmallerResponses) {

[mef, 2015/08/11 17:16:26]

synchronized (mLock) { checkHaveAdapter(); ...

here and below.

[bengr, 2015/08/25 23:43:34]

Done.

+        nativeConfigureNetworkQualityEstimator(mUrlRequestContextAdapter,
+                useLocalHostRequests, useSmallerResponses);
+    }
+
+    @Override
+    public void addRTTObserver(RTTObserver observer) {
+        if (mRTTObserverList.isEmpty()) {
+            nativeProvideRTTObservations(mUrlRequestContextAdapter, true);
+        }
+        mRTTObserverList.addObserver(observer);
+    }
+
+    @Override
+    public void removeRTTObserver(RTTObserver observer) {
+        mRTTObserverList.removeObserver(observer);
+        if (mRTTObserverList.isEmpty()) {
+            nativeProvideRTTObservations(mUrlRequestContextAdapter, false);
+        }
+    }
+
+    @Override
+    public void addBandwidthObserver(BandwidthObserver observer) {
+        if (mBandwidthObserverList.isEmpty()) {
+            nativeProvideBandwidthObservations(mUrlRequestContextAdapter, true);
+        }
+        mBandwidthObserverList.addObserver(observer);
+    }
+
+    @Override
+    public void removeBandwidthObserver(BandwidthObserver observer) {
+        mBandwidthObserverList.removeObserver(observer);
+        if (mBandwidthObserverList.isEmpty()) {
+            nativeProvideBandwidthObservations(mUrlRequestContextAdapter,
+                    false);
+        }
+
+    }
+
     /**
      * Mark request as started to prevent shutdown when there are active
      * requests.
      */
     void onRequestStarted(UrlRequest urlRequest) {
         mActiveRequestCount.incrementAndGet();
     }
 
     /**
      * Mark request as completed to allow shutdown when there are no active
@@ skipping 41 matching lines @@
     @CalledByNative
     private void initNetworkThread() {
         synchronized (mLock) {
             mNetworkThread = Thread.currentThread();
             mInitCompleted.open();
         }
         Thread.currentThread().setName("ChromiumNet");
         Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
     }
 
+    @SuppressWarnings("unused")
+    @CalledByNative
+    private void onRTTObservation(int value, int when, int source) {
+        for (RTTObserver observer : mRTTObserverList) {

[mef, 2015/08/11 17:16:26]

protect the list?

[bengr, 2015/08/25 23:43:34]

I don't understand.

+            observer.onRTTObservation(value, when, source);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @CalledByNative
+    private void onBandwidthObservation(int value, int when, int source) {
+        for (BandwidthObserver observer : mBandwidthObserverList) {
+            observer.onBandwidthObservation(value, when, source);
+        }
+    }
+
     // Native methods are implemented in cronet_url_request_context.cc.
     private static native long nativeCreateRequestContextAdapter(String config);
 
     private static native int nativeSetMinLogLevel(int loggingLevel);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeDestroy(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeStartNetLogToFile(long nativePtr,
             String fileName, boolean logAll);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeStopNetLog(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeInitRequestContextOnMainThread(long nativePtr);
+
+    @NativeClassQualifiedName("CronetURLRequestContextAdapter")
+    private native void nativeConfigureNetworkQualityEstimator(long nativePtr,
+            boolean useLocalHostRequests, boolean useSmallerResponses);
+
+    @NativeClassQualifiedName("CronetURLRequestContextAdapter")
+    private native void nativeProvideRTTObservations(long nativePtr,
+            boolean should);
+
+    @NativeClassQualifiedName("CronetURLRequestContextAdapter")
+    private native void nativeProvideBandwidthObservations(long nativePtr,
+            boolean should);
 }