aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--example/src/main.c16
-rw-r--r--example/src/middle.c11
-rw-r--r--include/uv_link_t.h12
-rw-r--r--src/uv_link_observer_t.c33
-rw-r--r--src/uv_link_t.c49
-rw-r--r--test/src/test-uv-link-observer-t.c5
6 files changed, 64 insertions, 62 deletions
diff --git a/example/src/main.c b/example/src/main.c
index 01d0447..ac4c4a9 100644
--- a/example/src/main.c
+++ b/example/src/main.c
@@ -20,6 +20,13 @@ struct client_s {
uv_link_observer_t observer;
};
+static void close_cb(uv_link_t* link) {
+ client_t* client;
+
+ client = link->data;
+ free(client);
+}
+
static void read_cb(uv_link_observer_t* observer,
ssize_t nread,
const uv_buf_t* buf) {
@@ -29,9 +36,7 @@ static void read_cb(uv_link_observer_t* observer,
if (nread < 0) {
fprintf(stderr, "error or close\n");
- uv_link_read_stop(&observer->link);
- uv_close((uv_handle_t*) &client->tcp, NULL);
- free(client);
+ uv_link_close(&observer->link, close_cb);
return;
}
@@ -61,7 +66,10 @@ static void connection_cb(uv_stream_t* s, int status) {
err = uv_link_chain(&client->source.link, &client->middle);
assert(err == 0);
- err = uv_link_observer_init(&client->observer, &client->middle);
+ err = uv_link_observer_init(&client->observer);
+ assert(err == 0);
+
+ err = uv_link_chain(&client->middle, &client->observer.link);
assert(err == 0);
client->observer.read_cb = read_cb;
diff --git a/example/src/middle.c b/example/src/middle.c
index 447a341..6bd4e85 100644
--- a/example/src/middle.c
+++ b/example/src/middle.c
@@ -14,6 +14,12 @@ static int read_stop_impl(uv_link_t* link) {
}
+static void close_impl(uv_link_t* link, uv_link_t* source,
+ uv_link_close_cb cb) {
+ cb(source);
+}
+
+
static void alloc_cb_override(uv_link_t* link,
size_t suggested_size,
uv_buf_t* buf) {
@@ -35,7 +41,9 @@ static void read_cb_override(uv_link_t* link,
else
res = "go away";
} else {
- res = "error";
+ free(buf->base);
+ uv_link_propagate_read_cb(link, nread, NULL);
+ return;
}
free(buf->base);
@@ -51,6 +59,7 @@ static void read_cb_override(uv_link_t* link,
uv_link_methods_t middle_methods = {
.read_start = read_start_impl,
.read_stop = read_stop_impl,
+ .close = close_impl,
/* Other doesn't matter in this example */
.alloc_cb_override = alloc_cb_override,
diff --git a/include/uv_link_t.h b/include/uv_link_t.h
index 68b66c1..f1a1dc6 100644
--- a/include/uv_link_t.h
+++ b/include/uv_link_t.h
@@ -64,12 +64,12 @@ struct uv_link_s {
uv_link_read_cb saved_read_cb;
/* Private, used for close */
- uv_link_t* saved_close_source;
+ int close_waiting;
uv_link_close_cb saved_close_cb;
};
UV_EXTERN int uv_link_init(uv_link_t* link, uv_link_methods_t const* methods);
-static void uv_link_close(uv_link_t* link, uv_link_close_cb cb);
+UV_EXTERN void uv_link_close(uv_link_t* link, uv_link_close_cb cb);
UV_EXTERN int uv_link_chain(uv_link_t* from, uv_link_t* to);
UV_EXTERN int uv_link_unchain(uv_link_t* from, uv_link_t* to);
@@ -101,10 +101,6 @@ void uv_link_propagate_close(uv_link_t* link, uv_link_t* source,
/* Use this to invoke methods of `link` */
-void uv_link_close(uv_link_t* link, uv_link_close_cb cb) {
- return uv_link_propagate_close(link, link, cb);
-}
-
static int uv_link_read_start(uv_link_t* link) {
return link->methods->read_start(link);
}
@@ -149,7 +145,6 @@ UV_EXTERN int uv_link_source_init(uv_link_source_t* source,
struct uv_link_observer_s {
uv_link_t link;
- uv_link_t* target;
/* This will be called, even if the ones in `link` will be overwritten */
void (*read_cb)(uv_link_observer_t* observer,
@@ -157,7 +152,6 @@ struct uv_link_observer_s {
const uv_buf_t* buf);
};
-UV_EXTERN int uv_link_observer_init(uv_link_observer_t* observer,
- uv_link_t* target);
+UV_EXTERN int uv_link_observer_init(uv_link_observer_t* observer);
#endif /* INCLUDE_UV_LINK_H_ */
diff --git a/src/uv_link_observer_t.c b/src/uv_link_observer_t.c
index 5479f67..dbd42ba 100644
--- a/src/uv_link_observer_t.c
+++ b/src/uv_link_observer_t.c
@@ -9,7 +9,7 @@ static int uv_link_observer_read_start(uv_link_t* link) {
observer = container_of(link, uv_link_observer_t, link);
- return uv_link_read_start(observer->target);
+ return uv_link_read_start(observer->link.parent);
}
@@ -18,7 +18,7 @@ static int uv_link_observer_read_stop(uv_link_t* link) {
observer = container_of(link, uv_link_observer_t, link);
- return uv_link_read_stop(observer->target);
+ return uv_link_read_stop(observer->link.parent);
}
@@ -33,7 +33,7 @@ static int uv_link_observer_write(uv_link_t* link,
observer = container_of(link, uv_link_observer_t, link);
- return uv_link_propagate_write(observer->target, source, bufs, nbufs,
+ return uv_link_propagate_write(observer->link.parent, source, bufs, nbufs,
send_handle, cb, arg);
}
@@ -45,7 +45,7 @@ static int uv_link_observer_try_write(uv_link_t* link,
observer = container_of(link, uv_link_observer_t, link);
- return uv_link_try_write(observer->target, bufs, nbufs);
+ return uv_link_try_write(observer->link.parent, bufs, nbufs);
}
@@ -57,7 +57,7 @@ static int uv_link_observer_shutdown(uv_link_t* link,
observer = container_of(link, uv_link_observer_t, link);
- return uv_link_propagate_shutdown(observer->target, source, cb, arg);
+ return uv_link_propagate_shutdown(observer->link.parent, source, cb, arg);
}
@@ -84,12 +84,7 @@ static void uv_link_observer_read_cb(uv_link_t* link,
void uv_link_observer_close(uv_link_t* link, uv_link_t* source,
uv_link_close_cb cb) {
- uv_link_observer_t* observer;
-
- observer = container_of(link, uv_link_observer_t, link);
-
- uv_link_propagate_close(observer->target, source, cb);
- observer->target = NULL;
+ cb(source);
}
@@ -106,13 +101,7 @@ static uv_link_methods_t uv_link_observer_methods = {
};
-static void uv_link_observer_empty_close_cb(uv_link_t* link) {
- /* no-op */
-}
-
-
-int uv_link_observer_init(uv_link_observer_t* observer,
- uv_link_t* target) {
+int uv_link_observer_init(uv_link_observer_t* observer) {
int err;
memset(observer, 0, sizeof(*observer));
@@ -121,13 +110,5 @@ int uv_link_observer_init(uv_link_observer_t* observer,
if (err != 0)
return err;
- observer->target = target;
-
- err = uv_link_chain(target, &observer->link);
- if (err != 0) {
- uv_link_close(&observer->link, uv_link_observer_empty_close_cb);
- return err;
- }
-
return 0;
}
diff --git a/src/uv_link_t.c b/src/uv_link_t.c
index e930a8f..d63a07b 100644
--- a/src/uv_link_t.c
+++ b/src/uv_link_t.c
@@ -35,38 +35,47 @@ int uv_link_init(uv_link_t* link, uv_link_methods_t const* methods) {
}
-static void uv_link_close_parent(uv_link_t* link) {
- uv_link_t* target;
- uv_link_t* source;
- uv_link_close_cb cb;
-
- target = link->parent;
- source = link->saved_close_source;
- cb = link->saved_close_cb;
+static void uv_link_close_join(uv_link_t* link) {
+ if (--link->close_waiting == 0)
+ return link->saved_close_cb(link);
+}
- memset(link, 0, sizeof(*link));
- if (target == NULL)
- cb(source);
- else
- uv_link_propagate_close(target, source, cb);
+void uv_link_close(uv_link_t* link, uv_link_close_cb cb) {
+ uv_link_propagate_close(link, link, cb);
}
void uv_link_propagate_close(uv_link_t* link, uv_link_t* source,
uv_link_close_cb cb) {
+ uv_link_t* root;
+ int count;
+
CHECK_EQ(link->child, NULL, "uv_link_t: attempt to close chained link");
- uv_link_methods_t const* methods;
- methods = link->methods;
+ /* Find root */
+ count = 1;
+ for (root = link; root->parent != NULL; root = root->parent)
+ count++;
+
+ /* NOTE: This is very important line. Only because we `+=` here the
+ * recursive propagation is possible
+ */
+ source->close_waiting += count;
+
+ source->saved_close_cb = cb;
- if (link->parent != NULL)
- CHECK_EQ(uv_link_unchain(link->parent, link), 0, "uv_link_unchain()");
+ /* Go from the root to the leaf, disconnecting and closing everything */
+ while (root != NULL) {
+ uv_link_t* child;
- link->saved_close_source = source;
- link->saved_close_cb = cb;
+ child = root->child;
+ if (child != NULL)
+ CHECK_EQ(uv_link_unchain(root, child), 0, "close unchain");
- methods->close(link, link, uv_link_close_parent);
+ root->methods->close(root, source, uv_link_close_join);
+ root = child;
+ }
}
diff --git a/test/src/test-uv-link-observer-t.c b/test/src/test-uv-link-observer-t.c
index 3c48908..0ce7b80 100644
--- a/test/src/test-uv-link-observer-t.c
+++ b/test/src/test-uv-link-observer-t.c
@@ -51,8 +51,9 @@ TEST_IMPL(uv_link_observer_t) {
CHECK_EQ(uv_link_init(&source, &methods), 0, "uv_link_init(source)");
- CHECK_EQ(uv_link_observer_init(&observer, &source), 0,
- "uv_link_observer_init()");
+ CHECK_EQ(uv_link_observer_init(&observer), 0, "uv_link_observer_init()");
+ CHECK_EQ(uv_link_chain(&source, &observer.link), 0,
+ "uv_link_chain");
observer.read_cb = observer_read_cb;