Merge r24035 - Send the recovery flag orte
authorrhc
Sun Nov 21 16:20:38 2010 +0000 (2010-11-21)
branchorte
changeset 22212f2896801
parent 1 88404064ace9
Merge r24035 - Send the recovery flag
orte4orcm-v1.0/orte/runtime/data_type_support/orte_dt_packing_fns.c
orte4orcm-v1.0/orte/runtime/data_type_support/orte_dt_unpacking_fns.c
     1.1 --- a/orte4orcm-v1.0/orte/runtime/data_type_support/orte_dt_packing_fns.c	Mon Nov 15 03:54:16 2010 +0000
     1.2 +++ b/orte4orcm-v1.0/orte/runtime/data_type_support/orte_dt_packing_fns.c	Sun Nov 21 16:20:38 2010 +0000
     1.3 @@ -284,6 +284,13 @@
     1.4              return rc;
     1.5          }
     1.6  
     1.7 +        /* pack the recovery flag */
     1.8 +        if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
     1.9 +                         (void*)(&(jobs[i]->enable_recovery)), 1, OPAL_BOOL))) {
    1.10 +            ORTE_ERROR_LOG(rc);
    1.11 +            return rc;
    1.12 +        }
    1.13 +
    1.14  #if OPAL_ENABLE_FT_CR == 1
    1.15          /* pack the ckpt state */
    1.16          if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
     2.1 --- a/orte4orcm-v1.0/orte/runtime/data_type_support/orte_dt_unpacking_fns.c	Mon Nov 15 03:54:16 2010 +0000
     2.2 +++ b/orte4orcm-v1.0/orte/runtime/data_type_support/orte_dt_unpacking_fns.c	Sun Nov 21 16:20:38 2010 +0000
     2.3 @@ -297,6 +297,14 @@
     2.4              return rc;
     2.5          }
     2.6  
     2.7 +        /* unpack the recovery flag */
     2.8 +        n = 1;
     2.9 +        if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
    2.10 +                         (&(jobs[i]->enable_recovery)), &n, OPAL_BOOL))) {
    2.11 +            ORTE_ERROR_LOG(rc);
    2.12 +            return rc;
    2.13 +        }
    2.14 +
    2.15  #if OPAL_ENABLE_FT_CR == 1
    2.16          /* unpack the ckpt state */
    2.17          if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,