From a80a24029dee906eea2632b6f558832358b0884d Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Mon, 17 Feb 2014 21:37:13 +0000
Subject: [PATCH] Rename poorly-named global: usnic_ticks ->
 ompi_btl_usnic_ticks

cmr=v1.7.5:reviewer=dgoodell

This commit was SVN r30752.
---
 ompi/mca/btl/usnic/btl_usnic.h           |  6 +++---
 ompi/mca/btl/usnic/btl_usnic_component.c | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ompi/mca/btl/usnic/btl_usnic.h b/ompi/mca/btl/usnic/btl_usnic.h
index b162513cd5..7cf033ee72 100644
--- a/ompi/mca/btl/usnic/btl_usnic.h
+++ b/ompi/mca/btl/usnic/btl_usnic.h
@@ -11,7 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2006      Sandia National Laboratories. All rights
  *                         reserved.
- * Copyright (c) 2011-2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011-2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -49,11 +49,11 @@ BEGIN_C_DECLS
  * when progression gets called.  It could be incremented by different amounts
  * at other times as needed or as tuning dictates.
  */
-extern uint64_t usnic_ticks;
+extern uint64_t ompi_btl_usnic_ticks;
 static inline uint64_t
 get_nsec(void)
 {
-    return usnic_ticks;
+    return ompi_btl_usnic_ticks;
 }
 
 #ifndef container_of
diff --git a/ompi/mca/btl/usnic/btl_usnic_component.c b/ompi/mca/btl/usnic/btl_usnic_component.c
index 6b2ca4e363..e044def741 100644
--- a/ompi/mca/btl/usnic/btl_usnic_component.c
+++ b/ompi/mca/btl/usnic/btl_usnic_component.c
@@ -11,7 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2006      Sandia National Laboratories. All rights
  *                         reserved.
- * Copyright (c) 2008-2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * $COPYRIGHT$
@@ -79,7 +79,7 @@
 #define max(a,b) ((a) > (b) ? (a) : (b))
 
 /* simulated clock */
-uint64_t usnic_ticks = 0;
+uint64_t ompi_btl_usnic_ticks = 0;
 static opal_event_t usnic_clock_timer_event;
 static bool usnic_clock_timer_event_set = false;
 static struct timeval usnic_clock_timeout;
@@ -439,7 +439,7 @@ static void
 usnic_clock_callback(int fd, short flags, void *timeout)
 {
     /* 1ms == 1,000,000 ns */
-    usnic_ticks += 1000000;
+    ompi_btl_usnic_ticks += 1000000;
 
     /* run progress to make sure time change gets noticed */
     usnic_component_progress();
@@ -936,7 +936,7 @@ static int usnic_component_progress(void)
     static bool fastpath_ok=true;
 
     /* update our simulated clock */
-    usnic_ticks += 5000;
+    ompi_btl_usnic_ticks += 5000;
 
     count = 0;
     if (fastpath_ok) {
@@ -1056,7 +1056,7 @@ static int usnic_component_progress_2(void)
     int c;
 
     /* update our simulated clock */
-    usnic_ticks += 5000;
+    ompi_btl_usnic_ticks += 5000;
 
     /* Poll for completions */
     for (i = 0; i < mca_btl_usnic_component.num_modules; i++) {