Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-24 17:00:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed connections and removed more unused code (Patch from Cyril)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8164 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-04-24 09:29:40 +00:00
parent 042b61ff9e
commit 1b0f59d746
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretroshare/src/pqi/pqi.h
View File

@ -61,8 +61,9 @@ virtual int tick() { return 1; }
virtual int status() { return 1; } virtual int status() { return 1; }
virtual int SendRsRawItem(RsRawItem *) = 0; virtual int SendRsRawItem(RsRawItem *) = 0;
#ifdef TO_BE_REMOVED
virtual RsRawItem *GetRsRawItem() = 0; virtual RsRawItem *GetRsRawItem() = 0;
#endif
}; };

5
libretroshare/src/pqi/pqihandler.cc
View File

@ -82,6 +82,7 @@ int pqihandler::tick()
moreToTick = 1; moreToTick = 1;
} }
} }
#ifdef TO_BE_REMOVED
// get the items, and queue them correctly // get the items, and queue them correctly
if (0 < locked_GetItems()) if (0 < locked_GetItems())
{ {
@ -90,6 +91,7 @@ int pqihandler::tick()
#endif #endif
moreToTick = 1; moreToTick = 1;
} }
#endif
} }
// static time_t last_print_time = 0 ; // static time_t last_print_time = 0 ;
@ -318,6 +320,8 @@ int pqihandler::SendRsRawItem(RsRawItem *ns)
return queueOutRsItem(ns) ; return queueOutRsItem(ns) ;
} }
#ifdef TO_BE_REMOVED
// inputs. This is a very basic // inputs. This is a very basic
// system that is completely biased and slow... // system that is completely biased and slow...
// someone please fix. // someone please fix.
@ -450,6 +454,7 @@ RsRawItem *pqihandler::GetRsRawItem()
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
#endif
static const float MIN_RATE = 0.01; // 10 B/s static const float MIN_RATE = 0.01; // 10 B/s

6
libretroshare/src/pqi/pqihandler.h
View File

@ -68,7 +68,9 @@ class pqihandler: public P3Interface, public pqiPublisher
// Service Data Interface // Service Data Interface
virtual int SendRsRawItem(RsRawItem *); virtual int SendRsRawItem(RsRawItem *);
#ifdef TO_BE_REMOVED
virtual RsRawItem *GetRsRawItem(); virtual RsRawItem *GetRsRawItem();
#endif
// rate control. // rate control.
void setMaxRate(bool in, float val); void setMaxRate(bool in, float val);
@ -89,8 +91,10 @@ class pqihandler: public P3Interface, public pqiPublisher
bool queueOutRsItem(RsItem *) ; bool queueOutRsItem(RsItem *) ;
virtual int locked_checkOutgoingRsItem(RsItem *item, int global); virtual int locked_checkOutgoingRsItem(RsItem *item, int global);
int locked_GetItems(); #ifdef TO_BE_REMOVED
int locked_GetItems();
void locked_SortnStoreItem(RsItem *item); void locked_SortnStoreItem(RsItem *item);
#endif
RsMutex coreMtx; /* MUTEX */ RsMutex coreMtx; /* MUTEX */

4
libretroshare/src/pqi/pqipersongrp.cc
View File

@ -184,6 +184,10 @@ int pqipersongrp::tick()
#endif #endif
} }
#endif #endif
if(pqihandler::tick())
i=1;
p3ServiceServer::tick(); p3ServiceServer::tick();
return i; return i;