PIFile: applyFileInfo

PIPeer: fixed pisd work progress ... git-svn-id: svn://db.shs.com.ru/pip@20 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
2015-03-12 13:28:27 +00:00
parent 3ed292a602
commit fdb48aba64
14 changed files with 346 additions and 148 deletions
--- a/src/console/piscreen.cpp
+++ b/src/console/piscreen.cpp
@@ -227,6 +227,7 @@ void PIScreen::SystemConsole::print() {
 	}
 	for (int i = 0; i < height; ++i)
 		pcells[i] = cells[i];
+	printf("\e[0m");
 	fflush(0);
 #endif
 }
--- a/src/core/pitime.cpp
+++ b/src/core/pitime.cpp
@@ -293,19 +293,35 @@ PIString PIDateTime::toString(const PIString & format) const {


 #ifdef WINDOWS
-	PIDateTime::PIDateTime(FILETIME t) {
-		FILETIME lt;
-		FileTimeToLocalFileTime(&t, &lt);
-		SYSTEMTIME st;
-		FileTimeToSystemTime(&lt, &st);
-		year = st.wYear;
-		month = st.wMonth;
-		day = st.wDay;
-		hours = st.wHour;
-		minutes = st.wMinute;
-		seconds = st.wSecond;
-		milliseconds = st.wMilliseconds;
-	}
+PIDateTime::PIDateTime(FILETIME t) {
+	FILETIME lt;
+	SYSTEMTIME st;
+	FileTimeToLocalFileTime(&t, &lt);
+	FileTimeToSystemTime(&lt, &st);
+	year = st.wYear;
+	month = st.wMonth;
+	day = st.wDay;
+	hours = st.wHour;
+	minutes = st.wMinute;
+	seconds = st.wSecond;
+	milliseconds = st.wMilliseconds;
+}
+
+
+FILETIME PIDateTime::toFILETIME() const {
+	FILETIME lt, ret;
+	SYSTEMTIME st;
+	st.wYear = year;
+	st.wMonth = month;
+	st.wDay = day;
+	st.wHour = hours;
+	st.wMinute = minutes;
+	st.wSecond = seconds;
+	st.wMilliseconds = milliseconds;
+	SystemTimeToFileTime(&st, &lt);
+	LocalFileTimeToFileTime(&lt, &ret);
+	return ret;
+}
 #endif


--- a/src/core/pitime.h
+++ b/src/core/pitime.h
@@ -224,6 +224,7 @@ struct PIP_EXPORT PIDateTime {
 	PIDateTime(const PIDate & date, const PITime & time) {year = date.year; month = date.month; day = date.day; hours = time.hours; minutes = time.minutes; seconds = time.seconds; milliseconds = time.milliseconds;}
 #ifdef WINDOWS
 	PIDateTime(FILETIME t);
+	FILETIME toFILETIME() const;
 #endif
 	int year;
 	int month;
--- a/src/io/pidir.cpp
+++ b/src/io/pidir.cpp
@@ -218,7 +218,12 @@ PIVector<PIFile::FileInfo> PIDir::entries() {
 #  else
 					const_cast<char*>(p.data()), 0
 #  endif
-											, 0, versionsort);
+												   , 0,
+#  ifdef MAC_OS
+														alphasort);
+#  else
+														versionsort);
+#  endif
 	for (int i = 0; i < cnt; ++i) {
 		l << PIFile::fileInfo(dp + PIString(list[i]->d_name));
 		delete list[i];
--- a/src/io/pifile.cpp
+++ b/src/io/pifile.cpp
@@ -34,7 +34,9 @@
 #  define S_IFSOCK 0x20
 #else
 #  include <sys/stat.h>
+#  include <sys/time.h>
 #  include <fcntl.h>
+#  include <utime.h>
 #endif
 #define S_IFHDN  0x40
 #ifdef QNX
@@ -289,6 +291,20 @@ PIFile::FileInfo PIFile::fileInfo(const PIString & path) {
 		ret.size = filesize.QuadPart;
 		ret.time_access = PIDateTime(fi.ftLastAccessTime);
 		ret.time_modification = PIDateTime(fi.ftLastWriteTime);
+		/*PIByteArray sec;
+		DWORD sec_n(0);
+		//SECURITY_DESCRIPTOR sec;
+		GetFileSecurity(path.data(), DACL_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, (SECURITY_DESCRIPTOR*)sec.data(), 0, &sec_n);
+		sec.resize(sec_n);
+		GetFileSecurity(path.data(), DACL_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, (SECURITY_DESCRIPTOR*)sec.data(), sec.size(), &sec_n);
+		errorClear();
+		SID sid; BOOL def;
+		GetSecurityDescriptorGroup((PSECURITY_DESCRIPTOR)sec.data(), &sid, &def);
+		char * s(0);
+		ConvertSidToStringSid((PSID)&sid, s);
+		piCout << s;
+		LocalFree(s);
+		//ret.id_user = ;*/
 	}
 	CloseHandle(hFile);
 #else
@@ -325,3 +341,65 @@ PIFile::FileInfo PIFile::fileInfo(const PIString & path) {
 	if (n == "..") ret.flags = FileInfo::Dir | FileInfo::DotDot;
 	return ret;
 }
+
+
+bool PIFile::applyFileInfo(const PIString & path, const PIFile::FileInfo & info) {
+	if (path.isEmpty()) return false;
+	PIString fp(path);
+	if (fp.endsWith(PIDir::separator)) fp.pop_back();
+#ifdef WINDOWS
+	DWORD attr = GetFileAttributes((LPCTSTR)(path.data()));
+	if (attr == 0xFFFFFFFF) return false;
+	attr &= ~(FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_READONLY);
+	if (info.isHidden()) attr |= FILE_ATTRIBUTE_HIDDEN;
+	if (!info.perm_user.write) attr |= FILE_ATTRIBUTE_READONLY;
+	if (SetFileAttributes((LPCTSTR)(fp.data()), attr) == 0) {
+		piCout << "[PIFile] applyFileInfo: \"SetFileAttributes\" error:" << errorString();
+		return false;
+	}
+	HANDLE hFile = 0;
+	if ((attr & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY) {
+		hFile = CreateFile(path.data(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
+	} else {
+		hFile = CreateFile(path.data(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);
+	}
+	if (!hFile) return false;
+	FILETIME atime = info.time_access.toFILETIME(), mtime = info.time_modification.toFILETIME();
+	if (SetFileTime(hFile, 0, &atime, &mtime) == 0) {
+		piCout << "[PIFile] applyFileInfo: \"SetFileTime\" error:" << errorString();
+		return false;
+	}
+	CloseHandle(hFile);
+#else
+	int mode(0);
+	if (info.perm_user.read)   mode |= S_IRUSR;
+	if (info.perm_user.write)  mode |= S_IWUSR;
+	if (info.perm_user.exec)   mode |= S_IXUSR;
+	if (info.perm_group.read)  mode |= S_IRGRP;
+	if (info.perm_group.write) mode |= S_IWGRP;
+	if (info.perm_group.exec)  mode |= S_IXGRP;
+	if (info.perm_other.read)  mode |= S_IROTH;
+	if (info.perm_other.write) mode |= S_IWOTH;
+	if (info.perm_other.exec)  mode |= S_IXOTH;
+	if (chmod(fp.data(), mode) != 0) {
+		piCout << "[PIFile] applyFileInfo: \"chmod\" error:" << errorString();
+		return false;
+	}
+	if (chown(fp.data(), info.id_user, info.id_group) != 0) {
+		piCout << "[PIFile] applyFileInfo: \"chown\" error:" << errorString();
+		return false;
+	}
+	struct timeval tm[2];
+	PISystemTime st = info.time_access.toSystemTime();
+	tm[0].tv_sec = st.seconds;
+	tm[0].tv_usec = st.nanoseconds / 1000;
+	st = info.time_modification.toSystemTime();
+	tm[1].tv_sec = st.seconds;
+	tm[1].tv_usec = st.nanoseconds / 1000;
+	if (utimes(fp.data(), tm) != 0) {
+		piCout << "[PIFile] applyFileInfo: \"utimes\" error:" << errorString();
+		return false;
+	}
+#endif
+	return true;
+}
--- a/src/io/pifile.h
+++ b/src/io/pifile.h
@@ -50,6 +50,8 @@ public:
 			Permissions(uchar r = 0): raw(r) {}
 			Permissions(bool r, bool w, bool e): raw(0) {read = w; write = w; exec = e;}
 			PIString toString() const {return PIString(read ? "r" : "-") + PIString(write ? "w" : "-") + PIString(exec ? "x" : "-");}
+			operator int() const {return raw;}
+			Permissions & operator =(int v) {raw = v; return *this;}
 			union {
 				uchar raw;
 				struct {
@@ -259,6 +261,12 @@ public:
 	//! Returns FileInfo of file or dir with path "path"
 	static FileInfo fileInfo(const PIString & path);
 	
+	//! Apply "info" parameters to file or dir with path "path"
+	static bool applyFileInfo(const PIString & path, const FileInfo & info);
+	
+	//! Apply "info" parameters to file or dir with path "info".path
+	static bool applyFileInfo(const FileInfo & info) {return applyFileInfo(info.path, info);}
+	
 //! \handlers
 //! \{

--- a/src/io/pipeer.cpp
+++ b/src/io/pipeer.cpp
@@ -46,6 +46,18 @@ int PIPeer::PeerInfo::ping() const {
 }


+PIString PIPeer::PeerInfo::fastestAddress() const {
+	double mp = -1.;
+	PIString ret;
+	piForeachC (Address & a, addresses)
+		if (a.ping > 0.) {
+			mp = piMaxd(mp, a.ping);
+			ret = a.address;
+		}
+	return ret;
+}
+
+
 PIPeer::PIPeer(const PIString & name_): PIObject() {
 	setName(name_);
 	self_info.name = name_;
@@ -202,12 +214,13 @@ PIPeer::PeerInfo * PIPeer::quickestPeer(const PIString & to) {
 	PeerInfo * dp = 0;
 	int mping = 0x7FFFFFFF;
 	for (int i = 0; i < tp.size_s(); ++i) {
-		if (mping > tp[i]->ping()) {
-			mping = tp[i]->ping();
+		int p = tp[i]->ping();
+		if (mping > p && p > 0) {
+			mping = p;
 			dp = tp[i];
 		}
 	}
-	//piCout << "*** search quickest peer: found" << dp->name;
+	//piCout << "*** search quickest peer: found" << (dp ? dp->name : "0");
 	return dp;
 }

@@ -222,7 +235,7 @@ bool PIPeer::send(const PIString & to, const void * data, int size) {
 	ba << int(4) << self_info.name << to << int(0) << size;
 	PIByteArray fmsg(data, size), cmsg;
 	int msg_count = (size - 1) / _PIPEER_MSG_SIZE + 1;
-	//piCout << "[PIPeer] send" << size << "bytes in" << msg_count << "packets ...";
+	piCout << "[PIPeer] send" << size << "bytes in" << msg_count << "packets ...";
 	for (int i = 0; i < msg_count; ++i) {
 		int csize = (i == msg_count - 1) ? ((size - 1) % _PIPEER_MSG_SIZE + 1) : _PIPEER_MSG_SIZE;
 		cmsg = ba;
@@ -230,7 +243,7 @@ bool PIPeer::send(const PIString & to, const void * data, int size) {
 		cmsg.append(fmsg.data(i * _PIPEER_MSG_SIZE), csize);
 		if (!sendToNeighbour(dp, cmsg)) return false;
 	}
-	//piCout << "[PIPeer] send" << size << "bytes ok";
+	piCout << "[PIPeer] send" << size << "bytes ok";
 	return true;
 }

@@ -242,6 +255,7 @@ bool PIPeer::dataRead(uchar * readed, int size) {
 	PIString from, to;
 	ba >> type;
 	PIMutexLocker locker(eth_mutex);
+	PIMutexLocker plocker(peers_mutex);
 	//piCout << "[PIPeer \"" + name_ + "\"] Received packet" << type;
 	if (type == 5) { // ping
 		PIString addr;
@@ -259,7 +273,7 @@ bool PIPeer::dataRead(uchar * readed, int size) {
 					a.wait_ping = false;
 					if (a.ping < 0) a.ping = ptime.toMilliseconds();
 					else a.ping = 0.6 * a.ping + 0.4 * ptime.toMilliseconds();
-					piCout << "*** ping echo" << p.name << a.address << a.ping;
+					//piCout << "*** ping echo" << p.name << a.address << a.ping;
 					return true;
 				}
 			}
@@ -348,7 +362,7 @@ bool PIPeer::mbcastRead(uchar * data, int size) {
 	case 1: // new peer
 		//piCout << "new peer packet ...";
 		peers_mutex.lock();
-		if (hasPeer(pi.name)) {
+		if (!hasPeer(pi.name)) {
 			ba >> pi;
 			pi.sync = 0;
 			if (pi.dist == 0) {
@@ -397,27 +411,30 @@ bool PIPeer::mbcastRead(uchar * data, int size) {
 			if (rpeer.name == self_info.name) continue;
 			bool exist = false;
 			piForeach (PeerInfo & peer, peers) {
-				if (peer.name == rpeer.name) exist = true;
-				if (exist && isPeerRecent(peer, rpeer)) {
-					//piCout << "synced " << peer.name;
-					for (int z = 0; z < rpeer.addresses.size_s(); ++z) {
-						PeerInfo::Address & ra(rpeer.addresses[z]);
-						for (int k = 0; k < peer.addresses.size_s(); ++k) {
-							PeerInfo::Address & a(peer.addresses[k]);
-							if (ra.address == a.address) {
-								ra.ping = a.ping;
-								ra.wait_ping = a.wait_ping;
-								ra.last_ping = a.last_ping;
-								piBreak;
+				if (peer.name == rpeer.name) {
+					exist = true;
+					if (isPeerRecent(peer, rpeer)) {
+						//piCout << "synced " << peer.name;
+						for (int z = 0; z < rpeer.addresses.size_s(); ++z) {
+							PeerInfo::Address & ra(rpeer.addresses[z]);
+							for (int k = 0; k < peer.addresses.size_s(); ++k) {
+								PeerInfo::Address & a(peer.addresses[k]);
+								if (ra.address == a.address) {
+									ra.ping = a.ping;
+									ra.wait_ping = a.wait_ping;
+									ra.last_ping = a.last_ping;
+									piBreak;
+								}
 							}
 						}
+						peer.was_update = true;
+						peer.addresses = rpeer.addresses;
+						peer.cnt = rpeer.cnt;
+						peer.time = rpeer.time;
+						peer.addNeighbours(rpeer.neighbours);
+						rpeer.neighbours = peer.neighbours;
+						if (peer.name == pi.name) peer.sync = 0;
 					}
-					peer.addresses = rpeer.addresses;
-					peer.cnt = rpeer.cnt;
-					peer.time = rpeer.time;
-					peer.addNeighbours(rpeer.neighbours);
-					rpeer.neighbours = peer.neighbours;
-					if (peer.name == pi.name) peer.sync = 0;
 					piBreak;
 				}
 			}
@@ -430,8 +447,6 @@ bool PIPeer::mbcastRead(uchar * data, int size) {
 		}
 		//piCout << "***";
 		//piCout << self_info.name << self_info.neighbours;
-		if (ch)
-			findNearestAddresses();
 		piForeach (PeerInfo & i, peers) {
 			if (i.dist == 0) {
 				self_info.addNeighbour(i.name);
@@ -439,6 +454,8 @@ bool PIPeer::mbcastRead(uchar * data, int size) {
 			}
 			//piCout << i.name << i.neighbours;
 		}
+		if (ch)
+			findNearestAddresses();
 		peers_mutex.unlock();
 		//piCoutObj << "after sync " << peers.size_s() << " peers";
 		break;
@@ -449,9 +466,10 @@ bool PIPeer::mbcastRead(uchar * data, int size) {

 bool PIPeer::sendToNeighbour(PIPeer::PeerInfo * peer, const PIByteArray & ba) {
 	//if (peer->_neth == 0) return false;
-	piCout << "[PIPeer] sendToNeighbour" << peer->name << peer->_naddress << ba.size_s() << "bytes ...";
+	PIString addr = peer->fastestAddress();
+	piCout << "[PIPeer] sendToNeighbour" << peer->name << addr << ba.size_s() << "bytes ...";
 	//bool ok = peer->_neth->send(peer->_naddress, ba.data(), ba.size_s());
-	bool ok = eth_send.send(peer->_naddress, ba);
+	bool ok = eth_send.send(addr, ba);
 	//piCout << "[PIPeer] sendToNeighbour" << (ok ? "ok" : "fail");
 	if (ok) diag_d.sended(ba.size_s());
 	return ok;
@@ -504,7 +522,7 @@ void PIPeer::pingNeighbours() {
 	ba << int(5) << self_info.name;
 	//piCout << "pingNeighbours" << peers.size();
 	piForeach (PeerInfo & p, peers) {
-		//piCout << "  ping neighbour" << p.name;
+		piCout << "  ping neighbour" << p.name << p.ping();
 		if (!p.isNeighbour()) continue;
 		piForeach (PeerInfo::Address & a, p.addresses) {
 			//piCout << "    address" << a.address << a.wait_ping;
@@ -528,7 +546,7 @@ void PIPeer::syncPeers() {
 	peers_mutex.lock();
 	for (uint i = 0; i < peers.size(); ++i) {
 		PeerInfo & cp(peers[i]);
-		if (cp.sync > 3 && cp.dist == 0) {
+		if (cp.sync > 3) {
 			pn = cp.name;
 			//piCoutObj << "sync: remove " << pn;
 			addToRemoved(cp);
@@ -543,7 +561,11 @@ void PIPeer::syncPeers() {
 			change = true;
 			continue;
 		}
-		cp.sync++;
+		if (cp.was_update)
+			cp.sync = 0;
+		else
+			cp.sync++;
+		cp.was_update = false;
 	}
 	pingNeighbours();
 	if (change) findNearestAddresses();
@@ -600,7 +622,7 @@ void PIPeer::findNearestAddresses() {
 		piForeach (PIEthernet * e, eths_traffic)
 			if (e->readAddress() == ma) {
 				i._neth = e;
-				break;
+				piBreak;
 			}
 		//piCout << i.name << i._naddress;
 	}
--- a/src/io/pipeer.h
+++ b/src/io/pipeer.h
@@ -51,7 +51,7 @@ public:
 		friend PIByteArray & operator <<(PIByteArray & s, const PIPeer::PeerInfo & v);
 		friend PIByteArray & operator >>(PIByteArray & s, PIPeer::PeerInfo & v);
 	public:
-		PeerInfo() {dist = sync = cnt = 0; _neth = 0; _first = 0;}
+		PeerInfo() {dist = sync = cnt = 0; _neth = 0; _first = 0; was_update = false;}
 		
 		struct Address {
 			Address(const PIString & a = PIString(), const PIString & m = "255.255.255.0");
@@ -70,6 +70,7 @@ public:
 		
 		bool isNeighbour() const {return dist == 0;}
 		int ping() const;
+		PIString fastestAddress() const;
 		
 	protected:
 		void addNeighbour(const PIString & n) {if (!neighbours.contains(n)) neighbours << n;}
@@ -79,6 +80,7 @@ public:
 		PIString nearest_address;
 		PIStringList neighbours;
 		int sync, cnt;
+		bool was_update;
 		PISystemTime time;
 		PIString _naddress;
 		PIEthernet * _neth;