commit 4f4712d820ea2e8c49c230be87a60d984ece739a
author Eddie James <eajames@us.ibm.com> Thu Jun 21 15:57:02 2018 -0500
committer Edward A. James <eajames@us.ibm.com> Wed Jun 27 18:15:26 2018 +0000
tree 96507d7e76e7c50f9acb3f6ab6d0ec6da50fd0b7
parent 3c1706a8c36f7d05299ca65e2f3dc9a3785566a6

passthrough: only open /dev/occX during the operation

The file handle was left open constantly, resulting in dead file handles
when FSI is rescanned.

Change-Id: I1ca8b330131eaad3e3672f5e8fbc3b994e8c34d6
Signed-off-by: Eddie James <eajames@us.ibm.com>

occ_pass_through.cpp

diff --git a/occ_pass_through.cpp b/occ_pass_through.cpp
index 4a7057b..424cc22 100644
--- a/occ_pass_through.cpp
+++ b/occ_pass_through.cpp
@@ -35,6 +35,12 @@
     using namespace phosphor::logging;
     using namespace sdbusplus::org::open_power::OCC::Device::Error;
 
+    if (!occActive)
+    {
+         log<level::INFO>("OCC is inactive; cannot perform pass-through");
+         return;
+    }
+
     fd = open(devicePath.c_str(), O_RDWR | O_NONBLOCK);
     if (fd < 0)
     {
@@ -53,6 +59,7 @@
     if (fd >= 0)
     {
         close(fd);
+        fd = -1;
     }
 }
 
@@ -63,6 +70,14 @@
 
     std::vector<int32_t> response {};
 
+    openDevice();
+
+    if (fd < 0)
+    {
+        // OCC is inactive; empty response
+        return response;
+    }
+
     // OCC only understands [bytes] so need array of bytes. Doing this
     // because rest-server currently treats all int* as 32 bit integer.
     std::vector<uint8_t> cmdInBytes;
@@ -115,6 +130,8 @@
         }
     }
 
+    closeDevice();
+
     return response;
 }
 
@@ -131,10 +148,11 @@
         // Extract the OccActive property
         if (sdbusplus::message::variant_ns::get<bool>(propertyMap->second))
         {
-            this->openDevice();
+            occActive = true;
         }
         else
         {
+            occActive = false;
             this->closeDevice();
         }
     }