mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-18 10:57:18 -05:00
* switched off some debugging.
* fixed tickrate slow down (when no activity) * added extra flags to interface. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
c05acf2f95
commit
d89eda510f
@ -34,8 +34,6 @@
|
||||
* #define CS_DEBUG 1
|
||||
***/
|
||||
|
||||
#define CS_DEBUG 1
|
||||
|
||||
bool operator<(const CacheId &a, const CacheId &b)
|
||||
{
|
||||
if (a.type == b.type)
|
||||
|
@ -49,8 +49,9 @@
|
||||
|
||||
#include "serialiser/rsconfigitems.h"
|
||||
|
||||
|
||||
#define CONTROL_DEBUG 1
|
||||
/******
|
||||
* #define CONTROL_DEBUG 1
|
||||
*****/
|
||||
|
||||
ftFileControl::ftFileControl()
|
||||
:mTransfer(NULL), mCreator(NULL),
|
||||
@ -124,8 +125,11 @@ void ftController::run()
|
||||
std::map<std::string, ftFileControl>::iterator it;
|
||||
for(it = mDownloads.begin(); it != mDownloads.end(); it++)
|
||||
{
|
||||
|
||||
#ifdef CONTROL_DEBUG
|
||||
std::cerr << "\tTicking: " << it->first;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
if (it->second.mTransfer)
|
||||
(it->second.mTransfer)->tick();
|
||||
|
@ -47,6 +47,7 @@ const int ftserverzone = 29539;
|
||||
|
||||
/***
|
||||
* #define SERVER_DEBUG 1
|
||||
* #define DEBUG_TICK 1
|
||||
***/
|
||||
|
||||
/* Setup */
|
||||
@ -612,10 +613,15 @@ int ftServer::tick()
|
||||
// This function needs to be divided up.
|
||||
bool ftServer::handleInputQueues()
|
||||
{
|
||||
handleCacheData();
|
||||
handleFileData();
|
||||
return true;
|
||||
bool moreToTick = false;
|
||||
|
||||
if (handleCacheData())
|
||||
moreToTick = true;
|
||||
|
||||
if (handleFileData())
|
||||
moreToTick = true;
|
||||
|
||||
return moreToTick;
|
||||
}
|
||||
|
||||
bool ftServer::handleCacheData()
|
||||
@ -704,9 +710,11 @@ bool ftServer::handleCacheData()
|
||||
|
||||
//rslog(RSL_DEBUG_BASIC, ftserverzone, out2.str());
|
||||
mP3iface -> SendSearchResult(ci);
|
||||
|
||||
i++;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
return (i > 0);
|
||||
}
|
||||
|
||||
|
||||
@ -740,7 +748,6 @@ bool ftServer::handleFileData()
|
||||
|
||||
FileInfo(ffr);
|
||||
delete fr;
|
||||
|
||||
}
|
||||
|
||||
// now File Data.
|
||||
|
@ -23,7 +23,9 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#define FT_DEBUG 1
|
||||
/******
|
||||
* #define FT_DEBUG 1
|
||||
*****/
|
||||
|
||||
#include "fttransfermodule.h"
|
||||
|
||||
|
@ -45,7 +45,12 @@ const uint32_t RS_POPUP_CHAT = 0x0002;
|
||||
const uint32_t RS_POPUP_CALL = 0x0004;
|
||||
const uint32_t RS_POPUP_CONNECT = 0x0008;
|
||||
|
||||
|
||||
/* CHAT flags are here - so they are in the same place as
|
||||
* other Notify flags... not used by libretroshare though
|
||||
*/
|
||||
const uint32_t RS_CHAT_OPEN_NEW = 0x0001;
|
||||
const uint32_t RS_CHAT_REOPEN = 0x0002;
|
||||
const uint32_t RS_CHAT_FOCUS = 0x0004;
|
||||
|
||||
const uint32_t RS_FEED_TYPE_PEER = 0x0010;
|
||||
const uint32_t RS_FEED_TYPE_CHAN = 0x0020;
|
||||
|
@ -37,8 +37,6 @@
|
||||
* #define DISTRIB_DEBUG 1
|
||||
****/
|
||||
|
||||
#define DISTRIB_DEBUG 1
|
||||
|
||||
RSA *extractPublicKey(RsTlvSecurityKey &key);
|
||||
RSA *extractPrivateKey(RsTlvSecurityKey &key);
|
||||
void setRSAPublicKey(RsTlvSecurityKey &key, RSA *rsa_pub);
|
||||
|
Loading…
Reference in New Issue
Block a user