commit b4b10fd350852e321624d74983cca286091b55a1
author Damien George <damien.p.george@gmail.com> Thu Jan 01 23:30:53 2015 +0000
committer Damien George <damien.p.george@gmail.com> Wed Jan 07 20:33:00 2015 +0000
tree 7ac4aa40d70be0170a61f649e9d73c42faa4ba33
parent ad2307c92c15f0aa90dbd0741fd2538719d0b5e1

py: Put all global state together in state structures.

This patch consolidates all global variables in py/ core into one place,
in a global structure.  Root pointers are all located together to make
GC tracing easier and more efficient.

py/objmodule.c

diff --git a/py/objmodule.c b/py/objmodule.c
index 2e53bf0..dd935ae 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -27,13 +27,12 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "py/mpstate.h"
 #include "py/nlr.h"
 #include "py/objmodule.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
 
-STATIC mp_map_t mp_loaded_modules_map; // TODO: expose as sys.modules
-
 STATIC void module_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_obj_module_t *self = self_in;
     const char *name = qstr_str(self->name);
@@ -65,10 +64,10 @@
     if (dict->map.table_is_fixed_array) {
         #if MICROPY_CAN_OVERRIDE_BUILTINS
         if (dict == &mp_module_builtins_globals) {
-            if (mp_module_builtins_override_dict == NULL) {
-                mp_module_builtins_override_dict = mp_obj_new_dict(1);
+            if (MP_STATE_VM(mp_module_builtins_override_dict) == NULL) {
+                MP_STATE_VM(mp_module_builtins_override_dict) = mp_obj_new_dict(1);
             }
-            dict = mp_module_builtins_override_dict;
+            dict = MP_STATE_VM(mp_module_builtins_override_dict);
         } else
         #endif
         {
@@ -96,7 +95,7 @@
 };
 
 mp_obj_t mp_obj_new_module(qstr module_name) {
-    mp_map_elem_t *el = mp_map_lookup(&mp_loaded_modules_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
+    mp_map_elem_t *el = mp_map_lookup(&MP_STATE_VM(mp_loaded_modules_map), MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
     // We could error out if module already exists, but let C extensions
     // add new members to existing modules.
     if (el->value != MP_OBJ_NULL) {
@@ -192,17 +191,17 @@
 STATIC MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
 
 void mp_module_init(void) {
-    mp_map_init(&mp_loaded_modules_map, 3);
+    mp_map_init(&MP_STATE_VM(mp_loaded_modules_map), 3);
 }
 
 void mp_module_deinit(void) {
-    mp_map_deinit(&mp_loaded_modules_map);
+    mp_map_deinit(&MP_STATE_VM(mp_loaded_modules_map));
 }
 
 // returns MP_OBJ_NULL if not found
 mp_obj_t mp_module_get(qstr module_name) {
     // lookup module
-    mp_map_elem_t *el = mp_map_lookup(&mp_loaded_modules_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
+    mp_map_elem_t *el = mp_map_lookup(&MP_STATE_VM(mp_loaded_modules_map), MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
 
     if (el == NULL) {
         // module not found, look for builtin module names
@@ -217,5 +216,5 @@
 }
 
 void mp_module_register(qstr qstr, mp_obj_t module) {
-    mp_map_lookup(&mp_loaded_modules_map, MP_OBJ_NEW_QSTR(qstr), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
+    mp_map_lookup(&MP_STATE_VM(mp_loaded_modules_map), MP_OBJ_NEW_QSTR(qstr), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
 }