Skip to content

Commit b317f0e

Browse files
nikicnikic
committed
Remove ZEND_HANDLE_MAPPED
The buf/len members are now simply used in addition to the main stream, without changing the handle kind.
1 parent e0eca26 commit b317f0e

File tree

6 files changed

+42
-95
lines changed

6 files changed

+42
-95
lines changed

‎Zend/zend_stream.c

Lines changed: 35 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -51,35 +51,11 @@ static size_t zend_stream_stdio_fsizer(void *handle) /* {{{ */
5151
return 0;
5252
} /* }}} */
5353

54-
static void zend_stream_unmap(zend_stream *stream) { /* {{{ */
55-
if (stream->mmap.buf) {
56-
efree(stream->mmap.buf);
57-
}
58-
stream->mmap.len = 0;
59-
stream->mmap.buf = 0;
60-
stream->handle = stream->mmap.old_handle;
61-
} /* }}} */
62-
63-
static void zend_stream_mmap_closer(zend_stream *stream) /* {{{ */
64-
{
65-
zend_stream_unmap(stream);
66-
if (stream->mmap.old_closer && stream->handle) {
67-
stream->mmap.old_closer(stream->handle);
68-
}
69-
} /* }}} */
70-
71-
static inline int zend_stream_is_mmap(zend_file_handle *file_handle) { /* {{{ */
72-
return file_handle->type == ZEND_HANDLE_MAPPED;
73-
} /* }}} */
74-
7554
static size_t zend_stream_fsize(zend_file_handle *file_handle) /* {{{ */
7655
{
7756
zend_stat_t buf;
7857

79-
if (zend_stream_is_mmap(file_handle)) {
80-
return file_handle->handle.stream.mmap.len;
81-
}
82-
if (file_handle->type == ZEND_HANDLE_STREAM || file_handle->type == ZEND_HANDLE_MAPPED) {
58+
if (file_handle->type == ZEND_HANDLE_STREAM) {
8359
return file_handle->handle.stream.fsizer(file_handle->handle.stream.handle);
8460
}
8561
if (file_handle->handle.fp && zend_fstat(fileno(file_handle->handle.fp), &buf) == 0) {
@@ -109,16 +85,14 @@ ZEND_API void zend_stream_init_filename(zend_file_handle *handle, const char *fi
10985

11086
ZEND_API int zend_stream_open(const char *filename, zend_file_handle *handle) /* {{{ */
11187
{
88+
zend_string *opened_path;
11289
if (zend_stream_open_function) {
11390
return zend_stream_open_function(filename, handle);
11491
}
115-
handle->type = ZEND_HANDLE_FP;
116-
handle->opened_path = NULL;
117-
handle->handle.fp = zend_fopen(filename, &handle->opened_path);
118-
handle->filename = filename;
119-
memset(&handle->handle.stream.mmap, 0, sizeof(zend_mmap));
12092

121-
return (handle->handle.fp) ? SUCCESS : FAILURE;
93+
zend_stream_init_fp(handle, zend_fopen(filename, &opened_path), filename);
94+
handle->opened_path = opened_path;
95+
return handle->handle.fp ? SUCCESS : FAILURE;
12296
} /* }}} */
12397

12498
static int zend_stream_getc(zend_file_handle *file_handle) /* {{{ */
@@ -133,7 +107,7 @@ static int zend_stream_getc(zend_file_handle *file_handle) /* {{{ */
133107

134108
static size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t len) /* {{{ */
135109
{
136-
if (!zend_stream_is_mmap(file_handle) && file_handle->handle.stream.isatty) {
110+
if (file_handle->handle.stream.isatty) {
137111
int c = '*';
138112
size_t n;
139113

@@ -154,35 +128,29 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
154128
size_t size;
155129
zend_stream_type old_type;
156130

131+
if (file_handle->buf) {
132+
*buf = file_handle->buf;
133+
*len = file_handle->len;
134+
return SUCCESS;
135+
}
136+
157137
if (file_handle->type == ZEND_HANDLE_FILENAME) {
158138
if (zend_stream_open(file_handle->filename, file_handle) == FAILURE) {
159139
return FAILURE;
160140
}
161141
}
162142

163-
switch (file_handle->type) {
164-
case ZEND_HANDLE_FP:
165-
if (!file_handle->handle.fp) {
166-
return FAILURE;
167-
}
168-
memset(&file_handle->handle.stream.mmap, 0, sizeof(zend_mmap));
169-
file_handle->handle.stream.isatty = isatty(fileno((FILE *)file_handle->handle.stream.handle));
170-
file_handle->handle.stream.reader = (zend_stream_reader_t)zend_stream_stdio_reader;
171-
file_handle->handle.stream.closer = (zend_stream_closer_t)zend_stream_stdio_closer;
172-
file_handle->handle.stream.fsizer = (zend_stream_fsizer_t)zend_stream_stdio_fsizer;
173-
memset(&file_handle->handle.stream.mmap, 0, sizeof(file_handle->handle.stream.mmap));
174-
/* no break; */
175-
case ZEND_HANDLE_STREAM:
176-
/* nothing to do */
177-
break;
178-
179-
case ZEND_HANDLE_MAPPED:
180-
*buf = file_handle->handle.stream.mmap.buf;
181-
*len = file_handle->handle.stream.mmap.len;
182-
return SUCCESS;
183-
184-
default:
143+
if (file_handle->type == ZEND_HANDLE_FP) {
144+
if (!file_handle->handle.fp) {
185145
return FAILURE;
146+
}
147+
148+
file_handle->type = ZEND_HANDLE_STREAM;
149+
file_handle->handle.stream.handle = file_handle->handle.fp;
150+
file_handle->handle.stream.isatty = isatty(fileno((FILE *)file_handle->handle.stream.handle));
151+
file_handle->handle.stream.reader = (zend_stream_reader_t)zend_stream_stdio_reader;
152+
file_handle->handle.stream.closer = (zend_stream_closer_t)zend_stream_stdio_closer;
153+
file_handle->handle.stream.fsizer = (zend_stream_fsizer_t)zend_stream_stdio_fsizer;
186154
}
187155

188156
size = zend_stream_fsize(file_handle);
@@ -194,8 +162,8 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
194162
file_handle->type = ZEND_HANDLE_STREAM; /* we might still be _FP but we need fsize() work */
195163

196164
if (old_type == ZEND_HANDLE_FP && !file_handle->handle.stream.isatty && size) {
197-
file_handle->handle.stream.mmap.buf = *buf = safe_emalloc(1, size, ZEND_MMAP_AHEAD);
198-
file_handle->handle.stream.mmap.len = zend_stream_read(file_handle, *buf, size);
165+
file_handle->buf = *buf = safe_emalloc(1, size, ZEND_MMAP_AHEAD);
166+
file_handle->len = zend_stream_read(file_handle, *buf, size);
199167
} else {
200168
size_t read, remain = 4*1024;
201169
*buf = emalloc(remain);
@@ -210,29 +178,22 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
210178
remain = size;
211179
}
212180
}
213-
file_handle->handle.stream.mmap.len = size;
181+
file_handle->len = size;
214182
if (size && remain < ZEND_MMAP_AHEAD) {
215183
*buf = safe_erealloc(*buf, size, 1, ZEND_MMAP_AHEAD);
216184
}
217-
file_handle->handle.stream.mmap.buf = *buf;
185+
file_handle->buf = *buf;
218186
}
219187

220-
if (file_handle->handle.stream.mmap.len == 0) {
188+
if (file_handle->len == 0) {
221189
*buf = erealloc(*buf, ZEND_MMAP_AHEAD);
222-
file_handle->handle.stream.mmap.buf = *buf;
190+
file_handle->buf = *buf;
223191
}
224192

225-
if (ZEND_MMAP_AHEAD) {
226-
memset(file_handle->handle.stream.mmap.buf + file_handle->handle.stream.mmap.len, 0, ZEND_MMAP_AHEAD);
227-
}
228-
file_handle->type = ZEND_HANDLE_MAPPED;
229-
file_handle->handle.stream.mmap.old_handle = file_handle->handle.stream.handle;
230-
file_handle->handle.stream.mmap.old_closer = file_handle->handle.stream.closer;
231-
file_handle->handle.stream.handle = &file_handle->handle.stream;
232-
file_handle->handle.stream.closer = (zend_stream_closer_t)zend_stream_mmap_closer;
193+
memset(file_handle->buf + file_handle->len, 0, ZEND_MMAP_AHEAD);
233194

234-
*buf = file_handle->handle.stream.mmap.buf;
235-
*len = file_handle->handle.stream.mmap.len;
195+
*buf = file_handle->buf;
196+
*len = file_handle->len;
236197

237198
return SUCCESS;
238199
} /* }}} */
@@ -244,7 +205,6 @@ ZEND_API void zend_file_handle_dtor(zend_file_handle *fh) /* {{{ */
244205
fclose(fh->handle.fp);
245206
break;
246207
case ZEND_HANDLE_STREAM:
247-
case ZEND_HANDLE_MAPPED:
248208
if (fh->handle.stream.closer && fh->handle.stream.handle) {
249209
fh->handle.stream.closer(fh->handle.stream.handle);
250210
}
@@ -260,6 +220,10 @@ ZEND_API void zend_file_handle_dtor(zend_file_handle *fh) /* {{{ */
260220
zend_string_release_ex(fh->opened_path, 0);
261221
fh->opened_path = NULL;
262222
}
223+
if (fh->buf) {
224+
efree(fh->buf);
225+
fh->buf = NULL;
226+
}
263227
}
264228
/* }}} */
265229

@@ -273,11 +237,6 @@ ZEND_API int zend_compare_file_handles(zend_file_handle *fh1, zend_file_handle *
273237
return fh1->handle.fp == fh2->handle.fp;
274238
case ZEND_HANDLE_STREAM:
275239
return fh1->handle.stream.handle == fh2->handle.stream.handle;
276-
case ZEND_HANDLE_MAPPED:
277-
return (fh1->handle.stream.handle == &fh1->handle.stream &&
278-
fh2->handle.stream.handle == &fh2->handle.stream &&
279-
fh1->handle.stream.mmap.old_handle == fh2->handle.stream.mmap.old_handle)
280-
|| fh1->handle.stream.handle == fh2->handle.stream.handle;
281240
default:
282241
return 0;
283242
}

‎Zend/zend_stream.h

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,12 @@ typedef void (*zend_stream_closer_t)(void* handle);
3737
typedef enum {
3838
ZEND_HANDLE_FILENAME,
3939
ZEND_HANDLE_FP,
40-
ZEND_HANDLE_STREAM,
41-
ZEND_HANDLE_MAPPED
40+
ZEND_HANDLE_STREAM
4241
} zend_stream_type;
4342

44-
typedef struct _zend_mmap {
45-
size_t len;
46-
char *buf;
47-
void *old_handle;
48-
zend_stream_closer_t old_closer;
49-
} zend_mmap;
50-
5143
typedef struct _zend_stream {
5244
void *handle;
5345
int isatty;
54-
zend_mmap mmap;
5546
zend_stream_reader_t reader;
5647
zend_stream_fsizer_t fsizer;
5748
zend_stream_closer_t closer;
@@ -65,6 +56,8 @@ typedef struct _zend_file_handle {
6556
const char *filename;
6657
zend_string *opened_path;
6758
zend_stream_type type;
59+
char *buf;
60+
size_t len;
6861
} zend_file_handle;
6962

7063
BEGIN_EXTERN_C()

‎ext/opcache/ZendAccelerator.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,6 @@ accel_time_t zend_get_file_handle_timestamp(zend_file_handle *file_handle, size_
970970
}
971971
break;
972972
case ZEND_HANDLE_FILENAME:
973-
case ZEND_HANDLE_MAPPED:
974973
if (file_handle->opened_path) {
975974
char *file_path = ZSTR_VAL(file_handle->opened_path);
976975

‎ext/phar/phar.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3264,7 +3264,6 @@ static zend_op_array *phar_compile_file(zend_file_handle *file_handle, int type)
32643264

32653265
switch (file_handle->type) {
32663266
case ZEND_HANDLE_STREAM:
3267-
case ZEND_HANDLE_MAPPED:
32683267
if (file_handle->handle.stream.closer && file_handle->handle.stream.handle) {
32693268
file_handle->handle.stream.closer(file_handle->handle.stream.handle);
32703269
}
@@ -3288,7 +3287,6 @@ static zend_op_array *phar_compile_file(zend_file_handle *file_handle, int type)
32883287
phar->is_persistent ?
32893288
php_stream_rewind(PHAR_G(cached_fp)[phar->phar_pos].fp) :
32903289
php_stream_rewind(phar->fp);
3291-
memset(&file_handle->handle.stream.mmap, 0, sizeof(file_handle->handle.stream.mmap));
32923290
}
32933291
}
32943292
}

‎main/main.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,16 +1580,17 @@ static int php_stream_open_for_zend(const char *filename, zend_file_handle *hand
15801580

15811581
PHPAPI int php_stream_open_for_zend_ex(const char *filename, zend_file_handle *handle, int mode) /* {{{ */
15821582
{
1583-
php_stream *stream = php_stream_open_wrapper((char *)filename, "rb", mode, &handle->opened_path);
1584-
1583+
zend_string *opened_path;
1584+
php_stream *stream = php_stream_open_wrapper((char *)filename, "rb", mode, &opened_path);
15851585
if (stream) {
1586+
memset(handle, 0, sizeof(zend_file_handle));
15861587
handle->type = ZEND_HANDLE_STREAM;
15871588
handle->filename = (char*)filename;
1589+
handle->opened_path = opened_path;
15881590
handle->handle.stream.handle = stream;
15891591
handle->handle.stream.reader = (zend_stream_reader_t)_php_stream_read;
15901592
handle->handle.stream.fsizer = php_zend_stream_fsizer;
15911593
handle->handle.stream.isatty = 0;
1592-
memset(&handle->handle.stream.mmap, 0, sizeof(handle->handle.stream.mmap));
15931594
handle->handle.stream.closer = php_zend_stream_closer;
15941595
/* suppress warning if this stream is not explicitly closed */
15951596
php_stream_auto_cleanup(stream);

‎sapi/phpdbg/phpdbg_prompt.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,9 +577,6 @@ int phpdbg_compile(void) /* {{{ */
577577
if (php_stream_open_for_zend_ex(PHPDBG_G(exec), &fh, USE_PATH|STREAM_OPEN_FOR_INCLUDE) == SUCCESS && zend_stream_fixup(&fh, &buf, &len) == SUCCESS) {
578578
CG(skip_shebang) = 1;
579579
PHPDBG_G(ops) = zend_compile_file(&fh, ZEND_INCLUDE);
580-
581-
fh.handle.stream.mmap.buf = buf;
582-
fh.handle.stream.mmap.len = len;
583580
zend_destroy_file_handle(&fh);
584581
if (EG(exception)) {
585582
zend_exception_error(EG(exception), E_ERROR);

0 commit comments

Comments
 (0)