Mercurial > hgrepos > FreeBSD > ports > www > uwsginl

changeset 105:2bbb4ab01566

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Extra comment what "skip-atexit" does"
author Franz Glasner <fzglas.hg@dom66.de>
date Wed, 05 Aug 2020 09:47:14 +0200
parents cbaa01adbd46
children 6b45dd9d05ed
files uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c	Wed Aug 05 09:46:03 2020 +0200
+++ b/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c	Wed Aug 05 09:47:14 2020 +0200
@@ -1,5 +1,5 @@
 --- plugins/pypy/pypy_plugin.c.orig	2020-07-09 07:54:09.000000000 +0200
-+++ plugins/pypy/pypy_plugin.c	2020-08-04 09:28:14.194761000 +0200
++++ plugins/pypy/pypy_plugin.c	2020-08-05 09:21:06.250984000 +0200
 @@ -42,9 +42,10 @@ void (*uwsgi_pypy_hook_paste_loader)(char *);
  void (*uwsgi_pypy_hook_pythonpath)(char *);
  void (*uwsgi_pypy_hook_request)(void *, int);
@@ -123,7 +123,7 @@
  
  	if (uwsgi_pypy_hook_request) {
  		uwsgi_pypy_hook_request(wsgi_req, wsgi_req->async_id);
-@@ -266,16 +267,19 @@ static void uwsgi_pypy_init_apps() {
+@@ -266,16 +267,20 @@ static void uwsgi_pypy_init_apps() {
  	}
  }
  
@@ -132,6 +132,7 @@
  static void uwsgi_pypy_atexit() {
 -	if (pypy_debug_file)
 -		fflush(pypy_debug_file);
++	/* NOTE: this function is NOT called when "skip-atexit = true" is configured */
 +	if (!uwsgi_pypy_hook_atexit) {
 +		uwsgi_log("!!! Your pypy setup does not define a uwsgi_pypy_atexit !!!\n");	       
 +		return;
@@ -149,7 +150,7 @@
  }
  
  
-@@ -332,14 +336,14 @@ static void uwsgi_pypy_post_fork() {
+@@ -332,14 +337,14 @@ static void uwsgi_pypy_post_fork() {
  	pthread_mutex_init(&upypy.attach_thread_lock, NULL);
  	struct uwsgi_string_list *usl = NULL;
  	uwsgi_foreach(usl, upypy.eval_post_fork) {
@@ -171,7 +172,7 @@
  
  	if (uwsgi_pypy_post_fork_hook) {
  		uwsgi_pypy_post_fork_hook();
-@@ -360,20 +364,20 @@ static int uwsgi_pypy_mule(char *opt) {
+@@ -360,20 +365,20 @@ static int uwsgi_pypy_mule(char *opt) {
  		exit(1);
  	}
  
@@ -201,7 +202,7 @@
  	.modifier1 = 0,
  	.on_load = uwsgi_pypy_onload,
  	.init = uwsgi_pypy_init,
-@@ -388,4 +392,6 @@ struct uwsgi_plugin pypy_plugin = {
+@@ -388,4 +393,6 @@ struct uwsgi_plugin pypy_plugin = {
  	.rpc = uwsgi_pypy_rpc,
  	.post_fork = uwsgi_pypy_post_fork,
  	.mule = uwsgi_pypy_mule,