[Python-checkins] CVS: python/dist/src/Include pymem.h,NONE,2.1 Python.h,2.25,2.26 mymalloc.h,2.25,2.26 mymath.h,2.12,2.13 myproto.h,2.9,2.10 myselect.h,2.13,2.14 mytime.h,2.7,2.8 objimpl.h,2.24,2.25 pgenheaders.h,2.22,2.23 pyport.h,2.8,2.9
Peter Schneider-Kamp
python-dev@python.org
Mon, 31 Jul 2000 15:19:33 -0700
Update of /cvsroot/python/python/dist/src/Include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11485/Include
Modified Files:
Python.h mymalloc.h mymath.h myproto.h myselect.h mytime.h
objimpl.h pgenheaders.h pyport.h
Added Files:
pymem.h
Log Message:
patch from Vladimir (move Py_Mem* interface to Include/pymem.h)
--- NEW FILE ---
/***********************************************************
Copyright (c) 2000, BeOpen.com.
Copyright (c) 1995-2000, Corporation for National Research Initiatives.
Copyright (c) 1990-1995, Stichting Mathematisch Centrum.
All rights reserved.
See the file "Misc/COPYRIGHT" for information on usage and
redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
******************************************************************/
/* Lowest-level memory allocation interface */
#ifndef Py_PYMEM_H
#define Py_PYMEM_H
#include "pyport.h"
#ifdef __cplusplus
extern "C" {
#endif
/*
* Core memory allocator
* =====================
*/
/* To make sure the interpreter is user-malloc friendly, all memory
APIs are implemented on top of this one.
The PyCore_* macros can be defined to make the interpreter use a
custom allocator. Note that they are for internal use only. Both
the core and extension modules should use the PyMem_* API.
See the comment block at the end of this file for two scenarios
showing how to use this to use a different allocator. */
#ifndef PyCore_MALLOC_FUNC
#undef PyCore_REALLOC_FUNC
#undef PyCore_FREE_FUNC
#define PyCore_MALLOC_FUNC malloc
#define PyCore_REALLOC_FUNC realloc
#define PyCore_FREE_FUNC free
#endif
#ifndef PyCore_MALLOC_PROTO
#undef PyCore_REALLOC_PROTO
#undef PyCore_FREE_PROTO
#define PyCore_MALLOC_PROTO (size_t)
#define PyCore_REALLOC_PROTO (void *, size_t)
#define PyCore_FREE_PROTO (void *)
#endif
#ifdef NEED_TO_DECLARE_MALLOC_AND_FRIEND
extern void *PyCore_MALLOC_FUNC PyCore_MALLOC_PROTO;
extern void *PyCore_REALLOC_FUNC PyCore_REALLOC_PROTO;
extern void PyCore_FREE_FUNC PyCore_FREE_PROTO;
#endif
#ifndef PyCore_MALLOC
#undef PyCore_REALLOC
#undef PyCore_FREE
#define PyCore_MALLOC(n) PyCore_MALLOC_FUNC(n)
#define PyCore_REALLOC(p, n) PyCore_REALLOC_FUNC((p), (n))
#define PyCore_FREE(p) PyCore_FREE_FUNC(p)
#endif
/* BEWARE:
Each interface exports both functions and macros. Extension modules
should normally use the functions for ensuring binary compatibility
of the user's code across Python versions. Subsequently, if the
Python runtime switches to its own malloc (different from standard
malloc), no recompilation is required for the extensions.
The macro versions trade compatibility for speed. They can be used
whenever there is a performance problem, but their use implies
recompilation of the code for each new Python release. The Python
core uses the macros because it *is* compiled on every upgrade.
This might not be the case with 3rd party extensions in a custom
setup (for example, a customer does not always have access to the
source of 3rd party deliverables). You have been warned! */
/*
* Raw memory interface
* ====================
*/
/* Functions */
/* Function wrappers around PyCore_MALLOC and friends; useful if you
need to be sure that you are using the same memory allocator as
Python. Note that the wrappers make sure that allocating 0 bytes
returns a non-NULL pointer, even if the underlying malloc
doesn't. Returned pointers must be checked for NULL explicitly.
No action is performed on failure. */
extern DL_IMPORT(void *) PyMem_Malloc(size_t);
extern DL_IMPORT(void *) PyMem_Realloc(void *, size_t);
extern DL_IMPORT(void) PyMem_Free(void *);
/* Starting from Python 1.6, the wrappers Py_{Malloc,Realloc,Free} are
no longer supported. They used to call PyErr_NoMemory() on failure. */
/* Macros */
#define PyMem_MALLOC(n) PyCore_MALLOC(n)
#define PyMem_REALLOC(p, n) PyCore_REALLOC((void *)(p), (n))
#define PyMem_FREE(p) PyCore_FREE((void *)(p))
/*
* Type-oriented memory interface
* ==============================
*/
/* Functions */
#define PyMem_New(type, n) \
( (type *) PyMem_Malloc((n) * sizeof(type)) )
#define PyMem_Resize(p, type, n) \
( (p) = (type *) PyMem_Realloc((n) * sizeof(type)) )
#define PyMem_Del(p) PyMem_Free(p)
/* Macros */
#define PyMem_NEW(type, n) \
( (type *) PyMem_MALLOC(_PyMem_EXTRA + (n) * sizeof(type)) )
#define PyMem_RESIZE(p, type, n) \
if ((p) == NULL) \
(p) = (type *)(PyMem_MALLOC( \
_PyMem_EXTRA + (n) * sizeof(type))); \
else \
(p) = (type *)(PyMem_REALLOC((p), \
_PyMem_EXTRA + (n) * sizeof(type)))
#define PyMem_DEL(p) PyMem_FREE(p)
/* PyMem_XDEL is deprecated. To avoid the call when p is NULL,
it is recommended to write the test explicitly in the code.
Note that according to ANSI C, free(NULL) has no effect. */
#ifdef __cplusplus
}
#endif
/* SCENARIOS
Here are two scenarios by Vladimir Marangozov (the author of the
memory allocation redesign).
1) Scenario A
Suppose you want to use a debugging malloc library that collects info on
where the malloc calls originate from. Assume the interface is:
d_malloc(size_t n, char* src_file, unsigned long src_line) c.s.
In this case, you would define (for example in config.h) :
#define PyCore_MALLOC_FUNC d_malloc
...
#define PyCore_MALLOC_PROTO (size_t, char *, unsigned long)
...
#define NEED_TO_DECLARE_MALLOC_AND_FRIEND
#define PyCore_MALLOC(n) PyCore_MALLOC_FUNC((n), __FILE__, __LINE__)
...
2) Scenario B
Suppose you want to use malloc hooks (defined & initialized in a 3rd party
malloc library) instead of malloc functions. In this case, you would
define:
#define PyCore_MALLOC_FUNC (*malloc_hook)
...
#define NEED_TO_DECLARE_MALLOC_AND_FRIEND
and ignore the previous definitions about PyCore_MALLOC_FUNC, etc.
*/
#endif /* !Py_PYMEM_H */
Index: Python.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/Python.h,v
retrieving revision 2.25
retrieving revision 2.26
diff -C2 -r2.25 -r2.26
*** Python.h 2000/07/31 15:28:03 2.25
--- Python.h 2000/07/31 22:19:30 2.26
***************
*** 55,58 ****
--- 55,60 ----
#include "pyport.h"
+ #include "pymem.h"
+
#include "object.h"
#include "objimpl.h"
Index: mymalloc.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/mymalloc.h,v
retrieving revision 2.25
retrieving revision 2.26
diff -C2 -r2.25 -r2.26
*** mymalloc.h 2000/07/31 15:28:03 2.25
--- mymalloc.h 2000/07/31 22:19:30 2.26
***************
*** 1,4 ****
- #ifndef Py_MYMALLOC_H
- #define Py_MYMALLOC_H
/***********************************************************
Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 15,18 ****
--- 13,19 ----
USE "pyport.h" INSTEAD
***************************************/
+
+ #ifndef Py_MYMALLOC_H
+ #define Py_MYMALLOC_H
/* Lowest-level memory allocation interface */
Index: mymath.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/mymath.h,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** mymath.h 2000/07/31 15:28:03 2.12
--- mymath.h 2000/07/31 22:19:30 2.13
***************
*** 1,2 ****
--- 1,12 ----
+ /***********************************************************
+ Copyright (c) 2000, BeOpen.com.
+ Copyright (c) 1995-2000, Corporation for National Research Initiatives.
+ Copyright (c) 1990-1995, Stichting Mathematisch Centrum.
+ All rights reserved.
+
+ See the file "Misc/COPYRIGHT" for information on usage and
+ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ ******************************************************************/
+
/***************************************
THIS FILE IS OBSOLETE
Index: myproto.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/myproto.h,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** myproto.h 2000/07/09 03:09:55 2.9
--- myproto.h 2000/07/31 22:19:30 2.10
***************
*** 1,8 ****
- #ifndef Py_PROTO_H
- #define Py_PROTO_H
- #ifdef __cplusplus
- extern "C" {
- #endif
-
/***********************************************************
Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 19,22 ****
--- 13,22 ----
DON'T USE Py_PROTO or Py_FPROTO anymore.
***************************************/
+
+ #ifndef Py_PROTO_H
+ #define Py_PROTO_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
#ifdef HAVE_PROTOTYPES
Index: myselect.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/myselect.h,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** myselect.h 2000/07/31 15:28:03 2.13
--- myselect.h 2000/07/31 22:19:30 2.14
***************
*** 1,8 ****
- #ifndef Py_MYSELECT_H
- #define Py_MYSELECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
-
/***********************************************************
Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 19,22 ****
--- 13,22 ----
USE "pyport.h" INSTEAD
***************************************/
+
+ #ifndef Py_MYSELECT_H
+ #define Py_MYSELECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
/* Include file for users of select() */
Index: mytime.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/mytime.h,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -r2.7 -r2.8
*** mytime.h 2000/07/31 15:28:03 2.7
--- mytime.h 2000/07/31 22:19:30 2.8
***************
*** 1,8 ****
- #ifndef Py_MYTIME_H
- #define Py_MYTIME_H
- #ifdef __cplusplus
- extern "C" {
- #endif
-
/***********************************************************
Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 19,22 ****
--- 13,22 ----
USE "pyport.h" INSTEAD
***************************************/
+
+ #ifndef Py_MYTIME_H
+ #define Py_MYTIME_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
/* Include file instead of <time.h> and/or <sys/time.h> */
Index: objimpl.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/objimpl.h,v
retrieving revision 2.24
retrieving revision 2.25
diff -C2 -r2.24 -r2.25
*** objimpl.h 2000/07/31 15:28:03 2.24
--- objimpl.h 2000/07/31 22:19:30 2.25
***************
*** 11,19 ****
#ifndef Py_OBJIMPL_H
#define Py_OBJIMPL_H
#ifdef __cplusplus
extern "C" {
#endif
-
- #include "pyport.h"
/*
--- 11,20 ----
#ifndef Py_OBJIMPL_H
#define Py_OBJIMPL_H
+
+ #include "pymem.h"
+
#ifdef __cplusplus
extern "C" {
#endif
/*
Index: pgenheaders.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pgenheaders.h,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -r2.22 -r2.23
*** pgenheaders.h 2000/07/31 15:28:03 2.22
--- pgenheaders.h 2000/07/31 22:19:30 2.23
***************
*** 31,35 ****
#endif
! #include "pyport.h"
#include "pydebug.h"
--- 31,35 ----
#endif
! #include "pymem.h"
#include "pydebug.h"
Index: pyport.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pyport.h,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** pyport.h 2000/07/31 15:28:03 2.8
--- pyport.h 2000/07/31 22:19:30 2.9
***************
*** 10,13 ****
--- 10,15 ----
#define Py_PYPORT_H
+ #include "config.h" /* include for defines */
+
/**************************************************************************
Symbols and macros to supply platform-independent interfaces to basic
***************
*** 221,227 ****
! /***********************************
! * WRAPPER FOR malloc/realloc/free *
! ***********************************/
#ifndef DL_IMPORT /* declarations for DLL import */
--- 223,229 ----
! /************************************
! * MALLOC COMPATIBILITY FOR pymem.h *
! ************************************/
#ifndef DL_IMPORT /* declarations for DLL import */
***************
*** 241,395 ****
#endif
- /*
- * Core memory allocator
- * =====================
- */
-
- /* To make sure the interpreter is user-malloc friendly, all memory
- APIs are implemented on top of this one.
-
- The PyCore_* macros can be defined to make the interpreter use a
- custom allocator. Note that they are for internal use only. Both
- the core and extension modules should use the PyMem_* API.
-
- See the comment block at the end of this file for two scenarios
- showing how to use this to use a different allocator. */
-
- #ifndef PyCore_MALLOC_FUNC
- #undef PyCore_REALLOC_FUNC
- #undef PyCore_FREE_FUNC
- #define PyCore_MALLOC_FUNC malloc
- #define PyCore_REALLOC_FUNC realloc
- #define PyCore_FREE_FUNC free
- #endif
-
- #ifndef PyCore_MALLOC_PROTO
- #undef PyCore_REALLOC_PROTO
- #undef PyCore_FREE_PROTO
- #define PyCore_MALLOC_PROTO (size_t)
- #define PyCore_REALLOC_PROTO (void *, size_t)
- #define PyCore_FREE_PROTO (void *)
- #endif
-
- #ifdef NEED_TO_DECLARE_MALLOC_AND_FRIEND
- extern void *PyCore_MALLOC_FUNC PyCore_MALLOC_PROTO;
- extern void *PyCore_REALLOC_FUNC PyCore_REALLOC_PROTO;
- extern void PyCore_FREE_FUNC PyCore_FREE_PROTO;
- #endif
-
- #ifndef PyCore_MALLOC
- #undef PyCore_REALLOC
- #undef PyCore_FREE
- #define PyCore_MALLOC(n) PyCore_MALLOC_FUNC(n)
- #define PyCore_REALLOC(p, n) PyCore_REALLOC_FUNC((p), (n))
- #define PyCore_FREE(p) PyCore_FREE_FUNC(p)
- #endif
-
- /* BEWARE:
-
- Each interface exports both functions and macros. Extension modules
- should normally use the functions for ensuring binary compatibility
- of the user's code across Python versions. Subsequently, if the
- Python runtime switches to its own malloc (different from standard
- malloc), no recompilation is required for the extensions.
-
- The macro versions trade compatibility for speed. They can be used
- whenever there is a performance problem, but their use implies
- recompilation of the code for each new Python release. The Python
- core uses the macros because it *is* compiled on every upgrade.
- This might not be the case with 3rd party extensions in a custom
- setup (for example, a customer does not always have access to the
- source of 3rd party deliverables). You have been warned! */
-
- /*
- * Raw memory interface
- * ====================
- */
-
- /* Functions */
-
- /* Function wrappers around PyCore_MALLOC and friends; useful if you
- need to be sure that you are using the same memory allocator as
- Python. Note that the wrappers make sure that allocating 0 bytes
- returns a non-NULL pointer, even if the underlying malloc
- doesn't. Returned pointers must be checked for NULL explicitly.
- No action is performed on failure. */
- extern DL_IMPORT(void *) PyMem_Malloc(size_t);
- extern DL_IMPORT(void *) PyMem_Realloc(void *, size_t);
- extern DL_IMPORT(void) PyMem_Free(void *);
-
- /* Starting from Python 1.6, the wrappers Py_{Malloc,Realloc,Free} are
- no longer supported. They used to call PyErr_NoMemory() on failure. */
-
- /* Macros */
- #define PyMem_MALLOC(n) PyCore_MALLOC(n)
- #define PyMem_REALLOC(p, n) PyCore_REALLOC((void *)(p), (n))
- #define PyMem_FREE(p) PyCore_FREE((void *)(p))
-
- /*
- * Type-oriented memory interface
- * ==============================
- */
-
- /* Functions */
- #define PyMem_New(type, n) \
- ( (type *) PyMem_Malloc((n) * sizeof(type)) )
- #define PyMem_Resize(p, type, n) \
- ( (p) = (type *) PyMem_Realloc((n) * sizeof(type)) )
- #define PyMem_Del(p) PyMem_Free(p)
-
- /* Macros */
- #define PyMem_NEW(type, n) \
- ( (type *) PyMem_MALLOC(_PyMem_EXTRA + (n) * sizeof(type)) )
- #define PyMem_RESIZE(p, type, n) \
- if ((p) == NULL) \
- (p) = (type *)(PyMem_MALLOC( \
- _PyMem_EXTRA + (n) * sizeof(type))); \
- else \
- (p) = (type *)(PyMem_REALLOC((p), \
- _PyMem_EXTRA + (n) * sizeof(type)))
- #define PyMem_DEL(p) PyMem_FREE(p)
-
- /* PyMem_XDEL is deprecated. To avoid the call when p is NULL,
- it is recommended to write the test explicitly in the code.
- Note that according to ANSI C, free(NULL) has no effect. */
-
- /* SCENARIOS
-
- Here are two scenarios by Vladimir Marangozov (the author of the
- memory allocation redesign).
-
- 1) Scenario A
-
- Suppose you want to use a debugging malloc library that collects info on
- where the malloc calls originate from. Assume the interface is:
-
- d_malloc(size_t n, char* src_file, unsigned long src_line) c.s.
-
- In this case, you would define (for example in config.h) :
-
- #define PyCore_MALLOC_FUNC d_malloc
- ...
- #define PyCore_MALLOC_PROTO (size_t, char *, unsigned long)
- ...
- #define NEED_TO_DECLARE_MALLOC_AND_FRIEND
-
- #define PyCore_MALLOC(n) PyCore_MALLOC_FUNC((n), __FILE__, __LINE__)
- ...
-
- 2) Scenario B
-
- Suppose you want to use malloc hooks (defined & initialized in a 3rd party
- malloc library) instead of malloc functions. In this case, you would
- define:
-
- #define PyCore_MALLOC_FUNC (*malloc_hook)
- ...
- #define NEED_TO_DECLARE_MALLOC_AND_FRIEND
-
- and ignore the previous definitions about PyCore_MALLOC_FUNC, etc.
-
-
- */
/********************************************
--- 243,246 ----