MonetDB: oltp - Inject some debugging

[Martin Kersten]

Changeset: 101357251f6e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=101357251f6e
Modified Files:
        monetdb5/modules/mal/oltp.c
        monetdb5/modules/mal/oltp.h
Branch: oltp
Log Message:

Inject some debugging


diffs (131 lines):

diff --git a/monetdb5/modules/mal/oltp.c b/monetdb5/modules/mal/oltp.c
--- a/monetdb5/modules/mal/oltp.c
+++ b/monetdb5/modules/mal/oltp.c
@@ -40,7 +40,7 @@ OLTPdump_(Client cntxt, str msg)
        mnstr_printf(cntxt->fdout,"%s",msg);
        for(i=0; i< MAXOLTPLOCKS; i++)
        if( oltp_locks[i].locked)
-               mnstr_printf(cntxt->fdout,"#[%i] %3d\n",i, (oltp_locks[i].cntxt 
? oltp_locks[i].cntxt->idx: -1));
+               mnstr_printf(cntxt->fdout,"#[%i] %3d\n",i, (oltp_locks[i].cntxt 
? oltp_locks[i].cntxt->idxx: -1));
 }
 */
 
@@ -53,6 +53,9 @@ OLTPreset(Client cntxt, MalBlkPtr mb, Ma
        (void) pci;
        
        MT_lock_set(&mal_oltpLock);
+#ifdef _DEBUG_OLTP_
+       mnstr_printf(cntxt->fdout,"#OLTP reset locktable\n");
+#endif
        for( i=0; i<MAXOLTPLOCKS; i++){
                oltp_locks[i].locked = 0;
                oltp_locks[i].cntxt = 0;
@@ -67,10 +70,14 @@ OLTPreset(Client cntxt, MalBlkPtr mb, Ma
 str
 OLTPenable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
-       (void) cntxt;
        (void) mb;
        (void) stk;
        (void) pci;
+#ifdef _DEBUG_OLTP_
+       mnstr_printf(cntxt->fdout,"#OLTP enabled\n");
+#else
+       (void) cntxt;
+#endif
        oltp_delay = TRUE;
        return MAL_SUCCEED;
 }
@@ -80,6 +87,11 @@ OLTPdisable(Client cntxt, MalBlkPtr mb, 
 {
        OLTPreset(cntxt, mb, stk,pci);
        oltp_delay = FALSE;
+#ifdef _DEBUG_OLTP_
+       mnstr_printf(cntxt->fdout,"#OLTP disabled\n");
+#else
+       (void) cntxt;
+#endif
        return MAL_SUCCEED;
 }
 
@@ -108,6 +120,11 @@ OLTPlock(Client cntxt, MalBlkPtr mb, Mal
 
        clk = (lng) time(0);
 
+#ifdef _DEBUG_OLTP_
+       mnstr_printf(cntxt->fdout,"#OLTP lock for client %d:", cntxt->idx);
+       printInstruction(cntxt->fdout,mb,stk,pci, LIST_MAL_ALL);
+       mnstr_printf(cntxt->fdout,"\n");
+#endif
        do{
                // checking the collision of read locks with write locks
                // does not require a lock on the table.
@@ -117,6 +134,10 @@ OLTPlock(Client cntxt, MalBlkPtr mb, Mal
                        if( lck < 0 && oltp_locks[-lck].locked )
                                goto lockdelay;
                }
+#ifdef _DEBUG_OLTP_
+               mnstr_printf(cntxt->fdout,"#OLTP lock does not cause 
conflict\n");
+#endif
+               break;
 
                MT_lock_set(&mal_oltpLock);
                // check if all the locks are available 
@@ -129,6 +150,9 @@ OLTPlock(Client cntxt, MalBlkPtr mb, Mal
                }
 
                if( cnt == pci->argc -1){
+#ifdef _DEBUG_OLTP_
+                       mnstr_printf(cntxt->fdout,"#OLTP set lock for client 
%d\n", cntxt->idx);
+#endif
                        for( i=1; i< pci->argc; i++){
                                lck= getVarConstant(mb, getArg(pci,i)).val.ival;
                                // only set the write locks
@@ -145,17 +169,27 @@ OLTPlock(Client cntxt, MalBlkPtr mb, Mal
                } else {
                        MT_lock_unset(&mal_oltpLock);
 lockdelay:
+#ifdef _DEBUG_OLTP_
+                       mnstr_printf(cntxt->fdout,"#OLTP delay imposed for 
client %d\n", cntxt->idx);
+#endif
                        MT_sleep_ms(LOCKDELAY);
                }
        } while( GDKms() - ms < LOCKTIMEOUT);
 
+#ifdef _DEBUG_OLTP_
+       mnstr_printf(cntxt->fdout,"#OLTP proceed query for client %d\n", 
cntxt->idx);
+#endif
        // if the time out is related to a copy_from query, we should not start 
it either.
        sql = getName("sql");
        cpy = getName("copy_from");
 
        for( i = 0; i < mb->stop; i++)
-               if( getModuleId(getInstrPtr(mb,i)) == sql && 
getFunctionId(getInstrPtr(mb,i)) == cpy)
+               if( getModuleId(getInstrPtr(mb,i)) == sql && 
getFunctionId(getInstrPtr(mb,i)) == cpy){
+#ifdef _DEBUG_OLTP_
+                       mnstr_printf(cntxt->fdout,"#OLTP bail out a concurrent 
copy into %d\n", cntxt->idx);
+#endif
                        throw(SQL,"oltp.lock","Conflicts with other write 
operations\n");
+               }
        return MAL_SUCCEED;
 }
 
diff --git a/monetdb5/modules/mal/oltp.h b/monetdb5/modules/mal/oltp.h
--- a/monetdb5/modules/mal/oltp.h
+++ b/monetdb5/modules/mal/oltp.h
@@ -8,12 +8,15 @@
 
 #ifndef _OLTP_H
 #define _OLTP_H
+
 #include "gdk.h"
 #include <stdarg.h>
 #include <time.h>
 #include "mal_exception.h"
 #include "mal_interpreter.h"
 
+#define _DEBUG_OLTP_
+
 mal_export str OLTPinit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 mal_export str OLTPreset(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 mal_export str OLTPenable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list