Changeset 391 for python/trunk/Python/thread_cthread.h

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Python/thread_cthread.h (modified) (8 diffs)

python/trunk/Python/thread_cthread.h

@@ -15 +15 @@
 {
 #ifndef HURD_C_THREADS
-        /* Roland McGrath said this should not be used since this is
-        done while linking to threads */
-        cthread_init(); 
+    /* Roland McGrath said this should not be used since this is
+    done while linking to threads */
+    cthread_init();
 #else
 /* do nothing */
-        ;
+    ;
 #endif
 }
@@ -30 +30 @@
 PyThread_start_new_thread(void (*func)(void *), void *arg)
 {
-        int success = 0;        /* init not needed when SOLARIS_THREADS and */
-                                /* C_THREADS implemented properly */
+    int success = 0;            /* init not needed when SOLARIS_THREADS and */
+                /* C_THREADS implemented properly */
 
-        dprintf(("PyThread_start_new_thread called\n"));
-        if (!initialized)
-                PyThread_init_thread();
-        /* looks like solaris detaches the thread to never rejoin
-         * so well do it here
-         */
-        cthread_detach(cthread_fork((cthread_fn_t) func, arg));
-        return success < 0 ? -1 : 0;
+    dprintf(("PyThread_start_new_thread called\n"));
+    if (!initialized)
+        PyThread_init_thread();
+    /* looks like solaris detaches the thread to never rejoin
+     * so well do it here
+     */
+    cthread_detach(cthread_fork((cthread_fn_t) func, arg));
+    return success < 0 ? -1 : 0;
 }
 
@@ -46 +46 @@
 PyThread_get_thread_ident(void)
 {
-        if (!initialized)
-                PyThread_init_thread();
-        return (long) cthread_self();
-}
-
-static void
-do_PyThread_exit_thread(int no_cleanup)
-{
-        dprintf(("PyThread_exit_thread called\n"));
-        if (!initialized)
-                if (no_cleanup)
-                        _exit(0);
-                else
-                        exit(0);
-        cthread_exit(0);
+    if (!initialized)
+        PyThread_init_thread();
+    return (long) cthread_self();
 }
 
@@ -66 +54 @@
 PyThread_exit_thread(void)
 {
-        do_PyThread_exit_thread(0);
+    dprintf(("PyThread_exit_thread called\n"));
+    if (!initialized)
+        exit(0);
+    cthread_exit(0);
 }
-
-void
-PyThread__exit_thread(void)
-{
-        do_PyThread_exit_thread(1);
-}
-
-#ifndef NO_EXIT_PROG
-static
-void do_PyThread_exit_prog(int status, int no_cleanup)
-{
-        dprintf(("PyThread_exit_prog(%d) called\n", status));
-        if (!initialized)
-                if (no_cleanup)
-                        _exit(status);
-                else
-                        exit(status);
-        if (no_cleanup)
-                _exit(status);
-        else
-                exit(status);
-}
-
-void
-PyThread_exit_prog(int status)
-{
-        do_PyThread_exit_prog(status, 0);
-}
-
-void
-PyThread__exit_prog(int status)
-{
-        do_PyThread_exit_prog(status, 1);
-}
-#endif /* NO_EXIT_PROG */
 
 /*
@@ -110 +66 @@
 PyThread_allocate_lock(void)
 {
-        mutex_t lock;
+    mutex_t lock;
 
-        dprintf(("PyThread_allocate_lock called\n"));
-        if (!initialized)
-                PyThread_init_thread();
+    dprintf(("PyThread_allocate_lock called\n"));
+    if (!initialized)
+        PyThread_init_thread();
 
-        lock = mutex_alloc();
-        if (mutex_init(lock)) {
-                perror("mutex_init");
-                free((void *) lock);
-                lock = 0;
-        }
-        dprintf(("PyThread_allocate_lock() -> %p\n", lock));
-        return (PyThread_type_lock) lock;
+    lock = mutex_alloc();
+    if (mutex_init(lock)) {
+        perror("mutex_init");
+        free((void *) lock);
+        lock = 0;
+    }
+    dprintf(("PyThread_allocate_lock() -> %p\n", lock));
+    return (PyThread_type_lock) lock;
 }
 
@@ -129 +85 @@
 PyThread_free_lock(PyThread_type_lock lock)
 {
-        dprintf(("PyThread_free_lock(%p) called\n", lock));
-        mutex_free(lock);
+    dprintf(("PyThread_free_lock(%p) called\n", lock));
+    mutex_free(lock);
 }
 
@@ -136 +92 @@
 PyThread_acquire_lock(PyThread_type_lock lock, int waitflag)
 {
-        int success = FALSE;
+    int success = FALSE;
 
-        dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock, waitflag));
-        if (waitflag) {         /* blocking */
-                mutex_lock((mutex_t)lock);
-                success = TRUE;
-        } else {                /* non blocking */
-                success = mutex_try_lock((mutex_t)lock);
-        }
-        dprintf(("PyThread_acquire_lock(%p, %d) -> %d\n", lock, waitflag, success));
-        return success;
+    dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock, waitflag));
+    if (waitflag) {             /* blocking */
+        mutex_lock((mutex_t)lock);
+        success = TRUE;
+    } else {                    /* non blocking */
+        success = mutex_try_lock((mutex_t)lock);
+    }
+    dprintf(("PyThread_acquire_lock(%p, %d) -> %d\n", lock, waitflag, success));
+    return success;
 }
 
@@ -152 +108 @@
 PyThread_release_lock(PyThread_type_lock lock)
 {
-        dprintf(("PyThread_release_lock(%p) called\n", lock));
-        mutex_unlock((mutex_t )lock);
+    dprintf(("PyThread_release_lock(%p) called\n", lock));
+    mutex_unlock((mutex_t )lock);
 }