Finish work related to ticket #1392 where the versions

were bumped from v1.0.0 to v2.0.0.  

This change fixed #1439.

This commit was SVN r19175.

ompi/file/file.c

@@ -10,6 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -272,8 +273,8 @@ static void file_destructor(ompi_file_t *file)
     /* Finalize the module */
 
     switch (file->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        file->f_io_selected_module.v1_0_0.io_module_file_close(file);
+        file->f_io_selected_module.v2_0_0.io_module_file_close(file);
         break;
 
     default:

ompi/mca/io/base/io_base_component_list.c

@@ -103,10 +103,10 @@ int mca_io_base_component_add(mca_io_base_components_t *comp)
         citem->component = *comp;
 
         c = (mca_base_component_t *) (&citem->component);
-        if (1 == c->mca_type_major_version &&
+        if (2 == c->mca_type_major_version &&
             0 == c->mca_type_minor_version &&
             0 == c->mca_type_release_version) {
-            citem->version = MCA_IO_BASE_V_1_0_0;
+            citem->version = MCA_IO_BASE_V_2_0_0;
         } else {
             citem->version = MCA_IO_BASE_V_NONE;
         }
@@ -185,8 +185,8 @@ int mca_io_base_component_run_progress(void)
         citem = (component_item_t *) item;
 
         switch (citem->version) {
-        case MCA_IO_BASE_V_1_0_0:
+        case MCA_IO_BASE_V_2_0_0:
-            ret = citem->component.v1_0_0.io_progress();
+            ret = citem->component.v2_0_0.io_progress();
             if (ret > 0) {
                 count += ret;
             }

ompi/mca/io/base/io_base_delete.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -57,7 +58,7 @@ static avail_io_t *check_one_component(const mca_base_component_t *component,
 
 static avail_io_t *query(const mca_base_component_t *component,
                          char *filename, struct ompi_info_t *info);
-static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *io_component, 
+static avail_io_t *query_2_0_0(const mca_io_base_component_2_0_0_t *io_component, 
                                char *filename, struct ompi_info_t *info);
 
 static void unquery(avail_io_t *avail, char *filename, struct ompi_info_t *info);
@@ -171,7 +172,7 @@ int mca_io_base_delete(char *filename, struct ompi_info_t *info)
   
     opal_output_verbose(10, mca_io_base_output,
                         "io:base:delete: Selected io component %s", 
-                        selected.ai_component.v1_0_0.io_version.mca_component_name);
+                        selected.ai_component.v2_0_0.io_version.mca_component_name);
   
     return OMPI_SUCCESS;
 }
@@ -313,16 +314,16 @@ static avail_io_t *check_one_component(const mca_base_component_t *component,
 static avail_io_t *query(const mca_base_component_t *component, 
                          char *filename, struct ompi_info_t *info)
 {
-    const mca_io_base_component_2_0_0_t *ioc_100;
+    const mca_io_base_component_2_0_0_t *ioc_200;
 
-    /* io v1.0.0 */
+    /* io v2.0.0 */
 
-    if (1 == component->mca_major_version &&
+    if (2 == component->mca_major_version &&
         0 == component->mca_minor_version &&
         0 == component->mca_release_version) {
-        ioc_100 = (mca_io_base_component_2_0_0_t *) component;
+        ioc_200 = (mca_io_base_component_2_0_0_t *) component;
         
-        return query_1_0_0(ioc_100, filename, info);
+        return query_2_0_0(ioc_200, filename, info);
     }
 
     /* Unknown io API version -- return error */
@@ -331,7 +332,7 @@ static avail_io_t *query(const mca_base_component_t *component,
 }
 
 
-static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *component,
+static avail_io_t *query_2_0_0(const mca_io_base_component_2_0_0_t *component,
                                char *filename, struct ompi_info_t *info)
 {
     bool usable;
@@ -339,7 +340,7 @@ static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *component,
     avail_io_t *avail;
     struct mca_io_base_delete_t *private_data;
 
-    /* Query v1.0.0 */
+    /* Query v2.0.0 */
 
     avail = NULL;
     private_data = NULL;
@@ -348,9 +349,9 @@ static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *component,
                                      &priority);
     if (OMPI_SUCCESS == ret && usable) {
         avail = OBJ_NEW(avail_io_t);
-        avail->ai_version = MCA_IO_BASE_V_1_0_0;
+        avail->ai_version = MCA_IO_BASE_V_2_0_0;
         avail->ai_priority = priority;
-        avail->ai_component.v1_0_0 = *component;
+        avail->ai_component.v2_0_0 = *component;
         avail->ai_private_data = private_data;
     }
 
@@ -364,13 +365,13 @@ static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *component,
 
 static void unquery(avail_io_t *avail, char *filename, struct ompi_info_t *info)
 {
-    const mca_io_base_component_2_0_0_t *ioc_100;
+    const mca_io_base_component_2_0_0_t *ioc_200;
 
     switch(avail->ai_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        ioc_100 = &(avail->ai_component.v1_0_0);
+        ioc_200 = &(avail->ai_component.v2_0_0);
-        if (NULL != ioc_100->io_delete_unquery) {
+        if (NULL != ioc_200->io_delete_unquery) {
-            ioc_100->io_delete_unquery(filename, info, avail->ai_private_data);
+            ioc_200->io_delete_unquery(filename, info, avail->ai_private_data);
         }
         break;
 
@@ -389,12 +390,12 @@ static void unquery(avail_io_t *avail, char *filename, struct ompi_info_t *info)
  */
 static int delete_file(avail_io_t *avail, char *filename, struct ompi_info_t *info)
 {
-    const mca_io_base_component_2_0_0_t *ioc_100;
+    const mca_io_base_component_2_0_0_t *ioc_200;
 
     switch(avail->ai_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        ioc_100 = &(avail->ai_component.v1_0_0);
+        ioc_200 = &(avail->ai_component.v2_0_0);
-        return ioc_100->io_delete_select(filename, info,
+        return ioc_200->io_delete_select(filename, info,
                                          avail->ai_private_data);
         break;
 

ompi/mca/io/base/io_base_file_select.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -61,7 +62,7 @@ static avail_io_t *check_one_component(ompi_file_t *file,
 
 static avail_io_t *query(const mca_base_component_t *component, 
                          ompi_file_t *file);
-static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *io_component, 
+static avail_io_t *query_2_0_0(const mca_io_base_component_2_0_0_t *io_component, 
                                ompi_file_t *file);
 
 static void unquery(avail_io_t *avail, ompi_file_t *file);
@@ -223,7 +224,7 @@ int mca_io_base_file_select(ompi_file_t *file,
   
     opal_output_verbose(10, mca_io_base_output,
                         "io:base:file_select: Selected io module %s", 
-                        selected.ai_component.v1_0_0.io_version.mca_component_name);
+                        selected.ai_component.v2_0_0.io_version.mca_component_name);
   
     return OMPI_SUCCESS;
 }
@@ -365,16 +366,16 @@ static avail_io_t *check_one_component(ompi_file_t *file,
 static avail_io_t *query(const mca_base_component_t *component, 
                          ompi_file_t *file)
 {
-    const mca_io_base_component_2_0_0_t *ioc_100;
+    const mca_io_base_component_2_0_0_t *ioc_200;
 
-    /* io v1.0.0 */
+    /* io v2.0.0 */
 
-    if (1 == component->mca_major_version &&
+    if (2 == component->mca_major_version &&
         0 == component->mca_minor_version &&
         0 == component->mca_release_version) {
-        ioc_100 = (mca_io_base_component_2_0_0_t *) component;
+        ioc_200 = (mca_io_base_component_2_0_0_t *) component;
         
-        return query_1_0_0(ioc_100, file);
+        return query_2_0_0(ioc_200, file);
     }
 
     /* Unknown io API version -- return error */
@@ -383,25 +384,25 @@ static avail_io_t *query(const mca_base_component_t *component,
 }
 
 
-static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *component,
+static avail_io_t *query_2_0_0(const mca_io_base_component_2_0_0_t *component,
                                ompi_file_t *file)
 {
     int priority;
     avail_io_t *avail;
-    const mca_io_base_module_1_0_0_t *module;
+    const mca_io_base_module_2_0_0_t *module;
     struct mca_io_base_file_t *module_data;
 
-    /* Query v1.0.0 */
+    /* Query v2.0.0 */
 
     avail = NULL;
     module_data = NULL;
     module = component->io_file_query(file, &module_data, &priority);
     if (NULL != module) {
         avail = OBJ_NEW(avail_io_t);
-        avail->ai_version = MCA_IO_BASE_V_1_0_0;
+        avail->ai_version = MCA_IO_BASE_V_2_0_0;
         avail->ai_priority = priority;
-        avail->ai_component.v1_0_0 = *component;
+        avail->ai_component.v2_0_0 = *component;
-        avail->ai_module.v1_0_0 = *module;
+        avail->ai_module.v2_0_0 = *module;
         avail->ai_module_data = module_data;
     }
 
@@ -415,12 +416,12 @@ static avail_io_t *query_1_0_0(const mca_io_base_component_2_0_0_t *component,
 
 static void unquery(avail_io_t *avail, ompi_file_t *file)
 {
-    const mca_io_base_component_2_0_0_t *ioc_100;
+    const mca_io_base_component_2_0_0_t *ioc_200;
 
     switch(avail->ai_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        ioc_100 = &(avail->ai_component.v1_0_0);
+        ioc_200 = &(avail->ai_component.v2_0_0);
-        ioc_100->io_file_unquery(file, avail->ai_module_data);
+        ioc_200->io_file_unquery(file, avail->ai_module_data);
         break;
 
     default:
@@ -438,12 +439,12 @@ static void unquery(avail_io_t *avail, ompi_file_t *file)
  */
 static int module_init(ompi_file_t *file)
 {
-    const mca_io_base_module_1_0_0_t *iom_100;
+    const mca_io_base_module_2_0_0_t *iom_200;
 
     switch(file->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        iom_100 = &(file->f_io_selected_module.v1_0_0);
+        iom_200 = &(file->f_io_selected_module.v2_0_0);
-        return iom_100->io_module_file_open(file->f_comm, file->f_filename,
+        return iom_200->io_module_file_open(file->f_comm, file->f_filename,
                                             file->f_amode, file->f_info,
                                             file);
         break;

ompi/mca/io/base/io_base_find_available.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -41,7 +42,7 @@ static int init_query(const mca_base_component_t *ls,
                       mca_base_component_priority_list_item_t *entry,
                       bool enable_progress_threads,
                       bool enable_mpi_threads);
-static int init_query_1_0_0(const mca_base_component_t *ls, 
+static int init_query_2_0_0(const mca_base_component_t *ls, 
                             mca_base_component_priority_list_item_t *entry,
                             bool enable_progress_threads,
                             bool enable_mpi_threads);
@@ -149,10 +150,10 @@ static int init_query(const mca_base_component_t *m,
     /* This component has already been successfully opened.  So now
        query it. */
 
-    if (1 == m->mca_type_major_version &&
+    if (2 == m->mca_type_major_version &&
         0 == m->mca_type_minor_version &&
         0 == m->mca_type_release_version) {
-        ret = init_query_1_0_0(m, entry, enable_progress_threads, 
+        ret = init_query_2_0_0(m, entry, enable_progress_threads, 
                                enable_mpi_threads);
     } else {
         /* Unrecognized io API version */
@@ -188,9 +189,9 @@ static int init_query(const mca_base_component_t *m,
 
 
 /*
- * Query a specific component, io v1.0.0
+ * Query a specific component, io v2.0.0
  */
-static int init_query_1_0_0(const mca_base_component_t *component, 
+static int init_query_2_0_0(const mca_base_component_t *component, 
                             mca_base_component_priority_list_item_t *entry,
                             bool enable_progress_threads,
                             bool enable_mpi_threads)

ompi/mca/io/base/io_base_register_datarep.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -34,7 +35,7 @@ mca_io_base_register_datarep(char *datarep,
 {
     opal_list_item_t *p;
     const mca_base_component_t *component;
-    const mca_io_base_component_2_0_0_t *v100;
+    const mca_io_base_component_2_0_0_t *v200;
     int tmp, ret = OMPI_SUCCESS;
 
     /* Find the maximum additional number of bytes required by all io
@@ -46,14 +47,14 @@ mca_io_base_register_datarep(char *datarep,
         component = ((mca_base_component_priority_list_item_t *) 
                      p)->super.cli_component;
 
-        /* Only know how to handle v1.0.0 components for now */
+        /* Only know how to handle v2.0.0 components for now */
-        if (component->mca_type_major_version == 1 &&
+        if (component->mca_type_major_version == 2 &&
             component->mca_type_minor_version == 0 &&
             component->mca_type_release_version == 0) {
-            v100 = (mca_io_base_component_2_0_0_t *) component;
+            v200 = (mca_io_base_component_2_0_0_t *) component;
 
             /* return first non-good error-code */
-            tmp = v100->io_register_datarep(datarep, read_fn, write_fn, 
+            tmp = v200->io_register_datarep(datarep, read_fn, write_fn, 
                                             extent_fn, state);
             ret = (ret == OMPI_SUCCESS) ? tmp : ret;
         }

ompi/mca/io/base/io_base_request.c

@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -69,7 +70,7 @@ int mca_io_base_request_create_freelist(void)
 {
     opal_list_item_t *p;
     const mca_base_component_t *component;
-    const mca_io_base_component_2_0_0_t *v100;
+    const mca_io_base_component_2_0_0_t *v200;
     size_t size = 0;
     int i, init, incr;
 
@@ -82,14 +83,14 @@ int mca_io_base_request_create_freelist(void)
         component = ((mca_base_component_priority_list_item_t *) 
                      p)->super.cli_component;
 
-        /* Only know how to handle v1.0.0 components for now */
+        /* Only know how to handle v2.0.0 components for now */
 
-        if (component->mca_type_major_version == 1 &&
+        if (component->mca_type_major_version == 2 &&
             component->mca_type_minor_version == 0 &&
             component->mca_type_release_version == 0) {
-            v100 = (mca_io_base_component_2_0_0_t *) component;
+            v200 = (mca_io_base_component_2_0_0_t *) component;
-            if (v100->io_request_bytes > size) {
+            if (v200->io_request_bytes > size) {
-                size = v100->io_request_bytes;
+                size = v200->io_request_bytes;
             }
         }
     }
@@ -157,7 +158,7 @@ int mca_io_base_request_alloc(ompi_file_t *file,
         /* Call the per-use init function, if it exists */
 
         switch (file->f_io_version) {
-        case MCA_IO_BASE_V_1_0_0:
+        case MCA_IO_BASE_V_2_0_0:
 
             /* These can be set once for this request since this
                request will always be used with the same module (and
@@ -169,15 +170,15 @@ int mca_io_base_request_alloc(ompi_file_t *file,
             (*req)->req_ver = file->f_io_version;
             (*req)->free_called = false;
             (*req)->super.req_free =
-                file->f_io_selected_module.v1_0_0.io_module_request_free;
+                file->f_io_selected_module.v2_0_0.io_module_request_free;
             (*req)->super.req_cancel =
-                file->f_io_selected_module.v1_0_0.io_module_request_cancel;
+                file->f_io_selected_module.v2_0_0.io_module_request_cancel;
 
             /* Call the module's once-per process init, if it
                exists */
 
             func = 
-                file->f_io_selected_module.v1_0_0.io_module_request_once_init;
+                file->f_io_selected_module.v2_0_0.io_module_request_once_init;
             if (NULL != func) {
                 if (OMPI_SUCCESS != 
                     (err = func(&file->f_io_selected_module, *req))) {

ompi/mca/io/io.h

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -40,7 +41,7 @@ struct mca_io_base_request_t;
 /*
  * Forward declarations of things declared in this file
  */
-struct mca_io_base_module_1_0_0_t;
+struct mca_io_base_module_2_0_0_t;
 union mca_io_base_modules_t;
 
 
@@ -49,14 +50,14 @@ union mca_io_base_modules_t;
  *
  * The IO component is being designed to ensure that it can
  * simultaneously support multiple component versions in a single
- * executable.  This is because ROMIO will always be v1.x that
+ * executable.  This is because ROMIO will always be v2.x that
  * supports pretty much a 1-to-1 MPI-API-to-module-function mapping,
- * but we plan to have a v2.x series that will be "something
+ * but we plan to have a v3.x series that will be "something
  * different" (as yet undefined).
  */
 enum mca_io_base_version_t {
     MCA_IO_BASE_V_NONE,
-    MCA_IO_BASE_V_1_0_0,
+    MCA_IO_BASE_V_2_0_0,
 
     MCA_IO_BASE_V_MAX
 };
@@ -78,11 +79,11 @@ typedef enum mca_io_base_version_t mca_io_base_version_t;
  * Component
  */
 
-struct mca_io_base_module_1_0_0_t;
+struct mca_io_base_module_2_0_0_t;
 typedef int (*mca_io_base_component_init_query_fn_t)
     (bool enable_progress_threads, bool enable_mpi_threads);
-typedef const struct mca_io_base_module_1_0_0_t *
+typedef const struct mca_io_base_module_2_0_0_t *
-    (*mca_io_base_component_file_query_1_0_0_fn_t)
+    (*mca_io_base_component_file_query_2_0_0_fn_t)
     (struct ompi_file_t *file, struct mca_io_base_file_t **private_data, 
      int *priority);
 typedef int (*mca_io_base_component_file_unquery_fn_t)
@@ -120,7 +121,7 @@ struct mca_io_base_component_2_0_0_t {
     size_t io_request_bytes;
 
     mca_io_base_component_init_query_fn_t io_init_query;
-    mca_io_base_component_file_query_1_0_0_fn_t io_file_query;
+    mca_io_base_component_file_query_2_0_0_fn_t io_file_query;
     mca_io_base_component_file_unquery_fn_t io_file_unquery;
 
     mca_io_base_component_file_delete_query_fn_t io_delete_query;
@@ -138,13 +139,13 @@ typedef struct mca_io_base_component_2_0_0_t mca_io_base_component_2_0_0_t;
  * All component versions
  */
 union mca_io_base_components_t {
-    mca_io_base_component_2_0_0_t v1_0_0;
+    mca_io_base_component_2_0_0_t v2_0_0;
 };
 typedef union mca_io_base_components_t mca_io_base_components_t;
 
 
 /*
- * Module v1.0.0
+ * Module v2.0.0
  */
 
 /**
@@ -340,7 +341,7 @@ typedef int (*mca_io_base_module_file_get_atomicity_fn_t)
     (struct ompi_file_t *fh, int *flag);
 typedef int (*mca_io_base_module_file_sync_fn_t)(struct ompi_file_t *fh);
 
-struct mca_io_base_module_1_0_0_t {
+struct mca_io_base_module_2_0_0_t {
 
     /** Once-per-process request initializtion function */
 
@@ -421,14 +422,14 @@ struct mca_io_base_module_1_0_0_t {
     mca_io_base_module_file_get_atomicity_fn_t        io_module_file_get_atomicity;
     mca_io_base_module_file_sync_fn_t                 io_module_file_sync;
 };
-typedef struct mca_io_base_module_1_0_0_t mca_io_base_module_1_0_0_t;
+typedef struct mca_io_base_module_2_0_0_t mca_io_base_module_2_0_0_t;
 
 
 /*
  * All module versions
  */
 union mca_io_base_modules_t {
-    mca_io_base_module_1_0_0_t v1_0_0;
+    mca_io_base_module_2_0_0_t v2_0_0;
 };
 typedef union mca_io_base_modules_t mca_io_base_modules_t;
 

ompi/mca/io/romio/src/io_romio.h

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -38,7 +39,7 @@ OMPI_DECLSPEC extern mca_io_base_component_2_0_0_t mca_io_romio_component;
  * global variables, instantiated in module.c  
  */
 extern opal_mutex_t mca_io_romio_mutex;
-extern mca_io_base_module_1_0_0_t mca_io_romio_module;
+extern mca_io_base_module_2_0_0_t mca_io_romio_module;
 extern opal_list_t mca_io_romio_pending_requests;
 OMPI_DECLSPEC extern mca_io_base_component_2_0_0_t mca_io_romio_component;
 

ompi/mca/io/romio/src/io_romio_module.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -34,7 +35,7 @@ int MPIR_Status_set_bytes(ompi_status_public_t *status,
 /*
  * The ROMIO module operations
  */
-mca_io_base_module_1_0_0_t mca_io_romio_module = {
+mca_io_base_module_2_0_0_t mca_io_romio_module = {
 
     /* Once-per-process request init / finalize functions */
 

ompi/mpi/c/file_get_amode.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -53,8 +54,8 @@ int MPI_File_get_amode(MPI_File fh, int *amode)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_get_amode(fh, amode);
         break;
 

ompi/mpi/c/file_get_atomicity.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -54,8 +55,8 @@ int MPI_File_get_atomicity(MPI_File fh, int *flag)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_get_atomicity(fh, flag);
         break;
 

ompi/mpi/c/file_get_byte_offset.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -55,8 +56,8 @@ int MPI_File_get_byte_offset(MPI_File fh, MPI_Offset offset,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_get_byte_offset(fh, offset, disp);
         break;
 

ompi/mpi/c/file_get_info.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -53,8 +54,8 @@ int MPI_File_get_info(MPI_File fh, MPI_Info *info_used)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_get_info(fh, info_used);
         break;
 

ompi/mpi/c/file_get_position.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -53,8 +54,8 @@ int MPI_File_get_position(MPI_File fh, MPI_Offset *offset)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_get_position(fh, offset);
         break;
 

ompi/mpi/c/file_get_position_shared.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -53,8 +54,8 @@ int MPI_File_get_position_shared(MPI_File fh, MPI_Offset *offset)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_get_position_shared(fh, offset);
         break;
 

ompi/mpi/c/file_get_size.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -53,8 +54,8 @@ int MPI_File_get_size(MPI_File fh, MPI_Offset *size)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_get_size(fh, size);
         break;
 

ompi/mpi/c/file_get_type_extent.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -59,8 +60,8 @@ int MPI_File_get_type_extent(MPI_File fh, MPI_Datatype datatype,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_get_type_extent(fh, datatype, extent);
         break;
 

ompi/mpi/c/file_get_view.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -57,8 +58,8 @@ int MPI_File_get_view(MPI_File fh, MPI_Offset *disp,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_get_view(fh, disp, etype, filetype, datarep);
         break;
 

ompi/mpi/c/file_iread.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -73,8 +74,8 @@ int MPI_File_iread(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_iread(fh, buf, count, datatype, io_request);
         break;
 

ompi/mpi/c/file_iread_at.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -73,8 +74,8 @@ int MPI_File_iread_at(MPI_File fh, MPI_Offset offset, void *buf,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_iread_at(fh, offset, buf, count, datatype, 
                                     io_request);
         break;

ompi/mpi/c/file_iread_shared.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -73,8 +74,8 @@ int MPI_File_iread_shared(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_iread_shared(fh, buf, count, datatype, io_request);
         break;
 

ompi/mpi/c/file_iwrite.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -74,8 +75,8 @@ int MPI_File_iwrite(MPI_File fh, void *buf, int count, MPI_Datatype
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_iwrite(fh, buf, count, datatype, io_request);
         break;
 

ompi/mpi/c/file_iwrite_at.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -75,8 +76,8 @@ int MPI_File_iwrite_at(MPI_File fh, MPI_Offset offset, void *buf,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_iwrite_at(fh, offset, buf, count, datatype, 
                                      io_request);
         break;

ompi/mpi/c/file_iwrite_shared.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -73,8 +74,8 @@ int MPI_File_iwrite_shared(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_iwrite_shared(fh, buf, count, datatype, io_request);
         break;
 

ompi/mpi/c/file_preallocate.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -51,8 +52,8 @@ int MPI_File_preallocate(MPI_File fh, MPI_Offset size)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_preallocate(fh, size);
         break;
 

ompi/mpi/c/file_read.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -62,8 +63,8 @@ int MPI_File_read(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read(fh, buf, count, datatype, status);
         break;
 

ompi/mpi/c/file_read_all.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -62,8 +63,8 @@ int MPI_File_read_all(MPI_File fh, void *buf, int count, MPI_Datatype
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_all(fh, buf, count, datatype, status);
         break;
 

ompi/mpi/c/file_read_all_begin.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -62,8 +63,8 @@ int MPI_File_read_all_begin(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_all_begin(fh, buf, count, datatype);
         break;
 

ompi/mpi/c/file_read_all_end.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -51,8 +52,8 @@ int MPI_File_read_all_end(MPI_File fh, void *buf, MPI_Status *status)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_all_end(fh, buf, status);
         break;
 

ompi/mpi/c/file_read_at.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -62,8 +63,8 @@ int MPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_at(fh, offset, buf, count, datatype, status);
         break;
 

ompi/mpi/c/file_read_at_all.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -63,8 +64,8 @@ int MPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_at_all(fh, offset, buf, count, datatype, 
                                        status);
         break;

ompi/mpi/c/file_read_at_all_begin.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -62,8 +63,8 @@ int MPI_File_read_at_all_begin(MPI_File fh, MPI_Offset offset, void *buf,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_at_all_begin(fh, offset, buf, count, datatype);
         break;
 

ompi/mpi/c/file_read_at_all_end.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -51,8 +52,8 @@ int MPI_File_read_at_all_end(MPI_File fh, void *buf, MPI_Status *status)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_at_all_end(fh, buf, status);
         break;
 

ompi/mpi/c/file_read_ordered.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -57,8 +58,8 @@ int MPI_File_read_ordered(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_ordered(fh, buf, count, datatype, status);
         break;
 

ompi/mpi/c/file_read_ordered_begin.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -62,8 +63,8 @@ int MPI_File_read_ordered_begin(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_ordered_begin(fh, buf, count, datatype);
         break;
 

ompi/mpi/c/file_read_ordered_end.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -51,8 +52,8 @@ int MPI_File_read_ordered_end(MPI_File fh, void *buf, MPI_Status *status)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_ordered_end(fh, buf, status);
         break;
 

ompi/mpi/c/file_read_shared.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -62,8 +63,8 @@ int MPI_File_read_shared(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_read_shared(fh, buf, count, datatype, status);
         break;
 

ompi/mpi/c/file_seek.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -54,8 +55,8 @@ int MPI_File_seek(MPI_File fh, MPI_Offset offset, int whence)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_seek(fh, offset, whence);
         break;
 

ompi/mpi/c/file_seek_shared.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -54,8 +55,8 @@ int MPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_seek_shared(fh, offset, whence);
         break;
 

ompi/mpi/c/file_set_atomicity.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -51,8 +52,8 @@ int MPI_File_set_atomicity(MPI_File fh, int flag)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_set_atomicity(fh, flag);
         break;
 

ompi/mpi/c/file_set_info.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -52,8 +53,8 @@ int MPI_File_set_info(MPI_File fh, MPI_Info info)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_set_info(fh, info);
         break;
 

ompi/mpi/c/file_set_size.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -51,8 +52,8 @@ int MPI_File_set_size(MPI_File fh, MPI_Offset size)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_set_size(fh, size);
         break;
 

ompi/mpi/c/file_set_view.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -64,8 +65,8 @@ int MPI_File_set_view(MPI_File fh, MPI_Offset disp, MPI_Datatype etype,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_set_view(fh, disp, etype, filetype, datarep, info);
         break;
 

ompi/mpi/c/file_sync.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -51,8 +52,8 @@ int MPI_File_sync(MPI_File fh)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_sync(fh);
         break;
 

ompi/mpi/c/file_write.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -63,8 +64,8 @@ int MPI_File_write(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write(fh, buf, count, datatype, status);
         break;
 

ompi/mpi/c/file_write_all.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -63,8 +64,8 @@ int MPI_File_write_all(MPI_File fh, void *buf, int count, MPI_Datatype
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_all(fh, buf, count, datatype, status);
         break;
 

ompi/mpi/c/file_write_all_begin.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -63,8 +64,8 @@ int MPI_File_write_all_begin(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_all_begin(fh, buf, count, datatype);
         break;
 

ompi/mpi/c/file_write_all_end.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -51,8 +52,8 @@ int MPI_File_write_all_end(MPI_File fh, void *buf, MPI_Status *status)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_all_end(fh, buf, status);
         break;
 

ompi/mpi/c/file_write_at.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -64,8 +65,8 @@ int MPI_File_write_at(MPI_File fh, MPI_Offset offset, void *buf,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_at(fh, offset, buf, count, datatype, status);
         break;
 

ompi/mpi/c/file_write_at_all.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -64,8 +65,8 @@ int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, void *buf,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_at_all(fh, offset, buf, count, datatype, 
                                         status);
         break;

ompi/mpi/c/file_write_at_all_begin.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -63,8 +64,8 @@ int MPI_File_write_at_all_begin(MPI_File fh, MPI_Offset offset, void *buf,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_at_all_begin(fh, offset, buf, count,
                                               datatype);
         break;

ompi/mpi/c/file_write_at_all_end.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -51,8 +52,8 @@ int MPI_File_write_at_all_end(MPI_File fh, void *buf, MPI_Status *status)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_at_all_end(fh, buf, status);
         break;
 

ompi/mpi/c/file_write_ordered.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -63,8 +64,8 @@ int MPI_File_write_ordered(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_ordered(fh, buf, count, datatype, status);
         break;
 

ompi/mpi/c/file_write_ordered_begin.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -63,8 +64,8 @@ int MPI_File_write_ordered_begin(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_ordered_begin(fh, buf, count, datatype);
         break;
 

ompi/mpi/c/file_write_ordered_end.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -51,8 +52,8 @@ int MPI_File_write_ordered_end(MPI_File fh, void *buf, MPI_Status *status)
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_ordered_end(fh, buf, status);
         break;
 

ompi/mpi/c/file_write_shared.c

@@ -9,6 +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      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -63,8 +64,8 @@ int MPI_File_write_shared(MPI_File fh, void *buf, int count,
     /* Call the back-end io component function */
 
     switch (fh->f_io_version) {
-    case MCA_IO_BASE_V_1_0_0:
+    case MCA_IO_BASE_V_2_0_0:
-        rc = fh->f_io_selected_module.v1_0_0.
+        rc = fh->f_io_selected_module.v2_0_0.
             io_module_file_write_shared(fh, buf, count, datatype, status);
         break;