diff -N -c -r -X exclude_files squid-1.0.beta8/include/util.h squid-1.0.beta8.henrik/include/util.h
*** squid-1.0.beta8/include/util.h	Fri May 10 01:20:44 1996
--- squid-1.0.beta8.henrik/include/util.h	Tue May 21 22:14:41 1996
***************
*** 41,46 ****
--- 41,49 ----
  char *xstrdup _PARAMS((char *));
  char *xstrerror _PARAMS((void));
  char *getfullhostname _PARAMS((void));
+ #if XMALLOC_STATISTICS
+ void malloc_statistics _PARAMS((void(*)(int,int,void *),void *));
+ #endif
  
  /* from debug.c */
  #ifndef MAX_DEBUG_LEVELS
diff -N -c -r -X exclude_files squid-1.0.beta8/lib/util.c squid-1.0.beta8.henrik/lib/util.c
*** squid-1.0.beta8/lib/util.c	Fri May 17 23:14:44 1996
--- squid-1.0.beta8.henrik/lib/util.c	Tue May 21 22:37:29 1996
***************
*** 21,26 ****
--- 21,59 ----
  extern char *sys_errlist[];
  #endif
  
+ #if XMALLOC_STATISTICS
+ #define DBG_MAXSIZE	(1024*1024)
+ #define DBG_GRAIN	(16)
+ #define DBG_MAXINDEX	(DBG_MAXSIZE/DBG_GRAIN)
+ #define DBG_INDEX(sz)	(sz<DBG_MAXSIZE?(sz+DBG_GRAIN-1)/DBG_GRAIN:DBG_MAXINDEX)
+ static int malloc_sizes[DBG_MAXINDEX+1];
+ static int dbg_stat_init=0;
+ 
+ static void stat_init()
+ {
+     int i;
+     for(i=0;i<=DBG_MAXINDEX;i++)
+     	malloc_sizes[i]=0;
+     dbg_stat_init=1;
+ }
+   
+ static int malloc_stat(sz)
+      int sz;
+ {
+     if(!dbg_stat_init)
+     	stat_init();
+     return malloc_sizes[DBG_INDEX(sz)]+=1;
+ }
+ 
+ void malloc_statistics(func,data)
+      void (*func)_PARAMS((int,int,void *));
+      void *data;
+ {
+     int i;
+     for(i=0;i<=DBG_MAXSIZE;i+=DBG_GRAIN)
+     	func(i,malloc_sizes[DBG_INDEX(i)],data);
+ }
+ #endif
  
  #if XMALLOC_DEBUG
  #define DBG_ARRY_SZ (2<<8)
***************
*** 114,119 ****
--- 147,155 ----
  #if XMALLOC_DEBUG
      check_malloc(p, sz);
  #endif
+ #if XMALLOC_STATISTICS
+     malloc_stat(sz);
+ #endif
      return (p);
  }
  
***************
*** 165,170 ****
--- 201,209 ----
  #if XMALLOC_DEBUG
      check_malloc(p, sz);
  #endif
+ #if XMALLOC_STATISTICS
+     malloc_stat(sz);
+ #endif
      return (p);
  }
  
***************
*** 194,199 ****
--- 233,241 ----
      }
  #if XMALLOC_DEBUG
      check_malloc(p, sz * n);
+ #endif
+ #if XMALLOC_STATISTICS
+     malloc_stat(sz);
  #endif
      return (p);
  }
diff -N -c -r -X exclude_files squid-1.0.beta8/src/ipcache.c squid-1.0.beta8.henrik/src/ipcache.c
*** squid-1.0.beta8/src/ipcache.c	Tue May 21 17:50:52 1996
--- squid-1.0.beta8.henrik/src/ipcache.c	Tue May 21 22:22:09 1996
***************
*** 133,139 ****
      if (bind(cfd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
  	close(cfd);
  	debug(14, 0, "ipcache_create_dnsserver: bind: %s\n", xstrerror());
! 	xfree(socketname);
  	return -1;
      }
      debug(14, 4, "ipcache_create_dnsserver: bind to local host.\n");
--- 133,139 ----
      if (bind(cfd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
  	close(cfd);
  	debug(14, 0, "ipcache_create_dnsserver: bind: %s\n", xstrerror());
! 	free(socketname);
  	return -1;
      }
      debug(14, 4, "ipcache_create_dnsserver: bind to local host.\n");
***************
*** 142,148 ****
      if ((pid = fork()) < 0) {
  	debug(14, 0, "ipcache_create_dnsserver: fork: %s\n", xstrerror());
  	close(cfd);
! 	xfree(socketname);
  	return -1;
      }
      if (pid > 0) {		/* parent */
--- 142,148 ----
      if ((pid = fork()) < 0) {
  	debug(14, 0, "ipcache_create_dnsserver: fork: %s\n", xstrerror());
  	close(cfd);
! 	free(socketname);
  	return -1;
      }
      if (pid > 0) {		/* parent */
***************
*** 151,164 ****
  	/* open new socket for parent process */
  	if ((sfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
  	    debug(14, 0, "ipcache_create_dnsserver: socket: %s\n", xstrerror());
! 	    xfree(socketname);
  	    return -1;
  	}
  	fcntl(sfd, F_SETFD, 1);	/* set close-on-exec */
  	memset(&addr, '\0', sizeof(addr));
  	addr.sun_family = AF_UNIX;
  	strcpy(addr.sun_path, socketname);
! 	xfree(socketname);
  	if (connect(sfd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
  	    close(sfd);
  	    debug(14, 0, "ipcache_create_dnsserver: connect: %s\n", xstrerror());
--- 151,164 ----
  	/* open new socket for parent process */
  	if ((sfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
  	    debug(14, 0, "ipcache_create_dnsserver: socket: %s\n", xstrerror());
! 	    free(socketname);
  	    return -1;
  	}
  	fcntl(sfd, F_SETFD, 1);	/* set close-on-exec */
  	memset(&addr, '\0', sizeof(addr));
  	addr.sun_family = AF_UNIX;
  	strcpy(addr.sun_path, socketname);
! 	free(socketname);
  	if (connect(sfd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
  	    close(sfd);
  	    debug(14, 0, "ipcache_create_dnsserver: connect: %s\n", xstrerror());
diff -N -c -r -X exclude_files squid-1.0.beta8/src/main.c squid-1.0.beta8.henrik/src/main.c
*** squid-1.0.beta8/src/main.c	Fri May 17 18:28:36 1996
--- squid-1.0.beta8.henrik/src/main.c	Tue May 21 21:27:37 1996
***************
*** 303,312 ****
  #endif
  #ifdef M_MXFAST
      /* biggest size that is considered a small block */
!     mallopt(M_MXFAST, 4096);
  #endif
  #ifdef M_NBLKS
!     /* number of holding small block */
      mallopt(M_NLBLKS, 100);
  #endif
  #endif /* HAVE_MALLOPT */
--- 303,312 ----
  #endif
  #ifdef M_MXFAST
      /* biggest size that is considered a small block */
!     mallopt(M_MXFAST, 512);
  #endif
  #ifdef M_NBLKS
!     /* number of blocks in each chunk */
      mallopt(M_NLBLKS, 100);
  #endif
  #endif /* HAVE_MALLOPT */
diff -N -c -r -X exclude_files squid-1.0.beta8/src/stat.c squid-1.0.beta8.henrik/src/stat.c
*** squid-1.0.beta8/src/stat.c	Mon May 20 21:47:22 1996
--- squid-1.0.beta8.henrik/src/stat.c	Tue May 21 21:59:43 1996
***************
*** 465,470 ****
--- 465,483 ----
  
  
  
+ #if XMALLOC_STATISTICS
+ void info_get_mallstat(size, number, sentry)
+      int size,number;
+      StoreEntry *sentry;
+ {
+     static char line[MAX_LINELEN];
+     if(number>0) {
+ 	sprintf(line,"{\t%d = %d}\n",size,number);
+ 	storeAppend(sentry, line, strlen(line));
+     }
+ }
+ #endif
+ 
  void info_get(obj, sentry)
       cacheinfo *obj;
       StoreEntry *sentry;
***************
*** 754,761 ****
--- 767,781 ----
  	    meta_data.url_strings) >> 10);
      storeAppend(sentry, line, strlen(line));
  
+ #if XMALLOC_STATISTICS
+     sprintf(line, "{Memory allocation statistics}\n");
+     storeAppend(sentry, line, strlen(line));
+     malloc_statistics(info_get_mallstat,sentry);
+ #endif
+ 
      storeAppend(sentry, close_bracket, strlen(close_bracket));
  }
+ 
  
  
  void parameter_get(obj, sentry)