Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed

  • python/trunk

  • python/trunk/Python/thread_lwp.h

    r2 r391  
    44#include <lwp/stackdep.h>
    55
    6 #define STACKSIZE       1000    /* stacksize for a thread */
    7 #define NSTACKS         2       /* # stacks to be put in cache initially */
     6#define STACKSIZE       1000    /* stacksize for a thread */
     7#define NSTACKS         2       /* # stacks to be put in cache initially */
    88
    99struct lock {
    10         int lock_locked;
    11         cv_t lock_condvar;
    12         mon_t lock_monitor;
     10    int lock_locked;
     11    cv_t lock_condvar;
     12    mon_t lock_monitor;
    1313};
    1414
    … …  
    1919static void PyThread__init_thread(void)
    2020{
    21         lwp_setstkcache(STACKSIZE, NSTACKS);
     21    lwp_setstkcache(STACKSIZE, NSTACKS);
    2222}
    2323
    … …  
    2929long PyThread_start_new_thread(void (*func)(void *), void *arg)
    3030{
    31         thread_t tid;
    32         int success;
    33         dprintf(("PyThread_start_new_thread called\n"));
    34         if (!initialized)
    35                 PyThread_init_thread();
    36         success = lwp_create(&tid, func, MINPRIO, 0, lwp_newstk(), 1, arg);
    37         return success < 0 ? -1 : 0;
     31    thread_t tid;
     32    int success;
     33    dprintf(("PyThread_start_new_thread called\n"));
     34    if (!initialized)
     35        PyThread_init_thread();
     36    success = lwp_create(&tid, func, MINPRIO, 0, lwp_newstk(), 1, arg);
     37    return success < 0 ? -1 : 0;
    3838}
    3939
    4040long PyThread_get_thread_ident(void)
    4141{
    42         thread_t tid;
    43         if (!initialized)
    44                 PyThread_init_thread();
    45         if (lwp_self(&tid) < 0)
    46                 return -1;
    47         return tid.thread_id;
    48 }
    49 
    50 static void do_PyThread_exit_thread(int no_cleanup)
    51 {
    52         dprintf(("PyThread_exit_thread called\n"));
    53         if (!initialized)
    54                 if (no_cleanup)
    55                         _exit(0);
    56                 else
    57                         exit(0);
    58         lwp_destroy(SELF);
     42    thread_t tid;
     43    if (!initialized)
     44        PyThread_init_thread();
     45    if (lwp_self(&tid) < 0)
     46        return -1;
     47    return tid.thread_id;
    5948}
    6049
    6150void PyThread_exit_thread(void)
    6251{
    63         do_PyThread_exit_thread(0);
     52    dprintf(("PyThread_exit_thread called\n"));
     53    if (!initialized)
     54        exit(0);
     55    lwp_destroy(SELF);
    6456}
    65 
    66 void PyThread__exit_thread(void)
    67 {
    68         do_PyThread_exit_thread(1);
    69 }
    70 
    71 #ifndef NO_EXIT_PROG
    72 static void do_PyThread_exit_prog(int status, int no_cleanup)
    73 {
    74         dprintf(("PyThread_exit_prog(%d) called\n", status));
    75         if (!initialized)
    76                 if (no_cleanup)
    77                         _exit(status);
    78                 else
    79                         exit(status);
    80         pod_exit(status);
    81 }
    82 
    83 void PyThread_exit_prog(int status)
    84 {
    85         do_PyThread_exit_prog(status, 0);
    86 }
    87 
    88 void PyThread__exit_prog(int status)
    89 {
    90         do_PyThread_exit_prog(status, 1);
    91 }
    92 #endif /* NO_EXIT_PROG */
    9357
    9458/*
    … …  
    9761PyThread_type_lock PyThread_allocate_lock(void)
    9862{
    99         struct lock *lock;
    100         extern char *malloc(size_t);
     63    struct lock *lock;
     64    extern char *malloc(size_t);
    10165
    102         dprintf(("PyThread_allocate_lock called\n"));
    103         if (!initialized)
    104                 PyThread_init_thread();
     66    dprintf(("PyThread_allocate_lock called\n"));
     67    if (!initialized)
     68        PyThread_init_thread();
    10569
    106         lock = (struct lock *) malloc(sizeof(struct lock));
    107         lock->lock_locked = 0;
    108         (void) mon_create(&lock->lock_monitor);
    109         (void) cv_create(&lock->lock_condvar, lock->lock_monitor);
    110         dprintf(("PyThread_allocate_lock() -> %p\n", lock));
    111         return (PyThread_type_lock) lock;
     70    lock = (struct lock *) malloc(sizeof(struct lock));
     71    lock->lock_locked = 0;
     72    (void) mon_create(&lock->lock_monitor);
     73    (void) cv_create(&lock->lock_condvar, lock->lock_monitor);
     74    dprintf(("PyThread_allocate_lock() -> %p\n", lock));
     75    return (PyThread_type_lock) lock;
    11276}
    11377
    11478void PyThread_free_lock(PyThread_type_lock lock)
    11579{
    116         dprintf(("PyThread_free_lock(%p) called\n", lock));
    117         mon_destroy(((struct lock *) lock)->lock_monitor);
    118         free((char *) lock);
     80    dprintf(("PyThread_free_lock(%p) called\n", lock));
     81    mon_destroy(((struct lock *) lock)->lock_monitor);
     82    free((char *) lock);
    11983}
    12084
    12185int PyThread_acquire_lock(PyThread_type_lock lock, int waitflag)
    12286{
    123         int success;
     87    int success;
    12488
    125         dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock, waitflag));
    126         success = 0;
     89    dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock, waitflag));
     90    success = 0;
    12791
    128         (void) mon_enter(((struct lock *) lock)->lock_monitor);
    129         if (waitflag)
    130                 while (((struct lock *) lock)->lock_locked)
    131                         cv_wait(((struct lock *) lock)->lock_condvar);
    132         if (!((struct lock *) lock)->lock_locked) {
    133                 success = 1;
    134                 ((struct lock *) lock)->lock_locked = 1;
    135         }
    136         cv_broadcast(((struct lock *) lock)->lock_condvar);
    137         mon_exit(((struct lock *) lock)->lock_monitor);
    138         dprintf(("PyThread_acquire_lock(%p, %d) -> %d\n", lock, waitflag, success));
    139         return success;
     92    (void) mon_enter(((struct lock *) lock)->lock_monitor);
     93    if (waitflag)
     94        while (((struct lock *) lock)->lock_locked)
     95            cv_wait(((struct lock *) lock)->lock_condvar);
     96    if (!((struct lock *) lock)->lock_locked) {
     97        success = 1;
     98        ((struct lock *) lock)->lock_locked = 1;
     99    }
     100    cv_broadcast(((struct lock *) lock)->lock_condvar);
     101    mon_exit(((struct lock *) lock)->lock_monitor);
     102    dprintf(("PyThread_acquire_lock(%p, %d) -> %d\n", lock, waitflag, success));
     103    return success;
    140104}
    141105
    142106void PyThread_release_lock(PyThread_type_lock lock)
    143107{
    144         dprintf(("PyThread_release_lock(%p) called\n", lock));
    145         (void) mon_enter(((struct lock *) lock)->lock_monitor);
    146         ((struct lock *) lock)->lock_locked = 0;
    147         cv_broadcast(((struct lock *) lock)->lock_condvar);
    148         mon_exit(((struct lock *) lock)->lock_monitor);
     108    dprintf(("PyThread_release_lock(%p) called\n", lock));
     109    (void) mon_enter(((struct lock *) lock)->lock_monitor);
     110    ((struct lock *) lock)->lock_locked = 0;
     111    cv_broadcast(((struct lock *) lock)->lock_condvar);
     112    mon_exit(((struct lock *) lock)->lock_monitor);
    149113}
Note: See TracChangeset for help on using the changeset viewer.