Browse Source

Remove Thread.Interrupt

Brian Fiete 3 years ago
parent
commit
b9ab8214d2
3 changed files with 9 additions and 22 deletions
  1. 2 11
      BeefLibs/corlib/src/Threading/Thread.bf
  2. 2 7
      BeefRT/rt/Thread.cpp
  3. 5 4
      BeefRT/rt/Thread.h

+ 2 - 11
BeefLibs/corlib/src/Threading/Thread.bf

@@ -217,17 +217,8 @@ namespace System.Threading
 			}
 		}
 
-        public void Suspend() { SuspendInternal(); }
-		[CallingConvention(.Cdecl)]
-        private extern void SuspendInternal();
-
-        public void Resume() { ResumeInternal(); }
-		[CallingConvention(.Cdecl)]
-        private extern void ResumeInternal();
-
-        public void Interrupt() { InterruptInternal(); }
-		[CallingConvention(.Cdecl)]
-        private extern void InterruptInternal();
+        public extern void Suspend();
+        public extern void Resume();
 
         public ThreadPriority Priority
         {

+ 2 - 7
BeefRT/rt/Thread.cpp

@@ -29,21 +29,16 @@ bf::System::Threading::Thread* BfGetCurrentThread()
 #endif	
 }
 
-void Thread::SuspendInternal()
+void Thread::Suspend()
 {
 	BfpThread_Suspend(GetInternalThread()->mThreadHandle, NULL);	
 }
 
-void Thread::ResumeInternal()
+void Thread::Resume()
 {
 	BfpThread_Resume(GetInternalThread()->mThreadHandle, NULL);	
 }
 
-void Thread::InterruptInternal()
-{
-	//TODO:
-}
-
 void Thread::SetJoinOnDelete(bool joinOnDelete)
 {
 	auto internalThread = GetInternalThread();	

+ 5 - 4
BeefRT/rt/Thread.h

@@ -39,10 +39,7 @@ namespace bf
 			private:
 				BfInternalThread* SetupInternalThread();
 
-				BFRT_EXPORT void ManualThreadInit();
-				BFRT_EXPORT void SuspendInternal();
-				BFRT_EXPORT void ResumeInternal();
-				BFRT_EXPORT void InterruptInternal();
+				BFRT_EXPORT void ManualThreadInit();				
 				BFRT_EXPORT int GetPriorityNative();
 				BFRT_EXPORT void SetPriorityNative(int priority);
 				BFRT_EXPORT void SetJoinOnDelete(bool joinOnDelete);
@@ -67,6 +64,10 @@ namespace bf
 				BFRT_EXPORT void Dbg_CreateInternal();
 
 			public:
+				BFRT_EXPORT void Suspend();
+				BFRT_EXPORT void Resume();
+				BFRT_EXPORT void Abort();
+
 				BFRT_EXPORT static void MemoryBarrier();
 
 				static Thread* Alloc()