view Python/thread_atheos.h @ 42309:bd6acfdb47d2

Merged revisions 56301-56442 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56322 | kurt.kaiser | 2007-07-12 11:35:03 -0700 (Thu, 12 Jul 2007) | 2 lines Replace obscure code which was failing in py3k. ................ r56323 | kurt.kaiser | 2007-07-12 11:44:12 -0700 (Thu, 12 Jul 2007) | 3 lines 1. Remove new division option 2. Update IDLE version to 3.0x ................ r56327 | kurt.kaiser | 2007-07-12 12:20:20 -0700 (Thu, 12 Jul 2007) | 5 lines Fix another instance of this defect in Tkinter, and one in IDLE. Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size change during iter in destroy call. ................ r56339 | georg.brandl | 2007-07-13 03:07:25 -0700 (Fri, 13 Jul 2007) | 2 lines Fix #1753310: regrtest -x doesn't work anymore ................ r56361 | kurt.kaiser | 2007-07-13 18:25:24 -0700 (Fri, 13 Jul 2007) | 2 lines convert a map() iterator to a list to get this working. ................ r56362 | kurt.kaiser | 2007-07-13 18:53:45 -0700 (Fri, 13 Jul 2007) | 2 lines Was modifying dict during iteration. ................ r56376 | collin.winter | 2007-07-14 11:56:19 -0700 (Sat, 14 Jul 2007) | 1 line Add an example of class decorators to test_grammar. ................ r56377 | collin.winter | 2007-07-14 12:00:17 -0700 (Sat, 14 Jul 2007) | 1 line Add a basic example of dictcomps to test_grammar. ................ r56413 | neal.norwitz | 2007-07-17 00:21:18 -0700 (Tue, 17 Jul 2007) | 149 lines Merged revisions 56202-56412 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56204 | ronald.oussoren | 2007-07-08 23:02:21 -0700 (Sun, 08 Jul 2007) | 2 lines Patch 1693258: Fix for duplicate "preferences" menu-OS X ........ r56207 | ronald.oussoren | 2007-07-09 01:41:15 -0700 (Mon, 09 Jul 2007) | 4 lines Patch 1673122: be explicit about which libtool to use, to avoid name clashes when a users install GNU libtool early in his PATH ........ r56280 | georg.brandl | 2007-07-11 12:41:49 -0700 (Wed, 11 Jul 2007) | 2 lines Fix #1752132: wrong comment in opcode description. ........ r56293 | georg.brandl | 2007-07-12 01:05:45 -0700 (Thu, 12 Jul 2007) | 3 lines Patch #1752270, #1750931: complain if urllib2 add_handler called without handler. ........ r56296 | georg.brandl | 2007-07-12 01:11:29 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1739696: use code.co_code only if really necessary ........ r56298 | georg.brandl | 2007-07-12 01:38:00 -0700 (Thu, 12 Jul 2007) | 3 lines Patch #1673759: add a missing overflow check when formatting floats with %G. ........ r56302 | georg.brandl | 2007-07-12 02:06:41 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1731659: improve time.strptime docs. ........ r56304 | georg.brandl | 2007-07-12 02:24:04 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1731169: clean up expected skips list. ........ r56306 | georg.brandl | 2007-07-12 02:37:49 -0700 (Thu, 12 Jul 2007) | 3 lines Bug #1637365: add subsection about "__name__ == __main__" to the Python tutorial. ........ r56308 | georg.brandl | 2007-07-12 02:59:22 -0700 (Thu, 12 Jul 2007) | 5 lines Patch #1675424: Added tests for uncovered code in the zipfile module. The KeyError raised by Zipfile.getinfo for nonexistent names now has a descriptive message. ........ r56340 | facundo.batista | 2007-07-13 03:43:44 -0700 (Fri, 13 Jul 2007) | 6 lines Added tests for basic behavior of DateTime, Binary, and Fault classes and the escape function. Check that marshalling recursive sequences & dicts raises TypeError. Check that marshalling out-of-range ints raises OverflowError [Alan McIntyre - GSoC] ........ r56345 | raymond.hettinger | 2007-07-13 05:09:41 -0700 (Fri, 13 Jul 2007) | 1 line Correct the docs for takewhile(). Improve the recipe for nth(). Should be backported ........ r56348 | thomas.heller | 2007-07-13 06:59:39 -0700 (Fri, 13 Jul 2007) | 4 lines Repair COMError. Since exceptions are new style classes now, setting the methods and docstring after the type creation does not work, they must be in the dictionary before creating the type. ........ r56349 | thomas.heller | 2007-07-13 07:18:06 -0700 (Fri, 13 Jul 2007) | 1 line Add tests for _ctypes.COMError. ........ r56350 | thomas.heller | 2007-07-13 09:50:43 -0700 (Fri, 13 Jul 2007) | 4 lines Do not try to load the GLUT library in the ctypes tests. This test adds little value, but has a large problem on OS X, as explained in SF# 1581906. ........ r56352 | thomas.heller | 2007-07-13 10:12:23 -0700 (Fri, 13 Jul 2007) | 3 lines Fix for SF# 1701409: segfault in c_char_p of ctypes. The repr output of c_char_p and c_wchar_p has changed as a sideeffect. ........ r56355 | thomas.heller | 2007-07-13 10:46:54 -0700 (Fri, 13 Jul 2007) | 3 lines Fix for SF# 1649098: avoid zero-sized array declaration in structure. ........ r56357 | thomas.heller | 2007-07-13 12:51:55 -0700 (Fri, 13 Jul 2007) | 3 lines PyType_stgdict() returns a borrowed reference which must not be Py_DECREF'd. ........ r56360 | barry.warsaw | 2007-07-13 15:12:58 -0700 (Fri, 13 Jul 2007) | 10 lines In response to this SF bug: [ 1752723 ] email.message_from_string: initial line gets discarded I added a test to assert that when the first line of text passed to message_from_string() contains a leading space, the message ends up with the appropriate FirstHeaderLineIsContinuationDefect on its defects list. The bug is invalid. ........ r56364 | georg.brandl | 2007-07-14 10:12:23 -0700 (Sat, 14 Jul 2007) | 2 lines Bug #1753406: missing \versionadded for subprocess.check_call. ........ r56366 | georg.brandl | 2007-07-14 10:32:41 -0700 (Sat, 14 Jul 2007) | 2 lines Clarify webbrowser.open description. ........ r56380 | andrew.kuchling | 2007-07-14 13:58:21 -0700 (Sat, 14 Jul 2007) | 1 line Typo fix ........ r56382 | andrew.kuchling | 2007-07-14 14:56:19 -0700 (Sat, 14 Jul 2007) | 7 lines Avoid exception if there's a stray directory inside a Maildir folder. The Maildir specification doesn't seem to say anything about this situation, and it can happen if you're keeping a Maildir mailbox in Subversion (.svn directories) or some similar system. The patch just ignores directories in the cur/, new/, tmp/ folders. ........ r56392 | facundo.batista | 2007-07-14 15:41:45 -0700 (Sat, 14 Jul 2007) | 6 lines First version. Includes tests for helper functions: read, write, _exception, readwrite, closeall, compact_traceback; and for classes dispatcher, dispatcher_with_send, and file_wrapper. [Alan McIntyre - GSoC] ........ r56399 | facundo.batista | 2007-07-15 13:30:39 -0700 (Sun, 15 Jul 2007) | 5 lines Changed the used port and commented out some tests that uses a non documented function that appers to uses resources not present in Windows. ........ r56412 | facundo.batista | 2007-07-16 19:19:39 -0700 (Mon, 16 Jul 2007) | 6 lines Prevent asyncore.dispatcher tests from hanging by adding loop counters to server & client, and by adding asyncore.close_all calls in tearDown. Also choose correct expected logging results based on the value of __debug__ [Alan McIntyre - GSoC] ........ ................ r56442 | guido.van.rossum | 2007-07-18 10:26:38 -0700 (Wed, 18 Jul 2007) | 14 lines Merged revisions 56413-56441 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56439 | georg.brandl | 2007-07-17 23:37:55 -0700 (Tue, 17 Jul 2007) | 2 lines Use "Unix" as platform name, not "UNIX". ........ r56441 | guido.van.rossum | 2007-07-18 10:19:14 -0700 (Wed, 18 Jul 2007) | 3 lines SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. (Slightly tweaked for style and refcounts.) ........ ................
author Guido van Rossum <guido@python.org>
date Wed, 18 Jul 2007 18:15:48 +0000
parents bec1b942e0bc
children e38335d4df91 df5719c298db
line wrap: on
line source

/* 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
}