* 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

libretroshare/src/ft/ftcontroller.cc

@@ -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();

libretroshare/src/ft/ftserver.cc

@@ -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.

libretroshare/src/ft/fttransfermodule.cc

@@ -23,7 +23,9 @@
  *
  */
 
-#define FT_DEBUG 1
+/******
+ * #define FT_DEBUG 1
+ *****/
 
 #include "fttransfermodule.h"