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

Hackish changes to debug Windows Transfers...

Browse source 
Committing these so others can run tests.
Most of these changes will be removed once the problem is fixed!
 * Fixed formatting of various serialiser item::print() fns.
 * Disabled printout of TlvBinaryData - data.
 * added AccurateTimeString() function to util/rsprint.cc
 * print serialise / deserialise of FileRequest & FileData + Timestamps.
 * added print + timestamp in ftFileProvider::getFileData()
 * #define TRANSFER_DEBUG to isolate these changes.
 * enabled debugging in fttransfermodule.cc



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-11-11 20:51:17 +00:00
parent 9397491634
commit 06273fa775
6 changed files with 109 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

42
libretroshare/src/serialiser/rsbaseitems.cc
View file

@ -32,6 +32,12 @@
#define RSSERIAL_DEBUG 1
***/
#define TRANSFER_DEBUG 1
#ifdef TRANSFER_DEBUG
#include "util/rsprint.h"
#endif
#include <iostream>
/*************************************************************************/
@ -168,8 +174,8 @@ std::ostream &RsFileRequest::print(std::ostream &out, uint16_t indent)
printRsItemBase(out, "RsFileRequest", indent);
uint16_t int_Indent = indent + 2;
printIndent(out, int_Indent);
out << "FileOffset: " << fileoffset << std::endl;
out << "ChunkSize: " << chunksize << std::endl;
out << "FileOffset: " << fileoffset;
out << " ChunkSize: " << chunksize << std::endl;
file.print(out, int_Indent);
printRsItemEnd(out, "RsFileRequest", indent);
return out;
@ -222,6 +228,15 @@ bool RsFileItemSerialiser::serialiseReq(RsFileRequest *item, void *data, uin
#endif
}
/*** Debugging Transfer rates.
* print timestamp, and file details so we can workout packet lags.
***/
#ifdef TRANSFER_DEBUG
std::cerr << "RsFileItemSerialiser::serialiseReq() at: " << RsUtil::AccurateTimeString() << std::endl;
item->print(std::cerr, 10);
#endif
return ok;
}
@ -275,6 +290,16 @@ RsFileRequest *RsFileItemSerialiser::deserialiseReq(void *data, uint32_t *pktsiz
return NULL;
}
/*** Debugging Transfer rates.
* print timestamp, and file details so we can workout packet lags.
***/
#ifdef TRANSFER_DEBUG
std::cerr << "RsFileItemSerialiser::deserialiseReq() at: " << RsUtil::AccurateTimeString() << std::endl;
item->print(std::cerr, 10);
#endif
return item;
}
@ -332,7 +357,6 @@ std::ostream &RsFileData::print(std::ostream &out, uint16_t indent)
{
printRsItemBase(out, "RsFileData", indent);
uint16_t int_Indent = indent + 2;
printIndent(out, int_Indent);
fd.print(out, int_Indent);
printRsItemEnd(out, "RsFileData", indent);
return out;
@ -380,6 +404,12 @@ bool RsFileItemSerialiser::serialiseData(RsFileData *item, void *data, uint3
#endif
}
#ifdef TRANSFER_DEBUG
std::cerr << "RsFileItemSerialiser::serialiseData() at: " << RsUtil::AccurateTimeString() << std::endl;
item->print(std::cerr, 10);
#endif
return ok;
}
@ -430,6 +460,12 @@ RsFileData *RsFileItemSerialiser::deserialiseData(void *data, uint32_t *pktsize)
return NULL;
}
#ifdef TRANSFER_DEBUG
std::cerr << "RsFileItemSerialiser::deserialiseData() at: " << RsUtil::AccurateTimeString() << std::endl;
item->print(std::cerr, 10);
#endif
return item;
}