More Improvements to FileTransfer:

* Added TlvShallowClear() to serialisers
 * Added RsQueueThread for periodic queue processes.
 * Completed ftDataMultiplex which replaces ftServer/ClientModules.
 * Added Server Queue / Thread to ftDataMultiplex.
 * Added ftdataplextest to exercise ftDataMultiplex.
 * Generalised ftFileSearch to handle an array of ftSearch classes.
 * Tweaked rsfiles.h #defines to match new ftFileSearch scheme.
 * Added Generic ftData Interfaces for Testing.
 * added ftDataSend/Recv Interfaces to ftServer + ftDataMultiplex respectively.
 * Completed much of ftServer (External Interface), but not yet done.
 * Extra debugging and small changes to ftExtraList
 * Integrated new ftTransferModule with minor interface changes.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@660 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/ft/ftdataplextest.cc

@@ -0,0 +1,174 @@
+/*
+ * libretroshare/src/ft: ftextralisttest.cc
+ *
+ * File Transfer for RetroShare.
+ *
+ * Copyright 2008 by Robert Fernie.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+/*
+ * Test for Multiplexor.....
+ * As this is a key middle component, it is hard to test without other bits.
+ * It relies on ftFileProvider/ftFileCreator/ftTransferModule... 
+ *
+ * And has dummy ftDataSend and ftSearch.
+ *
+ */
+
+#include "ft/ftextralist.h"
+#include "ft/ftdatamultiplex.h"
+#include "ft/ftfilesearch.h"
+
+void	do_random_server_test(ftDataMultiplex *mplex, ftExtraList *eList, std::list<std::string> &files);
+
+
+void usage(char *name)
+{
+	std::cerr << "Usage: " << name << " [-p <period>] [-d <dperiod>] <path> [<path2> ... ] ";
+	std::cerr << std::endl;
+}
+	
+int main(int argc, char **argv)
+{
+        int c;
+        uint32_t period = 1;
+        uint32_t dPeriod = 600; /* default 10 minutes */
+
+        std::list<std::string> fileList;
+
+        while(-1 != (c = getopt(argc, argv, "d:p:")))
+        {
+                switch (c)
+                {
+                case 'p':
+                        period = atoi(optarg);
+                        break;
+                case 'd':
+                        dPeriod = atoi(optarg);
+                        break;
+                default:
+                        usage(argv[0]);
+                        break;
+                }
+        }
+
+	if (optind >= argc)
+	{
+		std::cerr << "Missing Files" << std::endl;
+		usage(argv[0]);
+	}
+
+	for(; optind < argc; optind++)
+	{
+		std::cerr << "Adding: " << argv[optind] << std::endl;
+		fileList.push_back(std::string(argv[optind]));
+	}
+
+	ftExtraList *eList = new ftExtraList();
+	eList->start();
+
+	ftSearch *ftsd = new ftSearchDummy(); 
+	ftFileSearch *ftfs = new ftFileSearch();
+
+	ftfs-> addSearchMode(ftsd, RS_FILE_HINTS_LOCAL);
+	ftfs-> addSearchMode(eList, RS_FILE_HINTS_EXTRA);
+
+	ftDataSend *ftds = new ftDataSendDummy();
+
+	/* setup Actual Test bit */
+	ftDataMultiplex *ftmplex = new ftDataMultiplex(ftds, ftfs);
+	ftmplex->start();
+
+	/* Setup Search with some valid results */
+
+
+	/* Request Data */	
+
+	/* now work the thread */
+	std::list<std::string>::iterator it;
+	uint32_t flags = 0;
+	for(it = fileList.begin(); it  != fileList.end(); it++)
+	{
+		eList->hashExtraFile(*it, dPeriod, flags);
+	}
+
+
+	/* now request files from ftDataMultiplex */
+
+	/* just request random data packets first */
+	do_random_server_test(ftmplex, eList, fileList);
+}
+
+
+
+uint32_t do_random_server_iteration(ftDataMultiplex *mplex, ftExtraList *eList, std::list<std::string> &files)
+{
+	std::cerr << "do_random_server_iteration()";
+	std::cerr << std::endl;
+
+	std::list<std::string>::iterator it;
+	uint32_t i = 0;
+	for(it = files.begin(); it != files.end(); it++)
+	{
+		FileInfo info;
+		if (eList->hashExtraFileDone(*it, info))
+		{
+			std::cerr << "Hash Done for: " << *it;
+			std::cerr << std::endl;
+			std::cerr << info << std::endl;
+
+			std::cerr << "Requesting Data Packet";
+			std::cerr << std::endl;
+
+        		/* Server Recv */
+                	uint64_t offset = 10000;
+			uint32_t chunk = 20000;
+			mplex->recvDataRequest("Peer", info.hash, info.size, offset, chunk);
+			
+			i++;
+		}
+		else
+		{
+			std::cerr << "do_random_server_iteration() Hash Not Done for: " << *it;
+			std::cerr << std::endl;
+		}
+	}
+
+	return i;
+
+}
+
+
+void	do_random_server_test(ftDataMultiplex *mplex, ftExtraList *eList, std::list<std::string> &files)
+{
+	std::cerr << "do_random_server_test()";
+	std::cerr << std::endl;
+
+	uint32_t size = files.size();
+	while(size > do_random_server_iteration(mplex, eList, files))
+	{
+		std::cerr << "do_random_server_test() sleep";
+		std::cerr << std::endl;
+
+		sleep(10);
+	}
+}
+
+