osc/rdma: fix the spelling of incoming

cmr=v1.7.5:ticket=trac:4379

This commit was SVN r31050.

The following Trac tickets were found above:
  Ticket 4379 --> https://svn.open-mpi.org/trac/ompi/ticket/4379

ompi/mca/osc/rdma/osc_rdma.c

@@ -97,7 +97,7 @@ ompi_osc_rdma_free(ompi_win_t *win)
     if (NULL != module->passive_incoming_frag_count) free(module->passive_incoming_frag_count);
     if (NULL != module->passive_incoming_frag_signal_count) free(module->passive_incoming_frag_signal_count);
     if (NULL != module->epoch_outgoing_frag_count) free(module->epoch_outgoing_frag_count);
-    if (NULL != module->incomming_buffer) free (module->incomming_buffer);
+    if (NULL != module->incoming_buffer) free (module->incoming_buffer);
     if (NULL != module->comm) ompi_comm_free(&module->comm);
     if (NULL != module->free_after) free(module->free_after);
 

ompi/mca/osc/rdma/osc_rdma.h

@@ -189,7 +189,7 @@ struct ompi_osc_rdma_module_t {
 
     uint64_t lock_serial_number;
 
-    unsigned char *incomming_buffer;
+    unsigned char *incoming_buffer;
     ompi_request_t *frag_request;
     opal_list_t request_gc;
 
@@ -324,7 +324,7 @@ int ompi_osc_rdma_rget_accumulate(void *origin_addr,
 int ompi_osc_rdma_fence(int assert, struct ompi_win_t *win);
 
 /* received a post message */
-int osc_rdma_incomming_post (ompi_osc_rdma_module_t *module);
+int osc_rdma_incoming_post (ompi_osc_rdma_module_t *module);
 
 int ompi_osc_rdma_start(struct ompi_group_t *group,
                         int assert,
@@ -411,7 +411,7 @@ static inline void mark_incoming_completion (ompi_osc_rdma_module_t *module, int
 {
     if (MPI_PROC_NULL == source) {
         OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
-                             "mark_incoming_completion marking active incomming complete. count = %d",
+                             "mark_incoming_completion marking active incoming complete. count = %d",
                              (int) module->active_incoming_frag_count + 1));
         OPAL_THREAD_ADD32(&module->active_incoming_frag_count, 1);
         if (module->active_incoming_frag_count >= module->active_incoming_frag_signal_count) {
@@ -419,7 +419,7 @@ static inline void mark_incoming_completion (ompi_osc_rdma_module_t *module, int
         }
     } else {
         OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
-                             "mark_incoming_completion marking passive incomming complete. source = %d, count = %d",
+                             "mark_incoming_completion marking passive incoming complete. source = %d, count = %d",
                              source, (int) module->passive_incoming_frag_count[source] + 1));
         OPAL_THREAD_ADD32(module->passive_incoming_frag_count + source, 1);
         if (module->passive_incoming_frag_count[source] >= module->passive_incoming_frag_signal_count[source]) {

ompi/mca/osc/rdma/osc_rdma_component.c

@@ -205,7 +205,7 @@ static int component_progress (void)
 	return 0;
     }
 
-    /* process one incomming request */
+    /* process one incoming request */
     OPAL_THREAD_LOCK(&mca_osc_rdma_component.lock);
     OPAL_LIST_FOREACH_SAFE(pending, next, &mca_osc_rdma_component.pending_operations, ompi_osc_rdma_pending_t) {
 	int ret;
@@ -456,8 +456,8 @@ component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit
     /* sync memory - make sure all initialization completed */
     opal_atomic_mb();
 
-    module->incomming_buffer = malloc (mca_osc_rdma_component.buffer_size + sizeof (ompi_osc_rdma_frag_header_t));
+    module->incoming_buffer = malloc (mca_osc_rdma_component.buffer_size + sizeof (ompi_osc_rdma_frag_header_t));
-    if (OPAL_UNLIKELY(NULL == module->incomming_buffer)) {
+    if (OPAL_UNLIKELY(NULL == module->incoming_buffer)) {
 	goto cleanup;
     }
 

ompi/mca/osc/rdma/osc_rdma_data_move.c

@@ -389,9 +389,9 @@ static inline int process_put_long(ompi_osc_rdma_module_t* module, int source,
 }
 
 /**
- * osc_rdma_incomming_req_omplete:
+ * osc_rdma_incoming_req_complete:
  *
- * @short Completion callback for a send/receive associate with an access
+ * @short Completion callback for a receive associate with an access
  *        epoch.
  *
  * @param[in] request - PML request with an OSC RMDA module as the callback data.
@@ -400,7 +400,7 @@ static inline int process_put_long(ompi_osc_rdma_module_t* module, int source,
  *       access epoch completes. When fired this function will increment the
  *       passive or active incoming count.
  */
-static int osc_rdma_incomming_req_omplete (ompi_request_t *request)
+static int osc_rdma_incoming_req_complete (ompi_request_t *request)
 {
     ompi_osc_rdma_module_t *module = (ompi_osc_rdma_module_t *) request->req_complete_cb_data;
     int rank = MPI_PROC_NULL;
@@ -433,7 +433,7 @@ static int osc_rdma_get_post_send_cb (ompi_request_t *request)
 
     free (data);
 
-    /* mark this as a completed "incomming" request */
+    /* mark this as a completed "incoming" request */
     mark_incoming_completion (module, rank);
 
     /* put this request on the garbage colletion list */
@@ -469,7 +469,7 @@ static int osc_rdma_get_post_send (ompi_osc_rdma_module_t *module, void *source,
     }
 
     data->module = module;
-    /* for incomming completion we need to know the peer (MPI_PROC_NULL if this is
+    /* for incoming completion we need to know the peer (MPI_PROC_NULL if this is
      * in an active target epoch) */
     data->peer = (tag & 0x1) ? peer : MPI_PROC_NULL;
 
@@ -999,7 +999,7 @@ static int ompi_osc_rdma_cswap_start (ompi_osc_rdma_module_t *module, int source
             break;
         }
 
-        /* increment the incomming fragment count so it matches what is expected */
+        /* increment the incoming fragment count so it matches what is expected */
         mark_incoming_completion (module, (cswap_header->tag & 0x1) ? source : MPI_PROC_NULL);
 
         if (0 == memcmp (target, compare_addr, datatype_size)) {
@@ -1434,24 +1434,24 @@ static int ompi_osc_rdma_callback (ompi_request_t *request)
 {
     ompi_osc_rdma_module_t *module = (ompi_osc_rdma_module_t *) request->req_complete_cb_data;
     ompi_osc_rdma_header_base_t *base_header = 
-        (ompi_osc_rdma_header_base_t *) module->incomming_buffer;
+        (ompi_osc_rdma_header_base_t *) module->incoming_buffer;
-    size_t incomming_length = request->req_status._ucount;
+    size_t incoming_length = request->req_status._ucount;
     int source = request->req_status.MPI_SOURCE;
 
     OPAL_THREAD_UNLOCK(&ompi_request_lock);
 
-    assert(incomming_length >= sizeof(ompi_osc_rdma_header_base_t));
+    assert(incoming_length >= sizeof(ompi_osc_rdma_header_base_t));
 
     OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
                          "received rdma callback for fragment. source = %d, count = %u, type = 0x%x",
-                         source, (unsigned) incomming_length, base_header->type));
+                         source, (unsigned) incoming_length, base_header->type));
 
     switch (base_header->type) {
     case OMPI_OSC_RDMA_HDR_TYPE_FRAG:
         process_frag(module, (ompi_osc_rdma_frag_header_t *) base_header);
         break;
     case OMPI_OSC_RDMA_HDR_TYPE_POST:
-        (void) osc_rdma_incomming_post (module);
+        (void) osc_rdma_incoming_post (module);
         break;
     case OMPI_OSC_RDMA_HDR_TYPE_LOCK_ACK:
         ompi_osc_rdma_process_lock_ack(module, (ompi_osc_rdma_header_lock_ack_t *) base_header);
@@ -1469,7 +1469,7 @@ static int ompi_osc_rdma_callback (ompi_request_t *request)
     }
 
     OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
-                         "finished processing incomming messages"));
+                         "finished processing incoming messages"));
 
     /* restart the receive request */
     OPAL_THREAD_LOCK(&module->lock);
@@ -1494,7 +1494,7 @@ static int ompi_osc_rdma_callback (ompi_request_t *request)
 
 int ompi_osc_rdma_frag_start_receive (ompi_osc_rdma_module_t *module)
 {
-    return ompi_osc_rdma_irecv_w_cb (module->incomming_buffer, mca_osc_rdma_component.buffer_size + sizeof (ompi_osc_rdma_frag_header_t),
+    return ompi_osc_rdma_irecv_w_cb (module->incoming_buffer, mca_osc_rdma_component.buffer_size + sizeof (ompi_osc_rdma_frag_header_t),
                                      MPI_BYTE, OMPI_ANY_SOURCE, OSC_RDMA_FRAG_TAG, module->comm, &module->frag_request,
                                      ompi_osc_rdma_callback, module);
 }
@@ -1504,7 +1504,7 @@ int ompi_osc_rdma_component_irecv (ompi_osc_rdma_module_t *module, void *buf,
                                    int src, int tag, struct ompi_communicator_t *comm)
 {
     return ompi_osc_rdma_irecv_w_cb (buf, count, datatype, src, tag, comm, NULL,
-                                     osc_rdma_incomming_req_omplete, module);
+                                     osc_rdma_incoming_req_complete, module);
 }
 
 

ompi/mca/osc/rdma/osc_rdma_data_move.h

@@ -109,7 +109,7 @@ int ompi_osc_rdma_process_flush (ompi_osc_rdma_module_t *module, int source,
 /**
  * ompi_osc_rdma_process_unlock_ack:
  *
- * @short Process an incomming unlock acknowledgement.
+ * @short Process an incoming unlock acknowledgement.
  *
  * @param[in] module            - OSC RDMA module
  * @param[in] source            - Source rank
@@ -121,7 +121,7 @@ void ompi_osc_rdma_process_unlock_ack (ompi_osc_rdma_module_t *module, int sourc
 /**
  * ompi_osc_rdma_process_flush_ack:
  *
- * @short Process an incomming flush acknowledgement.
+ * @short Process an incoming flush acknowledgement.
  *
  * @param[in] module           - OSC RDMA module
  * @param[in] source           - Source rank

ompi/mca/osc/rdma/osc_rdma_frag.c

@@ -196,7 +196,7 @@ ompi_osc_rdma_frag_flush_all(ompi_osc_rdma_module_t *module)
     return OMPI_SUCCESS;
 }
 
-int osc_rdma_incomming_post (ompi_osc_rdma_module_t *module)
+int osc_rdma_incoming_post (ompi_osc_rdma_module_t *module)
 {
     OPAL_THREAD_LOCK(&module->lock);
     module->num_post_msgs++;

ompi/mca/osc/rdma/osc_rdma_passive_target.c

@@ -877,7 +877,7 @@ void ompi_osc_rdma_process_unlock_ack (ompi_osc_rdma_module_t *module, int sourc
  *
  * @param[in] module        - OSC RDMA module
  * @param[in] source        - Source rank
- * @param[in] unlock_header - Incomming unlock header
+ * @param[in] unlock_header - Incoming unlock header
  *
  * This functions is the target-side functio for handling an unlock
  * request. Once all pending operations from the target are complete
@@ -895,7 +895,7 @@ int ompi_osc_rdma_process_unlock (ompi_osc_rdma_module_t *module, int source,
                          module->passive_incoming_frag_count[source],
                          module->passive_incoming_frag_signal_count[source]));
 
-    /* we cannot block when processing an incomming request */
+    /* we cannot block when processing an incoming request */
     if (module->passive_incoming_frag_signal_count[source] !=
         module->passive_incoming_frag_count[source]) {
         return OMPI_ERR_WOULD_BLOCK;
@@ -938,7 +938,7 @@ int ompi_osc_rdma_process_flush (ompi_osc_rdma_module_t *module, int source,
                          module->passive_incoming_frag_count[source],
                          module->passive_incoming_frag_signal_count[source]));
 
-    /* we cannot block when processing an incomming request */
+    /* we cannot block when processing an incoming request */
     if (module->passive_incoming_frag_signal_count[source] !=
         module->passive_incoming_frag_count[source]) {
         return OMPI_ERR_WOULD_BLOCK;