wip fragment_size

Author: madmajestro

apc_sma.c

@@ -288,7 +288,7 @@ static APC_HOTSPOT size_t sma_deallocate(void* shmaddr, size_t offset)
 /* }}} */
 
 /* {{{ APC SMA API */
-PHP_APCU_API void apc_sma_init(apc_sma_t* sma, void** data, apc_sma_expunge_f expunge, int32_t num, size_t size, char *mask) {
+PHP_APCU_API void apc_sma_init(apc_sma_t* sma, void** data, apc_sma_expunge_f expunge, int32_t num, size_t size, size_t fragment_size, char *mask) {
 	int32_t i;
 
 	if (sma->initialized) {
@@ -298,6 +298,7 @@ PHP_APCU_API void apc_sma_init(apc_sma_t* sma, void** data, apc_sma_expunge_f ex
 	sma->initialized = 1;
 	sma->expunge = expunge;
 	sma->data = data;
+	sma->fragment_size = fragment_size > 0 ? fragment_size : MINBLOCKSIZE;
 
 #ifdef APC_MMAP
 	/*

apc_sma.h

@@ -75,6 +75,7 @@ typedef struct _apc_sma_t {
 	/* info */
 	int32_t  num;                  /* number of segments */
 	size_t size;                   /* segment size */
+	size_t fragment_size;          /* expected minimum size of allocated fragments */
 	int32_t  last;                 /* last segment */
 
 	/* segments */
@@ -88,7 +89,7 @@ typedef struct _apc_sma_t {
 */
 PHP_APCU_API void apc_sma_init(
 		apc_sma_t* sma, void** data, apc_sma_expunge_f expunge,
-		int32_t num, size_t size, char *mask);
+		int32_t num, size_t size, size_t fragment_size, char *mask);
 
 /*
  * apc_sma_detach will detach from shared memory and cleanup local allocations.

php_apc.c

@@ -247,7 +247,7 @@ static PHP_MINIT_FUNCTION(apcu)
 			/* initialize shared memory allocator */
 			apc_sma_init(
 				&apc_sma, (void **) &apc_user_cache, (apc_sma_expunge_f) apc_cache_default_expunge,
-				APCG(shm_segments), APCG(shm_size), mmap_file_mask);
+				APCG(shm_segments), APCG(shm_size), ALIGNWORD(sizeof(apc_cache_entry_t)), mmap_file_mask);
 
 			REGISTER_LONG_CONSTANT(APC_SERIALIZER_CONSTANT, (zend_long)&_apc_register_serializer, CONST_PERSISTENT | CONST_CS);