@@ -1,3 +1,9 @@

+Wed Nov  5 13:17:51 EET 2008 (edwin)

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

+ * libclamav/mpool.c, libclamav/mpool.h, libclamav/readdb.c: use

+ ANONYMOUS_MAP from clamav-config.h instead of MAP_ANONYMOUS, fix

+ mp_flush call mp_flush from readdb

+

 Wed Nov  5 10:56:28 EET 2008 (edwin)

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

  * libclamav/mpool.c (mp_destroy): need to use sizeof(*mp) because mp is a pointer here!!

@@ -67,6 +67,7 @@ FILE *lfd = NULL;

 /* #define MIN_FRAGSIZE 524288	/\* 0m2.387s *\/ */

 /* #define MIN_FRAGSIZE 1048576	/\* 0m2.392s *\/ */

 /* #define MIN_FRAGSIZE 2097152	/\* 0m2.402s *\/ */

+/* #define MIN_FRAGSIZE 99688128 */

 #if SIZEOF_VOID_P==8

 static const unsigned int fragsz[] = {

@@ -357,7 +358,7 @@ struct MP *mp_create() {

   sz = align_to_pagesize(&mp, MIN_FRAGSIZE);

   mp.mpm.usize = align_to_voidptr(sizeof(struct MPMAP));

   mp.mpm.size = sz - align_to_voidptr(sizeof(mp));

-  if ((mp_p = (struct MP *)mmap(NULL, sz, PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)) == MAP_FAILED)

+  if ((mp_p = (struct MP *)mmap(NULL, sz, PROT_READ | PROT_WRITE, MAP_PRIVATE|ANONYMOUS_MAP, -1, 0)) == MAP_FAILED)

     return NULL;

   memcpy(mp_p, &mp, sizeof(mp));

   spam("Map created @ %p->%p - size %u out of %u\n", mp_p, (void*)mp_p + mp.mpm.size, mp.mpm.usize, mp.mpm.size);

@@ -375,15 +376,22 @@ void mp_destroy(struct MP *mp) {

 }

 void mp_flush(struct MP *mp) {

+  size_t used = 0, mused;

   struct MPMAP *mpm_next = mp->mpm.next, *mpm;

   while((mpm = mpm_next)) {

     mpm_next = mpm->next;

     munmap((void *)mpm + align_to_pagesize(mp, mpm->usize), mpm->size - align_to_pagesize(mp, mpm->usize));

-    mpm->size = mpm->usize = align_to_pagesize(mp, mpm->usize);

+    mpm->size = align_to_pagesize(mp, mpm->usize);

+    used += mpm->size;

   }

-  munmap(&mp->mpm + align_to_pagesize(mp, mp->mpm.usize + align_to_voidptr(sizeof(mp))), mp->mpm.size - align_to_pagesize(mp, mp->mpm.usize + align_to_voidptr(sizeof(mp))));

-  mp->mpm.size = mp->mpm.usize;

-  spam("Map flushed @ %p\n", mp);

+  mused = align_to_pagesize(mp, mp->mpm.usize + align_to_voidptr(sizeof(*mp)));

+  if (mused < mp->mpm.size) {

+	  munmap(&mp->mpm + mused, mp->mpm.size - mused);

+	  mp->mpm.size = mused;

+  }

+  used += mp->mpm.size;

+  spam("Map flushed @ %p, in use: %lu\n", mp, used);

+  return used;

 }

 void *mp_malloc(struct MP *mp, size_t size) {

@@ -36,6 +36,7 @@ unsigned char *cli_mp_hex2str(mp_t* mp, const unsigned char *src);

 char *cli_mp_strdup(mp_t *mp, const char *s);

 char *cli_mp_virname(mp_t *mp, char *virname, unsigned int official);

 uint16_t *cli_mp_hex2ui(mp_t *mp, const char *hex);

+void mp_flush(mp_t *mp);

 #else /* USE_MPOOL */

 #define mp_malloc(a, b) cli_malloc(b)

@@ -47,6 +48,7 @@ uint16_t *cli_mp_hex2ui(mp_t *mp, const char *hex);

 #define cli_mp_strdup(mp, s) cli_strdup(s)

 #define cli_mp_virname(mp, a, b) cli_virname(a, b)

 #define cli_mp_hex2ui(mp, hex) cli_hex2ui(hex)

+#define mp_flush(val)

 #endif /* USE_MPOOL */

 #endif

@@ -2143,6 +2143,7 @@ int cl_build(struct cl_engine *engine)

     cli_md5db_build(engine->md5_mdb);

     cli_freeign(engine);

     cli_dconf_print(engine->dconf);

+    mp_flush(engine->mempool);

     return CL_SUCCESS;

 }