diff options
| author | drh <drh@noemail.net> | 2018-12-06 03:59:25 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2018-12-06 03:59:25 +0000 |
| commit | 3e2d47d49fbf897f28971845671d3fd6aa3cc5b3 (patch) | |
| tree | e584110d8886576c44c2045e038f9e457932b880 /src | |
| parent | fc08a1aef8b2750f0f6721dc1937c42a514fbab3 (diff) | |
| download | sqlite-3e2d47d49fbf897f28971845671d3fd6aa3cc5b3.tar.gz sqlite-3e2d47d49fbf897f28971845671d3fd6aa3cc5b3.zip | |
Invoking the sqlite3_trace() or sqlite3_trace_v2() interfaces cancels
any sqlite3_profile() that is running.
FossilOrigin-Name: ec63d3506bd429560077f82a4c5ed9d189780789fe1c134fff4f3b8733be1a3f
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/sqlite.h.in | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c index 27a4206a4..aa4546684 100644 --- a/src/main.c +++ b/src/main.c @@ -1996,7 +1996,6 @@ void *sqlite3_trace(sqlite3 *db, void(*xTrace)(void*,const char*), void *pArg){ sqlite3_mutex_enter(db->mutex); pOld = db->pTraceArg; db->mTrace = xTrace ? SQLITE_TRACE_LEGACY : 0; - if( db->xProfile ) db->mTrace |= SQLITE_TRACE_XPROFILE; db->xTrace = (int(*)(u32,void*,void*,void*))xTrace; db->pTraceArg = pArg; sqlite3_mutex_leave(db->mutex); @@ -2021,9 +2020,6 @@ int sqlite3_trace_v2( if( mTrace==0 ) xTrace = 0; if( xTrace==0 ) mTrace = 0; db->mTrace = mTrace; -#ifndef SQLITE_OMIT_DEPRECATED - if( db->xProfile ) db->mTrace |= SQLITE_TRACE_XPROFILE; -#endif db->xTrace = xTrace; db->pTraceArg = pArg; sqlite3_mutex_leave(db->mutex); diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 85ef3635a..4f33bb9ca 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2991,9 +2991,9 @@ int sqlite3_set_authorizer( ** time is in units of nanoseconds, however the current implementation ** is only capable of millisecond resolution so the six least significant ** digits in the time are meaningless. Future versions of SQLite -** might provide greater resolution on the profiler callback. The -** sqlite3_profile() function is considered experimental and is -** subject to change in future versions of SQLite. +** might provide greater resolution on the profiler callback. Invoking +** either [sqlite3_trace()] or [sqlite3_trace_v2()] will cancel the +** profile callback. */ SQLITE_DEPRECATED void *sqlite3_trace(sqlite3*, void(*xTrace)(void*,const char*), void*); |