Merge pull request #42 from arnaud-lb/travis

Travis

Author: arnaud-lb

.travis.yml

@@ -0,0 +1,42 @@
+dist: xenial
+lang: php
+compiler:
+    - gcc
+cache:
+    directories:
+        - /home/travis/.phpenv/
+env:
+    global:
+        - MEMPROF_CFLAGS='-Wall -Werror'
+jobs:
+    allow_failures:
+        - env: PHP_VERSION=8.0snapshot
+    fast_finish: true
+    include:
+        - env: PHP_VERSION=8.0snapshot
+        - env: PHP_VERSION=7.4.12
+        - env: PHP_VERSION=7.3.24
+        - env: PHP_VERSION=7.2.19
+        - env: PHP_VERSION=7.1.33
+
+before_install:
+    - |
+        # Use a non-zts PHP build
+        set -e
+        sudo apt-get install libjudy-dev libonig-dev libzip-dev
+        if ! [ -f $HOME/.phpenv/memprof-travis-cached ]; then
+            echo "Building PHP"
+            git clone git://github.com/php-build/php-build.git $HOME/.phpenv/plugins/php-build
+            phpenv install --verbose --force $PHP_VERSION
+            rm -rf $HOME/.phpenv/plugins/php-build
+            touch $HOME/.phpenv/memprof-travis-cached
+        else
+            echo "PHP already built"
+        fi
+        phpenv rehash
+        phpenv global $PHP_VERSION
+
+install:
+    - .travis/build.sh
+script:
+    - .travis/test.sh

.travis/build.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -xve
+
+if ! grep -q memprof.so ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; then
+    echo "extension = $(pwd)/modules/memprof.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+fi
+phpenv config-rm xdebug.ini || true
+
+phpize
+CFLAGS=$MEMPROF_CFLAGS ./configure
+make

.travis/test.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -xve
+
+export PATH=$TRAVIS_BUILD_DIR/.travis:$PATH
+
+PHP=$(which php)
+REPORT_EXIT_STATUS=1 TEST_PHP_EXECUTABLE="$PHP" "$PHP" run-tests.php -s -q --show-diff

README.md

@@ -1,6 +1,6 @@
 # php-memprof
 
-![Supported PHP versions: 7.0 ... 8.x](https://img.shields.io/badge/php-7.0%20...%208.x-blue.svg)
+![Supported PHP versions: 7.1 ... 8.x](https://img.shields.io/badge/php-7.1%20...%208.x-blue.svg) [![Build Status](https://travis-ci.com/arnaud-lb/php-memory-profiler.svg?branch=v2)](https://travis-ci.com/arnaud-lb/php-memory-profiler)
 
 php-memprof is a fast and accurate memory profiling extension for PHP that can be used to detect memory leaks.
 

config.m4

@@ -51,6 +51,9 @@ if test "$PHP_MEMPROF" != "no"; then
   dnl
   PHP_SUBST(MEMPROF_SHARED_LIBADD)
 
+  ORIG_CFLAGS="$CFLAGS"
+  CFLAGS=""
+
   AC_MSG_CHECKING(for malloc hooks)
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
     #include <malloc.h>
@@ -70,6 +73,8 @@ if test "$PHP_MEMPROF" != "no"; then
     AC_MSG_RESULT(no)
   ])
 
+  CFLAGS="$ORIG_CFLAGS"
+
   AC_DEFINE([MEMPROF_CONFIGURE_VERSION], 3, [Define configure version])
 
   PHP_NEW_EXTENSION(memprof, memprof.c util.c, $ext_shared)

memprof.c

@@ -672,7 +672,7 @@ static void memprof_zend_execute_internal(zend_execute_data *execute_data_ptr, z
 {
 	int ignore = 0;
 
-	if (execute_data_ptr->func == &zend_pass_function) {
+	if (&execute_data_ptr->func->internal_function == &zend_pass_function) {
 		ignore = 1;
 	} else if (execute_data_ptr->func->common.function_name) {
 		zend_string * name = execute_data_ptr->func->common.function_name;
@@ -719,13 +719,17 @@ static PHP_INI_MH(OnChangeMemoryLimit)
 
 	ret = origOnChangeMemoryLimit(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 
+	if (ret != SUCCESS) {
+		return ret;
+	}
+
 	if (memprof_enabled && orig_zheap) {
 		zend_mm_set_heap(orig_zheap);
-		ret = zend_set_memory_limit(PG(memory_limit));
+		zend_set_memory_limit(PG(memory_limit));
 		zend_mm_set_heap(zheap);
 	}
 
-	return ret;
+	return SUCCESS;
 }
 
 static void memprof_enable()

tests/zend_pass_function.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Enable with environment variable
+zend_pass_function crash
 --ENV--
 MEMPROF_PROFILE=1
 --FILE--

util.c

@@ -56,7 +56,7 @@ size_t get_function_name(zend_execute_data * execute_data, char * buf, size_t bu
 		return snprintf(buf, buf_size, "main");
 	}
 
-	if (execute_data->func == &zend_pass_function) {
+	if (&execute_data->func->internal_function == &zend_pass_function) {
 		return snprintf(buf, buf_size, "zend_pass_function");
 	}