frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xquartz: Use xorg_backtrace() instead of rolling our own for debugging 

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2022-12-14 17:07:46 -08:00
parent 9a66690eaf
commit d1a9a50792
Failed to extract signature
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/xquartz/xpr/xprFrame.c
View File

@ -45,10 +45,6 @@
#include <dispatch/dispatch.h> #include <dispatch/dispatch.h>
#ifdef DEBUG_XP_LOCK_WINDOW
#include <execinfo.h>
#endif
#define DEFINE_ATOM_HELPER(func, atom_name) \ #define DEFINE_ATOM_HELPER(func, atom_name) \
static Atom func(void) { \ static Atom func(void) { \
static int generation; \ static int generation; \
@ -353,15 +349,8 @@ xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
xp_error err; xp_error err;
#ifdef DEBUG_XP_LOCK_WINDOW #ifdef DEBUG_XP_LOCK_WINDOW
void* callstack[128];
int i, frames = backtrace(callstack, 128);
char** strs = backtrace_symbols(callstack, frames);
ErrorF("=== LOCK %d ===\n", (int)x_cvt_vptr_to_uint(wid)); ErrorF("=== LOCK %d ===\n", (int)x_cvt_vptr_to_uint(wid));
for (i = 0; i < frames; ++i) { xorg_backtrace();
ErrorF(" %s\n", strs[i]);
}
free(strs);
#endif #endif
err = xp_lock_window(x_cvt_vptr_to_uint( err = xp_lock_window(x_cvt_vptr_to_uint(
@ -371,6 +360,10 @@ xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
(int)x_cvt_vptr_to_uint( (int)x_cvt_vptr_to_uint(
wid), (int)err); wid), (int)err);
#ifdef DEBUG_XP_LOCK_WINDOW
ErrorF(" bits: %p\n", *data);
#endif
*pixelData = data[0]; *pixelData = data[0];
*bytesPerRow = rowbytes[0]; *bytesPerRow = rowbytes[0];
} }
@ -384,15 +377,8 @@ xprStopDrawing(RootlessFrameID wid, Bool flush)
xp_error err; xp_error err;
#ifdef DEBUG_XP_LOCK_WINDOW #ifdef DEBUG_XP_LOCK_WINDOW
void* callstack[128];
int i, frames = backtrace(callstack, 128);
char** strs = backtrace_symbols(callstack, frames);
ErrorF("=== UNLOCK %d ===\n", (int)x_cvt_vptr_to_uint(wid)); ErrorF("=== UNLOCK %d ===\n", (int)x_cvt_vptr_to_uint(wid));
for (i = 0; i < frames; ++i) { xorg_backtrace();
ErrorF(" %s\n", strs[i]);
}
free(strs);
#endif #endif
err = xp_unlock_window(x_cvt_vptr_to_uint(wid), flush); err = xp_unlock_window(x_cvt_vptr_to_uint(wid), flush);