[commit: ghc] ghc-8.0: rts: drop unused global 'blackhole_queue' (0fb2d54)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/0fb2d54f84b6597ff8a63d5490d989233084531e/ghc

>---------------------------------------------------------------

commit 0fb2d54f84b6597ff8a63d5490d989233084531e
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Sat Feb 27 14:44:45 2016 +0000

    rts: drop unused global 'blackhole_queue'
    
    Commit 5d52d9b64c21dcf77849866584744722f8121389 removed
    global 'blackhole_queue' in favour of new mechanism:
    when TSO hits blackhole TSO blocks waiting for
    'MessgaeBlackhole' delivery.
    
    Patch removed unused global and updates stale comments.
    Noticed by Yuras Shumovich.
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>
    
    Test Plan: build test
    
    Reviewers: simonmar, austin, Yuras, bgamari
    
    Reviewed By: Yuras, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1953
    
    (cherry picked from commit 3ee4fc04322dacb66c70262a220dce0f52c29d4f)


>---------------------------------------------------------------

0fb2d54f84b6597ff8a63d5490d989233084531e
 includes/rts/storage/TSO.h  | 2 +-
 includes/stg/MiscClosures.h | 1 -
 rts/Schedule.h              | 1 -
 rts/sm/Storage.c            | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/includes/rts/storage/TSO.h b/includes/rts/storage/TSO.h
index 744ab2b..9bddfca 100644
--- a/includes/rts/storage/TSO.h
+++ b/includes/rts/storage/TSO.h
@@ -230,7 +230,7 @@ void dirty_STACK (Capability *cap, StgStack *stack);
         ----------------------------------------------------------------------
         NotBlocked             END_TSO_QUEUE        runnable_queue, or running
 
-        BlockedOnBlackHole     the BLACKHOLE        blackhole_queue
+        BlockedOnBlackHole     MessageBlackHole *   TSO->bq
 
         BlockedOnMVar          the MVAR             the MVAR's queue
 
diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h
index 1236d73..6736658 100644
--- a/includes/stg/MiscClosures.h
+++ b/includes/stg/MiscClosures.h
@@ -463,7 +463,6 @@ extern StgWord rts_breakpoint_io_action[];
 // Schedule.c
 extern StgWord RTS_VAR(blocked_queue_hd), RTS_VAR(blocked_queue_tl);
 extern StgWord RTS_VAR(sleeping_queue);
-extern StgWord RTS_VAR(blackhole_queue);
 extern StgWord RTS_VAR(sched_mutex);
 
 // Apply.cmm
diff --git a/rts/Schedule.h b/rts/Schedule.h
index eb5135b..35606af 100644
--- a/rts/Schedule.h
+++ b/rts/Schedule.h
@@ -97,7 +97,6 @@ extern volatile StgWord recent_activity;
 /* Thread queues.
  * Locks required  : sched_mutex
  */
-extern  StgTSO *blackhole_queue;
 #if !defined(THREADED_RTS)
 extern  StgTSO *blocked_queue_hd, *blocked_queue_tl;
 extern  StgTSO *sleeping_queue;
diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
index 65f5b70..bfc6eb1 100644
--- a/rts/sm/Storage.c
+++ b/rts/sm/Storage.c
@@ -1046,7 +1046,6 @@ dirty_TVAR(Capability *cap, StgTVar *p)
 // Setting a TSO's link field with a write barrier.
 // It is *not* necessary to call this function when
 //    * setting the link field to END_TSO_QUEUE
-//    * putting a TSO on the blackhole_queue
 //    * setting the link field of the currently running TSO, as it
 //      will already be dirty.
 void