Pārlūkot izejas kodu

Moved context inheritance into active object creation

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8614 8c9fc860-2736-0410-a75d-ab315db34111
negelef 6 gadi atpakaļ
vecāks
revīzija
2024d20b0e
1 mainītis faili ar 1 papildinājumiem un 5 dzēšanām
  1. 1 5
      source/Activities.Mod

+ 1 - 5
source/Activities.Mod

@@ -70,11 +70,6 @@ TYPE Activity* = OBJECT {DISPOSABLE} (Queues.Item)
 		stackFrame.previous := NIL;
 		stackFrame.descriptor := ADDRESS OF StackFrameDescriptor;
 		SELF.procedure := procedure;
-		IF SYSTEM.GetActivity () # NIL THEN
-			context := SYSTEM.GetActivity ()(Activity).context;
-		ELSE
-			context := NIL;
-		END;
 	END InitializeActivity;
 
 	PROCEDURE ~Finalize;
@@ -298,6 +293,7 @@ BEGIN {UNCOOPERATIVE, UNCHECKED}
 	IF priority = IdlePriority THEN priority := SYSTEM.GetActivity ()(Activity).priority END;
 	NEW (activity, body, priority, object);
 	ASSERT (activity # NIL);
+	activity.context := GetCurrentActivity ().context;
 	Resume (activity);
 END Create;