Skip to content
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

Jump to bottom

port pypy plugin to python3 #2662

Merged
merged 1 commit into from
Sep 8, 2024
Merged

port pypy plugin to python3 #2662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 39 additions & 39 deletions plugins/pypy/pypy_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,14 @@
uwsgi_defines = []
uwsgi_cflags = ffi.string(lib0.uwsgi_get_cflags()).split()
for cflag in uwsgi_cflags:
if cflag.startswith('-D'):
if cflag.startswith(b'-D'):
line = cflag[2:]
if '=' in line:
(key, value) = line.split('=', 1)
if b'=' in line:
(key, value) = line.decode().split('=', 1)
uwsgi_cdef.append('#define %s ...' % key)
uwsgi_defines.append('#define %s %s' % (key, value.replace('\\"', '"').replace('""', '"')))
else:
line = line.decode()
uwsgi_cdef.append('#define %s ...' % line)
uwsgi_defines.append('#define %s 1' % line)
uwsgi_dot_h = ffi.string(lib0.uwsgi_get_dot_h())
Expand Down Expand Up @@ -166,22 +167,22 @@
struct uwsgi_plugin *p[];
...;
};
struct uwsgi_server uwsgi;
extern struct uwsgi_server uwsgi;

struct uwsgi_plugin pypy_plugin;
extern struct uwsgi_plugin pypy3_plugin;

const char *uwsgi_pypy_version;
extern const char *uwsgi_pypy_version;

char *uwsgi_binary_path();

void *uwsgi_malloc(size_t);

struct uwsgi_logvar {
char key[256];
uint8_t keylen;
char val[256];
uint8_t vallen;
struct uwsgi_logvar *next;
char key[256];
uint8_t keylen;
char val[256];
uint8_t vallen;
struct uwsgi_logvar *next;
};

struct uwsgi_logvar *uwsgi_logvar_get(struct wsgi_request *, char *, uint8_t);
Expand Down Expand Up @@ -248,7 +249,7 @@

int uwsgi_ready_fd(struct wsgi_request *);

void set_user_harakiri(struct wsgi_request *, int);
void set_user_harakiri(int);

int uwsgi_metric_set(char *, char *, int64_t);
int uwsgi_metric_inc(char *, char *, int64_t);
Expand All @@ -269,9 +270,9 @@
%s

extern struct uwsgi_server uwsgi;
extern struct uwsgi_plugin pypy_plugin;
extern struct uwsgi_plugin pypy3_plugin;
%s
''' % ('\n'.join(uwsgi_defines), uwsgi_dot_h, hooks)
''' % ('\n'.join(uwsgi_defines), uwsgi_dot_h.decode(), hooks)

ffi.cdef(cdefines)
lib = ffi.verify(cverify)
Expand All @@ -286,7 +287,7 @@

# fix argv if needed
if len(sys.argv) == 0:
sys.argv.insert(0, ffi.string(lib.uwsgi_binary_path()))
sys.argv.insert(0, ffi.string(lib.uwsgi_binary_path()).decode())


@ffi.callback("void(char *)")
Expand All @@ -307,12 +308,12 @@ def uwsgi_pypy_loader(module):
global wsgi_application
m = ffi.string(module)
c = 'application'
if ':' in m:
m, c = m.split(':')
if '.' in m:
mod = __import__(m, None, None, '*')
if b':' in m:
m, c = m.split(b':')
if b'.' in m:
mod = __import__(m.decode(), None, None, '*')
else:
mod = __import__(m)
mod = __import__(m.decode())
wsgi_application = getattr(mod, c)


Expand All @@ -324,7 +325,7 @@ def uwsgi_pypy_file_loader(filename):
global wsgi_application
w = ffi.string(filename)
c = 'application'
mod = imp.load_source('uwsgi_file_wsgi', w)
mod = imp.load_source('uwsgi_file_wsgi', w.decode())
wsgi_application = getattr(mod, c)


Expand All @@ -335,15 +336,15 @@ def uwsgi_pypy_paste_loader(config):
"""
global wsgi_application
c = ffi.string(config)
if c.startswith('config:'):
if c.startswith(b'config:'):
c = c[7:]
if c[0] != '/':
c = os.getcwd() + '/' + c
if c[0] != b'/'[0]:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This [0] is strange

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems useless, you're right.

c = os.getcwd() + '/' + c.decode()
try:
from logging.config import fileConfig
from paste.script.util.logging_config import fileConfig
fileConfig(c)
except ImportError:
print("PyPy WARNING: unable to load logging.config")
print("PyPy WARNING: unable to load paste.script.util.logging_config")
Comment on lines +344 to +347
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this some old patch that has been forwarded? This have been changed in 71464fb

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes this is, will review this better and submit fixes in the coming days.

from paste.deploy import loadapp
wsgi_application = loadapp('config:%s' % c)

Expand All @@ -364,8 +365,8 @@ def uwsgi_pypy_pythonpath(item):
add an item to the pythonpath
"""
path = ffi.string(item)
sys.path.append(path)
print("added %s to pythonpath" % path)
sys.path.append(path.decode())
print("added %s to pythonpath" % path.decode())


class WSGIfilewrapper(object):
Expand Down Expand Up @@ -470,15 +471,17 @@ def writer(data):
def start_response(status, headers, exc_info=None):
if exc_info:
traceback.print_exception(*exc_info)
status = status.encode()
lib.uwsgi_response_prepare_headers(wsgi_req, ffi.new("char[]", status), len(status))
for hh in headers:
hh = (hh[0].encode(), hh[1].encode())
lib.uwsgi_response_add_header(wsgi_req, ffi.new("char[]", hh[0]), len(hh[0]), ffi.new("char[]", hh[1]), len(hh[1]))
return writer

environ = {}
iov = wsgi_req.hvec
for i in range(0, wsgi_req.var_cnt, 2):
environ[ffi.string(ffi.cast("char*", iov[i].iov_base), iov[i].iov_len)] = ffi.string(ffi.cast("char*", iov[i+1].iov_base), iov[i+1].iov_len)
environ[ffi.string(ffi.cast("char*", iov[i].iov_base), iov[i].iov_len).decode()] = ffi.string(ffi.cast("char*", iov[i+1].iov_base), iov[i+1].iov_len).decode()

environ['wsgi.version'] = (1, 0)
scheme = 'http'
Expand Down Expand Up @@ -598,8 +601,8 @@ def uwsgi_pypy_rpc(node, func, *args):

def uwsgi_pypy_call(func, *args):
node = None
if '@' in func:
(func, node) = func.split('@')
if b'@' in func:
(func, node) = func.split(b'@')
return uwsgi_pypy_rpc(node, func, *args)
uwsgi.call = uwsgi_pypy_call

Expand Down Expand Up @@ -975,13 +978,10 @@ def uwsgi_pypy_chunked_read_nb():
uwsgi.chunked_read_nb = uwsgi_pypy_chunked_read_nb


def uwsgi_pypy_set_user_harakiri(x):
"""
uwsgi.set_user_harakiri(sec)
"""
wsgi_req = uwsgi_pypy_current_wsgi_req()
lib.set_user_harakiri(wsgi_req, x)
uwsgi.set_user_harakiri = uwsgi_pypy_set_user_harakiri
"""
uwsgi.set_user_harakiri(sec)
"""
uwsgi.set_user_harakiri = lambda x: lib.set_user_harakiri(x)


def uwsgi_pypy_get_logvar(key):
Expand Down Expand Up @@ -1067,7 +1067,7 @@ def uwsgi_pypy_continulet_switch(wsgi_req):


def uwsgi_pypy_setup_continulets():
if lib.uwsgi.async < 1:
if lib.uwsgi["async"] < 1:
raise Exception("pypy continulets require async mode !!!")
lib.uwsgi.schedule_to_main = uwsgi_pypy_continulet_switch
lib.uwsgi.schedule_to_req = uwsgi_pypy_continulet_schedule
Expand Down