remove junk

PIVector and PIDeque now growth to 64 MiB with PoT, then increments size by 64 MiB
in case of large containers it significantly save memory

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(PIP)
 set(PIP_MAJOR    4)
 set(PIP_MINOR    4)
-set(PIP_REVISION 0)
+set(PIP_REVISION 1)
 set(PIP_SUFFIX   )
 set(PIP_COMPANY  SHS)
 set(PIP_DOMAIN   org.SHS)

libs/main/containers/picontainers.cpp

@@ -23,7 +23,7 @@
 
 
 const size_t minAlloc    = 64;
-const size_t maxPoTAlloc = 4_MiB;
+const size_t maxPoTAlloc = 64_MiB;
 
 
 size_t _PIContainerConstantsBase::calcMinCountPoT(size_t szof) {
@@ -39,10 +39,12 @@ size_t _PIContainerConstantsBase::calcMinCountPoT(size_t szof) {
 
 
 size_t _PIContainerConstantsBase::calcMaxCountForPoT(size_t szof) {
+	// printf("calcMaxCountForPoT sizeof = %d, size = %d\n", szof, maxPoTAlloc / szof);
 	return maxPoTAlloc / szof;
 }
 
 
 size_t _PIContainerConstantsBase::calcStepAfterPoT(size_t szof) {
+	// printf("calcStepAfterPoT sizeof = %d, size = %d\n", szof, calcMaxCountForPoT(szof));
 	return calcMaxCountForPoT(szof);
 }

libs/main/containers/pideque.h

@@ -2575,17 +2575,25 @@ private:
 		pid_data  = nullptr;
 	}
 
-	inline size_t asize(ssize_t s) {
-		if (s <= 0) return 0;
-		if (pid_rsize * 2 >= size_t(s) && pid_rsize < size_t(s)) {
-			return pid_rsize * 2;
+	inline size_t asize(ssize_t ss) {
+		if (ss <= 0) return 0;
+		size_t s = ss;
+		if (s < _PIContainerConstants<T>::maxCountForPoT()) {
+			if (pid_rsize * 2 >= s && pid_rsize < s) {
+				return pid_rsize * 2;
+			}
+			ssize_t t = _PIContainerConstants<T>::minCountPoT();
+			s -= 1;
+			while (s >> t)
+				++t;
+			return (1 << t);
+		} else {
+			size_t ret = pid_rsize;
+			while (ret < s)
+				ret += _PIContainerConstants<T>::stepAfterPoT();
+			return ret;
 		}
-		size_t t = _PIContainerConstants<T>::minCountPoT();
-		s -= 1;
-		while (s >> t) {
-			++t;
-		}
-		return (1 << t);
+		return 0;
 	}
 
 	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>

libs/main/containers/pivector.h

@@ -2461,14 +2461,22 @@ private:
 
 	inline size_t asize(size_t s) {
 		if (s == 0) return 0;
-		if (piv_rsize * 2 >= s && piv_rsize < s) {
-			return piv_rsize * 2;
+		if (s < _PIContainerConstants<T>::maxCountForPoT()) {
+			if (piv_rsize * 2 >= s && piv_rsize < s) {
+				return piv_rsize * 2;
+			}
+			ssize_t t = _PIContainerConstants<T>::minCountPoT();
+			s -= 1;
+			while (s >> t)
+				++t;
+			return (1 << t);
+		} else {
+			size_t ret = piv_rsize;
+			while (ret < s)
+				ret += _PIContainerConstants<T>::stepAfterPoT();
+			return ret;
 		}
-		ssize_t t = _PIContainerConstants<T>::minCountPoT();
-		s -= 1;
-		while (s >> t)
-			++t;
-		return (1 << t);
+		return 0;
 	}
 
 	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>

libs/main/core/picout.cpp

@@ -366,7 +366,7 @@ PICout & PICout::operator<<(PIFlags<PICoutManipulators::PICoutFormat> v) {
 
 void PICout::stdoutPIString(const PIString & str, PICoutStdStream s) {
 #ifdef HAS_LOCALE
-	std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> utf8conv;
+	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> utf8conv;
 	getStdStream(s) << utf8conv.to_bytes((char16_t *)&(const_cast<PIString &>(str).front()),
 										 (char16_t *)&(const_cast<PIString &>(str).front()) + str.size());
 #else

libs/main/core/piinit.cpp

@@ -32,7 +32,6 @@
 #  ifdef ESP_PLATFORM
 #	include "esp_system.h"
 #  endif
-#  include <codecvt>
 #  ifdef WINDOWS
 #	include <winsock2.h>
 extern FILETIME __pi_ftjan1970;
@@ -149,9 +148,6 @@ PIInit::PIInit() {
 	}
 	currentLocale_t = newlocale(LC_ALL, setlocale(LC_ALL, "C"), 0);
 	setlocale(LC_CTYPE, "en_US.UTF-8");
-	// std::ios_base::sync_with_stdio(false);
-	// std::locale utf8( std::locale(), new std::codecvt_utf8<wchar_t> );
-	// std::wcout.imbue(utf8);
 #	else  // HAS_LOCALE
 	setlocale(LC_ALL, "");
 	setlocale(LC_NUMERIC, "C");

libs/main/text/pistring.cpp

@@ -320,7 +320,7 @@ void PIString::appendFromChars(const char * c, int s, const char * codepage) {
 	d.enlarge(sz);
 	MultiByteToWideChar((uint)(uintptr_t)codepage, MB_ERR_INVALID_CHARS, c, s, (LPWSTR)d.data(old_sz), sz);
 #  else
-	std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> ucs2conv;
+	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> ucs2conv;
 	std::u16string ucs2 = ucs2conv.from_bytes(c, c + s);
 	d.enlarge(ucs2.size());
 	ucs2.copy((char16_t *)d.data(old_sz), ucs2.size());
@@ -488,7 +488,7 @@ void PIString::buildData(const char * cp) const {
 	data_size_ = sz;
 	return;
 #  else
-	std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> ucs2conv;
+	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> ucs2conv;
 	std::string u8str = ucs2conv.to_bytes((char16_t *)d.data(), (char16_t *)d.data() + d.size());
 	data_             = (char *)malloc(u8str.size() + 1);
 	strcpy(data_, u8str.c_str());

utils/system_daemon/main.cpp

@@ -360,7 +360,6 @@ void usage() {
 
 
 int main(int argc, char * argv[]) {
-	sys_mon.startOnSelf();
 	// piDebug = false;
 	PICLI cli(argc, argv);
 	cli.addArgument("help");
@@ -375,6 +374,7 @@ int main(int argc, char * argv[]) {
 		usage();
 		return 0;
 	}
+	sys_mon.startOnSelf();
 	PIString name              = cli.argumentValue("name");
 	PIString sip               = cli.argumentValue("address");
 	PISingleApplication * sapp = 0;