AriasCreations/LSL-PyOptimizer
3
0
Fork 0
mirror of https://github.com/Sei-Lisa/LSL-PyOptimizer synced 2025-07-01 07:38:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Raise resource limits; raise them again in case of exception

Browse source 
The limits were too low to be reasonable with more modern versions of Python.

Double exceptions were possible. Make use of soft/hard limits; raise the soft limit in case of exception. That should make it less likely to get a double exception.

Per bug report by @LeonaMorro (thanks!)

Fixes GitHub issue report #9 (fix #9).
This commit is contained in:
Sei Lisa 2019-10-11 20:15:52 +02:00
parent 6d959f6f90
commit 2408e6e6fe
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
main.py
View file

@ -542,14 +542,16 @@ def main(argv):
options &= set(('rsrclimit',)) options &= set(('rsrclimit',))
options.add('prettify') options.add('prettify')
rsrclimit = False
try: try:
if 'rsrclimit' in options: if 'rsrclimit' in options:
rsrclimit = True
import resource import resource
resource.setrlimit(resource.RLIMIT_CPU, (5, 5)) resource.setrlimit(resource.RLIMIT_CPU, (5, 8))
resource.setrlimit(resource.RLIMIT_STACK, (393216, 393216)) resource.setrlimit(resource.RLIMIT_STACK, (0x60000, 0x80000))
resource.setrlimit(resource.RLIMIT_DATA, (4096, 4096)) resource.setrlimit(resource.RLIMIT_DATA, (9001000, 12001000))
resource.setrlimit(resource.RLIMIT_AS, (20001000, 20001000)) resource.setrlimit(resource.RLIMIT_AS, (61001000, 81001000))
if 'lso' in options: if 'lso' in options:
lslopt.lslcommon.LSO = True lslopt.lslcommon.LSO = True
@ -733,6 +735,12 @@ def main(argv):
return 0 return 0
except Exception as e: except Exception as e:
if rsrclimit:
# Raise the soft limits to hopefully prevent double exceptions
resource.setrlimit(resource.RLIMIT_CPU, (8, 8))
resource.setrlimit(resource.RLIMIT_STACK, (0x80000, 0x80000))
resource.setrlimit(resource.RLIMIT_DATA, (12001000, 12001000))
resource.setrlimit(resource.RLIMIT_AS, (81001000, 81001000))
if raise_exception: if raise_exception:
raise raise
werr(e.__class__.__name__ + ': ' + str(e) + '\n') werr(e.__class__.__name__ + ': ' + str(e) + '\n')