Changeset 391 for python/trunk/Python/thread_foobar.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_foobar.h (modified) (7 diffs)

python/trunk/Python/thread_foobar.h

@@ -14 +14 @@
 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();
-        return success < 0 ? -1 : 0;
+    dprintf(("PyThread_start_new_thread called\n"));
+    if (!initialized)
+        PyThread_init_thread();
+    return success < 0 ? -1 : 0;
 }
 
@@ -26 +26 @@
 PyThread_get_thread_ident(void)
 {
-        if (!initialized)
-                PyThread_init_thread();
-}
-
-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);
+    if (!initialized)
+        PyThread_init_thread();
 }
 
@@ -44 +33 @@
 PyThread_exit_thread(void)
 {
-        do_PyThread_exit_thread(0);
+    dprintf(("PyThread_exit_thread called\n"));
+    if (!initialized)
+        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);
-}
-
-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 */
 
 /*
@@ -85 +45 @@
 {
 
-        dprintf(("PyThread_allocate_lock called\n"));
-        if (!initialized)
-                PyThread_init_thread();
+    dprintf(("PyThread_allocate_lock called\n"));
+    if (!initialized)
+        PyThread_init_thread();
 
-        dprintf(("PyThread_allocate_lock() -> %p\n", lock));
-        return (PyThread_type_lock) lock;
+    dprintf(("PyThread_allocate_lock() -> %p\n", lock));
+    return (PyThread_type_lock) lock;
 }
 
@@ -96 +56 @@
 PyThread_free_lock(PyThread_type_lock lock)
 {
-        dprintf(("PyThread_free_lock(%p) called\n", lock));
+    dprintf(("PyThread_free_lock(%p) called\n", lock));
 }
 
@@ -102 +62 @@
 PyThread_acquire_lock(PyThread_type_lock lock, int waitflag)
 {
-        int success;
+    int success;
 
-        dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock, waitflag));
-        dprintf(("PyThread_acquire_lock(%p, %d) -> %d\n", lock, waitflag, success));
-        return success;
+    dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock, waitflag));
+    dprintf(("PyThread_acquire_lock(%p, %d) -> %d\n", lock, waitflag, success));
+    return success;
 }
 
@@ -112 +72 @@
 PyThread_release_lock(PyThread_type_lock lock)
 {
-        dprintf(("PyThread_release_lock(%p) called\n", lock));
+    dprintf(("PyThread_release_lock(%p) called\n", lock));
 }