Changeset 9998 for release

Timestamp:

Jul 10, 2008, 3:29:37 AM (16 years ago)

Author:

Gary Byers

Message:

Propagate r9997 to 1.2 branch. Someone else gets the honor of
committing the last 4-digit revision.

File:

• release/1.2/source/lisp-kernel/thread_manager.c (modified) (9 diffs)

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

@@ -61 +61 @@
 raise_thread_interrupt(TCR *target)
 {
+  pthread_t thread = (pthread_t)target->osid;
 #ifdef DARWIN_not_yet
   if (use_mach_exception_handling) {
@@ -66 +67 @@
   }
 #endif
- return pthread_kill((pthread_t)target->osid, SIGNAL_FOR_PROCESS_INTERRUPT);
+  if (thread != (pthread_t) 0) {
+    return pthread_kill(thread, SIGNAL_FOR_PROCESS_INTERRUPT);
+  }
+  return ESRCH;
 }
 #endif
@@ -180 +184 @@
 lock_recursive_lock(RECURSIVE_LOCK m, TCR *tcr)
 {
-  natural val;
   if (tcr == NULL) {
     tcr = get_tcr(true);
@@ -232 +235 @@
 unlock_recursive_lock(RECURSIVE_LOCK m, TCR *tcr)
 {
-  int ret = EPERM, pending;
+  int ret = EPERM;
 
    if (tcr == NULL) {
@@ -1108 +1111 @@
 {
   thread_activation activation;
-  TCR *current = get_tcr(false);
 
 
@@ -1279 +1281 @@
 {
   int suspend_count = atomic_incf(&(tcr->suspend_count));
+  pthread_t thread;
   if (suspend_count == 1) {
 #if SUSPEND_RESUME_VERBOSE
@@ -1289 +1292 @@
     }
 #endif
-    if (pthread_kill((pthread_t)(tcr->osid), thread_suspend_signal) == 0) {
+    thread = (pthread_t)(tcr->osid);
+    if ((thread != (pthread_t) 0) &&
+        (pthread_kill(thread, thread_suspend_signal) == 0)) {
       SET_TCR_FLAG(tcr,TCR_FLAG_BIT_SUSPEND_ACK_PENDING);
     } else {
@@ -1357 +1362 @@
 resume_tcr(TCR *tcr)
 {
-  int suspend_count = atomic_decf(&(tcr->suspend_count)), err;
+  int suspend_count = atomic_decf(&(tcr->suspend_count));
   if (suspend_count == 0) {
 #ifdef DARWIN
@@ -1574 +1579 @@
 
   void *p = calloc(1,sizeof(rwlock)+cache_block_size-1);
-  rwlock *rw;
+  rwlock *rw = NULL;;
   
   if (p) {