Remove deadline parameter from chdone()

Signed-off-by: Martin Sustrik <[email protected]>
open-io · Apr 12, 2018 · e87690c · e87690c
1 parent cbbeb77
commit e87690c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/chan.c b/chan.c
@@ -255,7 +255,7 @@ int chrecv(int h, void *val, size_t len, int64_t deadline) {
     return 0;
 }
 
-int chdone(int h, int64_t deadline) {
+int chdone(int h) {
     struct dill_halfchan *ch = hquery(h, dill_halfchan_type);
     if(dill_slow(!ch)) return -1;
     /* Done is always done to the opposite side of the channel. */

diff --git a/libdill.h b/libdill.h
@@ -271,7 +271,7 @@ DILL_EXPORT int chmake(int chv[2]);
 DILL_EXPORT int chmake_mem(struct chstorage *mem, int chv[2]);
 DILL_EXPORT int chsend(int ch, const void *val, size_t len, int64_t deadline);
 DILL_EXPORT int chrecv(int ch, void *val, size_t len, int64_t deadline);
-DILL_EXPORT int chdone(int ch, int64_t deadline);
+DILL_EXPORT int chdone(int ch);
 DILL_EXPORT int choose(struct chclause *clauses, int nclauses,
     int64_t deadline);
 

diff --git a/perf/done.c b/perf/done.c
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
         int ch[2];
         chmake(ch);
         int h = go(worker(ch[0]));
-        chdone(ch[1], -1);
+        chdone(ch[1]);
         hclose(h);
         hclose(ch[1]);
         hclose(ch[0]);

diff --git a/tests/chan.c b/tests/chan.c
@@ -191,7 +191,7 @@ int main() {
     int ch8[2];
     rc = chmake(ch8);
     errno_assert(rc == 0);
-    rc = chdone(ch8[0], -1);
+    rc = chdone(ch8[0]);
     errno_assert(rc == 0);
     rc = chrecv(ch8[1], &val, sizeof(val), -1);
     errno_assert(rc == -1 && errno == EPIPE);
@@ -213,7 +213,7 @@ int main() {
     errno_assert(hndl6[0] >= 0);
     hndl6[1] = go(receiver2(ch12[0]));
     errno_assert(hndl6[1] >= 0);
-    rc = chdone(ch12[1], -1);
+    rc = chdone(ch12[1]);
     errno_assert(rc == 0);
     rc = chrecv(ch12[1], &val, sizeof(val), -1);
     errno_assert(rc == 0);
@@ -243,7 +243,7 @@ int main() {
     errno_assert(hndl8[2] >= 0);
     rc = msleep(now() + 50);
     errno_assert(rc == 0);
-    rc = chdone(ch15[1], -1);
+    rc = chdone(ch15[1]);
     errno_assert(rc == 0);
     rc = hclose(ch15[1]);
     errno_assert(rc == 0);

diff --git a/tests/choose.c b/tests/choose.c
@@ -300,7 +300,7 @@ int main() {
     int ch18[2];
     rc = chmake(ch18);
     errno_assert(rc == 0);
-    rc = chdone(ch18[0], -1);
+    rc = chdone(ch18[0]);
     errno_assert(rc == 0);
     struct chclause cls15[] = {{CHRECV, ch18[1], &val, sizeof(val)}};
     rc = choose(cls15, 1, -1);

diff --git a/tutorial/basics/step6.c b/tutorial/basics/step6.c
@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) {
         assert(rc == 0);
     }
 
-    rc = chdone(b, now() + 10000);
+    rc = bundle_wait(b, now() + 10000);
     assert(rc == 0 || (rc < 0 && errno == ETIMEDOUT));
 
     rc = hclose(b);