dynamic_gen2: code cleanup

remove now unused mca parameter, get rid of an unnecesary if-else part,
and move setting the flag outside of the while loop.

Signed-off-by: Edgar Gabriel <egabriel@central.uh.edu>

Author: edgargabriel

ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2.h

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2008-2016 University of Houston. All rights reserved.
+ * Copyright (c) 2008-2020 University of Houston. All rights reserved.
  * Copyright (c) 2015-2018 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
@@ -36,7 +36,6 @@ BEGIN_C_DECLS
 
 extern int mca_fcoll_dynamic_gen2_priority;
 extern int mca_fcoll_dynamic_gen2_num_groups;
-extern int mca_fcoll_dynamic_gen2_write_chunksize;
 
 OMPI_MODULE_DECLSPEC extern mca_fcoll_base_component_2_0_0_t mca_fcoll_dynamic_gen2_component;
 

ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_component.c

@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2008-2016 University of Houston. All rights reserved.
+ * Copyright (c) 2008-2020 University of Houston. All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
@@ -42,7 +42,6 @@ const char *mca_fcoll_dynamic_gen2_component_version_string =
  */
 int mca_fcoll_dynamic_gen2_priority = 10;
 int mca_fcoll_dynamic_gen2_num_groups = 1;
-int mca_fcoll_dynamic_gen2_write_chunksize = -1;
 
 /*
  * Local function
@@ -95,12 +94,5 @@ dynamic_gen2_register(void)
                                            OPAL_INFO_LVL_9,
                                            MCA_BASE_VAR_SCOPE_READONLY, &mca_fcoll_dynamic_gen2_num_groups);
 
-    mca_fcoll_dynamic_gen2_write_chunksize = -1;
-    (void) mca_base_component_var_register(&mca_fcoll_dynamic_gen2_component.fcollm_version,
-                                           "write_chunksize", "Chunk size written at once. Default: stripe_size of the file system",
-                                           MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
-                                           OPAL_INFO_LVL_9,
-                                           MCA_BASE_VAR_SCOPE_READONLY, &mca_fcoll_dynamic_gen2_write_chunksize);
-
     return OMPI_SUCCESS;
 }

ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c

@@ -736,14 +736,13 @@ static int write_init (ompio_file_t *fh, int aggregator, mca_io_ompio_aggregator
 
 
     if ( aggregator == fh->f_rank && aggr_data->prev_num_io_entries) {
+        fh->f_flags |= OMPIO_COLLECTIVE_OP;
         while ( aggr_data->prev_bytes_to_write > 0 ) {
             ssize_t tret;
             aggr_data->prev_bytes_to_write -= mca_fcoll_dynamic_gen2_split_iov_array (fh, aggr_data->prev_io_array, 
                                                                                       aggr_data->prev_num_io_entries, 
                                                                                       &last_array_pos, &last_pos );
-            fh->f_flags |= OMPIO_COLLECTIVE_OP;
             tret = fh->f_fbtl->fbtl_pwritev (fh);
-            fh->f_flags &= ~OMPIO_COLLECTIVE_OP;            
             if ( 0 > tret ) {
                 free ( aggr_data->prev_io_array);
                 opal_output (1, "dynamic_gen2_write_all: fbtl_pwritev failed\n");
@@ -766,6 +765,7 @@ static int write_init (ompio_file_t *fh, int aggregator, mca_io_ompio_aggregator
                        fh->f_io_array[n].length);
 #endif
         }
+        fh->f_flags &= ~OMPIO_COLLECTIVE_OP;            
         free ( fh->f_io_array );
         free ( aggr_data->prev_io_array);
     } 
@@ -1643,12 +1643,7 @@ int mca_fcoll_dynamic_gen2_split_iov_array ( ompio_file_t *fh, mca_common_ompio_
 
         if ( pos == (int)io_array[array_pos].length ) {
             pos = 0;
-            if ((array_pos + 1) < num_entries) {
-                array_pos++;
-            }
-            else {
-                break;
-            }
+            array_pos++;
         }
     } while ( (array_pos < num_entries) && (((off_t)io_array[array_pos].offset+pos ) < endaddr)  );