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

42
kernel/syscall/syscall.c
View File

@@ -651,7 +651,7 @@ DEFINE_SYSCALL (sys_describe) {
/* int get_procgroup (int pid) */
DEFINE_SYSCALL (sys_get_procgroup) {
uint64_t fp;
uint64_t fp, fpg;
int pid = (int)a1;
@@ -661,9 +661,13 @@ DEFINE_SYSCALL (sys_get_procgroup) {
return SYSRESULT (-ST_NOT_FOUND);
spin_lock (&target_proc->lock, &fp);
int pgid = target_proc->procgroup->pgid;
struct procgroup* procgroup = target_proc->procgroup;
spin_unlock (&target_proc->lock, fp);
spin_lock (&procgroup->lock, &fpg);
int pgid = procgroup->pgid;
spin_unlock (&procgroup->lock, fpg);
return SYSRESULT (pgid);
}
@@ -932,28 +936,27 @@ DEFINE_SYSCALL (sys_create_volume) {
return SYSRESULT (vfs_create_volume (proc, rctx, key, type, device, false));
}
/* int env_set (int pid, char* key, void* buffer, size_t size) */
/* int env_set (int pgid, char* key, void* buffer, size_t size) */
DEFINE_SYSCALL (sys_env_set) {
uint64_t fp, fpg;
int pid = (int)a1;
int pgid = (int)a1;
uintptr_t uvaddr_key = a2;
uintptr_t uvaddr_buffer = a3;
size_t size = (size_t)a4;
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
struct proc* target_proc = proc_find_pid (pid);
struct procgroup* target_procgroup = procgroup_find (pgid);
if (target_proc == NULL) {
if (target_procgroup == NULL)
return SYSRESULT (-ST_NOT_FOUND);
}
uintptr_t out_paddr;
spin_lock (&target_proc->lock, &fp);
struct procgroup* procgroup = target_proc->procgroup;
spin_unlock (&target_proc->lock, fp);
spin_lock (&proc->lock, &fp);
struct procgroup* procgroup = proc->procgroup;
spin_unlock (&proc->lock, fp);
spin_lock (&procgroup->lock, &fpg);
@@ -973,31 +976,30 @@ DEFINE_SYSCALL (sys_env_set) {
if (buffer == NULL)
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
return SYSRESULT (proc_env_set (target_proc, key, buffer, size));
return SYSRESULT (proc_env_set (target_procgroup, key, buffer, size));
}
/* int env_get (int pid, char* key, void* buffer, size_t size) */
/* int env_get (int pgid, char* key, void* buffer, size_t size) */
DEFINE_SYSCALL (sys_env_get) {
uint64_t fp, fpg;
int pid = (int)a1;
int pgid = (int)a1;
uintptr_t uvaddr_key = a2;
uintptr_t uvaddr_buffer = a3;
size_t size = (size_t)a4;
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
struct proc* target_proc = proc_find_pid (pid);
struct procgroup* target_procgroup = procgroup_find (pgid);
if (target_proc == NULL) {
if (target_procgroup == NULL)
return SYSRESULT (-ST_NOT_FOUND);
}
uintptr_t out_paddr;
spin_lock (&target_proc->lock, &fp);
struct procgroup* procgroup = target_proc->procgroup;
spin_unlock (&target_proc->lock, fp);
spin_lock (&proc->lock, &fp);
struct procgroup* procgroup = proc->procgroup;
spin_unlock (&proc->lock, fp);
spin_lock (&procgroup->lock, &fpg);
@@ -1017,7 +1019,7 @@ DEFINE_SYSCALL (sys_env_get) {
if (buffer == NULL)
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
return SYSRESULT (proc_env_set (target_proc, key, buffer, size));
return SYSRESULT (proc_env_set (target_procgroup, key, buffer, size));
}
static syscall_handler_func_t handler_table[] = {