glib: Do not add time blocked in run_glib to glib-thread's run time.
authorMatt Birkholz <matt@birchwood-abbey.net>
Mon, 14 Aug 2017 20:57:49 +0000 (13:57 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Mon, 28 Aug 2017 18:34:24 +0000 (11:34 -0700)
src/glib/glib-thread.scm
src/glib/glib.pkg

index 2b1dd8051cd336ca3e6b18c62cd3c64a903a1c45..3f0561df149310a4e72e0df4c541d9d8fc625c0f 100644 (file)
@@ -78,7 +78,9 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
                                          (timer-record/time timer-records))
                                     -1)))
                       (%trace ";run-glib until "time"\n")
+                      (account-for-times self (get-system-times))
                       (run-glib (select-registry-handle io-registry) time)
+                      (record-start-times! self)
                       (%trace ";run-glib done at "(real-time-clock)"\n"))))
                  (%trace ";run-glib yields\n")
                  (yield-current-thread)
index 8d82cd95b75ca790bc0f8b52511143ebd1db075f..57ff2698f988c35cd2e2dc65949f16040bfa00da 100644 (file)
@@ -116,5 +116,9 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
          run-glib-daemons)
   (import (glib main)
          run-glib)
+  (import (runtime thread)
+         account-for-times
+         get-system-times
+         record-start-times!)
   (import (runtime primitive-io)
          select-registry-handle))
\ No newline at end of file