mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Trent Mick <trentm@activestate.com>:
The common technique for printing out a pointer has been to cast to a long and use the "%lx" printf modifier. This is incorrect on Win64 where casting to a long truncates the pointer. The "%p" formatter should be used instead. The problem as stated by Tim: > Unfortunately, the C committee refused to define what %p conversion "looks > like" -- they explicitly allowed it to be implementation-defined. Older > versions of Microsoft C even stuck a colon in the middle of the address (in > the days of segment+offset addressing)! The result is that the hex value of a pointer will maybe/maybe not have a 0x prepended to it. Notes on the patch: There are two main classes of changes: - in the various repr() functions that print out pointers - debugging printf's in the various thread_*.h files (these are why the patch is large) Closes SourceForge patch #100505.
This commit is contained in:
parent
d49e5b4667
commit
a44d353e2b
22 changed files with 153 additions and 153 deletions
|
@ -262,7 +262,7 @@ PyThread_type_lock PyThread_allocate_lock( void )
|
|||
return (PyThread_type_lock)NULL;
|
||||
}
|
||||
|
||||
dprintf(("PyThread_allocate_lock() -> %lx\n", (long)lock));
|
||||
dprintf(("PyThread_allocate_lock() -> %p\n", lock));
|
||||
return (PyThread_type_lock) lock;
|
||||
}
|
||||
|
||||
|
@ -270,7 +270,7 @@ void PyThread_free_lock( PyThread_type_lock lock )
|
|||
{
|
||||
status_t retval;
|
||||
|
||||
dprintf(("PyThread_free_lock(%lx) called\n", (long)lock));
|
||||
dprintf(("PyThread_free_lock(%p) called\n", lock));
|
||||
|
||||
retval = benaphore_destroy( (benaphore_t *)lock );
|
||||
if( retval != EOK ) {
|
||||
|
@ -284,7 +284,7 @@ int PyThread_acquire_lock( PyThread_type_lock lock, int waitflag )
|
|||
int success;
|
||||
status_t retval;
|
||||
|
||||
dprintf(("PyThread_acquire_lock(%lx, %d) called\n", (long)lock, waitflag));
|
||||
dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock, waitflag));
|
||||
|
||||
if( waitflag ) {
|
||||
retval = benaphore_lock( (benaphore_t *)lock );
|
||||
|
@ -300,7 +300,7 @@ int PyThread_acquire_lock( PyThread_type_lock lock, int waitflag )
|
|||
/* TODO: that's bad, raise an exception */
|
||||
}
|
||||
|
||||
dprintf(("PyThread_acquire_lock(%lx, %d) -> %d\n", (long)lock, waitflag, success));
|
||||
dprintf(("PyThread_acquire_lock(%p, %d) -> %d\n", lock, waitflag, success));
|
||||
return success;
|
||||
}
|
||||
|
||||
|
@ -308,7 +308,7 @@ void PyThread_release_lock( PyThread_type_lock lock )
|
|||
{
|
||||
status_t retval;
|
||||
|
||||
dprintf(("PyThread_release_lock(%lx) called\n", (long)lock));
|
||||
dprintf(("PyThread_release_lock(%p) called\n", lock));
|
||||
|
||||
retval = benaphore_unlock( (benaphore_t *)lock );
|
||||
if( retval != EOK ) {
|
||||
|
@ -336,7 +336,7 @@ PyThread_type_sema PyThread_allocate_sema( int value )
|
|||
return 0;
|
||||
}
|
||||
|
||||
dprintf(("PyThread_allocate_sema() -> %lx\n", (long) sema));
|
||||
dprintf(("PyThread_allocate_sema() -> %p\n", sema));
|
||||
return (PyThread_type_sema) sema;
|
||||
}
|
||||
|
||||
|
@ -344,7 +344,7 @@ void PyThread_free_sema( PyThread_type_sema sema )
|
|||
{
|
||||
status_t retval;
|
||||
|
||||
dprintf(("PyThread_free_sema(%lx) called\n", (long) sema));
|
||||
dprintf(("PyThread_free_sema(%p) called\n", sema));
|
||||
|
||||
retval = delete_sem( (sem_id)sema );
|
||||
if( retval != B_NO_ERROR ) {
|
||||
|
@ -357,7 +357,7 @@ int PyThread_down_sema( PyThread_type_sema sema, int waitflag )
|
|||
{
|
||||
status_t retval;
|
||||
|
||||
dprintf(("PyThread_down_sema(%lx, %d) called\n", (long) sema, waitflag));
|
||||
dprintf(("PyThread_down_sema(%p, %d) called\n", sema, waitflag));
|
||||
|
||||
if( waitflag ) {
|
||||
retval = acquire_sem( (sem_id)sema );
|
||||
|
@ -370,7 +370,7 @@ int PyThread_down_sema( PyThread_type_sema sema, int waitflag )
|
|||
return 0;
|
||||
}
|
||||
|
||||
dprintf(("PyThread_down_sema(%lx) return\n", (long) sema));
|
||||
dprintf(("PyThread_down_sema(%p) return\n", sema));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -378,7 +378,7 @@ void PyThread_up_sema( PyThread_type_sema sema )
|
|||
{
|
||||
status_t retval;
|
||||
|
||||
dprintf(("PyThread_up_sema(%lx)\n", (long) sema));
|
||||
dprintf(("PyThread_up_sema(%p)\n", sema));
|
||||
|
||||
retval = release_sem( (sem_id)sema );
|
||||
if( retval != B_NO_ERROR ) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue