[Python-checkins] CVS: python/dist/src/Objects obmalloc.c,2.4,2.5

[Neil Schemenauer]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv17872/Objects

Modified Files:
	obmalloc.c 
Log Message:
Remove malloc hooks.


Index: obmalloc.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/obmalloc.c,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** obmalloc.c	18 Mar 2002 21:06:21 -0000	2.4
--- obmalloc.c	22 Mar 2002 23:20:15 -0000	2.5
***************
*** 50,54 ****
  
  /* #undef WITH_MEMORY_LIMITS */		/* disable mem limit checks  */
- #define WITH_MALLOC_HOOKS		/* for profiling & debugging */
  
  /*==========================================================================*/
--- 50,53 ----
***************
*** 327,340 ****
  					   current arena */
  
- /*
-  * Hooks
-  */
- #ifdef WITH_MALLOC_HOOKS
- static void *(*malloc_hook)(size_t) = NULL;
- static void *(*calloc_hook)(size_t, size_t) = NULL;
- static void *(*realloc_hook)(void *, size_t) = NULL;
- static void (*free_hook)(void *) = NULL;
- #endif /* !WITH_MALLOC_HOOKS */
- 
  /*==========================================================================*/
  
--- 326,329 ----
***************
*** 357,365 ****
  	uint size;
  
- #ifdef WITH_MALLOC_HOOKS	
- 	if (malloc_hook != NULL)
- 		return (*malloc_hook)(nbytes);
- #endif
- 
  	/*
  	 * This implicitly redirects malloc(0)
--- 346,349 ----
***************
*** 524,534 ****
  	off_t offset;
  
- #ifdef WITH_MALLOC_HOOKS
- 	if (free_hook != NULL) {
- 		(*free_hook)(p);
- 		return;
- 	}
- #endif
- 
  	if (p == NULL)	/* free(NULL) has no effect */
  		return;
--- 508,511 ----
***************
*** 602,610 ****
  	uint size;
  
- #ifdef WITH_MALLOC_HOOKS
- 	if (realloc_hook != NULL)
- 		return (*realloc_hook)(p, nbytes);
- #endif
- 
  	if (p == NULL)
  		return _PyMalloc_Malloc(nbytes);
--- 579,582 ----
***************
*** 657,665 ****
  	size_t nbytes;
  
- #ifdef WITH_MALLOC_HOOKS
- 	if (calloc_hook != NULL)
- 		return (*calloc_hook)(nbel, elsz);
- #endif
- 
  	nbytes = nbel * elsz;
  	p = _PyMalloc_Malloc(nbytes);
--- 629,632 ----
***************
*** 670,707 ****
  */
  
- /*==========================================================================*/
- 
- /*
-  * Hooks
-  */
- 
- #ifdef WITH_MALLOC_HOOKS
- 
- void
- _PyMalloc_SetHooks( void *(*malloc_func)(size_t),
- 		    void *(*calloc_func)(size_t, size_t),
- 		    void *(*realloc_func)(void *, size_t),
- 		    void (*free_func)(void *) )
- {
- 	LOCK();
- 	malloc_hook = malloc_func;
- 	calloc_hook = calloc_func;
- 	realloc_hook = realloc_func;
- 	free_hook = free_func;
- 	UNLOCK();
- }
- 
- void
- _PyMalloc_FetchHooks( void *(**malloc_funcp)(size_t),
- 		      void *(**calloc_funcp)(size_t, size_t),
- 		      void *(**realloc_funcp)(void *, size_t),
- 		      void (**free_funcp)(void *) )
- {
- 	LOCK();
- 	*malloc_funcp = malloc_hook;
- 	*calloc_funcp = calloc_hook;
- 	*realloc_funcp = realloc_hook;
- 	*free_funcp = free_hook;
- 	UNLOCK();
- }
- #endif /* !WITH_MALLOC_HOOKS */
--- 637,638 ----