From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id E5EE86EC40; Fri, 4 Jun 2021 14:14:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E5EE86EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1622805268; bh=l0W04qBytLuObERLHFh/94CnBEJ53z2/VeDx8HTbqNQ=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=vD0rTmK3H8yK3aZ98G+fR1VGKLg/SKspjMtQmtDJkJbbxz3q+V+g/ElKtdrXPSuJ1 4bIzJ/C8iTN0SaWJj+ihTXh1WmbPAF5aYc8mguH9lNstTisEwkKwhINUrUhTHPOB4y tpfnIGWUN2gjKgVwUc3XWdhxS8C/UmTDG25s28KI= Received: from smtp47.i.mail.ru (smtp47.i.mail.ru [94.100.177.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id E83F16EC42 for ; Fri, 4 Jun 2021 14:13:30 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E83F16EC42 Received: by smtp47.i.mail.ru with esmtpa (envelope-from ) id 1lp7la-0007QW-8n; Fri, 04 Jun 2021 14:13:30 +0300 To: gorcunov@tarantool.org, tarantool-patches@dev.tarantool.org Cc: Egor2001 Date: Fri, 4 Jun 2021 14:13:11 +0300 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9D5B0DA836B685C546075B3437CB362FF47FF2EE3FBA69D6F182A05F538085040F8C2C2ECA0FC44896CFF7491DCA59DB6187767A742BAB1FA435A8B1B03E395FF X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7FEAC828D2BF6EC3CEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006374FA524FBD8B89EAA8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D867D8C1100A84E708C8D68265791F5E36117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC974A882099E279BDA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD182CC0D3CB04F14752D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE38D4DC57D478E6887C6FCE95544A9834D8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3223C850C947643096136E347CC761E07C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637B5EAED125435346EEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CC176FDF34A1E429FF23AF9E72EA30C5685162121619B6C269C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFD99FB7B2A39B4961699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C5CF6F4B28551E3F138F7250663E98974FDFF80CD6C97D465C48C3BCB3635EF3A7AAC2451601D0D11D7E09C32AA3244C4E569C1BB8887E9C53606219423660AE4DBEAD0ED6C55A80FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXjL9XSvACMLmdcPdZu/0rgi X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769889CF6782A79EB676CFF7491DCA59DB65F9045B74F665CC858570E9BDA2331C06F53C80213D1719C2C26F88BABE1618CA23003C376F5F1387402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH 2/2] fiber: fix DARWIN build X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Egor Elchinov via Tarantool-patches Reply-To: eelchinov@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Egor2001 Due to the limited libunwind API under osx this fix uses backtrace() from and dladdr() from instead of absent libunwind routines. Custom backtrace() function was renamed to backtrace_to_buf() because of the name conflict with backtrace() routine from . Needed for: #4002 --- src/lib/core/backtrace.cc | 38 +++++++++++++++++++++++++++++++------- src/lib/core/backtrace.h | 2 +- src/lib/core/crash.c | 2 +- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/lib/core/backtrace.cc b/src/lib/core/backtrace.cc index 276933ad6..a1727374c 100644 --- a/src/lib/core/backtrace.cc +++ b/src/lib/core/backtrace.cc @@ -46,6 +46,11 @@ #ifdef ENABLE_BACKTRACE #include +#ifdef TARGET_OS_DARWIN +#include +#include +#endif + #include "small/region.h" #include "small/static.h" /* @@ -131,7 +136,7 @@ error: } char * -backtrace(char *start, size_t size) +backtrace_to_buf(char *start, size_t size) { int frame_no = 0; unw_word_t sp = 0, old_sp = 0, ip, offset; @@ -442,7 +447,11 @@ void fast_trace_collect(void **ip_buf, int limit) { memset(ip_buf, 0, limit * sizeof(*ip_buf)); +#ifndef TARGET_OS_DARWIN unw_backtrace(ip_buf, limit); +#else + backtrace(ip_buf, limit); +#endif } /** @@ -459,12 +468,12 @@ fast_trace_collect(void **ip_buf, int limit) void fast_trace_foreach(backtrace_cb cb, void **ip_buf, int limit, void *cb_ctx) { +#ifndef TARGET_OS_DARWIN static __thread char proc_name[BACKTRACE_NAME_MAX]; - int frame_no = 0; + char* proc = NULL; + int frame_no = 0, ret = 0; unw_word_t ip = 0, offset = 0; unw_proc_info_t pi; - int ret = 0; - char* proc = NULL; unw_accessors_t* acc = unw_get_accessors(unw_local_addr_space); assert(acc); @@ -489,11 +498,26 @@ fast_trace_foreach(backtrace_cb cb, void **ip_buf, int limit, void *cb_ctx) break; } -#ifndef TARGET_OS_DARWIN if (ret != 0) say_debug("unwinding error: %s", unw_strerror(ret)); #else - if (ret != 0) + int frame_no = 0, ret = 1; + void *ip = NULL; + size_t offset = 0; + Dl_info dli; + + for (frame_no = 0; frame_no < limit && ip_buf[frame_no] != NULL; + ++frame_no) { + ip = ip_buf[frame_no]; + ret = dladdr(ip, &dli); + offset = (char *)ip - (char *)dli.dli_saddr; + + if (frame_no > 0 && + cb(frame_no - 1, ip, dli.dli_sname, offset, cb_ctx) != 0) + break; + } + + if (ret == 0) say_debug("unwinding error: %i", ret); #endif } @@ -502,7 +526,7 @@ void print_backtrace(void) { char *start = (char *)static_alloc(SMALL_STATIC_SIZE); - fdprintf(STDERR_FILENO, "%s", backtrace(start, SMALL_STATIC_SIZE)); + fdprintf(STDERR_FILENO, "%s", backtrace_to_buf(start, SMALL_STATIC_SIZE)); } #endif /* ENABLE_BACKTRACE */ diff --git a/src/lib/core/backtrace.h b/src/lib/core/backtrace.h index 1560f03e3..8bb668366 100644 --- a/src/lib/core/backtrace.h +++ b/src/lib/core/backtrace.h @@ -41,7 +41,7 @@ extern "C" { #include char * -backtrace(char *start, size_t size); +backtrace_to_buf(char *start, size_t size); void print_backtrace(void); diff --git a/src/lib/core/crash.c b/src/lib/core/crash.c index abb7837e6..d1990d68b 100644 --- a/src/lib/core/crash.c +++ b/src/lib/core/crash.c @@ -213,7 +213,7 @@ crash_collect(int signo, siginfo_t *siginfo, void *ucontext) #ifdef ENABLE_BACKTRACE char *start = cinfo->backtrace_buf; - backtrace(start, sizeof(cinfo->backtrace_buf)); + backtrace_to_buf(start, sizeof(cinfo->backtrace_buf)); #endif #ifdef HAS_GREG -- 2.31.1