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

libc: introduce "jehanne_" namespace

Browse Source 
With this commit all functions declared in libc.h have been renamed
with the "jehanne_" prefix. This is done for several reason:

- it removes conflicts during symbol resolution when linking
  standard C libraries like newlib or musl
- it allows programs depending on a standard C library to directly
  link to a library depending on our non standard libc (eg libsec).

To ease transiction two files are provided:

- sys/include/lib9.h that can be included instead of <libc.h> to use
  the old names (via a simple set of macros)
- sys/src/lib/c/lib9.c that can be compiled with a program where the
  macro provided by lib9.h are too dumb (see for example rc or grep).

In the kernel port/lib.h has been modified accordingly and some of
the functions it directly provides has been renamed too (eg malloc
in qmalloc.c and print in devcons.c).
This commit is contained in:
Giacomo Tesio
2017-04-19 23:33:14 +02:00
parent d38f7bb488
commit e70feee4a3
1195 changed files with 8385 additions and 7803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sys/src/kern/port/allocb.c
View File

@ -28,7 +28,7 @@ _allocb(int size, int align)
if(align <= 0)
align = BLOCKALIGN;
n = align + ROUNDUP(size+Hdrspc, align) + sizeof(Block);
if((p = malloc(n)) == nil)
if((p = jehanne_malloc(n)) == nil)
return nil;
b = (Block*)(p + n - sizeof(Block)); /* block at end of allocated space */
@ -66,7 +66,7 @@ allocb(int size)
mallocsummary();
panic("allocb: no memory for %d bytes\n", size);
}
setmalloctag(b->base, getcallerpc());
jehanne_setmalloctag(b->base, getcallerpc());
return b;
}
@ -86,7 +86,7 @@ allocbalign(int size, int align)
mallocsummary();
panic("allocbalign: no memory for %d bytes\n", size);
}
setmalloctag(b->base, getcallerpc());
jehanne_setmalloctag(b->base, getcallerpc());
return b;
}
@ -127,7 +127,7 @@ iallocb(int size)
return nil;
}
b->flag = BINTR;
setmalloctag(b->base, getcallerpc());
jehanne_setmalloctag(b->base, getcallerpc());
ilock(&ialloc);
ialloc.bytes += b->lim - b->base;
@ -168,7 +168,7 @@ freeb(Block *b)
b->lim = dead;
b->base = dead;
free(p);
jehanne_free(p);
}
void
@ -180,9 +180,9 @@ checkb(Block *b, char *msg)
panic("checkb b %s %#p", msg, b);
if(b->base == dead || b->lim == dead || b->next == dead
|| b->rp == dead || b->wp == dead){
print("checkb: base %#p lim %#p next %#p\n",
jehanne_print("checkb: base %#p lim %#p next %#p\n",
b->base, b->lim, b->next);
print("checkb: rp %#p wp %#p\n", b->rp, b->wp);
jehanne_print("checkb: rp %#p wp %#p\n", b->rp, b->wp);
panic("checkb dead: %s\n", msg);
}
@ -201,5 +201,5 @@ checkb(Block *b, char *msg)
void
iallocsummary(void)
{
print("ialloc %lud/%lud\n", ialloc.bytes, ialloc.limit);
jehanne_print("ialloc %lud/%lud\n", ialloc.bytes, ialloc.limit);
}