Update of /cvsroot/monetdb/MonetDB4/src/monet
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11254/src/monet
Modified Files:
Tag: MonetDB_4-22
monet_interpreter.mx
Log Message:
Changed the way we check for and use mallinfo(): If mallinfo() returns
a struct with fields which are too small to hold the information it is
supposed to return (e.g. 32 bits on a 64-bit system), we ignore
mallinfo(). Also, we use our own struct to hold the information, so
that the rest of the software can rely on bot the presence of the
struct and the types of the fields.
This also results in one interface change: the view_gdk_memory() and
memory() functions in M4 and the memStatistics() function in M5 now
return a BAT with a wrd tail instead of int.
Index: monet_interpreter.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/monet/monet_interpreter.mx,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -d -r1.13.2.1 -r1.13.2.2
--- monet_interpreter.mx 5 Feb 2008 22:33:33 -0000 1.13.2.1
+++ monet_interpreter.mx 12 Feb 2008 09:23:38 -0000 1.13.2.2
@@ -2546,11 +2546,11 @@
void
onlineProfilerEvent(char *caller, lng clk, lng ticks, struct tms *timer,
YYSTREE lt)
{
- static struct mallinfo prevMalloc;
+ static struct Mallinfo prevMalloc;
static struct rusage prevUsage;
static int eventcounter;
struct tms newTms;
- struct mallinfo infoMalloc;
+ struct Mallinfo infoMalloc;
struct rusage infoUsage;
char namebuf[1024];
-------------------------------------------------------------------------
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
