From f9e54e0ea53c774c4458c4af11764e5b929a2b33 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Tue, 6 May 2014 02:16:43 +0300
Subject: [PATCH] modgc: Add new module for GC-related functionality.
---
py/builtin.h | 1 +
py/builtintables.c | 3 ++
py/modgc.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
py/mpconfig.h | 5 ++++
py/py.mk | 1 +
py/qstrdefs.h | 5 ++++
unix/main.c | 12 --------
7 files changed, 83 insertions(+), 12 deletions(-)
create mode 100644 py/modgc.c
diff --git a/py/builtin.h b/py/builtin.h
index e19b74c04..baf444a20 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -77,3 +77,4 @@ extern const mp_obj_module_t mp_module_cmath;
extern const mp_obj_module_t mp_module_micropython;
extern const mp_obj_module_t mp_module_struct;
extern const mp_obj_module_t mp_module_sys;
+extern const mp_obj_module_t mp_module_gc;
diff --git a/py/builtintables.c b/py/builtintables.c
index ca15636a5..c064bb439 100644
--- a/py/builtintables.c
+++ b/py/builtintables.c
@@ -174,6 +174,9 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = {
#if MICROPY_ENABLE_MOD_SYS
{ MP_OBJ_NEW_QSTR(MP_QSTR_sys), (mp_obj_t)&mp_module_sys },
#endif
+#if MICROPY_ENABLE_MOD_GC && MICROPY_ENABLE_GC
+ { MP_OBJ_NEW_QSTR(MP_QSTR_gc), (mp_obj_t)&mp_module_gc },
+#endif
// extra builtin modules as defined by a port
MICROPY_EXTRA_BUILTIN_MODULES
diff --git a/py/modgc.c b/py/modgc.c
new file mode 100644
index 000000000..e569d290b
--- /dev/null
+++ b/py/modgc.c
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "misc.h"
+#include "mpconfig.h"
+#include "qstr.h"
+#include "obj.h"
+#include "builtin.h"
+#include "runtime.h"
+#include "objlist.h"
+#include "objtuple.h"
+#include "objstr.h"
+#include "gc.h"
+
+#if MICROPY_ENABLE_MOD_GC && MICROPY_ENABLE_GC
+
+STATIC mp_obj_t py_gc_collect(void) {
+ gc_collect();
+ return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_0(gc_collect_obj, py_gc_collect);
+
+STATIC const mp_map_elem_t mp_module_gc_globals_table[] = {
+ { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_gc) },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_collect), (mp_obj_t)&gc_collect_obj },
+};
+
+STATIC const mp_obj_dict_t mp_module_gc_globals = {
+ .base = {&mp_type_dict},
+ .map = {
+ .all_keys_are_qstrs = 1,
+ .table_is_fixed_array = 1,
+ .used = ARRAY_SIZE(mp_module_gc_globals_table),
+ .alloc = ARRAY_SIZE(mp_module_gc_globals_table),
+ .table = (mp_map_elem_t*)mp_module_gc_globals_table,
+ },
+};
+
+const mp_obj_module_t mp_module_gc = {
+ .base = { &mp_type_module },
+ .name = MP_QSTR_gc,
+ .globals = (mp_obj_dict_t*)&mp_module_gc_globals,
+};
+
+#endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 435140dc7..48494a21f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -200,6 +200,11 @@ typedef double mp_float_t;
#define MICROPY_ENABLE_MOD_CMATH (0)
#endif
+// Whether to provide "gc" module
+#ifndef MICROPY_ENABLE_MOD_GC
+#define MICROPY_ENABLE_MOD_GC (1)
+#endif
+
// Whether to provide "io" module
#ifndef MICROPY_ENABLE_MOD_IO
#define MICROPY_ENABLE_MOD_IO (1)
diff --git a/py/py.mk b/py/py.mk
index 657abe611..2b74f252c 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -88,6 +88,7 @@ PY_O_BASENAME = \
builtintables.o \
modarray.o \
modcollections.o \
+ modgc.o \
modio.o \
modmath.o \
modcmath.o \
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 2f46384c0..0ffc6c902 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -346,6 +346,11 @@ Q(BytesIO)
Q(getvalue)
#endif
+#if MICROPY_ENABLE_MOD_GC
+Q(gc)
+Q(collect)
+#endif
+
#if MICROPY_ENABLE_PROPERTY
Q(property)
Q(getter)
diff --git a/unix/main.c b/unix/main.c
index a7e4a907e..5a7ea1c03 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -247,15 +247,6 @@ mp_obj_t qstr_info(void) {
return mp_const_none;
}
-#if MICROPY_ENABLE_GC
-// TODO: this doesn't belong here
-STATIC mp_obj_t pyb_gc(void) {
- gc_collect();
- return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_0(pyb_gc_obj, pyb_gc);
-#endif
-
// Process options which set interpreter init options
void pre_process_options(int argc, char **argv) {
for (int a = 1; a < argc; a++) {
@@ -338,9 +329,6 @@ int main(int argc, char **argv) {
mp_store_name(qstr_from_str("mem_info"), mp_make_function_n(0, mem_info));
mp_store_name(qstr_from_str("qstr_info"), mp_make_function_n(0, qstr_info));
-#if MICROPY_ENABLE_GC
- mp_store_name(qstr_from_str("gc"), (mp_obj_t)&pyb_gc_obj);
-#endif
// Here is some example code to create a class and instance of that class.
// First is the Python, then the C code.
--
GitLab