From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 463E43858D1E for ; Thu, 18 Aug 2022 02:59:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 463E43858D1E Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 27I2U4Rh019562 for ; Thu, 18 Aug 2022 02:59:24 GMT Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3j1cpm01s6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Aug 2022 02:59:23 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 27I0uQUI004180 for ; Thu, 18 Aug 2022 02:59:22 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2172.outbound.protection.outlook.com [104.47.55.172]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3j0c2bkvkx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Aug 2022 02:59:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kt7+dDnqfyhgZ5ZLK8PAQCQCmw6iAPbbwNoGQSvLZAu5o+7iy7EzbdoL3UrWMm9dUrO7x2/6he0oWPKXNBl+otY74URwd8kKZwyHhhyuMkOdMyBJanIzttf1V+I656pq0p2v/Av5fe4fbjca/mdkqIoQ0Xcl7b5BLIEJGnV8APRwBv0Ez9lXA7Vn9Q99gvjvcfdiTkZfiif154/MVnaGrOw7CTftUkBzxs4sJDSqOwezv2nJmAW5XJbHUii9RKYJQQalUy8DfWveLSqvXEZ+4rmGalCwZoKC70TbLvdQ7oZ70qVepILTUqGSoESQp0VbrZQWX8T70SIB2I0E/Zz9jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ojYZYn9IUDZa43c/DLIZjuTH/MhDbl47JRFxjacUMLg=; b=X6hTIKfLs/HDRUvc+UBwahEoKy4JPt8g1ewuEM6LAtHDjVt/cHuEhfDBwosZAgVW64waZryQHObCZbSQXNeovRpR69yoJyZl/TmnVDKAKr859TgM9ocgnJ1iKUeDTVGni3zN8fUQ1RdJ5F/SDZFIDMXZYqXVonmGHag0LrECM2Y3eNdftyydCEJvbHBYmz5hLpzufsP0oWmd4dcHzzUrilDBsHg6lr+Q/BVEdJlW1ZOqCukpb5mc9nP3vxRGkP2+JnJIOhsFxCEglBB0Ey0+3PeQ6kjDQY3mkIGQpWU68hY1M2PhOcb3QLXYG5rZDg7Zf4QWi9d0wgLOy6vrQQ4XAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by SN4PR10MB5640.namprd10.prod.outlook.com (2603:10b6:806:20b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Thu, 18 Aug 2022 02:59:21 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::5c25:1d84:4aff:46ba]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::5c25:1d84:4aff:46ba%9]) with mapi id 15.20.5504.028; Thu, 18 Aug 2022 02:59:20 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Subject: [PATCH] gprofng: fix bug 29479 Collection fails when built without java support Date: Wed, 17 Aug 2022 19:59:18 -0700 Message-Id: <20220818025918.1435262-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.27.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SN6PR08CA0003.namprd08.prod.outlook.com (2603:10b6:805:66::16) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb543c24-36aa-4474-48a2-08da80c5a5f4 X-MS-TrafficTypeDiagnostic: SN4PR10MB5640:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x0gf0ZH7bzqDJ/SLkRjv2xHyLHDyI3LVoAIapHUgpr1M9GOcSkoC0ew7fcZyCRXoSIUAl912HXu7SYcr1dsEakSEfdkLKuOENPuXGHjKrdhoUxuE10urvKefb1e5737+jeIWiCniwdlw9kuLeznyGTrCrJ1b7ZCKwNwwbCI5S3QxTur6XjCHplTIaBSfxhVOm5Ey7dLrQEC/kC0EqQnMrL9/id8LWcq1EvdVHMKsRTRWGDUBKOxxcGPVV+T64uVhPeJWTObUZ8D4hLrG+eD+3T1EK6V2SaGPAvPNJwhyFqHbuY5Q7HoaWVvvnPKsOkeDPvu2/UPv4X+zkrdjJRkeYx6hlQitsTzlZOah67l/Nyl0M1QIzZsk+UcWJoRsMyx97qqChJtLepaXZcgCoomEeqpJU+b2Fl1IOTC8ER0UUDjL7ve2UxR1dWlBtv3xCthsccPSnmr9nV/HCuBp5+SBRz7yNGvmF2QXB56oZktQ2lM2PfeGpbJka98ynHRS97yIvQr+sTGTXfkp064K5OBJWB4E0b01x6/GA5nBiX2UC2/wEkhakh+kNMSF9BlE1wQ+j0nyUpA2sTpvUiH05RFxT7CnRh6P4jVTMy2JJSqIzMlkJSVQNCp9Z6/Klf81HAEt0l+dIZscs9u7bPKaKwHvDJy4Ly7M8vVPgXxnpGrGlcp3eyiC0QdGZZjZ3iARj56sqou4GcdKx3CZWnr0o/iqIw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA2PR10MB4636.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(396003)(366004)(136003)(376002)(346002)(39860400002)(66946007)(5660300002)(8676002)(316002)(6916009)(66476007)(8936002)(2906002)(66556008)(38100700002)(86362001)(41300700001)(6506007)(6512007)(9686003)(478600001)(6486002)(1076003)(186003)(36756003)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?K9vAPUsQno/0i0cSwi/d/EbIATls3LKJJK49meBlqLUlWChA6lLwIfwB2+IN?= =?us-ascii?Q?6Yc+QpoyjIuP4IQD4toSyWqCXJZDSsg8JD1R2Odm4r/1dUo1XHiE/SnvCI84?= =?us-ascii?Q?S2SAezspCeYFYEaErDtHLS3HQDdLk57LbVxWKS+6Yupw9d/1b5JVAxjL+nh3?= =?us-ascii?Q?nUtnoPWoB+vD50Zop37mVfA1rSBDaSPVr+v+Z4EX5pe6dAPphSZUHdV2zSFh?= =?us-ascii?Q?iIwiSlpa72KNu0YlGipM5g9hORNlXD2osJ5OuYjLSYsSzeb/SQm3mTDEwa7g?= =?us-ascii?Q?agLA8xK0cimCl8KsZSECZFLF8Ielw/UnK5Rjuz2wQ7w3s5Q9TDToGSztLrE9?= =?us-ascii?Q?jMU+wi5U/VqBhzHaScEh+vF4ZNyC73NqQYwEOmqr/d35WZ6ZjVvnMBDC24cA?= =?us-ascii?Q?PeDLNFLsAq96zMzFqktL9mQGBtAoiaT2TuiLh65A0S+vXBAVtSzpjHsnOm18?= =?us-ascii?Q?+sW0n4z5CXKp5jn+XGXoETBI8Zj1XUd9k7Icpplj5TWwdnXGenTrK8XWLsI8?= =?us-ascii?Q?fIF3CGHOxodCB3U8HWu8a5QS/XkEDdePD+i59osfAPyJHcVzAuTuHvmjR67V?= =?us-ascii?Q?crCTEa31vN5f1eLpfZAm9mPt82svRwx+BATbYgc99P624rZtMC8Fng53AF0Y?= =?us-ascii?Q?sNjDQoByeYzRuUt7fyhGG6fD67jc/3NavF4fzWnSp7SBqtlRb96BryJwmPQa?= =?us-ascii?Q?AoJIbPr0S1EflZAGtdl8FOOhZQvJpCotGju1Q/FRX4D0Gh2y0NtQrZrAUfcE?= =?us-ascii?Q?j2RUcaBaPez1PlpqzuUA64aTCHSm2Pqnh9TMjSi3RYr3Zs2CStf2wa4aFPpE?= =?us-ascii?Q?ToxGBxqebvroBFFBsZKDxiy/ynpWoha59XJGQvFPkZIcHSX1BuLhBD39G29r?= =?us-ascii?Q?ehw3eAxnUpSpnccxQKlgaPMkAaiZt+qudbYCFTFMKonPUmjevZZ7FbZ+fjYs?= =?us-ascii?Q?v4AzpFpeN066CD9tIKL9Z2/p+eBVI+zNM6d5a1w7lDKYJNvBMRe/p60Gfc/i?= =?us-ascii?Q?MCi5zf5Od8g/M0Ih/uZlqrVMWjzK8OuKrQeuz2XprfkVf8V7nbPun6R2jv/8?= =?us-ascii?Q?X25Oo5EP3GE4KIEFpLyfClQprjHLfUZMXU/wPBCfM9TIQybwQzotcOKR1MWc?= =?us-ascii?Q?mj07JXmxsFwWw8Ro3ruJBRbUpqZjUghiOgDvM/tztpL/jM4geOGg0ZZ6SYGj?= =?us-ascii?Q?eIWlVFOqxcgwqfvEdVKp/TbpSjRkh2PIchiH2MUYlvpISq4LRodjW8pG+52b?= =?us-ascii?Q?nU0S8Cp6Np68wiLOQqVLI8Hg0crBBkwPMx8koFczevmDEbMmavahKukqMr6A?= =?us-ascii?Q?VarBar2EV9TcyGvsxQ4QArNV+DBYig9qog9hZxtjFIXYpmg1I1mFep/TP+aV?= =?us-ascii?Q?xfamJ8LiJYcimtBThB4GtgN63mouqEULxDh0VY4pR6Av+4AcOCUj6XNAs6qu?= =?us-ascii?Q?rmEq0qQv8LwRHF5KNFXshNTz1FdJJL4qXU2jFLlQbLn+RAn+yNBejiwTPwIK?= =?us-ascii?Q?d5V/i/zv+RlYKh4l2IfeBXaLct6G+KA7M/yD9I02jx4J/nb8lghXkD4Q2NzS?= =?us-ascii?Q?Mv7lHQiGZvyEjvGcgX7zcBYcEVHbElAvdoJ1cN+xh+hDqHMO8Rpv2wMHU4fO?= =?us-ascii?Q?g7m0H7Y2XjmYpLVhZ4bTdfKuPvFSnf7b81FstnOrkYVv?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: JbjbWqvkq8ABjeKbenfbEINuSSsjOdb624tqtZy5MeMpBEoMtjkDadxIQxkDvR9NgLtQI8GXglqC30wBwC45oULsxinDZQiaYoapK0fWyY9kFnKIPymSc8ZyZGI20KlSLsRcMaErtuYsQEcPQUDQXgFU0S2yxhMVGh6OCOWTC7McfwEEuzCzQUcDU2SvWXclJbDLcC1+zUhQKmd8NiU9JxEiQ1kQb6Gq6jb4NP4x+Vl+c/IFnZcxflAYXSOAoA+Ceu+W0xMyojbT0m/b85ZWM2iSxuFH+mzansHBpajaDuOVLhQYFZohACjU5dThnMq9kFWO3IxDd/7mbTn6aW6xaS+7my187Dvs63Yr+rSazgzxCAXnqM0wc39XxxGb9UCZvdjiNZowTZBSv1Qhavrdy1nImE7sgfbaZiMcR54IClV5Cg9iQ0Jo7D4h2s3ee7iFWy8ZgVnUk3X07gBmKLMDVx8YRTZdjMwuCYnhkjn8OvMR+f+AX/HenbDCR3WVAcUvjT3Yo0WoJrLDfWqdAjGrs/td3RQof3HfZ2Hpjz0zotTH1dS/aiWCIiNzs2APuvB44cxzBd3wB6k2r0FBB7eJ5Yy2fSigKGAPmnWW7Yr41as6US1ml5uAee29QMlxowjwPmqz0cevTlWwXvzaRfPALIzrKaTSgIfhZL/EfX1fnf/otq9DrRxPXM0nCU74rncHMl9c8WZNIhNhz9tT/NfbTA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb543c24-36aa-4474-48a2-08da80c5a5f4 X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2022 02:59:20.8602 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wyF8bwNNvfjpOQ5R/ovFLwWnFzGl8glEZvTeQRvyciKi4omgIdCMe/hQAb4+r/UYii09YEShuH0B4MZPqMlCBW/9lnG1CUkAHx7GxqPt+sI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR10MB5640 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-08-18_01,2022-08-16_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 mlxscore=0 phishscore=0 adultscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000 definitions=main-2208180009 X-Proofpoint-GUID: n5XCkQUbgKK4JCo9Hm-OHlNn-UvfKUhH X-Proofpoint-ORIG-GUID: n5XCkQUbgKK4JCo9Hm-OHlNn-UvfKUhH X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2022 02:59:26 -0000 From: Vladimir Mezentsev gprofng/ChangeLog 2022-08-17 Vladimir Mezentsev PR gprofng/29479 * libcollector/collector.c: Add #if defined(GPROFNG_JAVA_PROFILING) for java specific code. * libcollector/unwind.c: Likewise. --- gprofng/libcollector/collector.c | 2 ++ gprofng/libcollector/unwind.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c index 93c9d3330de..ceff2c1cacc 100644 --- a/gprofng/libcollector/collector.c +++ b/gprofng/libcollector/collector.c @@ -913,8 +913,10 @@ __collector_open_experiment (const char *exp, const char *params, sp_origin_t or __collector_ext_unwind_key_init (1, NULL); /* start java attach if suitable */ +#if defined(GPROFNG_JAVA_PROFILING) if (exp_origin == SP_ORIGIN_DBX_ATTACH) __collector_jprofile_start_attach (); +#endif start_sec_time = CALL_UTIL (time)(NULL); __collector_start_time = collector_interface.getHiResTime (); TprintfT (DBG_LT0, "\t__collector_open_experiment; resetting start_time\n"); diff --git a/gprofng/libcollector/unwind.c b/gprofng/libcollector/unwind.c index 11924378802..f8e11823c81 100644 --- a/gprofng/libcollector/unwind.c +++ b/gprofng/libcollector/unwind.c @@ -557,6 +557,7 @@ __collector_get_frame_info (hrtime_t ts, int mode, void *arg) int size = max_frame_size; #define MIN(a,b) ((a)<(b)?(a):(b)) +#if defined(GPROFNG_JAVA_PROFILING) /* get Java info */ if (__collector_java_mode && __collector_java_asyncgetcalltrace_loaded && context && !pseudo_context) { @@ -569,6 +570,7 @@ __collector_get_frame_info (hrtime_t ts, int mode, void *arg) size -= sz; } } +#endif /* get native stack */ if (context) -- 2.27.0