Commit f86b9ce4 authored by sof's avatar sof

[project @ 1999-07-06 09:42:38 by sof]

Redo previous commit to cut down on the use of COMPILING_RTS where
possible - SchedAPI.h is now an RTS internal header file which
RtsAPI.h no longer includes.
parent 8cf6e22c
/* ----------------------------------------------------------------------------
* $Id: RtsAPI.h,v 1.6 1999/07/03 18:39:41 sof Exp $
* $Id: RtsAPI.h,v 1.7 1999/07/06 09:42:39 sof Exp $
*
* (c) The GHC Team, 1998-1999
*
......@@ -10,8 +10,17 @@
#ifndef RTSAPI_H
#define RTSAPI_H
#include "SchedAPI.h" /* for SchedulerStatus */
/*
* Running the scheduler
*/
typedef enum {
Success,
Killed, /* another thread killed us */
Interrupted, /* stopped in response to a call to interruptStgRts */
Deadlock,
AllBlocked, /* subtly different from Deadlock */
} SchedulerStatus;
typedef StgClosure *HaskellObj;
/* ----------------------------------------------------------------------------
......
/* -----------------------------------------------------------------------------
* $Id: SchedAPI.h,v 1.5 1999/07/03 18:39:41 sof Exp $
* $Id: SchedAPI.h,v 1.6 1999/07/06 09:42:39 sof Exp $
*
* (c) The GHC Team 1998
*
......@@ -11,27 +11,12 @@
#ifndef SCHEDAPI_H
#define SCHEDAPI_H
/*
* Running the scheduler
*/
typedef enum {
Success,
Killed, /* another thread killed us */
Interrupted, /* stopped in response to a call to interruptStgRts */
Deadlock,
AllBlocked, /* subtly different from Deadlock */
} SchedulerStatus;
/*
* schedule() plus the thread creation functions are not part
* part of the external RTS API, so leave them out if we're
* not compiling rts/ bits. -- sof 7/99
*
*/
#ifdef COMPILING_RTS
SchedulerStatus schedule(StgTSO *main_thread, /*out*/StgClosure **ret);
/*
......@@ -92,6 +77,5 @@ void deleteThread(StgTSO *tso);
*/
void RevertCAFs(void);
#endif
#endif
/* -----------------------------------------------------------------------------
* $Id: Stg.h,v 1.16 1999/07/06 09:19:47 sof Exp $
* $Id: Stg.h,v 1.17 1999/07/06 09:42:39 sof Exp $
*
* (c) The GHC Team, 1998-1999
*
......@@ -103,9 +103,7 @@ void _stgAssert (char *, unsigned int);
#include "TailCalls.h"
/* RTS public interface */
#ifndef COMPILING_RTS
#include "RtsAPI.h"
#endif
/* these are all ANSI C headers */
#include <stdlib.h>
......
/* ----------------------------------------------------------------------------
* $Id: RtsAPI.c,v 1.7 1999/05/21 14:46:19 sof Exp $
* $Id: RtsAPI.c,v 1.8 1999/07/06 09:42:38 sof Exp $
*
* (c) The GHC Team, 1998-1999
*
......@@ -10,6 +10,7 @@
#include "Rts.h"
#include "Storage.h"
#include "RtsAPI.h"
#include "SchedAPI.h"
#include "RtsFlags.h"
#include "RtsUtils.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment