From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sat, 18 Nov 2017 22:57:44 +0000 (+0100)
Subject: Handle shmem init failures in cpu affinity setup code
X-Git-Tag: v0.3.0~64^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07e7c36dac30f8f4864d86efad44a4e1b74e8ff3;p=platform%2Fupstream%2Fopenblas.git

Handle shmem init failures in cpu affinity setup code

Failures to obtain or attach shared memory segments would lead to an exit without explanation of the exact cause.
This change introduces a more verbose error message and tries to make the code continue without setting cpu affinity.
Fixes #1351
---

diff --git a/driver/others/init.c b/driver/others/init.c
index 962794b..5fb032f 100644
--- a/driver/others/init.c
+++ b/driver/others/init.c
@@ -26,7 +26,7 @@ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIA
 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+kOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 **********************************************************************************/
@@ -635,6 +635,8 @@ static int open_shmem(void) {
 
   int try = 0;
 
+  int err = 0;
+  
   do {
 
 #if defined(BIGNUMA)
@@ -652,18 +654,22 @@ static int open_shmem(void) {
 #endif
     }
 
+    if (shmid == -1) err = errno;
+    
     try ++;
 
   } while ((try < 10) && (shmid == -1));
 
   if (shmid == -1) {
-    perror ("Obtaining shared memory segment failed in open_shmem");
+    fprintf (stderr, "Obtaining shared memory segment failed in open_shmem: %s\n",strerror(err));
+    fprintf (stderr, "Setting CPU affinity not possible without shared memory access.\n");
     return (1);
   }
 
   if (shmid != -1) {
     if ( (common = shmat(shmid, NULL, 0)) == (void*)-1) {
       perror ("Attaching shared memory segment failed in open_shmem");
+      fprintf (stderr, "Setting CPU affinity not possible without shared memory access.\n");
       return (1);
     }
   }
@@ -679,11 +685,13 @@ static int create_pshmem(void) {
 
   if (pshmid == -1) {
     perror ("Obtaining shared memory segment failed in create_pshmem");
+    fprintf (stderr, "Setting CPU affinity not possible without shared memory access.\n");
     return(1);
   }
   
   if ( (paddr = shmat(pshmid, NULL, 0)) == (void*)-1) {
     perror ("Attaching shared memory segment failed in create_pshmem");
+    fprintf (stderr, "Setting CPU affinity not possible without shared memory access.\n");
     return (1);
   }