Use infinite timeout together with signal

franzpoeschel · franzpoeschel · commit e5e0c3c0d611 · 2024-01-22T19:34:45.000+01:00
diff --git a/source/adios2/toolkit/sst/dp/rdma_dp.c b/source/adios2/toolkit/sst/dp/rdma_dp.c
@@ -194,8 +194,7 @@ static void *make_progress(void *params_)
          * fashion otherwise (e.g. shm).
          */
         printf("Going into fi_cq_sread()\n");
-        ssize_t rc = fi_cq_sread(params->cq_signal, (void *)CQEntries, batch_size, NULL,
-                                 SST_BACKOFF_SECONDS_MAX * 1000);
+        ssize_t rc = fi_cq_sread(params->cq_signal, (void *)CQEntries, batch_size, NULL, -1);
         printf("fi_cq_sread()=%ld\n", rc);
         if (rc < 1)
         {
@@ -691,6 +690,7 @@ static void fini_fabric(struct fabric_state *fabric, CP_Services Svcs, void *CP_
     {
 
         fabric->cq_manual_progress->do_continue = 0;
+        fi_cq_signal(fabric->cq_signal);
 
         if (pthread_join(fabric->pthread_id, NULL) != 0)
         {

Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,7 @@ static void make_progress(void params_)`
`194`	`194`	`* fashion otherwise (e.g. shm).`
`195`	`195`	`*/`
`196`	`196`	`printf("Going into fi_cq_sread()\n");`
`197`		`- ssize_t rc = fi_cq_sread(params->cq_signal, (void *)CQEntries, batch_size, NULL,`
`198`		`- SST_BACKOFF_SECONDS_MAX * 1000);`
	`197`	`+ ssize_t rc = fi_cq_sread(params->cq_signal, (void *)CQEntries, batch_size, NULL, -1);`
`199`	`198`	`printf("fi_cq_sread()=%ld\n", rc);`
`200`	`199`	`if (rc < 1)`
`201`	`200`	`{`
`@@ -691,6 +690,7 @@ static void fini_fabric(struct fabric_state fabric, CP_Services Svcs, void CP_`
`691`	`690`	`{`
`692`	`691`
`693`	`692`	`fabric->cq_manual_progress->do_continue = 0;`
	`693`	`+ fi_cq_signal(fabric->cq_signal);`
`694`	`694`
`695`	`695`	`if (pthread_join(fabric->pthread_id, NULL) != 0)`
`696`	`696`	`{`