JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add plugs for thread-safety, requested by Jonathan Schleifer

Browse Source 
example:
#define AALLOC_THREAD_ENTER(ap)	@synchronized(aalloc_guard) {
#define AALLOC_THREAD_LEAVE(ap)	}

notes:
• you must declare and define eventual guard objects yourself
• while there will not be any direct “return” calls inside the
  locked area, AALLOC_ABORT and AALLOC_WARN may be called
• AALLOC_RANDOM does not need to be thread-safe, but malloc
  and free should be; if “ap” is used for locking, all functions
  called must be thread-safe though
This commit is contained in:
tg 2008-11-15 07:51:53 +00:00
parent 32e1ecf5b3
commit 24a23d52d8
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
aalloc.c
View File

@ -1,6 +1,6 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/aalloc.c,v 1.26 2008/11/15 07:35:23 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/aalloc.c,v 1.27 2008/11/15 07:51:53 tg Exp $");
/* mksh integration of aalloc */ /* mksh integration of aalloc */
@ -12,6 +12,11 @@ __RCSID("$MirOS: src/bin/mksh/aalloc.c,v 1.26 2008/11/15 07:35:23 tg Exp $");
#define AALLOC_WARN internal_warningf #define AALLOC_WARN internal_warningf
#endif #endif
#ifndef AALLOC_THREAD_ENTER
#define AALLOC_THREAD_ENTER(ap) /* nothing */
#define AALLOC_THREAD_LEAVE(ap) /* nothing */
#endif
#define AALLOC_LEAK_SILENT /* the code does not yet clean up at exit */ #define AALLOC_LEAK_SILENT /* the code does not yet clean up at exit */
#ifndef AALLOC_RANDOM #ifndef AALLOC_RANDOM
@ -143,6 +148,8 @@ anew(size_t hint)
PArea ap; PArea ap;
PBlock bp; PBlock bp;
AALLOC_THREAD_ENTER(NULL)
#ifdef AALLOC_MPROTECT #ifdef AALLOC_MPROTECT
if (!pagesz) { if (!pagesz) {
if ((pagesz = sysconf(_SC_PAGESIZE)) == -1 || if ((pagesz = sysconf(_SC_PAGESIZE)) == -1 ||
@ -214,6 +221,7 @@ anew(size_t hint)
track = ap; track = ap;
#endif #endif
AALLOC_DENY(bp); AALLOC_DENY(bp);
AALLOC_THREAD_LEAVE(NULL)
return (ap); return (ap);
} }
@ -335,6 +343,8 @@ adelete(PArea *pap)
#endif #endif
PBlock bp; PBlock bp;
AALLOC_THREAD_ENTER(*pap)
/* ignore invalid areas */ /* ignore invalid areas */
if ((bp = check_bp(*pap, "adelete", 0)) != NULL) { if ((bp = check_bp(*pap, "adelete", 0)) != NULL) {
if (bp->last != (char *)&bp->storage) if (bp->last != (char *)&bp->storage)
@ -375,6 +385,7 @@ adelete(PArea *pap)
*pap); *pap);
adelete_tracked: adelete_tracked:
#endif #endif
AALLOC_THREAD_LEAVE(*pap)
free(*pap); free(*pap);
*pap = NULL; *pap = NULL;
} }
@ -389,6 +400,8 @@ alloc(size_t nmemb, size_t size, PArea ap)
safe_muladd(nmemb, size, sizeof (TPtr)); safe_muladd(nmemb, size, sizeof (TPtr));
safe_malloc(ptr, size); safe_malloc(ptr, size);
AALLOC_THREAD_ENTER(ap)
/* chain into area */ /* chain into area */
if ((bp = check_bp(ap, "alloc", 0)) == NULL) if ((bp = check_bp(ap, "alloc", 0)) == NULL)
AALLOC_ABORT("cannot continue"); AALLOC_ABORT("cannot continue");
@ -418,6 +431,7 @@ alloc(size_t nmemb, size_t size, PArea ap)
ptr->iv ^= bp->cookie; /* apply block cookie */ ptr->iv ^= bp->cookie; /* apply block cookie */
bp->last += PVALIGN; /* advance next-avail pointer */ bp->last += PVALIGN; /* advance next-avail pointer */
AALLOC_DENY(bp); AALLOC_DENY(bp);
AALLOC_THREAD_LEAVE(ap)
/* return aligned storage just after the cookied backpointer */ /* return aligned storage just after the cookied backpointer */
return ((char *)ptr + PVALIGN); return ((char *)ptr + PVALIGN);
@ -432,6 +446,8 @@ aresize(void *vp, size_t nmemb, size_t size, PArea ap)
if (vp == NULL) if (vp == NULL)
return (alloc(nmemb, size, ap)); return (alloc(nmemb, size, ap));
AALLOC_THREAD_ENTER(ap)
/* validate allocation and backpointer against forward pointer */ /* validate allocation and backpointer against forward pointer */
if ((ptr = check_ptr(vp, ap, &bp, "aresize", "")) == NULL) if ((ptr = check_ptr(vp, ap, &bp, "aresize", "")) == NULL)
AALLOC_ABORT("cannot continue"); AALLOC_ABORT("cannot continue");
@ -445,6 +461,7 @@ aresize(void *vp, size_t nmemb, size_t size, PArea ap)
/* apply the cookie on the backpointer again */ /* apply the cookie on the backpointer again */
ptr->iv ^= bp->cookie; ptr->iv ^= bp->cookie;
AALLOC_DENY(bp); AALLOC_DENY(bp);
AALLOC_THREAD_LEAVE(ap)
return ((char *)ptr + PVALIGN); return ((char *)ptr + PVALIGN);
} }
@ -506,9 +523,11 @@ afree(void *vp, PArea ap)
if (vp == NULL) if (vp == NULL)
return; return;
AALLOC_THREAD_ENTER(ap)
/* validate allocation and backpointer, ignore rogues */ /* validate allocation and backpointer, ignore rogues */
if ((ptr = check_ptr(vp, ap, &bp, "afree", ", ignoring")) == NULL) if ((ptr = check_ptr(vp, ap, &bp, "afree", ", ignoring")) == NULL)
return; goto afree_done;
/* note: the block allocation does not ever shrink */ /* note: the block allocation does not ever shrink */
bp->last -= PVALIGN; /* mark the last forward pointer as free */ bp->last -= PVALIGN; /* mark the last forward pointer as free */
@ -526,5 +545,7 @@ afree(void *vp, PArea ap)
free(ptr); free(ptr);
AALLOC_DENY(bp); AALLOC_DENY(bp);
afree_done:
AALLOC_THREAD_LEAVE(ap)
return; return;
} }