GitLab

Duncan Coutts pushed to branch wip/io-manager-deadlock-detection at Glasgow Haskell Compiler / GHC

Commits:

f9da9451

by Duncan Coutts at 2025-11-15T12:30:48+00:00

FIXUP: Make the IOManager API use CapIOManager rather than Capability

whitespace

7d601300

by Duncan Coutts at 2025-11-15T12:31:17+00:00

FIXUP: Add a long Note [Deadlock detection]

note definition syntax now needs a ~~~~ line

2 changed files:

rts/IOManager.c
rts/Schedule.c

Changes:

rts/IOManager.c


 CapIOManager *allocCapabilityIOManager(Capability *cap)
 {
     CapIOManager *iomgr = stgMallocBytes(sizeof(CapIOManager),
-		                         "allocCapabilityIOManager");
+                                         "allocCapabilityIOManager");
     iomgr->cap = cap; /* link back */
     return iomgr;
 }

rts/Schedule.c

@@ -851,6 +851,7 @@ schedulePushWork(Capability *cap USED_IF_THREADS,
   * ------------------------------------------------------------------------- */
  /* Note [Deadlock detection]
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  For the purpose of this explanation we define:
   * a /partial deadlock/ to be a set of threads that are deadlocked; and

...	...	@@ -322,7 +322,7 @@ char * showIOManager(void)
322	322	CapIOManager allocCapabilityIOManager(Capability cap)
323	323	{
324	324	CapIOManager *iomgr = stgMallocBytes(sizeof(CapIOManager),
325		- "allocCapabilityIOManager");
	325	+ "allocCapabilityIOManager");
326	326	iomgr->cap = cap; /* link back */
327	327	return iomgr;
328	328	}