diff options
author | Fred Drake <fdrake@acm.org> | 2000-06-30 15:01:00 (GMT) |
---|---|---|
committer | Fred Drake <fdrake@acm.org> | 2000-06-30 15:01:00 (GMT) |
commit | a44d353e2b6d947d36ab9d36c1fc84335a0878fe (patch) | |
tree | 3d0add21fcb365aeeb5ac6b45add0a30e6f3b93b /Python/thread_os2.h | |
parent | d49e5b466731d0e68ea41655aecbe3a66b1976d9 (diff) | |
download | cpython-a44d353e2b6d947d36ab9d36c1fc84335a0878fe.zip cpython-a44d353e2b6d947d36ab9d36c1fc84335a0878fe.tar.gz cpython-a44d353e2b6d947d36ab9d36c1fc84335a0878fe.tar.bz2 |
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.
Diffstat (limited to 'Python/thread_os2.h')
-rw-r--r-- | Python/thread_os2.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Python/thread_os2.h b/Python/thread_os2.h index 982fb6f..aa972ce 100644 --- a/Python/thread_os2.h +++ b/Python/thread_os2.h @@ -141,14 +141,14 @@ PyThread_type_lock PyThread_allocate_lock(void) 0, /* shared ? */ 0); /* initial state */ - dprintf(("%ld: PyThread_allocate_lock() -> %lx\n", PyThread_get_thread_ident(), (long)aLock)); + dprintf(("%ld: PyThread_allocate_lock() -> %p\n", PyThread_get_thread_ident(), aLock)); return (PyThread_type_lock) aLock; } void PyThread_free_lock(PyThread_type_lock aLock) { - dprintf(("%ld: PyThread_free_lock(%lx) called\n", PyThread_get_thread_ident(),(long)aLock)); + dprintf(("%ld: PyThread_free_lock(%p) called\n", PyThread_get_thread_ident(),aLock)); DosCloseMutexSem((HMTX)aLock); } @@ -166,8 +166,8 @@ int PyThread_acquire_lock(PyThread_type_lock aLock, int waitflag) PID pid = 0; TID tid = 0; - dprintf(("%ld: PyThread_acquire_lock(%lx, %d) called\n", PyThread_get_thread_ident(), - (long)aLock, waitflag)); + dprintf(("%ld: PyThread_acquire_lock(%p, %d) called\n", PyThread_get_thread_ident(), + aLock, waitflag)); DosQueryMutexSem((HMTX)aLock,&pid,&tid,&count); if( tid == PyThread_get_thread_ident() ) { /* if we own this lock */ @@ -181,19 +181,19 @@ int PyThread_acquire_lock(PyThread_type_lock aLock, int waitflag) } } - dprintf(("%ld: PyThread_acquire_lock(%lx, %d) -> %d\n", - PyThread_get_thread_ident(),(long)aLock, waitflag, success)); + dprintf(("%ld: PyThread_acquire_lock(%p, %d) -> %d\n", + PyThread_get_thread_ident(),aLock, waitflag, success)); return success; } void PyThread_release_lock(PyThread_type_lock aLock) { - dprintf(("%ld: PyThread_release_lock(%lx) called\n", PyThread_get_thread_ident(),(long)aLock)); + dprintf(("%ld: PyThread_release_lock(%p) called\n", PyThread_get_thread_ident(),aLock)); if ( DosReleaseMutexSem( (HMTX) aLock ) != 0 ) { - dprintf(("%ld: Could not PyThread_release_lock(%lx) error: %l\n", - PyThread_get_thread_ident(), (long)aLock, GetLastError())); + dprintf(("%ld: Could not PyThread_release_lock(%p) error: %l\n", + PyThread_get_thread_ident(), aLock, GetLastError())); } } @@ -217,5 +217,5 @@ int PyThread_down_sema(PyThread_type_sema aSemaphore, int waitflag) void PyThread_up_sema(PyThread_type_sema aSemaphore) { - dprintf(("%ld: PyThread_up_sema(%lx)\n", PyThread_get_thread_ident(), (long)aSemaphore)); + dprintf(("%ld: PyThread_up_sema(%p)\n", PyThread_get_thread_ident(), aSemaphore)); } |