X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRtsAPI.h;h=1b6678905997cade16147a5dca9ac737c305eec6;hb=28a464a75e14cece5db40f2765a29348273ff2d2;hp=73a7354cc0d38d4fba69651aef7d5beaf576ab13;hpb=2b57ddc3e802a5d93b30a21e198077b016e2e008;p=ghc-hetmet.git

diff --git a/ghc/includes/RtsAPI.h b/ghc/includes/RtsAPI.h
index 73a7354..1b66789 100644
--- a/ghc/includes/RtsAPI.h
+++ b/ghc/includes/RtsAPI.h
@@ -1,7 +1,6 @@
 /* ----------------------------------------------------------------------------
- * $Id: RtsAPI.h,v 1.35 2003/08/22 22:38:02 sof Exp $
  *
- * (c) The GHC Team, 1998-1999
+ * (c) The GHC Team, 1998-2004
  *
  * API for invoking Haskell functions via the RTS
  *
@@ -28,6 +27,12 @@ typedef enum {
 
 typedef StgClosure *HaskellObj;
 
+/*
+ * An abstract type representing the token returned by rts_lock() and
+ * used when allocating objects and threads in the RTS.
+ */
+typedef struct Capability_ Capability;
+
 /* ----------------------------------------------------------------------------
    Starting up and shutting down the Haskell RTS.
    ------------------------------------------------------------------------- */
@@ -42,39 +47,39 @@ extern void setProgArgv            ( int argc, char *argv[] );
 /* ----------------------------------------------------------------------------
    Locking.
    
-   In a multithreaded environments, you have to surround all access to the
-   RtsAPI with these calls.
+   You have to surround all access to the RtsAPI with these calls.
    ------------------------------------------------------------------------- */
    
-void
-rts_lock ( void );
+// acquires a token which may be used to create new objects and
+// evaluate them.
+Capability *rts_lock (void);
 
-void
-rts_unlock ( void );
+// releases the token acquired with rts_lock().
+void rts_unlock (Capability *token);
 
 /* ----------------------------------------------------------------------------
    Building Haskell objects from C datatypes.
    ------------------------------------------------------------------------- */
-HaskellObj   rts_mkChar       ( HsChar   c );
-HaskellObj   rts_mkInt        ( HsInt    i );
-HaskellObj   rts_mkInt8       ( HsInt8   i );
-HaskellObj   rts_mkInt16      ( HsInt16  i );
-HaskellObj   rts_mkInt32      ( HsInt32  i );
-HaskellObj   rts_mkInt64      ( HsInt64  i );
-HaskellObj   rts_mkWord       ( HsWord   w );
-HaskellObj   rts_mkWord8      ( HsWord8  w );
-HaskellObj   rts_mkWord16     ( HsWord16 w );
-HaskellObj   rts_mkWord32     ( HsWord32 w );
-HaskellObj   rts_mkWord64     ( HsWord64 w );
-HaskellObj   rts_mkPtr        ( HsPtr    a );
-HaskellObj   rts_mkFunPtr     ( HsFunPtr a );
-HaskellObj   rts_mkFloat      ( HsFloat  f );
-HaskellObj   rts_mkDouble     ( HsDouble f );
-HaskellObj   rts_mkStablePtr  ( HsStablePtr s );
-HaskellObj   rts_mkBool       ( HsBool   b );
-HaskellObj   rts_mkString     ( char    *s );
-
-HaskellObj   rts_apply        ( HaskellObj, HaskellObj );
+HaskellObj   rts_mkChar       ( Capability *, HsChar   c );
+HaskellObj   rts_mkInt        ( Capability *, HsInt    i );
+HaskellObj   rts_mkInt8       ( Capability *, HsInt8   i );
+HaskellObj   rts_mkInt16      ( Capability *, HsInt16  i );
+HaskellObj   rts_mkInt32      ( Capability *, HsInt32  i );
+HaskellObj   rts_mkInt64      ( Capability *, HsInt64  i );
+HaskellObj   rts_mkWord       ( Capability *, HsWord   w );
+HaskellObj   rts_mkWord8      ( Capability *, HsWord8  w );
+HaskellObj   rts_mkWord16     ( Capability *, HsWord16 w );
+HaskellObj   rts_mkWord32     ( Capability *, HsWord32 w );
+HaskellObj   rts_mkWord64     ( Capability *, HsWord64 w );
+HaskellObj   rts_mkPtr        ( Capability *, HsPtr    a );
+HaskellObj   rts_mkFunPtr     ( Capability *, HsFunPtr a );
+HaskellObj   rts_mkFloat      ( Capability *, HsFloat  f );
+HaskellObj   rts_mkDouble     ( Capability *, HsDouble f );
+HaskellObj   rts_mkStablePtr  ( Capability *, HsStablePtr s );
+HaskellObj   rts_mkBool       ( Capability *, HsBool   b );
+HaskellObj   rts_mkString     ( Capability *, char    *s );
+
+HaskellObj   rts_apply        ( Capability *, HaskellObj, HaskellObj );
 
 /* ----------------------------------------------------------------------------
    Deconstructing Haskell objects
@@ -104,29 +109,31 @@ HsBool       rts_getBool      ( HaskellObj );
    Note that these calls may cause Garbage Collection, so all HaskellObj
    references are rendered invalid by these calls.
    ------------------------------------------------------------------------- */
-SchedulerStatus 
-rts_eval ( HaskellObj p, /*out*/HaskellObj *ret );
+Capability * 
+rts_eval (Capability *, HaskellObj p, /*out*/HaskellObj *ret);
 
-SchedulerStatus 
-rts_eval_ ( HaskellObj p, unsigned int stack_size, /*out*/HaskellObj *ret );
+Capability * 
+rts_eval_ (Capability *, HaskellObj p, unsigned int stack_size, 
+	   /*out*/HaskellObj *ret);
 
-SchedulerStatus 
-rts_evalIO ( HaskellObj p, /*out*/HaskellObj *ret );
+Capability * 
+rts_evalIO (Capability *, HaskellObj p, /*out*/HaskellObj *ret);
 
-#if defined(COMPILING_RTS_MAIN)
-/* Used by the RTS' main() only */
-SchedulerStatus 
-rts_mainLazyIO ( HaskellObj p, /*out*/HaskellObj *ret );
-#endif
+Capability *
+rts_evalStableIO (Capability *, HsStablePtr s, /*out*/HsStablePtr *ret);
 
-SchedulerStatus
-rts_evalStableIO ( HsStablePtr s, /*out*/HsStablePtr *ret );
+Capability * 
+rts_evalLazyIO (Capability *, HaskellObj p, /*out*/HaskellObj *ret);
 
-SchedulerStatus 
-rts_evalLazyIO ( HaskellObj p, unsigned int stack_size, /*out*/HaskellObj *ret );
+Capability * 
+rts_evalLazyIO_ (Capability *, HaskellObj p, unsigned int stack_size, 
+		 /*out*/HaskellObj *ret);
 
 void
-rts_checkSchedStatus ( char* site, SchedulerStatus rc);
+rts_checkSchedStatus (char* site, Capability *);
+
+SchedulerStatus
+rts_getSchedStatus (Capability *cap);
 
 /* --------------------------------------------------------------------------
    Wrapper closures
@@ -134,10 +141,10 @@ rts_checkSchedStatus ( char* site, SchedulerStatus rc);
    These are used by foreign export and foreign import "wrapper" stubs.
    ----------------------------------------------------------------------- */
 
-extern StgClosure GHCziTopHandler_runIO_closure;
-extern StgClosure GHCziTopHandler_runNonIO_closure;
-#define runIO_closure		  (&GHCziTopHandler_runIO_closure)
-#define runNonIO_closure	  (&GHCziTopHandler_runNonIO_closure)
+extern StgWord GHCziTopHandler_runIO_closure[];
+extern StgWord GHCziTopHandler_runNonIO_closure[];
+#define runIO_closure		  GHCziTopHandler_runIO_closure
+#define runNonIO_closure	  GHCziTopHandler_runNonIO_closure
 
 /* ------------------------------------------------------------------------ */