kamkow1/mop3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Environments now belong to procgroups, modify env_set () and env_get () accordingly
All checks were successful
Build documentation / build-and-deploy (push) Successful in 3m9s
Details

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-03-17 21:52:12 +01:00
parent 0b85d3a0da
commit 090a4e46ea
7 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
kernel/proc/env.c
View File

@@ -6,12 +6,12 @@
#include <libk/string.h>
#include <mm/malloc.h>
#include <proc/env.h>
#include <proc/proc.h>
#include <proc/procgroup.h>
#include <status.h>
void proc_env_cleanup (struct proc* proc) {
void proc_env_cleanup (struct procgroup* procgroup) {
for (size_t i = 0; i < fieldlengthof (struct proc_env, env_var_buckets); i++) {
struct hash_node_link* link = proc->env.env_var_buckets[i];
struct hash_node_link* link = procgroup->env.env_var_buckets[i];
if (link == NULL)
continue;
@@ -23,8 +23,8 @@ void proc_env_cleanup (struct proc* proc) {
}
}
int proc_env_set (struct proc* proc, const char* key, void* buffer, size_t data_size) {
uint64_t fp;
int proc_env_set (struct procgroup* procgroup, const char* key, void* buffer, size_t data_size) {
uint64_t fpg;
struct proc_env_var* var = malloc (sizeof (*var));
@@ -46,30 +46,30 @@ int proc_env_set (struct proc* proc, const char* key, void* buffer, size_t data_
uint32_t env_hash = hash_fnv32 (var->key, strlen_null (var->key));
spin_lock (&proc->lock, &fp);
spin_lock (&procgroup->lock, &fpg);
hash_insert (&proc->env, &var->env_link, env_hash, lengthof (proc->env.env_var_buckets),
hash_insert (&procgroup->env, &var->env_link, env_hash, lengthof (procgroup->env.env_var_buckets),
env_var_buckets);
spin_unlock (&proc->lock, fp);
spin_unlock (&procgroup->lock, fpg);
return ST_OK;
}
int proc_env_get (struct proc* proc, const char* key, void* buffer, size_t size) {
uint64_t fp;
int proc_env_get (struct procgroup* procgroup, const char* key, void* buffer, size_t size) {
uint64_t fpg;
struct hash_node_link* found_link = NULL;
size_t key_len = strlen_null (key);
uint32_t hash = hash_fnv32 (key, key_len);
spin_lock (&proc->lock, &fp);
spin_lock (&procgroup->lock, &fpg);
hash_find (&proc->env, key, key_len, hash, lengthof (proc->env.env_var_buckets), env_var_buckets,
struct proc_env_var, env_link, key, found_link);
hash_find (&procgroup->env, key, key_len, hash, lengthof (procgroup->env.env_var_buckets),
env_var_buckets, struct proc_env_var, env_link, key, found_link);
if (found_link == NULL) {
spin_unlock (&proc->lock, fp);
spin_unlock (&procgroup->lock, fpg);
return -ST_NOT_FOUND;
}
@@ -77,7 +77,7 @@ int proc_env_get (struct proc* proc, const char* key, void* buffer, size_t size)
memcpy (buffer, var->buffer, min (size, var->data_size));
spin_unlock (&proc->lock, fp);
spin_unlock (&procgroup->lock, fpg);
return ST_OK;
}