OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

console: modify ppm_save to take a pixman image ref

Browse Source 
The function is going to be called from a coroutine, and may yield.
Let's ensure our image reference doesn't change over time (due to resize
etc) by keeping a ref.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20201027133602.3038018-3-marcandre.lureau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Marc-André Lureau 2020-10-27 17:36:01 +04:00 committed by Gerd Hoffmann
parent e18d9a9687
commit d00ec2fe86
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/console.c
View File

@ -195,7 +195,6 @@ static void dpy_refresh(DisplayState *s);
static DisplayState *get_alloc_displaystate(void); static DisplayState *get_alloc_displaystate(void);
static void text_console_update_cursor_timer(void); static void text_console_update_cursor_timer(void);
static void text_console_update_cursor(void *opaque); static void text_console_update_cursor(void *opaque);
static bool ppm_save(int fd, DisplaySurface *ds, Error **errp);
static void gui_update(void *opaque) static void gui_update(void *opaque)
{ {
@ -311,16 +310,16 @@ void graphic_hw_invalidate(QemuConsole *con)
} }
} }
static bool ppm_save(int fd, DisplaySurface *ds, Error **errp) static bool ppm_save(int fd, pixman_image_t *image, Error **errp)
{ {
int width = pixman_image_get_width(ds->image); int width = pixman_image_get_width(image);
int height = pixman_image_get_height(ds->image); int height = pixman_image_get_height(image);
g_autoptr(Object) ioc = OBJECT(qio_channel_file_new_fd(fd)); g_autoptr(Object) ioc = OBJECT(qio_channel_file_new_fd(fd));
g_autofree char *header = NULL; g_autofree char *header = NULL;
g_autoptr(pixman_image_t) linebuf = NULL; g_autoptr(pixman_image_t) linebuf = NULL;
int y; int y;
trace_ppm_save(fd, ds); trace_ppm_save(fd, image);
header = g_strdup_printf("P6\n%d %d\n%d\n", width, height, 255); header = g_strdup_printf("P6\n%d %d\n%d\n", width, height, 255);
if (qio_channel_write_all(QIO_CHANNEL(ioc), if (qio_channel_write_all(QIO_CHANNEL(ioc),
@ -330,7 +329,7 @@ static bool ppm_save(int fd, DisplaySurface *ds, Error **errp)
linebuf = qemu_pixman_linebuf_create(PIXMAN_BE_r8g8b8, width); linebuf = qemu_pixman_linebuf_create(PIXMAN_BE_r8g8b8, width);
for (y = 0; y < height; y++) { for (y = 0; y < height; y++) {
qemu_pixman_linebuf_fill(linebuf, ds->image, width, 0, y); qemu_pixman_linebuf_fill(linebuf, image, width, 0, y);
if (qio_channel_write_all(QIO_CHANNEL(ioc), if (qio_channel_write_all(QIO_CHANNEL(ioc),
(char *)pixman_image_get_data(linebuf), (char *)pixman_image_get_data(linebuf),
pixman_image_get_stride(linebuf), errp) < 0) { pixman_image_get_stride(linebuf), errp) < 0) {
@ -344,6 +343,7 @@ static bool ppm_save(int fd, DisplaySurface *ds, Error **errp)
void qmp_screendump(const char *filename, bool has_device, const char *device, void qmp_screendump(const char *filename, bool has_device, const char *device,
bool has_head, int64_t head, Error **errp) bool has_head, int64_t head, Error **errp)
{ {
g_autoptr(pixman_image_t) image = NULL;
QemuConsole *con; QemuConsole *con;
DisplaySurface *surface; DisplaySurface *surface;
int fd; int fd;
@ -372,6 +372,7 @@ void qmp_screendump(const char *filename, bool has_device, const char *device,
error_setg(errp, "no surface"); error_setg(errp, "no surface");
return; return;
} }
image = pixman_image_ref(surface->image);
fd = qemu_open_old(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666); fd = qemu_open_old(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
if (fd == -1) { if (fd == -1) {
@ -380,7 +381,7 @@ void qmp_screendump(const char *filename, bool has_device, const char *device,
return; return;
} }
if (!ppm_save(fd, surface, errp)) { if (!ppm_save(fd, image, errp)) {
qemu_unlink(filename); qemu_unlink(filename);
} }
} }

2
ui/trace-events
View File

@ -15,7 +15,7 @@ displaysurface_create_pixman(void *display_surface) "surface=%p"
displaysurface_free(void *display_surface) "surface=%p" displaysurface_free(void *display_surface) "surface=%p"
displaychangelistener_register(void *dcl, const char *name) "%p [ %s ]" displaychangelistener_register(void *dcl, const char *name) "%p [ %s ]"
displaychangelistener_unregister(void *dcl, const char *name) "%p [ %s ]" displaychangelistener_unregister(void *dcl, const char *name) "%p [ %s ]"
ppm_save(int fd, void *display_surface) "fd=%d surface=%p" ppm_save(int fd, void *image) "fd=%d image=%p"
# gtk-egl.c # gtk-egl.c
# gtk-gl-area.c # gtk-gl-area.c