ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some documentation and thread-safeness. ___Remind me to ask some questions about mutex___!

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
unitraxx 2013-07-21 20:26:27 +00:00
parent 8360c06b15
commit c2159306e8
4 changed files with 65 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/online/current_user.cpp
View File

@ -88,10 +88,8 @@ namespace Online{
CurrentUser::SignInRequest * CurrentUser::requestSavedSession()
{
SignInRequest * request = NULL;
Log::info("CurrentUser::requestSavedSession","1");
if(m_state != US_SIGNED_IN && UserConfigParams::m_saved_session)
{
Log::info("CurrentUser::requestSavedSession","2");
request = new SignInRequest();
request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
request->setParameter("action",std::string("saved-session"));

6
src/online/request.cpp
View File

@ -29,11 +29,9 @@ namespace Online{
// =========================================================================================
Request::Request(int type, bool manage_memory, int priority)
: m_type(type)
: m_type(type), m_manage_memory(manage_memory), m_priority(priority)
{
m_priority = priority;
m_manage_memory = manage_memory;
m_cancel = false;
m_cancel.setAtomic(false);
m_done.setAtomic(false);
} // Request

108
src/online/request.hpp
View File

@ -27,27 +27,32 @@
namespace Online{
/**
* Stores a request for the http connector. They will be sorted by priorities.
* Stores a request for the HTTP Manager. They will be sorted by priorities.
* \ingroup online
*/
class Request
{
private:
const int m_type;
protected:
/** The priority of this request. The higher the value the more
important this request is. */
int m_priority;
/** Cancel this request if it is active. */
bool m_cancel;
/** Can be used as identifier for the user.
* Has 0 as default value.
* Only requests ment to control the HTTP Manager should use negative values, for all other uses positive values are obliged
* */
const int m_type;
/** True if the memory for this Request should be managed by
* http connector (i.e. this object is freed once the request
* is handled). Otherwise the memory is not freed, so it must
* be freed by the calling function. */
bool m_manage_memory;
const bool m_manage_memory;
/** The priority of this request. The higher the value the more
important this request is. */
const int m_priority;
Synchronised<bool> m_done;
protected:
/** Cancel this request if it is active. */
Synchronised<bool> m_cancel;
/** Set to though if the reply of the request is in and callbacks are executed */
Synchronised<bool> m_done;
virtual void beforeOperation() {}
virtual void operation() {};
@ -64,26 +69,26 @@ namespace Online{
virtual ~Request();
void execute();
// ------------------------------------------------------------------------
/** Returns the priority of this request. */
int getPriority() const { return m_priority; }
// ------------------------------------------------------------------------
/** Signals that this request should be canceled. */
void cancel() { m_cancel = true; }
// ------------------------------------------------------------------------
/** Returns if this request is to be canceled. */
bool isCancelled() const { return m_cancel; }
int getType() const { return m_type; }
// ------------------------------------------------------------------------
/** Returns if the memory for this object should be managed by
* by network_http (i.e. freed once the request is handled). */
bool manageMemory() const { return m_manage_memory; }
bool isDone() const { return m_done.getAtomic(); }
virtual bool isAllowedToAdd() { return true; }
int getType() const { return m_type; }
bool manageMemory() const { return m_manage_memory; }
// ------------------------------------------------------------------------
/** Returns the priority of this request. */
int getPriority() const { return m_priority; }
// ------------------------------------------------------------------------
/** Signals that this request should be canceled. */
void cancel() { m_cancel.setAtomic(true); }
// ------------------------------------------------------------------------
/** Returns if this request is to be canceled. */
bool isCancelled() const { return m_cancel.getAtomic(); }
// ------------------------------------------------------------------------
/** Returns if this request is done. */
bool isDone() const { return m_done.getAtomic(); }
// ------------------------------------------------------------------------
/** Virtual method to check if a request has initialized all needed members to a valid value. */
virtual bool isAllowedToAdd() const { return true; }
/** This class is used by the priority queue to sort requests by priority.
*/
@ -93,7 +98,9 @@ namespace Online{
/** Compares two requests, returns if the first request has a lower
* priority than the second one. */
bool operator() (const Request *a, const Request *b) const
{ return a->getPriority() < b->getPriority(); }
{
return a->getPriority() < b->getPriority();
}
}; // Compare
}; // Request
@ -106,29 +113,36 @@ namespace Online{
protected :
typedef std::map<std::string, std::string> Parameters;
Parameters * m_parameters;
typedef std::map<std::string, std::string> Parameters;
/** The progress indicator. 0 till it is started and the first
* packet is downloaded. At the end eithe -1 (error) or 1
/** The progress indicator. 0 untill it is started and the first
* packet is downloaded. At the end either -1 (error) or 1
* (everything ok) at the end. */
Synchronised<float> m_progress;
std::string m_url;
Synchronised<float> m_progress;
std::string m_url;
Parameters * m_parameters;
virtual void afterOperation();
std::string downloadPage();
virtual void afterOperation() OVERRIDE;
/** Executed when a request has finished. */
virtual void callback() {}
/**
* Performs a POST request to the website with URL m_url using the parameters given in m_parameters.
* Returns the page as a string.
**/
std::string downloadPage();
static int progressDownload(void *clientp,
double dltotal,
double dlnow,
double ultotal,
double ulnow);
static int progressDownload( void *clientp,
double dltotal,
double dlnow,
double ultotal,
double ulnow);
static size_t WriteCallback( void *contents,
size_t size,
size_t nmemb,
void *userp);
static size_t WriteCallback(void *contents,
size_t size,
size_t nmemb,
void *userp);
virtual void callback() {}
public :
HTTPRequest(int type = 0, bool manage_memory = false, int priority = 1);

5
src/states_screens/online_screen.cpp
View File

@ -153,6 +153,8 @@ void OnlineScreen::init()
// ----------------------------------------------------------------------------
void OnlineScreen::onUpdate(float delta, irr::video::IVideoDriver* driver)
{
if (hasStateChanged())
GUIEngine::reshowCurrentScreen();
if (m_recorded_state == CurrentUser::US_SIGNING_IN)
{
m_online_status_widget->setText(Messages::signingIn(), false);
@ -161,7 +163,6 @@ void OnlineScreen::onUpdate(float delta, irr::video::IVideoDriver* driver)
{
m_online_status_widget->setText(Messages::signingOut(), false);
}
for(int i = m_requests.size()-1; i>=0; --i)
{
if(m_requests[i].isDone())
@ -184,8 +185,6 @@ void OnlineScreen::onUpdate(float delta, irr::video::IVideoDriver* driver)
m_requests.erase(i);
}
}
if (hasStateChanged())
GUIEngine::reshowCurrentScreen();
} // onUpdate
// ----------------------------------------------------------------------------