forked from AuroraMiddleware/gtk
New directory with the start of a framework for testing performance in
2005-07-26 Federico Mena Quintero <federico@ximian.com> * perf/: New directory with the start of a framework for testing performance in GTK+. * Makefile.am (SRC_SUBDIRS): Added the perf directory. * configure.in (AC_OUTPUT): Generate perf/Makefile.
This commit is contained in:
Federico Mena Quintero
Federico Mena Quintero
parent
98a1367afe
commit
4b4c0fe86c
@ -1,3 +1,12 @@
|
|||||||
|
2005-07-26 Federico Mena Quintero <federico@ximian.com>
|
||||||
|
|
||||||
|
* perf/: New directory with the start of a framework for testing
|
||||||
|
performance in GTK+.
|
||||||
|
|
||||||
|
* Makefile.am (SRC_SUBDIRS): Added the perf directory.
|
||||||
|
|
||||||
|
* configure.in (AC_OUTPUT): Generate perf/Makefile.
|
||||||
|
|
||||||
2005-07-26 Matthias Clasen <mclasen@redhat.com>
|
2005-07-26 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkfilechooserdefault.c: Fix up includes on Win32.
|
* gtk/gtkfilechooserdefault.c: Fix up includes on Win32.
|
||||||
|
|||||||
@ -1,3 +1,12 @@
|
|||||||
|
2005-07-26 Federico Mena Quintero <federico@ximian.com>
|
||||||
|
|
||||||
|
* perf/: New directory with the start of a framework for testing
|
||||||
|
performance in GTK+.
|
||||||
|
|
||||||
|
* Makefile.am (SRC_SUBDIRS): Added the perf directory.
|
||||||
|
|
||||||
|
* configure.in (AC_OUTPUT): Generate perf/Makefile.
|
||||||
|
|
||||||
2005-07-26 Matthias Clasen <mclasen@redhat.com>
|
2005-07-26 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkfilechooserdefault.c: Fix up includes on Win32.
|
* gtk/gtkfilechooserdefault.c: Fix up includes on Win32.
|
||||||
|
|||||||
@ -1,3 +1,12 @@
|
|||||||
|
2005-07-26 Federico Mena Quintero <federico@ximian.com>
|
||||||
|
|
||||||
|
* perf/: New directory with the start of a framework for testing
|
||||||
|
performance in GTK+.
|
||||||
|
|
||||||
|
* Makefile.am (SRC_SUBDIRS): Added the perf directory.
|
||||||
|
|
||||||
|
* configure.in (AC_OUTPUT): Generate perf/Makefile.
|
||||||
|
|
||||||
2005-07-26 Matthias Clasen <mclasen@redhat.com>
|
2005-07-26 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkfilechooserdefault.c: Fix up includes on Win32.
|
* gtk/gtkfilechooserdefault.c: Fix up includes on Win32.
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
## Makefile.am for GTK+
|
## Makefile.am for GTK+
|
||||||
|
|
||||||
SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
|
SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
|
||||||
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
|
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
|
||||||
|
|
||||||
# require automake 1.4
|
# require automake 1.4
|
||||||
|
|||||||
@ -1715,6 +1715,7 @@ modules/engines/pixbuf/Makefile
|
|||||||
modules/engines/ms-windows/Makefile
|
modules/engines/ms-windows/Makefile
|
||||||
modules/engines/ms-windows/Theme/Makefile
|
modules/engines/ms-windows/Theme/Makefile
|
||||||
modules/engines/ms-windows/Theme/gtk-2.0/Makefile
|
modules/engines/ms-windows/Theme/gtk-2.0/Makefile
|
||||||
|
perf/Makefile
|
||||||
contrib/Makefile
|
contrib/Makefile
|
||||||
contrib/gdk-pixbuf-xlib/Makefile
|
contrib/gdk-pixbuf-xlib/Makefile
|
||||||
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
|
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
|
||||||
|
|||||||
39
perf/Makefile.am
Normal file
39
perf/Makefile.am
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
## Makefile.am for gtk+/perf
|
||||||
|
|
||||||
|
INCLUDES = \
|
||||||
|
-I$(top_srcdir) \
|
||||||
|
-I$(top_builddir)/gdk \
|
||||||
|
-I$(top_srcdir)/gdk \
|
||||||
|
-DG_DISABLE_DEPRECATED \
|
||||||
|
-DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||||
|
-DGDK_DISABLE_DEPRECATED \
|
||||||
|
-DGTK_DISABLE_DEPRECATED \
|
||||||
|
$(GTK_DEBUG_FLAGS) \
|
||||||
|
$(GTK_DEP_CFLAGS)
|
||||||
|
|
||||||
|
DEPS = \
|
||||||
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||||
|
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||||
|
$(top_builddir)/gtk/$(gtktargetlib)
|
||||||
|
|
||||||
|
LDADDS = \
|
||||||
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||||
|
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||||
|
$(top_builddir)/gtk/$(gtktargetlib)
|
||||||
|
|
||||||
|
noinst_PROGRAMS = \
|
||||||
|
testperf
|
||||||
|
|
||||||
|
testperf_DEPENDENCIES = $(TEST_DEPS)
|
||||||
|
|
||||||
|
testperf_LDADD = $(LDADDS)
|
||||||
|
|
||||||
|
testperf_SOURCES = \
|
||||||
|
appwindow.c \
|
||||||
|
appwindow.h \
|
||||||
|
main.c \
|
||||||
|
timers.c \
|
||||||
|
timers.h
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
README
|
||||||
127
perf/README
Normal file
127
perf/README
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
README for gtk+/perf
|
||||||
|
--------------------
|
||||||
|
|
||||||
|
This is a framework for testing performance in GTK+. For GTK+, being
|
||||||
|
performant does not only mean "paint widgets fast". It also means
|
||||||
|
things like the time needed to set up widgets, to map and draw a
|
||||||
|
window for the first time, and emitting/propagating signals.
|
||||||
|
|
||||||
|
The following is accurate as of 2005/07/26.
|
||||||
|
|
||||||
|
|
||||||
|
Using the framework
|
||||||
|
-------------------
|
||||||
|
|
||||||
|
Right now the framework is very simple; it just has utility functions
|
||||||
|
to time widget creation, drawing, and destruction. To run such a
|
||||||
|
test, you use the functions in timers.h. You can call this:
|
||||||
|
|
||||||
|
timer_time_widget (create_func, report_func, user_data);
|
||||||
|
|
||||||
|
You must provide the create_funcn and report_func callbacks.
|
||||||
|
|
||||||
|
The create_func:
|
||||||
|
|
||||||
|
This simply creates a toplevel window with some widgets inside it.
|
||||||
|
It is important that you do not show any of the widgets; the
|
||||||
|
framework will call gtk_widget_show_all() on the toplevel window
|
||||||
|
automatically at the right time.
|
||||||
|
|
||||||
|
The report_func:
|
||||||
|
|
||||||
|
This function will get called when timer_time_widget() reaches an
|
||||||
|
interesting point in the lifecycle of your widget. See timers.h and
|
||||||
|
the TimerReport enumeration; this is what gets passed as the
|
||||||
|
"report" argument to your report_func. Right now, your function
|
||||||
|
will be called three times for each call to timer_time_widget():
|
||||||
|
|
||||||
|
1. With report = TIMER_REPORT_WIDGET_CREATION. A timer gets
|
||||||
|
started right before timer_time_widget() calls create_func,
|
||||||
|
and it gets stopped when your create_func returns. This
|
||||||
|
measures the time it takes to set up a toplevel window (but
|
||||||
|
not show it).
|
||||||
|
|
||||||
|
2. With report = TIMER_REPORT_WIDGET_SHOW. A timer gets started
|
||||||
|
right before timer_time_widget() calls gtk_widget_show_all()
|
||||||
|
on your toplevel window, and it gets stopped when the window
|
||||||
|
has been fully shown and painted to the screen.
|
||||||
|
|
||||||
|
3. With report = TIMER_REPORT_WIDGET_DESTRUCTION. A timer gets
|
||||||
|
started right before timer_time_widget() calls
|
||||||
|
gtk_widget_destroy() on your toplevel window, and it gets
|
||||||
|
stopped when gtk_widget_destroy() returns.
|
||||||
|
|
||||||
|
As a very basic example of using timer_time_widget(), you can use
|
||||||
|
something like this:
|
||||||
|
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
#include "timers.h"
|
||||||
|
|
||||||
|
#define ITERS 20
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
create_cb (gpointer data)
|
||||||
|
{
|
||||||
|
GtkWidget *window;
|
||||||
|
|
||||||
|
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
|
||||||
|
/* ... fill the window with widgets, and don't show them ... */
|
||||||
|
|
||||||
|
return window;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
report_cb (TimerReport report, gdouble elapsed, gpointer data)
|
||||||
|
{
|
||||||
|
const char *type;
|
||||||
|
|
||||||
|
switch (report) {
|
||||||
|
case TIMER_REPORT_WIDGET_CREATION:
|
||||||
|
type = "widget creation";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case TIMER_REPORT_WIDGET_SHOW:
|
||||||
|
type = "widget show";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case TIMER_REPORT_WIDGET_DESTRUCTION:
|
||||||
|
type = "widget destruction";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf (stderr, "%s: %g sec\n", type, elapsed);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main (int argc, char **argv)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
gtk_init (&argc, &argv);
|
||||||
|
|
||||||
|
for (i = 0; i < ITERS; i++)
|
||||||
|
timer_time_widget (create_cb, report_cb, NULL);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
Getting meaningful results
|
||||||
|
--------------------------
|
||||||
|
|
||||||
|
Getting times for widget creation/drawing/destruction is interesting,
|
||||||
|
but how do you actually find the places that need optimizing?
|
||||||
|
|
||||||
|
Why, you run the tests under a profiler, of course.
|
||||||
|
|
||||||
|
FIXME: document how to do this.
|
||||||
|
|
||||||
|
|
||||||
|
Feedback
|
||||||
|
--------
|
||||||
|
|
||||||
|
Please mail your feedback to Federico Mena-Quintero <federico@novell.com>.
|
||||||
|
This performance framework is a work in progress.
|
||||||
423
perf/appwindow.c
Normal file
423
perf/appwindow.c
Normal file
@ -0,0 +1,423 @@
|
|||||||
|
/* This file contains utility functions to create what would be a typical "main
|
||||||
|
* window" for an application.
|
||||||
|
*
|
||||||
|
* TODO:
|
||||||
|
*
|
||||||
|
* Measurements happen from the start of the destruction of the last window. Use
|
||||||
|
* GTimer rather than X timestamps to fix this (it uses gettimeofday() internally!)
|
||||||
|
*
|
||||||
|
* Make non-interactive as well by using the above.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
|
static void
|
||||||
|
quit_cb (GtkWidget *widget, gpointer data)
|
||||||
|
{
|
||||||
|
gtk_main_quit ();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
noop_cb (GtkWidget *widget, gpointer data)
|
||||||
|
{
|
||||||
|
/* nothing */
|
||||||
|
}
|
||||||
|
|
||||||
|
static const GtkActionEntry menu_action_entries[] = {
|
||||||
|
{ "FileMenu", NULL, "_File" },
|
||||||
|
{ "EditMenu", NULL, "_Edit" },
|
||||||
|
{ "ViewMenu", NULL, "_View" },
|
||||||
|
{ "HelpMenu", NULL, "_Help" },
|
||||||
|
|
||||||
|
{ "New", GTK_STOCK_NEW, "_New", "<control>N", "Create a new document", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Open", GTK_STOCK_OPEN, "_Open", "<control>O", "Open a file", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Save", GTK_STOCK_SAVE, "_Save", "<control>S", "Save the document", G_CALLBACK (noop_cb) },
|
||||||
|
{ "SaveAs", GTK_STOCK_SAVE_AS, "Save _As...", NULL, "Save the document with a different name", NULL},
|
||||||
|
{ "PrintPreview", GTK_STOCK_PRINT_PREVIEW, "Print Previe_w", NULL, "See how the document will be printed", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Print", GTK_STOCK_PRINT, "_Print", "<control>P", "Print the document", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Close", GTK_STOCK_CLOSE, "_Close", "<control>W", "Close the document", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Quit", GTK_STOCK_QUIT, "_Quit", "<control>Q", "Quit the program", G_CALLBACK (quit_cb) },
|
||||||
|
|
||||||
|
{ "Undo", GTK_STOCK_UNDO, "_Undo", "<control>Z", "Undo the last action", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Redo", GTK_STOCK_REDO, "_Redo", "<control>Y", "Redo the last action", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Cut", GTK_STOCK_CUT, "Cu_t", "<control>X", "Cut the selection to the clipboard", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Copy", GTK_STOCK_COPY, "_Copy", "<control>C", "Copy the selection to the clipboard", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Paste", GTK_STOCK_PASTE, "_Paste", "<control>V", "Paste the contents of the clipboard", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Delete", GTK_STOCK_DELETE, "_Delete", "Delete", "Delete the selection", G_CALLBACK (noop_cb) },
|
||||||
|
{ "SelectAll", NULL, "Select _All", "<control>A", "Select the whole document", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Preferences", GTK_STOCK_PREFERENCES, "Pr_eferences", NULL, "Configure the application", G_CALLBACK (noop_cb) },
|
||||||
|
|
||||||
|
{ "ZoomFit", GTK_STOCK_ZOOM_FIT, "Zoom to _Fit", NULL, "Zoom the document to fit the window", G_CALLBACK (noop_cb) },
|
||||||
|
{ "Zoom100", GTK_STOCK_ZOOM_100, "Zoom _1:1", NULL, "Zoom to 1:1 scale", G_CALLBACK (noop_cb) },
|
||||||
|
{ "ZoomIn", GTK_STOCK_ZOOM_IN, "Zoom _In", NULL, "Zoom into the document", G_CALLBACK (noop_cb) },
|
||||||
|
{ "ZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", NULL, "Zoom away from the document", G_CALLBACK (noop_cb) },
|
||||||
|
{ "FullScreen", GTK_STOCK_FULLSCREEN, "Full _Screen", "F11", "Use the whole screen to view the document", G_CALLBACK (noop_cb) },
|
||||||
|
|
||||||
|
{ "HelpContents", GTK_STOCK_HELP, "_Contents", "F1", "Show the table of contents for the help system", G_CALLBACK (noop_cb) },
|
||||||
|
{ "About", GTK_STOCK_ABOUT, "_About", NULL, "About this application", G_CALLBACK (noop_cb) }
|
||||||
|
};
|
||||||
|
|
||||||
|
static const char ui_description[] =
|
||||||
|
"<ui>"
|
||||||
|
" <menubar name=\"MainMenu\">"
|
||||||
|
" <menu action=\"FileMenu\">"
|
||||||
|
" <menuitem action=\"New\"/>"
|
||||||
|
" <menuitem action=\"Open\"/>"
|
||||||
|
" <menuitem action=\"Save\"/>"
|
||||||
|
" <menuitem action=\"SaveAs\"/>"
|
||||||
|
" <separator/>"
|
||||||
|
" <menuitem action=\"PrintPreview\"/>"
|
||||||
|
" <menuitem action=\"Print\"/>"
|
||||||
|
" <separator/>"
|
||||||
|
" <menuitem action=\"Close\"/>"
|
||||||
|
" <menuitem action=\"Quit\"/>"
|
||||||
|
" </menu>"
|
||||||
|
" <menu action=\"EditMenu\">"
|
||||||
|
" <menuitem action=\"Undo\"/>"
|
||||||
|
" <menuitem action=\"Redo\"/>"
|
||||||
|
" <separator/>"
|
||||||
|
" <menuitem action=\"Cut\"/>"
|
||||||
|
" <menuitem action=\"Copy\"/>"
|
||||||
|
" <menuitem action=\"Paste\"/>"
|
||||||
|
" <menuitem action=\"Delete\"/>"
|
||||||
|
" <separator/>"
|
||||||
|
" <menuitem action=\"SelectAll\"/>"
|
||||||
|
" <separator/>"
|
||||||
|
" <menuitem action=\"Preferences\"/>"
|
||||||
|
" </menu>"
|
||||||
|
" <menu action=\"ViewMenu\">"
|
||||||
|
" <menuitem action=\"ZoomFit\"/>"
|
||||||
|
" <menuitem action=\"Zoom100\"/>"
|
||||||
|
" <menuitem action=\"ZoomIn\"/>"
|
||||||
|
" <menuitem action=\"ZoomOut\"/>"
|
||||||
|
" <separator/>"
|
||||||
|
" <menuitem action=\"FullScreen\"/>"
|
||||||
|
" </menu>"
|
||||||
|
" <menu action=\"HelpMenu\">"
|
||||||
|
" <menuitem action=\"HelpContents\"/>"
|
||||||
|
" <menuitem action=\"About\"/>"
|
||||||
|
" </menu>"
|
||||||
|
" </menubar>"
|
||||||
|
" <toolbar name=\"MainToolbar\">"
|
||||||
|
" <toolitem action=\"New\"/>"
|
||||||
|
" <toolitem action=\"Open\"/>"
|
||||||
|
" <toolitem action=\"Save\"/>"
|
||||||
|
" <separator/>"
|
||||||
|
" <toolitem action=\"Print\"/>"
|
||||||
|
" <separator/>"
|
||||||
|
" <toolitem action=\"Undo\"/>"
|
||||||
|
" <toolitem action=\"Redo\"/>"
|
||||||
|
" <separator/>"
|
||||||
|
" <toolitem action=\"Cut\"/>"
|
||||||
|
" <toolitem action=\"Copy\"/>"
|
||||||
|
" <toolitem action=\"Paste\"/>"
|
||||||
|
" </toolbar>"
|
||||||
|
"</ui>";
|
||||||
|
|
||||||
|
static GtkUIManager *
|
||||||
|
uimanager_new (void)
|
||||||
|
{
|
||||||
|
GtkUIManager *ui;
|
||||||
|
GtkActionGroup *action_group;
|
||||||
|
GError *error;
|
||||||
|
|
||||||
|
ui = gtk_ui_manager_new ();
|
||||||
|
|
||||||
|
action_group = gtk_action_group_new ("Actions");
|
||||||
|
gtk_action_group_add_actions (action_group, menu_action_entries, G_N_ELEMENTS (menu_action_entries), NULL);
|
||||||
|
|
||||||
|
gtk_ui_manager_insert_action_group (ui, action_group, 0);
|
||||||
|
g_object_unref (action_group);
|
||||||
|
|
||||||
|
error = NULL;
|
||||||
|
if (!gtk_ui_manager_add_ui_from_string (ui, ui_description, -1, &error))
|
||||||
|
g_error ("Could not parse the uimanager XML: %s", error->message);
|
||||||
|
|
||||||
|
return ui;
|
||||||
|
}
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
menubar_new (GtkUIManager *ui)
|
||||||
|
{
|
||||||
|
return gtk_ui_manager_get_widget (ui, "/MainMenu");
|
||||||
|
}
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
toolbar_new (GtkUIManager *ui)
|
||||||
|
{
|
||||||
|
return gtk_ui_manager_get_widget (ui, "/MainToolbar");
|
||||||
|
}
|
||||||
|
|
||||||
|
struct row_data {
|
||||||
|
char *stock_id;
|
||||||
|
char *text1;
|
||||||
|
char *text2;
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct row_data row_data[] = {
|
||||||
|
{ GTK_STOCK_NEW, "First", "Here bygynneth the Book of the tales of Caunterbury." },
|
||||||
|
{ GTK_STOCK_OPEN, "Second", "Whan that Aprille, with hise shoures soote," },
|
||||||
|
{ GTK_STOCK_ABOUT, "Third", "The droghte of March hath perced to the roote" },
|
||||||
|
{ GTK_STOCK_ADD, "Fourth", "And bathed every veyne in swich licour," },
|
||||||
|
{ GTK_STOCK_APPLY, "Fifth", "Of which vertu engendred is the flour;" },
|
||||||
|
{ GTK_STOCK_BOLD, "Sixth", "Whan Zephirus eek with his swete breeth" },
|
||||||
|
{ GTK_STOCK_CANCEL, "Seventh", "Inspired hath in every holt and heeth" },
|
||||||
|
{ GTK_STOCK_CDROM, "Eighth", "The tendre croppes, and the yonge sonne" },
|
||||||
|
{ GTK_STOCK_CLEAR, "Ninth", "Hath in the Ram his halfe cours yronne," },
|
||||||
|
{ GTK_STOCK_CLOSE, "Tenth", "And smale foweles maken melodye," },
|
||||||
|
{ GTK_STOCK_COLOR_PICKER, "Eleventh", "That slepen al the nyght with open eye-" },
|
||||||
|
{ GTK_STOCK_CONVERT, "Twelfth", "So priketh hem Nature in hir corages-" },
|
||||||
|
{ GTK_STOCK_CONNECT, "Thirteenth", "Thanne longen folk to goon on pilgrimages" },
|
||||||
|
{ GTK_STOCK_COPY, "Fourteenth", "And palmeres for to seken straunge strondes" },
|
||||||
|
{ GTK_STOCK_CUT, "Fifteenth", "To ferne halwes, kowthe in sondry londes;" },
|
||||||
|
{ GTK_STOCK_DELETE, "Sixteenth", "And specially, from every shires ende" },
|
||||||
|
{ GTK_STOCK_DIRECTORY, "Seventeenth", "Of Engelond, to Caunturbury they wende," },
|
||||||
|
{ GTK_STOCK_DISCONNECT, "Eighteenth", "The hooly blisful martir for the seke" },
|
||||||
|
{ GTK_STOCK_EDIT, "Nineteenth", "That hem hath holpen, whan that they were seeke." },
|
||||||
|
{ GTK_STOCK_EXECUTE, "Twentieth", "Bifil that in that seson, on a day," },
|
||||||
|
{ GTK_STOCK_FILE, "Twenty-first", "In Southwerk at the Tabard as I lay," },
|
||||||
|
{ GTK_STOCK_FIND, "Twenty-second", "Redy to wenden on my pilgrymage" },
|
||||||
|
{ GTK_STOCK_FIND_AND_REPLACE, "Twenty-third", "To Caunterbury, with ful devout corage," },
|
||||||
|
{ GTK_STOCK_FLOPPY, "Twenty-fourth", "At nyght were come into that hostelrye" },
|
||||||
|
{ GTK_STOCK_FULLSCREEN, "Twenty-fifth", "Wel nyne and twenty in a compaignye" },
|
||||||
|
{ GTK_STOCK_GOTO_BOTTOM, "Twenty-sixth", "Of sondry folk, by aventure yfalle" },
|
||||||
|
};
|
||||||
|
|
||||||
|
static GtkTreeModel *
|
||||||
|
tree_model_new (void)
|
||||||
|
{
|
||||||
|
GtkListStore *list;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
list = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
|
||||||
|
|
||||||
|
for (i = 0; i < G_N_ELEMENTS (row_data); i++)
|
||||||
|
{
|
||||||
|
GtkTreeIter iter;
|
||||||
|
|
||||||
|
gtk_list_store_append (list, &iter);
|
||||||
|
gtk_list_store_set (list,
|
||||||
|
&iter,
|
||||||
|
0, row_data[i].stock_id,
|
||||||
|
1, row_data[i].text1,
|
||||||
|
2, row_data[i].text2,
|
||||||
|
-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return GTK_TREE_MODEL (list);
|
||||||
|
}
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
tree_view_new (void)
|
||||||
|
{
|
||||||
|
GtkWidget *sw;
|
||||||
|
GtkWidget *tree;
|
||||||
|
GtkTreeModel *model;
|
||||||
|
GtkTreeViewColumn *column;
|
||||||
|
|
||||||
|
sw = gtk_scrolled_window_new (NULL, NULL);
|
||||||
|
|
||||||
|
model = tree_model_new ();
|
||||||
|
tree = gtk_tree_view_new_with_model (model);
|
||||||
|
g_object_unref (model);
|
||||||
|
|
||||||
|
gtk_widget_set_size_request (tree, 300, 100);
|
||||||
|
|
||||||
|
column = gtk_tree_view_column_new_with_attributes ("Icon",
|
||||||
|
gtk_cell_renderer_pixbuf_new (),
|
||||||
|
"stock-id", 0,
|
||||||
|
NULL);
|
||||||
|
gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
|
||||||
|
|
||||||
|
column = gtk_tree_view_column_new_with_attributes ("Index",
|
||||||
|
gtk_cell_renderer_text_new (),
|
||||||
|
"text", 1,
|
||||||
|
NULL);
|
||||||
|
gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
|
||||||
|
|
||||||
|
column = gtk_tree_view_column_new_with_attributes ("Canterbury Tales",
|
||||||
|
gtk_cell_renderer_text_new (),
|
||||||
|
"text", 2,
|
||||||
|
NULL);
|
||||||
|
gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
|
||||||
|
|
||||||
|
gtk_container_add (GTK_CONTAINER (sw), tree);
|
||||||
|
|
||||||
|
return sw;
|
||||||
|
}
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
left_pane_new (void)
|
||||||
|
{
|
||||||
|
return tree_view_new ();
|
||||||
|
}
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
text_view_new (void)
|
||||||
|
{
|
||||||
|
GtkWidget *sw;
|
||||||
|
GtkWidget *text_view;
|
||||||
|
GtkTextBuffer *buffer;
|
||||||
|
|
||||||
|
sw = gtk_scrolled_window_new (NULL, NULL);
|
||||||
|
|
||||||
|
text_view = gtk_text_view_new ();
|
||||||
|
gtk_widget_set_size_request (text_view, 400, 300);
|
||||||
|
gtk_container_add (GTK_CONTAINER (sw), text_view);
|
||||||
|
|
||||||
|
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
|
||||||
|
|
||||||
|
gtk_text_buffer_set_text (buffer,
|
||||||
|
"In felaweshipe, and pilgrimes were they alle,\n"
|
||||||
|
"That toward Caunterbury wolden ryde.\n"
|
||||||
|
"The chambres and the stables weren wyde,\n"
|
||||||
|
"And wel we weren esed atte beste;\n"
|
||||||
|
"And shortly, whan the sonne was to reste,\n"
|
||||||
|
"\n"
|
||||||
|
"So hadde I spoken with hem everychon \n"
|
||||||
|
"That I was of hir felaweshipe anon, \n"
|
||||||
|
"And made forward erly for to ryse \n"
|
||||||
|
"To take our wey, ther as I yow devyse. \n"
|
||||||
|
" But nathelees, whil I have tyme and space, \n"
|
||||||
|
" \n"
|
||||||
|
"Er that I ferther in this tale pace, \n"
|
||||||
|
"Me thynketh it acordaunt to resoun \n"
|
||||||
|
"To telle yow al the condicioun \n"
|
||||||
|
"Of ech of hem, so as it semed me, \n"
|
||||||
|
"And whiche they weren, and of what degree, \n"
|
||||||
|
" \n"
|
||||||
|
"And eek in what array that they were inne; \n"
|
||||||
|
"And at a knyght than wol I first bigynne. \n"
|
||||||
|
" A knyght ther was, and that a worthy man, \n"
|
||||||
|
"That fro the tyme that he first bigan \n"
|
||||||
|
"To riden out, he loved chivalrie, \n"
|
||||||
|
" \n"
|
||||||
|
"Trouthe and honour, fredom and curteisie. \n"
|
||||||
|
"Ful worthy was he in his lordes werre, \n"
|
||||||
|
" \n"
|
||||||
|
"And therto hadde he riden, no man ferre, \n"
|
||||||
|
"As wel in Cristendom as in Hethenesse, \n"
|
||||||
|
"And evere honoured for his worthynesse. \n"
|
||||||
|
" \n"
|
||||||
|
" At Alisaundre he was, whan it was wonne; \n"
|
||||||
|
"Ful ofte tyme he hadde the bord bigonne \n"
|
||||||
|
"Aboven alle nacions in Pruce; \n"
|
||||||
|
"In Lettow hadde he reysed, and in Ruce, \n"
|
||||||
|
"No cristen man so ofte of his degree. \n",
|
||||||
|
-1);
|
||||||
|
|
||||||
|
return sw;
|
||||||
|
}
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
upper_right_new (void)
|
||||||
|
{
|
||||||
|
GtkWidget *notebook;
|
||||||
|
|
||||||
|
notebook = gtk_notebook_new ();
|
||||||
|
|
||||||
|
gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
|
||||||
|
text_view_new (),
|
||||||
|
gtk_label_new ("First"));
|
||||||
|
|
||||||
|
gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
|
||||||
|
text_view_new (),
|
||||||
|
gtk_label_new ("Second"));
|
||||||
|
|
||||||
|
gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
|
||||||
|
text_view_new (),
|
||||||
|
gtk_label_new ("Third"));
|
||||||
|
|
||||||
|
return notebook;
|
||||||
|
}
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
lower_right_new (void)
|
||||||
|
{
|
||||||
|
return tree_view_new ();
|
||||||
|
}
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
right_pane_new (void)
|
||||||
|
{
|
||||||
|
GtkWidget *paned;
|
||||||
|
GtkWidget *upper_right;
|
||||||
|
GtkWidget *lower_right;
|
||||||
|
|
||||||
|
paned = gtk_vpaned_new ();
|
||||||
|
|
||||||
|
upper_right = upper_right_new ();
|
||||||
|
gtk_paned_pack1 (GTK_PANED (paned), upper_right, TRUE, TRUE);
|
||||||
|
|
||||||
|
lower_right = lower_right_new ();
|
||||||
|
gtk_paned_pack2 (GTK_PANED (paned), lower_right, TRUE, TRUE);
|
||||||
|
|
||||||
|
return paned;
|
||||||
|
}
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
content_area_new (void)
|
||||||
|
{
|
||||||
|
GtkWidget *hpaned;
|
||||||
|
GtkWidget *left, *right;
|
||||||
|
|
||||||
|
hpaned = gtk_hpaned_new ();
|
||||||
|
|
||||||
|
left = left_pane_new ();
|
||||||
|
gtk_paned_pack1 (GTK_PANED (hpaned), left, TRUE, TRUE);
|
||||||
|
|
||||||
|
right = right_pane_new ();
|
||||||
|
gtk_paned_pack2 (GTK_PANED (hpaned), right, TRUE, TRUE);
|
||||||
|
|
||||||
|
return hpaned;
|
||||||
|
}
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
status_bar_new (void)
|
||||||
|
{
|
||||||
|
return gtk_statusbar_new ();
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
|
||||||
|
{
|
||||||
|
gtk_main_quit ();
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
GtkWidget *
|
||||||
|
appwindow_new (void)
|
||||||
|
{
|
||||||
|
GtkWidget *window;
|
||||||
|
GtkUIManager *ui;
|
||||||
|
GtkWidget *vbox;
|
||||||
|
GtkWidget *widget;
|
||||||
|
|
||||||
|
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
|
||||||
|
gtk_window_set_title (GTK_WINDOW (window), "Main window");
|
||||||
|
g_signal_connect (window, "delete-event",
|
||||||
|
G_CALLBACK (delete_event_cb), NULL);
|
||||||
|
|
||||||
|
ui = uimanager_new ();
|
||||||
|
g_signal_connect_swapped (window, "destroy",
|
||||||
|
G_CALLBACK (g_object_unref), ui);
|
||||||
|
|
||||||
|
vbox = gtk_vbox_new (FALSE, 0);
|
||||||
|
gtk_container_add (GTK_CONTAINER (window), vbox);
|
||||||
|
|
||||||
|
widget = menubar_new (ui);
|
||||||
|
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
|
||||||
|
|
||||||
|
widget = toolbar_new (ui);
|
||||||
|
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
|
||||||
|
|
||||||
|
widget = content_area_new ();
|
||||||
|
gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0);
|
||||||
|
|
||||||
|
widget = status_bar_new ();
|
||||||
|
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
|
||||||
|
|
||||||
|
return window;
|
||||||
|
}
|
||||||
3
perf/appwindow.h
Normal file
3
perf/appwindow.h
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
#include <gtk/gtkwidget.h>
|
||||||
|
|
||||||
|
GtkWidget *appwindow_new (void);
|
||||||
54
perf/main.c
Normal file
54
perf/main.c
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
#include <stdio.h>
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
#include "appwindow.h"
|
||||||
|
#include "timers.h"
|
||||||
|
|
||||||
|
#define ITERS 20
|
||||||
|
|
||||||
|
static GtkWidget *
|
||||||
|
create_cb (gpointer data)
|
||||||
|
{
|
||||||
|
return appwindow_new ();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
report_cb (TimerReport report, gdouble elapsed, gpointer data)
|
||||||
|
{
|
||||||
|
const char *type;
|
||||||
|
|
||||||
|
switch (report) {
|
||||||
|
case TIMER_REPORT_WIDGET_CREATION:
|
||||||
|
type = "widget creation";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case TIMER_REPORT_WIDGET_SHOW:
|
||||||
|
type = "widget show";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case TIMER_REPORT_WIDGET_DESTRUCTION:
|
||||||
|
type = "widget destruction";
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
g_assert_not_reached ();
|
||||||
|
type = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf (stderr, "%s: %g sec\n", type, elapsed);
|
||||||
|
|
||||||
|
if (report == TIMER_REPORT_WIDGET_DESTRUCTION)
|
||||||
|
fputs ("\n", stderr);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main (int argc, char **argv)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
gtk_init (&argc, &argv);
|
||||||
|
|
||||||
|
for (i = 0; i < ITERS; i++)
|
||||||
|
timer_time_widget (create_cb, report_cb, NULL);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
134
perf/timers.c
Normal file
134
perf/timers.c
Normal file
@ -0,0 +1,134 @@
|
|||||||
|
/* Utility functions for timing widgets
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Federico Mena-Quintero <federico@novell.com>
|
||||||
|
*
|
||||||
|
* To measure how long it takes to fully map and expose a toplevel window, we
|
||||||
|
* use a trick which Owen Taylor described on IRC one day:
|
||||||
|
*
|
||||||
|
* 1. Start a timer.
|
||||||
|
* 2. Call gtk_widget_show_all() on the toplevel window.
|
||||||
|
* 3. In the expose_event handler of the window, queue an idle handler with
|
||||||
|
* G_PRIORITY_HIGH.
|
||||||
|
* 4. In the idle handler, change a property on the toplevel window.
|
||||||
|
* 5. In the property_notify_event handler, stop the timer.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
#include <glib.h>
|
||||||
|
#include <gtk/gtkmain.h>
|
||||||
|
#include "timers.h"
|
||||||
|
|
||||||
|
struct timer_closure
|
||||||
|
{
|
||||||
|
GTimer *timer;
|
||||||
|
GtkWidget *widget;
|
||||||
|
TimerReportFunc report_func;
|
||||||
|
gpointer user_data;
|
||||||
|
};
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
widget_property_notify_event_cb (GtkWidget *widget, GdkEventProperty *event, gpointer data)
|
||||||
|
{
|
||||||
|
struct timer_closure *closure;
|
||||||
|
gdouble elapsed;
|
||||||
|
|
||||||
|
closure = data;
|
||||||
|
|
||||||
|
if (event->atom != gdk_atom_intern ("window_property_change", FALSE))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
/* Finish timing map/expose */
|
||||||
|
|
||||||
|
elapsed = g_timer_elapsed (closure->timer, NULL);
|
||||||
|
(* closure->report_func) (TIMER_REPORT_WIDGET_SHOW, elapsed, closure->user_data);
|
||||||
|
|
||||||
|
/* Time destruction */
|
||||||
|
|
||||||
|
g_timer_reset (closure->timer);
|
||||||
|
gtk_widget_destroy (widget);
|
||||||
|
elapsed = g_timer_elapsed (closure->timer, NULL);
|
||||||
|
(* closure->report_func) (TIMER_REPORT_WIDGET_DESTRUCTION, elapsed, closure->user_data);
|
||||||
|
|
||||||
|
gtk_main_quit (); /* This will get us back to the end of timer_time_widget() */
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
idle_after_expose_cb (gpointer data)
|
||||||
|
{
|
||||||
|
struct timer_closure *closure;
|
||||||
|
|
||||||
|
closure = data;
|
||||||
|
|
||||||
|
gdk_property_change (closure->widget->window,
|
||||||
|
gdk_atom_intern ("window_property_change", FALSE),
|
||||||
|
gdk_atom_intern ("STRING", FALSE),
|
||||||
|
8,
|
||||||
|
GDK_PROP_MODE_REPLACE,
|
||||||
|
"hello",
|
||||||
|
strlen ("hello"));
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
widget_expose_event_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
|
||||||
|
{
|
||||||
|
struct timer_closure *closure;
|
||||||
|
|
||||||
|
closure = data;
|
||||||
|
|
||||||
|
g_idle_add_full (G_PRIORITY_HIGH, idle_after_expose_cb, closure, NULL);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
instrument_widget (GtkWidget *widget,
|
||||||
|
struct timer_closure *closure)
|
||||||
|
{
|
||||||
|
g_signal_connect (widget, "expose-event",
|
||||||
|
G_CALLBACK (widget_expose_event_cb), closure);
|
||||||
|
|
||||||
|
gtk_widget_add_events (widget, GDK_PROPERTY_CHANGE_MASK);
|
||||||
|
g_signal_connect (widget, "property-notify-event",
|
||||||
|
G_CALLBACK (widget_property_notify_event_cb), closure);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
timer_time_widget (TimerWidgetCreateFunc create_func,
|
||||||
|
TimerReportFunc report_func,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
GTimer *timer;
|
||||||
|
GtkWidget *widget;
|
||||||
|
gdouble elapsed;
|
||||||
|
struct timer_closure closure;
|
||||||
|
|
||||||
|
g_assert (create_func != NULL);
|
||||||
|
g_assert (report_func != NULL);
|
||||||
|
|
||||||
|
/* Time creation */
|
||||||
|
|
||||||
|
timer = g_timer_new ();
|
||||||
|
widget = (* create_func) (user_data);
|
||||||
|
g_assert (widget != NULL);
|
||||||
|
g_assert (!GTK_WIDGET_VISIBLE (widget) && !GTK_WIDGET_MAPPED (widget));
|
||||||
|
elapsed = g_timer_elapsed (timer, NULL);
|
||||||
|
|
||||||
|
(* report_func) (TIMER_REPORT_WIDGET_CREATION, elapsed, user_data);
|
||||||
|
|
||||||
|
/* Start timing map/expose */
|
||||||
|
|
||||||
|
closure.timer = timer;
|
||||||
|
closure.widget = widget;
|
||||||
|
closure.report_func = report_func;
|
||||||
|
closure.user_data = user_data;
|
||||||
|
instrument_widget (widget, &closure);
|
||||||
|
|
||||||
|
g_timer_reset (timer);
|
||||||
|
gtk_widget_show_all (widget);
|
||||||
|
gtk_main ();
|
||||||
|
|
||||||
|
/* Expose time and destruction time get recorded in widget_property_notify_event_cb() */
|
||||||
|
}
|
||||||
16
perf/timers.h
Normal file
16
perf/timers.h
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#include <gtk/gtkwidget.h>
|
||||||
|
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
TIMER_REPORT_WIDGET_CREATION,
|
||||||
|
TIMER_REPORT_WIDGET_SHOW,
|
||||||
|
TIMER_REPORT_WIDGET_DESTRUCTION
|
||||||
|
} TimerReport;
|
||||||
|
|
||||||
|
typedef GtkWidget *(* TimerWidgetCreateFunc) (gpointer user_data);
|
||||||
|
|
||||||
|
typedef void (* TimerReportFunc) (TimerReport report, gdouble elapsed, gpointer user_data);
|
||||||
|
|
||||||
|
void timer_time_widget (TimerWidgetCreateFunc create_func,
|
||||||
|
TimerReportFunc report_func,
|
||||||
|
gpointer user_data);
|
||||||
Loading…
Reference in New Issue
Block a user