From e8d21abdd5265138c664f3ff7a40712153e115b9 Mon Sep 17 00:00:00 2001 From: ewensun Date: Wed, 10 Sep 2008 14:12:13 +0000 Subject: [PATCH] ftFileStatus contruct failure git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@726 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/dbase/fimonitor.cc | 6 ++++++ libretroshare/src/dbase/findex.cc | 2 ++ libretroshare/src/dbase/fistore.cc | 3 +++ libretroshare/src/ft/ftserver1test.cc | 4 +++- libretroshare/src/ft/fttransfermodule.cc | 22 ++++++++++++++++++++++ libretroshare/src/ft/fttransfermodule.h | 8 +++----- libretroshare/src/server/filedexserver.cc | 12 ++++++++++-- libretroshare/src/server/ft.cc | 1 + libretroshare/src/server/ftfiler.cc | 2 ++ retroshare-gui/src/main.cpp | 2 +- 10 files changed, 53 insertions(+), 9 deletions(-) diff --git a/libretroshare/src/dbase/fimonitor.cc b/libretroshare/src/dbase/fimonitor.cc index 6d0e9de75..824ea8397 100644 --- a/libretroshare/src/dbase/fimonitor.cc +++ b/libretroshare/src/dbase/fimonitor.cc @@ -39,6 +39,8 @@ /*********** * #define FIM_DEBUG 1 ***********/ + +#define FIM_DEBUG 1 FileIndexMonitor::FileIndexMonitor(CacheStrapper *cs, std::string cachedir, std::string pid) :CacheSource(RS_SERVICE_TYPE_FILE_INDEX, false, cs, cachedir), fi(pid), @@ -185,6 +187,8 @@ void FileIndexMonitor::setPeriod(int period) void FileIndexMonitor::run() { + std::cerr << "FileIndexMonitor::run() "; + std::cerr << std::endl; updateCycle(); @@ -217,6 +221,8 @@ void FileIndexMonitor::run() void FileIndexMonitor::updateCycle() { + std::cerr << "FileIndexMonitor::updateCycle() "; + std::cerr << std::endl; time_t startstamp = time(NULL); /* iterate through all out-of-date directories */ diff --git a/libretroshare/src/dbase/findex.cc b/libretroshare/src/dbase/findex.cc index 912e269cc..950842d19 100644 --- a/libretroshare/src/dbase/findex.cc +++ b/libretroshare/src/dbase/findex.cc @@ -36,6 +36,8 @@ /**** * #define FI_DEBUG 1 ****/ + +#define FI_DEBUG 1 DirEntry::~DirEntry() diff --git a/libretroshare/src/dbase/fistore.cc b/libretroshare/src/dbase/fistore.cc index 84e7d75c8..dd4e52ac8 100644 --- a/libretroshare/src/dbase/fistore.cc +++ b/libretroshare/src/dbase/fistore.cc @@ -43,6 +43,9 @@ FileIndexStore::~FileIndexStore() * #define FIS_DEBUG2 1 * #define FIS_DEBUG 1 **/ + +#define FIS_DEBUG2 1 +#define FIS_DEBUG 1 /* actual load, once data available */ int FileIndexStore::loadCache(const CacheData &data) diff --git a/libretroshare/src/ft/ftserver1test.cc b/libretroshare/src/ft/ftserver1test.cc index 395a0bb09..e6a7938d5 100644 --- a/libretroshare/src/ft/ftserver1test.cc +++ b/libretroshare/src/ft/ftserver1test.cc @@ -167,7 +167,7 @@ int main(int argc, char **argv) std::cerr << "Point 5" << std::endl; std::ostringstream pname; - pname << "./tmp/rstst-" << time(NULL); + pname << "/tmp/rstst-" << time(NULL); std::string basepath = pname.str(); RsDirUtil::checkCreateDirectory(basepath); @@ -222,6 +222,8 @@ int main(int argc, char **argv) server->setConfigDirectory(configpath); + sleep(60); + NotifyBase *base = NULL; server->SetupFtServer(base); diff --git a/libretroshare/src/ft/fttransfermodule.cc b/libretroshare/src/ft/fttransfermodule.cc index 9f78f1e27..26f4b057c 100644 --- a/libretroshare/src/ft/fttransfermodule.cc +++ b/libretroshare/src/ft/fttransfermodule.cc @@ -23,6 +23,8 @@ * */ +#define FT_DEBUG 1 + #include "fttransfermodule.h" ftTransferModule::ftTransferModule(ftFileCreator *fc, ftDataMultiplex *dm, ftController *c) @@ -45,13 +47,27 @@ bool ftTransferModule::setFileSources(std::list peerIds) { mFileSources.clear(); +#ifdef FT_DEBUG + std::cerr << "ftTransferModule::setFileSources()"; + std::cerr << " List of peers: " ; +#endif + std::list::iterator it; for(it = peerIds.begin(); it != peerIds.end(); it++) { + +#ifdef FT_DEBUG + std::cerr << " \t" << *it; +#endif + peerInfo pInfo(*it); mFileSources.insert(std::pair(*it,pInfo)); } +#ifdef FT_DEBUG + std::cerr << std::endl; +#endif + return true; } @@ -342,6 +358,12 @@ bool ftTransferModule::completeFileTransfer() int ftTransferModule::tick() { +#ifdef FT_DEBUG + std::cerr << "ftTransferModule::tick()"; + std::cerr << " mFlag: " << mFlag; + std::cerr << std::endl; +#endif + queryInactive(); switch (mFlag) { diff --git a/libretroshare/src/ft/fttransfermodule.h b/libretroshare/src/ft/fttransfermodule.h index 04a64ba03..d69420951 100644 --- a/libretroshare/src/ft/fttransfermodule.h +++ b/libretroshare/src/ft/fttransfermodule.h @@ -116,11 +116,9 @@ public: PQIFILE_FAIL_BAD_PATH }; - ftFileStatus():hash(0),stat(PQIFILE_INIT) {} - ftFileStatus(std::string hash_in):hash(hash_in),stat(PQIFILE_INIT) - { - return; - } + ftFileStatus():hash(""),stat(PQIFILE_INIT) {} + ftFileStatus(std::string hash_in):hash(hash_in),stat(PQIFILE_INIT) {} + std::string hash; Status stat; }; diff --git a/libretroshare/src/server/filedexserver.cc b/libretroshare/src/server/filedexserver.cc index 753e3d390..b41b101a9 100644 --- a/libretroshare/src/server/filedexserver.cc +++ b/libretroshare/src/server/filedexserver.cc @@ -58,6 +58,8 @@ const int fldxsrvrzone = 47659; #define SERVER_DEBUG 1 #define DEBUG_TICK 1 ****/ +#define SERVER_DEBUG 1 +#define DEBUG_TICK 1 filedexserver::filedexserver() :p3Config(CONFIG_TYPE_FSERVER), @@ -283,9 +285,15 @@ void filedexserver::setFileCallback(std::string ownId, CacheStrapper *strappe void filedexserver::StartupMonitor() { + std::cerr << "filedexserver::StartupMonitor() err" << std::endl; + + pqioutput(PQL_DEBUG_BASIC, fldxsrvrzone, + "filedexserver::StartupMonitor()"); + /* startup the FileMonitor (after cache load) */ - fimon->setPeriod(600); /* 10 minutes */ - /* start it up */ + fimon->setPeriod(100); /* 10 minutes */ + /* start it up */ + fimon->setSharedDirectories(dbase_dirs); fimon->start(); diff --git a/libretroshare/src/server/ft.cc b/libretroshare/src/server/ft.cc index 0f6d8f341..aec1da8cc 100644 --- a/libretroshare/src/server/ft.cc +++ b/libretroshare/src/server/ft.cc @@ -30,6 +30,7 @@ * #define FT_DEBUG 1 ***/ + #define FT_DEBUG 1 bool ftManager::lookupLocalHash(std::string hash, std::string &path, uint64_t &size) { diff --git a/libretroshare/src/server/ftfiler.cc b/libretroshare/src/server/ftfiler.cc index 2d3e55849..67aa09de1 100644 --- a/libretroshare/src/server/ftfiler.cc +++ b/libretroshare/src/server/ftfiler.cc @@ -41,6 +41,8 @@ const int ftfilerzone = 86539; * #define FT_DEBUG 1 ***/ +#define FT_DEBUG 1 + /* * PQI Filer * diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index e10858485..7e5490d00 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +//#include /*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers. #include