Skip to content

Commit

Permalink
Remove markSignalHandlers
Browse files Browse the repository at this point in the history
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
  • Loading branch information
osa1 committed Apr 16, 2018
1 parent 90283b5 commit 4d30bc8
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 35 deletions.
8 changes: 0 additions & 8 deletions rts/RtsSignals.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
10 changes: 0 additions & 10 deletions rts/posix/Signals.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 0 additions & 5 deletions rts/sm/GC.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 0 additions & 12 deletions rts/win32/ConsoleHandler.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 4d30bc8

Please sign in to comment.