Changeset: 6fca400362c1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6fca400362c1
Modified Files:
configure.ag
gdk/gdk_posix.c
Branch: Apr2012
Log Message:
merging
diffs (40 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2608,11 +2608,6 @@ AC_CHECK_FUNCS([\
trunc \
uname \
])
-AC_RUN_IFELSE([AC_LANG_PROGRAM(
-[[#include <sys/time.h>
-#include <sys/resource.h>]],
-[[struct rusage u; exit(getrusage(RUSAGE_SELF, &u) != 0 || u.ru_maxrss <=
0);]])],
-AC_DEFINE(HAVE_GETRUSAGE, 1, [Define if you have the getrusage function with
working ru_maxrss.]))
LIBS="$save_LIBS"
save_LIBS="$LIBS"
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -53,9 +53,6 @@ extern char *sbrk(int);
#ifdef HAVE_MACH_MACH_INIT_H
# include <mach/mach_init.h>
#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
#if defined(DEBUG_ALLOC) && SIZEOF_VOID_P > 4
#undef DEBUG_ALLOC
@@ -777,11 +774,6 @@ MT_getrss(void)
if (task_info(task, TASK_BASIC_INFO_64, (task_info_t)&t_info,
&t_info_count) != KERN_INVALID_POLICY)
return t_info.resident_size; /* bytes */
-#elif defined(HAVE_GETRUSAGE)
- struct rusage usage;
-
- if (getrusage(RUSAGE_SELF, &usage) == 0)
- return (size_t) usage.ru_maxrss * 1024;
#else
/* get RSS on Linux */
int fd;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
