@@ -1,3 +1,8 @@

+Mon May 10 03:43:43 CEST 2010 (acab)

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

+ * libclamav: Use mpool in win32 (well, sort of) as the mighty crt allocator

+	      chokes when loading about one milion signatures

+

 Sat May  8 00:18:13 CEST 2010 (acab)

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

  * libclamav/fmap.c: make oof need stfu (bb#2000)

@@ -278,7 +278,11 @@ struct MP *mpool_create() {

   sz = align_to_pagesize(&mp, MIN_FRAGSIZE);

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

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

+#ifndef _WIN32

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

+#else

+  if(!(mpool_p = (struct MP *)VirtualAlloc(NULL, sz, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE)))

+#endif

     return NULL;

 #ifdef CL_DEBUG

   memset(mpool_p, ALLOCPOISON, sz);

@@ -298,13 +302,21 @@ void mpool_destroy(struct MP *mp) {

 #ifdef CL_DEBUG

     memset(mpm, FREEPOISON, mpmsize);

 #endif

+#ifndef _WIN32

     munmap((void *)mpm, mpmsize);

+#else

+    VirtualFree(mpm, 0, MEM_RELEASE);

+#endif

   }

   mpmsize = mp->u.mpm.size;

 #ifdef CL_DEBUG

   memset(mp, FREEPOISON, mpmsize + align_to_voidptr(sizeof(*mp)));

 #endif

+#ifndef _WIN32

   munmap((void *)mp, mpmsize + align_to_voidptr(sizeof(*mp)));

+#else

+  VirtualFree(mp, 0, MEM_RELEASE);

+#endif

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

 }

@@ -323,7 +335,11 @@ void mpool_flush(struct MP *mp) {

 #ifdef CL_DEBUG

 	    memset((char *)mpm + mused, FREEPOISON, mpm->size - mused);

 #endif

+#ifndef _WIN32

 	    munmap((char *)mpm + mused, mpm->size - mused);

+#else

+	    VirtualFree((char *)mpm + mused, mpm->size - mused, MEM_DECOMMIT);

+#endif

 	    mpm->size = mused;

 	}

 	used += mpm->size;

@@ -334,7 +350,11 @@ void mpool_flush(struct MP *mp) {

 #ifdef CL_DEBUG

 	memset((char *)mp + mused, FREEPOISON, mp->u.mpm.size + align_to_voidptr(sizeof(*mp)) - mused);

 #endif

+#ifndef _WIN32

 	munmap((char *)mp + mused, mp->u.mpm.size + align_to_voidptr(sizeof(*mp)) - mused);

+#else

+	VirtualFree((char *)mp + mused, mp->u.mpm.size + align_to_voidptr(sizeof(*mp)) - mused, MEM_DECOMMIT);

+#endif

 	mp->u.mpm.size = mused - align_to_voidptr(sizeof(*mp));

     }

     used += mp->u.mpm.size;

@@ -412,8 +432,12 @@ void *mpool_malloc(struct MP *mp, size_t size) {

   i = align_to_pagesize(mp, needed + align_to_voidptr(sizeof(*mpm)));

   else

   i = align_to_pagesize(mp, MIN_FRAGSIZE);

-  

+

+#ifndef _WIN32

   if ((mpm = (struct MPMAP *)mmap(NULL, i, PROT_READ | PROT_WRITE, MAP_PRIVATE|ANONYMOUS_MAP, -1, 0)) == MAP_FAILED) {

+#else

+  if (!(mpm = (struct MPMAP *)VirtualAlloc(NULL, i, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE))) {

+#endif

     cli_errmsg("mpool_malloc(): Can't allocate memory (%lu bytes).\n", (unsigned long int)i);

     spam("failed to alloc %u bytes (%u requested)\n", i, size);

     return NULL;

@@ -394,6 +394,9 @@

 /* Define to 1 if you have the <termios.h> header file. */

 /* #undef HAVE_TERMIOS_H */

+/* Define this if uname(2) is POSIX */

+/* #undef HAVE_UNAME_SYSCALL */

+

 /* Define to 1 if you have the <unistd.h> header file. */

 /* #undef HAVE_UNISTD_H */

@@ -403,6 +406,9 @@

 /* This value is set to 1 to indicate that the system argz facility works */

 /* #undef HAVE_WORKING_ARGZ */

+/* For internal use only - DO NOT DEFINE */

+/* #undef HAVE__INTERNAL__SHA_COLLECT */

+

 /* "Full library version number" */

 #define LIBCLAMAV_FULLVER "6.0.4"

@@ -490,13 +496,13 @@

 /* #undef SUPPORT_IPv6 */

 /* enable memory pools */

-/* #undef USE_MPOOL */

+#define USE_MPOOL 1

 /* use syslog */

 /* #undef USE_SYSLOG */

 /* Version number of package */

-#define VERSION "devel-clamav-0.96rc2-34-g3d8a490"

+#define VERSION "devel-clamav-0.96-72-gc5afd1c"

 /* Version suffix for package */

 #define VERSION_SUFFIX ""

@@ -94,108 +94,110 @@ EXPORTS cli_bytecode_init @44238 NONAME

 EXPORTS cli_bytecode_debug @44239 NONAME

 EXPORTS cli_bytecode_debug_printsrc @44240 NONAME

 EXPORTS cli_bytecode_printversion @44241 NONAME

-EXPORTS cli_printcxxver @44336 NONAME

-EXPORTS cli_bytecode_describe @44242 NONAME

-EXPORTS cli_malloc @44243 NONAME

-EXPORTS cli_wm_decrypt_macro @44244 NONAME

-EXPORTS cli_wm_readdir @44245 NONAME

-EXPORTS cli_ppt_vba_read @44246 NONAME

-EXPORTS cli_vba_inflate @44247 NONAME

-EXPORTS cli_vba_readdir @44248 NONAME

-EXPORTS uniq_get @44249 NONAME

-EXPORTS cli_ole2_extract @44250 NONAME

-EXPORTS cli_calloc @44251 NONAME

-EXPORTS cli_str2hex @44252 NONAME

-EXPORTS cli_md5stream @44253 NONAME

-EXPORTS cli_md5file @44254 NONAME

-EXPORTS html_normalise_map @44255 NONAME

-EXPORTS cli_utf16toascii @44256 NONAME

-EXPORTS cli_strbcasestr @44257 NONAME

-EXPORTS cli_ac_chklsig @44258 NONAME

-EXPORTS cli_parse_add @44259 NONAME

-EXPORTS cli_initroots @44260 NONAME

-EXPORTS cli_hex2str @44261 NONAME

-EXPORTS cli_hex2ui @44262 NONAME

+EXPORTS cli_printcxxver @44242 NONAME

+EXPORTS cli_bytecode_describe @44243 NONAME

+EXPORTS cli_malloc @44244 NONAME

+EXPORTS cli_wm_decrypt_macro @44245 NONAME

+EXPORTS cli_wm_readdir @44246 NONAME

+EXPORTS cli_ppt_vba_read @44247 NONAME

+EXPORTS cli_vba_inflate @44248 NONAME

+EXPORTS cli_vba_readdir @44249 NONAME

+EXPORTS uniq_get @44250 NONAME

+EXPORTS cli_ole2_extract @44251 NONAME

+EXPORTS cli_calloc @44252 NONAME

+EXPORTS cli_str2hex @44253 NONAME

+EXPORTS cli_md5stream @44254 NONAME

+EXPORTS cli_md5file @44255 NONAME

+EXPORTS html_normalise_map @44256 NONAME

+EXPORTS cli_utf16toascii @44257 NONAME

+EXPORTS cli_strbcasestr @44258 NONAME

+EXPORTS cli_ac_chklsig @44259 NONAME

+EXPORTS cli_parse_add @44260 NONAME

+EXPORTS cli_initroots @44261 NONAME

+EXPORTS cli_hex2str @44262 NONAME

+EXPORTS cli_hex2ui @44263 NONAME

+EXPORTS mpool_getstats @44264 NONAME

 ; compatibility layer, tommath, zlib

-EXPORTS w32_srand @44263 NONAME

-EXPORTS w32_rand @44264 NONAME

-EXPORTS gettimeofday @44265 NONAME

-EXPORTS opendir @44266 NONAME

-EXPORTS readdir @44267 NONAME

-EXPORTS closedir @44268 NONAME

-EXPORTS safe_open @44269 NONAME

-EXPORTS snprintf @44270 NONAME

-EXPORTS mp_init @44271 NONAME

-EXPORTS mp_read_radix @44272 NONAME

-EXPORTS mp_clear @44273 NONAME

-EXPORTS sha256_init @44274 NONAME

-EXPORTS sha256_update @44275 NONAME

-EXPORTS sha256_final @44276 NONAME

-EXPORTS optget @44277 NONAME

-EXPORTS optparse @44278 NONAME

-EXPORTS optfree @44279 NONAME

-EXPORTS w32_glob @44280 NONAME

-EXPORTS dirname @44281 NONAME

-EXPORTS basename @44282 NONAME

-EXPORTS clam_options @44283 NONAME DATA

+EXPORTS w32_srand @44265 NONAME

+EXPORTS w32_rand @44266 NONAME

+EXPORTS gettimeofday @44267 NONAME

+EXPORTS opendir @44268 NONAME

+EXPORTS readdir @44269 NONAME

+EXPORTS closedir @44270 NONAME

+EXPORTS safe_open @44271 NONAME

+EXPORTS snprintf @44272 NONAME

+EXPORTS mp_init @44273 NONAME

+EXPORTS mp_read_radix @44274 NONAME

+EXPORTS mp_clear @44275 NONAME

+EXPORTS sha256_init @44276 NONAME

+EXPORTS sha256_update @44277 NONAME

+EXPORTS sha256_final @44278 NONAME

+EXPORTS optget @44279 NONAME

+EXPORTS optparse @44280 NONAME

+EXPORTS optfree @44281 NONAME

+EXPORTS w32_glob @44282 NONAME

+EXPORTS dirname @44283 NONAME

+EXPORTS basename @44284 NONAME

+EXPORTS clam_options @44285 NONAME DATA

 ; zlib

-EXPORTS gzopen @44284 NONAME

-EXPORTS gzgets @44285 NONAME

-EXPORTS gzdopen @44286 NONAME

-EXPORTS gzclose @44287 NONAME

-EXPORTS gzwrite @44288 NONAME

-EXPORTS zlibCompileFlags @44337 NONAME

-EXPORTS zlibVersion @44338 NONAME

+EXPORTS gzopen @44286 NONAME

+EXPORTS gzgets @44287 NONAME

+EXPORTS gzdopen @44288 NONAME

+EXPORTS gzclose @44289 NONAME

+EXPORTS gzwrite @44290 NONAME

+EXPORTS zlibCompileFlags @44291 NONAME

+EXPORTS zlibVersion @44292 NONAME

 ; pthreads

-EXPORTS pthread_mutex_lock @44289 NONAME

-EXPORTS pthread_mutex_unlock @44290 NONAME

-EXPORTS pthread_mutex_destroy @44291 NONAME

-EXPORTS pthread_once @44292 NONAME

-EXPORTS pthread_getspecific @44293 NONAME

-EXPORTS pthread_setspecific @44294 NONAME

-EXPORTS pthread_create @44295 NONAME

-EXPORTS pthread_cond_timedwait @44296 NONAME

-EXPORTS pthread_cond_init @44297 NONAME

-EXPORTS pthread_cond_broadcast @44298 NONAME

-EXPORTS pthread_cond_signal @44299 NONAME

-EXPORTS pthread_cond_destroy @44300 NONAME

-EXPORTS pthread_join @44301 NONAME

-EXPORTS pthread_key_create @44302 NONAME

-EXPORTS pthread_cond_wait @44303 NONAME

-EXPORTS pthread_attr_init @44304 NONAME

-EXPORTS pthread_attr_setdetachstate @44305 NONAME

-EXPORTS pthread_attr_destroy @44306 NONAME

-EXPORTS pthread_mutex_init @44307 NONAME

+EXPORTS pthread_mutex_lock @44293 NONAME

+EXPORTS pthread_mutex_unlock @44294 NONAME

+EXPORTS pthread_mutex_destroy @44295 NONAME

+EXPORTS pthread_once @44296 NONAME

+EXPORTS pthread_getspecific @44297 NONAME

+EXPORTS pthread_setspecific @44298 NONAME

+EXPORTS pthread_create @44299 NONAME

+EXPORTS pthread_cond_timedwait @44300 NONAME

+EXPORTS pthread_cond_init @44301 NONAME

+EXPORTS pthread_cond_broadcast @44302 NONAME

+EXPORTS pthread_cond_signal @44303 NONAME

+EXPORTS pthread_cond_destroy @44304 NONAME

+EXPORTS pthread_join @44305 NONAME

+EXPORTS pthread_key_create @44306 NONAME

+EXPORTS pthread_cond_wait @44307 NONAME

+EXPORTS pthread_attr_init @44308 NONAME

+EXPORTS pthread_attr_setdetachstate @44309 NONAME

+EXPORTS pthread_attr_destroy @44310 NONAME

+EXPORTS pthread_mutex_init @44311 NONAME

 ; winsock bridge and compatibility functions

-EXPORTS htonl @44308 NONAME

-EXPORTS htons @44309 NONAME

-EXPORTS ntohl @44310 NONAME

-EXPORTS ntohs @44311 NONAME

-EXPORTS __WSAFDIsSet @44312 NONAME

-EXPORTS w32_socket @44313 NONAME

-EXPORTS w32_getsockopt @44314 NONAME

-EXPORTS w32_setsockopt @44315 NONAME

-EXPORTS w32_bind @44316 NONAME

-EXPORTS w32_listen @44317 NONAME

-EXPORTS w32_accept @44318 NONAME

-EXPORTS w32_connect @44319 NONAME

-EXPORTS w32_shutdown @44320 NONAME

-EXPORTS w32_send @44321 NONAME

-EXPORTS w32_recv @44322 NONAME

-EXPORTS w32_closesocket @44323 NONAME

-EXPORTS w32_getservbyname @44324 NONAME

-EXPORTS w32_getaddrinfo @44325 NONAME

-EXPORTS w32_freeaddrinfo @44326 NONAME

-EXPORTS w32_inet_ntop @44327 NONAME

-EXPORTS w32_gethostbyname @44328 NONAME

-EXPORTS w32_select @44329 NONAME

-EXPORTS poll_with_event @44330 NONAME

-EXPORTS w32_stat @44331 NONAME

-EXPORTS w32_strerror @44332 NONAME

-EXPORTS w32_strerror_r @44333 NONAME

-EXPORTS inet_addr @44334 NONAME

-EXPORTS fcntl @44335 NONAME

+EXPORTS htonl @44312 NONAME

+EXPORTS htons @44313 NONAME

+EXPORTS ntohl @44314 NONAME

+EXPORTS ntohs @44315 NONAME

+EXPORTS __WSAFDIsSet @44316 NONAME

+EXPORTS w32_socket @44317 NONAME

+EXPORTS w32_getsockopt @44318 NONAME

+EXPORTS w32_setsockopt @44319 NONAME

+EXPORTS w32_bind @44320 NONAME

+EXPORTS w32_listen @44321 NONAME

+EXPORTS w32_accept @44322 NONAME

+EXPORTS w32_connect @44323 NONAME

+EXPORTS w32_shutdown @44324 NONAME

+EXPORTS w32_send @44325 NONAME

+EXPORTS w32_recv @44326 NONAME

+EXPORTS w32_closesocket @44327 NONAME

+EXPORTS w32_getservbyname @44328 NONAME

+EXPORTS w32_getaddrinfo @44329 NONAME

+EXPORTS w32_freeaddrinfo @44330 NONAME

+EXPORTS w32_inet_ntop @44331 NONAME

+EXPORTS w32_gethostbyname @44332 NONAME

+EXPORTS w32_select @44333 NONAME

+EXPORTS poll_with_event @44334 NONAME

+EXPORTS w32_stat @44335 NONAME

+EXPORTS w32_strerror @44336 NONAME

+EXPORTS w32_strerror_r @44337 NONAME

+EXPORTS inet_addr @44338 NONAME

+EXPORTS fcntl @44339 NONAME

+

@@ -177,7 +177,7 @@ my %CONF = (

     'SIZEOF_VOID_P' => '4',

     'STDC_HEADERS' => '1',

     'SUPPORT_IPv6' => -1,

-    'USE_MPOOL' => -1,

+    'USE_MPOOL' => 1,

     'USE_SYSLOG' => -1,

     'VERSION_SUFFIX' => '""',

     'WORDS_BIGENDIAN' => '0',

@@ -192,6 +192,8 @@ my %CONF = (

     'off_t' => -1,

     'restrict' => -1,

     'socklen_t' => -1,

+    'HAVE_UNAME_SYSCALL' => -1,

+    'HAVE__INTERNAL__SHA_COLLECT' => -1

     );