[lc-checkins] CVS: linux/include/linux lzoconf.h,1.3,1.4 minilzo.h,1.3,1.4 comp_cache.h,1.70,1.71

[Rodrigo S. de C. <rc...@us...>]

Update of /cvsroot/linuxcompressed/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv29510/include/linux

Modified Files:
	comp_cache.h 
Added Files:
	lzoconf.h minilzo.h 
Log Message:
- Support for LZO compression algorithm is back
  echo 2 > /proc/sys/vm/comp_cache/algorithm

- Now there is a /proc/comp_cache_hist that shows the free space histogram.
That histogram now also displays how many fragments the pages have, so you
have a better picture of what's going on in the compressed cache.





Index: comp_cache.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/include/linux/comp_cache.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** comp_cache.h	29 May 2002 13:05:22 -0000	1.70
--- comp_cache.h	29 May 2002 21:28:54 -0000	1.71
***************
*** 2,6 ****
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-05-28 17:33:09 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-05-29 18:14:38 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 136,146 ****
  #define CF_IO                     1
  
! /* CF_WKdm/CF_WK4x4: defines the algorithm the fragment has been
!  * compressed (if it's been compressed) */
  #define CF_WKdm                   2
  #define CF_WK4x4                  3
  
  /* CF_Dirty: is the fragment dirty? */
! #define CF_Dirty                  4
  
  #define CompFragmentFreed(fragment)	        test_bit(CF_Freed, &(fragment)->flags)
--- 136,147 ----
  #define CF_IO                     1
  
! /* CF_WKdm/CF_WK4x4/CF_LZO: defines the algorithm the fragment has
!  * been compressed (if it's been compressed) */
  #define CF_WKdm                   2
  #define CF_WK4x4                  3
+ #define CF_LZO                    4
  
  /* CF_Dirty: is the fragment dirty? */
! #define CF_Dirty                  5
  
  #define CompFragmentFreed(fragment)	        test_bit(CF_Freed, &(fragment)->flags)
***************
*** 166,169 ****
--- 167,175 ----
  #define CompFragmentClearWK4x4(fragment)	clear_bit(CF_WK4x4, &(fragment)->flags)
  
+ #define CompFragmentLZO(fragment)	        test_bit(CF_LZO, &(fragment)->flags)
+ #define CompFragmentSetLZO(fragment)	        set_bit(CF_LZO, &(fragment)->flags)
+ #define CompFragmentTestandSetLZO(fragment)     test_and_set_bit(CF_LZO, &(fragment)->flags)
+ #define CompFragmentClearLZO(fragment)	        clear_bit(CF_LZO, &(fragment)->flags)
+ 
  #define CompFragmentDirty(fragment)	        test_bit(CF_Dirty, &(fragment)->flags)
  #define CompFragmentSetDirty(fragment)	        set_bit(CF_Dirty, &(fragment)->flags)
***************
*** 273,276 ****
--- 279,284 ----
  	WK_word *tempQPosArray;
  	WK_word *tempLowBitsArray;
+ 
+ 	unsigned short compressed_size;
  } comp_data_t;
  
***************
*** 539,543 ****
  void print_comp_cache_stats(unsigned short, char *, int *);
  int comp_cache_stat_read_proc(char *, char **, off_t, int, int *, void *);
! unsigned long free_space_count(int);
  
  
--- 547,552 ----
  void print_comp_cache_stats(unsigned short, char *, int *);
  int comp_cache_stat_read_proc(char *, char **, off_t, int, int *, void *);
! int comp_cache_hist_read_proc(char *, char **, off_t, int, int *, void *);
! unsigned long free_space_count(int, unsigned long *);