added autotools build system + fixed debugging checks (and examples)

NOTE: for the optional debug version: use libxthread_g.la only if compiling with -DDEBUG_THREADS

NOTE: be careful - where to include xthread.h (better at the end)
as it includes the autogenerated public config: xthread_config.h

see TODO for unfinished tasks

Author: Oleksandr Motsak

.gitignore

@@ -0,0 +1,17 @@
+^\.scon
+\.[oa]$
+^config\.log$
+.*\~$
+.*--$
+autom4te.cache
+auxes
+m4/libtool\.m4
+m4/lt\~obsolete\.m4
+m4/ltoptions\.m4
+m4/ltsugar\.m4
+m4/ltversion\.m4
+xthread_config.h.in
+configure
+Makefile.in
+aclocal.m4
+

.hgignore

@@ -0,0 +1,103 @@
+ACLOCAL_AMFLAGS = -I m4
+
+AM_CPPFLAGS = -I${srcdir} -I${builddir} 
+AM_CFLAGS = ${PIPE}
+AM_CXXFLAGS = -Wextra -Wall ${PIPE} $(CXXTEMPLFLAGS)
+
+if WANT_DEBUG
+  LIB_G=libxthread_g.la
+else
+  LIB_G=
+endif
+
+libxthread_LTLIBRARIES = libxthread.la ${LIB_G}
+libxthreaddir = $(libdir)
+
+CXXTEMPLFLAGS = 
+### --no-exceptions ## -fno-implicit-templates
+
+libxthread_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
+libxthread_g_la_CFLAGS = ${PIPE}
+
+libxthread_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
+## --no-rtti 
+libxthread_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic ${PIPE} ${CXXTEMPLFLAGS}
+libxthread_g_la_LDFLAGS = -g -Wextra -Wall -pedantic
+# -fdiagnostics-show-option 
+
+libxthread_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DDEBUG_THREADS
+
+SOURCES  = xthread.cc
+libxthread_la_SOURCES   = $(SOURCES)
+libxthread_g_la_SOURCES = $(SOURCES)
+
+# $(RT_LIBS) # librt is for the POSIX realtime extensions. I think it's only needed on Solaris.
+libxthread_la_LIBADD = $(PTHREAD_LIBS)
+libxthread_g_la_LIBADD = $(PTHREAD_LIBS)
+
+# where should the header go?
+libxthread_includedir  =$(includedir)/xthread/
+
+libxthread_include_HEADERS = xthread.h tlsize.inc
+nodist_libxthread_include_HEADERS = xthread_config.h
+
+if WANT_DEBUG
+TESTS = example-s-g example-s-r example-d-g example-d-r example2-s-g example2-s-r example2-d-g example2-d-r 
+else
+TESTS = example-s-r example-d-r example2-s-r example2-d-r 
+endif
+check_PROGRAMS = $(TESTS)
+
+
+
+examplesources = example.cc
+example_s_r_SOURCES = $(examplesources)
+example_s_g_SOURCES = $(examplesources)
+example_d_r_SOURCES = $(examplesources)
+example_d_g_SOURCES = $(examplesources)
+
+example_s_r_CFLAGS = -O3 -fomit-frame-pointer ${AM_CFLAGS}
+example_d_r_CFLAGS = -O3 -fomit-frame-pointer ${AM_CFLAGS}
+
+example_s_r_LDFLAGS = -static ${AM_LDFLAGS}
+example_s_g_LDFLAGS = -static ${AM_LDFLAGS}
+
+example_s_r_CXXFLAGS = -O3 -fomit-frame-pointer ${AM_CXXFLAGS}
+example_s_g_CXXFLAGS = -g -pedantic ${AM_CXXFLAGS}
+example_d_r_CXXFLAGS = -O3 -fomit-frame-pointer ${AM_CXXFLAGS}
+example_d_g_CXXFLAGS = -g -pedantic ${AM_CXXFLAGS}
+
+example_s_r_LDADD = libxthread.la
+example_s_g_LDADD = libxthread_g.la
+example_d_r_LDADD = libxthread.la
+example_d_g_LDADD = libxthread_g.la
+
+example_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DDEBUG_THREADS
+example_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DDEBUG_THREADS
+
+example2sources = example2.cc
+example2_s_r_SOURCES = $(example2sources)
+example2_s_g_SOURCES = $(example2sources)
+example2_d_r_SOURCES = $(example2sources)
+example2_d_g_SOURCES = $(example2sources)
+
+example2_s_r_CFLAGS = -O3 -fomit-frame-pointer ${AM_CFLAGS}
+example2_d_r_CFLAGS = -O3 -fomit-frame-pointer ${AM_CFLAGS}
+
+example2_s_r_LDFLAGS = -static ${AM_LDFLAGS}
+example2_s_g_LDFLAGS = -static ${AM_LDFLAGS}
+
+example2_s_r_CXXFLAGS = -O3 -fomit-frame-pointer ${AM_CXXFLAGS}
+example2_s_g_CXXFLAGS = -g -pedantic ${AM_CXXFLAGS}
+example2_d_r_CXXFLAGS = -O3 -fomit-frame-pointer ${AM_CXXFLAGS}
+example2_d_g_CXXFLAGS = -g -pedantic ${AM_CXXFLAGS}
+
+example2_s_r_LDADD = libxthread.la
+example2_s_g_LDADD = libxthread_g.la
+example2_d_r_LDADD = libxthread.la
+example2_d_g_LDADD = libxthread_g.la
+
+example2_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DDEBUG_THREADS
+example2_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DDEBUG_THREADS
+
+

Makefile.am

@@ -1,5 +1,5 @@
 libs = [ "xthread" ]
-cflags = "-g -O2"
+cflags = "-g -O0"
 linkflags = "-g"
 
 Threads=DefaultEnvironment()
@@ -11,11 +11,11 @@ Threads.Append(LINKFLAGS=linkflags)
 conf = Configure(Threads)
 if conf.CheckLib("pthread"):
   libs.append("pthread")
-if conf.CheckLib("rt"):
-  libs.append("rt")
+# if conf.CheckLib("rt"):
+#   libs.append("rt")
 
 Threads.Append(LIBS=libs)
 
-Threads.Library(["xthread"], ["thread.cc"])
+Threads.Library(["xthread"], ["xthread.cc"])
 Program("example.cc")
 Program("example2.cc")

SConstruct

@@ -0,0 +1,17 @@
+TODOS:
+
+. fail if necessary stuff was not found
+
+. check for __builtin_frame_address, alloca
+
+
+FIX:
+
+AX_CHECK_FUNC_IN produces wrong configure output
+
+. check for __builtin_frame_address, alloca
+
+
+OPTIMIZATIONS: 
+
+make use of posix_memalign if available 

TODO

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+autoreconf -vif `dirname "$0"`
+
+# TOP_DIR=$PWD
+# 
+# autotools ()
+# {
+#   aclocal -I $TOP_DIR/m4
+#   autoheader
+#   autoconf
+#   automake -a
+# }
+# 
+# 
+# for d in . factory libpolys; do
+#   echo "==============="
+#   echo "run libtoolize --force, aclocal -I $TOP_DIR/m4, autoconf, automake -a in $d"
+#   echo "---------------"
+#   cd $d
+#   libtoolize --force
+#   autotools
+#   cd $TOP_DIR
+#   echo
+# done
+# 
+# for d in omalloc; do
+#   echo "==============="
+#   echo "run aclocal -I $TOP_DIR/m4, autotools in $d"
+#   echo "---------------"
+#   cd $d
+#   autotools
+#   cd $TOP_DIR
+#   echo
+# done

autogen.sh

@@ -0,0 +1,128 @@
+AC_INIT([xthread], [0.1])
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([auxes])
+AC_CONFIG_SRCDIR([xthread.h])
+AC_CONFIG_HEADER([xthread_config.h])
+
+AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
+
+dnl Check if build env is sane
+AM_SANITY_CHECK
+
+#
+# - Check for CC and CXX but be careful about CFLAGS.
+#
+test "${CFLAGS+set}" = set || cflags_expl_set=no
+AC_PROG_CC
+test "${CXXFLAGS+set}" = set || cxxflags_expl_set=no
+AC_PROG_CXX
+if test "x$GCC" != xyes && test "x$GXX" != xyes; then
+  AC_MSG_WARN(you better use gcc to compile Factory)
+else
+  if test "x$GXX" = xyes && test "x$cxxflags_expl_set" = xno; then
+    AC_MSG_WARN([we use \`' as default for \`CXXFLAGS'
+                    (instead of the configure default \`-g -O')])
+  fi
+  if test "x$GCC" = xyes && test "x$cflags_expl_set" = xno; then
+    AC_MSG_WARN([we use \`' as default for \`CFLAGS'
+                    (instead of the configure default \`-g -O')])
+  fi
+fi
+
+AM_PROG_CC_C_O
+# AM_PROG_AR
+
+AC_PROG_LN_S
+AC_PROG_INSTALL
+
+AC_FUNC_MALLOC
+AC_HEADER_STDC
+AC_CHECK_HEADERS([stdlib.h string.h unistd.h sys/mman.h])
+
+AC_CHECK_FUNCS(posix_memalign mmap mprotect alloca)
+# __builtin_frame_address
+
+#AX_CHECK_FUNC_IN(alloca.h, alloca, [], [AC_MSG_ERROR([Sorry but alloca is necessary!])])
+#AX_CHECK_FUNC_IN(sys/mman.h, mmap, [], [AC_MSG_ERROR([Sorry but mmap is necessary!])])
+#AX_CHECK_FUNC_IN(sys/mman.h, mprotect, [], [AC_MSG_ERROR([Sorry but mprotect is necessary!])])
+#AX_CHECK_FUNC_IN(stdlib.h, posix_memalign, [], [])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+#AC_HEADER_STDBOOL
+#AC_TYPE_SIZE_T
+
+# Turn off shared libraries during beta-testing, since they
+# make the build process take too long.
+LT_INIT
+# ([shared])
+# LT_INIT(dlopen disable-static) # doesn't work on PowerPC!
+
+
+SING_CHECK_PIPE
+
+AX_CHECK_ATOMIC_OPS
+
+AX_GCC_ALWAYS_INLINE
+
+# ?????
+# AC_CHECK_LIB(rt, aio_error, RT_LIBS=-lrt, RT_LIBS=)
+# AC_SUBST(RT_LIBS)
+
+# In fact, a lot of the code in this directory depends on pthreads
+AX_PTHREAD([], [AC_MSG_ERROR([Sorry but pthread is necessary!])])
+
+LIBS="$PTHREAD_LIBS $LIBS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+CC="$PTHREAD_CC"
+
+AC_CHECK_LIB(pthread, pthread_attr_setstack,[], [AC_MSG_ERROR([Sorry but pthread_attr_setstack from pthread is necessary!])])
+
+AX__THREAD
+
+
+AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [build the debugging version of the libraries]),
+ [if test "x$enableval"  = "xyes"; then
+   ENABLE_DEBUG=yes
+ fi], ENABLE_DEBUG=no)
+
+AM_CONDITIONAL(WANT_DEBUG, test x"${ENABLE_DEBUG}" == xyes)
+
+#if test x"${ENABLE_DEBUG}" == xyes; then
+#  AC_DEFINE([DEBUG_THREADS],[1],[Enable Thread Debugging checks])
+#fi
+
+# CFLAGS
+if test "x$GCC" = xyes && test "x$cflags_expl_set" = xno; then
+  CFLAGS=""
+fi
+  
+# CXXFLAGS
+if test "x$GXX" = xyes && test "x$cxxflags_expl_set" = xno; then
+  CXXFLAGS=""
+fi
+
+# Add pre'prefixed config
+AX_PREFIX_CONFIG_H([xthread_config.h],[],[xthread_config.h])
+
+AH_VERBATIM([PTHREADS_CRASHES_IF_RUN_TOO_EARLY],
+	    [/* Mark the systems where we know it's bad if pthreads runs too
+   early before main (before threads are initialized, presumably).  */
+#ifdef __FreeBSD__
+#define PTHREADS_CRASHES_IF_RUN_TOO_EARLY 1
+#endif])
+
+
+AH_BOTTOM([/* This can be used instead of 'inline' key-word wherever it is time-critical */
+#ifdef GCC_ALWAYS_INLINE
+#define FORCE_INLINE GCC_ALWAYS_INLINE
+#else
+#define FORCE_INLINE inline
+#endif
+])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT

configure.ac

@@ -1,6 +1,6 @@
 #include "cstddef"
 #include "iostream"
-#include "thread.h"
+#include "xthread.h"
 
 struct ThreadLocalData {
   volatile unsigned long counter;
@@ -11,7 +11,7 @@ struct ThreadInfo {
   unsigned long result;
 };
 
-#include "tlsize.cc"
+#include "tlsize.inc"
 
 #define TL (Thread::currentMemory())
 #define TI (Thread::current()->info())
@@ -27,8 +27,12 @@ class ThreadBody : public ThreadAction {
   }
 };
 
+#include <iostream>
+
 int main() {
   Thread *t1, *t2;
+  try 
+  {
   ThreadBody body;
   ThreadInitMainStack(); // Initialize main thread's thread-local memory.
                          // This has to be done in the main function;
@@ -38,10 +42,15 @@ int main() {
 			 // calls it.
   t1 = new Thread(); // Create two new threads
   t2 = new Thread(); // Creating threads does not start them
-  t1->info().arg =
-  t2->info().arg = 100000000; // Pass arguments to both
+  t1->info().arg = t2->info().arg = 100000000; // Pass arguments to both
   t1->run(body); t2->run(body); // Actually run them
   t1->wait();    t2->wait(); // Wait for both to complete
   std::cout << "Result: " << t1->info().result + t2->info().result << "\n";
   delete t1; delete t2; // reclaim thread memory
+  }
+  catch( const std::exception & ex ) 
+  {
+    std::cerr << "There was an exception: " << ex.what() << std::endl;
+    throw;
+  }
 }