ldixon Tue Jan 7 10:56:00 2003 EDT
Modified files:
/php4/ext/oci8 config.m4 oci8.c
Log:
Added support for Shared Data Mode for OCI8_VERSION >= 8.1, which will provide
memory savings by sharing common statement data
Index: php4/ext/oci8/config.m4
diff -u php4/ext/oci8/config.m4:1.39 php4/ext/oci8/config.m4:1.40
--- php4/ext/oci8/config.m4:1.39 Fri Dec 6 13:25:39 2002
+++ php4/ext/oci8/config.m4 Tue Jan 7 10:55:59 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.39 2002/12/06 18:25:39 moriyoshi Exp $
+dnl $Id: config.m4,v 1.40 2003/01/07 15:55:59 ldixon Exp $
dnl
AC_DEFUN(AC_OCI8_VERSION,[
@@ -74,6 +74,7 @@
PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
+ AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
;;
9.0)
@@ -84,6 +85,7 @@
PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
+ AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
AC_DEFINE(HAVE_OCI9,1,[ ])
;;
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.197 php4/ext/oci8/oci8.c:1.198
--- php4/ext/oci8/oci8.c:1.197 Tue Dec 31 11:07:06 2002
+++ php4/ext/oci8/oci8.c Tue Jan 7 10:55:59 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.197 2002/12/31 16:07:06 sebastian Exp $ */
+/* $Id: oci8.c,v 1.198 2003/01/07 15:55:59 ldixon Exp $ */
/* TODO list:
*
@@ -464,12 +464,24 @@
zend_class_entry oci_coll_class_entry;
#endif
+#ifdef HAVE_OCI8_SHARED_MODE
+
+#ifdef WITH_COLLECTIONS
+#define PHP_OCI_INIT_MODE OCI_SHARED | OCI_OBJECT
+#else
+#define PHP_OCI_INIT_MODE OCI_SHARED
+#endif
+
+#else
+
#ifdef WITH_COLLECTIONS
#define PHP_OCI_INIT_MODE OCI_DEFAULT | OCI_OBJECT
#else
#define PHP_OCI_INIT_MODE OCI_DEFAULT
#endif
+#endif
+
#if OCI_USE_EMALLOC
OCIInitialize(PHP_OCI_INIT_MODE, NULL, ocimalloc, ocirealloc, ocifree);
#else
@@ -628,7 +640,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.197 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.198 $");
#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
