public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/fw/unwind-link] s390: Implement backtrace on top of <unwind-link.h>
@ 2020-02-10 17:09 Florian Weimer
0 siblings, 0 replies; 3+ messages in thread
From: Florian Weimer @ 2020-02-10 17:09 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3e3923869003596a2b84c394bf8cd1f428c58c72
commit 3e3923869003596a2b84c394bf8cd1f428c58c72
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon Feb 10 17:29:12 2020 +0100
s390: Implement backtrace on top of <unwind-link.h>
Diff:
---
sysdeps/s390/backtrace.c | 55 +++++++++++++-----------------------------------
1 file changed, 15 insertions(+), 40 deletions(-)
diff --git a/sysdeps/s390/backtrace.c b/sysdeps/s390/backtrace.c
index 5801e5e..70a560a 100644
--- a/sysdeps/s390/backtrace.c
+++ b/sysdeps/s390/backtrace.c
@@ -17,41 +17,17 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <libc-lock.h>
-#include <dlfcn.h>
#include <execinfo.h>
#include <stddef.h>
-#include <stdlib.h>
-#include <unwind.h>
+#include <unwind-link.h>
struct trace_arg
{
void **array;
+ struct unwind_link *unwind_link;
int cnt, size;
};
-#ifdef SHARED
-static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
-static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
-
-static void
-init (void)
-{
- void *handle = __libc_dlopen ("libgcc_s.so.1");
-
- if (handle == NULL)
- return;
-
- unwind_backtrace = __libc_dlsym (handle, "_Unwind_Backtrace");
- unwind_getip = __libc_dlsym (handle, "_Unwind_GetIP");
- if (unwind_getip == NULL)
- unwind_backtrace = NULL;
-}
-#else
-# define unwind_backtrace _Unwind_Backtrace
-# define unwind_getip _Unwind_GetIP
-#endif
-
static _Unwind_Reason_Code
backtrace_helper (struct _Unwind_Context *ctx, void *a)
{
@@ -60,7 +36,8 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
/* We are first called with address in the __backtrace function.
Skip it. */
if (arg->cnt != -1)
- arg->array[arg->cnt] = (void *) unwind_getip (ctx);
+ arg->array[arg->cnt]
+ = (void *) UNWIND_LINK_CALL (arg->unwind_link, _Unwind_GetIP, ctx);
if (++arg->cnt == arg->size)
return _URC_END_OF_STACK;
return _URC_NO_REASON;
@@ -69,21 +46,19 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
int
__backtrace (void **array, int size)
{
- struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
-
- if (size <= 0)
- return 0;
-
-#ifdef SHARED
- __libc_once_define (static, once);
-
- __libc_once (once, init);
-
- if (unwind_backtrace == NULL)
+ struct trace_arg arg =
+ {
+ .array = array,
+ .unwind_link = __libc_unwind_link_get (),
+ .size = size,
+ .cnt = -1,
+ };
+
+ if (size <= 0 || arg.unwind_link == NULL)
return 0;
-#endif
- unwind_backtrace (backtrace_helper, &arg);
+ UNWIND_LINK_CALL (arg.unwind_link, _Unwind_Backtrace,
+ backtrace_helper, &arg);
return arg.cnt != -1 ? arg.cnt : 0;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [glibc/fw/unwind-link] s390: Implement backtrace on top of <unwind-link.h>
@ 2020-02-13 16:22 Florian Weimer
0 siblings, 0 replies; 3+ messages in thread
From: Florian Weimer @ 2020-02-13 16:22 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=713ebe2d9ffaa560aae9a82ed9b2c6bda626d9e1
commit 713ebe2d9ffaa560aae9a82ed9b2c6bda626d9e1
Author: Florian Weimer <fweimer@redhat.com>
Date: Wed Feb 12 16:19:49 2020 +0100
s390: Implement backtrace on top of <unwind-link.h>
Diff:
---
sysdeps/s390/s390-32/backtrace.c | 45 ++++++++++++---------------------------
sysdeps/s390/s390-64/backtrace.c | 46 ++++++++++++----------------------------
2 files changed, 28 insertions(+), 63 deletions(-)
diff --git a/sysdeps/s390/s390-32/backtrace.c b/sysdeps/s390/s390-32/backtrace.c
index 497e4f8..21da676 100644
--- a/sysdeps/s390/s390-32/backtrace.c
+++ b/sysdeps/s390/s390-32/backtrace.c
@@ -17,12 +17,10 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <libc-lock.h>
-#include <dlfcn.h>
#include <execinfo.h>
#include <stddef.h>
#include <stdlib.h>
-#include <unwind.h>
+#include <unwind-link.h>
/* This is a global variable set at program start time. It marks the
highest used stack address. */
@@ -57,27 +55,11 @@ struct layout
struct trace_arg
{
void **array;
+ struct unwind_link *unwind_link;
int cnt, size;
};
#ifdef SHARED
-static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
-static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
-
-static void
-init (void)
-{
- void *handle = __libc_dlopen ("libgcc_s.so.1");
-
- if (handle == NULL)
- return;
-
- unwind_backtrace = __libc_dlsym (handle, "_Unwind_Backtrace");
- unwind_getip = __libc_dlsym (handle, "_Unwind_GetIP");
- if (unwind_getip == NULL)
- unwind_backtrace = NULL;
-}
-
static int
__backchain_backtrace (void **array, int size)
{
@@ -103,9 +85,6 @@ __backchain_backtrace (void **array, int size)
return cnt;
}
-#else
-# define unwind_backtrace _Unwind_Backtrace
-# define unwind_getip _Unwind_GetIP
#endif
static _Unwind_Reason_Code
@@ -116,7 +95,8 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
/* We are first called with address in the __backtrace function.
Skip it. */
if (arg->cnt != -1)
- arg->array[arg->cnt] = (void *) unwind_getip (ctx);
+ arg->array[arg->cnt]
+ = (void *) UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetIP) (ctx);
if (++arg->cnt == arg->size)
return _URC_END_OF_STACK;
return _URC_NO_REASON;
@@ -125,21 +105,24 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
int
__backtrace (void **array, int size)
{
- struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
+ struct trace_arg arg =
+ {
+ .array = array,
+ .unwind_link = __libc_unwind_link_get (),
+ .size = size,
+ .cnt = -1
+ };
if (size <= 0)
return 0;
#ifdef SHARED
- __libc_once_define (static, once);
-
- __libc_once (once, init);
-
- if (unwind_backtrace == NULL)
+ if (arg.unwind_link == NULL)
return __backchain_backtrace (array, size);
#endif
- unwind_backtrace (backtrace_helper, &arg);
+ UNWIND_LINK_PTR (arg.unwind_link, _Unwind_Backtrace)
+ (backtrace_helper, &arg);
return arg.cnt != -1 ? arg.cnt : 0;
}
diff --git a/sysdeps/s390/s390-64/backtrace.c b/sysdeps/s390/s390-64/backtrace.c
index 5d14e01..1b8818f 100644
--- a/sysdeps/s390/s390-64/backtrace.c
+++ b/sysdeps/s390/s390-64/backtrace.c
@@ -17,13 +17,10 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <libc-lock.h>
-#include <dlfcn.h>
#include <execinfo.h>
#include <stddef.h>
#include <stdlib.h>
-#include <unwind.h>
-
+#include <unwind-link.h>
/* This is a global variable set at program start time. It marks the
highest used stack address. */
@@ -56,27 +53,11 @@ struct layout
struct trace_arg
{
void **array;
+ struct unwind_link *unwind_link;
int cnt, size;
};
#ifdef SHARED
-static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
-static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
-
-static void
-init (void)
-{
- void *handle = __libc_dlopen ("libgcc_s.so.1");
-
- if (handle == NULL)
- return;
-
- unwind_backtrace = __libc_dlsym (handle, "_Unwind_Backtrace");
- unwind_getip = __libc_dlsym (handle, "_Unwind_GetIP");
- if (unwind_getip == NULL)
- unwind_backtrace = NULL;
-}
-
static int
__backchain_backtrace (void **array, int size)
{
@@ -102,9 +83,6 @@ __backchain_backtrace (void **array, int size)
return cnt;
}
-#else
-# define unwind_backtrace _Unwind_Backtrace
-# define unwind_getip _Unwind_GetIP
#endif
static _Unwind_Reason_Code
@@ -115,7 +93,8 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
/* We are first called with address in the __backtrace function.
Skip it. */
if (arg->cnt != -1)
- arg->array[arg->cnt] = (void *) unwind_getip (ctx);
+ arg->array[arg->cnt]
+ = (void *) UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetIP) (ctx);
if (++arg->cnt == arg->size)
return _URC_END_OF_STACK;
return _URC_NO_REASON;
@@ -124,21 +103,24 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
int
__backtrace (void **array, int size)
{
- struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
+ struct trace_arg arg =
+ {
+ .array = array,
+ .unwind_link = __libc_unwind_link_get (),
+ .size = size,
+ .cnt = -1
+ };
if (size <= 0)
return 0;
#ifdef SHARED
- __libc_once_define (static, once);
-
- __libc_once (once, init);
-
- if (unwind_backtrace == NULL)
+ if (arg.unwind_link == NULL)
return __backchain_backtrace (array, size);
#endif
- unwind_backtrace (backtrace_helper, &arg);
+ UNWIND_LINK_PTR (arg.unwind_link, _Unwind_Backtrace)
+ (backtrace_helper, &arg);
return arg.cnt != -1 ? arg.cnt : 0;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [glibc/fw/unwind-link] s390: Implement backtrace on top of <unwind-link.h>
@ 2020-02-13 10:46 Florian Weimer
0 siblings, 0 replies; 3+ messages in thread
From: Florian Weimer @ 2020-02-13 10:46 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=467e6f1c95439e643b44ed91dd21516571b8f992
commit 467e6f1c95439e643b44ed91dd21516571b8f992
Author: Florian Weimer <fweimer@redhat.com>
Date: Wed Feb 12 16:19:49 2020 +0100
s390: Implement backtrace on top of <unwind-link.h>
Diff:
---
sysdeps/s390/s390-32/backtrace.c | 45 ++++++++++++---------------------------
sysdeps/s390/s390-64/backtrace.c | 46 ++++++++++++----------------------------
2 files changed, 28 insertions(+), 63 deletions(-)
diff --git a/sysdeps/s390/s390-32/backtrace.c b/sysdeps/s390/s390-32/backtrace.c
index 497e4f8..21da676 100644
--- a/sysdeps/s390/s390-32/backtrace.c
+++ b/sysdeps/s390/s390-32/backtrace.c
@@ -17,12 +17,10 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <libc-lock.h>
-#include <dlfcn.h>
#include <execinfo.h>
#include <stddef.h>
#include <stdlib.h>
-#include <unwind.h>
+#include <unwind-link.h>
/* This is a global variable set at program start time. It marks the
highest used stack address. */
@@ -57,27 +55,11 @@ struct layout
struct trace_arg
{
void **array;
+ struct unwind_link *unwind_link;
int cnt, size;
};
#ifdef SHARED
-static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
-static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
-
-static void
-init (void)
-{
- void *handle = __libc_dlopen ("libgcc_s.so.1");
-
- if (handle == NULL)
- return;
-
- unwind_backtrace = __libc_dlsym (handle, "_Unwind_Backtrace");
- unwind_getip = __libc_dlsym (handle, "_Unwind_GetIP");
- if (unwind_getip == NULL)
- unwind_backtrace = NULL;
-}
-
static int
__backchain_backtrace (void **array, int size)
{
@@ -103,9 +85,6 @@ __backchain_backtrace (void **array, int size)
return cnt;
}
-#else
-# define unwind_backtrace _Unwind_Backtrace
-# define unwind_getip _Unwind_GetIP
#endif
static _Unwind_Reason_Code
@@ -116,7 +95,8 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
/* We are first called with address in the __backtrace function.
Skip it. */
if (arg->cnt != -1)
- arg->array[arg->cnt] = (void *) unwind_getip (ctx);
+ arg->array[arg->cnt]
+ = (void *) UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetIP) (ctx);
if (++arg->cnt == arg->size)
return _URC_END_OF_STACK;
return _URC_NO_REASON;
@@ -125,21 +105,24 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
int
__backtrace (void **array, int size)
{
- struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
+ struct trace_arg arg =
+ {
+ .array = array,
+ .unwind_link = __libc_unwind_link_get (),
+ .size = size,
+ .cnt = -1
+ };
if (size <= 0)
return 0;
#ifdef SHARED
- __libc_once_define (static, once);
-
- __libc_once (once, init);
-
- if (unwind_backtrace == NULL)
+ if (arg.unwind_link == NULL)
return __backchain_backtrace (array, size);
#endif
- unwind_backtrace (backtrace_helper, &arg);
+ UNWIND_LINK_PTR (arg.unwind_link, _Unwind_Backtrace)
+ (backtrace_helper, &arg);
return arg.cnt != -1 ? arg.cnt : 0;
}
diff --git a/sysdeps/s390/s390-64/backtrace.c b/sysdeps/s390/s390-64/backtrace.c
index 5d14e01..1b8818f 100644
--- a/sysdeps/s390/s390-64/backtrace.c
+++ b/sysdeps/s390/s390-64/backtrace.c
@@ -17,13 +17,10 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <libc-lock.h>
-#include <dlfcn.h>
#include <execinfo.h>
#include <stddef.h>
#include <stdlib.h>
-#include <unwind.h>
-
+#include <unwind-link.h>
/* This is a global variable set at program start time. It marks the
highest used stack address. */
@@ -56,27 +53,11 @@ struct layout
struct trace_arg
{
void **array;
+ struct unwind_link *unwind_link;
int cnt, size;
};
#ifdef SHARED
-static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
-static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
-
-static void
-init (void)
-{
- void *handle = __libc_dlopen ("libgcc_s.so.1");
-
- if (handle == NULL)
- return;
-
- unwind_backtrace = __libc_dlsym (handle, "_Unwind_Backtrace");
- unwind_getip = __libc_dlsym (handle, "_Unwind_GetIP");
- if (unwind_getip == NULL)
- unwind_backtrace = NULL;
-}
-
static int
__backchain_backtrace (void **array, int size)
{
@@ -102,9 +83,6 @@ __backchain_backtrace (void **array, int size)
return cnt;
}
-#else
-# define unwind_backtrace _Unwind_Backtrace
-# define unwind_getip _Unwind_GetIP
#endif
static _Unwind_Reason_Code
@@ -115,7 +93,8 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
/* We are first called with address in the __backtrace function.
Skip it. */
if (arg->cnt != -1)
- arg->array[arg->cnt] = (void *) unwind_getip (ctx);
+ arg->array[arg->cnt]
+ = (void *) UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetIP) (ctx);
if (++arg->cnt == arg->size)
return _URC_END_OF_STACK;
return _URC_NO_REASON;
@@ -124,21 +103,24 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
int
__backtrace (void **array, int size)
{
- struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
+ struct trace_arg arg =
+ {
+ .array = array,
+ .unwind_link = __libc_unwind_link_get (),
+ .size = size,
+ .cnt = -1
+ };
if (size <= 0)
return 0;
#ifdef SHARED
- __libc_once_define (static, once);
-
- __libc_once (once, init);
-
- if (unwind_backtrace == NULL)
+ if (arg.unwind_link == NULL)
return __backchain_backtrace (array, size);
#endif
- unwind_backtrace (backtrace_helper, &arg);
+ UNWIND_LINK_PTR (arg.unwind_link, _Unwind_Backtrace)
+ (backtrace_helper, &arg);
return arg.cnt != -1 ? arg.cnt : 0;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-13 16:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-10 17:09 [glibc/fw/unwind-link] s390: Implement backtrace on top of <unwind-link.h> Florian Weimer
2020-02-13 10:46 Florian Weimer
2020-02-13 16:22 Florian Weimer
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).