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_cthread.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_cthread.h')
-rw-r--r-- | Python/thread_cthread.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Python/thread_cthread.h b/Python/thread_cthread.h index 11370c5..1e60743 100644 --- a/Python/thread_cthread.h +++ b/Python/thread_cthread.h @@ -129,13 +129,13 @@ PyThread_type_lock PyThread_allocate_lock _P0() free((void *) lock); lock = 0; } - dprintf(("PyThread_allocate_lock() -> %lx\n", (long)lock)); + dprintf(("PyThread_allocate_lock() -> %p\n", lock)); return (PyThread_type_lock) lock; } void PyThread_free_lock _P1(lock, PyThread_type_lock lock) { - dprintf(("PyThread_free_lock(%lx) called\n", (long)lock)); + dprintf(("PyThread_free_lock(%p) called\n", lock)); mutex_free(lock); } @@ -143,20 +143,20 @@ int PyThread_acquire_lock _P2(lock, PyThread_type_lock lock, waitflag, int waitf { int success = FALSE; - dprintf(("PyThread_acquire_lock(%lx, %d) called\n", (long)lock, waitflag)); + dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock, waitflag)); if (waitflag) { /* blocking */ mutex_lock(lock); success = TRUE; } else { /* non blocking */ success = mutex_try_lock(lock); } - 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; } void PyThread_release_lock _P1(lock, PyThread_type_lock lock) { - dprintf(("PyThread_release_lock(%lx) called\n", (long)lock)); + dprintf(("PyThread_release_lock(%p) called\n", lock)); mutex_unlock((mutex_t )lock); } @@ -181,23 +181,23 @@ PyThread_type_sema PyThread_allocate_sema _P1(value, int value) if (!initialized) PyThread_init_thread(); - dprintf(("PyThread_allocate_sema() -> %lx\n", (long) sema)); + dprintf(("PyThread_allocate_sema() -> %p\n", sema)); return (PyThread_type_sema) sema; } void PyThread_free_sema _P1(sema, PyThread_type_sema sema) { - dprintf(("PyThread_free_sema(%lx) called\n", (long) sema)); + dprintf(("PyThread_free_sema(%p) called\n", sema)); } int PyThread_down_sema _P2(sema, PyThread_type_sema sema, waitflag, int waitflag) { - dprintf(("PyThread_down_sema(%lx, %d) called\n", (long) sema, waitflag)); - dprintf(("PyThread_down_sema(%lx) return\n", (long) sema)); + dprintf(("PyThread_down_sema(%p, %d) called\n", sema, waitflag)); + dprintf(("PyThread_down_sema(%p) return\n", sema)); return -1; } void PyThread_up_sema _P1(sema, PyThread_type_sema sema) { - dprintf(("PyThread_up_sema(%lx)\n", (long) sema)); + dprintf(("PyThread_up_sema(%p)\n", sema)); } |