diff options
| author | Sage Weil <sage@newdream.net> | 2011-10-25 23:54:16 +0200 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-10-25 23:54:16 +0200 |
| commit | 46f330d01cfdfaa58ab565d05003049e2c96bb07 (patch) | |
| tree | e7fcb7c72734be625aae95bfc855b7f516414616 /src/global | |
| parent | xattr: use sys/types.h instead of linux/types.h (diff) | |
| parent | fix osdmaptool clitests (diff) | |
| download | ceph-46f330d01cfdfaa58ab565d05003049e2c96bb07.tar.xz ceph-46f330d01cfdfaa58ab565d05003049e2c96bb07.zip | |
Merge branch 'master' into wip-freebsd
Diffstat (limited to 'src/global')
| -rw-r--r-- | src/global/signal_handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/global/signal_handler.cc b/src/global/signal_handler.cc index afc299193a9..abe6f0f16e4 100644 --- a/src/global/signal_handler.cc +++ b/src/global/signal_handler.cc @@ -77,8 +77,8 @@ static void handle_shutdown_signal(int signum) { char buf[1024]; snprintf(buf, sizeof(buf), "*** Caught signal (%s) **\n " - "in thread %p. Shutting down.\n", - sys_siglist[signum], (void*)pthread_self()); + "in thread %llx. Shutting down.\n", + sys_siglist[signum], (unsigned long long)pthread_self()); dout_emergency(buf); pidfile_remove(); reraise_fatal(signum); @@ -91,7 +91,7 @@ static void handle_fatal_signal(int signum) // presumably dump core-- will handle it. char buf[1024]; snprintf(buf, sizeof(buf), "*** Caught signal (%s) **\n " - "in thread %p\n", sys_siglist[signum], (void*)pthread_self()); + "in thread %llx\n", sys_siglist[signum], (unsigned long long)pthread_self()); dout_emergency(buf); pidfile_remove(); |