MercuryTechnologies · wavewave · Apr 11, 2025 · Apr 8, 2025 · Apr 8, 2025 · Apr 9, 2025
diff --git a/buck-multiplex-worker/BUCK b/buck-multiplex-worker/BUCK
@@ -1 +1 @@
-export_file("Main.hs", visibility = ["PUBLIC"])
+[export_file(f + ".hs", visibility = ["PUBLIC"]) for f in ["Main", "Message", "Pool", "Server", "Util", "Worker"]]
diff --git a/comm/src/Message.hs → buck-multiplex-worker/Message.hs b/comm/src/Message.hs → buck-multiplex-worker/Message.hs
diff --git a/server/lib/Pool.hs → buck-multiplex-worker/Pool.hs b/server/lib/Pool.hs → buck-multiplex-worker/Pool.hs
diff --git a/server/lib/Server.hs → buck-multiplex-worker/Server.hs b/server/lib/Server.hs → buck-multiplex-worker/Server.hs
diff --git a/comm/src/Util.hs → buck-multiplex-worker/Util.hs b/comm/src/Util.hs → buck-multiplex-worker/Util.hs
diff --git a/server/lib/Worker.hs → buck-multiplex-worker/Worker.hs b/server/lib/Worker.hs → buck-multiplex-worker/Worker.hs
diff --git a/buck-multiplex-worker/buck-multiplex-worker.cabal b/buck-multiplex-worker/buck-multiplex-worker.cabal
@@ -8,18 +8,33 @@ build-type: Simple
 
 executable multiplex-worker
   main-is: Main.hs
+  other-modules:
+    Message
+    Pool
+    Server
+    Util
+    Worker
   hs-source-dirs: .
   ghc-options: -Wall -Widentities -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Wredundant-constraints -Wunused-type-patterns -Wunused-packages -threaded -rtsopts -with-rtsopts=-N
   build-depends:
     base ==4.*,
+    binary,
+    bytestring,
     containers,
+    deepseq,
+    directory,
+    extra,
+    filepath,
     ghc,
-    ghc-persistent-worker-comm,
     ghc-persistent-worker-plugin,
-    ghc-persistent-worker-server,
+    network,
+    optparse-applicative,
+    process,
     stm,
     text,
+    time,
     transformers,
+    unix,
     vector,
     buck-worker
   default-language: GHC2021

diff --git a/cabal.project b/cabal.project
@@ -1,7 +1,4 @@
 packages: ./plugin
-          ./comm
-          ./server
-          ./client
           ./instrument
           ./buck-worker
           ./buck-multiplex-worker

diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md
diff --git a/client/LICENSE b/client/LICENSE
diff --git a/client/app/Client.hs b/client/app/Client.hs
diff --git a/client/ghc-persistent-worker-client.cabal b/client/ghc-persistent-worker-client.cabal
diff --git a/comm/CHANGELOG.md b/comm/CHANGELOG.md
diff --git a/comm/LICENSE b/comm/LICENSE
diff --git a/comm/ghc-persistent-worker-comm.cabal b/comm/ghc-persistent-worker-comm.cabal
diff --git a/comm/src/BUCK b/comm/src/BUCK
diff --git a/plugin/src/Internal/Cache.hs b/plugin/src/Internal/Cache.hs
@@ -39,7 +39,7 @@ import GHC.Utils.Outputable (SDoc, comma, doublePrec, fsep, hang, nest, punctuat
 import Internal.Log (Log, logd)
 import System.Environment (lookupEnv)
 
-#if __GLASGOW_HASKELL__ >= 911
+#if __GLASGOW_HASKELL__ >= 911 || defined(MWB)
 
 import Data.IORef (IORef, newIORef)
 import qualified Data.Map.Lazy as LazyMap
@@ -61,6 +61,8 @@ import GHC.Unit.Module.Graph (ModuleGraphNode (..), mgModSummaries', mkModuleGra
 
 #endif
 
+import GHC.Unit.Module.Graph (ModuleGraph, unionMG)
+
 data ModuleArtifacts =
   ModuleArtifacts {
     iface :: ModIface,
@@ -183,7 +185,7 @@ data BinPath =
   }
   deriving stock (Eq, Show)
 
-#if __GLASGOW_HASKELL__ >= 911
+#if __GLASGOW_HASKELL__ >= 911 || defined(MWB)
 
 data FinderState =
   FinderState {
@@ -539,7 +541,7 @@ report logVar workerId target cache = do
 
     workerDesc wid = text (" (" ++ wid ++ ")")
 
-#if __GLASGOW_HASKELL__ >= 911
+#if __GLASGOW_HASKELL__ >= 911 || defined(MWB)
 
 -- | This replacement of the Finder implementation has the sole purpose of recording some cache stats, for now.
 -- While its mutable state is allocated separately and shared across sessions, this doesn't really make a difference at
@@ -598,7 +600,7 @@ newFinderCache _ Cache {finder = FinderState {cache}} _ = pure cache
 
 withHscState :: HscEnv -> (MVar OrigNameCache -> MVar (Maybe LoaderState) -> MVar SymbolMap -> IO a) -> IO (Maybe a)
 withHscState HscEnv {hsc_interp, hsc_NC = NameCache {nsNames}} use =
-#if __GLASGOW_HASKELL__ >= 911
+#if __GLASGOW_HASKELL__ >= 911 || defined(MWB)
   for hsc_interp \ Interp {interpLoader = Loader {loader_state}, interpLookupSymbolCache} ->
     liftIO $ use nsNames loader_state interpLookupSymbolCache
 #else
@@ -683,7 +685,6 @@ storeIface _ _ =
 
 storeHug :: HscEnv -> Cache -> IO Cache
 storeHug hsc_env cache = do
-  -- dbgp (hang (text "Storing HUG:") 2 (showHugShort merged))
   pure cache {hug = Just merged}
   where
     merged = maybe id (unitEnv_union mergeHugs) cache.hug hsc_env.hsc_unit_env.ue_home_unit_graph

diff --git a/plugin/src/Internal/MakeFile.hs b/plugin/src/Internal/MakeFile.hs
@@ -67,7 +67,7 @@ import GHC.Unit (homeUnitId)
 import GHC.Utils.Panic.Plain
 #endif
 
-#if !defined(BUCK)
+#if !defined(MWB)
 depJSON :: DynFlags -> Maybe FilePath
 depJSON _ = Nothing
 

diff --git a/plugin/src/Internal/MakeFile/JSON.hs b/plugin/src/Internal/MakeFile/JSON.hs
@@ -36,7 +36,7 @@ import GHC.Utils.Misc
 import GHC.Utils.Outputable
 import System.FilePath (normalise)
 
-#if !defined(BUCK)
+#if !defined(MWB)
 import GHC.Data.FastString (lexicalCompareFS)
 
 instance Ord PackageId where

diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
diff --git a/server/LICENSE b/server/LICENSE
diff --git a/server/app/Main.hs b/server/app/Main.hs
diff --git a/server/ghc-persistent-worker-server.cabal b/server/ghc-persistent-worker-server.cabal
diff --git a/server/lib/BUCK b/server/lib/BUCK
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export_file("Main.hs", visibility = ["PUBLIC"])
		[export_file(f + ".hs", visibility = ["PUBLIC"]) for f in ["Main", "Message", "Pool", "Server", "Util", "Worker"]]