changeset 155:b49ec54abbbb

Error messages for loading libpypy3-c.so now mention libpypy3-c.so instead of libpypy-c.so
author Franz Glasner <f.glasner@feldmann-mg.com>
date Wed, 12 Oct 2022 13:03:36 +0200
parents 95bff42b7ed8
children 6c1e9754daa4
files uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c
diffstat 1 files changed, 27 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c	Wed Oct 12 12:20:58 2022 +0200
+++ b/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c	Wed Oct 12 13:03:36 2022 +0200
@@ -12,6 +12,15 @@
  
  static int uwsgi_pypy_init() {
  
+@@ -58,7 +59,7 @@ static int uwsgi_pypy_init() {
+ 	}
+ 
+ 	if (dlsym(RTLD_DEFAULT, "rpython_startup_code")) {
+-		uwsgi_log("PyPy runtime detected, skipping libpypy-c loading\n");
++		uwsgi_log("PyPy runtime detected, skipping libpypy3-c loading\n");
+ 		goto ready;
+ 	}
+ 	else if (upypy.lib) {
 @@ -68,26 +69,26 @@ static int uwsgi_pypy_init() {
  		if (upypy.home) {
  			// first try with /bin way:
@@ -63,6 +72,24 @@
  #endif
  		}
  	}
+@@ -126,7 +127,7 @@ static int uwsgi_pypy_init() {
+ 
+ 	u_pypy_init_threads = dlsym(upypy.handler, "pypy_init_threads");
+         if (!u_pypy_init_threads) {
+-                uwsgi_log("!!! WARNING your libpypy-c does not export pypy_init_threads, multithreading will not work !!!\n");
++                uwsgi_log("!!! WARNING your libpypy3-c does not export pypy_init_threads, multithreading will not work !!!\n");
+         }
+ 	
+ 	u_rpython_startup_code();
+@@ -161,7 +162,7 @@ ready:
+ 
+ 	u_pypy_thread_attach = dlsym(upypy.handler, "pypy_thread_attach");
+         if (!u_pypy_thread_attach) {
+-                uwsgi_log("!!! WARNING your libpypy-c does not export pypy_thread_attach, multithreading will not work !!!\n");
++                uwsgi_log("!!! WARNING your libpypy3-c does not export pypy_thread_attach, multithreading will not work !!!\n");
+         }
+ 
+ 	if (upypy.setup) {
 @@ -266,13 +267,17 @@ static void uwsgi_pypy_init_apps() {
  	}
  }