lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2026-01-27 08:02:47 +03:00
Code Activity

Moved debug memory alloc functions to own file

Browse Source
This commit is contained in:
Lammert Bies
2016-12-11 21:23:11 +01:00
parent ca776ee103
commit 2dcc86fd73
4 changed files with 185 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -131,6 +131,7 @@ LIB_SOURCES = src/libhttp.c \
src/httplib_lock_unlock_context.c \
src/httplib_log_access.c \
src/httplib_lowercase.c \
src/httplib_malloc.c \
src/httplib_master_thread.c \
src/httplib_match_prefix.c \
src/httplib_md5.c \

142
src/httplib_malloc.c Normal file
View File

@@ -0,0 +1,142 @@
/*
* Copyright (c) 2016 Lammert Bies
* Copyright (c) 2013-2016 the Civetweb developers
* Copyright (c) 2004-2013 Sergey Lyubka
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#define NO_HTTPLIB_MALLOC_OVERRIDE
#include "libhttp-private.h"
#if defined(MEMORY_DEBUGGING)
unsigned long mg_memory_debug_blockCount = 0;
unsigned long mg_memory_debug_totalMemUsed = 0;
void *XX_httplib_malloc_ex( size_t size, const char *file, unsigned line ) {
void *data = malloc(size + sizeof(size_t));
void *memory = 0;
char mallocStr[256];
if (data) {
*(size_t *)data = size;
mg_memory_debug_totalMemUsed += size;
mg_memory_debug_blockCount++;
memory = (void *)(((char *)data) + sizeof(size_t));
}
return memory;
} /* XX_httplib_malloc_ex */
void *XX_httplib_calloc_ex( size_t count, size_t size, const char *file, unsigned line ) {
void *data = XX_httplib_malloc_ex(size * count, file, line);
if ( data != NULL ) memset( data, 0, size * count );
return data;
} /* XX_httplib_calloc_ex */
void XX_httplib_free_ex( void *memory, const char *file, unsigned line ) {
char mallocStr[256];
void *data = (void *)(((char *)memory) - sizeof(size_t));
size_t size;
if (memory) {
size = *(size_t *)data;
mg_memory_debug_totalMemUsed -= size;
mg_memory_debug_blockCount--;
free(data);
}
} /* XX_httplib_free_ex */
void *XX_httplib_realloc_ex( void *memory, size_t newsize, const char *file, unsigned line ) {
char mallocStr[256];
void *data;
void *_realloc;
size_t oldsize;
if (newsize) {
if (memory) {
data = (void *)(((char *)memory) - sizeof(size_t));
oldsize = *(size_t *)data;
_realloc = realloc(data, newsize + sizeof(size_t));
if (_realloc) {
data = _realloc;
mg_memory_debug_totalMemUsed -= oldsize;
mg_memory_debug_totalMemUsed += newsize;
*(size_t *)data = newsize;
data = (void *)(((char *)data) + sizeof(size_t));
} else {
return _realloc;
}
} else {
data = XX_httplib_malloc_ex(newsize, file, line);
}
} else {
data = 0;
XX_httplib_free_ex(memory, file, line);
}
return data;
}
#else /* MEMORY_DEBUGGING */
void *XX_httplib_malloc( size_t a ) {
return malloc(a);
} /* XX_httplib_malloc */
void *XX_httplib_calloc( size_t a, size_t b ) {
return calloc(a, b);
} /* XX_httplib_calloc */
void * XX_httplib_realloc(void *a, size_t b) {
return realloc(a, b);
} /* XX_httplib_realloc */
void XX_httplib_free( void *a ) {
free(a);
} /* XX_httplib_free */
#endif /* MEMORY_DEBUGGING */

42
src/libhttp-private.h
View File

@@ -22,6 +22,48 @@
* THE SOFTWARE.
*/
/*
* The library provides their own memory allocation functions with a debugging
* version which counts the number of blocks and bytes allocated. The normal
* allocation functions are therefore disabled here, unless a macro has been
* set because a library function needs explicit access to the OS version of
* the memory allocation functions.
*/
#if !defined(NO_HTTPLIB_MALLOC_OVERRIDE)
#ifdef malloc
#undef malloc
#endif
#ifdef calloc
#undef calloc
#endif
#ifdef realloc
#undef realloc
#endif
#ifdef free
#undef free
#endif
#ifdef snprintf
#undef snprintf
#endif
#ifdef vsnprintf
#undef vsnprintf
#endif
#define malloc DO_NOT_USE_THIS_FUNCTION__USE_httplib_malloc
#define calloc DO_NOT_USE_THIS_FUNCTION__USE_httplib_calloc
#define realloc DO_NOT_USE_THIS_FUNCTION__USE_httplib_realloc
#define free DO_NOT_USE_THIS_FUNCTION__USE_httplib_free
#define snprintf DO_NOT_USE_THIS_FUNCTION__USE_httplib_snprintf
#ifdef _WIN32 /* vsnprintf must not be used in any system, * \ \ \ \
* but this define only works well for Windows. */
#define vsnprintf DO_NOT_USE_THIS_FUNCTION__USE_httplib_vsnprintf
#endif
#endif /* ! NO_HTTPLIB_MALLOC_OVERRIDE */
#if defined(_WIN32)
#if !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS /* Disable deprecation warning in VS2005 */

142
src/libhttp.c
View File

@@ -130,148 +130,6 @@ pthread_mutexattr_t XX_httplib_pthread_mutex_attr;
#endif /* defined(_WIN32_WCE) */
#if defined(MEMORY_DEBUGGING)
unsigned long mg_memory_debug_blockCount = 0;
unsigned long mg_memory_debug_totalMemUsed = 0;
void *XX_httplib_malloc_ex( size_t size, const char *file, unsigned line ) {
void *data = malloc(size + sizeof(size_t));
void *memory = 0;
char mallocStr[256];
if (data) {
*(size_t *)data = size;
mg_memory_debug_totalMemUsed += size;
mg_memory_debug_blockCount++;
memory = (void *)(((char *)data) + sizeof(size_t));
}
return memory;
} /* XX_httplib_malloc_ex */
void *XX_httplib_calloc_ex( size_t count, size_t size, const char *file, unsigned line ) {
void *data = XX_httplib_malloc_ex(size * count, file, line);
if ( data != NULL ) memset( data, 0, size * count );
return data;
} /* XX_httplib_calloc_ex */
void XX_httplib_free_ex( void *memory, const char *file, unsigned line ) {
char mallocStr[256];
void *data = (void *)(((char *)memory) - sizeof(size_t));
size_t size;
if (memory) {
size = *(size_t *)data;
mg_memory_debug_totalMemUsed -= size;
mg_memory_debug_blockCount--;
free(data);
}
} /* XX_httplib_free_ex */
void *XX_httplib_realloc_ex( void *memory, size_t newsize, const char *file, unsigned line ) {
char mallocStr[256];
void *data;
void *_realloc;
size_t oldsize;
if (newsize) {
if (memory) {
data = (void *)(((char *)memory) - sizeof(size_t));
oldsize = *(size_t *)data;
_realloc = realloc(data, newsize + sizeof(size_t));
if (_realloc) {
data = _realloc;
mg_memory_debug_totalMemUsed -= oldsize;
mg_memory_debug_totalMemUsed += newsize;
*(size_t *)data = newsize;
data = (void *)(((char *)data) + sizeof(size_t));
} else {
return _realloc;
}
} else {
data = XX_httplib_malloc_ex(newsize, file, line);
}
} else {
data = 0;
XX_httplib_free_ex(memory, file, line);
}
return data;
}
#else /* MEMORY_DEBUGGING */
void *XX_httplib_malloc( size_t a ) {
return malloc(a);
} /* XX_httplib_malloc */
void *XX_httplib_calloc( size_t a, size_t b ) {
return calloc(a, b);
} /* XX_httplib_calloc */
void * XX_httplib_realloc(void *a, size_t b) {
return realloc(a, b);
} /* XX_httplib_realloc */
void XX_httplib_free( void *a ) {
free(a);
} /* XX_httplib_free */
#endif /* MEMORY_DEBUGGING */
/* This following lines are just meant as a reminder to use the mg-functions
* for memory management */
#ifdef malloc
#undef malloc
#endif
#ifdef calloc
#undef calloc
#endif
#ifdef realloc
#undef realloc
#endif
#ifdef free
#undef free
#endif
#ifdef snprintf
#undef snprintf
#endif
#ifdef vsnprintf
#undef vsnprintf
#endif
#define malloc DO_NOT_USE_THIS_FUNCTION__USE_httplib_malloc
#define calloc DO_NOT_USE_THIS_FUNCTION__USE_httplib_calloc
#define realloc DO_NOT_USE_THIS_FUNCTION__USE_httplib_realloc
#define free DO_NOT_USE_THIS_FUNCTION__USE_httplib_free
#define snprintf DO_NOT_USE_THIS_FUNCTION__USE_httplib_snprintf
#ifdef _WIN32 /* vsnprintf must not be used in any system, * \ \ \ \
* but this define only works well for Windows. */
#define vsnprintf DO_NOT_USE_THIS_FUNCTION__USE_httplib_vsnprintf
#endif
/* Darwin prior to 7.0 and Win32 do not have socklen_t */
#ifdef NO_SOCKLEN_T