Environments now belong to procgroups, modify env_set () and env_get () accordingly

kernel/proc/env.c

@@ -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;
 }

kernel/proc/env.h

@@ -6,7 +6,7 @@
 
 #define PROC_ENV_VAR_MAX 128
 
-struct proc;
+struct procgroup;
 
 struct proc_env_var {
   char key[PROC_ENV_VAR_MAX];
@@ -19,10 +19,10 @@ struct proc_env {
   struct hash_node_link* env_var_buckets[64];
 };
 
-void proc_env_cleanup (struct proc* proc);
+void proc_env_cleanup (struct procgroup* procgroup);
 
-int proc_env_set (struct proc* proc, const char* key, void* buffer, size_t data_size);
+int proc_env_set (struct procgroup* procgroup, const char* key, void* buffer, size_t data_size);
 
-int proc_env_get (struct proc* proc, const char* key, void* buffer, size_t size);
+int proc_env_get (struct procgroup* procgroup, const char* key, void* buffer, size_t size);
 
 #endif // _KERNEL_PROC_ENV_H

kernel/proc/proc.h

@@ -7,7 +7,6 @@
 #include <libk/rbtree.h>
 #include <libk/std.h>
 #include <path_defs.h>
-#include <proc/env.h>
 #include <proc/procgroup.h>
 #include <proc/resource.h>
 #include <proc/suspension_q.h>
@@ -51,7 +50,6 @@ struct proc {
   size_t mail_recv_size;
   char cwv[VOLUME_MAX];
   struct proc_suspension_q done_sq;
-  struct proc_env env;
 };
 
 void proc_sched (bool user);

kernel/proc/procgroup.c

@@ -5,6 +5,7 @@
 #include <libk/string.h>
 #include <mm/malloc.h>
 #include <mm/pmm.h>
+#include <proc/env.h>
 #include <proc/proc.h>
 #include <proc/procgroup.h>
 #include <proc/reschedule.h>
@@ -238,6 +239,8 @@ static void procgroup_delete (struct procgroup* procgroup, struct reschedule_ctx
     free (mapping);
   }
 
+  proc_env_cleanup (procgroup);
+
   pmm_free (procgroup->pd.cr3_paddr, 1);
 
   free (procgroup->tls.tls_tmpl);

kernel/proc/procgroup.h

@@ -5,6 +5,7 @@
 #include <libk/list.h>
 #include <libk/rbtree.h>
 #include <libk/std.h>
+#include <proc/env.h>
 #include <proc/resource.h>
 #include <sync/spin_lock.h>
 #include <sys/mm.h>
@@ -35,6 +36,7 @@ struct procgroup {
   struct list_node_link* mappings;
   uintptr_t map_base;
   struct procgroup_tls tls;
+  struct proc_env env;
 };
 
 struct procgroup* procgroup_create (void);