Skip to content

Add cache and concurrency info to phpinfo and methods #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2017
Merged

Add cache and concurrency info to phpinfo and methods #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions tests/040.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
--TEST--
can get info about cache and concurrency
--SKIPIF--
<?php if (!extension_loaded("vips")) print "skip"; ?>
--FILE--
<?php
$return = vips_cache_get_max_mem();

if (is_int($return)) {
echo "pass vips_cache_get_max_mem\n";
}

$return = vips_cache_get_max_files();

if (is_int($return)) {
echo "pass vips_cache_get_max_files\n";
}

$return = vips_cache_get_max();

if (is_int($return)) {
echo "pass vips_cache_get_max\n";
}

$return = vips_cache_get_size();

if (is_int($return)) {
echo "pass vips_cache_get_size\n";
}

$return = vips_concurrency_get();

if (is_int($return)) {
echo "pass vips_concurrency_get\n";
}

?>
--EXPECT--
pass vips_cache_get_max_mem
pass vips_cache_get_max_files
pass vips_cache_get_max
pass vips_cache_get_size
pass vips_concurrency_get
77 changes: 76 additions & 1 deletion vips.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1781,6 +1781,46 @@ PHP_FUNCTION(vips_version)
}
/* }}} */

/* {{{ proto integer vips_cache_get_max_mem()
Get max memory to use for operation cache */
PHP_FUNCTION(vips_cache_get_max_mem)
{
RETURN_LONG(vips_cache_get_max_mem());
}
/* }}} */

/* {{{ proto integer vips_cache_get_max_files()
Get max number of open files for operation cache */
PHP_FUNCTION(vips_cache_get_max_files)
{
RETURN_LONG(vips_cache_get_max_files());
}
/* }}} */

/* {{{ proto integer vips_cache_get_max()
Get max number of operations to cache */
PHP_FUNCTION(vips_cache_get_max)
{
RETURN_LONG(vips_cache_get_max());
}
/* }}} */

/* {{{ proto integer vips_cache_get_size()
Get current cached operations */
PHP_FUNCTION(vips_cache_get_size)
{
RETURN_LONG(vips_cache_get_size());
}
/* }}} */

/* {{{ proto integer vips_concurrency_get()
Get number of workers per threadpool */
PHP_FUNCTION(vips_concurrency_get)
{
RETURN_LONG(vips_concurrency_get());
}
/* }}} */

/* {{{ php_vips_init_globals
*/
/* Uncomment this function if you have INI entries
Expand Down Expand Up @@ -1930,7 +1970,22 @@ PHP_MINFO_FUNCTION(vips)
vips_snprintf(digits, 256, "%d", vips_version(2));
php_info_print_table_row(2, "Micro version", digits);

php_info_print_table_row(2, "SIMD support with liborc",
vips_snprintf(digits, 256, "%zd", vips_cache_get_max_mem());
php_info_print_table_row(2, "Cache max mem", digits);

vips_snprintf(digits, 256, "%d", vips_cache_get_max());
php_info_print_table_row(2, "Cache max operations", digits);

vips_snprintf(digits, 256, "%d", vips_cache_get_size());
php_info_print_table_row(2, "Cache current operations", digits);

vips_snprintf(digits, 256, "%d", vips_cache_get_max_files());
php_info_print_table_row(2, "Cache max open files", digits);

vips_snprintf(digits, 256, "%d", vips_concurrency_get());
php_info_print_table_row(2, "Concurrency", digits);

php_info_print_table_row(2, "SIMD support with liborc",
vips_vector_isenabled() ? "yes" : "no" );

php_info_print_table_row(2, "JPEG support",
Expand Down Expand Up @@ -2074,6 +2129,21 @@ ZEND_BEGIN_ARG_INFO(arginfo_vips_concurrency_set, 0)
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(arginfo_vips_cache_get_max, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(arginfo_vips_cache_get_max_mem, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(arginfo_vips_cache_get_max_files, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(arginfo_vips_cache_get_size, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(arginfo_vips_concurrency_get, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(arginfo_vips_version, 0)
ZEND_END_ARG_INFO()
/* {{{ vips_functions[]
Expand Down Expand Up @@ -2103,6 +2173,11 @@ const zend_function_entry vips_functions[] = {
PHP_FE(vips_cache_set_max_mem, arginfo_vips_cache_set_max_mem)
PHP_FE(vips_cache_set_max_files, arginfo_vips_cache_set_max_files)
PHP_FE(vips_concurrency_set, arginfo_vips_concurrency_set)
PHP_FE(vips_cache_get_max, arginfo_vips_cache_get_max)
PHP_FE(vips_cache_get_max_mem, arginfo_vips_cache_get_max_mem)
PHP_FE(vips_cache_get_max_files, arginfo_vips_cache_get_max_files)
PHP_FE(vips_cache_get_size, arginfo_vips_cache_get_size)
PHP_FE(vips_concurrency_get, arginfo_vips_concurrency_get)
PHP_FE(vips_version, arginfo_vips_version)

PHP_FE_END /* Must be the last line in vips_functions[] */
Expand Down