Add dapltest headers to EXTRA_DIST

Modify dtest to delay before accepting

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.co.il>
Signed-off-by: Arlin Davis <ardavis@ichips.intel.com>

diff --git a/Makefile.am b/Makefile.am
index e2bf4dccd42f6ac3f662dc572e6c70a106bb4ff8..70ef6ef90ae17b82765b38da75cfffc9163226d3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -231,8 +231,35 @@ EXTRA_DIST = dat/common/dat_dictionary.h \
             doc/dat.conf \
             dapl/udapl/libdaplcma.map \
             libdat.spec.in \
-            $(man_MANS)
-            
+            $(man_MANS) \
+            test/dapltest/include/dapl_bpool.h \
+            test/dapltest/include/dapl_client_info.h \
+            test/dapltest/include/dapl_common.h \
+            test/dapltest/include/dapl_execute.h \
+            test/dapltest/include/dapl_fft_cmd.h \
+            test/dapltest/include/dapl_fft_util.h \
+            test/dapltest/include/dapl_getopt.h \
+            test/dapltest/include/dapl_global.h \
+            test/dapltest/include/dapl_limit_cmd.h \
+            test/dapltest/include/dapl_mdep.h \
+            test/dapltest/include/dapl_memlist.h \
+            test/dapltest/include/dapl_params.h \
+            test/dapltest/include/dapl_performance_cmd.h \
+            test/dapltest/include/dapl_performance_stats.h \
+            test/dapltest/include/dapl_performance_test.h \
+            test/dapltest/include/dapl_proto.h \
+            test/dapltest/include/dapl_quit_cmd.h \
+            test/dapltest/include/dapl_server_cmd.h \
+            test/dapltest/include/dapl_server_info.h \
+            test/dapltest/include/dapl_tdep.h \
+            test/dapltest/include/dapl_tdep_print.h \
+            test/dapltest/include/dapl_test_data.h \
+            test/dapltest/include/dapl_transaction_cmd.h \
+            test/dapltest/include/dapl_transaction_stats.h \
+            test/dapltest/include/dapl_transaction_test.h \
+            test/dapltest/include/dapl_version.h \
+            test/dapltest/mdep/linux/dapl_mdep_user.h
+        
 dist-hook: libdat.spec 
        cp libdat.spec $(distdir)
        

diff --git a/test/dtest/dtest.c b/test/dtest/dtest.c
index fe8a366150bb8d30ed862ce22c84aaf578ca89e7..86b70ccd723f77b18cb02015980acc3ddc71483b 100644 (file)
--- a/test/dtest/dtest.c
+++ b/test/dtest/dtest.c
@@ -405,9 +405,6 @@ cleanup:
        else
                LOGPRINTF("%d unregister_rdma_memory done\n", getpid());
 
-
-       if (delay) sleep(delay);
-
        /* Free protection domain */
        LOGPRINTF("%d Freeing pz\n",getpid());
        start = get_time();
@@ -699,6 +696,8 @@ connect_ep( char *hostname, int conn_id )
            return( DAT_ABORT );
        }
 
+       if (delay) sleep(delay); /* use to test rdma_cma timeout logic */
+
         /* accept connect request from client */
        h_cr = event.event_data.cr_arrival_event_data.cr_handle;
         LOGPRINTF("%d Accepting connect request from client\n",getpid());
@@ -1799,7 +1798,7 @@ void print_usage()
     printf("c: use cno\n");
     printf("v: verbose\n");
     printf("p: polling\n");
-    printf("d: delay before close\n");
+    printf("d: delay before accept\n");
     printf("b: buf length to allocate\n");
     printf("B: burst count, rdma and msgs \n");
     printf("h: hostname\n");