From patchwork Wed May 28 20:01:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 4257041 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 879CB9F1E7 for ; Wed, 28 May 2014 20:01:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B4CE3200F3 for ; Wed, 28 May 2014 20:01:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08BC4200F0 for ; Wed, 28 May 2014 20:01:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752031AbaE1UBN (ORCPT ); Wed, 28 May 2014 16:01:13 -0400 Received: from mail-we0-f172.google.com ([74.125.82.172]:53017 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751975AbaE1UBM (ORCPT ); Wed, 28 May 2014 16:01:12 -0400 Received: by mail-we0-f172.google.com with SMTP id k48so11998520wev.17 for ; Wed, 28 May 2014 13:01:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding; bh=yLuSwDtPXhUWRPDPeb7yrzuxeddCHIbVJZcKkpHFj10=; b=Z2eaKDpK/GdRl1xj2Y34WbkPhRJDXmpd0bOx9bBnuvdxoOIN9vGF+o4Nby4VduzDkA 79eVj7y9iQmRZQbE6CgjWfIW5iHtIuJ7V0s1Acmfdjj8M3c7d1RH5MVjIDaTYVFOddW2 XA/KHc3bGpt37KM8heAwIEiWxd8pVzD3R7Oumyuusch8uD7uWTBcl1zywSq8z2nsJzJ8 9+RtbdzNv9t2u+An7y2f7LQkTyqzgMIv42LPm/DFEd7dZz7fIxVgQSuP9bwQUf5d9sJ6 zEXX+8ENFPcvofU0+C8hD+YO3bhdVJZuXHIffHIKGDWADHmZQdqPQx7k0SPet3pcHMQq gmSA== X-Gm-Message-State: ALoCoQkj86uud8r/LmbBWkofS6YnYymnudBq2V9tcYPPNy+5dPMFo1Rg0fyjV3eF4gdJyioYADD9 X-Received: by 10.180.106.194 with SMTP id gw2mr3952970wib.47.1401307270738; Wed, 28 May 2014 13:01:10 -0700 (PDT) Received: from [192.168.1.102] (c-98-229-118-119.hsd1.ma.comcast.net. [98.229.118.119]) by mx.google.com with ESMTPSA id nb8sm19434167wic.18.2014.05.28.13.01.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 28 May 2014 13:01:10 -0700 (PDT) Message-ID: <53864083.2060305@dev.mellanox.co.il> Date: Wed, 28 May 2014 16:01:07 -0400 From: Hal Rosenstock User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:9.0) Gecko/20111222 Thunderbird/9.0.1 MIME-Version: 1.0 To: "linux-rdma (linux-rdma@vger.kernel.org)" CC: Ira Weiny Subject: [PATCH opensm] PerfMgr: Eliminate no longer used sig_sweep variable Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP sig_sweep was mostly neutered back in 2007. Code in osm_perfmgr.c:osm_perfmgr_process is problematic if max_outstanding_queries is exceeded as nothing signals sig_sweep event anymore. Remove this as this code is no longer needed. Signed-off-by: Hal Rosenstock --- -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/opensm/osm_perfmgr.h b/include/opensm/osm_perfmgr.h index 93e57a6..ab02c26 100644 --- a/include/opensm/osm_perfmgr.h +++ b/include/opensm/osm_perfmgr.h @@ -125,7 +125,6 @@ struct osm_opensm; * be manipulated only through the provided functions. */ typedef struct osm_perfmgr { - cl_event_t sig_sweep; cl_timer_t sweep_timer; struct osm_opensm *osm; osm_subn_t *subn; diff --git a/opensm/osm_perfmgr.c b/opensm/osm_perfmgr.c index 2db9585..1c0ed46 100644 --- a/opensm/osm_perfmgr.c +++ b/opensm/osm_perfmgr.c @@ -1071,10 +1071,6 @@ void osm_perfmgr_process(osm_perfmgr_t * pm) remove_marked_nodes(pm); #ifdef ENABLE_OSM_PERF_MGR_PROFILE - /* spin on outstanding queries */ - while (pm->outstanding_queries > 0) - cl_event_wait_on(&pm->sig_sweep, 1000, TRUE); - gettimeofday(&after, NULL); diff_time(&before, &after, &after); osm_log_v2(pm->log, OSM_LOG_INFO, FILE_ID, @@ -1876,8 +1872,6 @@ ib_api_status_t osm_perfmgr_init(osm_perfmgr_t * pm, osm_opensm_t * osm, memset(pm, 0, sizeof(*pm)); - cl_event_construct(&pm->sig_sweep); - cl_event_init(&pm->sig_sweep, FALSE); pm->subn = &osm->subn; pm->sm = &osm->sm; pm->log = &osm->log;