Take best fitting type for available memory measurement.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-27 18:47:26 +00:00
parent 49a1436640
commit 9d8aca4832
8 changed files with 554 additions and 537 deletions
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -1244,7 +1244,7 @@ current computer and/or user characteristics.

 \membersection{::wxGetFreeMemory}\label{wxgetfreememory}

-\func{long}{wxGetFreeMemory}{\void}
+\func{wxMemorySize}{wxGetFreeMemory}{\void}

 Returns the amount of free memory in bytes under environments which
 support it, and -1 if not supported. Currently, it is supported only
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -61,6 +61,18 @@ class WXDLLIMPEXP_CORE wxPoint;
 #define wxMax(a,b)            (((a) > (b)) ? (a) : (b))
 #define wxMin(a,b)            (((a) < (b)) ? (a) : (b))

+// wxGetFreeMemory can return huge amount of memory on 64-bit platforms
+// define wxMemorySize according to the type which best fits your platform
+#if wxUSE_LONGLONG && defined(__WIN64__)
+    // 64 bit Windowses have sizeof(long) only 32 bit long
+    // we need to use wxLongLong to express memory sizes
+    #define wxMemorySize wxLongLong
+#else
+    // 64 bit UNIX has sizeof(long) = 64
+    // assume 32 bit platforms cannnot return more than 32bits of
+    #define wxMemorySize long
+#endif
+
 // ----------------------------------------------------------------------------
 // String functions (deprecated, use wxString)
 // ----------------------------------------------------------------------------
@@ -283,7 +295,7 @@ wxDEPRECATED( WXDLLIMPEXP_BASE void wxUsleep(unsigned long milliseconds) );
 WXDLLIMPEXP_BASE unsigned long wxGetProcessId();

 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-WXDLLIMPEXP_BASE long wxGetFreeMemory();
+WXDLLIMPEXP_BASE wxMemorySize wxGetFreeMemory();

 // should wxApp::OnFatalException() be called?
 WXDLLIMPEXP_BASE bool wxHandleFatalExceptions(bool doit = true);
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -260,7 +260,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
    else
        buf[0] = 0 ;

-  return TRUE;
+    return true;
 }

 // Get user ID e.g. jacs
@@ -298,7 +298,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
    else
        buf[0] = 0 ;

-  return TRUE;
+    return true;
 }

 int wxKill(long pid, wxSignal sig , wxKillError *rc, int flags)
@@ -313,7 +313,7 @@ WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
    return false ;
 }

-// set the env var name to the given value, return TRUE on success
+// set the env var name to the given value, return true on success
 WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
 {
    // TODO : under classic there is no environement support, under X yes
@@ -326,20 +326,20 @@ WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
 bool wxShell(const wxString& command)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 // Shutdown or reboot the PC
 bool wxShutdown(wxShutdownFlags wFlags)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
 {
-    return FreeMem() ;
+    return (wxMemorySize)FreeMem() ;
 }

 #ifndef __DARWIN__
@@ -406,7 +406,7 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
@@ -436,7 +436,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
 bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
@@ -447,9 +447,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
    {
        *value = (float)strtod(s, NULL);
        delete[] s;
-        return TRUE;
+        return true;
    }
-    else return FALSE;
+    else return false;
 }

 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
@@ -460,9 +460,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
    {
        *value = strtol(s, NULL, 10);
        delete[] s;
-        return TRUE;
+        return true;
    }
-    else return FALSE;
+    else return false;
 }

 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
@@ -473,9 +473,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
    {
        *value = (int)strtol(s, NULL, 10);
        delete[] s;
-        return TRUE;
+        return true;
    }
-    else return FALSE;
+    else return false;
 }
 #endif // wxUSE_RESOURCES

@@ -507,7 +507,7 @@ void wxEndBusyCursor()
    }
 }

-// TRUE if we're between the above two calls
+// true if we're between the above two calls
 bool wxIsBusy()
 {
    return (gs_wxBusyCursorCount > 0);
@@ -539,7 +539,7 @@ wxString wxMacFindFolder( short        vol,
 bool wxCheckForInterrupt(wxWindow *wnd)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 void wxGetMousePosition( int* x, int* y )
@@ -552,10 +552,10 @@ void wxGetMousePosition( int* x, int* y )
    *y = pt.v ;
 };

-// Return TRUE if we have a colour display
+// Return true if we have a colour display
 bool wxColourDisplay()
 {
-    return TRUE;
+    return true;
 }

 // Returns depth of screen
@@ -644,7 +644,7 @@ wxChar *wxGetUserHome (const wxString& user)
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
    if ( path.empty() )
-        return FALSE;
+        return false;

    wxString p = path ;
    if (p[0u] == ':' ) {
--- a/src/mac/classic/utils.cpp
+++ b/src/mac/classic/utils.cpp
@@ -114,7 +114,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
    else
        buf[0] = 0 ;

-  return TRUE;
+    return true;
 }

 // Get user ID e.g. jacs
@@ -152,7 +152,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
    else
        buf[0] = 0 ;

-  return TRUE;
+    return true;
 }

 int wxKill(long pid, wxSignal sig , wxKillError *rc, int flags)
@@ -167,7 +167,7 @@ WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
    return false ;
 }

-// set the env var name to the given value, return TRUE on success
+// set the env var name to the given value, return true on success
 WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
 {
    // TODO : under classic there is no environement support, under X yes
@@ -180,20 +180,20 @@ WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
 bool wxShell(const wxString& command)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 // Shutdown or reboot the PC
 bool wxShutdown(wxShutdownFlags wFlags)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
 {
-    return FreeMem() ;
+    return (wxMemorySize)FreeMem() ;
 }

 void wxUsleep(unsigned long milliseconds)
@@ -253,7 +253,7 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
@@ -283,7 +283,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
 bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
@@ -294,9 +294,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
    {
        *value = (float)strtod(s, NULL);
        delete[] s;
-        return TRUE;
+        return true;
    }
-    else return FALSE;
+    else return false;
 }

 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
@@ -307,9 +307,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
    {
        *value = strtol(s, NULL, 10);
        delete[] s;
-        return TRUE;
+        return true;
    }
-    else return FALSE;
+    else return false;
 }

 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
@@ -320,9 +320,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
    {
        *value = (int)strtol(s, NULL, 10);
        delete[] s;
-        return TRUE;
+        return true;
    }
-    else return FALSE;
+    else return false;
 }
 #endif // wxUSE_RESOURCES

@@ -354,7 +354,7 @@ void wxEndBusyCursor()
    }
 }

-// TRUE if we're between the above two calls
+// true if we're between the above two calls
 bool wxIsBusy()
 {
    return (gs_wxBusyCursorCount > 0);
@@ -392,7 +392,7 @@ wxString wxMacFindFolder( short        vol,
 bool wxCheckForInterrupt(wxWindow *wnd)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 void wxGetMousePosition( int* x, int* y )
@@ -405,10 +405,10 @@ void wxGetMousePosition( int* x, int* y )
    *y = pt.v ;
 };

-// Return TRUE if we have a colour display
+// Return true if we have a colour display
 bool wxColourDisplay()
 {
-    return TRUE;
+    return true;
 }

 // Returns depth of screen
@@ -524,7 +524,7 @@ wxChar *wxGetUserHome (const wxString& user)
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
    if ( path.empty() )
-        return FALSE;
+        return false;

    wxString p = path ;
    if (p[0u] == ':' ) {
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -1010,15 +1010,20 @@ bool wxShutdown(wxShutdownFlags wFlags)
 // ----------------------------------------------------------------------------

 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
 {
-#if defined(__WIN32__) && !defined(__BORLANDC__)
+#if defined(__WIN64__)
+    MEMORYSTATUSEX memStatex;
+    statex.dwLength = sizeof (statex);
+    GlobalMemoryStatusEx (&statex);
+    return (wxMemorySize)memStatus.ullAvailPhys;
+#elif defined(__WIN32__) && !defined(__BORLANDC__)
    MEMORYSTATUS memStatus;
    memStatus.dwLength = sizeof(MEMORYSTATUS);
    GlobalMemoryStatus(&memStatus);
-    return memStatus.dwAvailPhys;
+    return (wxMemorySize)memStatus.dwAvailPhys;
 #else
-    return (long)GetFreeSpace(0);
+    return (wxMemorySize)GetFreeSpace(0);
 #endif
 }

--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -95,7 +95,7 @@ bool wxGetHostName(
        wxStrncpy(zBuf, zSysname, nMaxSize - 1);
    zBuf[nMaxSize] = _T('\0');
 #endif
-    return *zBuf ? TRUE : FALSE;
+    return *zBuf ? true : false;
 }

 // Get user ID e.g. jacs
@@ -108,9 +108,9 @@ bool wxGetUserId(
    long                            lrc;
    // UPM procs return 0 on success
    lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
-    if (lrc == 0) return TRUE;
+    if (lrc == 0) return true;
 #endif
-    return FALSE;
+    return false;
 }

 bool wxGetUserName(
@@ -125,7 +125,7 @@ bool wxGetUserName(
 #else
    wxStrncpy(zBuf, _T("Unknown User"), nMaxSize);
 #endif
-    return TRUE;
+    return true;
 }

 int wxKill(
@@ -201,11 +201,11 @@ bool wxShell(
 bool wxShutdown(wxShutdownFlags wFlags)
 {
    // TODO
-    return FALSE;
+    return false;
 }

 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
 {
    void*                           pMemptr = NULL;
    ULONG                           lSize;
@@ -215,8 +215,8 @@ long wxGetFreeMemory()
    lMemFlags = PAG_FREE;
    rc = ::DosQueryMem(pMemptr, &lSize, &lMemFlags);
    if (rc != 0)
-        return -1L;
-    return (long)lSize;
+        lSize = -1L;
+    return (wxMemorySize)lSize;
 }

 // ----------------------------------------------------------------------------
@@ -228,14 +228,14 @@ bool wxGetEnv(const wxString& var, wxString *value)
    // wxGetenv is defined as getenv()
    wxChar *p = wxGetenv(var);
    if ( !p )
-        return FALSE;
+        return false;

    if ( value )
    {
        *value = p;
    }

-    return TRUE;
+    return true;
 }

 bool wxSetEnv(const wxString& variable, const wxChar *value)
@@ -257,7 +257,7 @@ bool wxSetEnv(const wxString& variable, const wxChar *value)

    return putenv(buf) == 0;
 #else // no way to set an env var
-    return FALSE;
+    return false;
 #endif
 }

--- a/src/palmos/utils.cpp
+++ b/src/palmos/utils.cpp
@@ -156,7 +156,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
 // ----------------------------------------------------------------------------

 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
 {
    uint32_t freeTotal = 0;
    uint32_t freeHeap;
@@ -171,7 +171,7 @@ long wxGetFreeMemory()
        freeTotal+=freeHeap;
    }

-    return freeTotal;
+    return (wxMemorySize)freeTotal;
 }

 unsigned long wxGetProcessId()
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -259,7 +259,7 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
    wxString argument;
    const wxChar *cptr = command.c_str();
    wxChar quotechar = wxT('\0'); // is arg quoted?
-    bool escaped = FALSE;
+    bool escaped = false;

    // split the command line in arguments
    do
@@ -278,14 +278,14 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
        {
            if ( *cptr == wxT('\\') && ! escaped )
            {
-                escaped = TRUE;
+                escaped = true;
                cptr++;
                continue;
            }

            // all other characters:
            argument += *cptr++;
-            escaped = FALSE;
+            escaped = false;

            // have we reached the end of the argument?
            if ( (*cptr == quotechar && ! escaped)
@@ -348,7 +348,7 @@ bool wxShell(const wxString& command)

 bool wxShell(const wxString& command, wxArrayString& output)
 {
-    wxCHECK_MSG( !!command, FALSE, _T("can't exec shell non interactively") );
+    wxCHECK_MSG( !command.empty(), false, _T("can't exec shell non interactively") );

    return wxExecute(wxMakeShellCommand(command), output);
 }
@@ -369,7 +369,7 @@ bool wxShutdown(wxShutdownFlags wFlags)

        default:
            wxFAIL_MSG( _T("unknown wxShutdown() flag") );
-            return FALSE;
+            return false;
    }

    return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
@@ -385,7 +385,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
 bool wxPipeInputStream::CanRead() const
 {
    if ( m_lasterror == wxSTREAM_EOF )
-        return FALSE;
+        return false;

    // check if there is any input available
    struct timeval tv;
@@ -404,7 +404,7 @@ bool wxPipeInputStream::CanRead() const
            // fall through

        case 0:
-            return FALSE;
+            return false;

        default:
            wxFAIL_MSG(_T("unexpected select() return value"));
@@ -724,7 +724,7 @@ char *wxGetUserHome( const wxString &user )
 // private use only)
 static bool wxGetHostNameInternal(wxChar *buf, int sz)
 {
-    wxCHECK_MSG( buf, FALSE, wxT("NULL pointer in wxGetHostNameInternal") );
+    wxCHECK_MSG( buf, false, wxT("NULL pointer in wxGetHostNameInternal") );

    *buf = wxT('\0');

@@ -742,7 +742,7 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz)
 #else // no uname, no gethostname
    wxFAIL_MSG(wxT("don't know host name for this machine"));

-    bool ok = FALSE;
+    bool ok = false;
 #endif // uname/gethostname

    if ( !ok )
@@ -785,7 +785,7 @@ bool wxGetFullHostName(wxChar *buf, int sz)
            {
                wxLogSysError(_("Cannot get the official hostname"));

-                ok = FALSE;
+                ok = false;
            }
            else
            {
@@ -807,10 +807,10 @@ bool wxGetUserId(wxChar *buf, int sz)
    if ((who = getpwuid(getuid ())) != NULL)
    {
        wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
-        return TRUE;
+        return true;
    }

-    return FALSE;
+    return false;
 }

 bool wxGetUserName(wxChar *buf, int sz)
@@ -829,10 +829,10 @@ bool wxGetUserName(wxChar *buf, int sz)
 #else // !HAVE_PW_GECOS
       wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
 #endif // HAVE_PW_GECOS/!HAVE_PW_GECOS
-       return TRUE;
+       return true;
    }

-    return FALSE;
+    return false;
 }

 // this function is in mac/utils.cpp for wxMac
@@ -863,7 +863,7 @@ unsigned long wxGetProcessId()
    return (unsigned long)getpid();
 }

-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
 {
 #if defined(__LINUX__)
    // get it from /proc/meminfo
@@ -881,10 +881,10 @@ long wxGetFreeMemory()

        fclose(fp);

-        return memFree;
+        return (wxMemorySize)memFree;
    }
 #elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)
-    return sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE);
+    return (wxMemorySize)(sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE));
 //#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably
 #endif

@@ -901,7 +901,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
    {
        wxLogSysError( wxT("Failed to get file system statistics") );

-        return FALSE;
+        return false;
    }

    // under Solaris we also have to use f_frsize field instead of f_bsize
@@ -922,9 +922,9 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
        *pFree = wxLongLong(fs.f_bavail) * blockSize;
    }

-    return TRUE;
+    return true;
 #else // !HAVE_STATFS && !HAVE_STATVFS
-    return FALSE;
+    return false;
 #endif // HAVE_STATFS
 }

@@ -937,14 +937,14 @@ bool wxGetEnv(const wxString& var, wxString *value)
    // wxGetenv is defined as getenv()
    wxChar *p = wxGetenv(var);
    if ( !p )
-        return FALSE;
+        return false;

    if ( value )
    {
        *value = p;
    }

-    return TRUE;
+    return true;
 }

 bool wxSetEnv(const wxString& variable, const wxChar *value)
@@ -994,13 +994,13 @@ extern "C" void wxFatalSignalHandler(wxTYPE_SA_HANDLER)
 bool wxHandleFatalExceptions(bool doit)
 {
    // old sig handlers
-    static bool s_savedHandlers = FALSE;
+    static bool s_savedHandlers = false;
    static struct sigaction s_handlerFPE,
                            s_handlerILL,
                            s_handlerBUS,
                            s_handlerSEGV;

-    bool ok = TRUE;
+    bool ok = true;
    if ( doit && !s_savedHandlers )
    {
        // install the signal handler
@@ -1022,7 +1022,7 @@ bool wxHandleFatalExceptions(bool doit)
            wxLogDebug(_T("Failed to install our signal handler."));
        }

-        s_savedHandlers = TRUE;
+        s_savedHandlers = true;
    }
    else if ( s_savedHandlers )
    {
@@ -1036,7 +1036,7 @@ bool wxHandleFatalExceptions(bool doit)
            wxLogDebug(_T("Failed to uninstall our signal handler."));
        }

-        s_savedHandlers = FALSE;
+        s_savedHandlers = false;
    }
    //else: nothing to do