Staging
v0.5.1
https://github.com/python/cpython
Revision 23cafd27cfd45f143c21a61319d230acc5ecf0ea authored by Benjamin Peterson on 04 April 2009, 15:38:19 UTC, committed by Benjamin Peterson on 04 April 2009, 15:38:19 UTC
........
  r70711 | r.david.murray | 2009-03-30 10:14:01 -0500 (Mon, 30 Mar 2009) | 2 lines

  Convert import try/except to use test_support.import_module().
........
  r70713 | ronald.oussoren | 2009-03-30 10:20:46 -0500 (Mon, 30 Mar 2009) | 2 lines

  This patch fixes issue 1254695 (wrong argument type conversion in Carbon.Qt)
........
  r70716 | r.david.murray | 2009-03-30 10:30:34 -0500 (Mon, 30 Mar 2009) | 2 lines

  Revert incorrect change.
........
  r70719 | ronald.oussoren | 2009-03-30 11:01:51 -0500 (Mon, 30 Mar 2009) | 2 lines

  Fix for issue 896199 (some Carbon modules aren't present in the documentation)
........
  r70747 | r.david.murray | 2009-03-30 15:04:06 -0500 (Mon, 30 Mar 2009) | 3 lines

  Remove references to test_socket_ssl which was deleted in trunk
  in r64392 and py3k in r59038.
........
  r70772 | barry.warsaw | 2009-03-30 17:42:17 -0500 (Mon, 30 Mar 2009) | 5 lines

  A fix for issue 1974, inspired by the patch from Andi Albrecht (aalbrecht),
  though with some changes by me.  This patch should not be back ported or
  forward ported.  It's a bit too risky for 2.6 and 3.x does things fairly
  differently.
........
  r70821 | jeremy.hylton | 2009-03-31 10:04:15 -0500 (Tue, 31 Mar 2009) | 2 lines

  Add check for PyDict_Update() error.
........
  r70830 | georg.brandl | 2009-03-31 11:11:45 -0500 (Tue, 31 Mar 2009) | 1 line

  #5529: backport new docs of import semantics written by Brett to 2.x.
........
  r70844 | raymond.hettinger | 2009-03-31 12:47:06 -0500 (Tue, 31 Mar 2009) | 1 line

  Per the language summit, the optional fastpath imports should use from-import-star.
........
  r70873 | josiah.carlson | 2009-03-31 14:32:34 -0500 (Tue, 31 Mar 2009) | 2 lines

  This resolves issue 1161031.  Tests pass.
........
  r70901 | georg.brandl | 2009-03-31 16:40:24 -0500 (Tue, 31 Mar 2009) | 2 lines

  Remove warning about pending Win9x support removal.
........
  r70902 | georg.brandl | 2009-03-31 16:43:03 -0500 (Tue, 31 Mar 2009) | 1 line

  #1675026: add a note about a strange Windows problem, and remove notes about AtheOS.
........
  r70904 | josiah.carlson | 2009-03-31 16:49:36 -0500 (Tue, 31 Mar 2009) | 3 lines

  Made handle_expt_event() be called last, so that we don't accidentally read
  after closing the socket.
........
  r70918 | raymond.hettinger | 2009-03-31 17:43:03 -0500 (Tue, 31 Mar 2009) | 1 line

  Improve examples for collections.deque()
........
  r70934 | josiah.carlson | 2009-03-31 20:28:11 -0500 (Tue, 31 Mar 2009) | 2 lines

  Fix for failing asyncore tests.
........
  r70969 | raymond.hettinger | 2009-04-01 13:50:56 -0500 (Wed, 01 Apr 2009) | 1 line

  Issue #5647: MutableSet.__iand__() no longer mutates self during iteration.
........
  r71026 | benjamin.peterson | 2009-04-01 21:52:46 -0500 (Wed, 01 Apr 2009) | 1 line

  fix error handling
........
  r71073 | raymond.hettinger | 2009-04-02 17:25:40 -0500 (Thu, 02 Apr 2009) | 4 lines

  Have namedtuple's field renamer assign names that
  are consistent with the corresponding tuple index.
........
  r71075 | raymond.hettinger | 2009-04-02 17:34:17 -0500 (Thu, 02 Apr 2009) | 1 line

  Update docs for namedtuple's renaming change.
........
  r71078 | raymond.hettinger | 2009-04-02 21:43:54 -0500 (Thu, 02 Apr 2009) | 4 lines

  Localize the function lookup in timeit.
........
1 parent 85b3098
Raw File
Tip revision: 23cafd27cfd45f143c21a61319d230acc5ecf0ea authored by Benjamin Peterson on 04 April 2009, 15:38:19 UTC
Blocked revisions 70711,70713,70716,70719,70747,70772,70821,70830,70844,70873,70901-70902,70904,70918,70934,70969,71026,71073,71075,71078 via svnmerge
Tip revision: 23cafd2
pymem.h
/* The PyMem_ family:  low-level memory allocation interfaces.
   See objimpl.h for the PyObject_ memory family.
*/

#ifndef Py_PYMEM_H
#define Py_PYMEM_H

#include "pyport.h"

#ifdef __cplusplus
extern "C" {
#endif

/* BEWARE:

   Each interface exports both functions and macros.  Extension modules should
   use the functions, to ensure binary compatibility across Python versions.
   Because the Python implementation is free to change internal details, and
   the macros may (or may not) expose details for speed, if you do use the
   macros you must recompile your extensions with each Python release.

   Never mix calls to PyMem_ with calls to the platform malloc/realloc/
   calloc/free.  For example, on Windows different DLLs may end up using
   different heaps, and if you use PyMem_Malloc you'll get the memory from the
   heap used by the Python DLL; it could be a disaster if you free()'ed that
   directly in your own extension.  Using PyMem_Free instead ensures Python
   can return the memory to the proper heap.  As another example, in
   PYMALLOC_DEBUG mode, Python wraps all calls to all PyMem_ and PyObject_
   memory functions in special debugging wrappers that add additional
   debugging info to dynamic memory blocks.  The system routines have no idea
   what to do with that stuff, and the Python wrappers have no idea what to do
   with raw blocks obtained directly by the system routines then.

   The GIL must be held when using these APIs.
*/

/*
 * Raw memory interface
 * ====================
 */

/* Functions

   Functions supplying platform-independent semantics for malloc/realloc/
   free.  These functions make sure that allocating 0 bytes returns a distinct
   non-NULL pointer (whenever possible -- if we're flat out of memory, NULL
   may be returned), even if the platform malloc and realloc don't.
   Returned pointers must be checked for NULL explicitly.  No action is
   performed on failure (no exception is set, no warning is printed, etc).
*/

PyAPI_FUNC(void *) PyMem_Malloc(size_t);
PyAPI_FUNC(void *) PyMem_Realloc(void *, size_t);
PyAPI_FUNC(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. */
#ifdef PYMALLOC_DEBUG
/* Redirect all memory operations to Python's debugging allocator. */
#define PyMem_MALLOC		PyObject_MALLOC
#define PyMem_REALLOC		PyObject_REALLOC
#define PyMem_FREE		PyObject_FREE

#else	/* ! PYMALLOC_DEBUG */

/* PyMem_MALLOC(0) means malloc(1). Some systems would return NULL
   for malloc(0), which would be treated as an error. Some platforms
   would return a pointer with no memory behind it, which would break
   pymalloc. To solve these problems, allocate an extra byte. */
/* Returns NULL to indicate error if a negative size or size larger than
   Py_ssize_t can represent is supplied.  Helps prevents security holes. */
#define PyMem_MALLOC(n)		(((n) < 0 || (n) > PY_SSIZE_T_MAX) ? NULL \
				: malloc((n) ? (n) : 1))
#define PyMem_REALLOC(p, n)	(((n) < 0 || (n) > PY_SSIZE_T_MAX) ? NULL \
				: realloc((p), (n) ? (n) : 1))
#define PyMem_FREE		free

#endif	/* PYMALLOC_DEBUG */

/*
 * Type-oriented memory interface
 * ==============================
 *
 * Allocate memory for n objects of the given type.  Returns a new pointer
 * or NULL if the request was too large or memory allocation failed.  Use
 * these macros rather than doing the multiplication yourself so that proper
 * overflow checking is always done.
 */

#define PyMem_New(type, n) \
  ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
	( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
#define PyMem_NEW(type, n) \
  ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
	( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )

/*
 * The value of (p) is always clobbered by this macro regardless of success.
 * The caller MUST check if (p) is NULL afterwards and deal with the memory
 * error if so.  This means the original value of (p) MUST be saved for the
 * caller's memory error handler to not lose track of it.
 */
#define PyMem_Resize(p, type, n) \
  ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
	(type *) PyMem_Realloc((p), (n) * sizeof(type)) )
#define PyMem_RESIZE(p, type, n) \
  ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
	(type *) PyMem_REALLOC((p), (n) * sizeof(type)) )

/* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used
 * anymore.  They're just confusing aliases for PyMem_{Free,FREE} now.
 */
#define PyMem_Del		PyMem_Free
#define PyMem_DEL		PyMem_FREE

#ifdef __cplusplus
}
#endif

#endif /* !Py_PYMEM_H */
back to top