Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

added Specific protected timer class RsProtectedTimer to avoid passwd deadlock.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6494 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-07-10 21:11:11 +00:00
parent c0cc792300
commit e36557d542
4 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -31,7 +31,7 @@
#include <iostream>
#include <sstream>
#include <QTimer>
#include <util/RsProtectedTimer.h>
/******
* #define ID_DEBUG 1
@ -80,7 +80,7 @@ IdDialog::IdDialog(QWidget *parent)
connect( ui.radioButton_ListPseudo, SIGNAL(toggled( bool ) ), this, SLOT(ListTypeToggled( bool ) ) );
connect( ui.radioButton_ListAll, SIGNAL(toggled( bool ) ), this, SLOT(ListTypeToggled( bool ) ) );
QTimer *timer = new QTimer(this);
QTimer *timer = new RsProtectedTimer(this);
timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate()));
timer->start(1000);

1
retroshare-gui/src/retroshare-gui.pro
View File

@ -309,6 +309,7 @@ HEADERS += rshare.h \
gui/im_history/IMHistoryItemDelegate.h \
gui/im_history/IMHistoryItemPainter.h \
lang/languagesupport.h \
util/RsProtectedTimer.h \
util/stringutil.h \
util/DateTime.h \
util/win32.h \

53
retroshare-gui/src/util/RsProtectedTimer.h Normal file
View File

@ -0,0 +1,53 @@
/****************************************************************
* RetroShare is distributed under the following license:
*
* Copyright (C) 2013 Cyril Soler
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#pragma once
#include <QTimer>
#include <retroshare-gui/RsAutoUpdatePage.h>
#define PROTECTED_TIMER_DEBUG
class RsProtectedTimer: public QTimer
{
public:
RsProtectedTimer(QObject *parent)
: QTimer(parent)
{
}
virtual void timerEvent(QTimerEvent *e)
{
if(RsAutoUpdatePage::eventsLocked())
{
#ifdef PROTECTED_TIMER_DEBUG
std::cerr << "Timer is blocked!." << std::endl;
#endif
return ;
}
#ifdef PROTECTED_TIMER_DEBUG
std::cerr << "Timer has passsed protection." << std::endl;
#endif
QTimer::timerEvent(e) ;
}
};

4
retroshare-gui/src/util/TokenQueue.cpp
View File

@ -22,6 +22,7 @@
*/
#include "util/TokenQueue.h"
#include "retroshare-gui/RsAutoUpdatePage.h"
#include <iostream>
#include <QTimer>
@ -118,6 +119,9 @@ void TokenQueue::doPoll(float dt)
void TokenQueue::pollRequests()
{
if(RsAutoUpdatePage::eventsLocked())
return ;
double pollPeriod = 1.0; // max poll period.
if (mRequests.empty()) {