Fwd: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend_execute_API.c zend_globals.h

Hi All,

Reverted the NetWare specific stack limit check related changes.

With regards
Kamesh Jayachandran

On Wed, 22 Sep 2004 11:12:05 -0700, "Andi Gutmans" andi@zend.com said:

Do we want this in the core engine?
If so, why not create a general solution for multi-threaded systems (I
think Apache pre-fork is better off without it due to performance
reasons).
Anantha, can you please revert this patch until we come to a conclusion?
I
prefer doing a general implementation (#ifdef'ed) and having each
platform
implement their own stack threshold check.

Andi

Delivered-To: alias-zend-andi-zend-cvs@zend.com
Mailing-List: contact zend-engine-cvs-help@lists.php.net; run by ezmlm
list-help: mailto:zend-engine-cvs-help@lists.php.net
list-unsubscribe: mailto:zend-engine-cvs-unsubscribe@lists.php.net
list-post: mailto:zend-engine-cvs@lists.php.net
Delivered-To: mailing list zend-engine-cvs@lists.php.net
Delivered-To: ezmlm-scan-zend-engine-cvs@lists.php.net
Delivered-To: ezmlm-zend-engine-cvs@lists.php.net
From: "Anantha Kesari H Y" hyanantha@php.net
To: zend-engine-cvs@lists.php.net
Date: Wed, 22 Sep 2004 15:51:56 -0000
Subject: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend_execute_API.c
zend_globals.h
X-Bogosity: No, tests=bogofilter, spamicity=0.000000, version=0.13.6.2

hyanantha Wed Sep 22 11:51:56 2004 EDT

Modified files:
/ZendEngine2 zend_globals.h zend_execute_API.c
Log:
NetWare specific stack limit checks

http://cvs.php.net/diff.php/ZendEngine2/zend_globals.h?r1=1.137&r2=1.138&ty=u
Index: ZendEngine2/zend_globals.h
diff -u ZendEngine2/zend_globals.h:1.137 ZendEngine2/zend_globals.h:1.138
--- ZendEngine2/zend_globals.h:1.137 Mon Aug 23 16:57:40 2004
+++ ZendEngine2/zend_globals.h Wed Sep 22 11:51:56 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: zend_globals.h,v 1.137 2004/08/23 20:57:40 helly Exp $ /
+/ $Id: zend_globals.h,v 1.138 2004/09/22 15:51:56 hyanantha Exp $ */

#ifndef ZEND_GLOBALS_H
#define ZEND_GLOBALS_H
@@ -202,6 +202,10 @@

#ifdef ZEND_WIN32
zend_bool timed_out;
+#endif

+#ifdef NETWARE

•   zend_bool nw_stack_limit;
  

#endif

    HashTable regular_list;

http://cvs.php.net/diff.php/ZendEngine2/zend_execute_API.c?r1=1.296&r2=1.297&ty=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.296
ZendEngine2/zend_execute_API.c:1.297
--- ZendEngine2/zend_execute_API.c:1.296 Fri Sep 17 06:13:52 2004
+++ ZendEngine2/zend_execute_API.c Wed Sep 22 11:51:56 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: zend_execute_API.c,v 1.296 2004/09/17 10:13:52 stas Exp $ /
+/ $Id: zend_execute_API.c,v 1.297 2004/09/22 15:51:56 hyanantha Exp $ */

#include <stdio.h>
#include <signal.h>
@@ -49,6 +49,9 @@
static int timeout_thread_initialized=0;
#endif

+#ifdef NETWARE
+ZEND_API void zend_nw_stack_limit(int dummy);
+#endif

#if ZEND_DEBUG
static void (*original_sigsegv_handler)(int);
@@ -178,6 +181,10 @@
EG(timed_out) = 0;
#endif

+#ifdef NETWARE

•   EG(nw_stack_limit) = 0;
  

+#endif

•   EG(exception) = NULL;
  
    EG(scope) = NULL;
  

@@ -1104,6 +1111,12 @@
EG(timeout_seconds), EG(timeout_seconds) == 1 ?
"" : "s");
}

+#ifdef NETWARE
+ZEND_API void zend_nw_stack_limit(int dummy)
+{

• zend_error(E_ERROR, "Stack limit exceeded");
  +}
  +#endif

#ifdef ZEND_WIN32
static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam)

--
Zend Engine CVS Mailing List (http://cvs.php.net/)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Do we want this in the core engine?
If so, why not create a general solution for multi-threaded systems (I
think Apache pre-fork is better off without it due to performance reasons).
Anantha, can you please revert this patch until we come to a conclusion? I
prefer doing a general implementation (#ifdef'ed) and having each platform
implement their own stack threshold check.

Speaking of Netware, and slightly ot.. ;-), does anyone have access to a
NetWare boxen? Or maybe Novell could donate a slice of one to PHP
development (way out of scope..) ?

I've done a lot of NW patching in the past, a bit rusty, but would be glad to
help out with anything that that I can - testing &c.. :D

Elfyn

Elfyn McBratney
beu on irc.freenode.net/savannah.[non]gnu.org

PGP Key ID: 0x456548B4
PGP Key Fingerprint:
29D5 91BB 8748 7CC9 650F 31FE 6888 0C2A 4565 48B4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFBVFeuaIgMKkVlSLQRAss5AKCQuov+DwHUqu3pdKt5Hhww7EUQwwCgtmSe
TqrU+/Iy1iMv9UjbtiDeTSU=
=UkVt
-----END PGP SIGNATURE