Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 11:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "native modules are lazy by default"

Browse Source 
This reverts commit 1e7fe289989314c876232782e5f9cc7f8037c8d8.
This commit is contained in:
BLUELOVETH 2023-08-03 11:51:12 +08:00
parent 1e7fe28998
commit d9c98bb7d8
4 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/quick-start/modules.md
View File

@ -25,7 +25,7 @@ print(test.pi) # 3.14
### Native modules ### Native modules
A native module is a module written in c++ or mixed c++/python. A native module is a module written in c++ or mixed c++/python.
Native modules can be added into `_modules` or `_lazy_native_modules`. Native modules are always compiled and executed when the VM is created.
To creata a native module, To creata a native module,
use `vm->new_module(...)`. use `vm->new_module(...)`.
@ -52,9 +52,9 @@ print(test.add(1, 2)) # 3
When you do `import` a module, the VM will try to find it in the following order: When you do `import` a module, the VM will try to find it in the following order:
1. Search `vm->_modules`, if found, return it. 1. Search `vm->_modules`, if found, return it.
2. Search `vm->_lazy_native_modules`, if found, compile and execute it, then return it. 2. Search `vm->_lazy_modules`, if found, compile and execute it, then return it.
3. Search `vm->_lazy_modules`, if found, compile and execute it, then return it. 3. Try `vm->_import_handler`.
4. Try `vm->_import_handler`.
### Customized import handler ### Customized import handler

2
include/pocketpy/vm.h
View File

@ -47,7 +47,6 @@ namespace pkpy{
typedef PyObject* (*BinaryFuncC)(VM*, PyObject*, PyObject*); typedef PyObject* (*BinaryFuncC)(VM*, PyObject*, PyObject*);
typedef void (*NativeModuleInitializer)(VM*);
struct PyTypeInfo{ struct PyTypeInfo{
PyObject* obj; PyObject* obj;
@ -117,7 +116,6 @@ public:
NameDict _modules; // loaded modules NameDict _modules; // loaded modules
std::map<StrName, Str> _lazy_modules; // lazy loaded modules std::map<StrName, Str> _lazy_modules; // lazy loaded modules
std::map<StrName, NativeModuleInitializer> _lazy_native_modules; // lazy loaded native modules
struct{ struct{
PyObject* error; PyObject* error;

25
src/pocketpy.cpp
View File

@ -1554,18 +1554,17 @@ void VM::post_init(){
#if !PK_DEBUG_NO_BUILTINS #if !PK_DEBUG_NO_BUILTINS
add_module_sys(this); add_module_sys(this);
add_module_traceback(this);
add_module_time(this);
add_module_json(this);
add_module_math(this);
add_module_re(this);
add_module_dis(this);
add_module_c(this); add_module_c(this);
// lazy modules add_module_gc(this);
vm->_lazy_native_modules["traceback"] = &add_module_traceback; add_module_random(this);
vm->_lazy_native_modules["time"] = &add_module_time; add_module_base64(this);
vm->_lazy_native_modules["json"] = &add_module_json; add_module_timeit(this);
vm->_lazy_native_modules["math"] = &add_module_math;
vm->_lazy_native_modules["re"] = &add_module_re;
vm->_lazy_native_modules["dis"] = &add_module_dis;
vm->_lazy_native_modules["gc"] = &add_module_gc;
vm->_lazy_native_modules["random"] = &add_module_random;
vm->_lazy_native_modules["base64"] = &add_module_base64;
vm->_lazy_native_modules["timeit"] = &add_module_timeit;
for(const char* name: {"this", "functools", "collections", "heapq", "bisect", "pickle", "_long", "colorsys"}){ for(const char* name: {"this", "functools", "collections", "heapq", "bisect", "pickle", "_long", "colorsys"}){
_lazy_modules[name] = kPythonLibs[name]; _lazy_modules[name] = kPythonLibs[name];
@ -1588,8 +1587,8 @@ void VM::post_init(){
_import_handler = _default_import_handler; _import_handler = _default_import_handler;
} }
vm->_lazy_native_modules["linalg"] = &add_module_linalg; add_module_linalg(this);
vm->_lazy_native_modules["easing"] = &add_module_easing; add_module_easing(this);
#endif #endif
} }

9
src/vm.cpp
View File

@ -239,14 +239,6 @@ namespace pkpy{
} }
PyObject* ext_mod = _modules.try_get(name); PyObject* ext_mod = _modules.try_get(name);
if(ext_mod == nullptr){ if(ext_mod == nullptr){
auto it2 = _lazy_native_modules.find(name);
if(it2 != _lazy_native_modules.end()){
it2->second(this); // init
ext_mod = _modules.try_get(name);
PK_ASSERT(ext_mod != nullptr);
_lazy_native_modules.erase(it2);
return ext_mod;
}
Str source; Str source;
auto it = _lazy_modules.find(name); auto it = _lazy_modules.find(name);
if(it == _lazy_modules.end()){ if(it == _lazy_modules.end()){
@ -279,7 +271,6 @@ namespace pkpy{
_all_types.clear(); _all_types.clear();
_modules.clear(); _modules.clear();
_lazy_modules.clear(); _lazy_modules.clear();
_lazy_native_modules.clear();
} }
PyObject* VM::py_negate(PyObject* obj){ PyObject* VM::py_negate(PyObject* obj){