Staging
v0.5.1
https://github.com/python/cpython
Revision dcdc87235161b7641c76723fbab4153f5f21767b authored by Georg Brandl on 06 October 2010, 09:01:31 UTC, committed by Georg Brandl on 06 October 2010, 09:01:31 UTC
svn+ssh://svn.python.org/python/branches/py3k

................
  r77835 | martin.v.loewis | 2010-01-30 01:16:49 +0100 (Sa, 30 Jan 2010) | 9 lines

  Merged revisions 77834 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77834 | martin.v.loewis | 2010-01-30 01:15:44 +0100 (Sa, 30 Jan 2010) | 2 lines

    Add Victor Stinner.
  ........
................
  r78455 | martin.v.loewis | 2010-02-25 21:45:06 +0100 (Do, 25 Feb 2010) | 17 lines

  Merged revisions 78327,78399,78454 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78327 | andrew.kuchling | 2010-02-22 18:21:54 +0100 (Mo, 22 Feb 2010) | 1 line

    Note granting of commit privileges to Larry Hastings
  ........
    r78399 | brett.cannon | 2010-02-24 02:38:04 +0100 (Mi, 24 Feb 2010) | 1 line

    Record that Dino Viehland got commit privs.
  ........
    r78454 | martin.v.loewis | 2010-02-25 21:42:40 +0100 (Do, 25 Feb 2010) | 2 lines

    Add Florent Xicluna.
  ........
................
  r79375 | martin.v.loewis | 2010-03-24 16:07:12 +0100 (Mi, 24 Mär 2010) | 9 lines

  Merged revisions 79374 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79374 | martin.v.loewis | 2010-03-24 16:05:53 +0100 (Mi, 24 Mär 2010) | 2 lines

    Add Brian Curtin.
  ........
................
  r80153 | martin.v.loewis | 2010-04-17 19:11:55 +0200 (Sa, 17 Apr 2010) | 9 lines

  Merged revisions 80152 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80152 | martin.v.loewis | 2010-04-17 19:10:55 +0200 (Sa, 17 Apr 2010) | 2 lines

    Add Giampaolo.
  ........
................
  r80302 | martin.v.loewis | 2010-04-21 08:38:30 +0200 (Mi, 21 Apr 2010) | 9 lines

  Merged revisions 80301 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80301 | martin.v.loewis | 2010-04-21 08:37:48 +0200 (Mi, 21 Apr 2010) | 2 lines

    Add Tim Golden.
  ........
................
  r81532 | martin.v.loewis | 2010-05-25 22:07:11 +0200 (Di, 25 Mai 2010) | 9 lines

  Merged revisions 81531 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81531 | martin.v.loewis | 2010-05-25 22:06:02 +0200 (Di, 25 Mai 2010) | 2 lines

    Add Alexander Belopolsky.
  ........
................
  r83735 | martin.v.loewis | 2010-08-04 21:08:20 +0200 (Mi, 04 Aug 2010) | 2 lines

  Add Terry Reedy.
................
  r83939 | brett.cannon | 2010-08-11 02:18:19 +0200 (Mi, 11 Aug 2010) | 2 lines

  Note that Éric Araujo has been given commit privileges.
................
  r83943 | martin.v.loewis | 2010-08-11 07:48:57 +0200 (Mi, 11 Aug 2010) | 2 lines

  Add George Boutsioukis, from the GSoC project.
................
  r84166 | martin.v.loewis | 2010-08-18 00:58:42 +0200 (Mi, 18 Aug 2010) | 2 lines

  Add Ask Solem.
................
  r84167 | martin.v.loewis | 2010-08-18 01:16:51 +0200 (Mi, 18 Aug 2010) | 2 lines

  Correct library name that Ask will work on.
................
  r84257 | martin.v.loewis | 2010-08-22 10:46:19 +0200 (So, 22 Aug 2010) | 2 lines

  Add Daniel Stutzbach.
................
  r85215 | martin.v.loewis | 2010-10-04 17:48:14 +0200 (Mo, 04 Okt 2010) | 2 lines

  Add Tal Einat.
................
1 parent f243dad
Raw File
Tip revision: dcdc87235161b7641c76723fbab4153f5f21767b authored by Georg Brandl on 06 October 2010, 09:01:31 UTC
Merged revisions 77835,78455,79375,80153,80302,81532,83735,83939,83943,84166-84167,84257,85215 via svnmerge from
Tip revision: dcdc872
thread_atheos.h
/* Threading for AtheOS.
   Based on thread_beos.h. */

#include <atheos/threads.h>
#include <atheos/semaphore.h>
#include <atheos/atomic.h>
#include <errno.h>
#include <string.h>

/* Missing decl from threads.h */
extern int exit_thread(int);


/* Undefine FASTLOCK to play with simple semaphores. */
#define FASTLOCK


#ifdef FASTLOCK

/* Use an atomic counter and a semaphore for maximum speed. */
typedef struct fastmutex {
    sem_id sem;
    atomic_t count;
} fastmutex_t;


static int fastmutex_create(const char *name, fastmutex_t * mutex);
static int fastmutex_destroy(fastmutex_t * mutex);
static int fastmutex_lock(fastmutex_t * mutex);
static int fastmutex_timedlock(fastmutex_t * mutex, bigtime_t timeout);
static int fastmutex_unlock(fastmutex_t * mutex);


static int fastmutex_create(const char *name, fastmutex_t * mutex)
{
    mutex->count = 0;
    mutex->sem = create_semaphore(name, 0, 0);
    return (mutex->sem < 0) ? -1 : 0;
}


static int fastmutex_destroy(fastmutex_t * mutex)
{
    if (fastmutex_timedlock(mutex, 0) == 0 || errno == EWOULDBLOCK) {
        return delete_semaphore(mutex->sem);
    }
    return 0;
}


static int fastmutex_lock(fastmutex_t * mutex)
{
    atomic_t prev = atomic_add(&mutex->count, 1);
    if (prev > 0)
        return lock_semaphore(mutex->sem);
    return 0;
}


static int fastmutex_timedlock(fastmutex_t * mutex, bigtime_t timeout)
{
    atomic_t prev = atomic_add(&mutex->count, 1);
    if (prev > 0)
        return lock_semaphore_x(mutex->sem, 1, 0, timeout);
    return 0;
}


static int fastmutex_unlock(fastmutex_t * mutex)
{
    atomic_t prev = atomic_add(&mutex->count, -1);
    if (prev > 1)
        return unlock_semaphore(mutex->sem);
    return 0;
}


#endif                          /* FASTLOCK */


/*
 * Initialization.
 *
 */
static void PyThread__init_thread(void)
{
    /* Do nothing. */
    return;
}


/*
 * Thread support.
 *
 */

static atomic_t thread_count = 0;

long PyThread_start_new_thread(void (*func) (void *), void *arg)
{
    status_t success = -1;
    thread_id tid;
    char name[OS_NAME_LENGTH];
    atomic_t this_thread;

    dprintf(("PyThread_start_new_thread called\n"));

    this_thread = atomic_add(&thread_count, 1);
    PyOS_snprintf(name, sizeof(name), "python thread (%d)", this_thread);

    tid = spawn_thread(name, func, NORMAL_PRIORITY, 0, arg);
    if (tid < 0) {
        dprintf(("PyThread_start_new_thread spawn_thread failed: %s\n", strerror(errno)));
    } else {
        success = resume_thread(tid);
        if (success < 0) {
            dprintf(("PyThread_start_new_thread resume_thread failed: %s\n", strerror(errno)));
        }
    }

    return (success < 0 ? -1 : tid);
}


long PyThread_get_thread_ident(void)
{
    return get_thread_id(NULL);
}


static void do_PyThread_exit_thread(int no_cleanup)
{
    dprintf(("PyThread_exit_thread called\n"));

    /* Thread-safe way to read a variable without a mutex: */
    if (atomic_add(&thread_count, 0) == 0) {
        /* No threads around, so exit main(). */
        if (no_cleanup)
            _exit(0);
        else
            exit(0);
    } else {
        /* We're a thread */
        exit_thread(0);
    }
}


void PyThread_exit_thread(void)
{
    do_PyThread_exit_thread(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));

    /* No need to do anything, the threads get torn down if main()exits. */
    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 */


/*
 * Lock support.
 *
 */

static atomic_t lock_count = 0;

PyThread_type_lock PyThread_allocate_lock(void)
{
#ifdef FASTLOCK
    fastmutex_t *lock;
#else
    sem_id sema;
#endif
    char name[OS_NAME_LENGTH];
    atomic_t this_lock;

    dprintf(("PyThread_allocate_lock called\n"));

#ifdef FASTLOCK
    lock = (fastmutex_t *) malloc(sizeof(fastmutex_t));
    if (lock == NULL) {
        dprintf(("PyThread_allocate_lock failed: out of memory\n"));
        return (PyThread_type_lock) NULL;
    }
#endif
    this_lock = atomic_add(&lock_count, 1);
    PyOS_snprintf(name, sizeof(name), "python lock (%d)", this_lock);

#ifdef FASTLOCK
    if (fastmutex_create(name, lock) < 0) {
        dprintf(("PyThread_allocate_lock failed: %s\n",
                 strerror(errno)));
        free(lock);
        lock = NULL;
    }
    dprintf(("PyThread_allocate_lock()-> %p\n", lock));
    return (PyThread_type_lock) lock;
#else
    sema = create_semaphore(name, 1, 0);
    if (sema < 0) {
        dprintf(("PyThread_allocate_lock failed: %s\n",
                 strerror(errno)));
        sema = 0;
    }
    dprintf(("PyThread_allocate_lock()-> %p\n", sema));
    return (PyThread_type_lock) sema;
#endif
}


void PyThread_free_lock(PyThread_type_lock lock)
{
    dprintf(("PyThread_free_lock(%p) called\n", lock));

#ifdef FASTLOCK
    if (fastmutex_destroy((fastmutex_t *) lock) < 0) {
        dprintf(("PyThread_free_lock(%p) failed: %s\n", lock,
                 strerror(errno)));
    }
    free(lock);
#else
    if (delete_semaphore((sem_id) lock) < 0) {
        dprintf(("PyThread_free_lock(%p) failed: %s\n", lock,
                 strerror(errno)));
    }
#endif
}


int PyThread_acquire_lock(PyThread_type_lock lock, int waitflag)
{
    int retval;

    dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock,
             waitflag));

#ifdef FASTLOCK
    if (waitflag)
        retval = fastmutex_lock((fastmutex_t *) lock);
    else
        retval = fastmutex_timedlock((fastmutex_t *) lock, 0);
#else
    if (waitflag)
        retval = lock_semaphore((sem_id) lock);
    else
        retval = lock_semaphore_x((sem_id) lock, 1, 0, 0);
#endif
    if (retval < 0) {
        dprintf(("PyThread_acquire_lock(%p, %d) failed: %s\n",
                 lock, waitflag, strerror(errno)));
    }
    dprintf(("PyThread_acquire_lock(%p, %d)-> %d\n", lock, waitflag,
             retval));
    return retval < 0 ? 0 : 1;
}


void PyThread_release_lock(PyThread_type_lock lock)
{
    dprintf(("PyThread_release_lock(%p) called\n", lock));

#ifdef FASTLOCK
    if (fastmutex_unlock((fastmutex_t *) lock) < 0) {
        dprintf(("PyThread_release_lock(%p) failed: %s\n", lock,
                 strerror(errno)));
    }
#else
    if (unlock_semaphore((sem_id) lock) < 0) {
        dprintf(("PyThread_release_lock(%p) failed: %s\n", lock,
                 strerror(errno)));
    }
#endif
}
back to top