/* -----------------------------------------------------------------------------
- * $Id: PrimOps.h,v 1.98 2002/10/18 09:51:04 simonmar Exp $
+ * $Id: PrimOps.h,v 1.99 2002/10/22 11:01:18 simonmar Exp $
*
* (c) The GHC Team, 1998-2000
*
EXTFUN_RTS(myThreadIdzh_fast);
EXTFUN_RTS(labelThreadzh_fast);
-extern int cmp_thread(const StgTSO *tso1, const StgTSO *tso2);
-extern int rts_getThreadId(const StgTSO *tso);
-extern void labelThread(StgTSO *tso, char *label);
-
+extern int cmp_thread(StgPtr tso1, StgPtr tso2);
+extern int rts_getThreadId(StgPtr tso);
/* -----------------------------------------------------------------------------
Weak Pointer PrimOps.
/* -----------------------------------------------------------------------------
- * $Id: PrimOps.hc,v 1.101 2002/10/18 09:51:03 simonmar Exp $
+ * $Id: PrimOps.hc,v 1.102 2002/10/22 11:01:19 simonmar Exp $
*
* (c) The GHC Team, 1998-2000
*
R1.p = ThreadId#
R2.p = Addr# */
#ifdef DEBUG
- STGCALL2(labelThread,(StgTSO *)R1.p,(char *)R2.p);
+ STGCALL2(labelThread,R1.p,(char *)R2.p);
#endif
JMP_(ENTRY_CODE(Sp[0]));
FE_
/* ---------------------------------------------------------------------------
- * $Id: Schedule.c,v 1.156 2002/09/25 14:46:31 simonmar Exp $
+ * $Id: Schedule.c,v 1.157 2002/10/22 11:01:19 simonmar Exp $
*
* (c) The GHC Team, 1998-2000
*
* instances of Eq/Ord for ThreadIds.
* ------------------------------------------------------------------------ */
-int cmp_thread(const StgTSO *tso1, const StgTSO *tso2)
+int
+cmp_thread(StgPtr tso1, StgPtr tso2)
{
- StgThreadID id1 = tso1->id;
- StgThreadID id2 = tso2->id;
+ StgThreadID id1 = ((StgTSO *)tso1)->id;
+ StgThreadID id2 = ((StgTSO *)tso2)->id;
if (id1 < id2) return (-1);
if (id1 > id2) return 1;
*
* This is used in the implementation of Show for ThreadIds.
* ------------------------------------------------------------------------ */
-int rts_getThreadId(const StgTSO *tso)
+int
+rts_getThreadId(StgPtr tso)
{
- return tso->id;
+ return ((StgTSO *)tso)->id;
}
#ifdef DEBUG
-void labelThread(StgTSO *tso, char *label)
+void
+labelThread(StgPtr tso, char *label)
{
int len;
void *buf;
/* -----------------------------------------------------------------------------
- * $Id: Schedule.h,v 1.35 2002/07/25 18:37:00 sof Exp $
+ * $Id: Schedule.h,v 1.36 2002/10/22 11:01:20 simonmar Exp $
*
* (c) The GHC Team 1998-1999
*
void print_bqe (StgBlockingQueueElement *bqe);
#endif
+void labelThread(StgPtr tso, char *label);
+
/* -----------------------------------------------------------------------------
* Some convenient macros...
*/