From patchwork Mon Oct 17 19:11:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9380281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 380BC608A7 for ; Mon, 17 Oct 2016 19:11:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BBC728567 for ; Mon, 17 Oct 2016 19:11:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 106CA28FE7; Mon, 17 Oct 2016 19:11:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC89B28FDD for ; Mon, 17 Oct 2016 19:11:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964843AbcJQTLo (ORCPT ); Mon, 17 Oct 2016 15:11:44 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:56705 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964874AbcJQTLh (ORCPT ); Mon, 17 Oct 2016 15:11:37 -0400 Received: from [83.175.99.196] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.85_2 #1 (Red Hat Linux)) id 1bwDJw-0006T8-3D for linux-rdma@vger.kernel.org; Mon, 17 Oct 2016 19:11:36 +0000 From: Christoph Hellwig To: linux-rdma@vger.kernel.org Subject: [PATCH 03/13] ibacm: use __thread directly Date: Mon, 17 Oct 2016 21:11:12 +0200 Message-Id: <1476731482-26491-4-git-send-email-hch@lst.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1476731482-26491-1-git-send-email-hch@lst.de> References: <1476731482-26491-1-git-send-email-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Christoph Hellwig --- ibacm/linux/osd.h | 1 - ibacm/prov/acmp/src/acmp.c | 2 +- ibacm/src/acm.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ibacm/linux/osd.h b/ibacm/linux/osd.h index 3580cc3..31a7044 100644 --- a/ibacm/linux/osd.h +++ b/ibacm/linux/osd.h @@ -136,7 +136,6 @@ static inline uint64_t time_stamp_us(void) #define time_stamp_sec() (time_stamp_ms() / (uint64_t) 1000) #define time_stamp_min() (time_stamp_sec() / (uint64_t) 60) -#define PER_THREAD __thread static inline int beginthread(void (*func)(void *), void *arg) { pthread_t thread; diff --git a/ibacm/prov/acmp/src/acmp.c b/ibacm/prov/acmp/src/acmp.c index 24d2b70..1f3aeef 100644 --- a/ibacm/prov/acmp/src/acmp.c +++ b/ibacm/prov/acmp/src/acmp.c @@ -259,7 +259,7 @@ static atomic_t wait_cnt; static pthread_t retry_thread_id; static int retry_thread_started = 0; -PER_THREAD char log_data[ACM_MAX_ADDRESS]; +__thread char log_data[ACM_MAX_ADDRESS]; /* * Service options - may be set through ibacm_opts.cfg file. diff --git a/ibacm/src/acm.c b/ibacm/src/acm.c index d40aa71..33fc044 100644 --- a/ibacm/src/acm.c +++ b/ibacm/src/acm.c @@ -186,7 +186,7 @@ static struct acmc_client client_array[FD_SETSIZE - 1]; static FILE *flog; static pthread_mutex_t log_lock; -PER_THREAD char log_data[ACM_MAX_ADDRESS]; +__thread char log_data[ACM_MAX_ADDRESS]; static atomic_t counter[ACM_MAX_COUNTER]; static struct acmc_device *