Multi-line svn commit, see body.

[shibboleth/cpp-xmltooling.git] / xmltooling / util / PThreads.cpp

diff --git a/xmltooling/util/PThreads.cpp b/xmltooling/util/PThreads.cpp
index 6474ba3..a5d159c 100644 (file)
--- a/xmltooling/util/PThreads.cpp
+++ b/xmltooling/util/PThreads.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2005 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@
  */
 
 #include "internal.h"
+#include "logging.h"
 #include "util/Threads.h"
 
 #include <ctime>
 #include <signal.h>
-#include <log4cpp/Category.hh>
 
 #ifdef HAVE_PTHREAD
 # include <pthread.h>
@@ -36,8 +36,8 @@
 # error "This implementation is for POSIX platforms."
 #endif
 
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 namespace xmltooling {
@@ -45,7 +45,7 @@ namespace xmltooling {
     class XMLTOOL_DLLLOCAL ThreadImpl : public Thread {
         pthread_t thread_id;
     public:
-        ThreadImpl(void* (*start_routine)(void*), void* arg);
+        ThreadImpl(void* (*start_routine)(void*), void* arg, size_t stacksize);
         virtual ~ThreadImpl() {}
     
         int detach() {
@@ -176,9 +176,27 @@ namespace xmltooling {
 
 };
 
-ThreadImpl::ThreadImpl(void* (*start_routine)(void*), void* arg)
+ThreadImpl::ThreadImpl(void* (*start_routine)(void*), void* arg, size_t stacksize)
 {
-    int rc=pthread_create(&thread_id, NULL, start_routine, arg);
+    int rc;
+
+    if (stacksize > 0) {
+        pthread_attr_t attrs;
+        rc = pthread_attr_init(&attrs);
+        if (rc) {
+            Category::getInstance(XMLTOOLING_LOGCAT".Threads").error("pthread_attr_init error (%d)", rc);
+            throw ThreadingException("Thread creation failed.");
+        }
+        rc = pthread_attr_setstacksize(&attrs, stacksize);
+        if (rc) {
+            Category::getInstance(XMLTOOLING_LOGCAT".Threads").error("pthread_attr_setstacksize error (%d)", rc);
+            throw ThreadingException("Thread creation failed.");
+        }
+        rc = pthread_create(&thread_id, &attrs, start_routine, arg);
+    }
+    else {
+        rc = pthread_create(&thread_id, NULL, start_routine, arg);
+    }
     if (rc) {
 #ifdef HAVE_STRERROR_R
         char buf[256];
@@ -260,9 +278,9 @@ ThreadKeyImpl::ThreadKeyImpl(void (*destroy_fcn)(void*))
     }
 }
 
-Thread* Thread::create(void* (*start_routine)(void*), void* arg)
+Thread* Thread::create(void* (*start_routine)(void*), void* arg, size_t stacksize)
 {
-    return new ThreadImpl(start_routine, arg);
+    return new ThreadImpl(start_routine, arg, stacksize);
 }
 
 void Thread::exit(void* return_val)