X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTask.h;h=38e4763b5a350d8533b42a13133e4869c4abbc60;hb=8625c675de45bdb8bcfa795572ce7c47687c147c;hp=2d406aa457600351b00607de4af8b6204e98449f;hpb=c5e611c7bba08457ededf840903208587fc958a1;p=ghc-hetmet.git diff --git a/rts/Task.h b/rts/Task.h index 2d406aa..38e4763 100644 --- a/rts/Task.h +++ b/rts/Task.h @@ -14,7 +14,7 @@ #include "GetTime.h" -BEGIN_RTS_PRIVATE +#include "BeginPrivate.h" /* Definition of a Task @@ -225,6 +225,11 @@ INLINE_HEADER Task *myTask (void); // void startWorkerTask (Capability *cap); +// Interrupts a worker task that is performing an FFI call. The thread +// should not be destroyed. +// +void interruptWorkerTask (Task *task); + #endif /* THREADED_RTS */ // ----------------------------------------------------------------------------- @@ -233,8 +238,9 @@ void startWorkerTask (Capability *cap); // A thread-local-storage key that we can use to get access to the // current thread's Task structure. #if defined(THREADED_RTS) -#if defined(linux_HOST_OS) && \ - (defined(i386_HOST_ARCH) || defined(x86_64_HOST_ARCH)) +#if (defined(linux_HOST_OS) && \ + (defined(i386_HOST_ARCH) || defined(x86_64_HOST_ARCH))) || \ + (defined(mingw32_HOST_OS) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 4) #define MYTASK_USE_TLV extern __thread Task *my_task; #else @@ -270,6 +276,6 @@ setMyTask (Task *task) #endif } -END_RTS_PRIVATE +#include "EndPrivate.h" #endif /* TASK_H */