dtest: add times for open_query, remove sleep

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>

diff --git a/test/dtest/dtest.c b/test/dtest/dtest.c
index 4b63dfc57017c8529a7c7d77764668ebce1b7e2a..865f424e1a1031ad4457defef4c4b7023ffc13cc 100755 (executable)
--- a/test/dtest/dtest.c
+++ b/test/dtest/dtest.c
@@ -176,6 +176,7 @@ double start, stop, total_us, total_sec;
 struct dt_time {
        double total;
        double open;
+       double openq;
        double reg;
        double unreg;
        double pzc;
@@ -514,7 +515,7 @@ int main(int argc, char **argv)
                                DAT_PROVIDER_FIELD_PROVIDER_SPECIFIC_ATTR,
                                &pr_attr);
        stop = get_time();
-       ts.open += ((stop - start) * 1.0e6);
+       ts.openq += ((stop - start) * 1.0e6);
        if (ret != DAT_SUCCESS) {
                fprintf(stderr, "%d: Error open_query: %s\n",
                        getpid(), DT_RetToStr(ret));
@@ -539,8 +540,7 @@ int main(int argc, char **argv)
        } else
                LOGPRINTF("%d Query_by_name \n", getpid());
 
-       if (query_only)
-               goto close;
+
 
        /* dat_ia_open, dat_pz_create */
        h_async_evd = DAT_HANDLE_NULL;
@@ -578,6 +578,9 @@ int main(int argc, char **argv)
                          pr_attr.provider_specific_attr[i].value);
        }
 
+       if (query_only)
+               goto close;
+
        /* Create Protection Zone */
        start = get_time();
        LOGPRINTF("%d Create Protection Zone\n", getpid());
@@ -834,6 +837,7 @@ close:
                goto finish;
 
        printf("\n%d: open:      %10.2lf usec\n", getpid(), ts.open);
+       printf("%d: open_query:%10.2lf usec\n", getpid(), ts.openq);
        printf("%d: close:     %10.2lf usec\n", getpid(), ts.close);
        printf("%d: PZ create: %10.2lf usec\n", getpid(), ts.pzc);
        printf("%d: PZ free:   %10.2lf usec\n", getpid(), ts.pzf);
@@ -1432,8 +1436,10 @@ DAT_RETURN do_rdma_write_with_msg(void)
        DAT_DTO_COOKIE cookie;
        DAT_RETURN ret;
        int i, flags = DAT_COMPLETION_SUPPRESS_FLAG;
-       DAT_DTO_COMPLETION_EVENT_DATA *dto_event = &event.event_data.dto_completion_event_data;
-       DAT_IB_EXTENSION_EVENT_DATA *ext_event = event.event_extension_data;
+       DAT_DTO_COMPLETION_EVENT_DATA *dto_event =
+               &event.event_data.dto_completion_event_data;
+       DAT_IB_EXTENSION_EVENT_DATA *ext_event =
+               (DAT_IB_EXTENSION_EVENT_DATA *)event.event_extension_data;
 
        printf("\n %d RDMA WRITE DATA with SEND MSG\n\n", getpid());
 
@@ -1532,7 +1538,7 @@ done:
                ret = send_msg(p_rmr_snd,
                               sizeof(DAT_RMR_TRIPLET),
                               lmr_context_send_msg,
-                              cookie, DAT_COMPLETION_SUPPRESS_FLAG);
+                              cookie, DAT_COMPLETION_DEFAULT_FLAG);
 
                if (ret != DAT_SUCCESS) {
                        fprintf(stderr, "%d Error send_msg: %s\n",
@@ -1580,9 +1586,6 @@ done:
                printf("%d %s RDMA write buffer contains: %s last byte=%d\n",
                       getpid(), server ? "SERVER:" : "CLIENT:", rbuf, rbuf[buf_len-1]);
 
-       if (server && uni_direction)
-               sleep(1);
-
        recv_msg_index++;
        return (DAT_SUCCESS);
 }