cleanup shutdown, debug arena stuff

Author: krakjoe

config.m4

@@ -12,11 +12,23 @@ PHP_ARG_ENABLE([stat-coverage],
     [Enable stat coverage support])],
   [no], [no])
 
+PHP_ARG_ENABLE([stat-arena-debug],
+  [whether to enable stat arena debug support],
+  [AS_HELP_STRING([--enable-stat-arena-debug],
+    [Enable stat arena debug support])],
+  [no], [no])
+
 if test "$PHP_STAT" != "no"; then
   PHP_ADD_LIBRARY(pthread,, STAT_SHARED_LIBADD)
 
   AC_DEFINE(HAVE_ZEND_STAT, 1, [ Have stat support ])
 
+  if test "$PHP_STAT_ARENA_DEBUG" != "no"; then
+    AC_DEFINE(ZEND_STAT_ARENA_DEBUG, 1, [ Have stat arena debug support ])
+  else
+    AC_DEFINE(ZEND_STAT_ARENA_DEBUG, 0, [ Do not have stat arena debug support ])
+  fi
+
   PHP_NEW_EXTENSION(stat,
         zend_stat.c \
         src/zend_stat_arena.c \

src/zend_stat_arena.c

@@ -22,13 +22,17 @@
 #include "zend_stat.h"
 #include "zend_stat_arena.h"
 
+#ifndef ZEND_STAT_ARENA_DEBUG
+# define ZEND_STAT_ARENA_DEBUG 0
+#endif
+
 typedef struct _zend_stat_arena_block_t zend_stat_arena_block_t;
 
 typedef intptr_t zend_stat_arena_ptr_t;
 
 struct _zend_stat_arena_block_t {
     zend_long                    size;
-    zend_bool                    used;
+    zend_long                    used;
     zend_stat_arena_block_t     *next;
     zend_stat_arena_ptr_t        mem[1];
 };
@@ -70,15 +74,13 @@ static zend_always_inline zend_stat_arena_block_t* zend_stat_arena_find(zend_sta
     while (NULL != block) {
         if ((0 == block->used)) {
             if ((block->size >= size)) {
-                block->used = 1;
                 goto _zend_stat_arena_found;
             } else {
                 if (NULL != block->next) {
                     if ((0 == block->next->used) &&
                         ((block->size + block->next->size) >= size)) {
                         block->size += block->next->size;
                         block->next = block->next->next;
-                        block->used = 1;
                         goto _zend_stat_arena_found;
                     }
                 }
@@ -91,8 +93,7 @@ static zend_always_inline zend_stat_arena_block_t* zend_stat_arena_find(zend_sta
     return NULL;
 
 _zend_stat_arena_found:
-    if ((NULL != block) &&
-        ((wasted = (block->size - size)) > 0)) {
+    if (((wasted = (block->size - size)) > 0)) {
         if ((wasted > ZEND_STAT_ARENA_BLOCK_MIN)) {
             zend_stat_arena_block_t *reclaim =
                 (zend_stat_arena_block_t*)
@@ -108,6 +109,7 @@ static zend_always_inline zend_stat_arena_block_t* zend_stat_arena_find(zend_sta
 
         block->size = size;
     }
+    block->used = size;
 
     return block;
 }
@@ -175,8 +177,8 @@ void* zend_stat_arena_alloc(zend_stat_arena_t *arena, zend_long size) {
         goto _zend_stat_arena_alloc_oom;
     }
 
-    block->used = 1;
-    block->size = aligned;
+    block->used =
+        block->size = aligned;
 
     if (UNEXPECTED(NULL == arena->list.start)) {
         arena->list.start = block;
@@ -199,7 +201,7 @@ void* zend_stat_arena_alloc(zend_stat_arena_t *arena, zend_long size) {
     return NULL;
 }
 
-#ifdef ZEND_DEBUG
+#if ZEND_STAT_ARENA_DEBUG
 static zend_always_inline zend_bool zend_stat_arena_owns(zend_stat_arena_t *arena, void *mem) {
     if (UNEXPECTED((((char*) mem) < ((char*) arena)) || (((char*) mem) > arena->end))) {
         return 0;
@@ -212,7 +214,7 @@ static zend_always_inline zend_bool zend_stat_arena_owns(zend_stat_arena_t *aren
 void zend_stat_arena_free(zend_stat_arena_t *arena, void *mem) {
     zend_stat_arena_block_t *block = zend_stat_arena_block(mem);
 
-#ifdef ZEND_DEBUG
+#if ZEND_STAT_ARENA_DEBUG
     ZEND_ASSERT(zend_stat_arena_owns(arena, mem));
 #endif
 
@@ -239,18 +241,25 @@ void zend_stat_arena_free(zend_stat_arena_t *arena, void *mem) {
     pthread_mutex_unlock(&arena->mutex);
 }
 
-#ifdef ZEND_DEBUG
+#if ZEND_STAT_ARENA_DEBUG
 static zend_always_inline void zend_stat_arena_debug(zend_stat_arena_t *arena) {
     zend_stat_arena_block_t *block = arena->list.start;
+    zend_long wasted = 0;
 
     while (NULL != block) {
-        if (block->used) {
+        if (block->used > 0) {
+            wasted += block->size - block->used;
+        }
+
+        if (block->used > 0) {
             fprintf(stderr,
-                "[STAT] %p leaked "ZEND_LONG_FMT" bytes\n",
-                block->mem, block->size);
+                "[STAT] %p leaked %p "ZEND_LONG_FMT" bytes\n",
+                arena, block->mem, block->size);
         }
         block = block->next;
     }
+
+    fprintf(stderr, "[STAT] %p wasted "ZEND_LONG_FMT" bytes\n", arena, wasted);
 }
 #endif
 
@@ -259,7 +268,7 @@ void zend_stat_arena_destroy(zend_stat_arena_t *arena) {
         return;
     }
 
-#ifdef ZEND_DEBUG
+#if ZEND_STAT_ARENA_DEBUG
     zend_stat_arena_debug(arena);
 #endif
 

src/zend_stat_request.c

@@ -29,12 +29,7 @@ zend_bool zend_stat_request_create(zend_stat_request_t *request) {
 
     memset(request, 0, sizeof(zend_stat_request_t));
 
-#ifdef ZTS
-    request->pid = syscall(SYS_gettid);
-#else
-    request->pid = getpid();
-#endif
-
+    request->pid     = zend_stat_pid();
     request->elapsed = zend_stat_time();
 
     if (EXPECTED(ri->path_translated)) {

zend_stat.c

@@ -42,6 +42,7 @@
 #include "zend_stat_stream.h"
 #include "zend_stat_strings.h"
 
+static pid_t                   zend_stat_main = 0;
 static zend_stat_buffer_t*     zend_stat_buffer = NULL;
 static zend_stat_io_t          zend_stat_stream;
 static zend_stat_io_t          zend_stat_control;
@@ -132,6 +133,7 @@ static int zend_stat_startup(zend_extension *ze) {
     }
 
     zend_stat_started = zend_stat_time();
+    zend_stat_main    = zend_stat_pid();
 
     ze->handle = 0;
 
@@ -143,6 +145,10 @@ static void zend_stat_shutdown(zend_extension *ze) {
         return;
     }
 
+    if (zend_stat_pid() != zend_stat_main) {
+        return;
+    }
+
     if (zend_stat_ini_dump > 0) {
         zend_stat_buffer_dump(
             zend_stat_buffer, zend_stat_ini_dump);

zend_stat.h

@@ -38,6 +38,14 @@
 
 double zend_stat_time(void);
 
+static zend_always_inline pid_t zend_stat_pid(void) {
+#ifdef ZTS
+    return syscall(SYS_gettid);
+#else
+    return getpid();
+#endif
+}
+
 static zend_always_inline void* zend_stat_map(zend_long size) {
     void *mapped = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANONYMOUS, -1, 0);