--- libaitio/src/aitio.c 2012/05/14 12:49:21 1.10 +++ libaitio/src/aitio.c 2012/05/23 13:53:00 1.10.6.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.c,v 1.10 2012/05/14 12:49:21 misho Exp $ +* $Id: aitio.c,v 1.10.6.4 2012/05/23 13:53:00 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -47,10 +47,22 @@ SUCH DAMAGE. int io_Debug; +mpool_t *io_mpool; +/* Memory management */ + +void *(*io_malloc)(size_t) = malloc; +void *(*io_calloc)(size_t, size_t) = calloc; +void *(*io_realloc)(void*, size_t) = realloc; +char *(*io_strdup)(const char*) = strdup; +void (*io_free)(void*) = free; + + #pragma GCC visibility push(hidden) +int use_mm; + int io_Errno; char io_Error[STRSIZ]; @@ -84,8 +96,96 @@ io_SetErr(int eno, char *estr, ...) va_end(lst); } +// io_mm_inuse() Check for memory management model +inline int +io_mm_inuse() +{ + return use_mm & IO_MPOOL; +} + +// init libaitio routine +void +_init() +{ +#ifdef USE_MPOOL + ioLibInit(IO_MPOOL, 0); +#else + ioLibInit(IO_SYSM, 0); +#endif +} + +// fini libaitio routine +void +_fini() +{ + ioLibFini(); +} + /* + * ioLibInit() - Init libaitio library memory management + * + * @mm = memory management (IO_SYSM or IO_MPOOL) + * @maxmem = memory limit + * return: -1 error or !=-1 used memory management model + */ +inline int +ioLibInit(int mm, u_long maxmem) +{ + switch (mm) { + case IO_MPOOL: /* mpool */ + io_mpool = mpool_init(maxmem); + if (io_mpool) { + io_malloc = mpool_xmalloc; + io_calloc = mpool_xcalloc; + io_realloc = mpool_xrealloc; + io_strdup = mpool_xstrdup; + io_free = mpool_xfree; + use_mm = mm; + break; + } else { + #undef USE_MPOOL + } + case IO_SYSM: /* system */ + io_malloc = malloc; + io_calloc = calloc; + io_realloc = realloc; + io_strdup = strdup; + io_free = free; + use_mm = mm; + break; + default: /* not supported */ + io_SetErr(EINVAL, "Not supported memory management"); + return -1; + } + + return use_mm; +} + +/* + * ioLibFini() - Finish libaitio library memory management + * + * return: none + */ +inline void +ioLibFini() +{ + switch (use_mm) { + case 1: + mpool_destroy(&io_mpool); + + io_malloc = malloc; + io_calloc = calloc; + io_realloc = realloc; + io_strdup = strdup; + io_free = free; + use_mm = IO_SYSM; + break; + } +} + + +/* * ioPromptRead() - Read data from input h[0] with prompt to output h[1] * * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout @@ -312,7 +412,7 @@ ioRegexGet(const char *csRegex, const char *csData, ch * @csRegex = Regulare expression pattern * @csData = Source data * @csNew = Data for replace - * return: NULL not match or error; !=NULL allocated new string, must be free after use! + * return: NULL not match or error; !=NULL allocated new string, must be xfree after use! */ char * ioRegexReplace(const char *csRegex, const char *csData, const char *csNew) @@ -328,7 +428,7 @@ ioRegexReplace(const char *csRegex, const char *csData // ___ before match len = sp + 1; - str = malloc(len); + str = xmalloc(len); if (!str) { LOGERR; return NULL; @@ -337,7 +437,7 @@ ioRegexReplace(const char *csRegex, const char *csData // * replace match * if (csNew) { len += strlen(csNew); - str = realloc(str, len); + str = xrealloc(str, len); if (!str) { LOGERR; return NULL; @@ -346,7 +446,7 @@ ioRegexReplace(const char *csRegex, const char *csData } // after match ___ len += strlen(csData) - ep; - str = realloc(str, len); + str = xrealloc(str, len); if (!str) { LOGERR; return NULL; @@ -360,7 +460,7 @@ ioRegexReplace(const char *csRegex, const char *csData * ioStrAst() - Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" * * @csString = Input string - * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free() + * return: NULL error, !=NULL Allocated new string evaluated from input string, must be xfree() */ char * ioStrAst(const char *csString) @@ -401,7 +501,7 @@ ioStrAst(const char *csString) ext = str; out = strdup(ext); - free(str); + xfree(str); return out; } @@ -451,7 +551,7 @@ ioMkDir(const char *csDir, int mode) } end: chdir(szOld); - free(str); + xfree(str); return cx; }