Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

roll back to 725 again

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
ewensun 2008-09-17 13:18:12 +00:00
parent cc41cbb708
commit fa4727865c
7 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretroshare/src/dbase/fimonitor.cc
View File

@ -40,8 +40,6 @@
* #define FIM_DEBUG 1 * #define FIM_DEBUG 1
***********/ ***********/
#define FIM_DEBUG 1
FileIndexMonitor::FileIndexMonitor(CacheStrapper *cs, std::string cachedir, std::string pid) FileIndexMonitor::FileIndexMonitor(CacheStrapper *cs, std::string cachedir, std::string pid)
:CacheSource(RS_SERVICE_TYPE_FILE_INDEX, false, cs, cachedir), fi(pid), :CacheSource(RS_SERVICE_TYPE_FILE_INDEX, false, cs, cachedir), fi(pid),
pendingDirs(false), pendingForceCacheWrite(false), pendingDirs(false), pendingForceCacheWrite(false),
@ -187,8 +185,6 @@ void FileIndexMonitor::setPeriod(int period)
void FileIndexMonitor::run() void FileIndexMonitor::run()
{ {
std::cerr << "FileIndexMonitor::run() ";
std::cerr << std::endl;
updateCycle(); updateCycle();
@ -221,8 +217,6 @@ void FileIndexMonitor::run()
void FileIndexMonitor::updateCycle() void FileIndexMonitor::updateCycle()
{ {
std::cerr << "FileIndexMonitor::updateCycle() ";
std::cerr << std::endl;
time_t startstamp = time(NULL); time_t startstamp = time(NULL);
/* iterate through all out-of-date directories */ /* iterate through all out-of-date directories */

2
libretroshare/src/dbase/findex.cc
View File

@ -37,8 +37,6 @@
* #define FI_DEBUG 1 * #define FI_DEBUG 1
****/ ****/
#define FI_DEBUG 1
DirEntry::~DirEntry() DirEntry::~DirEntry()
{ {

3
libretroshare/src/dbase/fistore.cc
View File

@ -44,9 +44,6 @@ FileIndexStore::~FileIndexStore()
* #define FIS_DEBUG 1 * #define FIS_DEBUG 1
**/ **/
#define FIS_DEBUG2 1
#define FIS_DEBUG 1
/* actual load, once data available */ /* actual load, once data available */
int FileIndexStore::loadCache(const CacheData &data) int FileIndexStore::loadCache(const CacheData &data)
{ {

10
libretroshare/src/server/filedexserver.cc
View File

@ -58,8 +58,6 @@ const int fldxsrvrzone = 47659;
#define SERVER_DEBUG 1 #define SERVER_DEBUG 1
#define DEBUG_TICK 1 #define DEBUG_TICK 1
****/ ****/
#define SERVER_DEBUG 1
#define DEBUG_TICK 1
filedexserver::filedexserver() filedexserver::filedexserver()
:p3Config(CONFIG_TYPE_FSERVER), :p3Config(CONFIG_TYPE_FSERVER),
@ -285,15 +283,9 @@ void filedexserver::setFileCallback(std::string ownId, CacheStrapper *strappe
void filedexserver::StartupMonitor() void filedexserver::StartupMonitor()
{ {
std::cerr << "filedexserver::StartupMonitor() err" << std::endl;
pqioutput(PQL_DEBUG_BASIC, fldxsrvrzone,
"filedexserver::StartupMonitor()");
/* startup the FileMonitor (after cache load) */ /* startup the FileMonitor (after cache load) */
fimon->setPeriod(100); /* 10 minutes */ fimon->setPeriod(600); /* 10 minutes */
/* start it up */ /* start it up */
fimon->setSharedDirectories(dbase_dirs); fimon->setSharedDirectories(dbase_dirs);
fimon->start(); fimon->start();

1
libretroshare/src/server/ft.cc
View File

@ -30,7 +30,6 @@
* #define FT_DEBUG 1 * #define FT_DEBUG 1
***/ ***/
#define FT_DEBUG 1
bool ftManager::lookupLocalHash(std::string hash, std::string &path, uint64_t &size) bool ftManager::lookupLocalHash(std::string hash, std::string &path, uint64_t &size)
{ {

2
libretroshare/src/server/ftfiler.cc
View File

@ -41,8 +41,6 @@ const int ftfilerzone = 86539;
* #define FT_DEBUG 1 * #define FT_DEBUG 1
***/ ***/
#define FT_DEBUG 1
/* /*
* PQI Filer * PQI Filer
* *

2
retroshare-gui/src/main.cpp
View File

@ -25,7 +25,7 @@
#include <gui/MainWindow.h> #include <gui/MainWindow.h>
#include <gui/StartDialog.h> #include <gui/StartDialog.h>
#include <gui/GenCertDialog.h> #include <gui/GenCertDialog.h>
//#include <Gui/Preferences/Rsharesettings.h> #include <Gui/Preferences/Rsharesettings.h>
/*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers. /*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
#include <gui/qskinobject/qskinobject.h> #include <gui/qskinobject/qskinobject.h>