textview: Don't validate during snapshot

Do it during size_allocate, and go back there
if needed.

gdk/backtrace-helper.h

@@ -1,81 +0,0 @@
-/* backtrace-helper.h
- *
- * Copyright 2020-2023 Christian Hergert <chergert@redhat.com>
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#pragma once
-
-#include <sysprof-capture.h>
-
-#ifdef HAVE_EXECINFO_H
-# include <execinfo.h>
-#endif
-#ifdef ENABLE_LIBUNWIND
-# define UNW_LOCAL_ONLY
-# include <libunwind.h>
-#endif
-
-static void
-backtrace_init (void)
-{
-#ifdef ENABLE_LIBUNWIND
-  unw_set_caching_policy (unw_local_addr_space, UNW_CACHE_PER_THREAD);
-# ifdef HAVE_UNW_SET_CACHE_SIZE
-  unw_set_cache_size (unw_local_addr_space, 1024, 0);
-#endif
-#endif
-}
-
-static int
-backtrace_func (SysprofCaptureAddress  *addrs,
-                guint                   n_addrs,
-                G_GNUC_UNUSED gpointer  user_data)
-{
-#if defined(ENABLE_LIBUNWIND)
-# if GLIB_SIZEOF_VOID_P == 8
-  /* We know that collector will overwrite fields *AFTER* it
-   * has called the backtrace function allowing us to cheat
-   * and subtract an offset from addrs to avoid having to
-   * copy frame pointers around.
-   */
-  return unw_backtrace ((void **)addrs - 2, n_addrs) - 2;
-# else
-  static const int skip = 2;
-  void **stack = alloca (n_addrs * sizeof (gpointer));
-  int n = unw_backtrace (stack, n_addrs);
-  for (guint i = skip; i < n; i++)
-    addrs[i-skip] = GPOINTER_TO_SIZE (stack[i]);
-  return MAX (0, n - skip);
-# endif
-#elif defined(HAVE_EXECINFO_H)
-# if GLIB_SIZEOF_VOID_P == 8
-  /* See note on unw_backtrace() */
-  return backtrace ((void **)addrs - 2, n_addrs) - 2;
-# else /* GLIB_SIZEOF_VOID_P != 8 */
-  static const int skip = 2;
-  void **stack = alloca (n_addrs * sizeof (gpointer));
-  int n = backtrace (stack, n_addrs);
-  for (guint i = skip; i < n; i++)
-    addrs[i-skip] = GPOINTER_TO_SIZE (stack[i]);
-  return MAX (0, n - skip);
-# endif /* GLIB_SIZEOF_VOID_P */
-#else
-  return 0;
-#endif
-}
-

gdk/gdkframeclockidle.c

@@ -584,6 +584,8 @@ gdk_frame_clock_paint_idle (void *data)
                 {
                   priv->requested &= ~GDK_FRAME_CLOCK_PHASE_LAYOUT;
                   _gdk_frame_clock_emit_layout (clock);
+                  if (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT)
+                    g_print ("looping in layout %d\n", iter);
                 }
 	      if (iter == 5)
 		g_warning ("gdk-frame-clock: layout continuously requested, giving up after 4 tries");
@@ -809,3 +811,12 @@ _gdk_frame_clock_idle_new (void)
 
   return GDK_FRAME_CLOCK (clock);
 }
+
+GdkFrameClockPhase
+gdk_frame_clock_get_current_phase (GdkFrameClock *clock)
+{
+  GdkFrameClockIdle *clock_idle = GDK_FRAME_CLOCK_IDLE (clock);
+  GdkFrameClockIdlePrivate *priv = clock_idle->priv;
+
+  return priv->phase;
+}

gdk/gdkframeclockprivate.h

@@ -127,6 +127,8 @@ void _gdk_frame_clock_emit_paint         (GdkFrameClock *frame_clock);
 void _gdk_frame_clock_emit_after_paint   (GdkFrameClock *frame_clock);
 void _gdk_frame_clock_emit_resume_events (GdkFrameClock *frame_clock);
 
+GdkFrameClockPhase gdk_frame_clock_get_current_phase (GdkFrameClock *frame_clock);
+
 G_END_DECLS
 
 #endif /* __GDK_FRAME_CLOCK_PRIVATE_H__ */

gdk/gdkprofiler.c

@@ -32,9 +32,6 @@
 #include "gdkversionmacros.h"
 #include "gdkframeclockprivate.h"
 
-#ifdef HAVE_SYSPROF
-# include "backtrace-helper.h"
-#endif
 
 gboolean
 gdk_profiler_is_running (void)
@@ -163,19 +160,3 @@ void
   sysprof_collector_set_counters (&id, &value, 1);
 #endif
 }
-
-void
-(gdk_profiler_add_stacktrace) (void)
-{
-#ifdef HAVE_SYSPROF
-  static gsize did_init;
-
-  if (!did_init)
-    {
-      did_init = TRUE;
-      backtrace_init ();
-    }
-
-  sysprof_collector_sample (backtrace_func, NULL);
-#endif
-}

gdk/gdkprofilerprivate.h

@@ -63,8 +63,6 @@ void   gdk_profiler_end_markf (gint64       begin_time,
                                const gchar *message_format,
                                ...) G_GNUC_PRINTF (3, 4);
 
-void    gdk_profiler_add_stacktrace (void);
-
 guint   gdk_profiler_define_counter     (const char *name,
                                          const char *description);
 guint   gdk_profiler_define_int_counter (const char *name,
@@ -88,8 +86,6 @@ void    gdk_profiler_set_int_counter    (guint  id,
 /* no varargs macro support; the call will have to be optimised out by the compiler */
 #endif
 
-#define gdk_profiler_add_stacktrace() G_STMT_START {} G_STMT_END
-
 #define gdk_profiler_define_counter(n, d) 0
 #define gdk_profiler_define_int_counter(n, d) 0
 #define gdk_profiler_set_counter(i, v) G_STMT_START {} G_STMT_END

gtk/gtkrange.c

@@ -20,15 +20,13 @@
  * Modified by the GTK+ Team and others 1997-2004.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
 #include "config.h"
 
 #include "gtkrangeprivate.h"
 
-#include "gdkprofilerprivate.h"
-
 #include "gtkaccessible.h"
 #include "gtkaccessiblerange.h"
 #include "gtkadjustmentprivate.h"
@@ -690,7 +688,7 @@ gtk_range_set_adjustment (GtkRange      *range,
 
       priv->adjustment = adjustment;
       g_object_ref_sink (adjustment);
-
+      
       g_signal_connect (adjustment, "changed",
 			G_CALLBACK (gtk_range_adjustment_changed),
 			range);
@@ -1071,7 +1069,7 @@ gtk_range_set_range (GtkRange *range,
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
   GtkAdjustment *adjustment;
   double value;
-
+  
   g_return_if_fail (GTK_IS_RANGE (range));
   g_return_if_fail (min <= max);
 
@@ -1550,7 +1548,7 @@ clamp_dimensions (int        range_width,
           *width += extra;
         }
     }
-
+  
   /* See if we can fit rect, if not kill the border */
   shortage = *width - range_width;
   if (shortage > 0)
@@ -1587,7 +1585,7 @@ clamp_dimensions (int        range_width,
           border->bottom += extra / 2 + extra % 2;
         }
     }
-
+  
   /* See if we can fit rect, if not kill the border */
   shortage = *height - range_height;
   if (shortage > 0)
@@ -2350,8 +2348,6 @@ gtk_range_adjustment_changed (GtkAdjustment *adjustment,
   double upper = gtk_adjustment_get_upper (priv->adjustment);
   double lower = gtk_adjustment_get_lower (priv->adjustment);
 
-  gdk_profiler_add_stacktrace ();
-
   gtk_widget_set_visible (priv->slider_widget, upper != lower || !GTK_IS_SCALE (range));
 
   gtk_widget_queue_allocate (priv->trough_widget);
@@ -2395,7 +2391,7 @@ gtk_range_adjustment_value_changed (GtkAdjustment *adjustment,
 }
 
 static void
-apply_marks (GtkRange *range,
+apply_marks (GtkRange *range, 
              double    oldval,
              double   *newval)
 {
@@ -2506,7 +2502,7 @@ gtk_range_scroll (GtkRange     *range,
       else
         step_back (range);
       break;
-
+                    
     case GTK_SCROLL_STEP_UP:
       if (should_invert_move (range, GTK_ORIENTATION_VERTICAL))
         step_forward (range);
@@ -2520,18 +2516,18 @@ gtk_range_scroll (GtkRange     *range,
       else
         step_forward (range);
       break;
-
+                    
     case GTK_SCROLL_STEP_DOWN:
       if (should_invert_move (range, GTK_ORIENTATION_VERTICAL))
         step_back (range);
       else
         step_forward (range);
       break;
-
+                  
     case GTK_SCROLL_STEP_BACKWARD:
       step_back (range);
       break;
-
+                  
     case GTK_SCROLL_STEP_FORWARD:
       step_forward (range);
       break;
@@ -2542,7 +2538,7 @@ gtk_range_scroll (GtkRange     *range,
       else
         page_back (range);
       break;
-
+                    
     case GTK_SCROLL_PAGE_UP:
       if (should_invert_move (range, GTK_ORIENTATION_VERTICAL))
         page_forward (range);
@@ -2556,18 +2552,18 @@ gtk_range_scroll (GtkRange     *range,
       else
         page_forward (range);
       break;
-
+                    
     case GTK_SCROLL_PAGE_DOWN:
       if (should_invert_move (range, GTK_ORIENTATION_VERTICAL))
         page_back (range);
       else
         page_forward (range);
       break;
-
+                  
     case GTK_SCROLL_PAGE_BACKWARD:
       page_back (range);
       break;
-
+                  
     case GTK_SCROLL_PAGE_FORWARD:
       page_forward (range);
       break;
@@ -2857,7 +2853,7 @@ _gtk_range_set_stop_values (GtkRange *range,
 
   priv->n_marks = n_values;
 
-  for (i = 0; i < n_values; i++)
+  for (i = 0; i < n_values; i++) 
     priv->marks[i] = values[i];
 
   gtk_range_calc_marks (range);

gtk/gtktextview.c

@@ -4689,10 +4689,6 @@ gtk_text_view_size_allocate (GtkWidget *widget,
     }
   g_object_unref (layout);
 
-  /* The GTK resize loop processes all the pending exposes right
-   * after doing the resize stuff, so the idle sizer won't have a
-   * chance to run. So we do the work here.
-   */
   gtk_text_view_flush_first_validate (text_view);
 
   chooser = g_object_get_data (G_OBJECT (text_view), "gtk-emoji-chooser");
@@ -4876,6 +4872,8 @@ gtk_text_view_invalidate (GtkTextView *text_view)
       DV (g_print (G_STRLOC": adding incremental validate idle %d\n",
                    priv->incremental_validate_idle));
     }
+
+  gtk_widget_queue_allocate (GTK_WIDGET (text_view));
 }
 
 static void
@@ -5843,6 +5841,9 @@ gtk_text_view_paint (GtkWidget   *widget,
   g_return_if_fail (priv->xoffset >= - priv->left_padding);
   g_return_if_fail (priv->yoffset >= - priv->top_margin);
 
+  if (priv->first_validate_idle != 0)
+    g_critical ("textview: paint with unfinished validation\n");
+
   while (priv->first_validate_idle != 0)
     {
       DV (g_print (G_STRLOC": first_validate_idle: %d\n",

gtk/gtkwidget.c

@@ -75,6 +75,7 @@
 
 #include "gdk/gdkeventsprivate.h"
 #include "gdk/gdkprofilerprivate.h"
+#include "gdk/gdkframeclockprivate.h"
 #include "gsk/gskdebugprivate.h"
 #include "gsk/gskrendererprivate.h"
 
@@ -10571,6 +10572,14 @@ static void
 gtk_widget_set_alloc_needed (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
+  GdkFrameClock *frame_clock = gtk_widget_get_frame_clock (widget);
+
+  if (frame_clock != NULL &&
+      gdk_frame_clock_get_current_phase (frame_clock) == GDK_FRAME_CLOCK_PHASE_PAINT)
+    {
+      g_warning ("%s %p set alloc-needed during PAINT\n",
+                 G_OBJECT_TYPE_NAME (widget), widget);
+    }
 
   priv->alloc_needed = TRUE;
 

meson.build

@@ -156,7 +156,6 @@ check_headers = [
   'crt/externs.h',
   'dev/evdev/input.h',
   'dlfcn.h',
-  'execinfo.h',
   'ftw.h',
   'inttypes.h',
   'linux/input.h',