Index: src/store.c
===================================================================
RCS file: /server/cvs-server/squid/squid/src/store.c,v
retrieving revision 1.515
retrieving revision 1.516
diff -c -r1.515 -r1.516
*** src/store.c	2000/03/06 16:23:35	1.515
--- src/store.c	2000/03/09 04:50:13	1.516
***************
*** 890,896 ****
  	    if (ndir >= Config.cacheSwap.n_configured)
  		ndir = ndir % Config.cacheSwap.n_configured;
  	    sd = &Config.cacheSwap.swapDirs[ndir++];
! 	    if (sd->cur_size < sd->high_size)
  		continue;
  	    if (NULL == sd->lru_walker)
  		continue;
--- 890,896 ----
  	    if (ndir >= Config.cacheSwap.n_configured)
  		ndir = ndir % Config.cacheSwap.n_configured;
  	    sd = &Config.cacheSwap.swapDirs[ndir++];
! 	    if (sd->cur_size < sd->low_size)
  		continue;
  	    if (NULL == sd->lru_walker)
  		continue;
Index: src/store_dir.c
===================================================================
RCS file: /server/cvs-server/squid/squid/src/store_dir.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -c -r1.105 -r1.106
*** src/store_dir.c	2000/03/06 16:23:35	1.105
--- src/store_dir.c	2000/03/09 04:50:13	1.106
***************
*** 390,397 ****
  	Config.Swap.maxSize += SD->max_size;
  	if (NULL == SD->map)
  	    SD->map = file_map_create();
! 	SD->high_size = (int) (((float) SD->max_size *
! 		(float) Config.Swap.highWaterMark) / 100.0);
      }
  }
  
--- 390,397 ----
  	Config.Swap.maxSize += SD->max_size;
  	if (NULL == SD->map)
  	    SD->map = file_map_create();
! 	SD->low_size = (int) (((float) SD->max_size *
! 		(float) Config.Swap.lowWaterMark) / 100.0);
      }
  }
  
Index: src/store_dir_ufs.c
===================================================================
RCS file: /server/cvs-server/squid/squid/src/Attic/store_dir_ufs.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -c -r1.30 -r1.31
*** src/store_dir_ufs.c	2000/03/06 16:23:35	1.30
--- src/store_dir_ufs.c	2000/03/09 04:50:13	1.31
***************
*** 1142,1148 ****
  	storeAppendPrintf(sentry, "First level subdirectories: %d\n", SD->u.ufs.l1);
  	storeAppendPrintf(sentry, "Second level subdirectories: %d\n", SD->u.ufs.l2);
  	storeAppendPrintf(sentry, "Maximum Size: %d KB\n", SD->max_size);
! 	storeAppendPrintf(sentry, "HiWater Size: %d KB\n", SD->high_size);
  	storeAppendPrintf(sentry, "Current Size: %d KB\n", SD->cur_size);
  	storeAppendPrintf(sentry, "Percent Used: %0.2f%%\n",
  	    100.0 * SD->cur_size / SD->max_size);
--- 1142,1148 ----
  	storeAppendPrintf(sentry, "First level subdirectories: %d\n", SD->u.ufs.l1);
  	storeAppendPrintf(sentry, "Second level subdirectories: %d\n", SD->u.ufs.l2);
  	storeAppendPrintf(sentry, "Maximum Size: %d KB\n", SD->max_size);
! 	storeAppendPrintf(sentry, "LoWater Size: %d KB\n", SD->low_size);
  	storeAppendPrintf(sentry, "Current Size: %d KB\n", SD->cur_size);
  	storeAppendPrintf(sentry, "Percent Used: %0.2f%%\n",
  	    100.0 * SD->cur_size / SD->max_size);
Index: src/structs.h
===================================================================
RCS file: /server/cvs-server/squid/squid/src/structs.h,v
retrieving revision 1.313
retrieving revision 1.314
diff -c -r1.313 -r1.314
*** src/structs.h	2000/03/06 16:23:36	1.313
--- src/structs.h	2000/03/09 04:50:14	1.314
***************
*** 1321,1327 ****
      swapdir_t type;
      fileMap *map;
      int cur_size;
!     int high_size;
      int max_size;
      char *path;
      int index;			/* This entry's index into the swapDirs array */
--- 1321,1327 ----
      swapdir_t type;
      fileMap *map;
      int cur_size;
!     int low_size;
      int max_size;
      char *path;
      int index;			/* This entry's index into the swapDirs array */