[commit: ghc] master: Remove markSignalHandlers (4d30bc8)

git at git.haskell.org git at git.haskell.org
Mon Apr 16 18:59:12 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4d30bc869dba8480fad2487911e828aab6ffd53c/ghc

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

commit 4d30bc869dba8480fad2487911e828aab6ffd53c
Author: Ömer Sinan Ağacan <omeragacan at gmail.com>
Date:   Mon Apr 16 21:58:21 2018 +0300

    Remove markSignalHandlers
    
    It's no-op on all platforms
    
    Reviewers: bgamari, simonmar, erikd, dfeuer
    
    Reviewed By: dfeuer
    
    Subscribers: dfeuer, thomie, carter
    
    Differential Revision: https://phabricator.haskell.org/D4588


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

4d30bc869dba8480fad2487911e828aab6ffd53c
 rts/RtsSignals.h           |  8 --------
 rts/posix/Signals.c        | 10 ----------
 rts/sm/GC.c                |  5 -----
 rts/win32/ConsoleHandler.c | 12 ------------
 4 files changed, 35 deletions(-)

diff --git a/rts/RtsSignals.h b/rts/RtsSignals.h
index d417603..b0add67 100644
--- a/rts/RtsSignals.h
+++ b/rts/RtsSignals.h
@@ -51,14 +51,6 @@ void freeSignalHandlers(void);
  */
 void awaitUserSignals(void);
 
-/*
- * Function: markSignalHandlers()
- *
- * Evacuate the handler queue. _Assumes_ that console event delivery
- * has already been blocked.
- */
-void markSignalHandlers (evac_fn evac, void *user);
-
 #include "EndPrivate.h"
 
 #endif /* RTS_USER_SIGNALS */
diff --git a/rts/posix/Signals.c b/rts/posix/Signals.c
index cf45019..4cd1e38 100644
--- a/rts/posix/Signals.c
+++ b/rts/posix/Signals.c
@@ -488,16 +488,6 @@ startSignalHandlers(Capability *cap)
 }
 #endif
 
-/* ----------------------------------------------------------------------------
- * Mark signal handlers during GC.
- * -------------------------------------------------------------------------- */
-
-void
-markSignalHandlers (evac_fn evac STG_UNUSED, void *user STG_UNUSED)
-{
-    // nothing to do
-}
-
 #else /* !RTS_USER_SIGNALS */
 StgInt
 stg_sig_install(StgInt sig STG_UNUSED,
diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index e52400e..cadf557 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -402,11 +402,6 @@ GarbageCollect (uint32_t collect_gen,
 
   markScheduler(mark_root, gct);
 
-#if defined(RTS_USER_SIGNALS)
-  // mark the signal handlers (signals should be already blocked)
-  markSignalHandlers(mark_root, gct);
-#endif
-
   // Mark the weak pointer list, and prepare to detect dead weak pointers.
   markWeakPtrList();
   initWeakForGC();
diff --git a/rts/win32/ConsoleHandler.c b/rts/win32/ConsoleHandler.c
index 88c4a61..545a76a 100644
--- a/rts/win32/ConsoleHandler.c
+++ b/rts/win32/ConsoleHandler.c
@@ -199,18 +199,6 @@ void startSignalHandlers(Capability *cap)
 }
 #endif /* !THREADED_RTS */
 
-/*
- * Function: markSignalHandlers()
- *
- * Evacuate the handler stack. _Assumes_ that console event delivery
- * has already been blocked.
- */
-void markSignalHandlers (evac_fn evac STG_UNUSED, void *user STG_UNUSED)
-{
-    // nothing to mark; the console handler is a StablePtr which is
-    // already treated as a root by the GC.
-}
-
 
 /*
  * Function: generic_handler()



More information about the ghc-commits mailing list