mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
d11734b4b0
TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations.
143 lines
4.7 KiB
C
143 lines
4.7 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| PHP Version 7 |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1997-2014 The PHP Group |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 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_01.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 |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
/* $Id$ */
|
|
|
|
/* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
|
|
|
|
#ifndef FILE_H
|
|
#define FILE_H
|
|
|
|
PHP_MINIT_FUNCTION(file);
|
|
PHP_MSHUTDOWN_FUNCTION(file);
|
|
|
|
PHP_FUNCTION(tempnam);
|
|
PHP_NAMED_FUNCTION(php_if_tmpfile);
|
|
PHP_NAMED_FUNCTION(php_if_fopen);
|
|
PHPAPI PHP_FUNCTION(fclose);
|
|
PHP_FUNCTION(popen);
|
|
PHP_FUNCTION(pclose);
|
|
PHPAPI PHP_FUNCTION(feof);
|
|
PHPAPI PHP_FUNCTION(fread);
|
|
PHPAPI PHP_FUNCTION(fgetc);
|
|
PHPAPI PHP_FUNCTION(fgets);
|
|
PHP_FUNCTION(fscanf);
|
|
PHPAPI PHP_FUNCTION(fgetss);
|
|
PHP_FUNCTION(fgetcsv);
|
|
PHP_FUNCTION(fputcsv);
|
|
PHPAPI PHP_FUNCTION(fwrite);
|
|
PHPAPI PHP_FUNCTION(fflush);
|
|
PHPAPI PHP_FUNCTION(rewind);
|
|
PHPAPI PHP_FUNCTION(ftell);
|
|
PHPAPI PHP_FUNCTION(fseek);
|
|
PHP_FUNCTION(mkdir);
|
|
PHP_FUNCTION(rmdir);
|
|
PHPAPI PHP_FUNCTION(fpassthru);
|
|
PHP_FUNCTION(readfile);
|
|
PHP_FUNCTION(umask);
|
|
PHP_FUNCTION(rename);
|
|
PHP_FUNCTION(unlink);
|
|
PHP_FUNCTION(copy);
|
|
PHP_FUNCTION(file);
|
|
PHP_FUNCTION(file_get_contents);
|
|
PHP_FUNCTION(file_put_contents);
|
|
PHP_FUNCTION(get_meta_tags);
|
|
PHP_FUNCTION(flock);
|
|
PHP_FUNCTION(fd_set);
|
|
PHP_FUNCTION(fd_isset);
|
|
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
|
|
PHP_FUNCTION(realpath);
|
|
#endif
|
|
#ifdef HAVE_FNMATCH
|
|
PHP_FUNCTION(fnmatch);
|
|
#endif
|
|
PHP_NAMED_FUNCTION(php_if_ftruncate);
|
|
PHP_NAMED_FUNCTION(php_if_fstat);
|
|
PHP_FUNCTION(sys_get_temp_dir);
|
|
|
|
PHP_MINIT_FUNCTION(user_streams);
|
|
|
|
PHPAPI int php_le_stream_context(TSRMLS_D);
|
|
PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC);
|
|
PHPAPI int php_copy_file(const char *src, const char *dest TSRMLS_DC);
|
|
PHPAPI int php_copy_file_ex(const char *src, const char *dest, int src_chk TSRMLS_DC);
|
|
PHPAPI int php_copy_file_ctx(const char *src, const char *dest, int src_chk, php_stream_context *ctx TSRMLS_DC);
|
|
PHPAPI int php_mkdir_ex(const char *dir, zend_long mode, int options TSRMLS_DC);
|
|
PHPAPI int php_mkdir(const char *dir, zend_long mode TSRMLS_DC);
|
|
PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char escape_char, size_t buf_len, char *buf, zval *return_value TSRMLS_DC);
|
|
PHPAPI size_t php_fputcsv(php_stream *stream, zval *fields, char delimiter, char enclosure, char escape_char TSRMLS_DC);
|
|
|
|
#define META_DEF_BUFSIZE 8192
|
|
|
|
#define PHP_FILE_USE_INCLUDE_PATH 1
|
|
#define PHP_FILE_IGNORE_NEW_LINES 2
|
|
#define PHP_FILE_SKIP_EMPTY_LINES 4
|
|
#define PHP_FILE_APPEND 8
|
|
#define PHP_FILE_NO_DEFAULT_CONTEXT 16
|
|
|
|
typedef enum _php_meta_tags_token {
|
|
TOK_EOF = 0,
|
|
TOK_OPENTAG,
|
|
TOK_CLOSETAG,
|
|
TOK_SLASH,
|
|
TOK_EQUAL,
|
|
TOK_SPACE,
|
|
TOK_ID,
|
|
TOK_STRING,
|
|
TOK_OTHER
|
|
} php_meta_tags_token;
|
|
|
|
typedef struct _php_meta_tags_data {
|
|
php_stream *stream;
|
|
int ulc;
|
|
int lc;
|
|
char *input_buffer;
|
|
char *token_data;
|
|
int token_len;
|
|
int in_meta;
|
|
} php_meta_tags_data;
|
|
|
|
php_meta_tags_token php_next_meta_token(php_meta_tags_data * TSRMLS_DC);
|
|
|
|
typedef struct {
|
|
int pclose_ret;
|
|
size_t def_chunk_size;
|
|
zend_long auto_detect_line_endings;
|
|
zend_long default_socket_timeout;
|
|
char *user_agent; /* for the http wrapper */
|
|
char *from_address; /* for the ftp and http wrappers */
|
|
const char *user_stream_current_filename; /* for simple recursion protection */
|
|
php_stream_context *default_context;
|
|
HashTable *stream_wrappers; /* per-request copy of url_stream_wrappers_hash */
|
|
HashTable *stream_filters; /* per-request copy of stream_filters_hash */
|
|
HashTable *wrapper_errors; /* key: wrapper address; value: linked list of char* */
|
|
int pclose_wait;
|
|
} php_file_globals;
|
|
|
|
#ifdef ZTS
|
|
#define FG(v) TSRMG(file_globals_id, php_file_globals *, v)
|
|
extern PHPAPI int file_globals_id;
|
|
#else
|
|
#define FG(v) (file_globals.v)
|
|
extern PHPAPI php_file_globals file_globals;
|
|
#endif
|
|
|
|
|
|
#endif /* FILE_H */
|
|
|