Remove fiber ID property

Author: trowski

Zend/zend.c

@@ -761,7 +761,6 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{
 	executor_globals->exception = NULL;
 	executor_globals->objects_store.object_buckets = NULL;
 	executor_globals->current_fiber = NULL;
-	executor_globals->next_fiber_id = 0;
 	executor_globals->fiber_error = NULL;
 #ifdef ZEND_WIN32
 	zend_get_windows_version_info(&executor_globals->windows_version_info);

Zend/zend_fibers.c

@@ -413,12 +413,10 @@ static zend_object *zend_fiber_object_create(zend_class_entry *ce) /* {{{ */
 	fiber = emalloc(sizeof(zend_fiber));
 	memset(fiber, 0, sizeof(zend_fiber));
 
-	fiber->id = EG(next_fiber_id)++;
-
 	zend_object_std_init(&fiber->std, ce);
 	fiber->std.handlers = &zend_fiber_handlers;
 
-	zend_hash_index_add_ptr(&EG(fibers), fiber->id, fiber);
+	zend_hash_index_add_ptr(&EG(fibers), (uintptr_t) fiber, fiber);
 
 	return &fiber->std;
 }
@@ -443,7 +441,7 @@ static void zend_fiber_object_destroy(zend_object *object) /* {{{ */
 		zval_ptr_dtor(&fiber->value);
 	}
 
-	zend_hash_index_del(&EG(fibers), fiber->id);
+	zend_hash_index_del(&EG(fibers), (uintptr_t) fiber);
 
 	zend_fiber_destroy_context(&fiber->context);
 
@@ -783,7 +781,6 @@ void zend_register_fiber_ce(void)
 void zend_fiber_init(void)
 {
 	EG(current_fiber) = NULL;
-	EG(next_fiber_id) = 0;
 	EG(fiber_error) = NULL;
 
 	zend_hash_init(&EG(fibers), 0, NULL, NULL, 0);

Zend/zend_fibers.h

@@ -60,9 +60,6 @@ typedef struct _zend_fiber {
 	/* Fiber PHP object handle. */
 	zend_object std;
 
-	/* Unique ID assigned to this fiber. */
-	zend_long id;
-
 	/* Status of the fiber, one of the ZEND_FIBER_STATUS_* constants. */
 	zend_uchar status;
 

Zend/zend_globals.h

@@ -254,9 +254,6 @@ struct _zend_executor_globals {
 	/* Active fiber, NULL when in main thread. */
 	zend_fiber *current_fiber;
 
-	/* Next fiber ID. */
-	zend_long next_fiber_id;
-
 	/* Default fiber C stack size. */
 	zend_long fiber_stack_size;