php/archived-pecl-processing-rrd
1
0
Fork 0
mirror of https://github.com/php/pecl-processing-rrd.git synced 2026-03-23 23:22:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

add missing arginfo + relax tests with float

Browse Source 
git-svn-id: http://svn.php.net/repository/pecl/rrd/trunk@350618 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Remi Collet
2020-09-23 09:09:08 +00:00
parent 7d5dded190
commit d24179ade0
6 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rrd.c
View File

@@ -552,6 +552,9 @@ ZEND_BEGIN_ARG_INFO(arginfo_rrd_update, 0)
ZEND_ARG_INFO(0, file)
ZEND_ARG_INFO(0, options)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_rrd_void, 0)
ZEND_END_ARG_INFO()
/* }}} */
/* {{{ */
@@ -559,7 +562,7 @@ static zend_function_entry rrd_functions[] = {
PHP_FE(rrd_update, arginfo_rrd_update)
PHP_FE(rrd_create, arginfo_rrd_create)
PHP_FE(rrd_graph, arginfo_rrd_graph)
PHP_FE(rrd_error, NULL)
PHP_FE(rrd_error, arginfo_rrd_void)
PHP_FE(rrd_fetch, arginfo_rrd_fetch)
PHP_FE(rrd_first, arginfo_rrd_first)
PHP_FE(rrd_info, arginfo_rrd_info)
@@ -569,9 +572,9 @@ static zend_function_entry rrd_functions[] = {
PHP_FE(rrd_tune, arginfo_rrd_tune)
PHP_FE(rrd_xport, arginfo_rrd_xport)
#ifdef HAVE_RRDC_DISCONNECT
PHP_FE(rrdc_disconnect, NULL)
PHP_FE(rrdc_disconnect, arginfo_rrd_void)
#endif
PHP_FE(rrd_version, NULL)
PHP_FE(rrd_version, arginfo_rrd_void)
PHP_FE_END
};
/* }}} */

5
rrd_create.c
View File

@@ -323,10 +323,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_rrdcreator_description, 0, 0, 1)
ZEND_ARG_INFO(0, description)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_rrdcreator_void, 0, 0, 0)
ZEND_END_ARG_INFO()
/* class method table */
static zend_function_entry rrd_create_methods[] = {
PHP_ME(RRDCreator, __construct, arginfo_rrdcreator_construct, ZEND_ACC_PUBLIC)
PHP_ME(RRDCreator, save, NULL, ZEND_ACC_PUBLIC)
PHP_ME(RRDCreator, save, arginfo_rrdcreator_void, ZEND_ACC_PUBLIC)
PHP_ME(RRDCreator, addDataSource, arginfo_rrdcreator_description, ZEND_ACC_PUBLIC)
PHP_ME(RRDCreator, addArchive, arginfo_rrdcreator_description, ZEND_ACC_PUBLIC)
PHP_FE_END

8
rrd_graph.c
View File

@@ -140,6 +140,7 @@ static rrd_args *rrd_graph_obj_create_argv(const char *command_name, const rrd_g
array_init(&zv_argv);
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(obj->zv_arr_options), num_key, zs_key, zv_option_val) {
(void)num_key; /* to avoid -Wunused-but-set-variable */
smart_string option = {0}; /* one argument option */
/* option with string key means long option, hence they are used as
@@ -356,6 +357,9 @@ PHP_FUNCTION(rrd_graph)
/* }}} */
/* arguments */
ZEND_BEGIN_ARG_INFO_EX(arginfo_rrd_void, 0, 0, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_rrd_path, 0, 0, 1)
ZEND_ARG_INFO(0, path)
ZEND_END_ARG_INFO()
@@ -367,8 +371,8 @@ ZEND_END_ARG_INFO()
/* class method table */
static zend_function_entry rrd_graph_methods[] = {
PHP_ME(RRDGraph, __construct, arginfo_rrd_path, ZEND_ACC_PUBLIC)
PHP_ME(RRDGraph, save, NULL, ZEND_ACC_PUBLIC)
PHP_ME(RRDGraph, saveVerbose, NULL, ZEND_ACC_PUBLIC)
PHP_ME(RRDGraph, save, arginfo_rrd_void, ZEND_ACC_PUBLIC)
PHP_ME(RRDGraph, saveVerbose, arginfo_rrd_void, ZEND_ACC_PUBLIC)
PHP_ME(RRDGraph, setOptions, arginfo_rrd_options, ZEND_ACC_PUBLIC)
PHP_FE_END
};

22
tests/rrd_010.phpt
View File

@@ -40,11 +40,11 @@ array(4) {
[920805900]=>
float(0)
[920806200]=>
float(0.033333333333333)
float(0.03333333333%s)
[920806500]=>
float(0.033333333333333)
float(0.03333333333%s)
[920806800]=>
float(0.033333333333333)
float(0.03333333333%s)
[920807100]=>
float(0.02)
[920807400]=>
@@ -52,20 +52,20 @@ array(4) {
[920807700]=>
float(0.02)
[920808000]=>
float(0.013333333333333)
float(0.01333333333%s)
[920808300]=>
float(0.016666666666667)
float(0.01666666666%s)
}
["speed2"]=>
array(13) {
[920804700]=>
float(NAN)
[920805000]=>
float(0.056666666666667)
float(0.05666666666%s)
[920805300]=>
float(0.02)
[920805600]=>
float(0.0033333333333333)
float(0.00333333333%s)
[920805900]=>
float(0)
[920806200]=>
@@ -73,7 +73,7 @@ array(4) {
[920806500]=>
float(0)
[920806800]=>
float(0.066666666666667)
float(0.06666666666%s)
[920807100]=>
float(0.02)
[920807400]=>
@@ -81,9 +81,9 @@ array(4) {
[920807700]=>
float(0.02)
[920808000]=>
float(0.013333333333333)
float(0.01333333333%s)
[920808300]=>
float(0.016666666666667)
float(0.01666666666%s)
}
}
}
}

2
tests/rrd_012.phpt
View File

@@ -69,7 +69,7 @@ array(27) {
["rra[1].xff"]=>
float(0.5)
["rra[1].cdp_prep[0].value"]=>
float(0.026666666666667)
float(0.02666666666%s)
["rra[1].cdp_prep[0].unknown_datapoints"]=>
int(0)
}

20
tests/rrd_017.phpt
View File

@@ -47,11 +47,11 @@ array(4) {
[920805900]=>
float(0)
[920806200]=>
float(0.033333333333333)
float(0.0333333333%s)
[920806500]=>
float(0.033333333333333)
float(0.0333333333%s)
[920806800]=>
float(0.033333333333333)
float(0.0333333333%s)
[920807100]=>
float(0.02)
[920807400]=>
@@ -59,9 +59,9 @@ array(4) {
[920807700]=>
float(0.02)
[920808000]=>
float(0.013333333333333)
float(0.0133333333%s)
[920808300]=>
float(0.016666666666667)
float(0.0166666666%s)
}
}
[1]=>
@@ -81,11 +81,11 @@ array(4) {
[920805900]=>
float(0)
[920806200]=>
float(33.333333333333)
float(33.333333333%s)
[920806500]=>
float(33.333333333333)
float(33.333333333%s)
[920806800]=>
float(33.333333333333)
float(33.333333333%s)
[920807100]=>
float(20)
[920807400]=>
@@ -93,9 +93,9 @@ array(4) {
[920807700]=>
float(20)
[920808000]=>
float(13.333333333333)
float(13.333333333%s)
[920808300]=>
float(16.666666666667)
float(16.666666666%s)
}
}
}