Skip to content

bpo-45850: Implement deep-freeze on Windows #29648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gvanrossum merged 18 commits into from
Nov 22, 2021
Merged

bpo-45850: Implement deep-freeze on Windows #29648

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
97c8fd6
Deep-freeze for Windows, step 1
gvanrossum Nov 17, 2021
65ee8fe
Support reading marshalled data from a frozen .h file
gvanrossum Nov 18, 2021
de230cb
Add umarshal.py (3.11 marshal.loads() in pure Python)
gvanrossum Nov 18, 2021
87c6cb4
Generate .c files in _freeze_module.vcxproj
gvanrossum Nov 18, 2021
8b46af7
Avoid copying unchanged deep-frozen files
gvanrossum Nov 19, 2021
1bc777f
Properly generate lines in pythoncore.vcxproj; add codecs back
gvanrossum Nov 19, 2021
97187ff
Try not to break UNIX builds by lazy-importing struct
gvanrossum Nov 19, 2021
55b0f50
Merge remote-tracking branch 'origin/main' into windeepfreeze
gvanrossum Nov 19, 2021
8eeaea0
Remove temporary .bat file
gvanrossum Nov 19, 2021
d332f16
Change ntpath back to posixpath in frozen.c
gvanrossum Nov 19, 2021
3e7c3ac
One more nt->posix
gvanrossum Nov 19, 2021
871f28b
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 20, 2021
b52ad63
Fix by @zooba to get better error when no Python 3.10 is found
gvanrossum Nov 20, 2021
aea38e0
Generate integers for 15- and 30-bit digits
gvanrossum Nov 20, 2021
a7415ed
Give generated .c files a "df." prefix
gvanrossum Nov 20, 2021
f423c3b
Remove unused imports from deepfreeze.py
gvanrossum Nov 20, 2021
a3f60fc
Add a quick script to time startup
gvanrossum Nov 21, 2021
a69895e
Update blurb (reminder that 3.10 must be installed to build)
gvanrossum Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Deep-freeze for Windows, step 1
  • Loading branch information
@gvanrossum
gvanrossum committed Nov 17, 2021
commit 97c8fd6c46fead21fb78988c41cae53c23b27701
24 changes: 24 additions & 0 deletions PCbuild/pythoncore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,30 @@
<ClCompile Include="..\Python\thread.c" />
<ClCompile Include="..\Python\traceback.c" />
</ItemGroup>
<ItemGroup>
<!-- BEGIN deepfreeze -->
<ClCompile Include="..\Python\deepfreeze\importlib._bootstrap.c" />
<ClCompile Include="..\Python\deepfreeze\importlib._bootstrap_external.c" />
<ClCompile Include="..\Python\deepfreeze\zipimport.c" />
<ClCompile Include="..\Python\deepfreeze\abc.c" />
<!-- <ClCompile Include="..\Python\deepfreeze\codecs.c" /> -->
<ClCompile Include="..\Python\deepfreeze\io.c" />
<ClCompile Include="..\Python\deepfreeze\_collections_abc.c" />
<ClCompile Include="..\Python\deepfreeze\_sitebuiltins.c" />
<ClCompile Include="..\Python\deepfreeze\genericpath.c" />
<ClCompile Include="..\Python\deepfreeze\ntpath.c" />
<ClCompile Include="..\Python\deepfreeze\posixpath.c" />
<ClCompile Include="..\Python\deepfreeze\os.c" />
<ClCompile Include="..\Python\deepfreeze\site.c" />
<ClCompile Include="..\Python\deepfreeze\stat.c" />
<ClCompile Include="..\Python\deepfreeze\__hello__.c" />
<ClCompile Include="..\Python\deepfreeze\__phello__.c" />
<ClCompile Include="..\Python\deepfreeze\__phello__.spam.c" />
<ClCompile Include="..\Python\deepfreeze\__phello__.ham.c" />
<ClCompile Include="..\Python\deepfreeze\__phello__.ham.eggs.c" />
<ClCompile Include="..\Python\deepfreeze\frozen_only.c" />
<!-- END deepfreeze -->
</ItemGroup>
<ItemGroup Condition="$(IncludeExternals)">
<ClCompile Include="..\Modules\zlibmodule.c" />
<ClCompile Include="$(zlibDir)\adler32.c" />
Expand Down
7 changes: 1 addition & 6 deletions Python/frozen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,7 @@
#include "frozen_modules/frozen_only.h"
/* End includes */

#ifdef MS_WINDOWS
/* Deepfreeze isn't supported on Windows yet. */
#define GET_CODE(name) NULL
#else
#define GET_CODE(name) _Py_get_##name##_toplevel
#endif

/* Start extern declarations */
extern PyObject *_Py_get_importlib__bootstrap_toplevel(void);
Expand Down Expand Up @@ -108,7 +103,7 @@ static const struct _frozen bootstrap_modules[] = {
static const struct _frozen stdlib_modules[] = {
/* stdlib - startup, without site (python -S) */
{"abc", _Py_M__abc, (int)sizeof(_Py_M__abc), GET_CODE(abc)},
{"codecs", _Py_M__codecs, (int)sizeof(_Py_M__codecs), GET_CODE(codecs)},
// {"codecs", _Py_M__codecs, (int)sizeof(_Py_M__codecs), GET_CODE(codecs)},
{"io", _Py_M__io, (int)sizeof(_Py_M__io), GET_CODE(io)},

/* stdlib - startup, with site */
Expand Down
2 changes: 1 addition & 1 deletion Tools/scripts/freeze_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def find_tool():
]),
('stdlib - startup, without site (python -S)', [
'abc',
'codecs',
# 'codecs', # TODO: Windows name conflict with Python\codecs.c
# For now we do not freeze the encodings, due # to the noise all
# those extra modules add to the text printed during the build.
# (See https://github.com/python/cpython/pull/28398#pullrequestreview-756856469.)
Expand Down
20 changes: 20 additions & 0 deletions deepfreeze.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/importlib\_bootstrap.py -m importlib._bootstrap -o Python\deepfreeze\importlib._bootstrap.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/importlib\_bootstrap_external.py -m importlib._bootstrap_external -o Python\deepfreeze\importlib._bootstrap_external.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/zipimport.py -m zipimport -o Python\deepfreeze\zipimport.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/abc.py -m abc -o Python\deepfreeze\abc.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/codecs.py -m codecs -o Python\deepfreeze\codecs.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/io.py -m io -o Python\deepfreeze\io.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/_collections_abc.py -m _collections_abc -o Python\deepfreeze\_collections_abc.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/_sitebuiltins.py -m _sitebuiltins -o Python\deepfreeze\_sitebuiltins.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/genericpath.py -m genericpath -o Python\deepfreeze\genericpath.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/ntpath.py -m ntpath -o Python\deepfreeze\ntpath.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/posixpath.py -m posixpath -o Python\deepfreeze\posixpath.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/os.py -m os -o Python\deepfreeze\os.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/site.py -m site -o Python\deepfreeze\site.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/stat.py -m stat -o Python\deepfreeze\stat.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/__hello__.py -m __hello__ -o Python\deepfreeze\__hello__.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/__phello__\__init__.py -m __phello__ -o Python\deepfreeze\__phello__.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/__phello__\ham\__init__.py -m __phello__.ham -o Python\deepfreeze\__phello__.ham.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/__phello__\ham\eggs.py -m __phello__.ham.eggs -o Python\deepfreeze\__phello__.ham.eggs.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Lib/__phello__\spam.py -m __phello__.spam -o Python\deepfreeze\__phello__.spam.c
pcbuild\amd64\python.exe Tools\scripts\deepfreeze.py Tools/freeze/flag.py -m frozen_only -o Python\deepfreeze\frozen_only.c