Ticket #2851: scrolldata-check-thread.patch

xpra/server/window/motion.pyx

@@ -7 +7 @@
 #cython: auto_pickle=False, boundscheck=False, wraparound=False, cdivision=True, language_level=3
 
 import struct
+import threading
 
 from xpra.util import envbool, repr_ellipsized, csv
 from xpra.log import Logger
@@ -60 +61 @@
         self.y = y
         self.width = width
         self.height = height
+        self.thread = threading.current_thread()
 
+    def check_thread(self):
+        log("check_thread()")
+        if self.thread!=threading.current_thread():
+            log.error("wrong thread!")
+            import traceback
+            traceback.print_stack()
+
     def __repr__(self):
         return "ScrollDistances(%ix%i)" % (self.width, self.height)
 
@@ -85 +94 @@
             checksum its rows into a2,
             and push existing values (if we had any) into a1.
         """
+        self.check_thread()
         if DEBUG:
             log("%s.update%s a1=%#x, a2=%#x, distances=%#x, current size: %ix%i", self, (repr_ellipsized(pixels), x, y, width, height, rowstride, bpp), <uintptr_t> self.a1, <uintptr_t> self.a2, <uintptr_t> self.distances, self.width, self.height)
         assert width>0 and height>0, "invalid dimensions: %ix%i" % (width, height)
@@ -133 +143 @@
             The same lines may be accounted for multiple times.
             The result is stored in the "distances" array.
         """
+        self.check_thread()
         if DEBUG:
             log("calculate(%i) a1=%#x, a2=%#x, distances=%#x", max_distance, <uintptr_t> self.a1, <uintptr_t> self.a2, <uintptr_t> self.distances)
         if self.a1==NULL or self.a2==NULL:
@@ -180 +191 @@
             * scrolls dictionary contains scroll definitions
             * non-scrolls dictionary is everything else (that will need to be repainted)
         """
+        self.check_thread()
         DEF MAX_MATCHES = 20
         if self.a1==NULL or self.a2==NULL:
             return None
@@ -257 +269 @@
         return scrolls, line_defs
 
     cdef match_distance(self, uint8_t *line_state, int16_t distance, const uint8_t min_line_count):
+        self.check_thread()
         """
             find the lines that match the given scroll distance,
             return a dictionary with the starting line as key
@@ -306 +319 @@
 
 
     def invalidate(self, int16_t x, int16_t y, uint16_t w, uint16_t h):
+        self.check_thread()
         if self.a2==NULL:
             #nothing to invalidate!
             return
@@ -335 +349 @@
 
 
     def get_best_match(self):
+        self.check_thread()
         if self.a1==NULL or self.a2==NULL:
             return 0, 0
         cdef uint16_t max_hits = 0
@@ -351 +366 @@
         self.free()
 
     def free(self):
+        self.check_thread()
         cdef void* ptr = <void*> self.distances
         if ptr:
             self.distances = NULL