From: Nikita Popov <nikic@php.net>
Date: Mon, 22 Sep 2014 21:21:59 +0000 (+0200)
Subject: Remove static allocator
X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02bb637bb8fef6612eb49f862eb7dd9529b3cf76;p=php

Remove static allocator

We didn't even compile this file anymore
---

diff --git a/Zend/zend_static_allocator.c b/Zend/zend_static_allocator.c
deleted file mode 100644
index 049d29f6a2..0000000000
--- a/Zend/zend_static_allocator.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend 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.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#include "zend_static_allocator.h"
-
-/* Not checking emalloc() and erealloc() return values as they are supposed to bailout */
-
-inline static void block_init(Block *block, uint32_t block_size)
-{
-	block->pos = block->bp = (char *) emalloc(block_size);
-	block->end = block->bp + block_size;
-}
-
-inline static char *block_allocate(Block *block, uint32_t size)
-{
-	char *retval = block->pos;
-	if ((block->pos += size) >= block->end) {
-		return (char *)NULL;
-	}
-	return retval;
-}
-
-inline static void block_destroy(Block *block)
-{
-	efree(block->bp);
-}
-
-void static_allocator_init(StaticAllocator *sa)
-{
-	sa->Blocks = (Block *) emalloc(sizeof(Block));
-	block_init(sa->Blocks, ALLOCATOR_BLOCK_SIZE);
-	sa->num_blocks = 1;
-	sa->current_block = 0;
-}
-
-char *static_allocator_allocate(StaticAllocator *sa, uint32_t size)
-{
-	char *retval;
-
-	retval = block_allocate(&sa->Blocks[sa->current_block], size);
-	if (retval) {
-		return retval;
-	}
-	sa->Blocks = (Block *) erealloc(sa->Blocks, ++sa->num_blocks);
-	sa->current_block++;
-	block_init(&sa->Blocks[sa->current_block], (size > ALLOCATOR_BLOCK_SIZE) ? size : ALLOCATOR_BLOCK_SIZE);
-	retval = block_allocate(&sa->Blocks[sa->current_block], size);
-	return retval;
-}
-
-void static_allocator_destroy(StaticAllocator *sa)
-{
-	uint32_t i;
-
-	for (i=0; i<sa->num_blocks; i++) {
-		block_free(&sa->Blocks[i]);
-	}
-	efree(sa->Blocks);
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- */
diff --git a/Zend/zend_static_allocator.h b/Zend/zend_static_allocator.h
deleted file mode 100644
index cd9b0ff583..0000000000
--- a/Zend/zend_static_allocator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend 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.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef ZEND_STATIC_ALLOCATOR_H
-#define ZEND_STATIC_ALLOCATOR_H
-
-#define ALLOCATOR_BLOCK_SIZE 400000
-
-/* Temporary */
-typedef unsigned int uint32_t;
-#define emalloc(s) malloc(s)
-#define efree(p) free(p)
-
-typedef struct _Block {
-	char *bp;
-	char *pos;
-	char *end;
-} Block;
-
-typedef struct _StaticAllocator {
-	Block *Blocks;
-	uint32_t num_blocks;
-	uint32_t current_block;
-} StaticAllocator;
-
-void static_allocator_init(StaticAllocator *sa);
-char *static_allocator_allocate(StaticAllocator *sa, uint32_t size);
-void static_allocator_destroy(StaticAllocator *sa);
-
-#endif /* ZEND_STATIC_ALLOCATOR_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- */
diff --git a/win32/build/projectgen.js b/win32/build/projectgen.js
index 8adb887786..0ed8cc404b 100644
--- a/win32/build/projectgen.js
+++ b/win32/build/projectgen.js
@@ -46,7 +46,6 @@ function write_src_file(fname, path, intpath, arr)
 			if (arr[i].match('alloca.c') ||
 				arr[i].match(/internal_functions_(nw|win32)\.c/) ||
 				arr[i].match(/flock\.(c|h)/) ||
-				arr[i].match(/zend_static_allocator\.(c|h)/) ||
 				arr[i].match(/zend_(ini|language)_scanner_defs\.h/)) {
 				continue;
 			}