diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-05-01 11:37:47 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-05-01 11:37:47 +0000 |
| commit | 914572aba468968be24a0dc6fb324eb923b518e9 (patch) | |
| tree | d80f948b76adfb25b8549bb62929c6d431158356 /src/os_unix.c | |
| parent | d9fe7c4bb8b07330ca67018d46a334a615a421d5 (diff) | |
| download | vim-git-914572aba468968be24a0dc6fb324eb923b518e9.tar.gz | |
updated for version 7.0-236v7.0.236
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 5195b6b7b..a18845291 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -428,8 +428,8 @@ mch_char_avail() # endif /* - * Return total amount of memory available. Doesn't change when memory has - * been allocated. + * Return total amount of memory available in Kbyte. + * Doesn't change when memory has been allocated. */ /* ARGSUSED */ long_u @@ -437,9 +437,10 @@ mch_total_mem(special) int special; { # ifdef __EMX__ - return ulimit(3, 0L); /* always 32MB? */ + return ulimit(3, 0L) >> 10; /* always 32MB? */ # else long_u mem = 0; + long_u shiftright = 10; /* how much to shift "mem" right for Kbyte */ # ifdef HAVE_SYSCTL int mib[2], physmem; @@ -460,7 +461,19 @@ mch_total_mem(special) /* Linux way of getting amount of RAM available */ if (sysinfo(&sinfo) == 0) + { +# ifdef HAVE_SYSINFO_MEM_UNIT + /* avoid overflow as much as possible */ + while (shiftright > 0 && (sinfo.mem_unit & 1) == 0) + { + sinfo.mem_unit = sinfo.mem_unit >> 1; + --shiftright; + } + mem = sinfo.totalram * sinfo.mem_unit; +# else mem = sinfo.totalram; +# endif + } } # endif @@ -473,7 +486,15 @@ mch_total_mem(special) pagesize = sysconf(_SC_PAGESIZE); pagecount = sysconf(_SC_PHYS_PAGES); if (pagesize > 0 && pagecount > 0) + { + /* avoid overflow as much as possible */ + while (shiftright > 0 && (pagesize & 1) == 0) + { + pagesize = pagesize >> 1; + --shiftright; + } mem = (long_u)pagesize * pagecount; + } } # endif @@ -488,15 +509,18 @@ mch_total_mem(special) # ifdef RLIM_INFINITY && rlp.rlim_cur != RLIM_INFINITY # endif - && (long_u)rlp.rlim_cur < mem + && ((long_u)rlp.rlim_cur >> 10) < (mem >> shiftright) ) - return (long_u)rlp.rlim_cur; + { + mem = (long_u)rlp.rlim_cur; + shiftright = 10; + } } # endif if (mem > 0) - return mem; - return (long_u)0x7fffffff; + return mem >> shiftright; + return (long_u)0x1fffff; # endif } #endif |