diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/config.m4 php-excimer-1.0.2/config.m4 --- php-excimer-1.0.0~git20190913.d82eaf7/config.m4 2019-09-13 14:34:32.000000000 +0000 +++ php-excimer-1.0.2/config.m4 2021-10-16 06:07:49.000000000 +0000 @@ -14,5 +14,5 @@ ]) PHP_SUBST(EXCIMER_SHARED_LIBADD) - PHP_NEW_EXTENSION(excimer, excimer.c excimer_timer.c excimer_log.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(excimer, excimer.c excimer_timer.c excimer_log.c, $ext_shared) fi diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/debian/changelog php-excimer-1.0.2/debian/changelog --- php-excimer-1.0.0~git20190913.d82eaf7/debian/changelog 2021-05-14 23:26:36.000000000 +0000 +++ php-excimer-1.0.2/debian/changelog 2021-10-26 23:47:55.000000000 +0000 @@ -1,14 +1,30 @@ -php-excimer (1.0.0~git20190913.d82eaf7-1build2) impish; urgency=medium +php-excimer (1.0.2-1build1) jammy; urgency=medium - * No change rebuild for PHP 8.0 + * No change rebuild for PHP 8.1 - -- Bryce Harrington Fri, 14 May 2021 23:26:36 +0000 + -- Bryce Harrington Tue, 26 Oct 2021 23:47:55 +0000 -php-excimer (1.0.0~git20190913.d82eaf7-1build1) focal; urgency=medium +php-excimer (1.0.2-1) unstable; urgency=medium - * No-change rebuild for PHP 7.4 + * New upstream version 1.0.2 - -- Bryce Harrington Tue, 25 Feb 2020 23:52:40 +0000 + -- Kunal Mehta Wed, 20 Oct 2021 13:40:52 -0700 + +php-excimer (1.0.0-2) unstable; urgency=medium + + * Upload to unstable + * Add Restrictions: allow-stderr to autopkgtest + + -- Kunal Mehta Mon, 30 Aug 2021 23:17:51 -0700 + +php-excimer (1.0.0-1) experimental; urgency=medium + + * New upstream version 1.0.0 + * Bump debhelper from old 11 to 12. + * Update standards version to 4.5.1, no changes needed. + * d/watch: Switch to downloading tags + + -- Kunal Mehta Sat, 13 Mar 2021 23:35:48 -0800 php-excimer (1.0.0~git20190913.d82eaf7-1) unstable; urgency=medium diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/debian/compat php-excimer-1.0.2/debian/compat --- php-excimer-1.0.0~git20190913.d82eaf7/debian/compat 2019-10-11 18:42:05.000000000 +0000 +++ php-excimer-1.0.2/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/debian/control php-excimer-1.0.2/debian/control --- php-excimer-1.0.0~git20190913.d82eaf7/debian/control 2019-10-11 19:11:31.000000000 +0000 +++ php-excimer-1.0.2/debian/control 2021-10-26 23:47:30.000000000 +0000 @@ -1,12 +1,13 @@ Source: php-excimer Section: php Priority: optional -Maintainer: MediaWiki packaging team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: MediaWiki packaging team Uploaders: Kunal Mehta -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper-compat (= 12), dh-php, php-dev -Standards-Version: 4.4.1 +Standards-Version: 4.5.1 Homepage: https://www.mediawiki.org/wiki/Excimer Vcs-Git: https://salsa.debian.org/mediawiki-team/php-excimer.git Vcs-Browser: https://salsa.debian.org/mediawiki-team/php-excimer diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/debian/source/lintian-overrides php-excimer-1.0.2/debian/source/lintian-overrides --- php-excimer-1.0.0~git20190913.d82eaf7/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ php-excimer-1.0.2/debian/source/lintian-overrides 2021-08-31 06:20:32.000000000 +0000 @@ -0,0 +1,2 @@ +# not needed +php-excimer source: pear-package-without-pkg-php-tools-builddep diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/debian/tests/control php-excimer-1.0.2/debian/tests/control --- php-excimer-1.0.0~git20190913.d82eaf7/debian/tests/control 2019-10-11 18:42:05.000000000 +0000 +++ php-excimer-1.0.2/debian/tests/control 2021-08-30 06:53:15.000000000 +0000 @@ -1,2 +1,3 @@ Tests: unittests Depends: @, php-cli, php-dev +Restrictions: allow-stderr diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/debian/watch php-excimer-1.0.2/debian/watch --- php-excimer-1.0.0~git20190913.d82eaf7/debian/watch 2019-10-11 19:11:31.000000000 +0000 +++ php-excimer-1.0.2/debian/watch 2021-03-03 05:49:43.000000000 +0000 @@ -1,4 +1,4 @@ version=4 -opts="mode=git, pgpmode=none, pretty=0.1.0~git%cd.%h, compression=xz" \ +opts="mode=git, gitmode=full, pgpmode=none" \ https://gerrit.wikimedia.org/r/mediawiki/php/excimer \ -HEAD debian uupdate +refs/tags/([\d\.]+) debian uupdate diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/excimer.c php-excimer-1.0.2/excimer.c --- php-excimer-1.0.0~git20190913.d82eaf7/excimer.c 2019-09-13 14:34:32.000000000 +0000 +++ php-excimer-1.0.2/excimer.c 2021-10-16 06:07:49.000000000 +0000 @@ -238,6 +238,11 @@ static zend_object_handlers ExcimerTimer_handlers; /** {{{ arginfo */ +#ifndef ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX +#define ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \ + ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, required_num_args) +#endif + ZEND_BEGIN_ARG_INFO(arginfo_ExcimerProfiler_setPeriod, 0) ZEND_ARG_INFO(0, period) ZEND_END_ARG_INFO() @@ -282,38 +287,38 @@ ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_getEventCount, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_current, 0) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_ExcimerLog_current, 0, 0, IS_MIXED, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_key, 0) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_ExcimerLog_key, 0, 0, IS_MIXED, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_next, 0) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_ExcimerLog_next, 0, 0, IS_VOID, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_rewind, 0) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_ExcimerLog_rewind, 0, 0, IS_VOID, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_valid, 0) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_ExcimerLog_valid, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_count, 0) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_ExcimerLog_count, 0, 0, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_offsetExists, 0) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_ExcimerLog_offsetExists, 0, 1, _IS_BOOL, 0) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_offsetGet, 0) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_ExcimerLog_offsetGet, 0, 1, IS_MIXED, 0) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_offsetSet, 0) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_ExcimerLog_offsetSet, 0, 2, IS_VOID, 0) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ExcimerLog_offsetUnset, 0) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_ExcimerLog_offsetUnset, 0, 1, IS_VOID, 0) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() @@ -560,6 +565,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "excimer support", "enabled"); + php_info_print_table_row(2, "excimer version", PHP_EXCIMER_VERSION); php_info_print_table_end(); } /* }}} */ diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/excimer_log.c php-excimer-1.0.2/excimer_log.c --- php-excimer-1.0.0~git20190913.d82eaf7/excimer_log.c 2019-09-13 14:34:32.000000000 +0000 +++ php-excimer-1.0.2/excimer_log.c 2021-10-16 06:07:49.000000000 +0000 @@ -250,7 +250,7 @@ size_t i; for (i = 0; i < ZSTR_LEN(src); i++) { char c = ZSTR_VAL(src)[i]; - if (c == ' ') { + if (c == ' ' || c == '\0') { c = '_'; } ZSTR_VAL(dest->s)[prev_len + i] = c; @@ -408,10 +408,17 @@ } } +#if PHP_VERSION_ID < 80000 static int excimer_log_aggr_compare(const void *a, const void *b) { zval *zp_a = &((Bucket*)a)->val; zval *zp_b = &((Bucket*)b)->val; +#else +static int excimer_log_aggr_compare(Bucket *a, Bucket *b) +{ + zval *zp_a = &a->val; + zval *zp_b = &b->val; +#endif zval *zp_a_incl = zend_hash_str_find(Z_ARRVAL_P(zp_a), "inclusive", sizeof("inclusive")-1); zval *zp_b_incl = zend_hash_str_find(Z_ARRVAL_P(zp_b), "inclusive", sizeof("inclusive")-1); diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/package.xml php-excimer-1.0.2/package.xml --- php-excimer-1.0.0~git20190913.d82eaf7/package.xml 1970-01-01 00:00:00.000000000 +0000 +++ php-excimer-1.0.2/package.xml 2021-10-16 06:07:49.000000000 +0000 @@ -0,0 +1,110 @@ + + + excimer + pecl.php.net + Interrupting timer and low-overhead sampling profiler + Calls a user-defined callback when a one-shot or periodic timer expires. Also a sampling profiler backend, which aggregates backtraces collected by a periodic timer. + + Tim Starling + tstarling + tstarling@wikimedia.org + yes + + + Kunal Mehta + legoktm + legoktm@debian.org + yes + + + Timo Tijhof + krinkle + krinklemail@gmail.com + yes + + 2021-10-16 + + 1.0.2 + 1.0.2 + + + stable + stable + + Apache 2.0 + + - Fix Iterator prototypes for PHP 8.1 + - Add extension version in phpinfo() + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 7.1.0 + + + 1.8.0 + + + linux + + + + excimer + + + + 2021-09-29 + + 1.0.1 + 1.0.1 + + + - Filter null bytes out of the collapsed output + - Fix segfault in ZTS mode + - Fix [-Wincompatible-pointer-types] with PHP 8 + + + + 2021-02-26 + + 1.0.0 + 1.0.0 + + + - Initial PECL release + + + + diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/php_excimer.h php-excimer-1.0.2/php_excimer.h --- php-excimer-1.0.0~git20190913.d82eaf7/php_excimer.h 2019-09-13 14:34:32.000000000 +0000 +++ php-excimer-1.0.2/php_excimer.h 2021-10-16 06:07:49.000000000 +0000 @@ -19,7 +19,7 @@ extern zend_module_entry excimer_module_entry; #define phpext_excimer_ptr &excimer_module_entry -#define PHP_EXCIMER_VERSION "1.0.0" +#define PHP_EXCIMER_VERSION "1.0.2" #ifdef PHP_WIN32 # define PHP_EXCIMER_API __declspec(dllexport) diff -Nru php-excimer-1.0.0~git20190913.d82eaf7/README.md php-excimer-1.0.2/README.md --- php-excimer-1.0.0~git20190913.d82eaf7/README.md 1970-01-01 00:00:00.000000000 +0000 +++ php-excimer-1.0.2/README.md 2021-10-16 06:07:49.000000000 +0000 @@ -0,0 +1,19 @@ +# Excimer + +Excimer is an extension for PHP 7.1+ that provides a low-overhead interrupting timer and sampling profiler. + +## Installation + +Excimer is available from [packages.debian.org](https://packages.debian.org/stable/php-excimer), and can be installed via `apt-get install php-excimer`. + +For other installation methods, see . + +## Documentation + +For the API, see [PHPDoc stubs](./stubs). + +For usage examples, see . + +## See also + +* [wikimedia/arc-lamp](https://gerrit.wikimedia.org/g/performance/arc-lamp/)