summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/testsuite.cpp18
-rw-r--r--src/threadengines/threadengine_pthread.cpp7
2 files changed, 18 insertions, 7 deletions
diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index 608179703..719da0313 100644
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -33,10 +33,10 @@ class TestSuiteThread : public Thread
virtual void Run()
{
- while (1)
+ while (GetExitFlag() == false)
{
cout << "Test suite thread run...\n";
- sleep(10);
+ sleep(5);
}
}
};
@@ -110,19 +110,23 @@ bool TestSuite::DoThreadTests()
}
cout << "Creation success!\n";
- cout << "Creating new thread of type TestSuiteThread\n";
-
+ cout << "Creating new thread of type TestSuiteThread...\n";
TestSuiteThread* tst = new TestSuiteThread();
+ cout << "Create new thread based on TestSuiteThread...\n";
te->Create(tst);
- cout << "Press enter to end test.";
- cin >> anything;
+ cout << "Press any key to end test.\n";
+ getchar();
- /* Auto frees thread */
+ /* Thread engine auto frees thread on delete */
+ cout << "Waiting for thread to exit...";
delete tst;
+ cout << "Done!\n";
+ cout << "Delete ThreadEngine... ";
delete te;
+ cout << "Done!\n";
return true;
}
diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
index da120bfab..8bdcd6d96 100644
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -36,6 +36,7 @@ void PThreadEngine::Create(Thread* thread_to_init)
{
pthread_attr_t attribs;
pthread_attr_init(&attribs);
+ pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_JOINABLE);
pthread_t* MyPThread = new pthread_t;
if (pthread_create(MyPThread, &attribs, PThreadEngine::Entry, (void*)this) != 0)
@@ -44,6 +45,8 @@ void PThreadEngine::Create(Thread* thread_to_init)
throw CoreException("Unable to create new PThreadEngine: " + std::string(strerror(errno)));
}
+ pthread_attr_destroy(&attribs);
+
NewThread = thread_to_init;
NewThread->Creator = this;
NewThread->Extend("pthread", MyPThread);
@@ -81,6 +84,10 @@ void PThreadEngine::FreeThread(Thread* thread)
pthread_t* pthread = NULL;
if (thread->GetExt("pthread", pthread))
{
+ thread->SetExitFlag();
+ int rc;
+ void* status;
+ rc = pthread_join(*pthread, &status);
delete pthread;
}
}