From: Doug Evans <dje@google.com>
To: Pedro Alves <palves@redhat.com>, Yao Qi <yao@codesourcery.com>
Cc: gdb-patches <gdb-patches@sourceware.org>
Subject: [PATCH 1/3] gdbserver debug_printf+timestamps: FUNCTION_NAME
Date: Thu, 16 Jan 2014 23:31:00 -0000 [thread overview]
Message-ID: <21208.27605.74231.313332@ruffy.mtv.corp.google.com> (raw)
In-Reply-To: <21208.27400.695984.88504@ruffy.mtv.corp.google.com>
Doug Evans writes:
> v2 is now split into three parts:
>
> 1/3 - move ASSERT_FUNCTION to FUNCTION_NAME in common-utils.h
> 2/3 - create new function delim_string_to_char_ptr_vec_append in gdb_vecs.c
> 3/3 - the actual debug_printf patch
>
> I went with --debug[=timestamp] as the option naming.
I didn't do a darwin build but the change is mechanical.
2014-01-16 Doug Evans <dje@google.com>
* common/common-utils.h (FUNCTION_NAME): Renamed from ASSERT_FUNCTION,
and moved here ...
* common/gdb_assert.h (ASSERT_FUNCTION): ... from here.
#include "common-utils.h".
(gdb_assert, gdb_assert_fail, gdb_assert_not_reached): Update.
* common/vec.h (VEC_ASSERT_PASS): Update.
* darwin-nat.h: Replace #include of gdb_assert.h with common-utils.h.
(MACH_CHECK_ERROR): Update.
diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h
index 9777ac0..2d99549 100644
--- a/gdb/common/common-utils.h
+++ b/gdb/common/common-utils.h
@@ -25,6 +25,19 @@
#include <stddef.h>
#include <stdarg.h>
+/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
+ which contains the name of the function currently being defined.
+ This is broken in G++ before version 2.6.
+ C9x has a similar variable called __func__, but prefer the GCC one since
+ it demangles C++ function names. */
+#if (GCC_VERSION >= 2004)
+#define FUNCTION_NAME __PRETTY_FUNCTION__
+#else
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#define FUNCTION_NAME __func__
+#endif
+#endif
+
extern void malloc_failure (long size) ATTRIBUTE_NORETURN;
extern void internal_error (const char *file, int line, const char *, ...)
ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 4);
diff --git a/gdb/common/gdb_assert.h b/gdb/common/gdb_assert.h
index 50f7bf2..4869fc4 100644
--- a/gdb/common/gdb_assert.h
+++ b/gdb/common/gdb_assert.h
@@ -19,6 +19,8 @@
#ifndef GDB_ASSERT_H
#define GDB_ASSERT_H
+#include "common-utils.h" /* For FUNCTION_NAME. */
+
/* A static assertion. This will cause a compile-time error if EXPR,
which must be a compile-time constant, is false. */
@@ -32,24 +34,11 @@
#define gdb_assert(expr) \
((void) ((expr) ? 0 : \
- (gdb_assert_fail (#expr, __FILE__, __LINE__, ASSERT_FUNCTION), 0)))
-
-/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
- which contains the name of the function currently being defined.
- This is broken in G++ before version 2.6.
- C9x has a similar variable called __func__, but prefer the GCC one since
- it demangles C++ function names. */
-#if (GCC_VERSION >= 2004)
-#define ASSERT_FUNCTION __PRETTY_FUNCTION__
-#else
-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#define ASSERT_FUNCTION __func__
-#endif
-#endif
+ (gdb_assert_fail (#expr, __FILE__, __LINE__, FUNCTION_NAME), 0)))
/* This prints an "Assertion failed" message, asking the user if they
want to continue, dump core, or just exit. */
-#if defined (ASSERT_FUNCTION)
+#if defined (FUNCTION_NAME)
#define gdb_assert_fail(assertion, file, line, function) \
internal_error (file, line, _("%s: Assertion `%s' failed."), \
function, assertion)
@@ -62,9 +51,9 @@
/* The canonical form of gdb_assert (0).
MESSAGE is a string to include in the error message. */
-#if defined (ASSERT_FUNCTION)
+#if defined (FUNCTION_NAME)
#define gdb_assert_not_reached(message) \
- internal_error (__FILE__, __LINE__, "%s: %s", ASSERT_FUNCTION, _(message))
+ internal_error (__FILE__, __LINE__, "%s: %s", FUNCTION_NAME, _(message))
#else
#define gdb_assert_not_reached(message) \
internal_error (__FILE__, __LINE__, _(message))
diff --git a/gdb/common/vec.h b/gdb/common/vec.h
index 9874573..7bae2ff 100644
--- a/gdb/common/vec.h
+++ b/gdb/common/vec.h
@@ -398,7 +398,7 @@ extern void *vec_o_reserve (void *, int, size_t, size_t);
#define VEC_ASSERT_PASS ,file_,line_
#define vec_assert(expr, op) \
((void)((expr) ? 0 : (gdb_assert_fail (op, file_, line_, \
- ASSERT_FUNCTION), 0)))
+ FUNCTION_NAME), 0)))
#define VEC(T) VEC_##T
#define VEC_OP(T,OP) VEC_##T##_##OP
diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h
index 6d42a3b..84f4be1 100644
--- a/gdb/darwin-nat.h
+++ b/gdb/darwin-nat.h
@@ -18,7 +18,7 @@
#define __DARWIN_NAT_H__
#include <mach/mach.h>
-#include "gdb_assert.h"
+#include "common-utils.h" /* For FUNCTION_NAME. */
/* Describe the mach exception handling state for a task. This state is saved
before being changed and restored when a process is detached.
@@ -136,10 +136,10 @@ extern mach_port_t darwin_port_set;
/* A copy of mach_host_self (). */
extern mach_port_t darwin_host_self;
-/* ASSERT_FUNCTION is defined in gdb_assert.h (or not). */
-#ifdef ASSERT_FUNCTION
+/* FUNCTION_NAME is defined in common-utils.h (or not). */
+#ifdef FUNCTION_NAME
#define MACH_CHECK_ERROR(ret) \
- mach_check_error (ret, __FILE__, __LINE__, ASSERT_FUNCTION)
+ mach_check_error (ret, __FILE__, __LINE__, FUNCTION_NAME)
#else
#define MACH_CHECK_ERROR(ret) \
mach_check_error (ret, __FILE__, __LINE__, "??")
next prev parent reply other threads:[~2014-01-16 23:31 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-17 21:47 [PATCH 4/6] gdbserver: Delimit debugging output for readability Doug Evans
2013-12-18 11:17 ` Pedro Alves
2014-01-15 0:47 ` Doug Evans
2014-01-16 17:22 ` Pedro Alves
2014-01-16 18:43 ` Doug Evans
2014-01-16 18:54 ` Pedro Alves
2014-01-16 23:28 ` [PATCH 0/3] Add debug_printf and timestamps to gdbserver Doug Evans
2014-01-16 23:31 ` Doug Evans [this message]
2014-01-17 12:46 ` [PATCH 1/3] gdbserver debug_printf+timestamps: FUNCTION_NAME Pedro Alves
2014-01-16 23:33 ` [PATCH 2/3] gdbserver debug_printf+timestamps: delim_string_to_char_ptr_vec_append Doug Evans
2014-01-16 23:37 ` [PATCH 3/3, doc RFA] gdbserver debug_printf+timestamps: main patch Doug Evans
2014-01-17 2:58 ` Doug Evans
2014-01-17 7:04 ` Eli Zaretskii
2014-01-17 12:46 ` Pedro Alves
2014-01-17 22:45 ` Doug Evans
2014-01-18 8:25 ` Eli Zaretskii
2014-01-20 16:14 ` Pedro Alves
2014-01-22 23:06 ` Doug Evans
2014-01-16 18:39 ` [PATCH 4/6] gdbserver: Delimit debugging output for readability Yao Qi
2014-01-16 19:01 ` Doug Evans
2014-01-17 2:32 ` Joel Brobecker
2014-01-17 2:40 ` Joel Brobecker
2014-01-17 12:46 ` Pedro Alves
2014-01-17 12:59 ` Yao Qi
2014-01-20 5:42 ` Tom Tromey
2014-01-20 19:51 ` Doug Evans
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=21208.27605.74231.313332@ruffy.mtv.corp.google.com \
--to=dje@google.com \
--cc=gdb-patches@sourceware.org \
--cc=palves@redhat.com \
--cc=yao@codesourcery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).