From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 12 Jan 2018 16:12:13 +0000 (-0700)
Subject: glib-0.6: Disable attempt to deduct time spent blocked in glib.
X-Git-Tag: mit-scheme-pucked-cairo-0.5
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=d5dd66d815cddfd18c5be55a010612f5ec62c9b3;p=mit-scheme.git

glib-0.6: Disable attempt to deduct time spent blocked in glib.
---

diff --git a/src/glib/NEWS b/src/glib/NEWS
index 5a8035fa5..f18f71812 100644
--- a/src/glib/NEWS
+++ b/src/glib/NEWS
@@ -19,6 +19,12 @@ You should have received a copy of the GNU General Public License
 along with this plugin; if not, write to the Free Software Foundation,
 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+mit-scheme-pucked-glib 0.6 - Matt Birkholz, 2018-01-12
+======================================================
+
+Disable attempt to deduct time blocked in GLib.  It stimulates too many
+warnings from the thread system's accounting.
+
 mit-scheme-pucked-glib 0.5 - Matt Birkholz, 2016-06-12
 ======================================================
 
diff --git a/src/glib/configure.ac b/src/glib/configure.ac
index 4a08ab238..485423094 100644
--- a/src/glib/configure.ac
+++ b/src/glib/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
 AC_INIT([MIT/GNU Scheme Pucked glib plugin],
-        [0.5],
+        [0.6],
         [matt@birchwood-abbey.net],
         [mit-scheme-pucked-glib])
 AC_CONFIG_SRCDIR([glib.pkg])
diff --git a/src/glib/debian/changelog b/src/glib/debian/changelog
index 4678c0d59..9bb08afa3 100644
--- a/src/glib/debian/changelog
+++ b/src/glib/debian/changelog
@@ -1,3 +1,10 @@
+mit-scheme-pucked-glib (0.6) birchwood; urgency=low
+
+  * Disable attempt to deduct time blocked in GLib.  It stimulates too
+    many warnings from the thread system's accounting.
+
+ -- Matt Birkholz <matt@birchwood-abbey.net>  Fri, 12 Jan 2018 00:00:00 -0700
+
 mit-scheme-pucked-glib (0.5) birchwood; urgency=low
 
   * Initial Debianization.
diff --git a/src/glib/glib-thread.scm b/src/glib/glib-thread.scm
index 3f0561df1..bb4b9ad70 100644
--- a/src/glib/glib-thread.scm
+++ b/src/glib/glib-thread.scm
@@ -78,9 +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))
+		       ;;(account-for-times self (get-system-times))
 		       (run-glib (select-registry-handle io-registry) time)
-		       (record-start-times! self)
+		       ;;(record-start-times! self)
 		       (%trace ";run-glib done at "(real-time-clock)"\n"))))
 		  (%trace ";run-glib yields\n")
 		  (yield-current-thread)
diff --git a/src/glib/glib.pkg b/src/glib/glib.pkg
index 57ff2698f..66bf005d2 100644
--- a/src/glib/glib.pkg
+++ b/src/glib/glib.pkg
@@ -116,7 +116,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	  run-glib-daemons)
   (import (glib main)
 	  run-glib)
-  (import (runtime thread)
+  #;(import (runtime thread)
 	  account-for-times
 	  get-system-times
 	  record-start-times!)
diff --git a/src/glib/make.scm b/src/glib/make.scm
index bfc555ffd..637ab8537 100644
--- a/src/glib/make.scm
+++ b/src/glib/make.scm
@@ -6,5 +6,5 @@ Load the Glib option. |#
 (with-loader-base-uri (system-library-uri "glib/")
   (lambda ()
     (load-package-set "glib")))
-(add-subsystem-identification! "GLib" '(0 5))
+(add-subsystem-identification! "GLib" '(0 6))
 ((access glib-start (->environment '(glib main))))
\ No newline at end of file