com php-src: Update DTrace probes: ext/oci8/oci8.c ext/oci8/o ci8_dtrace.d ext/oci8/oci8_statement.c ext/oc i8/package.xml ext/oci8/php_oci8.h

Commit: ca4d122adcab8703f63cf8ed95a28a1fbc6e2b47 Author: Christopher Jones <sixd@php.net> Fri, 6 Sep 2013 08:54:19 -0700 Parents: e504ed66a84815d3e2e9fd0e3679c787c14b2691 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ca4d122adcab8703f63cf8ed95a28a1fbc6e2b47 Log: Update DTrace probes Changed paths: M ext/oci8/oci8.c M ext/oci8/oci8_dtrace.d M ext/oci8/oci8_statement.c M ext/oci8/package.xml M ext/oci8/php_oci8.h Diff: diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 468bdaf..8b6a389 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -2317,6 +2317,12 @@ static int php_oci_connection_close(php_oci_connection *connection TSRMLS_DC) int result = 0; zend_bool in_call_save = OCI_G(in_call); +#ifdef HAVE_OCI8_DTRACE + if (DTRACE_OCI8_CONNECTION_CLOSE_ENABLED()) { + DTRACE_OCI8_CONNECTION_CLOSE(connection); + } +#endif /* HAVE_OCI8_DTRACE */ + if (!connection->is_stub) { /* Release resources associated with connection */ php_oci_connection_release(connection TSRMLS_CC); diff --git a/ext/oci8/oci8_dtrace.d b/ext/oci8/oci8_dtrace.d index 15b4a96..8ac9410 100644 --- a/ext/oci8/oci8_dtrace.d +++ b/ext/oci8/oci8_dtrace.d @@ -17,12 +17,13 @@ */ provider php { + probe oci8__check__connection(void *connection, int is_open, long errcode, unsigned long server_status); probe oci8__connect__entry(char *username, char *dbname, char *charset, long session_mode, int persistent, int exclusive); probe oci8__connect__return(void *connection); - probe oci8__check__connection(void *connection, int is_open, long errcode, unsigned long serverstatus); - probe oci8__sqltext(char *sql); + probe oci8__connection__close(void *connection); probe oci8__error(int status, long errcode); - probe oci8__execute__mode(unsigned int mode); + probe oci8__execute__mode(void *connection, unsigned int mode); + probe oci8__sqltext(void *connection, char *sql); probe oci8__connect__p__dtor__close(void *connection); probe oci8__connect__p__dtor__release(void *connection); diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c index b2fa8ca..274c4e9 100644 --- a/ext/oci8/oci8_statement.c +++ b/ext/oci8/oci8_statement.c @@ -58,7 +58,7 @@ php_oci_statement *php_oci_statement_create(php_oci_connection *connection, char } else { #ifdef HAVE_OCI8_DTRACE if (DTRACE_OCI8_SQLTEXT_ENABLED()) { - DTRACE_OCI8_SQLTEXT(query); + DTRACE_OCI8_SQLTEXT(connection, query); } #endif /* HAVE_OCI8_DTRACE */ } @@ -498,7 +498,7 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode TSRMLS_DC) /* only these are allowed */ #ifdef HAVE_OCI8_DTRACE if (DTRACE_OCI8_EXECUTE_MODE_ENABLED()) { - DTRACE_OCI8_EXECUTE_MODE(mode); + DTRACE_OCI8_EXECUTE_MODE(statement->connection, mode); } #endif /* HAVE_OCI8_DTRACE */ break; diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index 90c187b..fcab20c 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -40,7 +40,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> <active>no</active> </lead> - <date>2013-09-03</date> + <date>2013-09-06</date> <time>12:00:00</time> <version> @@ -55,6 +55,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> <notes> Review and improve error handling code and data types. Fix oci_set_*($connection, ...) error handling so oci_error($connection) works. +Add DTrace oci8-connection-close probe +Add the connection handle to several DTrace probes. </notes> <contents> <dir name="/"> diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index f10f01d..8c5fba9 100644 --- a/ext/oci8/php_oci8.h +++ b/ext/oci8/php_oci8.h @@ -46,7 +46,7 @@ */ #undef PHP_OCI8_VERSION #endif -#define PHP_OCI8_VERSION "2.0.1-dev" +#define PHP_OCI8_VERSION "2.0.2-dev" extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry