mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 08:15:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

dbug: correct trace for DBUG_RETURN(func()); -- gcc only

Browse source 
when func1 calls func2 from DBUG_RETURN, dbug shows the trace as
| > func1
| < func1
| > func2
| < func2
because DBUG_LEAVE happens before func2(). Change that to invoke
DBUG_LEAVE when the local variable goes out of scope. This uses
gcc specific __attribute__((cleanup)).
This commit is contained in:
Sergei Golubchik 2015-11-10 16:57:15 +01:00
commit 29dd634a4c
5 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dbug/dbug.c
View file

@ -1106,6 +1106,7 @@ void _db_enter_(const char *_func_, const char *_file_,
}
save_errno= errno;
_stack_frame_->line= -1;
_stack_frame_->func= cs->func;
_stack_frame_->file= cs->file;
cs->func= _func_;
@ -1161,14 +1162,17 @@ void _db_enter_(const char *_func_, const char *_file_,
*
*/
void _db_return_(uint _line_, struct _db_stack_frame_ *_stack_frame_)
void _db_return_(struct _db_stack_frame_ *_stack_frame_)
{
int save_errno=errno;
uint _slevel_= _stack_frame_->level & ~TRACE_ON;
CODE_STATE *cs;
get_code_state_or_return;
if (cs->framep != _stack_frame_)
if (_stack_frame_->line == 0)
return;
if (_stack_frame_->line == -1 || cs->framep != _stack_frame_)
{
char buf[512];
my_snprintf(buf, sizeof(buf), ERR_MISSING_RETURN, cs->func);
@ -1183,7 +1187,7 @@ void _db_return_(uint _line_, struct _db_stack_frame_ *_stack_frame_)
{
if (!cs->locked)
pthread_mutex_lock(&THR_LOCK_dbug);
DoPrefix(cs, _line_);
DoPrefix(cs, _stack_frame_->line);
Indent(cs, cs->level);
(void) fprintf(cs->stack->out_file->file, "<%s\n", cs->func);
DbugFlush(cs);