Use valueshashtable for modules and remove atomshashtable

Change signature of `globalcontext_get_module` to get an `atom_index_t` to
refer to a given module.

Signed-off-by: Paul Guyot <pguyot@kallisys.net>

Author: pguyot

src/libAtomVM/CMakeLists.txt

@@ -23,7 +23,6 @@ project (libAtomVM)
 
 set(HEADER_FILES
     atom.h
-    atomshashtable.h
     atom_table.h
     avmpack.h
     bif.h
@@ -75,7 +74,6 @@ set(HEADER_FILES
 
 set(SOURCE_FILES
     atom.c
-    atomshashtable.c
     atom_table.c
     avmpack.c
     bif.c

src/libAtomVM/atom_table.c

@@ -267,6 +267,30 @@ atom_ref_t atom_table_get_atom_ptr_and_len(struct AtomTable *table, atom_index_t
     return node;
 }
 
+char *atom_table_atom_to_new_cstring(struct AtomTable *table, atom_index_t atom_index, const char *suffix)
+{
+    AtomString atom_string = atom_table_get_atom_string(table, atom_index);
+    size_t atom_len = atom_string_len(atom_string);
+    const uint8_t *atom_data = atom_string_data(atom_string);
+    size_t suffix_len = 0;
+    if (suffix) {
+        suffix_len = strlen(suffix);
+    }
+
+    char *result = malloc(atom_len + suffix_len + 1);
+    if (IS_NULL_PTR(result)) {
+        return NULL;
+    }
+
+    memcpy(result, atom_data, atom_len);
+    if (suffix) {
+        memcpy(result + atom_len, suffix, suffix_len);
+    }
+    result[atom_len + suffix_len] = 0;
+
+    return result;
+}
+
 bool atom_table_is_atom_ref_ascii(struct AtomTable *table, atom_ref_t atom)
 {
     SMP_RDLOCK(table);

src/libAtomVM/atom_table.h

@@ -77,6 +77,18 @@ void atom_table_write_bytes(struct AtomTable *table, atom_ref_t atom, size_t buf
 void atom_table_write_cstring(
     struct AtomTable *table, atom_ref_t atom, size_t buf_len, char *outbuf);
 
+/**
+ * @brief Allocate a new C string with malloc with the representation of
+ * an atom
+ *
+ * @param   table atom table
+ * @param   atom_index index of the atom to get the representation of
+ * @param   suffix suffix to append to atom name or NULL of none
+ * @return a newly allocated string with the representation of the atom or
+ * NULL if allocation failed or atom index doesn't exist
+ */
+char *atom_table_atom_to_new_cstring(struct AtomTable *table, atom_index_t atom_index, const char *suffix);
+
 #ifdef __cplusplus
 }
 #endif

src/libAtomVM/atomshashtable.c

@@ -25,7 +25,6 @@
 #include "globalcontext.h"
 
 #include "atom_table.h"
-#include "atomshashtable.h"
 #include "avmpack.h"
 #include "context.h"
 #include "defaultatoms.h"
@@ -98,7 +97,7 @@ GlobalContext *globalcontext_new()
 
     glb->modules_by_index = NULL;
     glb->loaded_modules_count = 0;
-    glb->modules_table = atomshashtable_new();
+    glb->modules_table = valueshashtable_new();
     if (IS_NULL_PTR(glb->modules_table)) {
         atom_table_destroy(glb->atom_table);
         free(glb);
@@ -637,9 +636,9 @@ term globalcontext_existing_term_from_atom_string(GlobalContext *glb, AtomString
 
 int globalcontext_insert_module(GlobalContext *global, Module *module)
 {
+    term module_name = module_get_name(module);
     SMP_RWLOCK_WRLOCK(global->modules_lock);
-    AtomString module_name_atom = module_get_atom_string_by_id(module, 1, global);
-    if (!atomshashtable_insert(global->modules_table, module_name_atom, TO_ATOMSHASHTABLE_VALUE(module))) {
+    if (!valueshashtable_insert(global->modules_table, term_to_atom_index(module_name), TO_VALUESHASHTABLE_VALUE(module))) {
         SMP_RWLOCK_UNLOCK(global->modules_lock);
         return -1;
     }
@@ -695,18 +694,15 @@ Module *globalcontext_load_module_from_avm(GlobalContext *global, const char *mo
     return new_module;
 }
 
-Module *globalcontext_get_module(GlobalContext *global, AtomString module_name_atom)
+Module *globalcontext_get_module(GlobalContext *global, atom_index_t module_name_atom)
 {
-    Module *found_module = (Module *) atomshashtable_get_value(global->modules_table, module_name_atom, (unsigned long) NULL);
+    Module *found_module = (Module *) valueshashtable_get_value(global->modules_table, module_name_atom, TO_VALUESHASHTABLE_VALUE(NULL));
 
     if (!found_module) {
-        char *module_name = malloc(256 + 5);
+        char *module_name = atom_table_atom_to_new_cstring(global->atom_table, module_name_atom, ".beam");
         if (IS_NULL_PTR(module_name)) {
             return NULL;
         }
-
-        atom_string_to_c(module_name_atom, module_name, 256);
-        strcat(module_name, ".beam");
         Module *loaded_module = globalcontext_load_module_from_avm(global, module_name);
         if (IS_NULL_PTR(loaded_module)) {
             // Platform may implement sys_load_module_from_file

src/libAtomVM/atomshashtable.h

@@ -40,6 +40,7 @@
 #include "synclist.h"
 #include "term.h"
 #include "timer_list.h"
+#include "valueshashtable.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -117,7 +118,7 @@ struct GlobalContext
     int32_t last_process_id;
 
     struct AtomTable *atom_table;
-    struct AtomsHashTable *modules_table;
+    struct ValuesHashTable *modules_table;
 
 #ifndef AVM_NO_SMP
     RWLock *modules_lock;
@@ -510,7 +511,7 @@ Module *globalcontext_get_module_by_index(GlobalContext *global, int index);
  * @param module_name_atom the module name.
  * @returns a pointer to a Module struct.
  */
-Module *globalcontext_get_module(GlobalContext *global, AtomString module_name_atom);
+Module *globalcontext_get_module(GlobalContext *global, atom_index_t module_name_atom);
 
 /**
  * @brief Load a given module from registered AVM packs

src/libAtomVM/globalcontext.c

@@ -432,7 +432,7 @@ const struct ExportedFunction *module_resolve_function0(Module *mod, int import_
     AtomString function_name_atom = atom_table_get_atom_string(glb->atom_table, unresolved->function_atom_index);
     int arity = unresolved->arity;
 
-    Module *found_module = globalcontext_get_module(glb, module_name_atom);
+    Module *found_module = globalcontext_get_module(glb, unresolved->module_atom_index);
 
     if (LIKELY(found_module != NULL)) {
         int exported_label = module_search_exported_function(found_module, function_name_atom, arity, glb);

src/libAtomVM/globalcontext.h

@@ -33,12 +33,10 @@
 
 #include "atom.h"
 #include "atom_table.h"
-#include "atomshashtable.h"
 #include "context.h"
 #include "exportedfunction.h"
 #include "globalcontext.h"
 #include "term.h"
-#include "valueshashtable.h"
 
 #ifdef __cplusplus
 extern "C" {