Commit ae0f4dee by Laurynas Biveinis Committed by Neil Booth

cppfiles.c (purge_cache): use munmap() only if MMAP_THRESHOLD defined.

	* cppfiles.c (purge_cache): use munmap() only if MMAP_THRESHOLD
	 defined.
	(read_include_file): Ensure inc->mmaped is initialized.

From-SVN: r36459
parent 6f84c9bd
Sat 16-Sep-2000 19:14:00 BST Laurynas Biveinis <lauras@softhome.net>
* cppfiles.c (purge_cache): use munmap() only if MMAP_THRESHOLD
defined.
(read_include_file): Ensure inc->mmaped is initialized.
2000-09-16 Richard Henderson <rth@cygnus.com> 2000-09-16 Richard Henderson <rth@cygnus.com>
* cppiles.c (purge_cache): Use PTR not caddr_t. * cppiles.c (purge_cache): Use PTR not caddr_t.
......
...@@ -272,6 +272,7 @@ read_include_file (pfile, inc) ...@@ -272,6 +272,7 @@ read_include_file (pfile, inc)
} }
size = inc->st.st_size; size = inc->st.st_size;
inc->mapped = 0;
#if MMAP_THRESHOLD #if MMAP_THRESHOLD
if (pagesize == -1) if (pagesize == -1)
pagesize = getpagesize (); pagesize = getpagesize ();
...@@ -300,7 +301,6 @@ read_include_file (pfile, inc) ...@@ -300,7 +301,6 @@ read_include_file (pfile, inc)
} }
offset += count; offset += count;
} }
inc->mapped = 0;
} }
} }
else if (S_ISBLK (inc->st.st_mode)) else if (S_ISBLK (inc->st.st_mode))
...@@ -363,9 +363,11 @@ purge_cache (inc) ...@@ -363,9 +363,11 @@ purge_cache (inc)
{ {
if (inc->buffer) if (inc->buffer)
{ {
#if MMAP_THRESHOLD
if (inc->mapped) if (inc->mapped)
munmap ((PTR) inc->buffer, inc->st.st_size); munmap ((PTR) inc->buffer, inc->st.st_size);
else else
#endif
free ((PTR) inc->buffer); free ((PTR) inc->buffer);
inc->buffer = NULL; inc->buffer = NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment