Changeset: e034e2d4a3c3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e034e2d4a3c3 Modified Files: Branch: default Log Message:
Merge with Jun2010 branch. diffs (65 lines): diff -r bd33590d3ab8 -r e034e2d4a3c3 MonetDB/HowToStart.rst --- a/MonetDB/HowToStart.rst Mon Jun 28 20:30:10 2010 +0200 +++ b/MonetDB/HowToStart.rst Wed Jun 30 10:28:21 2010 +0200 @@ -20,7 +20,7 @@ a native Windows system (NT, 2000, XP) see the instructions in the file `../buildtools/doc/windowsbuild.rst`__. -__ http://monetdb.cwi.nl/downloads/ +__ http://dev.monetdb.org/downloads/ __ Windows-Installation.html The Suite @@ -137,7 +137,7 @@ document loader will not be compiled at all in that case. Current Linux distributions all come with libxml2. -__ http://monetdb.cwi.nl/downloads/sources/ +__ http://dev.monetdb.org/downloads/sources/ __ http://www.gnu.org/software/autoconf/ __ http://www.gnu.org/software/automake/ __ http://www.gnu.org/software/libtool/ @@ -178,7 +178,7 @@ the pre-packaged source distribution, you can skip this section and proceed to `Bootstrap, Configure and Make`_. -__ http://monetdb.cwi.nl/downloads/ +__ http://dev.monetdb.org/downloads/ Mercurial clone ~~~~~~~~~~~~~~~ diff -r bd33590d3ab8 -r e034e2d4a3c3 MonetDB/src/gdk/gdk_system.mx --- a/MonetDB/src/gdk/gdk_system.mx Mon Jun 28 20:30:10 2010 +0200 +++ b/MonetDB/src/gdk/gdk_system.mx Wed Jun 30 10:28:21 2010 +0200 @@ -372,22 +372,20 @@ # if defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES) _MT_npages = sysconf(_SC_PHYS_PAGES); # else -# if defined(HAVE_GETRLIMIT) && defined(RLIMIT_RSS) +# if defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE) { - struct rlimit rl; + int mib[2] = { CTL_HW, HW_MEMSIZE }; + unsigned int namelen = sizeof(mib) / sizeof(mib[0]); + uint64_t size; + size_t len = sizeof(size); - /* Specifies the limit (in pages) of the process's resident set - * (the number of virtual pages resident in RAM). This limit - * only has effect in Linux 2.4.x, x < 30, and there only - * affects calls to madvise() specifying MADV_WILLNEED */ - /* FIXME: this looks like a total wrong thing to check in any - * case to me */ - getrlimit(RLIMIT_RSS, &rl); - _MT_npages = rl.rlim_cur / _MT_pagesize; + if (sysctl(mib, namelen, &size, &len, NULL, 0) >= 0) { + _MT_npages = size / _MT_pagesize; + } } # else # error "don't know how to get the amount of physical memory for your OS" -# endif /* getrlimit */ +# endif /* sysctl */ # endif /* sysconf */ # endif /* GlobalMemoryStatus */ #endif /* GlobalMemoryStatusEx */ _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
