Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-19 22:40:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reworked ranking process flow

Browse source 
added ranking retrieval in gui 
removed locks from TokenQueue
refactored gxs p3 pointers in p3face header file 
and gxs services now shutdown correctly using join(led to bad segfaults on shutdown)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5972 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2012-12-11 22:26:11 +00:00
parent f8c83779af
commit 3eaf844ec8
13 changed files with 297 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/util/TokenQueue.h
View file

@ -26,7 +26,6 @@
#include <QWidget>
#include <QTimer>
#include <QMutex>
#include <list>
#include <string>
#include <sys/time.h>
@ -100,8 +99,8 @@ public:
bool checkForRequest(uint32_t token);
void loadRequest(const TokenRequest &req);
bool activeRequestExist(const uint32_t& userType);
void activeRequestTokens(const uint32_t& userType, std::list<uint32_t>& tokens);
bool activeRequestExist(const uint32_t& userType) const;
void activeRequestTokens(const uint32_t& userType, std::list<uint32_t>& tokens) const;
protected:
void doPoll(float dt);
@ -114,8 +113,7 @@ private:
std::list<TokenRequest> mRequests;
RsTokenService *mService;
TokenResponse *mResponder;
QMutex mTokenMtx;
TokenResponse *mResponder;
QTimer *mTrigger;
};