mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-08-30 09:58:55 +02:00
Darryl L. Miles
e9202c1d29
Originally the use of a weak symbol was to provide a fallback for non-inline supporting compilers. However all compilers (we care about) support inline keyword (which was not known at the original time of the work). Furthermore GCC have already worked through the solution and make it easy to implement. The use of __GNUC_STDC_INLINE__ pattern in this way manages the fallback and emits a hard symbol this can be tested with: CFLAGS="-g" ./configure; make; nm */lib*.o | grep freeMagic1 CFLAGS="-O3" ./configure; make; nm */lib*.o | grep freeMagic1 A hard 'T' symbol is emitted (to provide fallback) with all builds, but in the -O3 all usage is inlined. So an individual file can decide to inline or not at the occasion (compile time options) allows.
96 lines
3.2 KiB
C
96 lines
3.2 KiB
C
/*
|
|
* malloc.h --
|
|
*
|
|
* See malloc.c for a description of magic's allocation functions.
|
|
* Magic's built-in malloc() function has been removed.
|
|
*
|
|
* rcsid "$Header: /usr/cvsroot/magic-8.0/utils/malloc.h,v 1.2 2009/09/10 20:32:55 tim Exp $"
|
|
*
|
|
* *********************************************************************
|
|
* * Copyright (C) 1985, 1990 Regents of the University of California. *
|
|
* * Permission to use, copy, modify, and distribute this *
|
|
* * software and its documentation for any purpose and without *
|
|
* * fee is hereby granted, provided that the above copyright *
|
|
* * notice appear in all copies. The University of California *
|
|
* * makes no representations about the suitability of this *
|
|
* * software for any purpose. It is provided "as is" without *
|
|
* * express or implied warranty. Export of this software outside *
|
|
* * of the United States of America may require an export license. *
|
|
* *********************************************************************
|
|
*/
|
|
|
|
#ifndef _MAGIC__UTILS__MALLOC_H
|
|
#define _MAGIC__UTILS__MALLOC_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
/* build time configuration check */
|
|
#if (!defined(SUPPORT_DIRECT_MALLOC) && defined(SUPPORT_REMOVE_MALLOC_LEGACY))
|
|
#error "ERROR: Unspported build configuration SUPPORT_REMOVE_MALLOC_LEGACY is defined but SUPPORT_DIRECT_MALLOC is undefined"
|
|
#endif
|
|
|
|
|
|
#ifdef SUPPORT_DIRECT_MALLOC
|
|
|
|
#define mallocMagic malloc
|
|
#define callocMagic calloc
|
|
#define freeMagic free
|
|
|
|
#else /* SUPPORT_DIRECT_MALLOC */
|
|
|
|
extern void *mallocMagicLegacy(size_t);
|
|
#define mallocMagic(size) mallocMagicLegacy(size)
|
|
|
|
/* renamed like this, so there is no performance loss if the byte count
|
|
* can be computed at compile time.
|
|
*/
|
|
extern void *callocMagicLegacy(size_t);
|
|
#define callocMagic(nmemb, size) callocMagicLegacy((nmemb) * (size))
|
|
|
|
extern void freeMagicLegacy(void *);
|
|
#define freeMagic(ptr) freeMagicLegacy(ptr)
|
|
|
|
#endif /* SUPPORT_DIRECT_MALLOC */
|
|
|
|
|
|
typedef void* free_magic1_t;
|
|
|
|
#ifdef __GNUC_STDC_INLINE__
|
|
/* Provide compiler visibility of STDC 'inline' semantics */
|
|
/*
|
|
* NOTICE: inline form, keep in sync with malloc.c copied
|
|
*/
|
|
inline free_magic1_t freeMagic1_init(void) {
|
|
return NULL;
|
|
}
|
|
inline void freeMagic1(free_magic1_t* m1, void* ptr) {
|
|
if(*m1) /* this if() is here to help inliner remove the call to free() when it can */
|
|
{
|
|
#if (defined(SUPPORT_DIRECT_MALLOC) || defined(SUPPORT_REMOVE_MALLOC_LEGACY))
|
|
free(*m1); /* no need for NULL check with free() */
|
|
#else
|
|
freeMagicLegacy(*m1);
|
|
#endif
|
|
}
|
|
*m1 = ptr;
|
|
}
|
|
inline void freeMagic1_end(free_magic1_t* m1) {
|
|
if(*m1) /* this if() is here to help inliner remove the call to free() when it can */
|
|
{
|
|
#if (defined(SUPPORT_DIRECT_MALLOC) || defined(SUPPORT_REMOVE_MALLOC_LEGACY))
|
|
free(*m1); /* no need for NULL check with free() */
|
|
#else
|
|
freeMagicLegacy(*m1);
|
|
#endif
|
|
}
|
|
}
|
|
#else /* __GNUC_STDC_INLINE__ */
|
|
/* To support older compilers (that don't auto emit based on -O level) */
|
|
extern free_magic1_t freeMagic1_init(void);
|
|
extern void freeMagic1(free_magic1_t* m1, void* ptr);
|
|
extern void freeMagic1_end(free_magic1_t* m1);
|
|
#endif /* __GNUC_STDC_INLINE__ */
|
|
|
|
#endif /* _MAGIC__UTILS__MALLOC_H */
|