Changeset 13433

Timestamp:

Feb 6, 2010, 4:28:32 AM (11 years ago)

Author:

gb

Message:

Basically propagate r13431 to 1.4.

Location:

release/1.4/source/lisp-kernel

Files:

• Threads.h (modified) (1 diff)
• area.h (modified) (1 diff)
• memory.c (modified) (5 diffs)
• thread_manager.c (modified) (6 diffs)
• x86-exceptions.c (modified) (2 diffs)
• x86-gc.c (modified) (1 diff)

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

@@ -183 +183 @@
 
 
-LispObj create_system_thread(size_t stack_size, 
+Boolean create_system_thread(size_t stack_size, 
                              void* stackaddr,
 #ifdef WINDOWS

release/1.4/source/lisp-kernel/area.h

@@ -123 +123 @@
 #define MIN_VSTACK_SIZE (1<<16)
 #define VSTACK_HARDPROT (1<<12)
+#ifdef PPC
 #define VSTACK_SOFTPROT (1<<16)
+#else
+#define VSTACK_SOFTPROT CSTACK_SOFTPROT
+#endif
 #define MIN_TSTACK_SIZE (1<<18)
 #define TSTACK_HARDPROT 0

release/1.4/source/lisp-kernel/memory.c

@@ -313 +313 @@
 }
 
+
+/* Cause the mapped memory region at ADDR to become completely unmapped.
+   ADDR should be an address returned by MapMemoryForStack() or MapMemory(),
+   and NBYTES should be the size of the mapped region at that address. */
 int
 UnMapMemory(LogicalAddress addr, natural nbytes)
@@ -320 +324 @@
 #endif
 #ifdef WINDOWS
-  /* Can't MEM_RELEASE here because we only want to free a chunk */
-  return VirtualFree(addr, nbytes, MEM_DECOMMIT);
+  return !VirtualFree(addr, 0, MEM_RELEASE);
 #else
   return munmap(addr, nbytes);
@@ -457 +460 @@
 }
 
-/*
-  Un-protect the first nbytes bytes in specified area.
-  Note that this may cause the area to be empty.
-*/
-void
-unprotect_area_prefix(protected_area_ptr area, size_t delta)
-{
-  unprotect_area(area);
-  area->start += delta;
-  if ((area->start + area->protsize) <= area->end) {
-    protect_area(area);
-  }
-}
-
-
-/*
-  Extend the protected area, causing the preceding nbytes bytes
-  to be included and protected.
-*/
-void
-protect_area_prefix(protected_area_ptr area, size_t delta)
-{
-  unprotect_area(area);
-  area->start -= delta;
-  protect_area(area);
-}
+
+
 
 protected_area_ptr
@@ -556 +535 @@
   if (n && ! p->nprot) {
     ProtectMemory(start, n);
+#ifdef WINDOWS
+    VirtualAlloc(start+n-page_size,page_size,MEM_COMMIT,PAGE_READWRITE|PAGE_GUARD);
+#endif
     p->nprot = n;
   }
@@ -949 +931 @@
 {
   area *a = readonly_area;
-  UnMapMemory(a->low,align_to_power_of_2(a->active-a->low, log2_page_size));
+  UnCommitMemory(a->low,align_to_power_of_2(a->active-a->low, log2_page_size));
   a->active = a->low;
   a->ndnodes = 0;

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

@@ -1426 +1426 @@
     free(tcr->tlb_pointer);
     tcr->tlb_pointer = NULL;
+#ifdef WINDOWS
+    if (tcr->osid != 0) {
+      CloseHandle((HANDLE)(tcr->osid));
+    }
+#endif
     tcr->osid = 0;
     tcr->interrupt_pending = 0;
@@ -1820 +1825 @@
 
 #ifdef WINDOWS
-LispObj
+Boolean
 create_system_thread(size_t stack_size,
                      void* stackaddr,
@@ -1827 +1832 @@
 {
   HANDLE thread_handle;
+  Boolean won = false;
 
   stack_size = ((stack_size+(((1<<16)-1)))&~((1<<16)-1));
 
   thread_handle = (HANDLE)_beginthreadex(NULL, 
-                                         0/*stack_size*/,
+                                         stack_size,
                                          start_routine,
                                          param,
@@ -1839 +1845 @@
   if (thread_handle == NULL) {
     wperror("CreateThread");
-  }
-  return (LispObj) ptr_to_lispobj(thread_handle);
-}
-#else
-LispObj
+  } else {
+    won = true;
+    CloseHandle(thread_handle);
+  }
+  return won;
+}
+#else
+Boolean
 create_system_thread(size_t stack_size,
                      void* stackaddr,
@@ -1887 +1896 @@
   UNLOCK(lisp_global(TCR_AREA_LOCK),current);
   pthread_attr_destroy(&attr);
-  return (LispObj) ptr_to_lispobj(returned_thread);
+  return (returned_thread != NULL);
 }
 #endif
@@ -2127 +2136 @@
       result = true;
 #ifdef WINDOWS
-      /* What we really want to de hear is (something like)
+      /* What we really want to do here is (something like)
          forcing the thread to run quit_handler().  For now,
-         mark the TCR as dead and kill thw Windows thread. */
+         mark the TCR as dead and kill the Windows thread. */
       tcr->osid = 0;
       if (!TerminateThread((HANDLE)osid, 0)) {
+        CloseHandle((HANDLE)osid);
         result = false;
       } else {
+        CloseHandle((HANDLE)osid);
         shutdown_thread_tcr(tcr);
       }

release/1.4/source/lisp-kernel/x86-exceptions.c

@@ -1836 +1836 @@
     return SIGILL;
   case EXCEPTION_IN_PAGE_ERROR:
+  case STATUS_GUARD_PAGE_VIOLATION:
     return SIGBUS;
   default:
@@ -3658 +3659 @@
     int err;
 
-/* can't use UnMapMemory() beacuse it only uses MEM_DECOMMIT */
-#ifdef WINDOWS
-    err = VirtualFree(base, nbytes, MEM_RELEASE);
-#else
-    err = munmap(base, nbytes);
-#endif
+    err = UnMapMemory(base, nbytes);
     if (err != 0)
       Fatal("munmap in delete_watched_area", "");

release/1.4/source/lisp-kernel/x86-gc.c

@@ -2786 +2786 @@
       a->active += n;
       memmove(oldfree, ro_base, n);
-      UnMapMemory((void *)ro_base, n);
+      UnCommitMemory((void *)ro_base, n);
       a->ndnodes = area_dnode(a, a->active);
       pure_space_active = r->active = r->low;