From de377d3eaec2b07f16d841ac79a97a8282c7e983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Tue, 6 Jun 2023 17:54:27 +0200 Subject: Move the image load benchmark under tools --- fiv-io-benchmark.c | 75 ---------------------------------------------------- meson.build | 11 ++++---- tools/benchmark-io.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 81 deletions(-) delete mode 100644 fiv-io-benchmark.c create mode 100644 tools/benchmark-io.c diff --git a/fiv-io-benchmark.c b/fiv-io-benchmark.c deleted file mode 100644 index 00406cd..0000000 --- a/fiv-io-benchmark.c +++ /dev/null @@ -1,75 +0,0 @@ -// -// fiv-io-benchmark.c: see if we suck -// -// Copyright (c) 2021 - 2022, Přemysl Eric Janouch -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// - -#include -#include -#include - -#include "fiv-io.h" - -static double -timestamp(void) -{ - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - return ts.tv_sec + ts.tv_nsec / 1.e9; -} - -static void -one_file(const char *filename) -{ - double since_us = timestamp(); - FivIoOpenContext ctx = { - .uri = g_filename_to_uri(filename, NULL, NULL), - .screen_dpi = 96, - // Only using this array as a redirect. - .warnings = g_ptr_array_new_with_free_func(g_free), - }; - - cairo_surface_t *loaded_by_us = fiv_io_open(&ctx, NULL); - g_free((char *) ctx.uri); - g_ptr_array_free(ctx.warnings, TRUE); - if (!loaded_by_us) - return; - - cairo_surface_destroy(loaded_by_us); - double us = timestamp() - since_us; - - double since_pixbuf = timestamp(); - GdkPixbuf *gdk_pixbuf = gdk_pixbuf_new_from_file(filename, NULL); - if (!gdk_pixbuf) - return; - - cairo_surface_t *loaded_by_pixbuf = - gdk_cairo_surface_create_from_pixbuf(gdk_pixbuf, 1, NULL); - g_object_unref(gdk_pixbuf); - cairo_surface_destroy(loaded_by_pixbuf); - double pixbuf = timestamp() - since_pixbuf; - - printf("%f\t%f\t%.0f%%\t%s\n", us, pixbuf, us / pixbuf * 100, filename); -} - -int -main(int argc, char *argv[]) -{ - // Needed for gdk_cairo_surface_create_from_pixbuf(). - gdk_init(&argc, &argv); - - for (int i = 1; i < argc; i++) - one_file(argv[i]); - return 0; -} diff --git a/meson.build b/meson.build index 32ee8e6..43631df 100644 --- a/meson.build +++ b/meson.build @@ -165,12 +165,6 @@ exe = executable('fiv', 'fiv.c', 'fiv-view.c', 'fiv-io.c', 'fiv-context-menu.c', dependencies : dependencies, win_subsystem : 'windows', ) -if gdkpixbuf.found() - executable('io-benchmark', 'fiv-io-benchmark.c', 'fiv-io.c', - 'xdg.c', tiff_tables, - build_by_default : false, - dependencies : [dependencies, gdkpixbuf]) -endif desktops += 'fiv-jpegcrop.desktop' jpegcrop = executable('fiv-jpegcrop', 'fiv-jpegcrop.c', rc, config, @@ -194,6 +188,11 @@ if get_option('tools').enabled() dependencies : tools_dependencies, c_args: tools_c_args) endforeach + + if gdkpixbuf.found() + executable('benchmark-io', 'tools/benchmark-io.c', 'fiv-io.c', 'xdg.c', + tiff_tables, dependencies : [dependencies, gdkpixbuf]) + endif endif gsettings_schemas = ['fiv.gschema.xml'] diff --git a/tools/benchmark-io.c b/tools/benchmark-io.c new file mode 100644 index 0000000..be8fb8f --- /dev/null +++ b/tools/benchmark-io.c @@ -0,0 +1,75 @@ +// +// benchmark-io.c: measure and compare image loading times +// +// Copyright (c) 2021 - 2022, Přemysl Eric Janouch +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// + +#include +#include +#include + +#include "fiv-io.h" + +static double +timestamp(void) +{ + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return ts.tv_sec + ts.tv_nsec / 1.e9; +} + +static void +one_file(const char *filename) +{ + double since_us = timestamp(); + FivIoOpenContext ctx = { + .uri = g_filename_to_uri(filename, NULL, NULL), + .screen_dpi = 96, + // Only using this array as a redirect. + .warnings = g_ptr_array_new_with_free_func(g_free), + }; + + cairo_surface_t *loaded_by_us = fiv_io_open(&ctx, NULL); + g_free((char *) ctx.uri); + g_ptr_array_free(ctx.warnings, TRUE); + if (!loaded_by_us) + return; + + cairo_surface_destroy(loaded_by_us); + double us = timestamp() - since_us; + + double since_pixbuf = timestamp(); + GdkPixbuf *gdk_pixbuf = gdk_pixbuf_new_from_file(filename, NULL); + if (!gdk_pixbuf) + return; + + cairo_surface_t *loaded_by_pixbuf = + gdk_cairo_surface_create_from_pixbuf(gdk_pixbuf, 1, NULL); + g_object_unref(gdk_pixbuf); + cairo_surface_destroy(loaded_by_pixbuf); + double pixbuf = timestamp() - since_pixbuf; + + printf("%f\t%f\t%.0f%%\t%s\n", us, pixbuf, us / pixbuf * 100, filename); +} + +int +main(int argc, char *argv[]) +{ + // Needed for gdk_cairo_surface_create_from_pixbuf(). + gdk_init(&argc, &argv); + + for (int i = 1; i < argc; i++) + one_file(argv[i]); + return 0; +} -- cgit v1.2.3