Order high priority requests in the same order they are requested. (b5b33c73) · Commits · e / os / android_frameworks_base

core/java/android/net/http/RequestQueue.java

+54 −19

Original line number	Original line	Diff line number	Diff line
	@@ -52,10 +52,44 @@ public class RequestQueue implements RequestFeeder {

	private Context mContext;		private Context mContext;

			private static class RequestSet {
			private final LinkedList<Request> mHighPriority;
			private final LinkedList<Request> mLowPriority;

			RequestSet() {
			mHighPriority = new LinkedList<Request>();
			mLowPriority = new LinkedList<Request>();
			}

			void add(Request req, boolean head) {
			LinkedList l = mLowPriority;
			if (req.mHighPriority) {
			l = mHighPriority;
			}
			if (head) {
			l.addFirst(req);
			} else {
			l.add(req);
			}
			}

			Request removeFirst() {
			if (!mHighPriority.isEmpty()) {
			return mHighPriority.removeFirst();
			} else if (!mLowPriority.isEmpty()) {
			return mLowPriority.removeFirst();
			}
			return null;
			}

			boolean isEmpty() {
			return mHighPriority.isEmpty() && mLowPriority.isEmpty();
			}
			};
	/**		/**
	* Requests, indexed by HttpHost (scheme, host, port)		* Requests, indexed by HttpHost (scheme, host, port)
	*/		*/
	private LinkedHashMap<HttpHost, LinkedList<Request>> mPending;		private LinkedHashMap<HttpHost, RequestSet> mPending;

	/* Support for notifying a client when queue is empty */		/* Support for notifying a client when queue is empty */
	private boolean mClientWaiting = false;		private boolean mClientWaiting = false;
	@@ -344,7 +378,7 @@ public class RequestQueue implements RequestFeeder {
	public RequestQueue(Context context, int connectionCount) {		public RequestQueue(Context context, int connectionCount) {
	mContext = context;		mContext = context;

	mPending = new LinkedHashMap<HttpHost, LinkedList<Request>>(32);		mPending = new LinkedHashMap<HttpHost, RequestSet>(32);

	mActivePool = new ActivePool(connectionCount);		mActivePool = new ActivePool(connectionCount);
	mActivePool.startup();		mActivePool.startup();
	@@ -480,7 +514,7 @@ public class RequestQueue implements RequestFeeder {
	req = new Request(method, httpHost, mProxyHost, uri.mPath, bodyProvider,		req = new Request(method, httpHost, mProxyHost, uri.mPath, bodyProvider,
	bodyLength, eventHandler, headers, highPriority);		bodyLength, eventHandler, headers, highPriority);

	queueRequest(req, highPriority);		queueRequest(req, false);

	mActivePool.mTotalRequest++;		mActivePool.mTotalRequest++;

	@@ -520,19 +554,24 @@ public class RequestQueue implements RequestFeeder {
	HttpLog.v("dump()");		HttpLog.v("dump()");
	StringBuilder dump = new StringBuilder();		StringBuilder dump = new StringBuilder();
	int count = 0;		int count = 0;
	Iterator<Map.Entry<HttpHost, LinkedList<Request>>> iter;		Iterator<Map.Entry<HttpHost, RequestSet>> iter;

	// mActivePool.log(dump);		// mActivePool.log(dump);

	if (!mPending.isEmpty()) {		if (!mPending.isEmpty()) {
	iter = mPending.entrySet().iterator();		iter = mPending.entrySet().iterator();
	while (iter.hasNext()) {		while (iter.hasNext()) {
	Map.Entry<HttpHost, LinkedList<Request>> entry = iter.next();		Map.Entry<HttpHost, RequestSet> entry = iter.next();
	String hostName = entry.getKey().getHostName();		String hostName = entry.getKey().getHostName();
	StringBuilder line = new StringBuilder("p" + count++ + " " + hostName + " ");		StringBuilder line = new StringBuilder("p" + count++ + " " + hostName + " ");

	LinkedList<Request> reqList = entry.getValue();		RequestSet reqList = entry.getValue();
	ListIterator reqIter = reqList.listIterator(0);		ListIterator reqIter = reqList.mHighPriority.listIterator(0);
			while (iter.hasNext()) {
			Request request = (Request)iter.next();
			line.append(request + " ");
			}
			reqIter = reqList.mLowPriority.listIterator(0);
	while (iter.hasNext()) {		while (iter.hasNext()) {
	Request request = (Request)iter.next();		Request request = (Request)iter.next();
	line.append(request + " ");		line.append(request + " ");
	@@ -564,7 +603,7 @@ public class RequestQueue implements RequestFeeder {
	Request ret = null;		Request ret = null;

	if (mNetworkConnected && mPending.containsKey(host)) {		if (mNetworkConnected && mPending.containsKey(host)) {
	LinkedList<Request> reqList = mPending.get(host);		RequestSet reqList = mPending.get(host);
	ret = reqList.removeFirst();		ret = reqList.removeFirst();
	if (reqList.isEmpty()) {		if (reqList.isEmpty()) {
	mPending.remove(host);		mPending.remove(host);
	@@ -597,18 +636,14 @@ public class RequestQueue implements RequestFeeder {

	protected synchronized void queueRequest(Request request, boolean head) {		protected synchronized void queueRequest(Request request, boolean head) {
	HttpHost host = request.mProxyHost == null ? request.mHost : request.mProxyHost;		HttpHost host = request.mProxyHost == null ? request.mHost : request.mProxyHost;
	LinkedList<Request> reqList;		RequestSet reqList;
	if (mPending.containsKey(host)) {		if (mPending.containsKey(host)) {
	reqList = mPending.get(host);		reqList = mPending.get(host);
	} else {		} else {
	reqList = new LinkedList<Request>();		reqList = new RequestSet();
	mPending.put(host, reqList);		mPending.put(host, reqList);
	}		}
	if (head) {		reqList.add(request, head);
	reqList.addFirst(request);
	} else {
	reqList.add(request);
	}
	}		}


	@@ -621,12 +656,12 @@ public class RequestQueue implements RequestFeeder {
	}		}

	/* helper */		/* helper */
	private Request removeFirst(LinkedHashMap<HttpHost, LinkedList<Request>> requestQueue) {		private Request removeFirst(LinkedHashMap<HttpHost, RequestSet> requestQueue) {
	Request ret = null;		Request ret = null;
	Iterator<Map.Entry<HttpHost, LinkedList<Request>>> iter = requestQueue.entrySet().iterator();		Iterator<Map.Entry<HttpHost, RequestSet>> iter = requestQueue.entrySet().iterator();
	if (iter.hasNext()) {		if (iter.hasNext()) {
	Map.Entry<HttpHost, LinkedList<Request>> entry = iter.next();		Map.Entry<HttpHost, RequestSet> entry = iter.next();
	LinkedList<Request> reqList = entry.getValue();		RequestSet reqList = entry.getValue();
	ret = reqList.removeFirst();		ret = reqList.removeFirst();
	if (reqList.isEmpty()) {		if (reqList.isEmpty()) {
	requestQueue.remove(entry.getKey());		requestQueue.remove(entry.getKey());