Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make this smaller.

This commit is contained in:
christos 2017-01-12 01:02:09 +00:00
parent b722e4222b
commit 227c2c0795
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/libc/stdlib/malloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: malloc.c,v 1.56 2014/09/18 13:58:20 christos Exp $ */
/* $NetBSD: malloc.c,v 1.57 2017/01/12 01:02:09 christos Exp $ */
/*
* ----------------------------------------------------------------------------
@ -84,21 +84,27 @@ void utrace(struct ut *, int);
#include <sys/types.h>
#if defined(__NetBSD__)
# define malloc_minsize 16U
# define HAS_UTRACE
# define UTRACE_LABEL "malloc",
#include <sys/cdefs.h>
#include "extern.h"
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: malloc.c,v 1.56 2014/09/18 13:58:20 christos Exp $");
#endif /* LIBC_SCCS and not lint */
# define malloc_minsize 16U
# ifdef _LIBC
# define HAS_UTRACE
# define UTRACE_LABEL "malloc",
int utrace(const char *, void *, size_t);
#include <reentrant.h>
# endif
# include <sys/cdefs.h>
# include "extern.h"
# if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: malloc.c,v 1.57 2017/01/12 01:02:09 christos Exp $");
# endif /* LIBC_SCCS and not lint */
# include <reentrant.h>
# ifdef _REENTRANT
extern int __isthreaded;
static mutex_t thread_lock = MUTEX_INITIALIZER;
#define _MALLOC_LOCK() if (__isthreaded) mutex_lock(&thread_lock);
#define _MALLOC_UNLOCK() if (__isthreaded) mutex_unlock(&thread_lock);
# define _MALLOC_LOCK() if (__isthreaded) mutex_lock(&thread_lock);
# define _MALLOC_UNLOCK() if (__isthreaded) mutex_unlock(&thread_lock);
# else
# define _MALLOC_LOCK()
# define _MALLOC_UNLOCK()
# endif
#endif /* __NetBSD__ */
#if defined(__sparc__) && defined(sun)
@ -472,8 +478,10 @@ malloc_init(void)
continue;
b[j] = '\0';
p = b;
#ifdef _LIBC
} else if (i == 1 && issetugid() == 0) {
p = getenv("MALLOC_OPTIONS");
#endif
} else if (i == 1) {
continue;
} else {