MonetDB: config_rss - Get test_rss.c to compile.

[Sjoerd Mullender]

Changeset: 71f768266ce9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71f768266ce9
Modified Files:
        sql/backends/monet5/config_rss/test_rss.c
Branch: config_rss
Log Message:

Get test_rss.c to compile.


diffs (45 lines):

diff --git a/sql/backends/monet5/config_rss/test_rss.c 
b/sql/backends/monet5/config_rss/test_rss.c
--- a/sql/backends/monet5/config_rss/test_rss.c
+++ b/sql/backends/monet5/config_rss/test_rss.c
@@ -1,14 +1,14 @@
-#include<stdio.h>
-#include<stdlib.h>
+#include "monetdb_config.h"
+#include <stdio.h>
+#include <stdlib.h>
 
-#include<Windows.h>
-#include<Psapi.h>
+#include <Windows.h>
+#include <Psapi.h>
 
-#include<mal.h>
-#include<mal_exception.h>
+#include "mal.h"
+#include "mal_exception.h"
 
 #define MB(x) ((SIZE_T) (x) << 20)
-#define GB(x) ((SIZE_T) (x) << 30)
 
 #define ALLOC_CHUNK_SIZE (MB(10))
 #define MIN_WORKING_SET MB(100)
@@ -17,7 +17,9 @@
 
 #define TEST_FILE "test_file"
 
-mal_export str TESTrestricted_rss(lng* RetVal, lng* GDK_mem_maxsize /*in 
bytes*/)
+extern __declspec(dllexport) str TESTrestricted_rss(lng* RetVal, lng* 
GDK_mem_maxsize /*in bytes*/);
+
+str TESTrestricted_rss(lng* RetVal, lng* GDK_mem_maxsize /*in bytes*/)
 {
        *RetVal = 0; // Use a dummy return value to make interfacing with 
sql/mal easy.
 
@@ -50,7 +52,7 @@ mal_export str TESTrestricted_rss(lng* R
 
                // Query process memory counters from OS.
                PROCESS_MEMORY_COUNTERS_EX psmemCounters;
-               GetProcessMemoryInfo(GetCurrentProcess(), &psmemCounters, 
sizeof(PROCESS_MEMORY_COUNTERS_EX));
+               GetProcessMemoryInfo(GetCurrentProcess(), 
(PROCESS_MEMORY_COUNTERS *) &psmemCounters, sizeof(PROCESS_MEMORY_COUNTERS_EX));
                
                printf("Working Set:\t%lld MB\t", psmemCounters.WorkingSetSize 
>> 20);
                printf("Total Memory:\t%lld MB\n", psmemCounters.PrivateUsage 
>> 20);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list