[M3commit] CVS Update: cm3
Jay K
jay.krell at cornell.edu
Sun Sep 13 15:39:19 CEST 2009
Index: src/float/DS3100/FloatMode.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/float/DS3100/FloatMode.m3,v
retrieving revision 1.2
diff -u -w -r1.2 FloatMode.m3
--- src/float/DS3100/FloatMode.m3 14 Feb 2006 14:46:37 -0000 1.2
+++ src/float/DS3100/FloatMode.m3 13 Sep 2009 13:27:35 -0000
@@ -21,7 +21,7 @@
doesn't cause floating-point exceptions)
*)
-IMPORT FPU, Usignal, ThreadF, Word, RTMisc;
+IMPORT FPU, Usignal, ThreadInternal, Word, RTMisc;
TYPE RM = RoundingMode;
TYPE MRM = FPU.RoundingMode;
@@ -53,7 +53,7 @@
ExtractFlags (status, state, flags);
END Get;
BEGIN
- ThreadF.GetMyFPState(Get);
+ ThreadInternal.GetMyFPState(Get);
RETURN flags;
END GetFlags;
@@ -141,7 +141,7 @@
END;
END Set;
BEGIN
- ThreadF.SetMyFPState(Set);
+ ThreadInternal.SetMyFPState(Set);
RETURN flags;
END SetFlags;
@@ -163,7 +163,7 @@
state.sticky [f] := FALSE;
END Set;
BEGIN
- ThreadF.SetMyFPState(Set);
+ ThreadInternal.SetMyFPState(Set);
END ClearFlag;
TYPE
@@ -242,7 +242,7 @@
EVAL FPU.SetStatus (LOOPHOLE (status, INTEGER));
END Set;
BEGIN
- ThreadF.SetMyFPState(Set);
+ ThreadInternal.SetMyFPState(Set);
END SetBehavior;
PROCEDURE GetBehavior(f: Flag): Behavior =
@@ -252,7 +252,7 @@
behavior := state.behavior [f];
END Get;
BEGIN
- ThreadF.GetMyFPState(Get);
+ ThreadInternal.GetMyFPState(Get);
RETURN behavior;
END GetBehavior;
Index: src/float/IRIX5/FloatMode.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/float/IRIX5/FloatMode.m3,v
retrieving revision 1.2
diff -u -w -r1.2 FloatMode.m3
--- src/float/IRIX5/FloatMode.m3 14 Feb 2006 14:46:37 -0000 1.2
+++ src/float/IRIX5/FloatMode.m3 13 Sep 2009 13:27:35 -0000
@@ -22,7 +22,7 @@
doesn't cause floating-point exceptions)
*)
-IMPORT FPU, Usignal, ThreadF, Word, RTError;
+IMPORT FPU, Usignal, ThreadInternal, Word, RTError;
TYPE RM = RoundingMode;
TYPE MRM = FPU.RoundingMode;
@@ -54,7 +54,7 @@
ExtractFlags (status, state, flags);
END Get;
BEGIN
- ThreadF.GetMyFPState(Get);
+ ThreadInternal.GetMyFPState(Get);
RETURN flags;
END GetFlags;
@@ -142,7 +142,7 @@
END;
END Set;
BEGIN
- ThreadF.SetMyFPState(Set);
+ ThreadInternal.SetMyFPState(Set);
RETURN flags;
END SetFlags;
@@ -164,7 +164,7 @@
state.sticky [f] := FALSE;
END Set;
BEGIN
- ThreadF.SetMyFPState(Set);
+ ThreadInternal.SetMyFPState(Set);
END ClearFlag;
TYPE
@@ -243,7 +243,7 @@
EVAL FPU.SetStatus (LOOPHOLE (status, INTEGER));
END Set;
BEGIN
- ThreadF.SetMyFPState(Set);
+ ThreadInternal.SetMyFPState(Set);
END SetBehavior;
PROCEDURE GetBehavior(f: Flag): Behavior =
@@ -253,7 +253,7 @@
behavior := state.behavior [f];
END Get;
BEGIN
- ThreadF.GetMyFPState(Get);
+ ThreadInternal.GetMyFPState(Get);
RETURN behavior;
END GetBehavior;
Index: src/float/VAX/FloatMode.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/float/VAX/FloatMode.m3,v
retrieving revision 1.2
diff -u -w -r1.2 FloatMode.m3
--- src/float/VAX/FloatMode.m3 14 Feb 2006 14:46:37 -0000 1.2
+++ src/float/VAX/FloatMode.m3 13 Sep 2009 13:27:35 -0000
@@ -9,7 +9,7 @@
MODULE FloatMode (* FOR VAX *);
-IMPORT ThreadF;
+IMPORT ThreadInternal;
PROCEDURE SetRounding(md: RoundingMode) RAISES {Failure} =
BEGIN
@@ -28,7 +28,7 @@
flags := state.sticky;
END Get;
BEGIN
- ThreadF.GetMyFPState(Get);
+ ThreadInternal.GetMyFPState(Get);
RETURN flags;
END GetFlags;
@@ -49,7 +49,7 @@
state.sticky := state.sticky - SET OF Flag {f};
END Set;
BEGIN
- ThreadF.SetMyFPState(Set);
+ ThreadInternal.SetMyFPState(Set);
END ClearFlag;
TYPE
@@ -74,7 +74,7 @@
state.behavior [f] := b;
END Set;
BEGIN
- ThreadF.SetMyFPState(Set);
+ ThreadInternal.SetMyFPState(Set);
END SetBehavior;
PROCEDURE GetBehavior(f: Flag): Behavior =
Index: src/runtime/NT386/RTSignal.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/NT386/RTSignal.m3,v
retrieving revision 1.2
diff -u -w -r1.2 RTSignal.m3
--- src/runtime/NT386/RTSignal.m3 12 Feb 2001 15:22:45 -0000 1.2
+++ src/runtime/NT386/RTSignal.m3 13 Sep 2009 13:27:35 -0000
@@ -4,7 +4,7 @@
UNSAFE MODULE RTSignal;
IMPORT RT0, RTMachInfo, RTError, RTException, RTProcess, RuntimeError;
-IMPORT WinBase, WinCon, WinDef, WinNT, ThreadContext, Thread, ThreadF;
+IMPORT WinBase, WinCon, WinDef, WinNT, ThreadContext, Thread, ThreadInternal;
TYPE
RTE = RuntimeError.T;
@@ -60,7 +60,7 @@
END;
(* Otherwise, just dump our guts... *)
- ThreadF.SuspendOthers ();
+ ThreadInternal.SuspendOthers ();
FOR i := FIRST (SysErrs) TO LAST (SysErrs) DO
IF (SysErrs[i].err = err) THEN
RTError.ReportPC (pc, SysErrs[i].msg);
@@ -71,7 +71,7 @@
EXIT;
END;
END;
- ThreadF.ResumeOthers ();
+ ThreadInternal.ResumeOthers ();
(***
IF (old_filter # NIL)
THEN RETURN old_filter (info);
Index: src/runtime/WIN32/RTOS.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/WIN32/RTOS.m3,v
retrieving revision 1.5
diff -u -w -r1.5 RTOS.m3
--- src/runtime/WIN32/RTOS.m3 29 Dec 2008 10:23:39 -0000 1.5
+++ src/runtime/WIN32/RTOS.m3 13 Sep 2009 13:27:35 -0000
@@ -6,7 +6,7 @@
UNSAFE MODULE RTOS;
-IMPORT RTMachInfo, RTSignal, ThreadF;
+IMPORT RTMachInfo, RTSignal, ThreadInternal;
IMPORT WinBase, WinCon, WinDef;
(*--------------------------------------------------- process termination ---*)
@@ -20,7 +20,7 @@
CONST Magic = 1 * ADRSIZE (INTEGER); (* == offset of "fp" in this frame *)
VAR fp: ADDRESS := ADR (fp) + Magic; (* == my frame pointer *)
BEGIN
- ThreadF.SuspendOthers ();
+ ThreadInternal.SuspendOthers ();
RTMachInfo.DumpStack (LOOPHOLE (Crash, ADDRESS), fp);
RTSignal.RestoreHandlers (); (* so we really do crash... *)
IF WinBase.IsDebuggerPresent () # 0 THEN
@@ -33,7 +33,7 @@
PROCEDURE Crash () =
VAR ptr := LOOPHOLE(-99, UNTRACED REF INTEGER);
BEGIN
- ThreadF.SuspendOthers ();
+ ThreadInternal.SuspendOthers ();
ptr^ := 99; (* try to get to the debugger... *)
Exit (-1);
END Crash;
Index: src/runtime/common/RTAllocator.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/common/RTAllocator.m3,v
retrieving revision 1.32
diff -u -w -r1.32 RTAllocator.m3
--- src/runtime/common/RTAllocator.m3 8 Sep 2009 16:41:37 -0000 1.32
+++ src/runtime/common/RTAllocator.m3 13 Sep 2009 13:27:35 -0000
@@ -14,7 +14,7 @@
UNSAFE MODULE RTAllocator
EXPORTS RTAllocator, RTAllocCnts, RTHooks, RTHeapRep;
-IMPORT Cstdlib, RT0, RTMisc, RTOS, RTType, Scheduler, ThreadUnsafe;
+IMPORT Cstdlib, RT0, RTMisc, RTOS, RTType, Scheduler, ThreadInternal;
IMPORT RuntimeError AS RTE, Word;
FROM RTType IMPORT Typecode;
@@ -71,7 +71,7 @@
VAR
hdr: RefHeader; def: RT0.TypeDefn; dataSize: CARDINAL;
res: ADDRESS;
- thread := ThreadUnsafe.MyHeapState();
+ thread := ThreadInternal.MyHeapState();
BEGIN
IF (ref = NIL) THEN RETURN NIL; END;
IF Word.And(LOOPHOLE(ref, Word.T), 1) # 0 THEN RETURN ref; END;
@@ -192,7 +192,7 @@
PROCEDURE GetTracedRef (def: RT0.TypeDefn): REFANY =
VAR
res: ADDRESS;
- thread := ThreadUnsafe.MyHeapState();
+ thread := ThreadInternal.MyHeapState();
BEGIN
IF def.typecode = 0 OR def.traced # 1 OR def.kind # ORD(TK.Ref) THEN
RTE.Raise(RTE.T.ValueOutOfRange);
@@ -214,7 +214,7 @@
PROCEDURE GetTracedObj (def: RT0.TypeDefn): ROOT =
VAR
res: ADDRESS;
- thread := ThreadUnsafe.MyHeapState();
+ thread := ThreadInternal.MyHeapState();
BEGIN
IF def.typecode = 0 OR def.traced # 1 OR def.kind # ORD(TK.Obj) THEN
RTE.Raise(RTE.T.ValueOutOfRange);
@@ -283,7 +283,7 @@
VAR
res: ADDRESS;
dataSize: CARDINAL;
- thread := ThreadUnsafe.MyHeapState();
+ thread := ThreadInternal.MyHeapState();
BEGIN
IF def.typecode = 0 OR def.traced # 1 OR def.kind # ORD(TK.Array) THEN
RTE.Raise(RTE.T.ValueOutOfRange);
Index: src/runtime/common/RTCollector.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/common/RTCollector.m3,v
retrieving revision 1.69
diff -u -w -r1.69 RTCollector.m3
--- src/runtime/common/RTCollector.m3 13 Sep 2009 04:57:33 -0000 1.69
+++ src/runtime/common/RTCollector.m3 13 Sep 2009 13:27:35 -0000
@@ -16,7 +16,7 @@
IMPORT RT0, RTHeapEvent, RTHeapMap, RTIO, RTMachine;
IMPORT RTMisc, RTOS, RTParams, RTPerfTool, RTProcess, RTType;
-IMPORT Word, Thread, ThreadF, RuntimeError;
+IMPORT Word, Thread, ThreadInternal, RuntimeError;
IMPORT TextLiteral AS TextLit, RTLinker, Time;
FROM RT0 IMPORT Typecode, TypeDefn;
@@ -732,7 +732,7 @@
PROCEDURE CollectSomeInStateZero () =
BEGIN
- ThreadF.SuspendOthers ();
+ ThreadInternal.SuspendOthers ();
<* ASSERT disableCount + disableMotionCount = 0 *>
(* compute some costs relative to previous collection *)
@@ -806,7 +806,7 @@
pages, because we want to make sure that old, impure, dirty
pages referenced by threads are marked as ambiguous roots.
Otherwise, these pages won't get cleaned before we return. *)
- ThreadF.ProcessStacks(NoteStackLocations);
+ ThreadInternal.ProcessStacks(NoteStackLocations);
(* Now, nothing in previous space is referenced by a thread. *)
(* Promote any remaining "old" pages and unprotect everything else *)
@@ -886,7 +886,7 @@
collectorState := CollectorState.One;
IF backgroundWaiting THEN signalBackground := TRUE; END;
- ThreadF.ResumeOthers ();
+ ThreadInternal.ResumeOthers ();
END CollectSomeInStateZero;
(* Clean gray nodes *)
@@ -1615,9 +1615,9 @@
PROCEDURE After (self: MonitorClosure) =
BEGIN
- ThreadF.SuspendOthers();
+ ThreadInternal.SuspendOthers();
SanityCheck (self);
- ThreadF.ResumeOthers();
+ ThreadInternal.ResumeOthers();
END After;
PROCEDURE SanityCheck (<*UNUSED*> self: MonitorClosure) =
@@ -1790,7 +1790,7 @@
BEGIN
TRY
Disable();
- ThreadF.SuspendOthers();
+ ThreadInternal.SuspendOthers();
FOR p := p0 TO p1 - 1 DO
IF desc[p - p0] = 0 THEN
WITH page = PageToRef(p), d = page.desc DO
@@ -1813,7 +1813,7 @@
END;
END;
FINALLY
- ThreadF.ResumeOthers();
+ ThreadInternal.ResumeOthers();
Enable();
END;
END VisitAllRefs;
Index: src/runtime/common/RTHeapStats.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/common/RTHeapStats.m3,v
retrieving revision 1.6
diff -u -w -r1.6 RTHeapStats.m3
--- src/runtime/common/RTHeapStats.m3 8 Sep 2009 05:54:55 -0000 1.6
+++ src/runtime/common/RTHeapStats.m3 13 Sep 2009 13:27:35 -0000
@@ -5,7 +5,7 @@
(* Last modified on Fri May 5 08:22:31 PDT 1995 by kalsow *)
(* The code below makes the following NASTY assumption:
- ThreadF.ProcessStacks calls its argument twice for
+ ThreadInternal.ProcessStacks calls its argument twice for
each thread -- the first time for the stack, the
second time for its registers. *)
@@ -13,7 +13,7 @@
IMPORT RT0, RTCollector, RTModule, RTIO, RTHeapMap, RTHeapRep, RTMisc;
IMPORT RTOS, RTType, RTTypeSRC, RTProcedure, RTProcedureSRC, RTMachine;
-IMPORT RTStack, ThreadF, Word, Text;
+IMPORT RTStack, ThreadInternal, Word, Text;
FROM RTIO IMPORT PutInt, PutAddr, PutText;
TYPE
@@ -96,7 +96,7 @@
(* freeze the world *)
RTCollector.Disable ();
RTOS.LockHeap (); (* freeze the heap *)
- ThreadF.SuspendOthers ();
+ ThreadInternal.SuspendOthers ();
(* capture the heap limits *)
heap_min := LOOPHOLE (RTHeapRep.p0 * RTHeapRep.BytesPerPage, ADDRESS);
@@ -146,7 +146,7 @@
(* thaw the world *)
DISPOSE (visit_stack);
DISPOSE (map);
- ThreadF.ResumeOthers ();
+ ThreadInternal.ResumeOthers ();
RTOS.UnlockHeap (); (* unfreeze the heap *)
RTCollector.Enable ();
END ReportReachable;
@@ -282,7 +282,7 @@
BEGIN
self_id := -1;
mark_addr := ADR (i);
- ThreadF.ProcessStacks (GetThread);
+ ThreadInternal.ProcessStacks (GetThread);
RTIO.PutText ("Threads: ");
RTIO.PutInt (n_threads);
IF (n_threads > NUMBER (threads)) THEN
Index: src/runtime/common/RTLinker.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/common/RTLinker.m3,v
retrieving revision 1.15
diff -u -w -r1.15 RTLinker.m3
--- src/runtime/common/RTLinker.m3 8 Sep 2009 05:54:55 -0000 1.15
+++ src/runtime/common/RTLinker.m3 13 Sep 2009 13:27:36 -0000
@@ -12,7 +12,7 @@
IMPORT Cstdlib, Cstring;
IMPORT RT0, RTParams, RTDebug, RTHeapRep, RTCollectorSRC;
-IMPORT RTTypeSRC, RTSignal, ThreadF, RTHeapInfo, RTLinkerX,
+IMPORT RTTypeSRC, RTSignal, ThreadInternal, RTHeapInfo, RTLinkerX,
RTIO, Word;
VAR
@@ -46,7 +46,7 @@
AddUnit (RTLinkerX.RTDebug_I3);
AddUnit (RTLinkerX.RTError_I3);
AddUnit (RTLinkerX.RTHeapRep_I3);
- AddUnit (RTLinkerX.ThreadF_I3);
+ AddUnit (RTLinkerX.ThreadInternal_I3);
AddUnit (RTLinkerX.RTHeapInfo_I3);
AddUnit (RTLinkerX.RTIO_I3);
AddUnit (RTLinkerX.RTCollectorSRC_I3);
@@ -55,7 +55,7 @@
(* finally, initialize the runtime. *)
RTSignal.InstallHandlers ();
RTParams.Init ();
- ThreadF.Init ();
+ ThreadInternal.Init ();
RTHeapRep.Init ();
RTDebug.Init ();
RTHeapInfo.Init ();
Index: src/runtime/common/RTLinkerX.i3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/common/RTLinkerX.i3,v
retrieving revision 1.7
diff -u -w -r1.7 RTLinkerX.i3
--- src/runtime/common/RTLinkerX.i3 7 Apr 2008 17:58:30 -0000 1.7
+++ src/runtime/common/RTLinkerX.i3 13 Sep 2009 13:27:36 -0000
@@ -46,7 +46,7 @@
<*EXTERNAL*> PROCEDURE RTTypeSRC_I3 (mode: INTEGER): RT0.ModulePtr;
<*EXTERNAL*> PROCEDURE RTWeakRef_I3 (mode: INTEGER): RT0.ModulePtr;
<*EXTERNAL*> PROCEDURE RTutils_I3 (mode: INTEGER): RT0.ModulePtr;
-<*EXTERNAL*> PROCEDURE ThreadF_I3 (mode: INTEGER): RT0.ModulePtr;
+<*EXTERNAL*> PROCEDURE ThreadInternal_I3 (mode: INTEGER): RT0.ModulePtr;
<*EXTERNAL*> PROCEDURE Word_I3 (mode: INTEGER): RT0.ModulePtr;
<*EXTERNAL*> PROCEDURE RT0_M3 (mode: INTEGER): RT0.ModulePtr;
<*EXTERNAL*> PROCEDURE RTAllocStats_M3 (mode: INTEGER): RT0.ModulePtr;
Index: src/runtime/ex_frame/RTExFrame.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/ex_frame/RTExFrame.m3,v
retrieving revision 1.5
diff -u -w -r1.5 RTExFrame.m3
--- src/runtime/ex_frame/RTExFrame.m3 8 Sep 2009 05:54:56 -0000 1.5
+++ src/runtime/ex_frame/RTExFrame.m3 13 Sep 2009 13:27:36 -0000
@@ -4,7 +4,7 @@
UNSAFE MODULE RTExFrame EXPORTS RTException, RTExFrame;
-IMPORT RT0, RTError, RTIO, RTParams, RTOS, ThreadF;
+IMPORT RT0, RTError, RTIO, RTParams, RTOS, ThreadInternal;
IMPORT Thread, Csetjmp;
VAR
@@ -16,7 +16,7 @@
PROCEDURE Raise (VAR act: RT0.RaiseActivation) RAISES ANY =
VAR
- f := LOOPHOLE(ThreadF.GetCurrentHandlers(), Frame);
+ f := LOOPHOLE(ThreadInternal.GetCurrentHandlers(), Frame);
ex: ExceptionList;
BEGIN
IF DEBUG THEN
@@ -67,7 +67,7 @@
PROCEDURE ResumeRaise (VAR a: RT0.RaiseActivation) RAISES ANY =
VAR
- f := LOOPHOLE(ThreadF.GetCurrentHandlers(), Frame);
+ f := LOOPHOLE(ThreadInternal.GetCurrentHandlers(), Frame);
ex: ExceptionList;
BEGIN
IF DEBUG THEN
@@ -99,7 +99,7 @@
BadStack ();
END;
- ThreadF.SetCurrentHandlers (f.next); (* cut to the new handler *)
+ ThreadInternal.SetCurrentHandlers (f.next); (* cut to the new handler *)
f := f.next; (* try the previous frame *)
END;
END ResumeRaise;
@@ -114,7 +114,7 @@
RTIO.PutText ("\n");
RTIO.Flush ();
END;
- ThreadF.SetCurrentHandlers (f.next); (* cut to the new handler *)
+ ThreadInternal.SetCurrentHandlers (f.next); (* cut to the new handler *)
p.info := a; (* copy the exception to the new frame *)
Csetjmp.ulongjmp (p.jmpbuf, 1); (* and jump... *)
RAISE OUCH;
@@ -138,7 +138,7 @@
cl.proc := p.handler;
cl.frame := p.frame;
- ThreadF.SetCurrentHandlers (f.next); (* cut to the new handler *)
+ ThreadInternal.SetCurrentHandlers (f.next); (* cut to the new handler *)
CallProc (LOOPHOLE (ADR (cl), FinallyProc), a);
END InvokeFinallyHandler;
@@ -159,7 +159,7 @@
RTIO.PutText ("\n");
RTIO.Flush ();
END;
- ThreadF.SetCurrentHandlers (f.next); (* cut to the new handler *)
+ ThreadInternal.SetCurrentHandlers (f.next); (* cut to the new handler *)
Thread.Release (p.mutex); (* and release the lock *)
END ReleaseLock;
@@ -173,7 +173,7 @@
PROCEDURE SanityCheck () =
CONST Min_SK = ORD (FIRST (ScopeKind));
CONST Max_SK = ORD (LAST (ScopeKind));
- VAR f := LOOPHOLE(ThreadF.GetCurrentHandlers(), Frame);
+ VAR f := LOOPHOLE(ThreadInternal.GetCurrentHandlers(), Frame);
VAR i: INTEGER;
BEGIN
WHILE (f # NIL) DO
@@ -184,7 +184,7 @@
END SanityCheck;
PROCEDURE DumpStack () =
- VAR f := LOOPHOLE(ThreadF.GetCurrentHandlers(), Frame);
+ VAR f := LOOPHOLE(ThreadInternal.GetCurrentHandlers(), Frame);
BEGIN
IF NOT DEBUG AND NOT dump_enabled THEN RETURN; END;
Index: src/runtime/ex_frame/RTException.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/ex_frame/RTException.m3,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 RTException.m3
--- src/runtime/ex_frame/RTException.m3 24 Jan 2001 12:24:27 -0000 1.1.1.1
+++ src/runtime/ex_frame/RTException.m3 13 Sep 2009 13:27:36 -0000
@@ -8,7 +8,7 @@
UNSAFE MODULE RTException EXPORTS RTException, RTExRep;
IMPORT RT0, RTMisc, RTIO, RTParams, RTOS;
-IMPORT Thread, ThreadF, M3toC, Ctypes, Csetjmp;
+IMPORT Thread, ThreadInternal, M3toC, Ctypes, Csetjmp;
VAR
DEBUG := FALSE;
@@ -22,7 +22,7 @@
PROCEDURE Raise (en: ExceptionPtr; arg: ExceptionArg) RAISES ANY =
VAR
- f := LOOPHOLE(ThreadF.GetCurrentHandlers(), Frame);
+ f := LOOPHOLE(ThreadInternal.GetCurrentHandlers(), Frame);
ex: ExceptionList;
BEGIN
IF DEBUG THEN
@@ -69,7 +69,7 @@
PROCEDURE ResumeRaise (en: ExceptionPtr; arg: ExceptionArg) RAISES ANY =
VAR
- f := LOOPHOLE(ThreadF.GetCurrentHandlers(), Frame);
+ f := LOOPHOLE(ThreadInternal.GetCurrentHandlers(), Frame);
ex: ExceptionList;
BEGIN
IF DEBUG THEN
@@ -101,7 +101,7 @@
BadStack ();
END;
- ThreadF.SetCurrentHandlers (f.next); (* cut to the new handler *)
+ ThreadInternal.SetCurrentHandlers (f.next); (* cut to the new handler *)
f := f.next; (* try the previous frame *)
END;
END ResumeRaise;
@@ -117,7 +117,7 @@
RTIO.PutText ("\n");
RTIO.Flush ();
END;
- ThreadF.SetCurrentHandlers (f.next); (* cut to the new handler *)
+ ThreadInternal.SetCurrentHandlers (f.next); (* cut to the new handler *)
p.exception := en; (* record the exception *)
p.arg := arg; (* and it argument *)
Csetjmp.ulongjmp (p.jmpbuf, 1); (* and jump... *)
@@ -143,7 +143,7 @@
cl.proc := p.handler;
cl.frame := p.frame;
- ThreadF.SetCurrentHandlers (f.next); (* cut to the new handler *)
+ ThreadInternal.SetCurrentHandlers (f.next); (* cut to the new handler *)
CallProc (LOOPHOLE (ADR (cl), FinallyProc));
END InvokeFinallyHandler;
@@ -164,7 +164,7 @@
RTIO.PutText ("\n");
RTIO.Flush ();
END;
- ThreadF.SetCurrentHandlers (f.next); (* cut to the new handler *)
+ ThreadInternal.SetCurrentHandlers (f.next); (* cut to the new handler *)
Thread.Release (p.mutex); (* and release the lock *)
END ReleaseLock;
@@ -188,7 +188,7 @@
PROCEDURE SanityCheck () =
CONST Min_SK = ORD (FIRST (ScopeKind));
CONST Max_SK = ORD (LAST (ScopeKind));
- VAR f := LOOPHOLE(ThreadF.GetCurrentHandlers(), Frame);
+ VAR f := LOOPHOLE(ThreadInternal.GetCurrentHandlers(), Frame);
VAR i: INTEGER;
BEGIN
WHILE (f # NIL) DO
@@ -199,7 +199,7 @@
END SanityCheck;
PROCEDURE DumpStack () =
- VAR f := LOOPHOLE(ThreadF.GetCurrentHandlers(), Frame);
+ VAR f := LOOPHOLE(ThreadInternal.GetCurrentHandlers(), Frame);
BEGIN
IF NOT DEBUG AND NOT dump_enabled THEN RETURN; END;
Index: src/thread/Common/m3makefile
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/thread/Common/m3makefile,v
retrieving revision 1.7
diff -u -w -r1.7 m3makefile
--- src/thread/Common/m3makefile 8 Sep 2009 16:41:37 -0000 1.7
+++ src/thread/Common/m3makefile 13 Sep 2009 13:27:36 -0000
@@ -8,10 +8,11 @@
% modified on Tue Feb 11 15:07:32 PST 1992 by muller
Interface ("Thread")
+Interface ("ThreadF")
Interface ("Scheduler")
if equal (OS_TYPE, "POSIX")
Interface ("SchedulerPosix")
end
Interface ("MutexRep")
Interface ("ThreadEvent")
-interface ("ThreadUnsafe")
+interface ("ThreadInternal")
Index: src/thread/POSIX/ThreadPosix.i3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/thread/POSIX/ThreadPosix.i3,v
retrieving revision 1.7
diff -u -w -r1.7 ThreadPosix.i3
--- src/thread/POSIX/ThreadPosix.i3 29 Jun 2009 19:20:47 -0000 1.7
+++ src/thread/POSIX/ThreadPosix.i3 13 Sep 2009 13:27:36 -0000
@@ -20,7 +20,7 @@
<*EXTERNAL ThreadPosix__InitC*>
PROCEDURE InitC();
-(* There is already ThreadF.Init exported by the same module that exports this
+(* There is already ThreadInternal.Init exported by the same module that exports this
interface, so we chose an arbitrary different name here. *)
END ThreadPosix.
Index: src/thread/POSIX/ThreadPosix.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/thread/POSIX/ThreadPosix.m3,v
retrieving revision 1.45
diff -u -w -r1.45 ThreadPosix.m3
--- src/thread/POSIX/ThreadPosix.m3 13 Sep 2009 13:08:00 -0000 1.45
+++ src/thread/POSIX/ThreadPosix.m3 13 Sep 2009 13:27:36 -0000
@@ -10,7 +10,7 @@
(*| modified On Mon Apr 5 14:51:30 PDT 1993 by muller *)
(*| modified on Mon Feb 22 10:08:49 PST 1993 by jdd *)
-UNSAFE MODULE ThreadPosix EXPORTS Thread, ThreadF, ThreadUnsafe,
+UNSAFE MODULE ThreadPosix EXPORTS Thread, ThreadF, ThreadInternal,
Scheduler, SchedulerPosix, RTOS, RTHooks, ThreadPosix;
IMPORT Cerrno, Cstring, FloatMode, MutexRep, RTHeapRep, RTCollectorSRC,
@@ -1461,7 +1461,7 @@
perfOn := RTPerfTool.Send (perfW, ADR (e), EventSize);
END PerfRunning;
-(*--------------------------------------------------------- ThreadF hooks ---*)
+(*--------------------------------------------------------- ThreadInternal hooks ---*)
VAR
hooks: Hooks := NIL;
@@ -1485,6 +1485,8 @@
RETURN oldHooks;
END RegisterHooks;
+(*--------------------------------------------------------- ThreadF ---*)
+
PROCEDURE MyId(): Id RAISES {}=
BEGIN
RETURN self.id;
Index: src/thread/POSIX/m3makefile
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/thread/POSIX/m3makefile,v
retrieving revision 1.6
diff -u -w -r1.6 m3makefile
--- src/thread/POSIX/m3makefile 22 Mar 2009 09:43:13 -0000 1.6
+++ src/thread/POSIX/m3makefile 13 Sep 2009 13:27:36 -0000
@@ -7,7 +7,6 @@
% modified on Tue May 4 10:18:56 PDT 1993 by mjordan
% modified on Tue Feb 11 15:07:32 PST 1992 by muller
-Interface ("ThreadF")
module ("ThreadPosix")
c_source ("ThreadPosixC")
h_source ("ThreadPosix")
Index: src/thread/PTHREAD/ThreadPThread.m3
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/thread/PTHREAD/ThreadPThread.m3,v
retrieving revision 1.139
diff -u -w -r1.139 ThreadPThread.m3
--- src/thread/PTHREAD/ThreadPThread.m3 13 Sep 2009 13:08:01 -0000 1.139
+++ src/thread/PTHREAD/ThreadPThread.m3 13 Sep 2009 13:27:36 -0000
@@ -2,7 +2,7 @@
(* All rights reserved. *)
(* See the file COPYRIGHT-PURDUE for a full description. *)
-UNSAFE MODULE ThreadPThread EXPORTS Thread, ThreadF, ThreadUnsafe,
+UNSAFE MODULE ThreadPThread EXPORTS Thread, ThreadF, ThreadInternal,
Scheduler, SchedulerPosix, RTOS, RTHooks, ThreadPThread;
IMPORT Cerrno, FloatMode, MutexRep,
@@ -1316,7 +1316,6 @@
VAR
perfW : RTPerfTool.Handle;
- perfOn: BOOLEAN := FALSE; (* LL = perfMu *)
PROCEDURE PerfStart () =
BEGIN
Index: src/thread/PTHREAD/m3makefile
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/thread/PTHREAD/m3makefile,v
retrieving revision 1.13
diff -u -w -r1.13 m3makefile
--- src/thread/PTHREAD/m3makefile 29 Apr 2009 21:01:14 -0000 1.13
+++ src/thread/PTHREAD/m3makefile 13 Sep 2009 13:27:36 -0000
@@ -7,6 +7,5 @@
% modified on Tue May 4 10:18:56 PDT 1993 by mjordan
% modified on Tue Feb 11 15:07:32 PST 1992 by muller
-Interface ("ThreadF")
module ("ThreadPThread")
c_source ("ThreadPThreadC")
Index: src/thread/WIN32/m3makefile
===================================================================
RCS file: /usr/cvs/cm3/m3-libs/m3core/src/thread/WIN32/m3makefile,v
retrieving revision 1.13
diff -u -w -r1.13 m3makefile
--- src/thread/WIN32/m3makefile 21 Apr 2009 11:02:11 -0000 1.13
+++ src/thread/WIN32/m3makefile 13 Sep 2009 13:27:36 -0000
@@ -2,7 +2,6 @@
% All rights reserved.
% See the file COPYRIGHT for a full description.
-Interface ("ThreadF")
Interface ("ThreadContext")
module ("ThreadWin32")
interface("ThreadInternal")
> Date: Sun, 13 Sep 2009 15:36:43 +0000
> To: m3commit at elegosoft.com
> From: jkrell at elego.de
> Subject: [M3commit] CVS Update: cm3
>
> CVSROOT: /usr/cvs
> Changes by: jkrell at birch. 09/09/13 15:36:43
>
> Modified files:
> cm3/m3-libs/m3core/src/float/DS3100/: FloatMode.m3
> cm3/m3-libs/m3core/src/float/IRIX5/: FloatMode.m3
> cm3/m3-libs/m3core/src/float/VAX/: FloatMode.m3
> cm3/m3-libs/m3core/src/runtime/NT386/: RTSignal.m3
> cm3/m3-libs/m3core/src/runtime/WIN32/: RTOS.m3
> cm3/m3-libs/m3core/src/runtime/common/: RTAllocator.m3
> RTCollector.m3
> RTHeapStats.m3
> RTLinker.m3 RTLinkerX.i3
> cm3/m3-libs/m3core/src/runtime/ex_frame/: RTExFrame.m3
> RTException.m3
> cm3/m3-libs/m3core/src/thread/Common/: m3makefile
> cm3/m3-libs/m3core/src/thread/POSIX/: ThreadPosix.i3
> ThreadPosix.m3 m3makefile
> cm3/m3-libs/m3core/src/thread/PTHREAD/: ThreadPThread.m3
> m3makefile
> cm3/m3-libs/m3core/src/thread/WIN32/: m3makefile
> Added files:
> cm3/m3-libs/m3core/src/thread/Common/: ThreadF.i3
> ThreadInternal.i3
> Removed files:
> cm3/m3-libs/m3core/src/thread/Common/: ThreadUnsafe.i3
> cm3/m3-libs/m3core/src/thread/WIN32/: ThreadInternal.i3
>
> Log message:
> move ThreadUnsafe.i3 to ThreadInternal.i3
> move most of ThreadF.i3 to ThreadInternal.i3
> ThreadF is safe and public, and small.
> ThreadInternal is not safe nor public.
> As well between ThreadF.i3 and ThreadInternal.i3 we need only have one common copy.
> Three ThreadF.i3s replaced by one.
> A ThreadInternal.i3 and ThreadUnsafe.i3 replaced by one ThreadInternal.i3.
> ThreadF.i3 is entirely shared.
> ThreadInternal.i3 exposes a little extra that is present in all three but only
> needs to be exposed for Win32 (and then, only if Cygwin uses Win32 threads).
>
> (deletes deferred because of CVS wierdness)
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://m3lists.elegosoft.com/pipermail/m3commit/attachments/20090913/1374e46c/attachment-0002.html>
More information about the M3commit
mailing list