Author: Armin Rigo <[email protected]>
Branch: sandbox-lib
Changeset: r83179:28c504249fc6
Date: 2016-03-20 08:14 +0100
http://bitbucket.org/pypy/pypy/changeset/28c504249fc6/
Log: Rename "sandboxlib" to "rsandbox"
diff --git a/rpython/annotator/policy.py b/rpython/annotator/policy.py
--- a/rpython/annotator/policy.py
+++ b/rpython/annotator/policy.py
@@ -88,7 +88,7 @@
if key not in bk.emulated_pbc_calls:
params_s = s_func.args_s
s_result = s_func.s_result
- from rpython.translator.sandboxlib.rsandbox import
make_sandbox_trampoline
+ from rpython.translator.rsandbox.rsandbox import
make_sandbox_trampoline
sandbox_trampoline = make_sandbox_trampoline(
annotator.translator,
s_func.name, params_s, s_result)
diff --git a/rpython/config/translationoption.py
b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -106,8 +106,8 @@
# other noticeable options
BoolOption("thread", "enable use of threading primitives",
default=False, cmdline="--thread"),
- BoolOption("sandboxlib", "Produce a fully-sandboxed library",
- default=False, cmdline="--sandboxlib",
+ BoolOption("rsandbox", "Produce a fully-sandboxed library",
+ default=False, cmdline="--rsandbox",
requires=[("translation.thread", False),
("translation.continuation", False),
("translation.shared", True)],
diff --git a/rpython/rlib/objectmodel.py b/rpython/rlib/objectmodel.py
--- a/rpython/rlib/objectmodel.py
+++ b/rpython/rlib/objectmodel.py
@@ -300,7 +300,7 @@
def compute_annotation(self):
if sandboxed_name:
config = self.bookkeeper.annotator.translator.config
- if config.translation.sandboxlib:
+ if config.translation.rsandbox:
func._sandbox_external_name = sandboxed_name
func._dont_inline_ = True
return self.bookkeeper.immutablevalue(func)
diff --git a/rpython/rtyper/extfunc.py b/rpython/rtyper/extfunc.py
--- a/rpython/rtyper/extfunc.py
+++ b/rpython/rtyper/extfunc.py
@@ -95,7 +95,7 @@
def compute_annotation(self):
s_result = SomeExternalFunction(
self.name, self.signature_args, self.signature_result)
- if (self.bookkeeper.annotator.translator.config.translation.sandboxlib
+ if (self.bookkeeper.annotator.translator.config.translation.rsandbox
and not self.safe_not_sandboxed):
s_result.needs_sandboxing = True
return s_result
diff --git a/rpython/rtyper/rtyper.py b/rpython/rtyper/rtyper.py
--- a/rpython/rtyper/rtyper.py
+++ b/rpython/rtyper/rtyper.py
@@ -574,8 +574,8 @@
def getcallable(self, graph):
def getconcretetype(v):
return self.bindingrepr(v).lowleveltype
- if self.annotator.translator.config.translation.sandboxlib:
- from rpython.translator.sandboxlib.rsandbox import (
+ if self.annotator.translator.config.translation.rsandbox:
+ from rpython.translator.rsandbox.rsandbox import (
make_sandbox_trampoline) # don't import this globally
try:
name = graph.func._sandbox_external_name
diff --git a/rpython/translator/c/database.py b/rpython/translator/c/database.py
--- a/rpython/translator/c/database.py
+++ b/rpython/translator/c/database.py
@@ -31,10 +31,10 @@
gcpolicyclass=None,
exctransformer=None,
thread_enabled=False,
- sandbox=False):
+ rsandbox=False):
self.translator = translator
self.standalone = standalone
- self.sandbox = sandbox
+ self.rsandbox = rsandbox
if gcpolicyclass is None:
gcpolicyclass = gc.RefcountingGcPolicy
self.gcpolicy = gcpolicyclass(self, thread_enabled)
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -131,7 +131,7 @@
gcpolicyclass=gcpolicyclass,
exctransformer=exctransformer,
thread_enabled=self.config.translation.thread,
- sandbox=self.config.translation.sandboxlib)
+ rsandbox=self.config.translation.rsandbox)
self.db = db
# give the gc a chance to register interest in the start-up functions
it
@@ -211,7 +211,7 @@
defines = defines.copy()
if self.config.translation.countmallocs:
defines['COUNT_OP_MALLOCS'] = 1
- if self.config.translation.sandboxlib:
+ if self.config.translation.rsandbox:
defines['RPY_SANDBOXED'] = 1
if CBuilder.have___thread is None:
CBuilder.have___thread = self.translator.platform.check___thread()
@@ -381,7 +381,7 @@
no_precompile_cfiles = module_files,
shared=self.config.translation.shared,
icon=self.config.translation.icon,
- sandboxlib=self.config.translation.sandboxlib)
+ rsandbox=self.config.translation.rsandbox)
if self.has_profopt():
profopt = self.config.translation.profopt
@@ -854,7 +854,7 @@
fi.close()
if 'RPY_SANDBOXED' in defines:
- from rpython.translator.sandboxlib.rsandbox import add_sandbox_files
+ from rpython.translator.rsandbox.rsandbox import add_sandbox_files
eci = add_sandbox_files(database, eci)
eci = add_extra_files(eci)
diff --git a/rpython/translator/c/node.py b/rpython/translator/c/node.py
--- a/rpython/translator/c/node.py
+++ b/rpython/translator/c/node.py
@@ -914,10 +914,10 @@
def new_funcnode(db, T, obj, forcename=None):
from rpython.rtyper.rtyper import llinterp_backend
- if db.sandbox:
+ if db.rsandbox:
if (getattr(obj, 'external', None) is not None and
not obj._safe_not_sandboxed):
- from rpython.translator.sandboxlib import rsandbox
+ from rpython.translator.rsandbox import rsandbox
obj.__dict__['graph'] = rsandbox.get_sandbox_stub(
obj, db.translator.rtyper)
obj.__dict__.pop('_safe_not_sandboxed', None)
@@ -930,7 +930,7 @@
return FuncNode(db, T, obj, name)
elif getattr(obj, 'external', None) is not None:
assert obj.external == 'C'
- if db.sandbox:
+ if db.rsandbox:
assert obj._safe_not_sandboxed
return ExternalFuncNode(db, T, obj, name)
elif hasattr(obj._callable, "c_name"):
diff --git a/rpython/translator/platform/posix.py
b/rpython/translator/platform/posix.py
--- a/rpython/translator/platform/posix.py
+++ b/rpython/translator/platform/posix.py
@@ -100,7 +100,7 @@
def gen_makefile(self, cfiles, eci, exe_name=None, path=None,
shared=False, headers_to_precompile=[],
no_precompile_cfiles = [], icon=None,
- sandboxlib=False):
+ rsandbox=False):
cfiles = self._all_cfiles(cfiles, eci)
if path is None:
@@ -121,8 +121,8 @@
if shared:
libname = exe_name.new(ext='').basename
- if sandboxlib:
- libname += '-sandbox'
+ if rsandbox:
+ libname += '-rsandbox'
target_name = 'lib%s.%s' % (libname, self.so_ext)
else:
target_name = exe_name.basename
@@ -137,7 +137,7 @@
m.eci = eci
default_target = exe_name.basename
- if sandboxlib:
+ if rsandbox:
assert shared
default_target = target_name
@@ -206,7 +206,7 @@
if shared:
m.definition('SHARED_IMPORT_LIB', libname)
m.definition('PYPY_MAIN_FUNCTION', "pypy_main_startup")
- if shared and not sandboxlib:
+ if shared and not rsandbox:
m.rule('main.c', '',
'echo "'
'int $(PYPY_MAIN_FUNCTION)(int, char*[]); '
diff --git a/rpython/translator/sandboxlib/__init__.py
b/rpython/translator/rsandbox/__init__.py
rename from rpython/translator/sandboxlib/__init__.py
rename to rpython/translator/rsandbox/__init__.py
diff --git a/rpython/translator/sandboxlib/rsandbox.py
b/rpython/translator/rsandbox/rsandbox.py
rename from rpython/translator/sandboxlib/rsandbox.py
rename to rpython/translator/rsandbox/rsandbox.py
--- a/rpython/translator/sandboxlib/rsandbox.py
+++ b/rpython/translator/rsandbox/rsandbox.py
@@ -95,7 +95,7 @@
from rpython.translator.c.support import cdecl
c_header = ['#include "common_header.h"\n']
- c_source = ['#include "sandboxlib.h"\n']
+ c_source = ['#include "rsandbox.h"\n']
fnnames = database.translator._sandboxlib_fnnames[0]
for fnname in sorted(fnnames):
sandboxfunc = fnnames[fnname]
diff --git a/rpython/translator/sandboxlib/test/__init__.py
b/rpython/translator/rsandbox/test/__init__.py
rename from rpython/translator/sandboxlib/test/__init__.py
rename to rpython/translator/rsandbox/test/__init__.py
diff --git a/rpython/translator/sandboxlib/test/test_sandbox.py
b/rpython/translator/rsandbox/test/test_sandbox.py
rename from rpython/translator/sandboxlib/test/test_sandbox.py
rename to rpython/translator/rsandbox/test/test_sandbox.py
--- a/rpython/translator/sandboxlib/test/test_sandbox.py
+++ b/rpython/translator/rsandbox/test/test_sandbox.py
@@ -3,7 +3,7 @@
def compile(entry_point):
- t = Translation(entry_point, backend='c', sandboxlib=True)
+ t = Translation(entry_point, backend='c', rsandbox=True)
return str(t.compile())
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
