[svn:dbd-oracle] r15081 - dbd-oracle/branches/FAN

Author: byterock
Date: Thu Jan 12 04:27:51 2012
New Revision: 15081

Modified:
   dbd-oracle/branches/FAN/dbdimp.c
   dbd-oracle/branches/FAN/oci8.c

Log:
code cleanup for move

Modified: dbd-oracle/branches/FAN/dbdimp.c
==============================================================================
--- dbd-oracle/branches/FAN/dbdimp.c	(original)
+++ dbd-oracle/branches/FAN/dbdimp.c	Thu Jan 12 04:27:51 2012
@@ -202,7 +202,7 @@
 int
 dbd_discon_all(SV *drh, imp_drh_t *imp_drh)
 {
-	
+
 	dTHX;
 	/* The disconnect_all concept is flawed and needs more work */
 	if (!PL_dirty && !SvTRUE(perl_get_sv("DBI::PERL_ENDING",0))) {
@@ -385,7 +385,7 @@
 int
 dbd_db_login6(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *uid, char *pwd, SV *attr)
 {
-	
+
 	dTHX;
 	sword status;
 	SV **svp;
@@ -496,7 +496,7 @@
     }
 
     /* TAF Events */
-     
+
 	imp_dbh->using_taf = 0;
 
 	if (DBD_ATTRIB_TRUE(attr,"ora_taf",7,svp)){
@@ -522,7 +522,6 @@
 	if (DBD_ATTRIB_TRUE(attr,"ora_verbose",11,svp))
 		DBD_ATTRIB_GET_IV(  attr, "ora_verbose",  11, svp, dbd_verbose);
 
-dbd_verbose=15;
 	/* check to see if success_warn is set. This will */
 	/* warn after some sucessfull operations for tuning results */
 	if (DBD_ATTRIB_TRUE(attr,"ora_oci_success_warn",20,svp))
@@ -610,7 +609,7 @@
 
                 DBD_ATTRIB_GET_IV(attr, "ora_init_mode",13, init_mode_sv, init_mode);
 
-	        {	
+	        {
 			size_t rsize = 0;
 			/* Get CLIENT char and nchar charset id values */
 			OCINlsEnvironmentVariableGet_log_stat( &charsetid,(size_t) 0, OCI_NLS_CHARSET_ID, 0, &rsize ,status );
@@ -914,7 +913,7 @@
 
     /* set up TAF callback if wanted */
 
- 
+
 
     if (imp_dbh->using_taf){
 		bool	can_taf;
@@ -940,7 +939,7 @@
 	/* set up HA evnets callback if requested */
 
          if (imp_dbh->using_ha){
-                
+
                 if (DBIS->debug >= 4 || dbd_verbose >= 4 ) {
                 	PerlIO_printf(DBILOGFP,"Setting up HA Event Callback!");
                 }
@@ -1057,7 +1056,7 @@
 dbd_db_disconnect(SV *dbh, imp_dbh_t *imp_dbh)
 {
 	dTHX;
-	
+
 	int refcnt = 1 ;
 
 #if defined(USE_ITHREADS) && defined(PERL_MAGIC_shared_scalar)
@@ -1142,7 +1141,7 @@
                                                         (ub4) OCI_ATTR_FOCBK, imp_dbh->errhp, status);
 
                 }
-                 
+
 
 		if (imp_dbh->using_drcp) {
 			OCIHandleFree_log_stat(imp_dbh->authp, OCI_HTYPE_SESSION,status);
@@ -1412,7 +1411,7 @@
 createxmlfromstring(SV *sth, imp_sth_t *imp_sth, SV *source){
 
 	dTHX;
-	
+
 	OCIXMLType *xml = NULL;
 	STRLEN len;
 	ub4 buflen;
@@ -1696,7 +1695,7 @@
 int ora_realloc_phs_array(phs_t *phs,int newentries, int newbufsize){
 
 	dTHX;
-	
+
 	int i; /* Loop variable */
 	unsigned short *newal;
 
@@ -2663,7 +2662,7 @@
 pp_rebind_ph_rset_in(SV *sth, imp_sth_t *imp_sth, phs_t *phs)
 {
 	dTHX;
-	
+
 	SV * sth_csr = phs->sv;
 	D_impdata(imp_sth_csr, imp_sth_t, sth_csr);
 	sword status;
@@ -3316,7 +3315,7 @@
 int
 dbd_st_execute(SV *sth, imp_sth_t *imp_sth) /* <= -2:error, >=0:ok row count, (-1=unknown count) */
 {
-	
+
 	dTHX;
 	ub4 row_count = 0;
 	int debug 	  = DBIS->debug;
@@ -3643,7 +3642,7 @@
 	SV *err_count;
 {
 	dTHX;
-	
+
 	ub4 row_count = 0;
 	int debug = DBIS->debug;
 	D_imp_dbh_from_sth;
@@ -3971,7 +3970,7 @@
 int
 dbd_st_finish(SV *sth, imp_sth_t *imp_sth)
 {
-	
+
 	dTHX;
 	D_imp_dbh_from_sth;
 	sword status;

Modified: dbd-oracle/branches/FAN/oci8.c
==============================================================================
--- dbd-oracle/branches/FAN/oci8.c	(original)
+++ dbd-oracle/branches/FAN/oci8.c	Thu Jan 12 04:27:51 2012
@@ -1299,9 +1299,6 @@
 
 }
 
-//pthread_mutex_t         mutex;
-
-//static pthread_mutex_t mutex=PHTREAD_MUTEX_INITIALIZER;
 
 void
 hacb_fn( dvoid *ha_ctx, OCIEvent *eventhp) {
@@ -1309,7 +1306,7 @@
    ha_context_t *ctx =(ha_context_t*)ha_ctx;
    imp_dbh_t  *imp_dbh = (imp_dbh_t*)ctx->imp_dbh;
    pthread_mutex_t mutex;
-   pthread_mutex_init(&mutex, NULL);   
+   pthread_mutex_init(&mutex, NULL);
    pthread_mutex_lock(&mutex);
    PERL_SET_CONTEXT(ctx->ct_perl);
    do_ha_perl(imp_dbh,eventhp,ctx->function);
@@ -1317,7 +1314,7 @@
 }
 void
 do_ha_perl(  imp_dbh_t *imp_dbh, OCIEvent *eventhp,char *function) {
-   
+
    dTHX;
    dSP;
    OCIServer *srvhp;
@@ -1335,22 +1332,6 @@
 
   PerlIO_printf(DBILOGFP, "DBIc_ACTIVE=%d\n",DBIc_ACTIVE(imp_dbh));
 
-   //sv_bless(dbh,dbh_h);
-   /*if (dbh){ 
-     PerlIO_printf(DBILOGFP, " dhb is object cb_f=%d\n",sv_isobject(SvRV(dbh)));
-   }
-  //PerlIO_printf(DBILOGFP, " dhb isa DBI::db cb_f=%d\n",sv_derived_from(dbh,"DBI::db"));
-
-PerlIO_printf(DBILOGFP, " dhb isa cb_f=%d\n",sv_derived_from(SvRV(dbh),"DBI::db"));
-
-//PerlIO_printf(DBILOGFP, " dhb isa cb_f=%s\n", HvNAME(dbh_h));
-
-
-
-*/
-//  PerlIO_printf(DBILOGFP, " dhb isa DBI::db cb_f=%d\n",sv_derived_from(dbh,"DBI::db"));
-
-
    OCIAttrGet_log_stat(eventhp,  OCI_HTYPE_EVENT, (dvoid *)&event_code, 0, OCI_ATTR_HA_SOURCE, imp_dbh->errhp, status);
 
    hv_store(ha_event,"Source",6,sv_2mortal(newSVpv(oci_ha_event_source(event_code),strlen(oci_ha_event_source(event_code)))),0);
@@ -1429,7 +1410,7 @@
   }
 
    hv_store(ha_event,"Instances",9,newRV_noinc((SV*)servers),0);
-   //sv_2mortal(newRV_inc((SV*)DBIc_MY_H(imp_xxh)))
+   /*sv_2mortal(newRV_inc((SV*)DBIc_MY_H(imp_xxh)))*/
    XPUSHs(sv_2mortal(newRV((SV*)DBIc_MY_H(imp_dbh))));
    XPUSHs(sv_2mortal(newRV((SV*)ha_event)));
    PUTBACK;
@@ -1443,22 +1424,18 @@
         dTHX;
         sword status;
         ha_context_t  *ctx = NULL;
-       // SV* dbhref = newRV(dbh);// = sv_setref_iv(dbh, "DBI::db");
-// = newSVrv((SV*) dbh, "DBI::db"); 
-//newRV_noinc((SV*) dbh);
+       /* SV* dbhref = newRV(dbh);
+        = sv_setref_iv(dbh, "DBI::db");
+ = newSVrv((SV*) dbh, "DBI::db");
+newRV_noinc((SV*) dbh);*/
 /*allocate space for the callback */
         Newz(1, ctx, 1, ha_context_t);
         ctx->function= (char*)safemalloc(strlen(imp_dbh->ha_function));
         ctx->ct_perl   = my_perl;
         ctx->imp_dbh   = imp_dbh;
-        //sv_setref_pv(dbhref,"DBI::db", dbh);
-       // ctx->dbh       = dbhref; //newSVrv( dbh, "DBI::db");
-
-
-
-
-
-//sv_bless(dbhref, gv_stashpv("DBI::db", 0));
+        /*sv_setref_pv(dbhref,"DBI::db", dbh);
+        ctx->dbh       = dbhref; //newSVrv( dbh, "DBI::db");
+sv_bless(dbhref, gv_stashpv("DBI::db", 0));*/
         strcpy((char *)ctx->function,imp_dbh->ha_function);
 
 

• [svn:dbd-oracle] r15081 - dbd-oracle/branches/FAN by byterock