gimp r27668 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Sat Nov 15 23:16:04 2008
New Revision: 27668
URL: http://svn.gnome.org/viewvc/gimp?rev=27668&view=rev

Log:
2008-11-16  Sven Neumann  <sven gimp org>

	* app/display/gimpdisplayshell.h: optimize access to
	GimpDisplayShell struct members by placing related and frequently
	accessed members like like scale and offset into the same
	cacheline.

	* app/display/gimpdisplayshell.c (gimp_display_shell_init): resort
	initialization accordingly.



Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell.c
   trunk/app/display/gimpdisplayshell.h

Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c	(original)
+++ trunk/app/display/gimpdisplayshell.c	Sat Nov 15 23:16:04 2008
@@ -241,6 +241,15 @@
   shell->menubar_manager        = NULL;
   shell->popup_manager          = NULL;
 
+  shell->options                = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS, NULL);
+  shell->fullscreen_options     = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_FULLSCREEN, NULL);
+  shell->no_image_options       = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_NO_IMAGE, NULL);
+
+  shell->snap_to_guides         = TRUE;
+  shell->snap_to_grid           = FALSE;
+  shell->snap_to_canvas         = FALSE;
+  shell->snap_to_vectors        = FALSE;
+
   shell->unit                   = GIMP_UNIT_PIXEL;
 
   shell->zoom                   = gimp_zoom_model_new ();
@@ -261,14 +270,16 @@
   shell->last_offset_x          = 0;
   shell->last_offset_y          = 0;
 
+  shell->last_motion_time       = 0;
+  shell->last_motion_delta_x    = 0.0;
+  shell->last_motion_delta_y    = 0.0;
+  shell->last_motion_distance   = 0.0;
+  shell->last_motion_delta_time = 0.0;
+
   shell->disp_width             = 0;
   shell->disp_height            = 0;
 
   shell->proximity              = FALSE;
-  shell->snap_to_guides         = TRUE;
-  shell->snap_to_grid           = FALSE;
-  shell->snap_to_canvas         = FALSE;
-  shell->snap_to_vectors        = FALSE;
 
   shell->selection              = NULL;
 
@@ -333,10 +344,6 @@
 
   shell->size_allocate_from_configure_event = FALSE;
 
-  shell->options                = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS, NULL);
-  shell->fullscreen_options     = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_FULLSCREEN, NULL);
-  shell->no_image_options       = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_NO_IMAGE, NULL);
-
   shell->space_pressed          = FALSE;
   shell->space_release_pending  = FALSE;
   shell->space_shaded_tool      = NULL;
@@ -349,12 +356,6 @@
   shell->highlight              = NULL;
   shell->mask                   = NULL;
 
-  shell->last_motion_time       = 0;
-  shell->last_motion_delta_x    = 0.0;
-  shell->last_motion_delta_y    = 0.0;
-  shell->last_motion_distance   = 0.0;
-  shell->last_motion_delta_time = 0.0;
-
   gtk_window_set_role (GTK_WINDOW (shell), "gimp-image-window");
   gtk_window_set_resizable (GTK_WINDOW (shell), TRUE);
 

Modified: trunk/app/display/gimpdisplayshell.h
==============================================================================
--- trunk/app/display/gimpdisplayshell.h	(original)
+++ trunk/app/display/gimpdisplayshell.h	Sat Nov 15 23:16:04 2008
@@ -63,6 +63,8 @@
 {
   GimpWindow         parent_instance;
 
+  /* --- cacheline 2 boundary (128 bytes) was 20 bytes ago --- */
+
   GimpDisplay       *display;
 
   GimpUIManager     *menubar_manager;
@@ -70,14 +72,18 @@
 
   GimpDialogFactory *display_factory;
 
-  gdouble            monitor_xres;
-  gdouble            monitor_yres;
+  GimpDisplayOptions *options;
+  GimpDisplayOptions *fullscreen_options;
+  GimpDisplayOptions *no_image_options;
 
-  GimpUnit           unit;
+  gboolean           snap_to_guides;   /*  should the guides be snapped to?   */
+  gboolean           snap_to_grid;     /*  should the grid be snapped to?     */
+  gboolean           snap_to_canvas;   /*  should the canvas be snapped to?   */
+  gboolean           snap_to_vectors;  /*  should the active path be snapped  */
 
-  GimpZoomModel     *zoom;
-  gdouble            other_scale;      /*  scale factor entered in Zoom->Other*/
-  gboolean           dot_for_dot;      /*  ignore monitor resolution          */
+  /* --- cacheline 3 boundary (192 bytes) --- */
+
+  GimpUnit           unit;
 
   gint               offset_x;         /*  offset of display image            */
   gint               offset_y;
@@ -85,24 +91,41 @@
   gdouble            scale_x;          /*  horizontal scale factor            */
   gdouble            scale_y;          /*  vertical scale factor              */
 
+  gdouble            monitor_xres;
+  gdouble            monitor_yres;
+  gboolean           dot_for_dot;      /*  ignore monitor resolution          */
+
   gint               x_src_dec;        /*  increments for the bresenham style */
   gint               y_src_dec;        /*  image --> display transformation   */
   gint               x_dest_inc;
   gint               y_dest_inc;
 
+  /* --- cacheline 4 boundary (256 bytes) --- */
+
+  GimpZoomModel     *zoom;
+
   gdouble            last_scale;       /*  scale used when reverting zoom     */
   guint              last_scale_time;  /*  time when last_scale was set       */
   gint               last_offset_x;    /*  offsets used when reverting zoom   */
   gint               last_offset_y;
 
+  guint32            last_motion_time; /*  previous time of a forwarded motion event  */
+  guint32            last_read_motion_time;
+  gdouble            last_motion_delta_time;
+  gdouble            last_motion_delta_x;
+  gdouble            last_motion_delta_y;
+  gdouble            last_motion_distance;
+
+  /* --- cacheline 5 boundary (320 bytes) --- */
+
+  GimpCoords         last_coords;      /* last motion event                   */
+
+  gdouble            other_scale;      /*  scale factor entered in Zoom->Other*/
+
   gint               disp_width;       /*  width of drawing area              */
   gint               disp_height;      /*  height of drawing area             */
 
   gboolean           proximity;        /*  is a device in proximity           */
-  gboolean           snap_to_guides;   /*  should the guides be snapped to?   */
-  gboolean           snap_to_grid;     /*  should the grid be snapped to?     */
-  gboolean           snap_to_canvas;   /*  should the canvas be snapped to?   */
-  gboolean           snap_to_vectors;  /*  should the active path be snapped  */
 
   Selection         *selection;        /*  Selection (marching ants)          */
 
@@ -168,34 +191,21 @@
 
   gboolean           size_allocate_from_configure_event;
 
-  GimpDisplayOptions *options;
-  GimpDisplayOptions *fullscreen_options;
-  GimpDisplayOptions *no_image_options;
-
   /*  the state of gimp_display_shell_tool_events()  */
   gboolean           space_pressed;
   gboolean           space_release_pending;
   const gchar       *space_shaded_tool;
+
   gboolean           scrolling;
   gint               scroll_start_x;
   gint               scroll_start_y;
+  gpointer           scroll_info;
+
   gboolean           button_press_before_focus;
 
   GdkRectangle      *highlight;        /* in image coordinates, can be NULL   */
   GimpDrawable      *mask;
   GimpChannelType    mask_color;
-
-  gpointer           scroll_info;
-
-  GimpCoords         last_coords;      /* last motion event                   */
-
-  guint32            last_motion_time; /*  previous time of a forwarded motion event  */
-  guint32            last_read_motion_time;
-  gdouble            last_motion_delta_time;
-  gdouble            last_motion_delta_x;
-  gdouble            last_motion_delta_y;
-  gdouble            last_motion_distance;
-
 };
 
 struct _GimpDisplayShellClass