diff options
| author | Duncan Coutts <duncan@well-typed.com> | 2021-01-03 14:50:58 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-01-25 05:11:14 -0500 |
| commit | 8bdbfdd8e03f44572e683d221dd40ca81b0ed852 (patch) | |
| tree | d4bb11a345750b9b55540b77ff93782f7ebc5d4d | |
| parent | 083d7aeb5b0f9e47bf34459415367502492c5e06 (diff) | |
| download | haskell-8bdbfdd8e03f44572e683d221dd40ca81b0ed852.tar.gz | |
Rename includes/rts/IOManager.h to IOInterface.h
Naming is hard. Where we want to get to is to have a clear internal and
external API for the IO manager within the RTS. What we have right now
is just the external API (used in base for the Haskell side of the
threaded IO manager impls) living in includes/rts/IOManager.h.
We want to add a clear RTS internal API, which really ought to live in
rts/IOManager.h. Several people think it's too confusing to have both:
* includes/rts/IOManager.h for the external API
* rts/IOManager.h for the internal API
So the plan is to add rts/IOManager.{h,c} as the internal parts, and
rename the external part to be includes/rts/IOInterface.h.
It is admittidly not great to have .h files in includes/rts/ called
"interface" since by definition, every .h fle under includes/ is an
interface!
Alternative naming scheme suggestions welcome!
| -rw-r--r-- | includes/Rts.h | 2 | ||||
| -rw-r--r-- | includes/rts/IOInterface.h (renamed from includes/rts/IOManager.h) | 0 | ||||
| -rw-r--r-- | rts/Capability.c | 2 | ||||
| -rw-r--r-- | rts/rts.cabal.in | 2 | ||||
| -rw-r--r-- | rts/win32/AsyncWinIO.c | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/includes/Rts.h b/includes/Rts.h index fc69a964e3..e093a4bcde 100644 --- a/includes/Rts.h +++ b/includes/Rts.h @@ -230,7 +230,7 @@ void _assertFail(const char *filename, unsigned int linenum) #include "rts/FileLock.h" #include "rts/GetTime.h" #include "rts/Globals.h" -#include "rts/IOManager.h" +#include "rts/IOInterface.h" #include "rts/Linker.h" #include "rts/Ticky.h" #include "rts/Timer.h" diff --git a/includes/rts/IOManager.h b/includes/rts/IOInterface.h index 4c392e2058..4c392e2058 100644 --- a/includes/rts/IOManager.h +++ b/includes/rts/IOInterface.h diff --git a/rts/Capability.c b/rts/Capability.c index c30135d695..63c01ac348 100644 --- a/rts/Capability.c +++ b/rts/Capability.c @@ -31,7 +31,7 @@ #include "sm/BlockAlloc.h" // for countBlocks() #if !defined(mingw32_HOST_OS) -#include "rts/IOManager.h" // for setIOManagerControlFd() +#include "rts/IOInterface.h" // for setIOManagerControlFd() #endif #include <string.h> diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in index 8c382e067e..b98a6eaca7 100644 --- a/rts/rts.cabal.in +++ b/rts/rts.cabal.in @@ -155,7 +155,7 @@ library rts/GetTime.h rts/Globals.h rts/Hpc.h - rts/IOManager.h + rts/IOInterface.h rts/Libdw.h rts/LibdwPool.h rts/Linker.h diff --git a/rts/win32/AsyncWinIO.c b/rts/win32/AsyncWinIO.c index 660a687f99..f6921fd4e5 100644 --- a/rts/win32/AsyncWinIO.c +++ b/rts/win32/AsyncWinIO.c @@ -9,7 +9,7 @@ */ #include "Rts.h" -#include <rts/IOManager.h> +#include <rts/IOInterface.h> #include "AsyncWinIO.h" #include "Prelude.h" #include "Capability.h" |