@@ -1,3 +1,7 @@

+Sat May 15 22:31:46 CEST 2010 (acab)

+------------------------------------

+ * fmap: check for anon maps are avail (bb#1940)

+

 Fri May 14 17:16:19 EEST 2010 (edwin)

 -------------------------------------

  * unit_tests: add bytecode.cvd load test

@@ -21,7 +21,7 @@

 /* enable clamuko */

 #undef CLAMUKO

-/* disable loading of unsigned bytecode */

+/* enable loading of unsigned bytecode */

 #undef CL_BCUNSIGNED

 /* enable debugging */

@@ -13985,7 +13985,7 @@ mmap((void *)0, 0, PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);

   return 0;

 }

 _ACEOF

-if ac_fn_c_try_compile "$LINENO"; then :

+if ac_fn_c_try_link "$LINENO"; then :

   ac_cv_c_mmap_anonymous='MAP_ANONYMOUS'

 else

@@ -14014,7 +14014,8 @@ rm -f core conftest.err conftest.$ac_objext \

 fi

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext \

+    conftest$ac_exeext conftest.$ac_ext

 fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_mmap_anonymous" >&5

@@ -30,7 +30,7 @@

 #ifdef HAVE_UNISTD_H

 #include <unistd.h>

 #endif

-#if HAVE_MMAP

+#ifdef ANONYMOUS_MAP

 #ifdef HAVE_SYS_MMAN_H

 #include <sys/mman.h>

 #endif

@@ -67,7 +67,7 @@ static inline unsigned int fmap_which_page(fmap_t *m, size_t at);

 #define UNPAGE_THRSHLD_HI 8*1024*1024

 #define READAHEAD_PAGES 8

-#if defined(HAVE_MMAP) && defined(C_LINUX) && defined(CL_THREAD_SAFE)

+#if defined(ANONYMOUS_MAP) && defined(C_LINUX) && defined(CL_THREAD_SAFE)

 /*

    WORKAROUND

    Relieve some stress on mmap_sem.

@@ -124,7 +124,7 @@ fmap_t *fmap_check_empty(int fd, off_t offset, size_t len, int *empty) {

     hdrsz = fmap_align_to(sizeof(fmap_t) + (pages-1) * sizeof(uint32_t), pgsz); /* fmap_t includes 1 bitmap slot, hence (pages-1) */

     mapsz = pages * pgsz + hdrsz;

     fmap_lock;

-#if HAVE_MMAP

+#ifdef ANONYMOUS_MAP

     if ((m = (fmap_t *)mmap(NULL, mapsz, PROT_READ | PROT_WRITE, MAP_PRIVATE|/*FIXME: MAP_POPULATE is ~8% faster but more memory intensive */ANONYMOUS_MAP, -1, 0)) == MAP_FAILED) {

 	m = NULL;

     } else {

@@ -133,9 +133,9 @@ fmap_t *fmap_check_empty(int fd, off_t offset, size_t len, int *empty) {

 	madvise((void *)m, mapsz, MADV_RANDOM|MADV_DONTFORK);

 #endif /* madvise */

     }

-#else /* ! HAVE_MMAP */

+#else /* ! ANONYMOUS_MAP */

     m = (fmap_t *)cli_malloc(mapsz);

-#endif /* HAVE_MMAP */

+#endif /* ANONYMOUS_MAP */

     if(!m) {

 	cli_warnmsg("fmap: map allocation failed\n");

 	fmap_unlock;

@@ -159,7 +159,7 @@ fmap_t *fmap_check_empty(int fd, off_t offset, size_t len, int *empty) {

 static void fmap_aging(fmap_t *m) {

-#if HAVE_MMAP

+#ifdef ANONYMOUS_MAP

     if(m->dumb) return;

     if(m->paged * m->pgsz > UNPAGE_THRSHLD_HI) { /* we alloc'd too much */

 	unsigned int i, avail = 0, freeme[2048], maxavail = MIN(sizeof(freeme)/sizeof(*freeme), m->paged - UNPAGE_THRSHLD_LO / m->pgsz) - 1;

@@ -410,7 +410,7 @@ void fmap_unneed_ptr(fmap_t *m, void *ptr, size_t len) {

 }

 void funmap(fmap_t *m) {

-#if HAVE_MMAP

+#ifdef ANONYMOUS_MAP

     if(!m->dumb) {

 	size_t len = m->pages * m->pgsz + m->hdrsz;

 	fmap_lock;

@@ -80,7 +80,7 @@ AC_DEFUN([AC_C_FUNC_MMAP_ANONYMOUS],

 [

 	AC_CACHE_CHECK([for MAP_ANON(YMOUS)], [ac_cv_c_mmap_anonymous],[

 		ac_cv_c_mmap_anonymous='no'

-		AC_COMPILE_IFELSE(

+		AC_LINK_IFELSE(

 			[AC_LANG_PROGRAM([[#include <sys/mman.h>]], [[mmap((void *)0, 0, PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);]])],

 			[ac_cv_c_mmap_anonymous='MAP_ANONYMOUS'],

 			[