Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19519/src/modules/kernel
Modified Files:
status.mx
Log Message:
propagated changes of Monday Feb 11 2008 - Tuesday Feb 12 2008
from the MonetDB_5-4 branch to the development trunk
Index: status.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/status.mx,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- status.mx 10 Feb 2008 23:48:46 -0000 1.50
+++ status.mx 12 Feb 2008 18:48:27 -0000 1.51
@@ -33,7 +33,7 @@
command cpuStatistics() :bat[:str,:int]
address SYScpuStatistics
comment "Global cpu usage information";
-command memStatistics():bat[:str,:int]
+command memStatistics():bat[:str,:wrd]
address SYSmemStatistics
comment "Global memory usage information";
command ioStatistics():bat[:str,:int]
@@ -337,13 +337,13 @@
str
SYSmemStatistics(int *ret)
{
- struct mallinfo m;
+ struct Mallinfo m;
BAT *b;
- int i;
+ wrd i;
m = MT_mallinfo();
- b = BATnew(TYPE_str, TYPE_int, 32);
+ b = BATnew(TYPE_str, TYPE_wrd, 32);
if (b == 0)
throw(MAL, "catalog.memStatistics", "Failed to create BAT");
@@ -400,7 +400,6 @@
#endif
sze = (size_t)*num;
@c
-#if 0
int
get_mem_bigsize(lng *num)
{
@@ -415,7 +414,6 @@
GDK_mem_bigsize = MAX(32768, sze);
return GDK_SUCCEED;
}
-#endif
int
get_mem_cursize(lng *num)
@@ -435,12 +433,9 @@
set_mem_maxsize(lng *num)
{
@:num2sze(mem_maxsize)@
-#if 0
if (sze < GDK_mem_bigsize)
set_mem_bigsize(num);
GDK_mem_maxsize = MAX(GDK_mem_bigsize, sze);
-#endif
- GDK_mem_maxsize = sze;
return GDK_SUCCEED;
}
@@ -462,12 +457,9 @@
set_vm_minsize(lng *num)
{
@:num2sze(vm_minsize)@
-#if 0
if (sze < GDK_mem_bigsize)
set_mem_bigsize(num);
GDK_vm_minsize = MAX(GDK_mem_bigsize, sze);
-#endif
- GDK_vm_minsize = sze;
return GDK_SUCCEED;
}
@@ -506,7 +498,7 @@
{
lng hbuns = 0, tbuns = 0, hhsh = 0, thsh = 0, hind = 0, tind = 0, head
= 0, tail = 0, tot = 0, n = 0, sz;
BAT *bn = BATnew(TYPE_str, TYPE_lng, 2 * BBPsize);
- struct mallinfo m;
+ struct Mallinfo m;
char buf[1024];
bat i;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
