clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-06-16 02:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use getsectiondata as a fallback to the dlsym method

Browse Source 
- Mirrors the method of adding the resource; `-sectcreate` is used as a fallback to `ld -b binary`
This commit is contained in:
Jay Oster
2015-07-03 02:48:34 -07:00
parent f07e6db7af
commit bfbc254108
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/pypy/pypy_plugin.c
+9 -10
View File
@@ -167,15 +167,6 @@ ready:
if (upypy.setup) {
buffer = uwsgi_open_and_read(upypy.setup, &rlen, 1, NULL);
}
#if defined(__APPLE__)
else {
unsigned long setup_size = 0;
char *setup_data = (char*)getsectiondata(&_mh_execute_header, "__DATA", "pypy_setup", &setup_size);
if (setup_data) {
buffer = uwsgi_concat2n(setup_data, setup_size, "", 0);
}
}
#else
else {
char *start = dlsym(RTLD_DEFAULT, "uwsgi_pypy_setup_start");
if (!start) {
@@ -188,8 +179,16 @@ ready:
if (start && end) {
buffer = uwsgi_concat2n(start, end-start, "", 0);
}
}
#if defined(__APPLE__)
else {
unsigned long setup_size = 0;
char *setup_data = (char*)getsectiondata(&_mh_execute_header, "__DATA", "pypy_setup", &setup_size);
if (setup_data) {
buffer = uwsgi_concat2n(setup_data, setup_size, "", 0);
}
}
#endif
}
if (!buffer) {
uwsgi_log("you have to load a pypy setup file with --pypy-setup\n");