X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ABM2%2FEngine%2FKernel.cpp;h=35d4afce603cc425a1fe83b2275477380459315b;hb=5ddbdf638ea3b2fe93de5b7746ac827c21fc5633;hp=f16fe06919b1e0a5264c8193a480fb02952a5f85;hpb=0835c5605c80efd286ccb7eff92fffc07689f359;p=matthijs%2FABM2.git

diff --git a/ABM2/Engine/Kernel.cpp b/ABM2/Engine/Kernel.cpp
index f16fe06..35d4afc 100755
--- a/ABM2/Engine/Kernel.cpp
+++ b/ABM2/Engine/Kernel.cpp
@@ -25,20 +25,24 @@ CKernel::~CKernel()
 
 int CKernel::Execute()
 {
+#ifdef WIN32
     MSG msg;
+#endif // WIN32
 
 	while(taskList.size())
 	{
 		{
 			PROFILE("Kernel task loop");
 
-			//DWORD starting_point = GetTickCount();
+			DWORD starting_point = GetTickCount();
 
+#ifdef WIN32
         if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
         {
             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }
+#endif // WIN32
 
 
 			std::list< CMMPointer<ITask> >::iterator it, thisIt;
@@ -62,8 +66,10 @@ int CKernel::Execute()
 				}
 			}
 			IMMObject::CollectGarbage();
-			//DWORD end_point = GetTickCount();
-//			Sleep(50 - (end_point-starting_point));
+			DWORD end_point = GetTickCount();
+			/* Sleep if we didn't use up too much time already */
+			if (starting_point + 50 > end_point)
+				Sleep(50 - (end_point-starting_point));
 		}
 #ifdef _DEBUG
 		CProfileSample::Output();
@@ -73,7 +79,7 @@ int CKernel::Execute()
 	return 0;
 }
 
-bool CKernel::AddTask(CMMPointer<ITask> &t)
+bool CKernel::AddTask(const CMMPointer<ITask> &t)
 {
 	if(!t->Start())return false;
 
@@ -88,7 +94,7 @@ bool CKernel::AddTask(CMMPointer<ITask> &t)
 	return true;
 }
 
-void CKernel::SuspendTask(CMMPointer<ITask> &t)
+void CKernel::SuspendTask(const CMMPointer<ITask> &t)
 {
 	//check that this task is in our list - we don't want to suspend a task that isn't running
 	if(std::find(taskList.begin(),taskList.end(),t)!=taskList.end())
@@ -99,7 +105,7 @@ void CKernel::SuspendTask(CMMPointer<ITask> &t)
 	}
 }
 
-void CKernel::ResumeTask(CMMPointer<ITask> &t)
+void CKernel::ResumeTask(const CMMPointer<ITask> &t)
 {
 	if(std::find(pausedTaskList.begin(),pausedTaskList.end(),t)!=pausedTaskList.end())
 	{
@@ -116,7 +122,7 @@ void CKernel::ResumeTask(CMMPointer<ITask> &t)
 	}
 }
 
-void CKernel::RemoveTask(CMMPointer<ITask> &t)
+void CKernel::RemoveTask(const CMMPointer<ITask> &t)
 {
 	if(std::find(taskList.begin(),taskList.end(),t)!=taskList.end())
 	{
@@ -130,4 +136,4 @@ void CKernel::KillAllTasks()
 	{
 		(*it)->canKill=true;
 	}
-}
\ No newline at end of file
+}