wash/mango
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: don't use typedef for enums or non-opaque structs

Browse Source
This commit is contained in:
max 🍓
2023-04-12 20:17:11 +01:00
parent 0d75e347e9
commit b6f8c1ccaa
51 changed files with 663 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
obj/namespace.c
View File

@@ -1,34 +1,34 @@
#include <socks/object.h>
static object_namespace_t *global_ns;
static struct object_namespace *global_ns;
struct object_namespace {
/* root directory set object */
object_t *ns_root;
struct object *ns_root;
};
static kern_status_t ns_query_name(object_t *obj, char out[OBJECT_NAME_MAX])
static kern_status_t ns_query_name(struct object *obj, char out[OBJECT_NAME_MAX])
{
out[0] = '/';
out[1] = 0;
return KERN_OK;
}
static kern_status_t ns_get_child_at(object_t *obj, size_t at, object_t **out)
static kern_status_t ns_get_child_at(struct object *obj, size_t at, struct object **out)
{
object_namespace_t *ns = object_data(obj);
struct object_namespace *ns = object_data(obj);
return object_get_child_at(ns->ns_root, at, out);
}
static kern_status_t ns_get_child_named(object_t *obj, const char *name, object_t **out)
static kern_status_t ns_get_child_named(struct object *obj, const char *name, struct object **out)
{
object_namespace_t *ns = object_data(obj);
struct object_namespace *ns = object_data(obj);
return object_get_child_named(ns->ns_root, name, out);
}
static object_type_t ns_type = {
static struct object_type ns_type = {
.ob_name = "namespace",
.ob_size = sizeof(object_namespace_t),
.ob_size = sizeof(struct object_namespace),
.ob_ops = {
.query_name = ns_query_name,
.get_named = ns_get_child_named,
@@ -43,20 +43,20 @@ void init_global_namespace(void)
global_ns = object_namespace_create();
}
object_namespace_t *global_namespace(void)
struct object_namespace *global_namespace(void)
{
return global_ns;
}
object_namespace_t *object_namespace_create(void)
struct object_namespace *object_namespace_create(void)
{
object_t *ns_object = object_create(&ns_type);
object_namespace_t *ns = object_data(ns_object);
struct object *ns_object = object_create(&ns_type);
struct object_namespace *ns = object_data(ns_object);
ns->ns_root = set_create("/");
return ns;
}
kern_status_t object_namespace_get_object(object_namespace_t *ns, const char *path, object_t **out)
kern_status_t object_namespace_get_object(struct object_namespace *ns, const char *path, struct object **out)
{
return KERN_OK;
}
@@ -93,7 +93,7 @@ static void cleanup_object_path(char *path, size_t len, size_t *parts)
path[final_len] = 0;
}
kern_status_t object_publish(object_namespace_t *ns, const char *path, object_t *obj)
kern_status_t object_publish(struct object_namespace *ns, const char *path, struct object *obj)
{
if (*path != '/') {
return KERN_INVALID_ARGUMENT;
@@ -119,13 +119,13 @@ kern_status_t object_publish(object_namespace_t *ns, const char *path, object_t
char *sp;
char *tok = strtok_r(rpath, "/", &sp);
object_t *cur = ns->ns_root;
struct object *cur = ns->ns_root;
unsigned long flags;
while (tok) {
object_lock(cur, &flags);
object_t *next;
struct object *next;
kern_status_t status = object_get_child_named(cur, tok, &next);
if (status == KERN_NO_ENTRY) {
next = set_create(tok);
@@ -154,7 +154,7 @@ kern_status_t object_publish(object_namespace_t *ns, const char *path, object_t
return set_add_object(cur, obj);
}
kern_status_t object_unpublish(object_namespace_t *ns, object_t *obj)
kern_status_t object_unpublish(struct object_namespace *ns, struct object *obj)
{
return KERN_OK;
}

34
obj/object.c
View File

@@ -4,7 +4,7 @@
#define HAS_OP(obj, opname) ((obj)->ob_type->ob_ops.opname)
static queue_t object_types;
static struct queue object_types;
static spin_lock_t object_types_lock = SPIN_LOCK_INIT;
kern_status_t object_bootstrap(void)
@@ -14,7 +14,7 @@ kern_status_t object_bootstrap(void)
return KERN_OK;
}
kern_status_t object_type_register(object_type_t *p)
kern_status_t object_type_register(struct object_type *p)
{
unsigned long flags;
spin_lock_irqsave(&object_types_lock, &flags);
@@ -22,7 +22,7 @@ kern_status_t object_type_register(object_type_t *p)
spin_unlock_irqrestore(&object_types_lock, flags);
p->ob_cache.c_name = p->ob_name;
p->ob_cache.c_obj_size = sizeof(object_t) + p->ob_size;
p->ob_cache.c_obj_size = sizeof(struct object) + p->ob_size;
p->ob_cache.c_page_order = VM_PAGE_16K;
vm_cache_init(&p->ob_cache);
@@ -31,7 +31,7 @@ kern_status_t object_type_register(object_type_t *p)
return KERN_OK;
}
kern_status_t object_type_unregister(object_type_t *p)
kern_status_t object_type_unregister(struct object_type *p)
{
unsigned long flags;
spin_lock_irqsave(&object_types_lock, &flags);
@@ -41,14 +41,14 @@ kern_status_t object_type_unregister(object_type_t *p)
return KERN_OK;
}
object_t *object_create(object_type_t *type)
struct object *object_create(struct object_type *type)
{
if (!(type->ob_flags & OBJTYPE_INIT)) {
return NULL;
}
vm_cache_t *cache = &type->ob_cache;
object_t *obj = vm_cache_alloc(cache, 0);
struct vm_cache *cache = &type->ob_cache;
struct object *obj = vm_cache_alloc(cache, 0);
if (!obj) {
return NULL;
}
@@ -62,13 +62,13 @@ object_t *object_create(object_type_t *type)
return obj;
}
object_t *object_ref(object_t *obj)
struct object *object_ref(struct object *obj)
{
obj->ob_refcount++;
return obj;
}
void object_deref(object_t *obj)
void object_deref(struct object *obj)
{
unsigned long flags;
spin_lock_irqsave(&obj->ob_lock, &flags);
@@ -92,24 +92,24 @@ void object_deref(object_t *obj)
vm_cache_free(&obj->ob_type->ob_cache, obj);
}
void object_lock(object_t *obj, unsigned long *flags)
void object_lock(struct object *obj, unsigned long *flags)
{
spin_lock_irqsave(&obj->ob_lock, flags);
}
void object_unlock(object_t *obj, unsigned long flags)
void object_unlock(struct object *obj, unsigned long flags)
{
spin_unlock_irqrestore(&obj->ob_lock, flags);
}
void *object_data(object_t *obj)
void *object_data(struct object *obj)
{
return (char *)obj + sizeof *obj;
}
object_t *object_header(void *p)
struct object *object_header(void *p)
{
object_t *obj = (object_t *)((char *)p - sizeof *obj);
struct object *obj = (struct object *)((char *)p - sizeof *obj);
if (obj->ob_magic != OBJECT_MAGIC) {
return NULL;
}
@@ -117,7 +117,7 @@ object_t *object_header(void *p)
return obj;
}
kern_status_t object_get_child_named(object_t *obj, const char *name, object_t **out)
kern_status_t object_get_child_named(struct object *obj, const char *name, struct object **out)
{
kern_status_t status = KERN_UNSUPPORTED;
@@ -128,7 +128,7 @@ kern_status_t object_get_child_named(object_t *obj, const char *name, object_t *
return status;
}
kern_status_t object_get_child_at(object_t *obj, size_t at, object_t **out)
kern_status_t object_get_child_at(struct object *obj, size_t at, struct object **out)
{
kern_status_t status = KERN_UNSUPPORTED;
@@ -139,7 +139,7 @@ kern_status_t object_get_child_at(object_t *obj, size_t at, object_t **out)
return status;
}
kern_status_t object_query_name(object_t *obj, char name[OBJECT_NAME_MAX])
kern_status_t object_query_name(struct object *obj, char name[OBJECT_NAME_MAX])
{
if (HAS_OP(obj, query_name)) {
return obj->ob_type->ob_ops.query_name(obj, name);

26
obj/set.c
View File

@@ -1,11 +1,11 @@
#include <socks/object.h>
struct set {
queue_t s_list;
struct queue s_list;
char s_name[OBJECT_NAME_MAX];
};
static kern_status_t set_query_name(object_t *obj, char out[OBJECT_NAME_MAX])
static kern_status_t set_query_name(struct object *obj, char out[OBJECT_NAME_MAX])
{
struct set *set = object_data(obj);
strncpy(out, set->s_name, OBJECT_NAME_MAX - 1);
@@ -14,11 +14,11 @@ static kern_status_t set_query_name(object_t *obj, char out[OBJECT_NAME_MAX])
return KERN_OK;
}
static kern_status_t set_get_child_at(object_t *obj, size_t at, object_t **out)
static kern_status_t set_get_child_at(struct object *obj, size_t at, struct object **out)
{
struct set *set = object_data(obj);
size_t i = 0;
queue_foreach(object_t, child, &set->s_list, ob_list) {
queue_foreach(struct object, child, &set->s_list, ob_list) {
if (i == at) {
*out = object_ref(child);
return KERN_OK;
@@ -30,12 +30,12 @@ static kern_status_t set_get_child_at(object_t *obj, size_t at, object_t **out)
return KERN_NO_ENTRY;
}
static kern_status_t set_get_child_named(object_t *obj, const char *name, object_t **out)
static kern_status_t set_get_child_named(struct object *obj, const char *name, struct object **out)
{
struct set *set = object_data(obj);
char child_name[OBJECT_NAME_MAX];
queue_foreach(object_t, child, &set->s_list, ob_list) {
queue_foreach(struct object, child, &set->s_list, ob_list) {
kern_status_t status = object_query_name(child, child_name);
if (status != KERN_OK) {
continue;
@@ -50,7 +50,7 @@ static kern_status_t set_get_child_named(object_t *obj, const char *name, object
return KERN_NO_ENTRY;
}
static object_type_t set_type = {
static struct object_type set_type = {
.ob_name = "set",
.ob_size = sizeof(struct set),
.ob_ops = {
@@ -65,9 +65,9 @@ void init_set_objects(void)
object_type_register(&set_type);
}
object_t *set_create(const char *name)
struct object *set_create(const char *name)
{
object_t *set_obj = object_create(&set_type);
struct object *set_obj = object_create(&set_type);
if (!set_obj) {
return NULL;
}
@@ -80,7 +80,7 @@ object_t *set_create(const char *name)
return set_obj;
}
kern_status_t set_add_object(object_t *set_obj, object_t *obj)
kern_status_t set_add_object(struct object *set_obj, struct object *obj)
{
if (!object_is_set(set_obj)) {
return KERN_INVALID_ARGUMENT;
@@ -96,7 +96,7 @@ kern_status_t set_add_object(object_t *set_obj, object_t *obj)
return status;
}
queue_foreach (object_t, child, &set->s_list, ob_list) {
queue_foreach (struct object, child, &set->s_list, ob_list) {
object_query_name(child, child_name);
if (!strcmp(child_name, obj_name)) {
@@ -109,7 +109,7 @@ kern_status_t set_add_object(object_t *set_obj, object_t *obj)
return KERN_OK;
}
kern_status_t set_remove_object(object_t *set_obj, object_t *obj)
kern_status_t set_remove_object(struct object *set_obj, struct object *obj)
{
if (!object_is_set(set_obj)) {
return KERN_INVALID_ARGUMENT;
@@ -122,7 +122,7 @@ kern_status_t set_remove_object(object_t *set_obj, object_t *obj)
return KERN_OK;
}
bool object_is_set(object_t *obj)
bool object_is_set(struct object *obj)
{
return obj->ob_type == &set_type;
}