[lc-checkins] CVS: linux/mm/comp_cache main.c,1.64,1.65 minilzo.c,1.2,1.3 proc.c,1.26,1.27

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

Update of /cvsroot/linuxcompressed/linux/mm/comp_cache
In directory usw-pr-cvs1:/tmp/cvs-serv23073/mm/comp_cache

Modified Files:
	main.c minilzo.c proc.c 
Log Message:
Bug fixes:
o /proc/comp_cache_stat showed the wrong size of compressed size. Fixed.
o Fixed LZO compilation problems when porting the code to 2.4.19.

Some Cleanups.


Index: main.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/comp_cache/main.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** main.c	10 Sep 2002 16:43:22 -0000	1.64
--- main.c	10 Sep 2002 20:19:06 -0000	1.65
***************
*** 2,6 ****
   * linux/mm/comp_cache/main.c
   *
!  * Time-stamp: <2002-09-04 16:06:25 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache/main.c
   *
!  * Time-stamp: <2002-09-10 17:03:33 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 238,242 ****
  	printk("Compressed Cache: maximum size\n"
  	       "Compressed Cache:  %lu pages = %luKiB\n",
! 	       max_num_comp_pages, (max_num_comp_pages * COMP_PAGE_SIZE)/1024);
  
  	/* fiz zone watermarks */
--- 238,242 ----
  	printk("Compressed Cache: maximum size\n"
  	       "Compressed Cache:  %lu pages = %luKiB\n",
! 	       max_num_comp_pages, (max_num_comp_pages * COMP_PAGE_SIZE) >> 10);
  
  	/* fiz zone watermarks */

Index: minilzo.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/comp_cache/minilzo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** minilzo.c	1 Jul 2002 18:16:59 -0000	1.2
--- minilzo.c	10 Sep 2002 20:19:06 -0000	1.3
***************
*** 37,46 ****
  #define __LZO_IN_MINILZO
  
! #ifdef MINILZO_HAVE_CONFIG_H
! #  include <config.h>
! #endif
  
  #undef LZO_HAVE_CONFIG_H
  #include <linux/minilzo.h>
  
  #if !defined(MINILZO_VERSION) || (MINILZO_VERSION != 0x1070)
--- 37,48 ----
  #define __LZO_IN_MINILZO
  
! //#ifdef MINILZO_HAVE_CONFIG_H
! //#  include <config.h>
! //#endif
  
  #undef LZO_HAVE_CONFIG_H
  #include <linux/minilzo.h>
+ #include <linux/compiler.h>
+ #include <asm/page.h>
  
  #if !defined(MINILZO_VERSION) || (MINILZO_VERSION != 0x1070)
***************
*** 55,59 ****
  #  include <linux/types.h>
  #endif
! #include <stdio.h>
  
  #ifndef __LZO_CONF_H
--- 57,61 ----
  #  include <linux/types.h>
  #endif
! //#include <stdio.h>
  
  #ifndef __LZO_CONF_H
***************
*** 67,71 ****
  
  #if defined(__BOUNDS_CHECKING_ON)
! #  include <unchecked.h>
  #else
  #  define BOUNDS_CHECKING_OFF_DURING(stmt)      stmt
--- 69,73 ----
  
  #if defined(__BOUNDS_CHECKING_ON)
! //#  include <unchecked.h>
  #else
  #  define BOUNDS_CHECKING_OFF_DURING(stmt)      stmt
***************
*** 74,78 ****
  
  #if !defined(LZO_HAVE_CONFIG_H)
! #  include <stddef.h>
  #  include <linux/string.h>
  #  define HAVE_MEMCMP
--- 76,80 ----
  
  #if !defined(LZO_HAVE_CONFIG_H)
! #  include <linux/stddef.h>
  #  include <linux/string.h>
  #  define HAVE_MEMCMP
***************
*** 84,94 ****
  #  if defined(STDC_HEADERS)
  #    include <linux/string.h>
! #    include <stdlib.h>
  #  endif
  #  if defined(HAVE_STDDEF_H)
! #    include <stddef.h>
  #  endif
  #  if defined(HAVE_MEMORY_H)
! #    include <memory.h>
  #  endif
  #endif
--- 86,96 ----
  #  if defined(STDC_HEADERS)
  #    include <linux/string.h>
! //#    include <stdlib.h>
  #  endif
  #  if defined(HAVE_STDDEF_H)
! #    include <linux/stddef.h>
  #  endif
  #  if defined(HAVE_MEMORY_H)
! //#    include <memory.h>
  #  endif
  #endif
***************
*** 105,112 ****
  #if defined(LZO_DEBUG) || !defined(NDEBUG)
  #  if !defined(NO_STDIO_H)
! #    include <stdio.h>
  #  endif
  #endif
! #include <assert.h>
  
  #if !defined(LZO_UNUSED)
--- 107,116 ----
  #if defined(LZO_DEBUG) || !defined(NDEBUG)
  #  if !defined(NO_STDIO_H)
! //#    include <stdio.h>
  #  endif
  #endif
! //#include <assert.h>
! 
! #define assert(condition) do { if (unlikely(!(condition))) BUG(); } while(0)
  
  #if !defined(LZO_UNUSED)
***************
*** 319,325 ****
  
  #if defined(__LZO_DOS16) || defined(__LZO_WIN16)
! #  include <dos.h>
  #  if 1 && defined(__WATCOMC__)
! #    include <i86.h>
       __LZO_EXTERN_C unsigned char _HShift;
  #    define __LZO_HShift    _HShift
--- 323,329 ----
  
  #if defined(__LZO_DOS16) || defined(__LZO_WIN16)
! //#  include <dos.h>
  #  if 1 && defined(__WATCOMC__)
! //#    include <i86.h>
       __LZO_EXTERN_C unsigned char _HShift;
  #    define __LZO_HShift    _HShift
***************
*** 869,873 ****
  }
  
! #include <stdio.h>
  
  #if 0
--- 873,877 ----
  }
  
! //#include <stdio.h>
  
  #if 0
***************
*** 1305,1309 ****
  
  #if !defined(__LZO_IN_MINILZO)
! #include <lzo1x.h>
  #endif
  
--- 1309,1313 ----
  
  #if !defined(__LZO_IN_MINILZO)
! //#include <lzo1x.h>
  #endif
  

Index: proc.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/comp_cache/proc.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** proc.c	10 Sep 2002 16:43:23 -0000	1.26
--- proc.c	10 Sep 2002 20:19:06 -0000	1.27
***************
*** 2,6 ****
   * linux/mm/comp_cache/proc.c
   *
!  * Time-stamp: <2002-09-10 13:27:33 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache/proc.c
   *
!  * Time-stamp: <2002-09-10 16:57:22 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 500,504 ****
  			  " - failed allocations: %6lu\n",
  			  max_used_num_comp_pages << (COMP_PAGE_ORDER + PAGE_SHIFT - 10),
! 			  COMP_PAGE_SIZE,
  			  failed_comp_page_allocs);
  				   
--- 500,504 ----
  			  " - failed allocations: %6lu\n",
  			  max_used_num_comp_pages << (COMP_PAGE_ORDER + PAGE_SHIFT - 10),
! 			  COMP_PAGE_SIZE >> 10,
  			  failed_comp_page_allocs);