Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-07 19:49:23 +01:00
Code Issues Projects Releases Wiki Activity

commands.py: Add heap_size argument to process().

Browse Source
This commit is contained in:
Valentin Lorentz 2013-08-09 12:01:40 +02:00
parent 33cc9bc6b8
commit 918b8a3c01
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/commands.py
View File

@ -40,6 +40,11 @@ import threading
import multiprocessing #python2.6 or later! import multiprocessing #python2.6 or later!
import Queue import Queue
try:
import resource
except ImportError: # Windows!
resource = None
import supybot.log as log import supybot.log as log
import supybot.conf as conf import supybot.conf as conf
import supybot.utils as utils import supybot.utils as utils
@ -84,6 +89,7 @@ def process(f, *args, **kwargs):
<timeout>, if supplied, limits the length of execution of target <timeout>, if supplied, limits the length of execution of target
function to <timeout> seconds.""" function to <timeout> seconds."""
timeout = kwargs.pop('timeout', None) timeout = kwargs.pop('timeout', None)
heap_size = kwargs.pop('heap_size', resource.RLIM_INFINITY)
if conf.disableMultiprocessing: if conf.disableMultiprocessing:
pn = kwargs.pop('pn', 'Unknown') pn = kwargs.pop('pn', 'Unknown')
@ -95,6 +101,9 @@ def process(f, *args, **kwargs):
q = multiprocessing.Queue() q = multiprocessing.Queue()
def newf(f, q, *args, **kwargs): def newf(f, q, *args, **kwargs):
if resource:
rsrc = resource.RLIMIT_DATA
resource.setrlimit(rsrc, (heap_size, heap_size))
try: try:
r = f(*args, **kwargs) r = f(*args, **kwargs)
q.put(r) q.put(r)
@ -111,9 +120,10 @@ def process(f, *args, **kwargs):
try: try:
v = q.get(block=False) v = q.get(block=False)
except Queue.Empty: except Queue.Empty:
v = "Nothing returned." return None
if isinstance(v, Exception): if isinstance(v, Exception):
v = "Error: " + str(v) raise v
else:
return v return v
def regexp_wrapper(s, reobj, timeout, plugin_name, fcn_name): def regexp_wrapper(s, reobj, timeout, plugin_name, fcn_name):