Merge pull request #5297 from edgargabriel/topic/sharedfp-revamp

sharedfp/sm and lockedfile: fix coverty warnings

Author: edgargabriel

ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_file_open.c

@@ -78,9 +78,15 @@ int mca_sharedfp_lockedfile_file_open (struct ompi_communicator_t *comm,
         ompi_proc_t *masterproc = ompi_group_peer_lookup(comm->c_local_group, 0 );
         masterjobid = OMPI_CAST_RTE_NAME(&masterproc->super.proc_name)->jobid;
     }
-    comm->c_coll->coll_bcast ( &masterjobid, 1, MPI_UNSIGNED, 0, comm, 
-                               comm->c_coll->coll_bcast_module );
- 
+    err = comm->c_coll->coll_bcast ( &masterjobid, 1, MPI_UNSIGNED, 0, comm, 
+                                     comm->c_coll->coll_bcast_module );
+    if ( OMPI_SUCCESS != err ) {
+        opal_output(0, "[%d]mca_sharedfp_lockedfile_file_open: Error in bcast operation\n", fh->f_rank);
+	free (sh);
+	free(module_data);
+        return err;
+    }
+
     size_t filenamelen = strlen(filename) + 16;
     lockedfilename = (char*)malloc(sizeof(char) * filenamelen);
     if ( NULL == lockedfilename ) {
@@ -100,16 +106,33 @@ int mca_sharedfp_lockedfile_file_open (struct ompi_communicator_t *comm,
 	 *therefore there is no need to lock the file
 	 */
 	handle = open ( lockedfilename, O_RDWR | O_CREAT, 0644 );
+        if ( -1 == handle ){
+            opal_output(0, "[%d]mca_sharedfp_lockedfile_file_open: Error during file open\n", 
+                        fh->f_rank);
+            free (sh);
+            free(module_data);
+            free (lockedfilename);
+            return OMPI_ERROR;
+        }
 	write ( handle, &position, sizeof(OMPI_MPI_OFFSET_TYPE) );
 	close ( handle );
     }
-    comm->c_coll->coll_barrier ( comm, comm->c_coll->coll_barrier_module );
+    err = comm->c_coll->coll_barrier ( comm, comm->c_coll->coll_barrier_module );
+    if ( OMPI_SUCCESS != err ) {
+        opal_output(0, "[%d]mca_sharedfp_lockedfile_file_open: Error in barrier operation\n", fh->f_rank);
+	free (sh);
+	free(module_data);
+        free (lockedfilename);
+        return err;
+    }
 
     handle = open ( lockedfilename, O_RDWR, 0644  );
     if ( -1 == handle ) {
-        opal_output(0, "[%d]mca_sharedfp_lockedfile_file_open: Error during file open\n", fh->f_rank);
+        opal_output(0, "[%d]mca_sharedfp_lockedfile_file_open: Error during file open\n", 
+                    fh->f_rank);
 	free (sh);
 	free(module_data);
+        free (lockedfilename);
         return OMPI_ERROR;
     }
 
@@ -120,9 +143,7 @@ int mca_sharedfp_lockedfile_file_open (struct ompi_communicator_t *comm,
     /*remember the shared file handle*/
     fh->f_sharedfp_data = sh;
 
-    comm->c_coll->coll_barrier ( comm, comm->c_coll->coll_barrier_module );
-
-    return err;
+    return comm->c_coll->coll_barrier ( comm, comm->c_coll->coll_barrier_module );
 }
 
 int mca_sharedfp_lockedfile_file_close (ompio_file_t *fh)

ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c

@@ -126,12 +126,20 @@ int mca_sharedfp_sm_file_open (struct ompi_communicator_t *comm,
 
     sm_data->sm_filename = sm_filename;
 
-    /*TODO: is it necessary to write to the file first?*/
+    /* TODO: is it necessary to write to the file first? */
     if( 0 == fh->f_rank ){
         memset ( &sm_offset, 0, sizeof (struct mca_sharedfp_sm_offset ));
         write ( sm_fd, &sm_offset, sizeof(struct mca_sharedfp_sm_offset));
     }
-    comm->c_coll->coll_barrier (comm, comm->c_coll->coll_barrier_module );
+    err = comm->c_coll->coll_barrier (comm, comm->c_coll->coll_barrier_module );
+    if ( OMPI_SUCCESS != err ) {
+        opal_output(0,"mca_sharedfp_sm_file_open: Error in barrier operation \n");
+        free(sm_filename);
+        free(sm_data);
+        free(sh);
+        close (sm_fd);
+        return err;
+    }
 
     /*the file has been written to, now we can map*/
     sm_offset_ptr = mmap(NULL, sizeof(struct mca_sharedfp_sm_offset), PROT_READ | PROT_WRITE,
@@ -188,18 +196,26 @@ int mca_sharedfp_sm_file_open (struct ompi_communicator_t *comm,
         free(sm_data);
         free(sh);
         munmap(sm_offset_ptr, sizeof(struct mca_sharedfp_sm_offset));
-        err = OMPI_ERROR;
+        return OMPI_ERROR;
     }
 
-    comm->c_coll->coll_barrier (comm, comm->c_coll->coll_barrier_module );
+    err = comm->c_coll->coll_barrier (comm, comm->c_coll->coll_barrier_module );
+    if ( OMPI_SUCCESS != err ) {
+        opal_output(0,"mca_sharedfp_sm_file_open: Error in barrier operation \n");
+        free(sm_filename);
+        free(sm_data);
+        free(sh);
+        munmap(sm_offset_ptr, sizeof(struct mca_sharedfp_sm_offset));
+        return err;
+    }
 
 #if defined(HAVE_SEM_OPEN)
     if ( 0 == fh->f_rank ) {
         sem_unlink ( sm_data->sem_name);
     }
 #endif
 
-    return err;
+    return OMPI_SUCCESS;
 }
 
 int mca_sharedfp_sm_file_close (ompio_file_t *fh)