poll: optimize poll add and remove for those using fd table

Author: bukka

main/poll/php_poll_internal.h

@@ -99,7 +99,8 @@ php_poll_fd_table *php_poll_fd_table_init(int initial_capacity, bool persistent)
 void php_poll_fd_table_cleanup(php_poll_fd_table *table);
 php_poll_fd_entry *php_poll_fd_table_find(php_poll_fd_table *table, int fd);
 php_poll_fd_entry *php_poll_fd_table_get(php_poll_fd_table *table, int fd);
-void php_poll_fd_table_remove(php_poll_fd_table *table, int fd);
+php_poll_fd_entry *php_poll_fd_table_get_new(php_poll_fd_table *table, int fd);
+bool php_poll_fd_table_remove(php_poll_fd_table *table, int fd);
 
 /* Accessor functions for table properties */
 static inline int php_poll_fd_table_count(php_poll_fd_table *table)

main/poll/poll_backend_eventport.c

@@ -146,7 +146,7 @@ static zend_result eventport_backend_add(
 		return FAILURE;
 	}
 
-	php_poll_fd_entry *entry = php_poll_fd_table_get(backend_data->fd_table, fd);
+	php_poll_fd_entry *entry = php_poll_fd_table_get_new(backend_data->fd_table, fd);
 	if (!entry) {
 		php_poll_set_error(ctx, PHP_POLL_ERR_NOMEM);
 		return FAILURE;

main/poll/poll_backend_poll.c

@@ -116,7 +116,7 @@ static zend_result poll_backend_add(php_poll_ctx *ctx, int fd, uint32_t events,
 		return FAILURE;
 	}
 
-	php_poll_fd_entry *entry = php_poll_fd_table_get(backend_data->fd_table, fd);
+	php_poll_fd_entry *entry = php_poll_fd_table_get_new(backend_data->fd_table, fd);
 	if (!entry) {
 		php_poll_set_error(ctx, PHP_POLL_ERR_NOMEM);
 		return FAILURE;
@@ -153,12 +153,11 @@ static zend_result poll_backend_remove(php_poll_ctx *ctx, int fd)
 {
 	poll_backend_data_t *backend_data = (poll_backend_data_t *) ctx->backend_data;
 
-	if (!php_poll_fd_table_find(backend_data->fd_table, fd)) {
+	if (!php_poll_fd_table_remove(backend_data->fd_table, fd)) {
 		php_poll_set_error(ctx, PHP_POLL_ERR_NOTFOUND);
 		return FAILURE;
 	}
 
-	php_poll_fd_table_remove(backend_data->fd_table, fd);
 	return SUCCESS;
 }
 

main/poll/poll_backend_wsapoll.c

@@ -120,7 +120,7 @@ static zend_result wsapoll_backend_add(php_poll_ctx *ctx, int fd, uint32_t event
 		return FAILURE;
 	}
 
-	php_poll_fd_entry *entry = php_poll_fd_table_get(backend_data->fd_table, fd);
+	php_poll_fd_entry *entry = php_poll_fd_table_get_new(backend_data->fd_table, fd);
 	if (!entry) {
 		php_poll_set_error(ctx, PHP_POLL_ERR_NOMEM);
 		return FAILURE;
@@ -158,12 +158,11 @@ static zend_result wsapoll_backend_remove(php_poll_ctx *ctx, int fd)
 {
 	wsapoll_backend_data_t *backend_data = (wsapoll_backend_data_t *) ctx->backend_data;
 
-	if (!php_poll_fd_table_find(backend_data->fd_table, fd)) {
+	if (!php_poll_fd_table_remove(backend_data->fd_table, fd)) {
 		php_poll_set_error(ctx, PHP_POLL_ERR_NOTFOUND);
 		return FAILURE;
 	}
 
-	php_poll_fd_table_remove(backend_data->fd_table, fd);
 	return SUCCESS;
 }
 

main/poll/poll_fd_table.c

@@ -54,14 +54,9 @@ php_poll_fd_entry *php_poll_fd_table_find(php_poll_fd_table *table, int fd)
 	return zv ? Z_PTR_P(zv) : NULL;
 }
 
-php_poll_fd_entry *php_poll_fd_table_get(php_poll_fd_table *table, int fd)
+php_poll_fd_entry *php_poll_fd_table_get_new(php_poll_fd_table *table, int fd)
 {
-	php_poll_fd_entry *entry = php_poll_fd_table_find(table, fd);
-	if (entry) {
-		return entry;
-	}
-
-	entry = php_poll_calloc(1, sizeof(php_poll_fd_entry), table->persistent);
+	php_poll_fd_entry *entry = php_poll_calloc(1, sizeof(php_poll_fd_entry), table->persistent);
 	if (!entry) {
 		return NULL;
 	}
@@ -82,14 +77,25 @@ php_poll_fd_entry *php_poll_fd_table_get(php_poll_fd_table *table, int fd)
 	return entry;
 }
 
-void php_poll_fd_table_remove(php_poll_fd_table *table, int fd)
+php_poll_fd_entry *php_poll_fd_table_get(php_poll_fd_table *table, int fd)
+{
+	php_poll_fd_entry *entry = php_poll_fd_table_find(table, fd);
+	if (entry) {
+		return entry;
+	}
+
+	return php_poll_fd_table_get_new(table, fd);
+}
+
+bool php_poll_fd_table_remove(php_poll_fd_table *table, int fd)
 {
 	zval *zv = zend_hash_index_find(&table->entries_ht, (zend_ulong) fd);
-	if (zv) {
-		php_poll_fd_entry *entry = Z_PTR_P(zv);
-		pefree(entry, table->persistent);
-		zend_hash_index_del(&table->entries_ht, (zend_ulong) fd);
+	if (zv == NULL) {
+		return false;
 	}
+	php_poll_fd_entry *entry = Z_PTR_P(zv);
+	pefree(entry, table->persistent);
+	return zend_hash_index_del(&table->entries_ht, (zend_ulong) fd) == SUCCESS;
 }
 
 /* Helper function for backends that need to iterate over all entries */