mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 15:02:43 +02:00
Revert "fix thread namespace"
This reverts commit03a7525218
. Origin commit data ------------------ Branch: master Commit:1790425e86
Author: max_10 <max_10@gmx.de> Date: 2018-09-20 (Thu, 20 Sep 2018) ------------------ This commit was generated by Migit
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
#include "thread_abstraction.h"
|
||||
|
||||
SimpleThread::SimpleThread() :
|
||||
Thread::Thread() :
|
||||
mIsRunning(false),
|
||||
mThread()
|
||||
{
|
||||
}
|
||||
|
||||
SimpleThread::~SimpleThread()
|
||||
Thread::~Thread()
|
||||
{
|
||||
// if thread is still running on object destruction, cancel thread the hard way:
|
||||
if (mIsRunning)
|
||||
@@ -15,20 +15,20 @@ SimpleThread::~SimpleThread()
|
||||
}
|
||||
}
|
||||
|
||||
void SimpleThread::startThread()
|
||||
void Thread::startThread()
|
||||
{
|
||||
mIsRunning = true;
|
||||
pthread_create(&mThread, 0, &SimpleThread::runThread, this);
|
||||
pthread_create(&mThread, 0, &Thread::runThread, this);
|
||||
}
|
||||
|
||||
void SimpleThread::joinThread()
|
||||
void Thread::joinThread()
|
||||
{
|
||||
pthread_join(mThread, 0);
|
||||
mIsRunning = false;
|
||||
}
|
||||
|
||||
void* SimpleThread::runThread(void* ptr)
|
||||
void* Thread::runThread(void* ptr)
|
||||
{
|
||||
static_cast<SimpleThread*>(ptr)->run();
|
||||
((Thread*)ptr)->run();
|
||||
return 0;
|
||||
}
|
||||
|
@@ -1,20 +1,20 @@
|
||||
#ifndef _SIMPLETHREAD_ABSTRACTION_H
|
||||
#define _SIMPLETHREAD_ABSTRACTION_H
|
||||
#ifndef _THREAD_ABSTRACTION_H
|
||||
#define _THREAD_ABSTRACTION_H
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
class SimpleThread
|
||||
class Thread
|
||||
{
|
||||
bool mIsRunning;
|
||||
pthread_t mThread;
|
||||
|
||||
static void* runThread(void*);
|
||||
SimpleThread(const SimpleThread&);
|
||||
const SimpleThread& operator=(const SimpleThread&);
|
||||
Thread(const Thread&);
|
||||
const Thread& operator=(const Thread&);
|
||||
|
||||
public:
|
||||
SimpleThread();
|
||||
~SimpleThread();
|
||||
Thread();
|
||||
~Thread();
|
||||
void startThread();
|
||||
void joinThread();
|
||||
|
||||
|
Reference in New Issue
Block a user