Checkpoint/restart fix:

Still recovering from interface changes.

This commit was SVN r14769.

orte/mca/rml/ftrm/rml_ftrm.h

@@ -166,16 +166,6 @@ extern "C" {
 
     int orte_rml_ftrm_xcast_gate(orte_gpr_trigger_cb_fn_t cbfunc);
 
-
-    int orte_rml_ftrm_register_contact_info(void);
-    
-    int orte_rml_ftrm_register_subscription(orte_jobid_t job, char *trigger);
-    
-    int orte_rml_ftrm_get_contact_info(orte_process_name_t *name, orte_gpr_notify_data_t **data);
-    
-    void orte_rml_ftrm_update_contact_info(orte_gpr_notify_data_t* data,
-                                           void* cbdata);
-    
     /*
      * Register a callback on loss of connection
      */
@@ -187,6 +177,14 @@ extern "C" {
      */
     int orte_rml_ftrm_ft_event(int state);
 
+    int orte_rml_ftrm_register_contact_info(void);
+
+    int orte_rml_ftrm_register_subscription(orte_jobid_t job, char *trigger);
+
+    int orte_rml_ftrm_get_contact_info(orte_process_name_t *name, orte_gpr_notify_data_t **data);
+
+    void orte_rml_ftrm_update_contact_info(orte_gpr_notify_data_t* data, void* cbdata);
+
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif

orte/mca/rml/ftrm/rml_ftrm_component.c

@@ -90,7 +90,12 @@ orte_rml_module_t orte_rml_ftrm_module = {
     orte_rml_ftrm_add_exception_handler,
     orte_rml_ftrm_del_exception_handler,
 
-    orte_rml_ftrm_ft_event
+    orte_rml_ftrm_ft_event,
+
+    orte_rml_ftrm_register_contact_info,
+    orte_rml_ftrm_register_subscription,
+    orte_rml_ftrm_get_contact_info,
+    orte_rml_ftrm_update_contact_info
 };
 
 int rml_ftrm_output_handle;

orte/mca/rml/ftrm/rml_ftrm_module.c

@@ -444,65 +444,6 @@ int orte_rml_ftrm_xcast_gate(orte_gpr_trigger_cb_fn_t cbfunc)
 }
 
 
-int orte_rml_ftrm_register_contact_info(void)
-{
-    int ret;
-    
-    opal_output_verbose(20, rml_ftrm_output_handle,
-                        "orte_rml_ftrm: register_contact_info()");
-    
-    if( NULL != wrapped_module.register_contact_info ) {
-        if( ORTE_SUCCESS != (ret = wrapped_module.register_contact_info() ) ) {
-            return ret;
-        }
-    }
-    
-    return ORTE_SUCCESS;
-}
-
-int orte_rml_ftrm_register_subscription(orte_jobid_t job, char *trigger)
-{
-    int ret;
-    
-    opal_output_verbose(20, rml_ftrm_output_handle,
-                        "orte_rml_ftrm: register_subscription()");
-    
-    if( NULL != wrapped_module.register_subscription ) {
-        if( ORTE_SUCCESS != (ret = wrapped_module.register_subscription(job, trigger) ) ) {
-            return ret;
-        }
-    }
-    
-    return ORTE_SUCCESS;
-}
-
-int orte_rml_ftrm_get_contact_info(orte_process_name_t *name, orte_gpr_notify_data_t **data)
-{
-    int ret;
-    
-    opal_output_verbose(20, rml_ftrm_output_handle,
-                        "orte_rml_ftrm: get_contact_info()");
-    
-    if( NULL != wrapped_module.get_contact_info ) {
-        if( ORTE_SUCCESS != (ret = wrapped_module.get_contact_info(name, data) ) ) {
-            return ret;
-        }
-    }
-    
-    return ORTE_SUCCESS;
-}
-
-void orte_rml_ftrm_update_contact_info(orte_gpr_notify_data_t* data,
-                                      void* cbdata)
-{
-    opal_output_verbose(20, rml_ftrm_output_handle,
-                        "orte_rml_ftrm: update_contact_info()");
-    
-    if( NULL != wrapped_module.update_contact_info ) {
-        wrapped_module.update_contact_info(data, cbdata);
-    }
-}
-
 /*
  * Register a callback on loss of connection
  */
@@ -538,6 +479,64 @@ int orte_rml_ftrm_del_exception_handler(orte_rml_exception_callback_t cbfunc)
     return ORTE_SUCCESS;
 }
 
+int orte_rml_ftrm_register_contact_info(void)
+{
+    int ret;
+
+    opal_output_verbose(20, rml_ftrm_output_handle,
+                        "orte_rml_ftrm: register_contact_info()");
+
+    if( NULL != wrapped_module.register_contact_info ) {
+        if( ORTE_SUCCESS != (ret = wrapped_module.register_contact_info() ) ) {
+            return ret;
+        }
+    }
+
+    return ORTE_SUCCESS;
+}
+
+int orte_rml_ftrm_register_subscription(orte_jobid_t job, char *trigger)
+{
+    int ret;
+
+    opal_output_verbose(20, rml_ftrm_output_handle,
+                        "orte_rml_ftrm: register_subscription()");
+
+    if( NULL != wrapped_module.register_subscription ) {
+        if( ORTE_SUCCESS != (ret = wrapped_module.register_subscription(job, trigger) ) ) {
+            return ret;
+        }
+    }
+
+    return ORTE_SUCCESS;
+}
+
+int orte_rml_ftrm_get_contact_info(orte_process_name_t *name, orte_gpr_notify_data_t **data)
+{
+    int ret;
+
+    opal_output_verbose(20, rml_ftrm_output_handle,
+                        "orte_rml_ftrm: get_contact_info()");
+
+    if( NULL != wrapped_module.get_contact_info ) {
+        if( ORTE_SUCCESS != (ret = wrapped_module.get_contact_info(name, data) ) ) {
+            return ret;
+        }
+    }
+
+    return ORTE_SUCCESS;
+}
+
+void orte_rml_ftrm_update_contact_info(orte_gpr_notify_data_t* data, void* cbdata)
+{
+
+    opal_output_verbose(20, rml_ftrm_output_handle,
+                        "orte_rml_ftrm: update_contact_info()");
+
+    if( NULL != wrapped_module.update_contact_info ) {
+        wrapped_module.update_contact_info(data, cbdata);
+    }
+}
 
 /*
  * FT Event