Merge branch 'develop' of https://github.com/HerbertKoelman/cpp-pthread into develop

Author: HerbertKoelman

.gitignore

@@ -17,6 +17,7 @@
 *.mod
 
 # Compiled Static libraries
+*.dSYM
 *.lai
 *.la
 *.a
@@ -26,6 +27,8 @@
 *.exe
 *.out
 *.app
+without-cpp11-pthread-tests
+with-cpp11-pthread-tests
 
 # Xcode
 #cpp-pthread.xcodeproj/

Makefile.in

@@ -17,13 +17,12 @@ PTHREADLIB=libcpp-pthread.a
 all: 
 	cd src && $(MAKE) clean all
 
-dist: 
-	cd src && $(MAKE) dist
-	tar cf - bin udataobj locale doc | gzip -c > distrib/$(PACKAGE)
+pkg: 
+	tar cf - ./  | gzip -c > distrib/$(PACKAGE)
 
 globber:clean
-	$(RM) -R Makefile autom4te.cache config.log config.status configure
-	cd src && $(MAKE) globber
+	-$(RM) -R Makefile autom4te.cache config.log config.status 
+	-(cd src && $(MAKE) globber)
 
 clean:
 	cd src && $(MAKE) clean

README.md

@@ -16,16 +16,25 @@ Install moves files into your system's default localtion of headers and librarie
 configure --prefix=/usr/local
 ```
 
-[Documentation](http://herbertkoelman.github.io/cpp-pthread/doc/html/) can be generated with this command:
+[Doxygen documentation](http://herbertkoelman.github.io/cpp-pthread/doc/html/) can be generated with this command:
 ```
 make doxygen
 ...
 ```
 
+The target `pkg` will produce au tar.gz.
+
 This command creates a `doc` directory wich will contain the generated documentation.
 
 > **warning** generating documentation requires that doxygen is installed.
 
+The confugre file is not versionned, therefore it is required to run `autoconf` to generate one
+```
+autoconf
+( cd src && autoconf )
+( cd tests && autoconf )
+```
+
 ### How to use it
 
 Once compiled and installed in a location that suites you, use your compiler options to reference the headers and the libraries directory. In almoast all casses you can:

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.69)
-AC_INIT([cpp-pthread],[1.0.0],[[email protected]],[http://mut-mut-scmv1.dev.parimutuel.local/applications/cpp-pthread])
+AC_INIT([cpp-pthread],[m4_esyscmd_s(echo $(git describe --always))],[[email protected]],[])
 AC_LANG(C++)
 
 AC_CONFIG_AUX_DIR([/usr/bin . bin])

cpp-pthread.xcodeproj/project.pbxproj

@@ -14,6 +14,7 @@
 		E54543411CAD23690051A313 /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5EC5B7B1C9C2C6B00E21131 /* mutex.cpp */; };
 		E54543421CAD23690051A313 /* lock_guard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E519A0E41C9C4B4F00ED113D /* lock_guard.cpp */; };
 		E54543431CAD23690051A313 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E519A0FF1C9C7CAB00ED113D /* thread.cpp */; };
+		E580F99C1CB3174F00A7CE3A /* pthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E580F99B1CB3174F00A7CE3A /* pthread.cpp */; };
 		E5BF2B651CB13C8100B158E3 /* without-cpp11-pthread-tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5BF2B631CB13C7700B158E3 /* without-cpp11-pthread-tests.cpp */; };
 		E5BF2B661CB13C8900B158E3 /* libcpp-pthread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5EC5B711C9C2C3000E21131 /* libcpp-pthread.a */; };
 		E5C4D71D1C9DC8C700D0E18C /* pthread in Headers */ = {isa = PBXBuildFile; fileRef = E5EC5B811C9C2C8B00E21131 /* pthread */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -63,6 +64,7 @@
 		E519A0E41C9C4B4F00ED113D /* lock_guard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lock_guard.cpp; path = src/lock_guard.cpp; sourceTree = "<group>"; };
 		E519A0FF1C9C7CAB00ED113D /* thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = thread.cpp; path = src/thread.cpp; sourceTree = "<group>"; };
 		E54543351CAD21A30051A313 /* cpp11-pthread-tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "cpp11-pthread-tests"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E580F99B1CB3174F00A7CE3A /* pthread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pthread.cpp; path = src/pthread.cpp; sourceTree = "<group>"; };
 		E5BF2B5A1CB13C3D00B158E3 /* without-cpp11-pthread-tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "without-cpp11-pthread-tests"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E5BF2B631CB13C7700B158E3 /* without-cpp11-pthread-tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "without-cpp11-pthread-tests.cpp"; sourceTree = "<group>"; };
 		E5EC5B711C9C2C3000E21131 /* libcpp-pthread.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcpp-pthread.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -130,6 +132,7 @@
 		E5EC5B801C9C2C7100E21131 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				E580F99B1CB3174F00A7CE3A /* pthread.cpp */,
 				E5EC5B791C9C2C6B00E21131 /* condition_variable.cpp */,
 				E5EC5B7B1C9C2C6B00E21131 /* mutex.cpp */,
 				E519A0E41C9C4B4F00ED113D /* lock_guard.cpp */,
@@ -278,6 +281,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				E519A0E51C9C4B4F00ED113D /* lock_guard.cpp in Sources */,
+				E580F99C1CB3174F00A7CE3A /* pthread.cpp in Sources */,
 				E5EC5B7D1C9C2C6B00E21131 /* condition_variable.cpp in Sources */,
 				E5EC5B7F1C9C2C6B00E21131 /* mutex.cpp in Sources */,
 				E519A1011C9C7CAB00ED113D /* thread.cpp in Sources */,
@@ -464,6 +468,7 @@
 				E5BF2B601CB13C3D00B158E3 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		E5EC5B6C1C9C2C3000E21131 /* Build configuration list for PBXProject "cpp-pthread" */ = {
 			isa = XCConfigurationList;

include/pthread/pthread.hpp

@@ -31,5 +31,7 @@
 */
 namespace pthread {
 
+  extern "C" const char *cpp_pthread_version();
+  
 }
 #endif /* pthread_pthread_hpp */

include/pthread/thread.hpp

@@ -223,8 +223,14 @@ namespace pthread {
   public:
     virtual ~abstract_thread();
 
+    /** start running the `run()` method in a new thread.
+     */
     void start();
 
+    /** joins this thread.
+     *
+     * an exception is thrown if deadlock condition are detected.
+     */
     int join() { return _thread->join() ;};
 
   private:

src/Makefile.in

@@ -44,11 +44,8 @@ libcpp-pthread.a: $(OBJECTS)
 	${AR} ${LIBDIR}/$@ $(OBJECTS)
 	$(RANLIB) ${LIBDIR}/$@
 
-dist:
-	$(MV) $(TARGETS) $(BINDIR)
-    
 globber: clean
-	$(RM) -R Makefile autom4te.cache config.log config.status configure
+	-$(RM) -R Makefile autom4te.cache config.log config.status 
 
 clean:
 	${RM} *.o core *.a

src/configure.ac

@@ -2,15 +2,15 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.69)
-AC_INIT([cpp-pthread],[1.0.0],[herbert.koelman@pmu.fr])
+AC_INIT([cpp-pthread],[m4_esyscmd_s(echo $(git describe --always --abbrev=0))],[herbert.koelman@me.com],[],[http://herbertkoelman.github.io/cpp-pthread/])
 AC_LANG(C++)
 AC_CONFIG_SRCDIR([thread.cpp])
 AC_CONFIG_AUX_DIR([/usr/bin ../ ../bin])
 AC_CONFIG_HEADERS([../include/pthread/config.h])
-AC_DEFINE_UNQUOTED(CPP_THREAD_VERSION, ["version: $PACKAGE_VERSION - branch: <branch> - compiled on `uname -sv`."], [pthread C++ wrapper.])
+AC_DEFINE_UNQUOTED(CPP_PTHREAD_VERSION, ["$PACKAGE_NAME $PACKAGE_VERSION - $(git log --pretty='%H' | head -1) - compiled on `uname -sv`."], [pthread C++ wrapper.])
 
 # Checks for programs.
-AC_PROG_CXX([xlC_r xlC gcc cl KCC CC cxx cc++ aCC c++ g++])
+AC_PROG_CXX([xlC_r xlC g++ c++ gcc cl KCC CC cxx cc++ aCC ])
 AC_PROG_CC([xlc xlc_r gcc cl cc])
 AC_CHECK_PROG([AR],[ar],[ar -rv])
 AC_CHECK_PROG([MV],[mv],[mv],[echo "no mv command found"])

src/pthread.cpp

@@ -12,14 +12,16 @@
 #include "pthread/pthread.hpp"
 #include "pthread/config.h"
 
+
 namespace pthread {
 
-  extern "C" const char *cpp_pthread_version(){
+extern "C" const char *cpp_pthread_version(){
 #ifndef CPP_PTHREAD_VERSION
-    return "missing CPP_PTHREAD_VERSION define. Re-run configure" ;
+  return "missing CPP_PTHREAD_VERSION define. Re-run configure" ;
 #else
-    return CPP_PTHREAD_VERSION ;
+  return CPP_PTHREAD_VERSION ;
 #endif
-  }
+}
+
 }
 #endif /* pthread_pthread_hpp */