ext/opcache/zend_shared_alloc: add zend_shared_alloc_aligned()

Eliminate some duplicate code.

Author: MaxKellermann

ext/opcache/ZendAccelerator.c

@@ -1538,11 +1538,9 @@ static zend_persistent_script *cache_script_in_shared_memory(zend_persistent_scr
 	memory_used = zend_accel_script_persist_calc(new_persistent_script, 1);
 
 	/* Allocate shared memory */
+	ZCG(mem) = zend_shared_alloc_aligned(memory_used);
 #if defined(__AVX__) || defined(__SSE2__)
-	/* Align to 64-byte boundary */
-	ZCG(mem) = zend_shared_alloc(memory_used + 64);
 	if (ZCG(mem)) {
-		ZCG(mem) = (void*)(((zend_uintptr_t)ZCG(mem) + 63L) & ~63L);
 #if defined(__x86_64__)
 		memset(ZCG(mem), 0, memory_used);
 #elif defined(__AVX__)
@@ -1574,7 +1572,6 @@ static zend_persistent_script *cache_script_in_shared_memory(zend_persistent_scr
 #endif
 	}
 #else
-	ZCG(mem) = zend_shared_alloc(memory_used);
 	if (ZCG(mem)) {
 		memset(ZCG(mem), 0, memory_used);
 	}
@@ -4237,11 +4234,9 @@ static zend_persistent_script* preload_script_in_shared_memory(zend_persistent_s
 	memory_used = zend_accel_script_persist_calc(new_persistent_script, 1);
 
 	/* Allocate shared memory */
+	ZCG(mem) = zend_shared_alloc_aligned(memory_used);
 #if defined(__AVX__) || defined(__SSE2__)
-	/* Align to 64-byte boundary */
-	ZCG(mem) = zend_shared_alloc(memory_used + 64);
 	if (ZCG(mem)) {
-		ZCG(mem) = (void*)(((zend_uintptr_t)ZCG(mem) + 63L) & ~63L);
 #if defined(__x86_64__)
 		memset(ZCG(mem), 0, memory_used);
 #elif defined(__AVX__)
@@ -4273,7 +4268,6 @@ static zend_persistent_script* preload_script_in_shared_memory(zend_persistent_s
 #endif
 	}
 #else
-	ZCG(mem) = zend_shared_alloc(memory_used);
 	if (ZCG(mem)) {
 		memset(ZCG(mem), 0, memory_used);
 	}

ext/opcache/zend_file_cache.c

@@ -1866,13 +1866,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
 			goto use_process_mem;
 		}
 
-#if defined(__AVX__) || defined(__SSE2__)
-		/* Align to 64-byte boundary */
-		buf = zend_shared_alloc(info.mem_size + 64);
-		buf = (void*)(((zend_uintptr_t)buf + 63L) & ~63L);
-#else
-		buf = zend_shared_alloc(info.mem_size);
-#endif
+		buf = zend_shared_alloc_aligned(info.mem_size);
 
 		if (!buf) {
 			zend_accel_schedule_restart_if_necessary(ACCEL_RESTART_OOM);

ext/opcache/zend_shared_alloc.h

@@ -134,6 +134,20 @@ void zend_shared_alloc_shutdown(void);
 void *zend_shared_alloc_pages(size_t requested_size);
 void *zend_shared_alloc(size_t size);
 
+/**
+ * Wrapper for zend_shared_alloc() which aligns at 64-byte boundary if
+ * AVX or SSE2 are used.
+ */
+static inline void *zend_shared_alloc_aligned(size_t size) {
+#if defined(__AVX__) || defined(__SSE2__)
+	/* Align to 64-byte boundary */
+	void *p = zend_shared_alloc(size + 64);
+	return (void *)(((zend_uintptr_t)p + 63L) & ~63L);
+#else
+	return zend_shared_alloc(size);
+#endif
+}
+
 /* copy into shared memory */
 void *zend_shared_memdup_get_put_free(void *source, size_t size);
 void *zend_shared_memdup_put_free(void *source, size_t size);