git-svn-id: svn://db.shs.com.ru/pip@240 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

src/io/pipeer.cpp

@@ -29,6 +29,7 @@
 #define _PIPEER_BROADCAST_PORT   13361
 #define _PIPEER_TRAFFIC_PORT_S   13400
 #define _PIPEER_TRAFFIC_PORT_E   14000
+#define _PIPEER_PING_TIMEOUT     5.0
 
 
 PIPeer::PeerData::PeerData(const PIString & n): PIObject(n) {
@@ -184,6 +185,8 @@ void PIPeer::timerEvent(void * data, int delim) {
 	switch (delim) {
 	case 1: // every 1 s
 		syncPeers();
+		piMSleep(100);
+		pingNeighbours();
 		break;
 	case 5: // every 5 s
 		checkNetwork();
@@ -354,6 +357,7 @@ PIPeer::PeerInfo * PIPeer::quickestPeer(const PIString & to) {
 
 bool PIPeer::send(const PIString & to, const void * data, int size) {
 	PIByteArray ba(data, size);
+//	piCoutObj << "send" << ba.size_s() << "bytes" << _PIPEER_MSG_SIZE;
 	if (ba.size_s() <= _PIPEER_MSG_SIZE) {
 		ba.insert(0, uchar(1));
 		return sendInternal(to, ba);
@@ -364,7 +368,6 @@ bool PIPeer::send(const PIString & to, const void * data, int size) {
 		if (!dp) return false;
 		return dp->_data->send(ba);
 	}
-	//piCout << "[PIPeer] send" << size << "bytes ok";
 	return true;
 }
 
@@ -379,7 +382,10 @@ bool PIPeer::sendInternal(const PIString & to, const PIByteArray & data) {
 	PIByteArray ba;
 	ba << int(4) << self_info.name << to << int(0) << data;
 //	piCoutObj << "sendInternal to" << to << data.size_s() << int(data.front());
-	if (!sendToNeighbour(dp, ba)) return false;
+	if (!sendToNeighbour(dp, ba)) {
+		//piCoutObj << "send error";
+		return false;
+	}
 	return true;
 }
 
@@ -406,7 +412,6 @@ bool PIPeer::dataRead(uchar * readed, int size) {
 	PIString from, to;
 	ba >> type;
 	PIMutexLocker locker(eth_mutex);
-	//piCoutObj << "received data from" << from << "packet" << type;
 	if (type == 5) { // ping request
 		PIString addr;
 		PISystemTime time;
@@ -455,6 +460,7 @@ bool PIPeer::dataRead(uchar * readed, int size) {
 		}
 		return true;
 	}
+//	piCoutObj << "received data from" << from << "packet" << type;
 	if (type != 4) return true;
 	diag_d.received(size);
 	ba >> from >> to >> cnt >> pba;
@@ -731,9 +737,10 @@ void PIPeer::sendPeerRemove(const PIString & peer) {
 
 
 void PIPeer::pingNeighbours() {
+	PIMutexLocker ml(peers_mutex);
 	PIByteArray ba, sba;
 	ba << int(5) << self_info.name;
-	//piCout << "*** pingNeighbours" << peers.size() << "...";
+//	piCoutObj << "*** pingNeighbours" << peers.size() << "...";
 	piForeach (PeerInfo & p, peers) {
 		if (!p.isNeighbour()) continue;
 		//piCout << "  ping neighbour" << p.name << p.ping();
@@ -741,7 +748,7 @@ void PIPeer::pingNeighbours() {
 		piForeach (PeerInfo::Address & a, p.addresses) {
 //			piCout << "    address" << a.address << a.wait_ping;
 			if (a.wait_ping) {
-				if ((PISystemTime::current(true) - a.last_ping).abs().toSeconds() <= 5.)
+				if ((PISystemTime::current(true) - a.last_ping).abs().toSeconds() <= _PIPEER_PING_TIMEOUT)
 					continue;
 				a.ping = -1.;
 			}
@@ -797,7 +804,6 @@ void PIPeer::syncPeers() {
 			cp._data->setDist(cp.dist + 1);
 		cp.was_update = false;
 	}
-	pingNeighbours();
 	if (change) buildMap();
 	self_info.cnt++;
 	self_info.time = PISystemTime::current();

utils/system_daemon/daemon.cpp

@@ -206,7 +206,7 @@ void Daemon::TileFileProgress::tileEvent(PIScreenTile * t, TileEvent e) {
 
 
 
-Daemon::Daemon(): inited__(false), PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString(rand() % 100)), fm(this) {
+Daemon::Daemon(): inited__(false), PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString(rand() % 100)) {
 //	setName("Daemon");
 	dtimer.setName("__S__Daemon_timer");
 	mode = offset = cur = height = 0;
@@ -608,6 +608,7 @@ void Daemon::closeFileDialog(const PIString & p_name, bool ok) {
 
 void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
 	//if (conn_name != from) return;
+//	piCout << "rec" << data.size();
 	if (data.size() < 4) return;
 	PIMutexLocker ml(remote_mutex);
 	PIByteArray ba(data), rba;
@@ -626,7 +627,7 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
 		r->dir_my.cd(dir);
 		r->ft.setDirectory(r->dir_my);
 		//piCout << "store to" << r->dir_my.absolutePath();
-		piCout << "cd to" << r->dir_my.absolutePath();
+		piCoutObj << "cd to" << r->dir_my.absolutePath();
 		r->updateDir();
 //		sendDirToRemote(r);
 		break;
@@ -737,7 +738,6 @@ void Daemon::makeOtherHostInfo() {
 void Daemon::requestChDir(const PIString & d) {
 	if (d.isEmpty()) return;
 	Remote * r = remotes.value(conn_name, 0);
-	//piCout << "request chdir" << d << conn_name << r;
 	if (d.isEmpty()) return;
 	if (!r) return;
 	fm.remoteSaveDir();
@@ -745,4 +745,6 @@ void Daemon::requestChDir(const PIString & d) {
 	PIByteArray ba;
 	ba << int(RequestChangeDir) << d;
 	send(conn_name, ba);
+//	bool ok = send(conn_name, ba);
+//	piCout << "request chdir" << d << conn_name << r << ok;
 }

utils/system_daemon/file_manager.cpp

@@ -1,6 +1,5 @@
 #include "file_manager.h"
 #include "shared.h"
-#include "daemon.h"
 
 extern PIScreen screen;
 
@@ -225,10 +224,8 @@ void FileManager::TileDir::resizeEvent(int w, int h) {
 
 
 
-FileManager::FileManager(Daemon * d) {
+FileManager::FileManager() {
 	setName("FileManager");
-	del_commit = false;
-	daemon = d;
 	CONNECTU(&screen, keyPressed, this, keyEvent)
 	//dir.setDir("/home/peri4/Documents");
 	TileSimple * tl;

utils/system_daemon/file_manager.h

@@ -4,12 +4,11 @@
 #include "piscreentiles.h"
 #include "pidir.h"
 
-class Daemon;
 
 class FileManager: public PIObject {
 	PIOBJECT(FileManager)
 public:
-	FileManager(Daemon * d = 0);
+	FileManager();
 	
 	PIScreenTile * tile() const;
 	PIScreenTile * localTile() const {return panels[0];}
@@ -67,11 +66,8 @@ private:
 	EVENT1(tileKey, PIKbdListener::KeyEvent, key)
 	static void tileKey_s(void * fm, PIKbdListener::KeyEvent key) {((FileManager*)fm)->tileKey(key);}
 	
-	bool del_commit;
 	TileDir * panels[2];
-	Daemon * daemon;
 	PIScreenTile * tile_root;
-	PIStringList selected;
 	typedef PIPair<PIString, PIString> SSPair;
 
 };