projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement stack chunks and separate TSO/STACK objects
[ghc-hetmet.git]
/
rts
/
win32
/
AsyncIO.c
diff --git
a/rts/win32/AsyncIO.c
b/rts/win32/AsyncIO.c
index
6fb9a2b
..
ff2e1a2
100644
(file)
--- a/
rts/win32/AsyncIO.c
+++ b/
rts/win32/AsyncIO.c
@@
-12,7
+12,6
@@
#include <windows.h>
#include <stdio.h>
#include "Schedule.h"
#include <windows.h>
#include <stdio.h>
#include "Schedule.h"
-#include "RtsFlags.h"
#include "Capability.h"
#include "win32/AsyncIO.h"
#include "win32/IOManager.h"
#include "Capability.h"
#include "win32/AsyncIO.h"
#include "win32/IOManager.h"
@@
-275,9
+274,9
@@
start:
unsigned int rID = completedTable[i].reqID;
prev = NULL;
unsigned int rID = completedTable[i].reqID;
prev = NULL;
- for(tso = blocked_queue_hd ; tso != END_TSO_QUEUE; prev = tso, tso = tso->_link) {
+ for(tso = blocked_queue_hd ; tso != END_TSO_QUEUE; tso = tso->_link) {
- switch(tso->why_blocked) {
+ switch(tso->why_blocked) {
case BlockedOnRead:
case BlockedOnWrite:
case BlockedOnDoProc:
case BlockedOnRead:
case BlockedOnWrite:
case BlockedOnDoProc:
@@
-301,6
+300,11
@@
start:
/* Terminates the run queue + this inner for-loop. */
tso->_link = END_TSO_QUEUE;
tso->why_blocked = NotBlocked;
/* Terminates the run queue + this inner for-loop. */
tso->_link = END_TSO_QUEUE;
tso->why_blocked = NotBlocked;
+ // save the StgAsyncIOResult in the
+ // stg_block_async_info stack frame, because
+ // the block_info field will be overwritten by
+ // pushOnRunQueue().
+ tso->sp[1] = (W_)tso->block_info.async_result;
pushOnRunQueue(&MainCapability, tso);
break;
}
pushOnRunQueue(&MainCapability, tso);
break;
}
@@
-311,6
+315,8
@@
start:
}
break;
}
}
break;
}
+
+ prev = tso;
}
/* Signal that there's completed table slots available */
if ( !ReleaseSemaphore(completed_table_sema, 1, NULL) ) {
}
/* Signal that there's completed table slots available */
if ( !ReleaseSemaphore(completed_table_sema, 1, NULL) ) {