From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7218846091; Wed, 15 Jan 2025 12:11:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B21D4025F; Wed, 15 Jan 2025 12:11:46 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by mails.dpdk.org (Postfix) with ESMTP id DDF434003C for ; Wed, 15 Jan 2025 12:11:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1736939504; x=1768475504; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=lywl/vvmzHXLLtS4R9WA1E52RbykNNV9ftCxX8GvNhE=; b=c+Ev0auI+5mgyItbt/nZt3Py+F6mgYbpRj5CAS23vh8w2+617FxNFmGQ nEeZ0c3CVUx6BQYUiKWSfdWKOzGvnn9I0DTcjNN43NLvqTzofu3y0wu8+ Fx4VJB0FvX9zRAtM9nRpLJhZzediWXLQjiGIChH16ppMaz5Gbsw17+pQ1 M7DOKcgeQYaQX28it5NgflGGhAvdAB9Cs5nFXu6eae6Bk1vEmpxd7b0Z3 bRyL2nx5hwN1EFvY4AxCty7vRV6z+81MSAB3905qqEImF8ktyKt2SRNZx 1de94qlF9/94YELsTlX4HDk6p5fvdAbDgpnaPa679z7BbWPI38fD0Ix7G g==; X-CSE-ConnectionGUID: GHKWQbG/Qs6aMQRUCZJoYw== X-CSE-MsgGUID: 3wCpzkFzRdiRshtPTDO9ew== X-IronPort-AV: E=McAfee;i="6700,10204,11315"; a="48653311" X-IronPort-AV: E=Sophos;i="6.12,206,1728975600"; d="scan'208";a="48653311" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2025 03:11:43 -0800 X-CSE-ConnectionGUID: 0sCOaYJCSPGIYICzPkdn5Q== X-CSE-MsgGUID: vsNqWWhQRMaYkftfT0u51g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="135958034" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmviesa001.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 15 Jan 2025 03:11:42 -0800 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Wed, 15 Jan 2025 03:11:42 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44 via Frontend Transport; Wed, 15 Jan 2025 03:11:42 -0800 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (104.47.51.40) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Wed, 15 Jan 2025 03:11:41 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bh0qN5UmHeBgUQYJCFdZf6FrVZQIv9U4yvfENktz2GRpgrom7tuHocr2zP5xEpbk5E+cR/g+0GhaaXq7J9W6oCi0j/uA1J0i4cCITIkvi7aEDXhM2D7zIkH9nEARPG2UMle48Jd/bnGivSrJMofJTWQygDE/p4xqtHXB5+NcRFNZfjnS+u+RGNGC5kl+IclPWaHbOuHVz5/r7sjUOD2nYd3cMkH7HG4tYqX7bDWENO8tEa8PRPIAH9lK7l/3PDwEZ6JAKRDiJvnnBV2KZ8WDsGJfUG+8dAr41dV1hEtiRUz7DUZpWjqotDNvfexrUxZPlKMiL3Yp8UZW3gNhEbCaSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=5tZBZhQH41DLcC2oEux/eu06wpiE75Pu2XXHdiCACKI=; b=e3hD4jcE/ewfzPvmGN5l4F8lFOyW15hSpPFATwa7jQ4d+6EUFZPy03Pty78PbGU54ruisnp4PuFV1moqKg0/cwi2cEn6V6CVcHhxWGCCuqNwCdS+rGcurKBjkAl+wZDZdxViek4Pon4ynFs97WTL2tBBrTaqjBLsJ9DGYJk7yAmoyIoPukiFvtCjyGNd9mp2soovW+Q+dqOleopPwrVkGNMNPJzg+jBKswpfNiIUlHVxv1WupdR+YgJVwdS4VNYNMLMyTzOzYbYuEW+bDcCOwVLP2hDlzIgtfS+4EMMYb+ZAHEIvQx8p2/lu1w6ISs3kLFoNBCJIkPClqBiKz0pRfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DS0PR11MB7309.namprd11.prod.outlook.com (2603:10b6:8:13e::17) by DM4PR11MB7301.namprd11.prod.outlook.com (2603:10b6:8:10a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.18; Wed, 15 Jan 2025 11:11:34 +0000 Received: from DS0PR11MB7309.namprd11.prod.outlook.com ([fe80::f120:cc1f:d78d:ae9b]) by DS0PR11MB7309.namprd11.prod.outlook.com ([fe80::f120:cc1f:d78d:ae9b%5]) with mapi id 15.20.8356.010; Wed, 15 Jan 2025 11:11:34 +0000 Date: Wed, 15 Jan 2025 11:11:28 +0000 From: Bruce Richardson To: Andre Muezerie CC: Stephen Hemminger , Subject: Re: [PATCH v11 0/3] add diagnostics macros to make code portable Message-ID: References: <1735263196-2809-1-git-send-email-andremue@linux.microsoft.com> <1735918611-17374-1-git-send-email-andremue@linux.microsoft.com> <20250103112402.64bf2d96@pi5> <20250103212634.GA24552@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net> <20250108024647.GA15780@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net> <20250114192005.GA19265@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net> Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20250114192005.GA19265@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net> X-ClientProxiedBy: DUZPR01CA0328.eurprd01.prod.exchangelabs.com (2603:10a6:10:4ba::13) To DS0PR11MB7309.namprd11.prod.outlook.com (2603:10b6:8:13e::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7309:EE_|DM4PR11MB7301:EE_ X-MS-Office365-Filtering-Correlation-Id: 468c5060-519c-41fa-0d52-08dd35555efe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?kwLQgvA8JT3iu9Ba3uP4HgFRXZM/5lyHkE0gDkMs9pVaiU5brD2d/KCVesvu?= =?us-ascii?Q?GpCA574fq7zC1PNVLaurcpqrNZNuMhAsElfC2O4J4SdaWcWin8Sn/e3ANqgy?= =?us-ascii?Q?lhVVtpdItCnDxtf/FWgXuy0IhAkDkuyySwtjV+rV1koHd0qahSoluPF7dRc6?= =?us-ascii?Q?+jXEyQHIbwC6VBHVkZzw9j55vEJyTFplkuB8WxL0YmMXc0ZNIBESdb2bpIE3?= =?us-ascii?Q?5j1cRlSqd6WurYAOhy3Zb+yzIot+rl9a/ONGEvaMM9onK9HHEktuF9qdg3h5?= =?us-ascii?Q?pZKb8JtyXB/TJaJHHDxuhIsqQbEjr+nLKvTVokULGqFAPWrGCRzpkUfxoYXo?= =?us-ascii?Q?V95ALYYOMUBpKegZia6yoEXzAtNY4xPIHLNUVrl90VZY5kBLE/gVWcbcEumg?= =?us-ascii?Q?CiHU8GdjwfV5dh22WSijHiZpZUf7rKyRUFVSGIXUw84Pn9FgtD0g0Eh2id0u?= =?us-ascii?Q?SrkXsAWh/BjzNZ9nMcVUKVwc1qfPOD0GoXO419phVKkMyIcoSJJgY+X7veuG?= =?us-ascii?Q?X5GstJ8J5lUgRBBmZwrFxVyVlQ5LDqzjGqNs+Rprya2Nlhw4ynKMPVdqD4lA?= =?us-ascii?Q?s8eN8rm9TAPB4XpZWbEBwnDv6Qon9ErKrfGPHpOXU9yJ4NFt5F9BDcaYsOS3?= =?us-ascii?Q?Urq48BfSOCvkVbGag15VcmbznvdjI99C/0xSKUnUgvjxM66XZrJ4gbV38XYg?= =?us-ascii?Q?rZXCKjk++MUs5cAq6kbKJ+nwXGcrj/OiABEkdBsxzPo82fTn9LL5zMjwueQ8?= =?us-ascii?Q?F17F5BwmrR5NrlMGAsJqHWUtwpZT9Cop0T3YZDqytfH2k3zVWG0Tl63HGOzb?= =?us-ascii?Q?Ua9bTkV2kfFwRnuFG6KyYQIu+cDZ97bMETo/Z5BSxgP4B9WepaqGtzlPgSnp?= =?us-ascii?Q?t1zzY1k6mt7EX+ebXLk3R6ZHmSW9j0wTzW+pDCqFmgL8xzHX7LKu41/tUDS0?= =?us-ascii?Q?zqDGxR6g4KJWsfVHM2mo70+FYjGJzEF0R4oNGG7K/qs7kGtUY4JDuFLS6HXg?= =?us-ascii?Q?JVMiCMbkT9OD0/jr5KbwUR/NgzHQEcy7pLVIBqOOlvRTQEjpGG+GqoO6X5W1?= =?us-ascii?Q?G3Cl8m+WvVeCLSEhaLgLiIxB7Hc+hIJFmHBAKNqqny4qASMXnJLbEqcDWjwE?= =?us-ascii?Q?oQbl1D5ZcBNwhhQn9lWlTyI8/Mfl+jc8MjW4iAxHpfdAC1S//H71VMtGpggq?= =?us-ascii?Q?I8j4ykYVn9vP44EuFBufb7rE3POr6X5uxAntRTKBcmgtatDtjTWOyFIgUQbt?= =?us-ascii?Q?HijCzmRxOS+rABQxf4DInB2FlDgwIAsng8AkenDLe/VVURhkuAYmLV2jTrWC?= =?us-ascii?Q?EPubkqcyvUQV7pxfWHw6ZLZR6EVhoH0ql5NVMFUpEyxy+g=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS0PR11MB7309.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(1800799024)(366016)(7053199007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Dk+XA1oeq+18/SGbgeokWV9Gz/KgPZS0sZSdQ/v18YP1iC1OeHlHgGx6jy6J?= =?us-ascii?Q?fqhEUVZvfZTrZSbUww29YG/wC+Zqg2FZK0RaxDCRRgFvmc4C4hj3rL6ClgjA?= =?us-ascii?Q?+B2TgDZalp77vCU8dpQjkCOwCLgQcB/Se2t1I3dv1C+K5a2Slsu5uBGoSQy1?= =?us-ascii?Q?cCiSib5BIgH2ox92DkS08sxoh9CsR0qJvc4HiiSfQXG2KOV7Y7m/nmrznhiJ?= =?us-ascii?Q?88ZBPrAnIBQgCOqEaiboDjjjJJOq8vq8KPqEYkbolHkKepU4j9CxZNxbhrR4?= =?us-ascii?Q?Ta8/wFqNUXZ84nVb8Vnk/E/FkolG3DLy9gQpE6RuCfnS5CvBDrPmFw/D+UiK?= =?us-ascii?Q?SGtcmCPcFNappvlTWmnOB80KSSdWiUIVGLdOFsTy/MNzyA/QSoSu7OlloMCV?= =?us-ascii?Q?gwssv3eKuppdXPu6/sg+CznOKwn5DOOBJ46RzMeCQnHn9xT0RrOI5sCESTJT?= =?us-ascii?Q?7MOOXLLM4H5VmO4Y+y4BOMPSNcMTxxJ9TKH8fiXEI8tszKg1U+/eUUCUC2yE?= =?us-ascii?Q?O/p3yRfBDDw8mfRTMwI5XukW4ewbBm/aeOyhHkInY3KvRs5WQyyJH/HdJbll?= =?us-ascii?Q?Qcc2IRBWHzY+RrBQyOmCk/cDoVR1AgxhluTKfh/3gwVKWiSthbOESkNrYi8m?= =?us-ascii?Q?eGQThne9uRdmm5uVTQ9O8Oj5tn31Iejc9z71bjTPBNfKNHI7a+Fy8X/+Oanv?= =?us-ascii?Q?jFhjfSLgtL/0FJQ0jgAvyUlevpOt1gnpNTcxn5x6I1u9XXYhkjXr9kUOj8VD?= =?us-ascii?Q?jA+5GtuN2H9hfYM5ze8wS3cSkM3b//1gQ4IfXKmslLZc0rAnafMz4ZdEnD25?= =?us-ascii?Q?rzWXsHAxBVfVV9nf4+zOb2C/tF7SwdKEiDsMDCFZ+CdUWnEWbabx1Wzj4R8F?= =?us-ascii?Q?66AgB8NMg+KFCOvhDCO5FQPstTW9IdgUnkEJZ7Rc9Bp3m1uyhUZJU6ZO/ZCy?= =?us-ascii?Q?Co62WpQPq+hMIU9d749559r7A5CGYj2LJgZDGBg3enuTNuvWyNA+/VyClgVC?= =?us-ascii?Q?C8B7hOWesOr9JmlhN92yr3QSqCwpJx9ISOkkc5+JPaBm1vOgobVVygeABcHg?= =?us-ascii?Q?+OzYM1Yu/bHU6l6E/1/ZtaU2GkDevwhXAW1j8L3rgds6UI6xZ9oC5nINpmfw?= =?us-ascii?Q?Oms2E2JPbUCbyd1yCAbcv/tenJCEwROTtAwEmvn/PaANKzY8eisf/dRvuM4h?= =?us-ascii?Q?EyIPFyyHj6aNVPPOrAnMxz7ieqnFufUsqnIfNy+SK0FRsdmQrwC8Of4qXghb?= =?us-ascii?Q?/bYPbOUwd1Dkboo3cTTP+j70v/ifhgPWdVepgCgCsXOIz0ymKkAh5ELmiNLw?= =?us-ascii?Q?C9HUM7+pAB1PIEGiVNjP6vyzBQo2D75mXbD2kxOQVlBQAjJiJWtMezJ89h00?= =?us-ascii?Q?r5jwh0yHq7gwHwKX3B21NckPwUzKVe6kn0N6/LgZO7JOtjcwqOJxxl/Qniy4?= =?us-ascii?Q?muOkTR1GvuZus3cKFNRiqNvOYOw0qXsFL18fKwReFti7ldt1incSpiYpmACV?= =?us-ascii?Q?Gw/3CxkOqbadO3JbAtaPJKXDyGK2tk6HAU9aM9J3gbluIR1fYBB0KVnRWujM?= =?us-ascii?Q?jsS2DzgNW9OuOj0kVSRXXAWZEwMV3GNxw9SiBVRAU9epyWCHnzAwgFq8P2oq?= =?us-ascii?Q?HQ=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 468c5060-519c-41fa-0d52-08dd35555efe X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7309.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2025 11:11:34.0346 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GgHo4piiPBOQQNa0EN7sVqO8tgkAwIlUKr+SKwWlmDKkz8fDEJ4+IpMz0F2buiEeKxcx4LmI5RGH45NGWlwUZkBCEh8HYYPkJVXuJFic964= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB7301 X-OriginatorOrg: intel.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On Tue, Jan 14, 2025 at 11:20:05AM -0800, Andre Muezerie wrote: > On Wed, Jan 08, 2025 at 09:20:27AM +0000, Bruce Richardson wrote: > > On Tue, Jan 07, 2025 at 06:46:48PM -0800, Andre Muezerie wrote: > > > On Mon, Jan 06, 2025 at 11:00:15AM +0000, Bruce Richardson wrote: > > > > On Fri, Jan 03, 2025 at 01:26:34PM -0800, Andre Muezerie wrote: > > > > > On Fri, Jan 03, 2025 at 11:24:02AM -0800, Stephen Hemminger wrote: > > > > > > On Fri, 3 Jan 2025 07:36:48 -0800 > > > > > > Andre Muezerie wrote: > > > > > > > > > > > > > From: Andre Muezerie > > > > > > > To: andremue@linux.microsoft.com > > > > > > > Cc: dev@dpdk.org, stephen@networkplumber.org > > > > > > > Subject: [PATCH v11 0/3] add diagnostics macros to make code portable > > > > > > > Date: Fri, 3 Jan 2025 07:36:48 -0800 > > > > > > > X-Mailer: git-send-email 1.8.3.1 > > > > > > > > > > > > > > It was a common pattern to have "GCC diagnostic ignored" pragmas > > > > > > > sprinkled over the code and only activate these pragmas for certain > > > > > > > compilers (gcc and clang). Clang supports GCC's pragma for > > > > > > > compatibility with existing source code, so #pragma GCC diagnostic > > > > > > > and #pragma clang diagnostic are synonyms for Clang > > > > > > > (https://clang.llvm.org/docs/UsersManual.html). > > > > > > > > > > > > > > Now that effort is being made to make the code compatible with MSVC > > > > > > > these expressions would become more complex. It makes sense to hide > > > > > > > this complexity behind macros. This makes maintenance easier as these > > > > > > > macros are defined in a single place. As a plus the code becomes > > > > > > > more readable as well. > > > > > > > > > > > > Since 90% of these cases are about removing const from a pointer, > > > > > > maybe it would be better to have a macro that did that? > > > > > > > > > > > > Would not work for base driver code which is pretending to be platform independent. > > > > > > > > > > Most of the warnings I've seen were about dropping the volatile qualifier, like the one below: > > > > > > > > > > ../drivers/net/i40e/i40e_rxtx_vec_sse.c:42:32: warning: cast from 'volatile struct i40e_32byte_rx_desc::(unnamed at ../drivers/net/i40e/base/i40e_type.h:803:2) *' to '__attribute__((__vector_size__(2 * sizeof(long long)))) long long *' drops volatile qualifier [-Wcast-qual] > > > > > 42 | _mm_store_si128((__m128i *)&rxdp[i].read, > > > > > | ^ > > > > > > > > > > To make sure I understood your suggestion correctly, you're proposing to replace this > > > > > > > > > > __rte_diagnostic_push > > > > > __rte_diagnostic_ignored_wcast_qual > > > > > _mm_store_si128((__m128i *)&rxdp[i].read, dma_addr0); > > > > > __rte_diagnostic_pop > > > > > > > > > > > > > > > with something like this? > > > > > > > > > > _mm_store_si128(RTE_IGNORE_CAST_QUAL((__m128i *)&rxdp[i].read), dma_addr0); > > > > > > > > > > This could be done, and I think it does look better, despite the slight line length increase. > > > > > > > > +1 for this option. One macro can be used to drop all qualifiers, both > > > > const and volatile, right? > > > > > > Yes, a single macro can drop all qualifiers. I did realize though that the macro must involve the entire expression - it cannot be used just around one parameter, unfortunately. > > > > > For many use cases, those involving pointers, the qualifiers can be cast > > away by passing through a uintptr_t. Just tested this with gcc and clang: > > > > volatile int x = 5; > > int *y = (int *)(uintptr_t)&x; > > printf("*y = %d\n", *y); > > > > works without warnings or errors. Does this similarly work with MSVC? If > > so, we can do a macro specifically for pointers types, which should cover > > 99% of what we need. > > > > /Bruce > > Yes, that also works with MSVC. So for the macro you mentioned, is this what you had in mind? > > old code: > _mm_store_si128((__m128i *)&rxdp[i].read, dma_addr0); > > > new code: > #define RTE_IGNORE_CAST_QUAL(X) \ > (uintptr_t)(X) > > _mm_store_si128((__m128i *)RTE_IGNORE_CAST_QUAL(&rxdp[i].read), dma_addr0); Something like that. However, I'd actually include a (void *) in the macro which should avoid the need for the cast in the store function call: #define RTE_IGNORE_CAST_QUAL(X) (void *)(uintptr_t)(X) Since void pointers are automatically cast to any other pointer type, we save typecasting in lots of other places. If we want to avoid risk of someone trying to use this on non-pointer values, we may also be able to do this as an inline function to give a little type-safety (untested to verify, sadly :-(, just sharing as possible idea): static inline void * rte_ignore_ptr_qualifiers(const volatile void *x) { return (void *)(uintptr_t)x; } /Bruce