Update of /cvsroot/monetdb/MonetDB4/src/modules/contrib
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17968/src/modules/contrib
Modified Files:
mprof.mx
Log Message:
propagated changes of Monday Feb 11 2008 - Tuesday Feb 12 2008
from the MonetDB_4-22 branch to the development trunk
Index: mprof.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/contrib/mprof.mx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mprof.mx 8 Feb 2008 22:36:05 -0000 1.5
+++ mprof.mx 12 Feb 2008 18:46:11 -0000 1.6
@@ -363,10 +363,10 @@
perf_tag_size:= pNew("_tag_size", int);
perf_beg_time:= pNew("_beg_time", int);
perf_beg_io:= pNew("_beg_io", int);
- perf_beg_memory:= pNew("_beg_memory", int);
+ perf_beg_memory:= pNew("_beg_memory", wrd);
perf_end_time:= pNew("_end_time", int);
perf_end_io:= pNew("_end_io", int);
- perf_end_memory:= pNew("_end_memory", int);
+ perf_end_memory:= pNew("_end_memory", wrd);
commit();
}
@@ -472,7 +472,7 @@
#endif
typedef struct tms Tms;
-typedef struct mallinfo Mallinfo;
+typedef struct Mallinfo Mallinfo;
typedef struct rusage Rusage;
#include "mprof.proto.h"
@@ -1174,7 +1174,7 @@
}
int
-insB_impl(int *res, str Str1, int *clk, struct tms *t, struct rusage *ru,
struct mallinfo *m)
+insB_impl(int *res, str Str1, int *clk, struct tms *t, struct rusage *ru,
struct Mallinfo *m)
{
BUN p;
int i;
@@ -1210,7 +1210,7 @@
int clk;
struct tms t;
struct rusage ru;
- struct mallinfo m;
+ struct Mallinfo m;
if (!MprofOK)
return GDK_SUCCEED;
@@ -1224,7 +1224,7 @@
}
int
-insE_impl(int *res, str Str1, int *clk, struct tms *t, struct rusage *ru,
struct mallinfo *m)
+insE_impl(int *res, str Str1, int *clk, struct tms *t, struct rusage *ru,
struct Mallinfo *m)
{
BUN p;
int i;
@@ -1259,7 +1259,7 @@
int clk;
struct tms t;
struct rusage ru;
- struct mallinfo m;
+ struct Mallinfo m;
if (!MprofOK)
return GDK_SUCCEED;
-------------------------------------------------------------------------
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
