Merge branch 'erikj/perf_room_members_fix' of github.com:matrix-org/synapse into erikj/profile_rununtilconcurrent

synapse/app/homeserver.py

@@ -520,27 +520,46 @@ class SynapseSite(Site):
 
 
 def run(hs):
-    PROFILE_SYNAPSE = False
+    PROFILE_SYNAPSE = True
     if PROFILE_SYNAPSE:
         def profile(func):
-            from cProfile import Profile
+            from pyinstrument import Profiler
             from threading import current_thread
+            import time
+            import resource
 
             def profiled(*args, **kargs):
-                profile = Profile()
-                profile.enable()
+                profile = Profiler()
+
+                rusage = resource.getrusage(resource.RUSAGE_SELF)
+                start_utime = rusage.ru_utime * 1000
+                start = int(time.time()*1000)
+
+                profile.start()
                 func(*args, **kargs)
-                profile.disable()
-                ident = current_thread().ident
-                profile.dump_stats("/tmp/%s.%s.%i.pstat" % (
-                    hs.hostname, func.__name__, ident
-                ))
+                profile.stop()
+
+                end = int(time.time()*1000)
+                rusage = resource.getrusage(resource.RUSAGE_SELF)
+                end_utime = rusage.ru_utime * 1000
+
+                if end_utime - start_utime > 50:
+                    ident = current_thread().ident
+                    name = "/tmp/%s.%s.%i.%d-%d.%d-%d" % (
+                        hs.hostname, func.__name__, ident, start, end,
+                        end-start, end_utime - start_utime,
+                    )
+                    # profile.dump_stats(name + ".html")
+                    html = profile.output_html()
+                    with open(name + ".html", "w") as f:
+                        f.write(html)
 
             return profiled
 
-        from twisted.python.threadpool import ThreadPool
-        ThreadPool._worker = profile(ThreadPool._worker)
-        reactor.run = profile(reactor.run)
+        # from twisted.python.threadpool import ThreadPool
+        # ThreadPool._worker = profile(ThreadPool._worker)
+        reactor.runUntilCurrent = profile(reactor.runUntilCurrent)
+        reactor.doIteration = profile(reactor.doIteration)
 
     def in_thread():
         with LoggingContext("run"):

synapse/handlers/room.py

@@ -252,11 +252,8 @@ class RoomMemberHandler(BaseHandler):
         self.distributor.declare("user_joined_room")
         self.distributor.declare("user_left_room")
 
-    @defer.inlineCallbacks
     def get_room_members(self, room_id):
-        users = yield self.store.get_users_in_room(room_id)
-
-        defer.returnValue([UserID.from_string(u) for u in users])
+        return self.store.get_user_objs_in_room(room_id)
 
     @defer.inlineCallbacks
     def fetch_room_distributions_into(self, room_id, localusers=None,

synapse/storage/events.py

@@ -128,6 +128,7 @@ class EventsStore(SQLBaseStore):
             txn.call_after(self.get_current_state_for_key.invalidate_all)
             txn.call_after(self.get_rooms_for_user.invalidate_all)
             txn.call_after(self.get_users_in_room.invalidate, event.room_id)
+            txn.call_after(self.get_user_objs_in_room.invalidate, event.room_id)
             txn.call_after(self.get_joined_hosts_for_room.invalidate, event.room_id)
             txn.call_after(self.get_room_name_and_aliases, event.room_id)
 

synapse/storage/roommember.py

@@ -67,6 +67,7 @@ class RoomMemberStore(SQLBaseStore):
         txn.call_after(self.get_rooms_for_user.invalidate, target_user_id)
         txn.call_after(self.get_joined_hosts_for_room.invalidate, event.room_id)
         txn.call_after(self.get_users_in_room.invalidate, event.room_id)
+        txn.call_after(self.get_user_objs_in_room.invalidate, event.room_id)
 
     def get_room_member(self, user_id, room_id):
         """Retrieve the current state of a room member.
@@ -101,6 +102,12 @@ class RoomMemberStore(SQLBaseStore):
             return [r["user_id"] for r in rows]
         return self.runInteraction("get_users_in_room", f)
 
+    @cached()
+    def get_user_objs_in_room(self, room_id):
+        return self.get_users_in_room(room_id).addCallback(
+            lambda users: [UserID.from_string(u) for u in users]
+        )
+
     def get_room_members(self, room_id, membership=None):
         """Retrieve the current room member list for a room.