move libthread to libstb-hal

Makefile.am

@@ -2,11 +2,15 @@ ACLOCAL_AMFLAGS = -I m4
 
 lib_LTLIBRARIES = libstb-hal.la
 libstb_hal_la_SOURCES =
-SUBDIRS = common tools
+SUBDIRS = common tools libthread
 bin_PROGRAMS = libstb-hal-test
 
 libstb_hal_la_LIBADD = \
-	common/libcommon.la
+	common/libcommon.la \
+	libthread/libthread.la
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include
 
 libstb_hal_test_SOURCES = libtest.cpp
 libstb_hal_test_LDADD = libstb-hal.la

common/Makefile.am

@@ -18,7 +18,5 @@ libcommon_la_SOURCES = \
 endif
 
 libcommon_la_SOURCES += \
-	thread_abstraction.cpp \
-	mutex_abstraction.cpp \
 	lt_debug.cpp \
 	proc_tools.c

common/thread_abstraction.cpp

@@ -1,34 +0,0 @@
-#include "thread_abstraction.h"
-
-SimpleThread::SimpleThread() :
-	mIsRunning(false),
-	mThread()
-{
-}
-
-SimpleThread::~SimpleThread()
-{
-	// if thread is still running on object destruction, cancel thread the hard way:
-	if (mIsRunning)
-	{
-		pthread_cancel(mThread);
-	}
-}
-
-void SimpleThread::startThread()
-{
-	mIsRunning = true;
-	pthread_create(&mThread, 0, &SimpleThread::runThread, this);
-}
-
-void SimpleThread::joinThread()
-{
-	pthread_join(mThread, 0);
-	mIsRunning = false;
-}
-
-void* SimpleThread::runThread(void* ptr)
-{
-	static_cast<SimpleThread*>(ptr)->run();
-	return 0;
-}

common/thread_abstraction.h

@@ -1,25 +0,0 @@
-#ifndef _SIMPLETHREAD_ABSTRACTION_H
-#define _SIMPLETHREAD_ABSTRACTION_H
-
-#include <pthread.h>
-
-class SimpleThread
-{
-	bool mIsRunning;
-	pthread_t mThread;
-
-	static void* runThread(void*);
-	SimpleThread(const SimpleThread&);
-	const SimpleThread& operator=(const SimpleThread&);
-
-	public:
-		SimpleThread();
-		~SimpleThread();
-		void startThread();
-		void joinThread();
-
-	protected:
-		virtual void run() = 0;
-};
-
-#endif

configure.ac

@@ -48,6 +48,7 @@ AC_OUTPUT([
 Makefile
 common/Makefile
 libeplayer3/Makefile
+libthread/Makefile
 azbox/Makefile
 generic-pc/Makefile
 libduckbox/Makefile

generic-pc/Makefile.am

@@ -2,6 +2,7 @@ noinst_LTLIBRARIES = libgeneric.la
 
 AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
 AM_CPPFLAGS += \
+	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/common
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing

generic-pc/audio.cpp

@@ -103,7 +103,7 @@ int cAudio::Start(void)
 {
 	lt_debug("%s >\n", __func__);
 	if (! HAL_nodec)
-		SimpleThread::startThread();
+		Thread::startThread();
 	lt_debug("%s <\n", __func__);
 	return 0;
 }
@@ -114,7 +114,7 @@ int cAudio::Stop(void)
 	if (thread_started)
 	{
 		thread_started = false;
-		SimpleThread::joinThread();
+		Thread::joinThread();
 	}
 	lt_debug("%s <\n", __func__);
 	return 0;

generic-pc/audio_lib.h

@@ -4,7 +4,7 @@
 #define _AUDIO_LIB_H_
 
 #include <stdint.h>
-#include "../common/thread_abstraction.h"
+#include <thread_abstraction.h>
 #include "../common/cs_types.h"
 
 typedef enum
@@ -38,7 +38,7 @@ typedef enum
    AUDIO_FMT_ADVANCED = AUDIO_FMT_MLP
 } AUDIO_FORMAT;
 
-class cAudio : public SimpleThread
+class cAudio : public Thread
 {
 	friend class cPlayback;
 	private:

generic-pc/dmx.cpp

@@ -70,12 +70,15 @@ static const char *DMX_T[] = {
 };
 
 /* map the device numbers. for now only demux0 is used */
-static const char *devname[] = {
+#define NUM_DEMUXDEV 1
+static const char *devname[NUM_DEMUXDEV] = {
 	"/dev/dvb/adapter0/demux0",
-	"/dev/dvb/adapter0/demux0",
-	"/dev/dvb/adapter0/demux0"
 };
 
+#define NUM_DEMUX 1
+static int dmx_source[NUM_DEMUX] = { 0 };
+static bool init[NUM_DEMUXDEV] = { false };
+
 /* uuuugly */
 static int dmx_tp_count = 0;
 #define MAX_TS_COUNT 8
@@ -494,12 +497,28 @@ int cDemux::getUnit(void)
 
 bool cDemux::SetSource(int unit, int source)
 {
-	lt_info_c("%s(%d, %d): not implemented yet\n", __func__, unit, source);
+	//lt_info_c("%s(%d, %d): not implemented yet\n", __func__, unit, source);
+	//return true;
+	if (unit >= NUM_DEMUX || unit < 0) {
+		lt_info_c("%s: unit (%d) out of range, NUM_DEMUX %d\n", __func__, unit, NUM_DEMUX);
+		return false;
+	}
+	lt_info_c("%s(%d, %d) => %d to %d\n", __func__, unit, source, dmx_source[unit], source);
+	if (source < 0 || source >= NUM_DEMUXDEV)
+		lt_info_c("%s(%d, %d) ERROR: source %d out of range!\n", __func__, unit, source, source);
+	else
+		dmx_source[unit] = source;
 	return true;
 }
 
 int cDemux::GetSource(int unit)
 {
-	lt_info_c("%s(%d): not implemented yet\n", __func__, unit);
+	//lt_info_c("%s(%d): not implemented yet\n", __func__, unit);
-	return 0;
+	//return 0;
+	if (unit >= NUM_DEMUX || unit < 0) {
+		lt_info_c("%s: unit (%d) out of range, NUM_DEMUX %d\n", __func__, unit, NUM_DEMUX);
+		return -1;
+	}
+	lt_info_c("%s(%d) => %d\n", __func__, unit, dmx_source[unit]);
+	return dmx_source[unit];
 }

generic-pc/glfb.cpp

@@ -97,7 +97,7 @@ GLFramebuffer::GLFramebuffer(int x, int y): mReInit(true), mShutDown(false), mIn
 	if (input_fd < 0)
 		lt_info("%s: could not open /tmp/neutrino.input FIFO: %m\n", __func__);
 	initKeys();
-	SimpleThread::startThread();
+	Thread::startThread();
 	while (!mInitDone)
 		usleep(1);
 }
@@ -105,7 +105,7 @@ GLFramebuffer::GLFramebuffer(int x, int y): mReInit(true), mShutDown(false), mIn
 GLFramebuffer::~GLFramebuffer()
 {
 	mShutDown = true;
-	SimpleThread::joinThread();
+	Thread::joinThread();
 	if (input_fd >= 0)
 		close(input_fd);
 }

generic-pc/glfb.h

@@ -18,8 +18,8 @@
 
 #ifndef __glthread__
 #define __glthread__
-#include "../common/thread_abstraction.h"
+#include <thread_abstraction.h>
-#include "../common/mutex_abstraction.h"
+#include <mutex_abstraction.h>
 
 #include <vector>
 #include <map>
@@ -31,7 +31,7 @@ extern "C" {
 #include <libavutil/rational.h>
 }
 
-class GLFramebuffer : public SimpleThread
+class GLFramebuffer : public Thread
 {
 public:
 	GLFramebuffer(int x, int y);

generic-pc/video.cpp

@@ -141,7 +141,7 @@ int cVideo::Start(void *, unsigned short, unsigned short, void *)
 {
 	lt_debug("%s running %d >\n", __func__, thread_running);
 	if (!thread_running && !HAL_nodec)
-		SimpleThread::startThread();
+		Thread::startThread();
 	lt_debug("%s running %d <\n", __func__, thread_running);
 	return 0;
 }
@@ -151,7 +151,7 @@ int cVideo::Stop(bool)
 	lt_debug("%s running %d >\n", __func__, thread_running);
 	if (thread_running) {
 		thread_running = false;
-		SimpleThread::joinThread();
+		Thread::joinThread();
 	}
 	lt_debug("%s running %d <\n", __func__, thread_running);
 	return 0;

generic-pc/video_lib.h

@@ -1,8 +1,8 @@
 #ifndef _VIDEO_TD_H
 #define _VIDEO_TD_H
 
-#include "../common/thread_abstraction.h"
+#include <thread_abstraction.h>
-#include "../common/mutex_abstraction.h"
+#include <mutex_abstraction.h>
 #include <vector>
 #include <linux/dvb/video.h>
 #include "../common/cs_types.h"
@@ -120,7 +120,7 @@ typedef enum
 
 
 #define VDEC_MAXBUFS 0x30
-class cVideo : public SimpleThread
+class cVideo : public Thread
 {
 	friend class GLFramebuffer;
 	friend class cDemux;

include/condition_abstraction.h

@@ -0,0 +1,23 @@
+#ifndef _CONDITION_ABSTRACTION_H
+#define _CONDITION_ABSTRACTION_H
+
+#include <pthread.h>
+
+#include "mutex_abstraction.h"
+
+class Condition
+{
+	pthread_cond_t mCondition;
+
+	Condition(const Condition&);
+	const Condition& operator=(const Condition&);
+
+	public:
+		Condition();
+		virtual ~Condition();
+		virtual int wait(Mutex* const aMutex);
+		virtual int broadcast();
+		virtual int signal();
+};
+
+#endif

include/mutex_abstraction.h

@@ -5,16 +5,21 @@
 
 class Mutex
 {
+	friend class Condition;
+
 	pthread_mutex_t mMutex;
 
 	Mutex(const Mutex&);
 	const Mutex& operator=(const Mutex&);
 
+	protected:
+		explicit Mutex(int);
+
 	public:
 		Mutex();
 		virtual ~Mutex();
-		void lock();
+		virtual void lock();
-		void unlock();
+		virtual void unlock();
 };
 
 #endif

include/reentrant_mutex.h

@@ -0,0 +1,16 @@
+#ifndef _REENTRANT_MUTEX_H
+#define _REENTRANT_MUTEX_H
+
+#include "mutex_abstraction.h"
+
+class ReentrantMutex : public Mutex
+{
+	ReentrantMutex(const ReentrantMutex&);
+	const ReentrantMutex& operator=(const ReentrantMutex&);
+
+	public:
+		ReentrantMutex();
+		virtual ~ReentrantMutex();
+};
+
+#endif

include/scoped_lock.h

@@ -0,0 +1,18 @@
+#ifndef _SCOPED_LOCK_H
+#define _SCOPED_LOCK_H
+
+#include "mutex_abstraction.h"
+
+class ScopedLock
+{
+	Mutex& mMutex;
+
+	ScopedLock(const ScopedLock&);
+	const ScopedLock& operator=(const ScopedLock&);
+
+	public:
+		ScopedLock(Mutex&);
+		~ScopedLock();
+};
+
+#endif

include/thread_abstraction.h

@@ -0,0 +1,30 @@
+#ifndef _THREAD_ABSTRACTION_H
+#define _THREAD_ABSTRACTION_H
+
+#include <pthread.h>
+
+class Thread
+{
+	bool mIsRunning;
+	pthread_t mThread;
+
+	static void* runThread(void*);
+	Thread(const Thread&);
+	const Thread& operator=(const Thread&);
+
+	public:
+		Thread();
+		virtual ~Thread();
+		int startThread();
+		int cancelThread();
+		int detachThread();
+		int joinThread();
+
+		int setCancelModeDisable();
+		int setSchedulePriority(int);
+
+	protected:
+		virtual void run() = 0;
+};
+
+#endif

libthread/Makefile.am

@@ -0,0 +1,16 @@
+noinst_LTLIBRARIES = libthread.la
+
+AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
+AM_CPPFLAGS += \
+	-I$(top_srcdir)/include
+
+AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
+
+AM_LDFLAGS = -lpthread -lrt
+
+libthread_la_SOURCES = \
+	condition_abstraction.cpp \
+	reentrant_mutex.cpp \
+	scoped_lock.cpp \
+	thread_abstraction.cpp \
+	mutex_abstraction.cpp

libthread/Makefile.in

@@ -0,0 +1,639 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = libthread
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libthread_la_LIBADD =
+am_libthread_la_OBJECTS = condition_abstraction.lo reentrant_mutex.lo \
+	scoped_lock.lo thread_abstraction.lo mutex_abstraction.lo
+libthread_la_OBJECTS = $(am_libthread_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libthread_la_SOURCES)
+DIST_SOURCES = $(libthread_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AVCODEC_CFLAGS = @AVCODEC_CFLAGS@
+AVCODEC_LIBS = @AVCODEC_LIBS@
+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
+AVFORMAT_LIBS = @AVFORMAT_LIBS@
+AVUTIL_CFLAGS = @AVUTIL_CFLAGS@
+AVUTIL_LIBS = @AVUTIL_LIBS@
+AWK = @AWK@
+BOXMODEL = @BOXMODEL@
+BOXTYPE = @BOXTYPE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONFIGDIR = @CONFIGDIR@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIR = @DATADIR@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
+DIRECTFB_LIBS = @DIRECTFB_LIBS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FONTDIR = @FONTDIR@
+GAMESDIR = @GAMESDIR@
+GREP = @GREP@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_INTERFACES_CFLAGS = @GSTREAMER_INTERFACES_CFLAGS@
+GSTREAMER_INTERFACES_LIBS = @GSTREAMER_INTERFACES_LIBS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDIR = @LIBDIR@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINDIR = @PLUGINDIR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SWRESAMPLE_CFLAGS = @SWRESAMPLE_CFLAGS@
+SWRESAMPLE_LIBS = @SWRESAMPLE_LIBS@
+SWSCALE_CFLAGS = @SWSCALE_CFLAGS@
+SWSCALE_LIBS = @SWSCALE_LIBS@
+TARGET_CONFIGDIR = @TARGET_CONFIGDIR@
+TARGET_DATADIR = @TARGET_DATADIR@
+TARGET_FONTDIR = @TARGET_FONTDIR@
+TARGET_GAMESDIR = @TARGET_GAMESDIR@
+TARGET_LIBDIR = @TARGET_LIBDIR@
+TARGET_PLUGINDIR = @TARGET_PLUGINDIR@
+TARGET_THEMESDIR = @TARGET_THEMESDIR@
+TARGET_UCODEDIR = @TARGET_UCODEDIR@
+THEMESDIR = @THEMESDIR@
+UCODEDIR = @UCODEDIR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libthread.la
+AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS \
+	-I$(top_srcdir)/include
+AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
+AM_LDFLAGS = -lpthread -lrt
+libthread_la_SOURCES = \
+	condition_abstraction.cpp \
+	reentrant_mutex.cpp \
+	scoped_lock.cpp \
+	thread_abstraction.cpp \
+	mutex_abstraction.cpp
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libthread/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign libthread/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libthread.la: $(libthread_la_OBJECTS) $(libthread_la_DEPENDENCIES) $(EXTRA_libthread_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libthread_la_OBJECTS) $(libthread_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/condition_abstraction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mutex_abstraction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reentrant_mutex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scoped_lock.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread_abstraction.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

libthread/condition_abstraction.cpp

@@ -0,0 +1,27 @@
+#include <condition_abstraction.h>
+
+Condition::Condition() :
+	mCondition()
+{
+	pthread_cond_init(&mCondition, 0);
+}
+
+Condition::~Condition()
+{
+	pthread_cond_destroy(&mCondition);
+}
+
+int Condition::wait(Mutex* const aMutex)
+{
+	return pthread_cond_wait(&mCondition, &(aMutex->mMutex));
+}
+
+int Condition::broadcast()
+{
+	return pthread_cond_broadcast(&mCondition);
+}
+
+int Condition::signal()
+{
+	return pthread_cond_signal(&mCondition);
+}

libthread/mutex_abstraction.cpp

@@ -1,4 +1,4 @@
-#include "mutex_abstraction.h"
+#include <mutex_abstraction.h>
 
 Mutex::Mutex() :
 	mMutex()
@@ -6,6 +6,16 @@ Mutex::Mutex() :
 	pthread_mutex_init(&mMutex, 0);
 }
 
+Mutex::Mutex(int attr) :
+	mMutex()
+{
+	pthread_mutexattr_t Attr;
+
+	pthread_mutexattr_init(&Attr);
+	pthread_mutexattr_settype(&Attr, attr);
+	pthread_mutex_init(&mMutex, &Attr);
+}
+
 Mutex::~Mutex()
 {
 	pthread_mutex_destroy(&mMutex);

libthread/reentrant_mutex.cpp

@@ -0,0 +1,11 @@
+#include <reentrant_mutex.h>
+
+ReentrantMutex::ReentrantMutex() :
+	Mutex(PTHREAD_MUTEX_RECURSIVE)
+{
+}
+
+ReentrantMutex::~ReentrantMutex()
+{
+	//safely destroyed in ~Mutex();
+}

libthread/scoped_lock.cpp

@@ -0,0 +1,12 @@
+#include <scoped_lock.h>
+
+ScopedLock::ScopedLock(Mutex& aMutex) :
+	mMutex(aMutex)
+{
+	mMutex.lock();
+}
+
+ScopedLock::~ScopedLock()
+{
+	mMutex.unlock();
+}

libthread/thread_abstraction.cpp

@@ -0,0 +1,58 @@
+#include <thread_abstraction.h>
+
+Thread::Thread() :
+	mIsRunning(false),
+	mThread()
+{
+}
+
+Thread::~Thread()
+{
+	// if thread is still running on object destruction, cancel thread the hard way:
+	if (mIsRunning)
+	{
+		pthread_cancel(mThread);
+	}
+}
+
+int Thread::startThread()
+{
+	mIsRunning = true;
+	return pthread_create(&mThread, 0, &Thread::runThread, this);
+}
+
+int Thread::cancelThread()
+{
+	return pthread_cancel(mThread);
+	mIsRunning = false;
+}
+
+int Thread::detachThread()
+{
+	mIsRunning = false; // thread shall not cancel on object destruction!
+	return pthread_detach(mThread);
+}
+
+int Thread::joinThread()
+{
+	int ret = pthread_join(mThread, 0);
+	mIsRunning = false;
+	return ret;
+}
+
+int Thread::setCancelModeDisable()
+{
+	return pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, 0);
+}
+
+int Thread::setSchedulePriority(int prio)
+{
+	return pthread_setschedprio(mThread, prio);
+}
+
+void* Thread::runThread(void* ptr)
+{
+	Thread* t = static_cast<Thread*>(ptr);
+	t->run();
+	return 0;
+}