rts: drop unused global 'blackhole_queue'
authorSergei Trofimovich <slyfox@gentoo.org>
Sat, 27 Feb 2016 14:44:45 +0000 (14:44 +0000)
committerSergei Trofimovich <siarheit@google.com>
Sat, 27 Feb 2016 14:44:53 +0000 (14:44 +0000)
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@google.com>
Test Plan: build test

Reviewers: simonmar, austin, Yuras, bgamari

Reviewed By: Yuras, bgamari

Subscribers: thomie

Differential Revision: https://phabricator.haskell.org/D1953

includes/rts/storage/TSO.h
includes/stg/MiscClosures.h
rts/Schedule.h
rts/sm/Storage.c

index 744ab2b..9bddfca 100644 (file)
@@ -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
 
index dff129b..5f5e0d6 100644 (file)
@@ -462,7 +462,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
index 67e2fdc..b6fbed4 100644 (file)
@@ -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;
index c815b99..45bb54c 100644 (file)
@@ -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