Changeset f53afafb for libcfa/src/concurrency/kernel

Timestamp:

Feb 22, 2022, 2:45:47 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

3a038fa

Parents:

5cefa43 (diff), a182ad5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (2 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -18 +18 @@
 
 // C Includes
-#include <errno.h>                                                                              // errno
+#include <errno.h>                                      // errno
 #include <signal.h>
-#include <string.h>                                                                             // strerror
-#include <unistd.h>                                                                             // sysconf
+#include <string.h>                                     // strerror
+#include <unistd.h>                                     // sysconf
 
 extern "C" {
-        #include <limits.h>                                                                     // PTHREAD_STACK_MIN
-        #include <unistd.h>                                                                     // syscall
-        #include <sys/eventfd.h>                                                        // eventfd
-        #include <sys/mman.h>                                                           // mprotect
-        #include <sys/resource.h>                                                       // getrlimit
+        #include <limits.h>                             // PTHREAD_STACK_MIN
+        #include <unistd.h>                             // syscall
+        #include <sys/eventfd.h>                        // eventfd
+        #include <sys/mman.h>                           // mprotect
+        #include <sys/resource.h>                       // getrlimit
 }
 
 // CFA Includes
 #include "kernel_private.hfa"
-#include "startup.hfa"                                                                  // STARTUP_PRIORITY_XXX
+#include "startup.hfa"                                  // STARTUP_PRIORITY_XXX
 #include "limits.hfa"
 #include "math.hfa"
@@ -736 +736 @@
         check( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
 
-        size_t stacksize = DEFAULT_STACK_SIZE;
+        size_t stacksize = max( PTHREAD_STACK_MIN, DEFAULT_STACK_SIZE );
 
         void * stack;