mirror of https://github.com/asterisk/asterisk
pjproject_bundled will now use the asterisk memory debugging APIs if MALLOC_DEBUG is turned on in menuselect. Because this required stubs for the executable programs and the python bindings, some Makefile reorganization was needed to properly handle the dependencies. As a result, the makefile now individually makes each of the pjproject libraries separately instead of making them all in 1 shot. The only visible change is that there are separate status lines printed for each library instead oif 1 for all libs. Also, the making of the pjproject dependency files was eliminated. They're not needed for building unless you're actively modifying pjproject source files and it makes the build process faster. Finally, any issues with parallel builds should be resolved again making the build faster. Change-Id: Icc5e3d658fbfb00e0a46b44c66dcc2522d5171b0changes/30/4030/6
George Joseph
9 years ago
parent
f166681c12
commit
0dc0356e39
@ -0,0 +1,72 @@
|
|||||||
|
/*
|
||||||
|
* Asterisk -- An open source telephony toolkit.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2016, Digium, Inc
|
||||||
|
*
|
||||||
|
* George Joseph <gjoseph@digium.com>
|
||||||
|
*
|
||||||
|
* See http://www.asterisk.org for more information about
|
||||||
|
* the Asterisk project. Please do not directly contact
|
||||||
|
* any of the maintainers of this project for assistance;
|
||||||
|
* the project provides a web site, mailing lists and IRC
|
||||||
|
* channels for your use.
|
||||||
|
*
|
||||||
|
* This program is free software, distributed under the terms of
|
||||||
|
* the GNU General Public License Version 2. See the LICENSE file
|
||||||
|
* at the top of the source tree.
|
||||||
|
*/
|
||||||
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
int __ast_asprintf(const char *file, int lineno, const char *func, char **strp, const char *format, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
int rc = 0;
|
||||||
|
|
||||||
|
va_start(ap, format);
|
||||||
|
rc = vasprintf(strp, format, ap);
|
||||||
|
va_end(ap);
|
||||||
|
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *__ast_calloc(size_t nmemb, size_t size, const char *file, int lineno, const char *func)
|
||||||
|
{
|
||||||
|
return calloc(nmemb, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void __ast_free(void *ptr, const char *file, int lineno, const char *func)
|
||||||
|
{
|
||||||
|
free(ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void *__ast_malloc(size_t size, const char *file, int lineno, const char *func)
|
||||||
|
{
|
||||||
|
return malloc(size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void *__ast_realloc(void *ptr, size_t size, const char *file, int lineno, const char *func)
|
||||||
|
{
|
||||||
|
return realloc(ptr, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *__ast_strdup(const char *s, const char *file, int lineno, const char *func)
|
||||||
|
{
|
||||||
|
return strdup(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *__ast_strndup(const char *s, size_t n, const char *file, int lineno, const char *func)
|
||||||
|
{
|
||||||
|
return strndup(s, n);
|
||||||
|
}
|
||||||
|
|
||||||
|
int __ast_vasprintf(char **strp, const char *format, va_list ap, const char *file, int lineno, const char *func)
|
||||||
|
{
|
||||||
|
return vasprintf(strp, format, ap);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,78 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2016 George Joseph <gjoseph@digium.com>
|
||||||
|
*
|
||||||
|
* See http://www.asterisk.org for more information about
|
||||||
|
* the Asterisk project. Please do not directly contact
|
||||||
|
* any of the maintainers of this project for assistance;
|
||||||
|
* the project provides a web site, mailing lists and IRC
|
||||||
|
* channels for your use.
|
||||||
|
*
|
||||||
|
* This program is free software, distributed under the terms of
|
||||||
|
* the GNU General Public License Version 2. See the LICENSE file
|
||||||
|
* at the top of the source tree.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ASTERISK_MALLOC_DEBUG_H_
|
||||||
|
#define ASTERISK_MALLOC_DEBUG_H_
|
||||||
|
|
||||||
|
/* Include these now to prevent them from messing up MALLOC_DEBUG */
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <pj/compat/string.h>
|
||||||
|
#include <pj/compat/stdarg.h>
|
||||||
|
#include <pj/compat/malloc.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int __ast_asprintf(const char *file, int lineno, const char *func, char **strp, const char *format, ...)
|
||||||
|
__attribute__((format(printf, 5, 6)));
|
||||||
|
void *__ast_calloc(size_t nmemb, size_t size, const char *file, int lineno, const char *func);
|
||||||
|
void __ast_free(void *ptr, const char *file, int lineno, const char *func);
|
||||||
|
void *__ast_malloc(size_t size, const char *file, int lineno, const char *func);
|
||||||
|
void *__ast_realloc(void *ptr, size_t size, const char *file, int lineno, const char *func);
|
||||||
|
char *__ast_strdup(const char *s, const char *file, int lineno, const char *func);
|
||||||
|
char *__ast_strndup(const char *s, size_t n, const char *file, int lineno, const char *func);
|
||||||
|
int __ast_vasprintf(char **strp, const char *format, va_list ap, const char *file, int lineno, const char *func)
|
||||||
|
__attribute__((format(printf, 2, 0)));
|
||||||
|
|
||||||
|
/* Undefine any macros */
|
||||||
|
#undef asprintf
|
||||||
|
#undef calloc
|
||||||
|
#undef free
|
||||||
|
#undef malloc
|
||||||
|
#undef realloc
|
||||||
|
#undef strdup
|
||||||
|
#undef strndup
|
||||||
|
#undef vasprintf
|
||||||
|
|
||||||
|
/* Provide our own definitions */
|
||||||
|
#define asprintf(a, b, c...) \
|
||||||
|
__ast_asprintf(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, b, c)
|
||||||
|
|
||||||
|
#define calloc(a,b) \
|
||||||
|
__ast_calloc(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||||
|
|
||||||
|
#define free(a) \
|
||||||
|
__ast_free(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||||
|
|
||||||
|
#define malloc(a) \
|
||||||
|
__ast_malloc(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||||
|
|
||||||
|
#define realloc(a,b) \
|
||||||
|
__ast_realloc(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||||
|
|
||||||
|
#define strdup(a) \
|
||||||
|
__ast_strdup(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||||
|
|
||||||
|
#define strndup(a,b) \
|
||||||
|
__ast_strndup(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||||
|
|
||||||
|
#define vasprintf(a,b,c) \
|
||||||
|
__ast_vasprintf(a,b,c,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* ASTERISK_MALLOC_DEBUG_H_ */
|
||||||
Loading…
Reference in new issue