Changeset 1392 in svn for trunk

Timestamp:

2013-09-23T09:51:43Z (4 years ago)

Author:

Xuefer

Message:

calc avail for test

File:

• trunk/xcache/xc_malloc.c (modified) (3 diffs)

trunk/xcache/xc_malloc.c

@@ -39 +39 @@
 {
     if (p) {
-#ifdef TEST
         allocator->avail -= size;
-#else
+#ifndef TEST
         zend_hash_add(&allocator->shm->blocks, (void *) &p, sizeof(p), (void *) &size, sizeof(size), NULL);
 #endif
@@ -60 +59 @@
 static XC_ALLOCATOR_MALLOC(xc_allocator_malloc_malloc) /* {{{ */
 {
+    if (allocator->avail < size) {
+        return NULL;
+    }
     return xc_add_to_blocks(allocator, malloc(size), size);
 }
@@ -72 +74 @@
 static XC_ALLOCATOR_CALLOC(xc_allocator_malloc_calloc) /* {{{ */
 {
+    if (allocator->avail < size) {
+        return NULL;
+    }
     return xc_add_to_blocks(allocator, calloc(memb, size), size);
 }