matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move requestbroker into new folder, make request process function a method of Request

Browse Source
This commit is contained in:
Simon Robertshaw 2013-03-14 11:30:24 +00:00
parent 7a055a9d90
commit 9479b7f330
17 changed files with 295 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SConscript
View File

@ -260,6 +260,7 @@ if(GetOption('win')):
sources+=Glob("src/*/*.cpp")
sources+=Glob("src/simulation/elements/*.cpp")
sources+=Glob("src/simulation/tools/*.cpp")
sources+=Glob("src/client/requestbroker/*.cpp")
#for source in sources:
# print str(source)

2
src/client/Client.cpp
View File

@ -42,7 +42,7 @@
#include "search/Thumbnail.h"
#include "preview/Comment.h"
#include "ClientListener.h"
#include "RequestBroker.h"
#include "requestbroker/RequestBroker.h"
#include "cajun/reader.h"
#include "cajun/writer.h"

147
src/client/requestbroker/ImageRequest.cpp Normal file
View File

@ -0,0 +1,147 @@
#include <iostream>
#include <typeinfo>
#include "ImageRequest.h"
#include "graphics/Graphics.h"
#include "client/HTTP.h"
ImageRequest::ImageRequest(std::string url, int width, int height, ListenerHandle listener):
Request(Image, listener)
{
URL = url;
HTTPContext = NULL;
Width = width;
Height = height;
}
ImageRequest::~ImageRequest()
{
}
RequestBroker::ProcessResponse ImageRequest::Process(RequestBroker & rb)
{
VideoBuffer * image = NULL;
//Have a look at the thumbnail cache
for(std::deque<std::pair<std::string, VideoBuffer*> >::iterator iter = rb.imageCache.begin(), end = rb.imageCache.end(); iter != end; ++iter)
{
if((*iter).first == URL)
{
image = (*iter).second;
#ifdef DEBUG
std::cout << typeid(*this).name() << " " << URL << " found in cache" << std::endl;
#endif
}
}
if(!image)
{
if(HTTPContext)
{
if(http_async_req_status(HTTPContext))
{
pixel * imageData;
char * data;
int status, data_size, imgw, imgh;
data = http_async_req_stop(HTTPContext, &status, &data_size);
if (status == 200 && data)
{
imageData = Graphics::ptif_unpack(data, data_size, &imgw, &imgh);
free(data);
if(imageData)
{
//Success!
image = new VideoBuffer(imageData, imgw, imgh);
free(imageData);
}
else
{
//Error thumbnail
image = new VideoBuffer(32, 32);
image->SetCharacter(14, 14, 'x', 255, 255, 255, 255);
}
if(rb.imageCache.size() >= THUMB_CACHE_SIZE)
{
//Remove unnecessary from thumbnail cache
delete rb.imageCache.front().second;
rb.imageCache.pop_front();
}
rb.imageCache.push_back(std::pair<std::string, VideoBuffer*>(URL, image));
}
else
{
#ifdef DEBUG
std::cout << typeid(*this).name() << " Request for " << URL << " failed with status " << status << std::endl;
#endif
if(data)
free(data);
return RequestBroker::Failed;
}
}
}
else
{
//Check for ongoing requests
for(std::vector<Request*>::iterator iter = rb.activeRequests.begin(), end = rb.activeRequests.end(); iter != end; ++iter)
{
if((*iter)->Type != Request::Image)
continue;
ImageRequest * otherReq = (ImageRequest*)(*iter);
if(otherReq->URL == URL && otherReq != this)
{
#ifdef DEBUG
std::cout << typeid(*this).name() << " Request for " << URL << " found, appending." << std::endl;
#endif
//Add the current listener to the item already being requested
(*iter)->Children.push_back(this);
return RequestBroker::Duplicate;
}
}
//If it's not already being requested, request it
#ifdef DEBUG
std::cout << typeid(*this).name() << " Creating new request for " << URL << std::endl;
#endif
HTTPContext = http_async_req_start(NULL, (char *)URL.c_str(), NULL, 0, 0);
RequestTime = time(NULL);
}
}
if(image)
{
//Create a copy, to seperate from the cache
VideoBuffer * myVB = new VideoBuffer(*image);
myVB->Resize(Width, Height, true);
ResultObject = (void*)myVB;
rb.requestComplete(this);
for(std::vector<Request*>::iterator childIter = Children.begin(), childEnd = Children.end(); childIter != childEnd; ++childIter)
{
if((*childIter)->Type == Request::Image)
{
ImageRequest * childReq = (ImageRequest*)*childIter;
VideoBuffer * tempImage = new VideoBuffer(*image);
tempImage->Resize(childReq->Width, childReq->Height, true);
childReq->ResultObject = (void*)tempImage;
rb.requestComplete(*childIter);
}
}
return RequestBroker::Finished;
}
return RequestBroker::OK;
}
void ImageRequest::Cleanup()
{
Request::Cleanup();
if(ResultObject)
{
delete ((VideoBuffer*)ResultObject);
ResultObject = NULL;
}
}

14
src/client/requestbroker/ImageRequest.h Normal file
View File

@ -0,0 +1,14 @@
#include "RequestBroker.h"
class ImageRequest: public RequestBroker::Request
{
public:
int Width, Height;
std::string URL;
int RequestTime;
void * HTTPContext;
ImageRequest(std::string url, int width, int height, ListenerHandle listener);
virtual RequestBroker::ProcessResponse Process(RequestBroker & rb);
virtual ~ImageRequest();
virtual void Cleanup();
};

188
src/client/RequestBroker.cpp → src/client/requestbroker/RequestBroker.cpp
View File

@ -1,14 +1,14 @@
#include <algorithm>
#include <iostream>
#include <typeinfo>
#include <sstream>
#include <time.h>
#include "RequestBroker.h"
#include "RequestListener.h"
#include "Client.h"
#include "HTTP.h"
#include "GameSave.h"
#include "search/Thumbnail.h"
#include "simulation/SaveRenderer.h"
#include "ThumbRenderRequest.h"
#include "ImageRequest.h"
#include "client/Client.h"
#include "client/GameSave.h"
//Asynchronous Thumbnail render & request processing
@ -139,6 +139,8 @@ void RequestBroker::FlushThumbQueue()
{
if(CheckRequestListener(completeQueue.front()->Listener))
{
std::cout << typeid(*this).name() << " Calling listener: " << completeQueue.front()->Listener.second << std::endl;
std::cout.flush();
completeQueue.front()->Listener.second->OnResponseReady(completeQueue.front()->ResultObject);
}
else
@ -190,15 +192,7 @@ void RequestBroker::thumbnailQueueProcessTH()
{
ProcessResponse resultStatus = OK;
Request * r = *req;
switch(r->Type)
{
case Request::ThumbnailRender:
resultStatus = processThumbnailRender(*(ThumbRenderRequest*)r);
break;
case Request::Image:
resultStatus = processImage(*(ImageRequest*)r);
break;
}
resultStatus = r->Process(*this);
if(resultStatus == Duplicate || resultStatus == Failed || resultStatus == Finished)
{
req = activeRequests.erase(req);
@ -233,147 +227,6 @@ void RequestBroker::thumbnailQueueProcessTH()
pthread_mutex_unlock(&runningMutex);
}
RequestBroker::ProcessResponse RequestBroker::processThumbnailRender(ThumbRenderRequest & request)
{
#ifdef DEBUG
std::cout << typeid(*this).name() << " Processing render request" << std::endl;
#endif
Thumbnail * thumbnail = SaveRenderer::Ref().Render(request.Save, request.Decorations, request.Fire);
delete request.Save;
request.Save = NULL;
if(thumbnail)
{
thumbnail->Resize(request.Width, request.Height);
request.ResultObject = (void*)thumbnail;
requestComplete(&request);
return Finished;
}
else
{
return Failed;
}
return Failed;
}
RequestBroker::ProcessResponse RequestBroker::processImage(ImageRequest & request)
{
VideoBuffer * image = NULL;
//Have a look at the thumbnail cache
for(std::deque<std::pair<std::string, VideoBuffer*> >::iterator iter = imageCache.begin(), end = imageCache.end(); iter != end; ++iter)
{
if((*iter).first == request.URL)
{
image = (*iter).second;
#ifdef DEBUG
std::cout << typeid(*this).name() << " " << request.URL << " found in cache" << std::endl;
#endif
}
}
if(!image)
{
if(request.HTTPContext)
{
if(http_async_req_status(request.HTTPContext))
{
pixel * imageData;
char * data;
int status, data_size, imgw, imgh;
data = http_async_req_stop(request.HTTPContext, &status, &data_size);
if (status == 200 && data)
{
imageData = Graphics::ptif_unpack(data, data_size, &imgw, &imgh);
free(data);
if(imageData)
{
//Success!
image = new VideoBuffer(imageData, imgw, imgh);
free(imageData);
}
else
{
//Error thumbnail
image = new VideoBuffer(32, 32);
image->SetCharacter(14, 14, 'x', 255, 255, 255, 255);
}
if(imageCache.size() >= THUMB_CACHE_SIZE)
{
//Remove unnecessary from thumbnail cache
delete imageCache.front().second;
imageCache.pop_front();
}
imageCache.push_back(std::pair<std::string, VideoBuffer*>(request.URL, image));
}
else
{
#ifdef DEBUG
std::cout << typeid(*this).name() << " Request for " << request.URL << " failed with status " << status << std::endl;
#endif
if(data)
free(data);
return Failed;
}
}
}
else
{
//Check for ongoing requests
for(std::vector<Request*>::iterator iter = activeRequests.begin(), end = activeRequests.end(); iter != end; ++iter)
{
if((*iter)->Type != Request::Image)
continue;
ImageRequest * otherReq = (ImageRequest*)(*iter);
if(otherReq->URL == request.URL && otherReq != &request)
{
#ifdef DEBUG
std::cout << typeid(*this).name() << " Request for " << request.URL << " found, appending." << std::endl;
#endif
//Add the current listener to the item already being requested
(*iter)->Children.push_back(&request);
return Duplicate;
}
}
//If it's not already being requested, request it
#ifdef DEBUG
std::cout << typeid(*this).name() << " Creating new request for " << request.URL << std::endl;
#endif
request.HTTPContext = http_async_req_start(NULL, (char *)request.URL.c_str(), NULL, 0, 0);
request.RequestTime = time(NULL);
}
}
if(image)
{
//Create a copy, to seperate from the cache
VideoBuffer * myVB = new VideoBuffer(*image);
myVB->Resize(request.Width, request.Height, true);
request.ResultObject = (void*)myVB;
requestComplete(&request);
for(std::vector<Request*>::iterator childIter = request.Children.begin(), childEnd = request.Children.end(); childIter != childEnd; ++childIter)
{
if((*childIter)->Type == Request::Image)
{
ImageRequest * childReq = (ImageRequest*)*childIter;
VideoBuffer * tempImage = new VideoBuffer(*image);
tempImage->Resize(childReq->Width, childReq->Height, true);
childReq->ResultObject = (void*)tempImage;
requestComplete(*childIter);
}
}
return Finished;
}
return OK;
}
void RequestBroker::requestComplete(Request * completedRequest)
{
pthread_mutex_lock(&completeQueueMutex);
@ -419,4 +272,29 @@ void RequestBroker::DetachRequestListener(RequestListener * tListener)
}
pthread_mutex_unlock(&listenersMutex);
}
RequestBroker::Request::Request(RequestType type, ListenerHandle listener)
{
Type = type;
Listener = listener;
ResultObject = NULL;
}
RequestBroker::Request::~Request()
{
std::vector<Request*>::iterator iter = Children.begin();
while(iter != Children.end())
{
delete (*iter);
iter++;
}
}
void RequestBroker::Request::Cleanup()
{
std::vector<Request*>::iterator iter = Children.begin();
while(iter != Children.end())
{
(*iter)->Cleanup();
iter++;
}
}

117
src/client/RequestBroker.h → src/client/requestbroker/RequestBroker.h
View File

@ -3,6 +3,7 @@
#include <list>
#include <utility>
#include <deque>
#include <string>
#include <pthread.h>
#undef GetUserName //God dammit microsoft!
@ -14,103 +15,12 @@ class RequestListener;
typedef std::pair<int, RequestListener*> ListenerHandle;
class RequestBroker: public Singleton<RequestBroker>
{
friend class ImageRequest;
friend class ThumbRenderRequest;
public:
class Request;
private:
enum ProcessResponse { Finished, OK, Canceled, Failed, Duplicate };
class Request
{
public:
enum RequestType { ThumbnailRender, Image };
RequestType Type;
void * ResultObject;
ListenerHandle Listener;
std::vector<Request*> Children;
Request(RequestType type, ListenerHandle listener)
{
Type = type;
Listener = listener;
ResultObject = NULL;
}
virtual ~Request()
{
std::vector<Request*>::iterator iter = Children.begin();
while(iter != Children.end())
{
delete (*iter);
iter++;
}
}
virtual void Cleanup()
{
std::vector<Request*>::iterator iter = Children.begin();
while(iter != Children.end())
{
(*iter)->Cleanup();
iter++;
}
}
};
class ThumbRenderRequest: public Request
{
public:
int Width, Height;
bool Decorations;
bool Fire;
GameSave * Save;
ThumbRenderRequest(GameSave * save, bool decorations, bool fire, int width, int height, ListenerHandle listener):
Request(ThumbnailRender, listener)
{
Save = save;
Width = width;
Height = height;
Decorations = decorations;
Fire = fire;
}
virtual ~ThumbRenderRequest()
{
if(Save)
delete Save;
}
virtual void Cleanup()
{
Request::Cleanup();
if(ResultObject)
{
delete ((VideoBuffer*)ResultObject);
ResultObject = NULL;
}
}
};
class ImageRequest: public Request
{
public:
int Width, Height;
std::string URL;
int RequestTime;
void * HTTPContext;
ImageRequest(std::string url, int width, int height, ListenerHandle listener):
Request(Image, listener)
{
URL = url;
HTTPContext = NULL;
Width = width;
Height = height;
}
virtual ~ImageRequest() {}
virtual void Cleanup()
{
Request::Cleanup();
if(ResultObject)
{
delete ((VideoBuffer*)ResultObject);
ResultObject = NULL;
}
}
};
pthread_mutex_t listenersMutex;
pthread_mutex_t runningMutex;
pthread_mutex_t requestQueueMutex;
@ -131,9 +41,6 @@ private:
void thumbnailQueueProcessTH();
void assureRunning();
ProcessResponse processThumbnailRender(ThumbRenderRequest & request);
ProcessResponse processImage(ImageRequest & request);
void requestComplete(Request * completedRequest);
public:
@ -152,4 +59,18 @@ public:
bool CheckRequestListener(ListenerHandle handle);
ListenerHandle AttachRequestListener(RequestListener * tListener);
void DetachRequestListener(RequestListener * tListener);
enum ProcessResponse { Finished, OK, Canceled, Failed, Duplicate };
class Request
{
public:
enum RequestType { ThumbnailRender, Image };
RequestType Type;
void * ResultObject;
ListenerHandle Listener;
std::vector<Request*> Children;
Request(RequestType type, ListenerHandle listener);
virtual ProcessResponse Process(RequestBroker & rb) { return Failed; }
virtual ~Request();
virtual void Cleanup();
};
};

0
src/client/RequestListener.h → src/client/requestbroker/RequestListener.h
View File

56
src/client/requestbroker/ThumbRenderRequest.cpp Normal file
View File

@ -0,0 +1,56 @@
#include <typeinfo>
#include "ThumbRenderRequest.h"
#include "client/GameSave.h"
#include "graphics/Graphics.h"
#include "search/Thumbnail.h"
#include "simulation/SaveRenderer.h"
ThumbRenderRequest::ThumbRenderRequest(GameSave * save, bool decorations, bool fire, int width, int height, ListenerHandle listener):
RequestBroker::Request(ThumbnailRender, listener)
{
Save = save;
Width = width;
Height = height;
Decorations = decorations;
Fire = fire;
}
RequestBroker::ProcessResponse ThumbRenderRequest::Process(RequestBroker & rb)
{
#ifdef DEBUG
std::cout << typeid(*this).name() << " Processing render request" << std::endl;
#endif
Thumbnail * thumbnail = SaveRenderer::Ref().Render(Save, Decorations, Fire);
delete Save;
Save = NULL;
if(thumbnail)
{
thumbnail->Resize(Width, Height);
ResultObject = (void*)thumbnail;
rb.requestComplete((Request*)this);
return RequestBroker::Finished;
}
else
{
return RequestBroker::Failed;
}
return RequestBroker::Failed;
}
ThumbRenderRequest::~ThumbRenderRequest()
{
if(Save)
delete Save;
}
void ThumbRenderRequest::Cleanup()
{
Request::Cleanup();
if(ResultObject)
{
delete ((VideoBuffer*)ResultObject);
ResultObject = NULL;
}
}

16
src/client/requestbroker/ThumbRenderRequest.h Normal file
View File

@ -0,0 +1,16 @@
#include "RequestBroker.h"
class GameSave;
class ThumbRenderRequest: public RequestBroker::Request
{
public:
int Width, Height;
bool Decorations;
bool Fire;
GameSave * Save;
ThumbRenderRequest(GameSave * save, bool decorations, bool fire, int width, int height, ListenerHandle listener);
virtual RequestBroker::ProcessResponse Process(RequestBroker & rb);
virtual ~ThumbRenderRequest();
virtual void Cleanup();
};

2
src/interface/AvatarButton.cpp
View File

@ -5,7 +5,7 @@
#include "Format.h"
#include "Engine.h"
#include "client/Client.h"
#include "client/RequestBroker.h"
#include "client/requestbroker/RequestBroker.h"
#include "graphics/Graphics.h"
#include "ContextMenu.h"
#include "Keys.h"

2
src/interface/AvatarButton.h
View File

@ -6,7 +6,7 @@
#include "Component.h"
#include "graphics/Graphics.h"
#include "interface/Colour.h"
#include "client/RequestListener.h"
#include "client/requestbroker/RequestListener.h"
namespace ui
{

2
src/interface/SaveButton.cpp
View File

@ -5,7 +5,7 @@
#include "client/SaveInfo.h"
#include "graphics/Graphics.h"
#include "Engine.h"
#include "client/RequestBroker.h"
#include "client/requestbroker/RequestBroker.h"
#include "simulation/SaveRenderer.h"
#include "Format.h"
#include "ContextMenu.h"

2
src/interface/SaveButton.h
View File

@ -6,7 +6,7 @@
#include "Component.h"
#include "client/SaveFile.h"
#include "client/SaveInfo.h"
#include "client/RequestListener.h"
#include "client/requestbroker/RequestListener.h"
#include "graphics/Graphics.h"
#include "interface/Colour.h"

2
src/save/LocalSaveActivity.cpp
View File

@ -3,7 +3,7 @@
#include "interface/Textbox.h"
#include "interface/Button.h"
#include "search/Thumbnail.h"
#include "client/RequestBroker.h"
#include "client/requestbroker/RequestBroker.h"
#include "dialogues/ErrorMessage.h"
#include "dialogues/ConfirmPrompt.h"
#include "client/Client.h"

2
src/save/LocalSaveActivity.h
View File

@ -2,7 +2,7 @@
#include "Activity.h"
#include "client/SaveFile.h"
#include "client/RequestListener.h"
#include "client/requestbroker/RequestListener.h"
namespace ui
{

2
src/save/ServerSaveActivity.cpp
View File

@ -3,7 +3,7 @@
#include "interface/Textbox.h"
#include "interface/Button.h"
#include "interface/Checkbox.h"
#include "client/RequestBroker.h"
#include "client/requestbroker/RequestBroker.h"
#include "dialogues/ErrorMessage.h"
#include "dialogues/ConfirmPrompt.h"
#include "client/Client.h"

2
src/save/ServerSaveActivity.h
View File

@ -2,7 +2,7 @@
#include "Activity.h"
#include "client/SaveInfo.h"
#include "client/RequestListener.h"
#include "client/requestbroker/RequestListener.h"
#include "tasks/TaskListener.h"
namespace ui