From 93cfb02acb13b74198b8e0ab72f039313ecf9f1f Mon Sep 17 00:00:00 2001 From: s_nakamoto Date: Fri, 6 Nov 2009 05:50:05 +0000 Subject: got rid of CheckForShutdown, replaced some thread-unsafe wxWidgets calls, Linux fixes, socket send MSG_NOSIGNAL, bind INADDR_ANY, works reliably on Linux now except if wxMessageBox is used in a thread other than the GUI thread --- util.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'util.h') diff --git a/util.h b/util.h index 3bc7c798a5..8fcfcd0dc9 100644 --- a/util.h +++ b/util.h @@ -84,6 +84,10 @@ inline void SetThreadPriority(int nThread, int nPriority) { setpriority(PRIO_PRO #define THREAD_PRIORITY_NORMAL 0 #define THREAD_PRIORITY_ABOVE_NORMAL 0 #endif +#ifndef MSG_NOSIGNAL +#define MSG_NOSIGNAL 0 +#endif + @@ -379,6 +383,14 @@ inline int64 GetTimeMillis() return wxGetLocalTimeMillis().GetValue(); } +inline string DateTimeStrFormat(const char* pszFormat, int64 nTime) +{ + time_t n = nTime; + struct tm* ptmTime = gmtime(&n); + char pszTime[200]; + strftime(pszTime, sizeof(pszTime), pszFormat, ptmTime); + return pszTime; +} @@ -400,7 +412,7 @@ inline void heapchk() { \ static char nLoops; \ if (nLoops <= 0) \ - nLoops = GetRand(50) + 1; \ + nLoops = GetRand(20) + 1; \ if (nLoops-- > 1) \ { \ ThreadFn; \ -- cgit v1.2.3