Changeset 4319

Timestamp:

Sep 25, 2000, 6:35:01 AM (25 years ago)

Author:

phaller

Message:

GlobalMemoryStatus implemented without Open32

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (3 diffs)
• oslibdos.cpp (modified) (2 diffs)
• oslibdos.h (modified) (3 diffs)

trunk/src/kernel32/KERNEL32.CPP ¶

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.52 2000-09-03 18:04:55 phaller Exp $ */
+/* $Id: KERNEL32.CPP,v 1.53 2000-09-25 04:35:01 phaller Exp $ */
 
 /*
@@ -36 +36 @@
 #include "handlemanager.h"
 #include "wprocess.h"
+#include "oslibdos.h"
 #include <versionos2.h>
 
@@ -184 +185 @@
 //******************************************************************************
 //******************************************************************************
-VOID WIN32API GlobalMemoryStatus( MEMORYSTATUS *arg1)
+
+/*
+ * PH 2000/09/25 This is an experiment to overcome some problems
+ * with Open32's GMS variant.
+ */
+void _GlobalMemoryStatus(MEMORYSTATUS *lpMemStat)
+{
+  ULONG  sys[5];
+  // Note: QSV_TOTPHYSMEM = 17, QSV_MAXSHMEM = 21
+  lpMemStat->dwLength = sizeof(MEMORYSTATUS);
+  
+  if(!OSLibDosQuerySysInfo( 17, 21, (PVOID)sys, sizeof(sys)))
+  {
+    // Specified a number between 0 and 100 that gives a general idea of
+    // current memory utilization, in which 0 indicates no memory use and
+    // 100 indicates full memory use
+
+    //#define MB512 0x1c000000
+    //lpMemStat->dwMemoryLoad = (MB512-sys[20]) * 100 / MB512;
+    lpMemStat->dwMemoryLoad = (sys[1] * 100) / sys[0];
+    
+    // bytes of physical memory
+    lpMemStat->dwTotalPhys = sys[0];
+      
+    // free physical memory bytes
+    lpMemStat->dwAvailPhys = sys[0] - sys[1];
+
+    // bytes of paging file
+    lpMemStat->dwTotalPageFile = sys[2] - sys[0];
+
+    // free bytes of paging file
+    // @@@PH subtract swapper.dat size?
+    lpMemStat->dwAvailPageFile = lpMemStat->dwTotalPageFile;
+
+    // user bytes of address space
+    lpMemStat->dwTotalVirtual = max(sys[2], sys[3]);
+    lpMemStat->dwAvailVirtual = min(sys[2], sys[3]);
+  }
+}
+
+
+
+VOID WIN32API GlobalMemoryStatus(MEMORYSTATUS *arg1)
 {
     dprintf(("KERNEL32:  GlobalMemoryStatus\n"));
-    O32_GlobalMemoryStatus(arg1);
+    //O32_GlobalMemoryStatus(arg1);
+    _GlobalMemoryStatus(arg1);
     dprintf(("dwMemoryLoad    %X\n", arg1->dwMemoryLoad));
     dprintf(("dwTotalPhys     %X\n", arg1->dwTotalPhys));

trunk/src/kernel32/oslibdos.cpp ¶

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.43 2000-09-20 21:32:53 hugh Exp $ */
+/* $Id: oslibdos.cpp,v 1.44 2000-09-25 04:35:01 phaller Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -2039 +2039 @@
 
 
+ULONG OSLibDosQuerySysInfo(ULONG iStart, ULONG iLast, PVOID pBuf, ULONG cbBuf)
+{
+  USHORT sel = RestoreOS2FS();
+  APIRET rc;
+  
+  rc = DosQuerySysInfo(iStart, iLast, pBuf, cbBuf);
+  
+  SetFS(sel);
+  SetLastError(error2WinError(rc,ERROR_INVALID_HANDLE));
+  return rc;
+}

trunk/src/kernel32/oslibdos.h ¶

@@ -1 @@
-/* $Id: oslibdos.h,v 1.23 2000-09-20 21:32:55 hugh Exp $ */
+/* $Id: oslibdos.h,v 1.24 2000-09-25 04:35:00 phaller Exp $ */
 
 /*
@@ -202 +202 @@
                            LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters,
                            LPDWORD lpTotalNumberOfClusters);
+
+ULONG OSLibDosQuerySysInfo(ULONG iStart, ULONG iLast, PVOID pBuf, ULONG cbBuf);
 
 
@@ -282 +284 @@
 
 ULONG OSLibDosQueryModuleName(ULONG hModule, int cchName, char *pszName);
-
-