wez Fri Jul 30 10:37:18 2004 EDT
Added files: (Branch: PHP_4_3)
/php-src/win32 globals.c php_win32_globals.h
Modified files:
/php-src/ext/standard basic_functions.c
/php-src/win32 pwd.c time.c wsyslog.c
Log:
MFH: win32 zts fixes
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.543.2.39&r2=1.543.2.40&ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.543.2.39
php-src/ext/standard/basic_functions.c:1.543.2.40
--- php-src/ext/standard/basic_functions.c:1.543.2.39 Mon Jun 21 15:33:47 2004
+++ php-src/ext/standard/basic_functions.c Fri Jul 30 10:37:17 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.543.2.39 2004/06/21 19:33:47 pollita Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.40 2004/07/30 14:37:17 wez Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1037,8 +1037,14 @@
{
#ifdef ZTS
ts_allocate_id(&basic_globals_id, sizeof(php_basic_globals),
(ts_allocate_ctor) basic_globals_ctor, (ts_allocate_dtor) basic_globals_dtor);
+#ifdef PHP_WIN32
+ ts_allocate_id(&php_win32_core_globals_id, sizeof(php_win32_core_globals),
(ts_allocate_ctor)php_win32_core_globals_ctor, NULL);
+#endif
#else
basic_globals_ctor(&basic_globals TSRMLS_CC);
+#ifdef PHP_WIN32
+ php_win32_core_globals_ctor(&php_win32_core_globals TSRMLS_CC);
+#endif
#endif
REGISTER_LONG_CONSTANT("CONNECTION_ABORTED", PHP_CONNECTION_ABORTED, CONST_CS
| CONST_PERSISTENT);
@@ -1125,6 +1131,9 @@
{
#ifdef ZTS
ts_free_id(basic_globals_id);
+#ifdef PHP_WIN32
+ ts_free_id(php_win32_core_globals_id);
+#endif
#else
basic_globals_dtor(&basic_globals TSRMLS_CC);
#endif
http://cvs.php.net/diff.php/php-src/win32/pwd.c?r1=1.5.4.1&r2=1.5.4.2&ty=u
Index: php-src/win32/pwd.c
diff -u php-src/win32/pwd.c:1.5.4.1 php-src/win32/pwd.c:1.5.4.2
--- php-src/win32/pwd.c:1.5.4.1 Tue Dec 31 11:35:51 2002
+++ php-src/win32/pwd.c Fri Jul 30 10:37:17 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pwd.c,v 1.5.4.1 2002/12/31 16:35:51 sebastian Exp $ */
+/* $Id: pwd.c,v 1.5.4.2 2004/07/30 14:37:17 wez Exp $ */
#include "php.h" /*php specific */
#define WIN32_LEAN_AND_MEAN
@@ -28,10 +28,7 @@
#include <lmapibuf.h>
#include "pwd.h"
#include "grp.h"
-
-#ifndef THREAD_SAFE
-static struct passwd pwd;
-#endif
+#include "php_win32_globals.h"
static char *home_dir = ".";
static char *login_shell = "not command.com!";
@@ -46,21 +43,26 @@
char *
getlogin()
{
- static char name[256];
+ char name[256];
DWORD max_len = 256;
+ TSRMLS_FETCH();
+ STR_FREE(PW32G(login_name));
GetUserName(name, &max_len);
- return name;
+ name[max_len] = '\0';
+ PW32G(login_name) = strdup(name);
+ return PW32G(login_name);
}
struct passwd *
getpwuid(int user_id)
{
- pwd.pw_name = getlogin();
- pwd.pw_dir = home_dir;
- pwd.pw_shell = login_shell;
- pwd.pw_uid = 0;
+ TSRMLS_FETCH();
+ PW32G(pwd).pw_name = getlogin();
+ PW32G(pwd).pw_dir = home_dir;
+ PW32G(pwd).pw_shell = login_shell;
+ PW32G(pwd).pw_uid = 0;
- return &pwd;
+ return &PW32G(pwd);
}
http://cvs.php.net/diff.php/php-src/win32/time.c?r1=1.6&r2=1.6.4.1&ty=u
Index: php-src/win32/time.c
diff -u php-src/win32/time.c:1.6 php-src/win32/time.c:1.6.4.1
--- php-src/win32/time.c:1.6 Sun Jun 23 19:22:33 2002
+++ php-src/win32/time.c Fri Jul 30 10:37:17 2004
@@ -11,7 +11,7 @@
*
*****************************************************************************/
-/* $Id: time.c,v 1.6 2002/06/23 23:22:33 edink Exp $ */
+/* $Id: time.c,v 1.6.4.1 2004/07/30 14:37:17 wez Exp $ */
/**
*
@@ -28,6 +28,7 @@
#include <winbase.h>
#include <mmsystem.h>
#include <errno.h>
+#include "php_win32_globals.h"
int getfilesystemtime(struct timeval *time_Info)
{
@@ -46,64 +47,61 @@
PHPAPI int gettimeofday(struct timeval *time_Info, struct timezone *timezone_Info)
{
-
- static struct timeval starttime = {0, 0};
- static __int64 lasttime = 0;
- static __int64 freq = 0;
__int64 timer;
LARGE_INTEGER li;
BOOL b;
double dt;
+ TSRMLS_FETCH();
/* Get the time, if they want it */
if (time_Info != NULL) {
- if (starttime.tv_sec == 0) {
+ if (PW32G(starttime).tv_sec == 0) {
b = QueryPerformanceFrequency(&li);
if (!b) {
- starttime.tv_sec = -1;
+ PW32G(starttime).tv_sec = -1;
}
else {
- freq = li.QuadPart;
+ PW32G(freq) = li.QuadPart;
b = QueryPerformanceCounter(&li);
if (!b) {
- starttime.tv_sec = -1;
+ PW32G(starttime).tv_sec = -1;
}
else {
- getfilesystemtime(&starttime);
+ getfilesystemtime(&PW32G(starttime));
timer = li.QuadPart;
- dt = (double)timer/freq;
- starttime.tv_usec -= (int)((dt-(int)dt)*1000000);
- if (starttime.tv_usec < 0) {
- starttime.tv_usec += 1000000;
- --starttime.tv_sec;
+ dt = (double)timer/PW32G(freq);
+ PW32G(starttime).tv_usec -= (int)((dt-(int)dt)*1000000);
+ if (PW32G(starttime).tv_usec < 0) {
+ PW32G(starttime).tv_usec += 1000000;
+ --PW32G(starttime).tv_sec;
}
- starttime.tv_sec -= (int)dt;
+ PW32G(starttime).tv_sec -= (int)dt;
}
}
}
- if (starttime.tv_sec > 0) {
+ if (PW32G(starttime).tv_sec > 0) {
b = QueryPerformanceCounter(&li);
if (!b) {
- starttime.tv_sec = -1;
+ PW32G(starttime).tv_sec = -1;
}
else {
timer = li.QuadPart;
- if (timer < lasttime) {
+ if (timer < PW32G(lasttime)) {
getfilesystemtime(time_Info);
- dt = (double)timer/freq;
- starttime = *time_Info;
- starttime.tv_usec -= (int)((dt-(int)dt)*1000000);
- if (starttime.tv_usec < 0) {
- starttime.tv_usec += 1000000;
- --starttime.tv_sec;
+ dt = (double)timer/PW32G(freq);
+ PW32G(starttime) = *time_Info;
+ PW32G(starttime).tv_usec -= (int)((dt-(int)dt)*1000000);
+ if (PW32G(starttime).tv_usec < 0) {
+ PW32G(starttime).tv_usec += 1000000;
+ --PW32G(starttime).tv_sec;
}
- starttime.tv_sec -= (int)dt;
+ PW32G(starttime).tv_sec -= (int)dt;
}
else {
- lasttime = timer;
- dt = (double)timer/freq;
- time_Info->tv_sec = starttime.tv_sec + (int)dt;
- time_Info->tv_usec = starttime.tv_usec +
(int)((dt-(int)dt)*1000000);
+ PW32G(lasttime) = timer;
+ dt = (double)timer/PW32G(freq);
+ time_Info->tv_sec = PW32G(starttime).tv_sec + (int)dt;
+ time_Info->tv_usec = PW32G(starttime).tv_usec +
(int)((dt-(int)dt)*1000000);
if (time_Info->tv_usec > 1000000) {
time_Info->tv_usec -= 1000000;
++time_Info->tv_sec;
@@ -111,7 +109,7 @@
}
}
}
- if (starttime.tv_sec < 0) {
+ if (PW32G(starttime).tv_sec < 0) {
getfilesystemtime(time_Info);
}
@@ -159,6 +157,7 @@
}
+#if 0 /* looks pretty ropey in here */
#ifdef HAVE_SETITIMER
@@ -240,3 +239,5 @@
}
#endif
+#endif
+
http://cvs.php.net/diff.php/php-src/win32/wsyslog.c?r1=1.4&r2=1.4.16.1&ty=u
Index: php-src/win32/wsyslog.c
diff -u php-src/win32/wsyslog.c:1.4 php-src/win32/wsyslog.c:1.4.16.1
--- php-src/win32/wsyslog.c:1.4 Sat Feb 19 08:11:02 2000
+++ php-src/win32/wsyslog.c Fri Jul 30 10:37:17 2004
@@ -56,15 +56,14 @@
#include <fcntl.h>
#include <process.h>
-#ifndef THREAD_SAFE
-static char *loghdr; /* log file header string */
-static HANDLE loghdl = NULL; /* handle of event source */
-#endif
+#include "php_win32_globals.h"
void closelog(void)
{
- DeregisterEventSource(loghdl);
- efree(loghdr);
+ TSRMLS_FETCH();
+ DeregisterEventSource(PW32G(log_source));
+ STR_FREE(PW32G(log_header));
+ PW32G(log_header) = NULL;
}
/* Emulator for BSD syslog() routine
@@ -77,12 +76,14 @@
{
va_list args;
LPTSTR strs[2];
- char tmp[1024]; /* callers must be careful not to pop
this */
unsigned short etype;
-
+ char *tmp = NULL;
+ TSRMLS_FETCH();
+
/* default event source */
- if (!loghdl)
- openlog("c-client", LOG_PID, LOG_MAIL);
+ if (!PW32G(log_source))
+ openlog("php", LOG_PID, LOG_SYSLOG);
+
switch (priority) { /* translate UNIX type into NT type */
case LOG_ALERT:
etype = EVENTLOG_ERROR_TYPE;
@@ -94,12 +95,13 @@
etype = EVENTLOG_WARNING_TYPE;
}
va_start(args, message); /* initialize vararg mechanism */
- vsprintf(tmp, message, args); /* build message */
- strs[0] = loghdr; /* write header */
+ vspprintf(&tmp, 0, message, args); /* build message */
+ strs[0] = PW32G(log_header); /* write header */
strs[1] = tmp; /* then the message */
/* report the event */
- ReportEvent(loghdl, etype, (unsigned short) priority, 2000, NULL, 2, 0, strs,
NULL);
+ ReportEvent(PW32G(log_source), etype, (unsigned short) priority, 2000, NULL,
2, 0, strs, NULL);
va_end(args);
+ efree(tmp);
}
@@ -111,12 +113,14 @@
void openlog(const char *ident, int logopt, int facility)
{
- char tmp[1024];
+ TSRMLS_FETCH();
- if (loghdl) {
+ if (PW32G(log_source)) {
closelog();
}
- loghdl = RegisterEventSource(NULL, ident);
- sprintf(tmp, (logopt & LOG_PID) ? "%s[%d]" : "%s", ident, getpid());
- loghdr = estrdup(tmp); /* save header for later */
+
+ STR_FREE(PW32G(log_header));
+
+ PW32G(log_source) = RegisterEventSource(NULL, ident);
+ spprintf(&PW32G(log_header), 0, (logopt & LOG_PID) ? "%s[%d]" : "%s", ident,
getpid());
}
http://cvs.php.net/co.php/php-src/win32/globals.c?r=1.1&p=1
Index: php-src/win32/globals.c
+++ php-src/win32/globals.c
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2004 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_0.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
/* $Id: globals.c,v 1.1 2004/07/29 02:59:43 wez Exp $ */
#include "php.h"
#include "php_win32_globals.h"
#ifdef ZTS
PHPAPI int php_win32_core_globals_id;
#else
php_win32_core_globals php_win32_core_globals;
#endif
void php_win32_core_globals_ctor(void *vg TSRMLS_DC)
{
php_win32_core_globals *wg = (php_win32_core_globals*)vg;
memset(wg, 0, sizeof(*wg));
}
PHP_RSHUTDOWN_FUNCTION(win32_core_globals)
{
php_win32_core_globals *wg =
#ifdef ZTS
ts_resource(php_win32_core_globals_id)
#else
&php_win32_core_globals
#endif
;
STR_FREE(wg->login_name);
memset(wg, 0, sizeof(*wg));
}
http://cvs.php.net/co.php/php-src/win32/php_win32_globals.h?r=1.1&p=1
Index: php-src/win32/php_win32_globals.h
+++ php-src/win32/php_win32_globals.h
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2004 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_0.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
/* $Id: php_win32_globals.h,v 1.1 2004/07/29 02:59:43 wez Exp $ */
#ifndef PHP_WIN32_GLOBALS_H
#define PHP_WIN32_GLOBALS_H
/* misc globals for thread-safety under win32 */
#include "pwd.h"
typedef struct _php_win32_core_globals php_win32_core_globals;
#ifdef ZTS
# define PW32G(v) TSRMG(php_win32_core_globals_id,
php_win32_core_globals*, v)
extern PHPAPI int php_win32_core_globals_id;
#else
# define PW32G(v) (php_win32_core_globals.v)
extern PHPAPI struct _php_win32_core_globals php_win32_core_globals;
#endif
struct _php_win32_core_globals {
/* syslog */
char *log_header;
HANDLE log_source;
/* getpwuid */
struct passwd pwd;
/* getlogin */
char *login_name;
/* time */
struct timeval starttime;
__int64 lasttime, freq;
};
void php_win32_core_globals_ctor(void *vg TSRMLS_DC);
PHP_RSHUTDOWN_FUNCTION(win32_core_globals);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
