Complete hookup of the registry proxy for the get_conditional command.

This commit was SVN r7915.

orte/mca/gpr/base/base.h

@@ -93,20 +93,21 @@ extern "C" {
 #define ORTE_GPR_UNSUBSCRIBE_CMD            (uint8_t)  6
 #define ORTE_GPR_CANCEL_TRIGGER_CMD         (uint8_t)  7
 #define ORTE_GPR_GET_CMD                    (uint8_t)  8
-#define ORTE_GPR_TEST_INTERNALS_CMD         (uint8_t)  9
-#define ORTE_GPR_NOTIFY_CMD                 (uint8_t) 10
-#define ORTE_GPR_DUMP_ALL_CMD               (uint8_t) 11
-#define ORTE_GPR_DUMP_SEGMENTS_CMD          (uint8_t) 12
-#define ORTE_GPR_DUMP_TRIGGERS_CMD          (uint8_t) 13
-#define ORTE_GPR_DUMP_SUBSCRIPTIONS_CMD     (uint8_t) 14
-#define ORTE_GPR_DUMP_CALLBACKS_CMD         (uint8_t) 15
-#define ORTE_GPR_INCREMENT_VALUE_CMD        (uint8_t) 16
-#define ORTE_GPR_DECREMENT_VALUE_CMD        (uint8_t) 17
-#define ORTE_GPR_COMPOUND_CMD               (uint8_t) 18
-#define ORTE_GPR_CLEANUP_JOB_CMD            (uint8_t) 19
-#define ORTE_GPR_CLEANUP_PROC_CMD           (uint8_t) 20
-#define ORTE_GPR_DUMP_A_TRIGGER_CMD         (uint8_t) 21
-#define ORTE_GPR_DUMP_A_SUBSCRIPTION_CMD    (uint8_t) 22
+#define ORTE_GPR_GET_CONDITIONAL_CMD        (uint8_t)  9
+#define ORTE_GPR_TEST_INTERNALS_CMD         (uint8_t) 10
+#define ORTE_GPR_NOTIFY_CMD                 (uint8_t) 11
+#define ORTE_GPR_DUMP_ALL_CMD               (uint8_t) 12
+#define ORTE_GPR_DUMP_SEGMENTS_CMD          (uint8_t) 13
+#define ORTE_GPR_DUMP_TRIGGERS_CMD          (uint8_t) 14
+#define ORTE_GPR_DUMP_SUBSCRIPTIONS_CMD     (uint8_t) 15
+#define ORTE_GPR_DUMP_CALLBACKS_CMD         (uint8_t) 16
+#define ORTE_GPR_INCREMENT_VALUE_CMD        (uint8_t) 17
+#define ORTE_GPR_DECREMENT_VALUE_CMD        (uint8_t) 18
+#define ORTE_GPR_COMPOUND_CMD               (uint8_t) 19
+#define ORTE_GPR_CLEANUP_JOB_CMD            (uint8_t) 20
+#define ORTE_GPR_CLEANUP_PROC_CMD           (uint8_t) 21
+#define ORTE_GPR_DUMP_A_TRIGGER_CMD         (uint8_t) 22
+#define ORTE_GPR_DUMP_A_SUBSCRIPTION_CMD    (uint8_t) 23
 #define ORTE_GPR_ERROR                      (uint8_t)0xff
 
 typedef uint8_t orte_gpr_cmd_flag_t;

orte/mca/gpr/base/pack_api_cmd/gpr_base_pack_put_get.c

@@ -146,7 +146,7 @@ int orte_gpr_base_pack_get_conditional(orte_buffer_t *cmd,
 
     OPAL_TRACE(3);
     
-    command = ORTE_GPR_GET_CMD;
+    command = ORTE_GPR_GET_CONDITIONAL_CMD;
 
     if (ORTE_SUCCESS != (rc = orte_dps.pack(cmd, &command, 1, ORTE_GPR_CMD))) {
         ORTE_ERROR_LOG(rc);

orte/mca/gpr/base/unpack_api_response/gpr_base_unpack_put_get.c

@@ -78,7 +78,7 @@ int orte_gpr_base_unpack_get(orte_buffer_t *buffer, int *ret, size_t *cnt, orte_
         return rc;
     }
     
-    if (ORTE_GPR_GET_CMD != command) {
+    if (ORTE_GPR_GET_CMD != command || ORTE_GPR_GET_CONDITIONAL_CMD != command) {
         ORTE_ERROR_LOG(ORTE_ERR_COMM_FAILURE);
         return ORTE_ERR_COMM_FAILURE;
     }

orte/mca/gpr/replica/communications/gpr_replica_cmd_processor.c

@@ -117,6 +117,19 @@ int orte_gpr_replica_process_command_buffer(orte_buffer_t *input_buffer,
             	    break;
             
             	    
+            	case ORTE_GPR_GET_CONDITIONAL_CMD:  /*****    GET_CONDITIONAL    *****/
+            
+            	    if (orte_gpr_replica_globals.debug) {
+            		    opal_output(0, "\tget conditional cmd");
+            	    }
+            
+            	    if (ORTE_SUCCESS != (ret = orte_gpr_replica_recv_get_conditional_cmd(input_buffer, answer))) {
+                     ORTE_ERROR_LOG(ret);
+            		    goto RETURN_ERROR;
+            	    }            
+            	    break;
+            
+            	    
             	case ORTE_GPR_DELETE_ENTRIES_CMD:  /*****     DELETE ENTRIES     *****/
             
             	    if (orte_gpr_replica_globals.debug) {

orte/mca/gpr/replica/communications/gpr_replica_put_get_cm.c

@@ -303,7 +303,7 @@ int orte_gpr_replica_recv_get_cmd(orte_buffer_t *input_buffer,
 int orte_gpr_replica_recv_get_conditional_cmd(orte_buffer_t *input_buffer,
                                   orte_buffer_t *output_buffer)
 {
-    orte_gpr_cmd_flag_t command=ORTE_GPR_GET_CMD;
+    orte_gpr_cmd_flag_t command=ORTE_GPR_GET_CONDITIONAL_CMD;
     orte_gpr_addr_mode_t addr_mode;
     orte_gpr_replica_segment_t *seg=NULL;
     orte_gpr_replica_itag_t *tokentags=NULL, *keytags=NULL;