changeset 1122:17b24cb10202

gather more output loop timing Ignore-this: 723db286bb94478104b71f013b260fe
author Drew Perttula <drewp@bigasterisk.com>
date Fri, 13 Jun 2014 07:34:12 +0000
parents a856693007b2
children 9f4d68612d56
files bin/effecteval light9/effecteval/effectloop.py
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/bin/effecteval	Fri Jun 13 07:32:06 2014 +0000
+++ b/bin/effecteval	Fri Jun 13 07:34:12 2014 +0000
@@ -191,7 +191,8 @@
         self.stats = scales.collection('/',
                                        scales.PmfStat('sendLevels'),
                                        scales.PmfStat('getMusic'),
-                                       scales.PmfStat('writeDmx'),
+                                       scales.PmfStat('evals'),
+                                       scales.PmfStat('sendOutupt'),
                                        scales.IntStat('errors'),
                                        )
 
--- a/light9/effecteval/effectloop.py	Fri Jun 13 07:32:06 2014 +0000
+++ b/light9/effecteval/effectloop.py	Fri Jun 13 07:34:12 2014 +0000
@@ -80,10 +80,12 @@
                 if song is None:
                     return
 
-                outputs = self.allEffectOutputs(songTime)
+                with self.stats.evals.time():
+                    outputs = self.allEffectOutputs(songTime)
                 combined = self.combineOutputs(outputs)
                 self.logLevels(t1, combined)
-                yield self.sendOutput(combined)
+                with self.stats.sendOutput.time():
+                    yield self.sendOutput(combined)
                 
                 elapsed = time.time() - t1
                 dt = max(0, self.period - elapsed)
@@ -105,8 +107,7 @@
     @inlineCallbacks
     def sendOutput(self, combined):
         dmx = combined.get_dmx_list()
-        with self.stats.writeDmx.time():
-            yield dmxclient.outputlevels(dmx, twisted=True)
+        yield dmxclient.outputlevels(dmx, twisted=True)
         
     def allEffectOutputs(self, songTime):
         outputs = []