Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 14:45:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

disabled some useless old branches in the flushing of incoming items due to calling pqihandler::tick() and pqipersongrp::tickServiceRecv()

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8163 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-04-23 21:37:16 +00:00
parent dcf41395fd
commit 042b61ff9e
3 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/pqi/pqihandler.cc
View file

@ -349,7 +349,7 @@ int pqihandler::locked_GetItems()
{ {
static int ntimes =0 ; static int ntimes =0 ;
if(++ntimes < 20) // if(++ntimes < 20)
{ {
std::cerr << "pqihandler::locked_GetItems() pqi->GetItem()"; std::cerr << "pqihandler::locked_GetItems() pqi->GetItem()";
std::cerr << " should never happen anymore!"; std::cerr << " should never happen anymore!";

27
libretroshare/src/pqi/pqipersongrp.cc
View file

@ -70,7 +70,7 @@ bool pqipersongrp::RecvRsRawItem(RsRawItem *item)
#ifdef TO_BE_REMOVED
// handle the tunnel services. // handle the tunnel services.
int pqipersongrp::tickServiceRecv() int pqipersongrp::tickServiceRecv()
{ {
@ -103,13 +103,14 @@ int pqipersongrp::tickServiceRecv()
} }
return 0; return 0;
} }
#endif
// handle the tunnel services. // handle the tunnel services.
// Improvements: // Improvements:
// This function is no longer necessary, and data is pushed directly to pqihandler. // This function is no longer necessary, and data is pushed directly to pqihandler.
#if 0 #ifdef TO_BE_REMOVED
int pqipersongrp::tickServiceSend() int pqipersongrp::tickServiceSend()
{ {
RsRawItem *pqi = NULL; RsRawItem *pqi = NULL;
@ -160,7 +161,7 @@ int pqipersongrp::tick()
int i = 0; int i = 0;
#if 0 #ifdef TO_BE_REMOVED
if (tickServiceSend()) if (tickServiceSend())
{ {
i = 1; i = 1;
@ -168,10 +169,6 @@ int pqipersongrp::tick()
std::cerr << "pqipersongrp::tick() moreToTick from tickServiceSend()" << std::endl; std::cerr << "pqipersongrp::tick() moreToTick from tickServiceSend()" << std::endl;
#endif #endif
} }
#endif
#if 0
if (pqihandler::tick()) /* does Send/Recv */ if (pqihandler::tick()) /* does Send/Recv */
{ {
i = 1; i = 1;
@ -179,9 +176,6 @@ int pqipersongrp::tick()
std::cerr << "pqipersongrp::tick() moreToTick from pqihandler::tick()" << std::endl; std::cerr << "pqipersongrp::tick() moreToTick from pqihandler::tick()" << std::endl;
#endif #endif
} }
#endif
if (tickServiceRecv()) if (tickServiceRecv())
{ {
i = 1; i = 1;
@ -189,20 +183,9 @@ int pqipersongrp::tick()
std::cerr << "pqipersongrp::tick() moreToTick from tickServiceRecv()" << std::endl; std::cerr << "pqipersongrp::tick() moreToTick from tickServiceRecv()" << std::endl;
#endif #endif
} }
#endif
p3ServiceServer::tick(); p3ServiceServer::tick();
#if 1
if (pqihandler::tick()) /* does Send/Recv */
{
i = 1;
#ifdef PGRP_DEBUG
std::cerr << "pqipersongrp::tick() moreToTick from pqihandler::tick()" << std::endl;
#endif
}
#endif
return i; return i;
} }

2
libretroshare/src/pqi/pqipersongrp.h
View file

@ -119,7 +119,7 @@ virtual int checkOutgoingRsItem(RsItem *item, int global)
private: private:
// The serviceserver operation. // The serviceserver operation.
int tickServiceRecv(); //int tickServiceRecv();
//int tickServiceSend(); //int tickServiceSend();
pqilistener *pqil; pqilistener *pqil;