NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-10-28 19:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enable parallel compression with zstandard. Fixes #2324

Browse Source
This commit is contained in:
grossmj 2026-02-16 18:28:11 +08:00
parent 74bc3b5144
commit 28e7c014c8
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gns3server/controller/import_project.py
View File

@ -17,7 +17,6 @@
import os import os
import sys import sys
import stat
import json import json
import uuid import uuid
import shutil import shutil

7
gns3server/utils/asyncio/aiozipstream.py
View File

@ -71,10 +71,9 @@ def _get_compressor(compress_type, compresslevel=None):
elif compress_type == ZIP_ZSTANDARD: elif compress_type == ZIP_ZSTANDARD:
import zstandard as zstd import zstandard as zstd
if compresslevel is not None: if compresslevel is not None:
#params = zstd.ZstdCompressionParameters.from_level(compresslevel, threads=-1, enable_ldm=True, window_log=31) # for threads param a value of -1 means to set the number of threads to the number of detected logical CPUs
#return zstd.ZstdCompressor(compression_params=params).compressobj() return zstd.ZstdCompressor(level=compresslevel, threads=-1).compressobj()
return zstd.ZstdCompressor(level=compresslevel).compressobj() return zstd.ZstdCompressor(threads=-1).compressobj()
return zstd.ZstdCompressor().compressobj()
else: else:
return None return None

4
gns3server/utils/zipfile_zstd/_zipfile.py
View File

@ -42,7 +42,7 @@ if 'compresslevel' in inspect.signature(zipfile._get_compressor).parameters:
if compress_type == zipfile.ZIP_ZSTANDARD: if compress_type == zipfile.ZIP_ZSTANDARD:
if compresslevel is None: if compresslevel is None:
compresslevel = 3 compresslevel = 3
return zstd.ZstdCompressor(level=compresslevel, threads=12).compressobj() return zstd.ZstdCompressor(level=compresslevel, threads=-1).compressobj()
else: else:
return patch.originals['_get_compressor'](compress_type, compresslevel=compresslevel) return patch.originals['_get_compressor'](compress_type, compresslevel=compresslevel)
else: else:
@ -51,7 +51,7 @@ else:
if compress_type == zipfile.ZIP_ZSTANDARD: if compress_type == zipfile.ZIP_ZSTANDARD:
if compresslevel is None: if compresslevel is None:
compresslevel = 3 compresslevel = 3
return zstd.ZstdCompressor(level=compresslevel, threads=12).compressobj() return zstd.ZstdCompressor(level=compresslevel, threads=-1).compressobj()
else: else:
return patch.originals['_get_compressor'](compress_type) return patch.originals['_get_compressor'](compress_type)