xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel: remove ucalloc.c duplicates

Browse source
This commit is contained in:
cinap_lenrek 2021-03-13 14:57:53 +01:00
parent 7c62c12701
commit 3841a46421
5 changed files with 3 additions and 273 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
sys/src/9/kw/ucalloc.c
View file

@ -1,135 +0,0 @@
/*
* allocate uncached memory
*/
#include "u.h"
#include "../port/lib.h"
#include "mem.h"
#include "dat.h"
#include "fns.h"
#include <pool.h>
typedef struct Private Private;
struct Private {
Lock;
char msg[256];
char* cur;
};
static Private ucprivate;
static void
ucpoolpanic(Pool* p, char* fmt, ...)
{
va_list v;
Private *pv;
char msg[sizeof pv->msg];
pv = p->private;
va_start(v, fmt);
vseprint(pv->cur, &pv->msg[sizeof pv->msg], fmt, v);
va_end(v);
memmove(msg, pv->msg, sizeof msg);
iunlock(pv);
panic("%s", msg);
}
static void
ucpoolprint(Pool* p, char* fmt, ...)
{
va_list v;
Private *pv;
pv = p->private;
va_start(v, fmt);
pv->cur = vseprint(pv->cur, &pv->msg[sizeof pv->msg], fmt, v);
va_end(v);
}
static void
ucpoolunlock(Pool* p)
{
Private *pv;
char msg[sizeof pv->msg];
pv = p->private;
if(pv->cur == pv->msg){
iunlock(pv);
return;
}
memmove(msg, pv->msg, sizeof msg);
pv->cur = pv->msg;
iunlock(pv);
iprint("%.*s", sizeof pv->msg, msg);
}
static void
ucpoollock(Pool* p)
{
Private *pv;
pv = p->private;
ilock(pv);
pv->pc = getcallerpc(&p);
pv->cur = pv->msg;
}
static void*
ucarena(usize size)
{
void *uv, *v;
assert(size == 1*MiB);
mainmem->maxsize += 1*MiB;
if((v = mallocalign(1*MiB, 1*MiB, 0, 0)) == nil ||
(uv = mmuuncache(v, 1*MiB)) == nil){
free(v);
mainmem->maxsize -= 1*MiB;
return nil;
}
return uv;
}
static Pool ucpool = {
.name = "Uncached",
.maxsize = 4*MiB,
.minarena = 1*MiB-32,
.quantum = 32,
.alloc = ucarena,
.merge = nil,
.flags = /*POOL_TOLERANCE|POOL_ANTAGONISM|POOL_PARANOIA|*/0,
.lock = ucpoollock,
.unlock = ucpoolunlock,
.print = ucpoolprint,
.panic = ucpoolpanic,
.private = &ucprivate,
};
void
ucfree(void* v)
{
if(v == nil)
return;
poolfree(&ucpool, v);
}
void*
ucalloc(usize size)
{
assert(size < ucpool.minarena-128);
return poolallocalign(&ucpool, size, 32, 0, 0);
}
void*
ucallocalign(usize size, int align, usize span)
{
assert(size < ucpool.minarena-128);
return poolallocalign(&ucpool, size, align, 0, span);
}

2
sys/src/9/omap/fns.h
View file

@ -125,7 +125,7 @@ uintptr mmukmap(uintptr, uintptr, usize);
uintptr mmukunmap(uintptr, uintptr, usize);
extern void* mmuuncache(void*, usize);
extern void* ucalloc(usize);
extern void* ucallocalign(usize size, int align, int span);
extern void* ucallocalign(usize size, int align, usize span);
extern void ucfree(void*);
/*

135
sys/src/9/omap/ucalloc.c
View file

@ -1,135 +0,0 @@
/*
* allocate uncached memory
*/
#include "u.h"
#include "../port/lib.h"
#include "mem.h"
#include "dat.h"
#include "fns.h"
#include <pool.h>
typedef struct Private Private;
struct Private {
Lock;
char msg[256];
char* cur;
};
static Private ucprivate;
static void
ucpoolpanic(Pool* p, char* fmt, ...)
{
va_list v;
Private *pv;
char msg[sizeof pv->msg];
pv = p->private;
va_start(v, fmt);
vseprint(pv->cur, &pv->msg[sizeof pv->msg], fmt, v);
va_end(v);
memmove(msg, pv->msg, sizeof msg);
iunlock(pv);
panic("%s", msg);
}
static void
ucpoolprint(Pool* p, char* fmt, ...)
{
va_list v;
Private *pv;
pv = p->private;
va_start(v, fmt);
pv->cur = vseprint(pv->cur, &pv->msg[sizeof pv->msg], fmt, v);
va_end(v);
}
static void
ucpoolunlock(Pool* p)
{
Private *pv;
char msg[sizeof pv->msg];
pv = p->private;
if(pv->cur == pv->msg){
iunlock(pv);
return;
}
memmove(msg, pv->msg, sizeof msg);
pv->cur = pv->msg;
iunlock(pv);
iprint("%.*s", sizeof pv->msg, msg);
}
static void
ucpoollock(Pool* p)
{
Private *pv;
pv = p->private;
ilock(pv);
pv->pc = getcallerpc(&p);
pv->cur = pv->msg;
}
static void*
ucarena(usize size)
{
void *uv, *v;
assert(size == 1*MiB);
mainmem->maxsize += 1*MiB;
if((v = mallocalign(1*MiB, 1*MiB, 0, 0)) == nil ||
(uv = mmuuncache(v, 1*MiB)) == nil){
free(v);
mainmem->maxsize -= 1*MiB;
return nil;
}
return uv;
}
static Pool ucpool = {
.name = "Uncached",
.maxsize = 4*MiB,
.minarena = 1*MiB-32,
.quantum = 32,
.alloc = ucarena,
.merge = nil,
.flags = /*POOL_TOLERANCE|POOL_ANTAGONISM|POOL_PARANOIA|*/0,
.lock = ucpoollock,
.unlock = ucpoolunlock,
.print = ucpoolprint,
.panic = ucpoolpanic,
.private = &ucprivate,
};
void
ucfree(void* v)
{
if(v == nil)
return;
poolfree(&ucpool, v);
}
void*
ucalloc(usize size)
{
assert(size < ucpool.minarena-128);
return poolallocalign(&ucpool, size, 32, 0, 0);
}
void*
ucallocalign(usize size, int align, int span)
{
assert(size < ucpool.minarena-128);
return poolallocalign(&ucpool, size, align, 0, span);
}

2
sys/src/9/port/ucalloc.c
View file

@ -119,7 +119,7 @@ ucfree(void* v)
}
void*
ucallocalign(usize size, int align, int span)
ucallocalign(usize size, int align, usize span)
{
void *v;

2
sys/src/9/teg2/fns.h
View file

@ -164,7 +164,7 @@ uintptr mmukmap(uintptr, uintptr, usize);
uintptr mmukunmap(uintptr, uintptr, usize);
extern void* mmuuncache(void*, usize);
extern void* ucalloc(usize);
extern void* ucallocalign(usize size, int align, int span);
extern void* ucallocalign(usize size, int align, usize span);
extern void ucfree(void*);
/*