re
/
go-sqlcipher
forked from mirror/go-sqlcipher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TraceInfo: fix RunTimeNanosec retrieval, add AutoCommit 

Also change type of EventCode to uint32 so adding AutoCommit
is "free" = does not enlarge the TraceInfo struct.
32 bits are more than enough, since only 4 (four) are used now.
This commit is contained in:
A.N 2016-09-06 18:12:10 +03:00 committed by Yasuhiro Matsumoto
parent 0a2fcd29b6
commit 911ebeea74
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tracecallback.go
View File

@ -33,7 +33,11 @@ const (
) )
type TraceInfo struct { type TraceInfo struct {
EventCode uint // Pack together the shorter fields, to keep the struct smaller.
// On a 64-bit machine there would be padding
// between EventCode and ConnHandle; having AutoCommit here is "free":
EventCode uint32
AutoCommit bool
ConnHandle uintptr ConnHandle uintptr
// Usually filled, unless EventCode = TraceClose = SQLITE_TRACE_CLOSE: // Usually filled, unless EventCode = TraceClose = SQLITE_TRACE_CLOSE:
@ -122,7 +126,8 @@ func traceCallbackTrampoline(
var info TraceInfo var info TraceInfo
info.EventCode = traceEventCode info.EventCode = uint32(traceEventCode)
info.AutoCommit = (int(C.sqlite3_get_autocommit(contextDB)) != 0)
info.ConnHandle = connHandle info.ConnHandle = connHandle
switch traceEventCode { switch traceEventCode {
@ -146,7 +151,13 @@ func traceCallbackTrampoline(
case TraceProfile: case TraceProfile:
info.StmtHandle = uintptr(p) info.StmtHandle = uintptr(p)
info.RunTimeNanosec = int64(uintptr(xValue))
if xValue == nil {
panic("NULL pointer in X arg of trace_v2 callback for SQLITE_TRACE_PROFILE event")
}
info.RunTimeNanosec = *(*int64)(xValue)
// sample the error //TODO: is it safe? is it useful? // sample the error //TODO: is it safe? is it useful?
fillDBError(&info.DBError, contextDB) fillDBError(&info.DBError, contextDB)