diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2009-05-05 14:17:18 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-05-05 14:17:18 +0000 |
commit | 2746f589b7daee593cc4a64b2b8ddff5371a09a3 (patch) | |
tree | 5b1b890e90ea0295f502286a7bb1977336d2d31b /include/asterisk/stringfields.h | |
parent | 1f49e675bbe1eaada53b678f07ee4ad75e25bbef (diff) |
Add a more efficient way of allocating structures that use stringfields
This commit adds an API call that can be used to allocate a structure along with this stringfield storage in a single allocation.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@192362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/stringfields.h')
-rw-r--r-- | include/asterisk/stringfields.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h index ca87b60ce..38b7ef6c0 100644 --- a/include/asterisk/stringfields.h +++ b/include/asterisk/stringfields.h @@ -138,6 +138,7 @@ struct ast_string_field_pool { */ struct ast_string_field_mgr { ast_string_field last_alloc; /*!< the last field allocated */ + struct ast_string_field_pool *embedded_pool; /*!< pointer to the embedded pool, if any */ #if defined(__AST_DEBUG_MALLOC) const char *owner_file; /*!< filename of owner */ const char *owner_func; /*!< function name of owner */ @@ -254,6 +255,30 @@ int __ast_string_field_init(struct ast_string_field_mgr *mgr, struct ast_string_ int needed, const char *file, int lineno, const char *func); /*! + * \brief Allocate a structure with embedded stringfields in a single allocation + * \param n Number of structures to allocate (see ast_calloc) + * \param type The type of structure to allocate + * \param size The number of bytes of space (minimum) to allocate for stringfields to use + * + * This function will allocate memory for one or more structures that use stringfields, and + * also allocate space for the stringfields and initialize the stringfield management + * structure embedded in the outer structure. + * + * \since 1.6.3 + */ +#define ast_calloc_with_stringfields(n, type, size) \ + __ast_calloc_with_stringfields(n, sizeof(type), offsetof(type, __field_mgr), offsetof(type, __field_mgr_pool), \ + size, __FILE__, __LINE__, __PRETTY_FUNCTION__) + +/*! + * \internal + * \brief internal version of ast_calloc_with_stringfields + */ +void * attribute_malloc __ast_calloc_with_stringfields(unsigned int num_structs, size_t struct_size, size_t field_mgr_offset, + size_t field_mgr_pool_offset, size_t pool_size, const char *file, + int lineno, const char *func); + +/*! \internal \brief Release a field's allocation from a pool \param pool_head Pointer to the current pool |