wip

Author: madmajestro

apc_cache.c

@@ -1281,16 +1281,20 @@ PHP_APCU_API void apc_cache_entry(apc_cache_t *cache, zend_string *key, zend_fca
 }
 /*}}}*/
 
-PHP_APCU_API void apc_cache_entry_relocate(apc_cache_t* cache, apc_cache_entry_t *entry_old, apc_cache_entry_t *entry_new)
+PHP_APCU_API zend_bool apc_cache_wlocked_relocate_entry(apc_cache_entry_t *old, apc_cache_entry_t *new)
 {
-	// ptrdiff_t offset = entry_new - entry_old;
+	/* deny relocate, if block is in use */
+	if (old->ref_count > 0)
+		return 0;
+
+	memmove(new, old, old->mem_size);
 
-	if (entry_new->next)
-		entry_new->next->pprev = &entry_new->next;
+	if (new->next)
+		new->next->pprev = &new->next;
 
-	*entry_new->pprev = entry_new;
+	*new->pprev = new;
 
-	// Todo: when first element, slot-ptr has to be changed
+	return 1;
 }
 
 /*

apc_sma.c

@@ -658,7 +658,7 @@ PHP_APCU_API zend_bool apc_sma_get_avail_size(apc_sma_t* sma, size_t size) {
 	return 0;
 }
 
-PHP_APCU_API zend_bool apc_sma_defrag(apc_sma_t* sma, size_t size) {
+PHP_APCU_API zend_bool apc_sma_defrag(apc_sma_t* sma, apc_sma_relocate_f relocate) {
 	int32_t i;
 	size_t realsize = ALIGNWORD(size + ALIGNWORD(sizeof(struct block_t)));
 
@@ -677,10 +677,56 @@ PHP_APCU_API zend_bool apc_sma_defrag(apc_sma_t* sma, size_t size) {
 		while (cur->fnext) {
 			cur = BLOCKAT(cur->fnext);
 
-			if (cur->size >= realsize) {
-				SMA_UNLOCK(sma, i);
-				return 1;
+			/* Abort if last block is reached */
+			if (cur->fnext)
+				break;
+
+			/* Try to move an allocated block to cur */
+			block_t *nxt = NEXT_SBLOCK(cur);
+			while (OFFSET(nxt) < cur->fnext) {
+				block_t backup_cur = *cur;
+				block_t backup_nxt = *nxt;
+
+				/* relocate block (skip if it can't be relocated) */
+				if (!relocate((char *) nxt + ALIGNWORD(sizeof(block_t)), (char *) cur + ALIGNWORD(sizeof(block_t))))
+					continue;
+
+				cur->size = backup_nxt.size;
+				nxt = NEXT_SBLOCK(cur);
+				cur->fnext = OFFSET(nxt);
+				SET_CANARY(cur);
+#if 0
+				cur->id = backup_nxt.id;
+#endif
+
+				/* */
+				nxt->fnext = backup_cur.fnext;
+				nxt->fprev = backup_cur.fprev;
+				BLOCKAT(nxt->fnext)->fprev = OFFSET(nxt);
+				BLOCKAT(nxt->fprev)->fnext = OFFSET(nxt);
+
+
+
+				nxt->prev_size = 0;                       /* block is alloc'd */
+				nxt->size = backup_cur.size;              /* and fix the size */
+				NEXT_SBLOCK(nxt)->prev_size = nxt->size;  /* adjust size */
+				SET_CANARY(nxt);
+
+				/* replace cur with next in free list */
+				nxt->fnext = cur->fnext;
+				nxt->fprev = cur->fprev;
+				BLOCKAT(nxt->fnext)->fprev = OFFSET(nxt);
+				BLOCKAT(nxt->fprev)->fnext = OFFSET(nxt);
+
+
+
+				sma_deallocate(void* shmaddr, size_t offset)
+
+
+				used = NEXT_SBLOCK(used);
 			}
+
+
 		}
 
 		SMA_UNLOCK(sma, i);

apc_sma.h

@@ -81,6 +81,8 @@ typedef struct _apc_sma_t {
 	apc_segment_t *segs;           /* segments */
 } apc_sma_t; /* }}} */
 
+typedef zend_bool (*apc_sma_relocate_f)(void *old, void *new); /* }}} */
+
 /*
 * apc_sma_api_init will initialize a shared memory allocator with num segments of the given size
 *