Changeset 9852 for release/1.2/source

Timestamp:

Jun 30, 2008, 3:08:20 PM (11 years ago)

Author:

gb

Message:

From trunk: treat stack sizes as "natural" integers.

Location:

release/1.2/source/lisp-kernel

Files:

• Threads.h (modified) (1 diff)
• pmcl-kernel.c (modified) (6 diffs)
• thread_manager.c (modified) (5 diffs)

release/1.2/source/lisp-kernel/Threads.h

@@ -216 +216 @@
 extern int thread_suspend_signal, thread_resume_signal;
 
+void *
+allocate_stack(natural);
+
 void
 suspend_resume_handler(int, siginfo_t *, ExceptionInformation *);

release/1.2/source/lisp-kernel/pmcl-kernel.c

@@ -188 +188 @@
 
 BytePtr
-allocate_lisp_stack(unsigned useable,
+allocate_lisp_stack(natural useable,
                     unsigned softsize,
                     unsigned hardsize,
@@ -198 +198 @@
                     protected_area_ptr *hardp)
 {
-  void *allocate_stack(unsigned);
+  void *allocate_stack(natural);
   void free_stack(void *);
   natural size = useable+softsize+hardsize;
@@ -248 +248 @@
 area *
 allocate_lisp_stack_area(area_code stack_type,
-                         unsigned useable, 
+                         natural usable,
                          unsigned softsize, 
                          unsigned hardsize, 
@@ -260 +260 @@
   protected_area_ptr soft_area=NULL, hard_area=NULL;
 
-  bottom = allocate_lisp_stack(useable, 
+  bottom = allocate_lisp_stack(usable, 
                                softsize, 
                                hardsize, 
@@ -301 +301 @@
 
 area*
-allocate_vstack_holding_area_lock(unsigned usable)
+allocate_vstack_holding_area_lock(natural usable)
 {
   return allocate_lisp_stack_area(AREA_VSTACK, 
@@ -313 +313 @@
 
 area *
-allocate_tstack_holding_area_lock(unsigned usable)
+allocate_tstack_holding_area_lock(natural usable)
 {
   return allocate_lisp_stack_area(AREA_TSTACK, 

release/1.2/source/lisp-kernel/thread_manager.c

@@ -734 +734 @@
 {
   extern area
-    *allocate_vstack_holding_area_lock(unsigned),
-    *allocate_tstack_holding_area_lock(unsigned);
+    *allocate_vstack_holding_area_lock(natural),
+    *allocate_tstack_holding_area_lock(natural);
   area *a;
   int i;
@@ -972 +972 @@
 #else
 Ptr
-create_stack(int size)
+create_stack(natural size)
 {
   Ptr p;
   size=align_to_power_of_2(size, log2_page_size);
   p = (Ptr) mmap(NULL,
-                     (size_t)size,
-                     PROT_READ | PROT_WRITE | PROT_EXEC,
-                     MAP_PRIVATE | MAP_ANON | MAP_GROWSDOWN,
-                     -1,        /* Darwin insists on this when not mmap()ing
-                                 a real fd */
-                     0);
+                 (size_t)size,
+                 PROT_READ | PROT_WRITE | PROT_EXEC,
+                 MAP_PRIVATE | MAP_ANON | MAP_GROWSDOWN,
+                 -1,    /* Darwin insists on this when not mmap()ing
+                           a real fd */
+                 0);
   if (p != (Ptr)(-1)) {
     *((size_t *)p) = size;
@@ -993 +993 @@
 
 void *
-allocate_stack(unsigned size)
+allocate_stack(natural size)
 {
   return create_stack(size);
@@ -1075 +1075 @@
 {
   thread_activation *activation = (thread_activation *)param;
-  TCR *tcr = new_tcr(activation->vsize, activation->vsize);
+  TCR *tcr = new_tcr(activation->vsize, activation->tsize);
   sigset_t mask, old_mask;
 
@@ -1695 +1695 @@
     LOCK_SPINLOCK(rw->spin,tcr);
     rw->blocked_writers--;
-    if (err = EINTR) {
+    if (err == EINTR) {
       err = 0;
     }