From b8edacd0bb4feacc3ac1d61421e600c75ab87f7c Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Fri, 1 Jun 2012 14:07:34 -0400
Subject: Major steps towards implementing the policy component. Identified and
 reacted to the priority inversion problem we have in texturefetch.  Includes
 the introduction of a priority_queue for the requests that are ready.  Start
 some parameterization in anticipation of having policy_class everywhere. 
 Removed _assert.h which isn't really needed in indra codebase.  Implemented
 async setPriority request (which I hope I can get rid of eventually along
 with all priorities in this library).  Converted to using unsigned int for
 priority rather than float.  Implemented POST and did groundwork for PUT.

---
 indra/llcorehttp/httprequest.cpp | 52 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 3 deletions(-)

(limited to 'indra/llcorehttp/httprequest.cpp')

diff --git a/indra/llcorehttp/httprequest.cpp b/indra/llcorehttp/httprequest.cpp
index 6c62f931ff..a06b859a91 100644
--- a/indra/llcorehttp/httprequest.cpp
+++ b/indra/llcorehttp/httprequest.cpp
@@ -31,6 +31,7 @@
 #include "_httpservice.h"
 #include "_httpoperation.h"
 #include "_httpoprequest.h"
+#include "_httpopsetpriority.h"
 #include "_httpopcancel.h"
 
 
@@ -162,7 +163,7 @@ HttpStatus HttpRequest::getStatus() const
 
 
 HttpHandle HttpRequest::requestGetByteRange(unsigned int policy_id,
-											float priority,
+											unsigned int priority,
 											const std::string & url,
 											size_t offset,
 											size_t len,
@@ -190,6 +191,34 @@ HttpHandle HttpRequest::requestGetByteRange(unsigned int policy_id,
 }
 
 
+HttpHandle HttpRequest::requestPost(unsigned int policy_id,
+									unsigned int priority,
+									const std::string & url,
+									BufferArray * body,
+									HttpOptions * options,
+									HttpHeaders * headers,
+									HttpHandler * user_handler)
+{
+	HttpStatus status;
+	HttpHandle handle(LLCORE_HTTP_HANDLE_INVALID);
+
+	HttpOpRequest * op = new HttpOpRequest();
+	if (! (status = op->setupPost(policy_id, priority, url, body, options, headers)))
+	{
+		op->release();
+		mLastReqStatus = status;
+		return handle;
+	}
+	op->setHandlers(mReplyQueue, mSelfHandler, user_handler);
+	mRequestQueue->addOp(op);			// transfers refcount
+	
+	mLastReqStatus = status;
+	handle = static_cast<HttpHandle>(op);
+	
+	return handle;
+}
+
+
 HttpHandle HttpRequest::requestCancel(HttpHandle handle, HttpHandler * user_handler)
 {
 	HttpStatus status;
@@ -222,6 +251,23 @@ HttpHandle HttpRequest::requestNoOp(HttpHandler * user_handler)
 }
 
 
+HttpHandle HttpRequest::requestSetPriority(HttpHandle request, unsigned int priority,
+										   HttpHandler * handler)
+{
+	HttpStatus status;
+	HttpHandle ret_handle(LLCORE_HTTP_HANDLE_INVALID);
+
+	HttpOpSetPriority * op = new HttpOpSetPriority(request, priority);
+	op->setHandlers(mReplyQueue, mSelfHandler, handler);
+	mRequestQueue->addOp(op);			// transfer refcount as well
+
+	mLastReqStatus = status;
+	ret_handle = static_cast<HttpHandle>(op);
+	
+	return ret_handle;
+}
+
+
 HttpStatus HttpRequest::update(long millis)
 {
 	HttpStatus status;
@@ -259,7 +305,7 @@ HttpStatus HttpRequest::createService()
 {
 	HttpStatus status;
 
-	LLINT_ASSERT(! has_inited);
+	llassert_always(! has_inited);
 	HttpRequestQueue::init();
 	HttpRequestQueue * rq = HttpRequestQueue::instanceOf();
 	HttpService::init(rq);
@@ -273,7 +319,7 @@ HttpStatus HttpRequest::destroyService()
 {
 	HttpStatus status;
 
-	LLINT_ASSERT(has_inited);
+	llassert_always(has_inited);
 	HttpService::term();
 	HttpRequestQueue::term();
 	has_inited = false;
-- 
cgit v1.2.3