From d4943909455e0ae3120d8898abe6fc9e3359d7fc Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 28 Jul 2017 11:00:30 -0400
Subject: [PATCH] Localize console lock

The console code was using a global lock, but the data protected
is per instance.  Change to using a local version.  I couldn't figure out
a generic way for the decorator approach to dereference 'self'
without creating a specific requirement on the class name, so
I changed to using it as a context manager directly for now.

Change-Id: I304b75572fecd3326723d981fec67207d87d0742
---
 pyghmi/ipmi/console.py | 59 +++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/pyghmi/ipmi/console.py b/pyghmi/ipmi/console.py
index a56f9970..db0544a5 100644
--- a/pyghmi/ipmi/console.py
+++ b/pyghmi/ipmi/console.py
@@ -22,10 +22,6 @@ import threading
 
 from pyghmi.ipmi.private import constants
 from pyghmi.ipmi.private import session
-from pyghmi.ipmi.private import util
-
-
-PENDINGOUTPUT = threading.RLock()
 
 
 class Console(object):
@@ -47,6 +43,7 @@ class Console(object):
     def __init__(self, bmc, userid, password,
                  iohandler, port=623,
                  force=False, kg=None):
+        self.outputlock = threading.RLock()
         self.keepaliveid = None
         self.connected = False
         self.broken = False
@@ -167,16 +164,16 @@ class Console(object):
         # discern which channel or even *if* the serial port in question
         # correlates at all to an ipmi channel to check mux
 
-    @util.protect(PENDINGOUTPUT)
     def _addpendingdata(self, data):
-        if isinstance(data, dict):
-            self.pendingoutput.append(data)
-        else:  # it is a text situation
-            if (len(self.pendingoutput) == 0 or
-                    isinstance(self.pendingoutput[-1], dict)):
+        with self.outputlock:
+            if isinstance(data, dict):
                 self.pendingoutput.append(data)
-            else:
-                self.pendingoutput[-1] += data
+            else:  # it is a text situation
+                if (len(self.pendingoutput) == 0 or
+                        isinstance(self.pendingoutput[-1], dict)):
+                    self.pendingoutput.append(data)
+                else:
+                    self.pendingoutput[-1] += data
 
     def _got_cons_input(self, handle):
         """Callback for handle events detected by ipmi session
@@ -225,24 +222,25 @@ class Console(object):
         """
         return session.Session.wait_for_rsp(timeout=timeout)
 
-    @util.protect(PENDINGOUTPUT)
     def _sendpendingoutput(self):
-        if len(self.pendingoutput) == 0:
-            return
-        if isinstance(self.pendingoutput[0], dict):
-            if 'break' in self.pendingoutput[0]:
-                self._sendoutput("", sendbreak=True)
+        with self.outputlock:
+            if len(self.pendingoutput) == 0:
+                return
+            if isinstance(self.pendingoutput[0], dict):
+                if 'break' in self.pendingoutput[0]:
+                    self._sendoutput("", sendbreak=True)
+                else:
+                    raise ValueError
+                del self.pendingoutput[0]
+                return
+            if len(self.pendingoutput[0]) > self.maxoutcount:
+                chunk = self.pendingoutput[0][:self.maxoutcount]
+                self.pendingoutput[0] = self.pendingoutput[0][
+                    self.maxoutcount:]
             else:
-                raise ValueError
-            del self.pendingoutput[0]
-            return
-        if len(self.pendingoutput[0]) > self.maxoutcount:
-            chunk = self.pendingoutput[0][:self.maxoutcount]
-            self.pendingoutput[0] = self.pendingoutput[0][self.maxoutcount:]
-        else:
-            chunk = self.pendingoutput[0]
-            del self.pendingoutput[0]
-        self._sendoutput(chunk)
+                chunk = self.pendingoutput[0]
+                del self.pendingoutput[0]
+            self._sendoutput(chunk)
 
     def _sendoutput(self, output, sendbreak=False):
         self.myseq += 1
@@ -362,7 +360,7 @@ class Console(object):
                     # also add pending output for efficiency and ease
                     newtext = self.lastpayload[4 + ackcount:]
                     newtext = struct.pack("B"*len(newtext), *newtext)
-                    with util.protect(PENDINGOUTPUT):
+                    with self.outputlock:
                         if (self.pendingoutput and
                                 not isinstance(self.pendingoutput[0], dict)):
                             self.pendingoutput[0] = \
@@ -409,6 +407,7 @@ class ServerConsole(Console):
     """
 
     def __init__(self, _session, iohandler, force=False):
+        self.outputlock = threading.RLock()
         self.keepaliveid = None
         self.connected = True
         self.broken = False
@@ -484,7 +483,7 @@ class ServerConsole(Console):
             if nacked and not breakdetected:  # the BMC was in some way unhappy
                 newtext = self.lastpayload[4 + ackcount:]
                 newtext = struct.pack("B"*len(newtext), *newtext)
-                with util.protect(PENDINGOUTPUT):
+                with self.outputlock:
                     if (self.pendingoutput and
                             not isinstance(self.pendingoutput[0], dict)):
                         self.pendingoutput[0] = newtext + self.pendingoutput[0]