Update DTrace probes

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 468bdaf610676da9396b0e2bf865138936a9f27c..8b6a38945110a618051526cc97c5b38b2bb0e38d 100644 (file)
--- 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 15b4a9626342017328af10f82fb06d46c0a5b29d..8ac94105c13cdc5b2f12cba1ee141ac44e0af890 100644 (file)
--- 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 b2fa8ca8817343420b91decb44137683829892c8..274c4e9e33b40b4e2227a20d7b2c52ced88cd5d5 100644 (file)
--- 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 90c187bfb63414e9fb45c94673fbc56e652a7b5f..fcab20cc4544bef63c1a8cb6a73fa7535dd32148 100644 (file)
--- 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 f10f01db52d428aa5735d1dc59107bcf3ca74ee9..8c5fba9ab087391bc056886677329eed255344d8 100644 (file)
--- 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