trying rshutdown graph compaction

Author: zeriyoshi

ext/opcache/tests/static_cache_explicit_cache_shared_graph_relocation_001.phpt

@@ -0,0 +1,56 @@
+--TEST--
+OPcache explicit volatile cache relocates unreferenced shared graph blocks during compaction
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.static_cache.volatile_size_mb=8
+--FILE--
+<?php
+
+function build_relocatable_graph(): array
+{
+    $rows = [];
+    for ($i = 0; $i < 3500; $i++) {
+        $rows[] = [
+            $i,
+            str_repeat(chr(65 + ($i % 26)), 48),
+            [$i * 2, $i * 3],
+        ];
+    }
+
+    return [
+        'rows' => $rows,
+        'meta' => ['kind' => 'relocatable'],
+    ];
+}
+
+OPcache\volatile_clear();
+
+var_dump(OPcache\volatile_store('shared_graph_relocation_first', str_repeat('A', 1500000)));
+var_dump(OPcache\volatile_store('shared_graph_relocation_graph', build_relocatable_graph()));
+var_dump(OPcache\volatile_store('shared_graph_relocation_third', str_repeat('C', 1500000)));
+
+OPcache\volatile_delete('shared_graph_relocation_first');
+
+var_dump(OPcache\volatile_store('shared_graph_relocation_merged', str_repeat('M', 3200000)));
+
+$graph = OPcache\volatile_fetch('shared_graph_relocation_graph');
+var_dump($graph['rows'][123][1]);
+var_dump($graph['rows'][123][2][1]);
+var_dump($graph['meta']['kind']);
+var_dump(strlen(OPcache\volatile_fetch('shared_graph_relocation_merged')));
+var_dump(strlen(OPcache\volatile_fetch('shared_graph_relocation_third')));
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+string(48) "TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT"
+int(369)
+string(11) "relocatable"
+int(3200000)
+int(1500000)

ext/opcache/zend_static_cache.c

@@ -1290,11 +1290,17 @@ static zend_result zend_opcache_static_cache_rinit(void)
 
 zend_result zend_opcache_static_cache_rshutdown(void)
 {
+	bool shared_graph_refs_released;
+
 	zend_opcache_static_cache_clear_lookup_caches();
 	zend_opcache_static_cache_request_shutdown();
 	zend_opcache_static_cache_release_request_entry_locks();
 	zend_opcache_static_cache_release_request_local_slots();
-	zend_opcache_static_cache_release_request_shared_graph_refs();
+
+	shared_graph_refs_released = zend_opcache_static_cache_release_request_shared_graph_refs();
+	if (shared_graph_refs_released) {
+		zend_opcache_static_cache_compact_after_request_shutdown();
+	}
 
 	EG(static_cache_class_access_active) = false;
 	EG(tracked_mutation_hooks_active) = false;

ext/opcache/zend_static_cache_internal.h

@@ -421,6 +421,8 @@ bool zend_opcache_static_cache_header_init_locked(void);
 void zend_opcache_static_cache_free_locked(uint32_t payload_offset);
 uint32_t zend_opcache_static_cache_alloc_locked(size_t size, const void *source);
 bool zend_opcache_static_cache_compact_to_fit_locked(size_t size);
+bool zend_opcache_static_cache_compact_available_locked(void);
+void zend_opcache_static_cache_compact_after_request_shutdown(void);
 bool zend_opcache_static_cache_startup_storage_before_request(void);
 void zend_opcache_static_cache_shutdown_storage(void);
 void zend_opcache_static_cache_ensure_ready(void);
@@ -461,13 +463,15 @@ bool zend_opcache_static_cache_shared_graph_copy_fits_buffer(
 		size_t target_buffer_len);
 bool zend_opcache_static_cache_fetch_shared_graph(const unsigned char *buffer, size_t buffer_len, zval *destination);
 bool zend_opcache_static_cache_shared_graph_can_overwrite_payload_locked(uint32_t payload_offset);
+bool zend_opcache_static_cache_shared_graph_can_move_payload_locked(uint32_t payload_offset);
+bool zend_opcache_static_cache_shared_graph_rebase_moved_payload_locked(uint32_t payload_offset, ptrdiff_t delta);
 bool zend_opcache_static_cache_shared_graph_acquire_locked(uint32_t payload_offset);
 bool zend_opcache_static_cache_shared_graph_retire_payload_locked(uint32_t payload_offset);
 bool zend_opcache_static_cache_shared_graph_release_ref_locked(uint32_t payload_offset);
 bool zend_opcache_static_cache_has_request_shared_graph_ref(uint32_t payload_offset);
 void zend_opcache_static_cache_register_shared_graph_ref(uint32_t payload_offset);
 void zend_opcache_static_cache_defer_retired_shared_graph_free(uint32_t payload_offset);
-void zend_opcache_static_cache_release_request_shared_graph_refs(void);
+bool zend_opcache_static_cache_release_request_shared_graph_refs(void);
 bool zend_opcache_static_cache_clear_locked(void);
 bool zend_opcache_static_cache_prepare_value(
 		zend_opcache_static_cache_prepared_value *prepared,