agoo 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 158117188fe96c69828c60595d0a38afe61bd10923f15236613ca7efbd323623
-  data.tar.gz: da8bea92f370d7e8d66c39c8ff693611e971e1805b11ccf8ecaaa8d9a01eabc3
+  metadata.gz: 3b7919a52d201024eefc3480e4f64e28587b124b402d41dfd4cf9cc2108a01a6
+  data.tar.gz: a7d185258d848b7887b50dccac072eed8660817a099a210d279d52812ade3263
 SHA512:
-  metadata.gz: 3387636bc61cd62a24ac7b71f1678c74c8e564c857e580acff1f93144868cd5fe614d49607c3a150f9486b779d4e3b925d8f52c391b02685054bf7a862420256
-  data.tar.gz: 781c95aad1a5161b6d0c069051a748e2b83a5c00d1f44ac7d14a37f897bdec02fc792a1e694db1acb8b4d124b53cdb9758237b1206aece31810b7c6513858b0e
+  metadata.gz: 434a205f05f234cb2eec6212e33947cecbc8773c47c6c77e0e0c17aab87d22b6406cdfd3750fbb9388f1ca5972cb883a95b7b3c3565c5a50b09cb4cd6a314079
+  data.tar.gz: 9decdf78bb95013eaedd1b9ee594f7206fdaca20b1e9c9944fc87bbd61a4fcb376fa357d2b3c83f0c1d3f9eb38e7bd6661e58d7a790d2f8b7d57ad3cd566e2ca

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All changes to the Agoo gem are documented here. Releases follow semantic versio
 
 ## [Unreleased]
 
+## [2.11.1] - [2019-09-22]
+
+Race fix
+
+### Fixed
+- A race condion occurred with a slow Ruby response and a connection close. Fixed.
+
 ## [2.11.0] - [2019-09-15]
 
 TLS using OpenSSL

data/ext/agoo/con.c

@@ -75,10 +75,7 @@ agoo_con_create(agooErr err, int sock, uint64_t id, agooBind b) {
 
 void
 agoo_con_destroy(agooCon c) {
-    agooRes	res;
-
     atomic_fetch_sub(&agoo_server.con_cnt, 1);
-
     if (AGOO_CON_WS == c->bind->kind || AGOO_CON_SSE == c->bind->kind) {
 	agoo_ws_req_close(c);
     }
@@ -106,6 +103,8 @@ agoo_con_destroy(agooCon c) {
     }
     agoo_log_cat(&agoo_con_cat, "Connection %llu closed.", (unsigned long long)c->id);
 
+    agooRes	res;
+
     while (NULL != (res = c->res_head)) {
 	c->res_head = res->next;
 	AGOO_FREE(res);
@@ -520,6 +519,7 @@ agoo_con_http_read(agooCon c) {
 		return false;
 	    } else {
 		con_ssl_error(c, __FILE__, __LINE__);
+		c->dead = true;
 		return true;
 	    }
 	}
@@ -544,6 +544,7 @@ agoo_con_http_read(agooCon c) {
 		agoo_log_cat(&agoo_warn_cat, "Failed to read request. %s.", strerror(errno));
 	    }
 	}
+	c->dead = true;
 	return true;
     }
     c->bcnt += cnt;
@@ -553,7 +554,7 @@ agoo_con_http_read(agooCon c) {
 
 	    switch (con_header_read(c, &mlen)) {
 	    case HEAD_AGAIN:
-		// Try again the next time. Didn't read enough..
+		// Try again the next time. Didn't read enough.
 		return false;
 	    case HEAD_OK:
 		// req was created
@@ -665,6 +666,8 @@ agoo_con_http_write(agooCon c) {
 		return true;
 	    }
 	    con_ssl_error(c, __FILE__, __LINE__);
+	    c->dead = true;
+
 	    return false;
 	}
 #else
@@ -677,6 +680,7 @@ agoo_con_http_write(agooCon c) {
 		return true;
 	    }
 	    agoo_log_cat(&agoo_error_cat, "Socket error @ %llu.", (unsigned long long)c->id);
+	    c->dead = true;
 
 	    return false;
 	}
@@ -1127,7 +1131,7 @@ static agooReadyIO
 con_ready_io(void *ctx) {
     agooCon	c = (agooCon)ctx;
 
-    if (NULL != c->bind) {
+    if (NULL != c->bind && !c->dead && 0 != c->sock) {
 	switch (c->bind->events(c)) {
 	case POLLIN:		return AGOO_READY_IN;
 	case POLLOUT:		return AGOO_READY_OUT;
@@ -1138,33 +1142,32 @@ con_ready_io(void *ctx) {
     return AGOO_READY_NONE;
 }
 
+// Ready to close check. True if ready to close.
 static bool
 con_ready_check(void *ctx, double now) {
     agooCon	c = (agooCon)ctx;
 
     if (c->dead || 0 == c->sock) {
 	if (remove_dead_res(c)) {
-	    return false;
+	    return true;
 	}
     } else if (0.0 == c->timeout || now < c->timeout) {
-	return true;
+	return false;
     } else if (c->closing) {
 	if (remove_dead_res(c)) {
-	    return false;
+	    return true;
 	}
     } else if (AGOO_CON_WS == c->bind->kind || AGOO_CON_SSE == c->bind->kind) {
 	c->timeout = dtime() + CON_TIMEOUT;
 	if (AGOO_CON_WS == c->bind->kind) {
 	    agoo_ws_ping(c);
 	}
-	return true;
+	return false;
     } else {
 	c->closing = true;
 	c->timeout = now + 0.5;
-
-	return true;
     }
-    return true;
+    return false;
 }
 
 static bool
@@ -1178,6 +1181,8 @@ con_ready_read(agooReady ready, void *ctx) {
     } else {
 	return true; // not an error, just ignore
     }
+    c->dead = true;
+
     return false;
 }
 
@@ -1208,6 +1213,8 @@ con_ready_write(void *ctx) {
 	    }
 	}
     }
+    c->dead = true;
+
     return false;
 }
 
@@ -1216,12 +1223,17 @@ con_ready_destroy(void *ctx) {
     agoo_con_destroy((agooCon)ctx);
 }
 
+static void
+con_ready_error(void *ctx) {
+    ((agooCon)ctx)->dead = true;
+}
+
 static struct _agooHandler	con_handler = {
     .io = con_ready_io,
     .check = con_ready_check,
     .read = con_ready_read,
     .write = con_ready_write,
-    .error = NULL,
+    .error = con_ready_error,
     .destroy = con_ready_destroy,
 };
 

data/ext/agoo/ready.c

@@ -201,6 +201,13 @@ ready_remove(agooReady ready, Link link) {
     ready->lcnt--;
 }
 
+static void
+ready_check_remove(agooReady ready, Link link) {
+    if (NULL == link->handler->check || link->handler->check(link->ctx, 0.0)) {
+	ready_remove(ready, link);
+    }
+}
+
 int
 agoo_ready_go(agooErr err, agooReady ready) {
     double	now;
@@ -250,13 +257,13 @@ agoo_ready_go(agooErr err, agooReady ready) {
 	link = (Link)ep->data.ptr;
 	if (0 != (ep->events & EPOLLIN) && NULL != link->handler->read) {
 	    if (!link->handler->read(ready, link->ctx)) {
-		ready_remove(ready, link);
+		ready_check_remove(ready, link);
 		continue;
 	    }
 	}
 	if (0 != (ep->events & EPOLLOUT && NULL != link->handler->write)) {
 	    if (!link->handler->write(link->ctx)) {
-		ready_remove(ready, link);
+		ready_check_remove(ready, link);
 		continue;
 	    }
 	}
@@ -264,7 +271,7 @@ agoo_ready_go(agooErr err, agooReady ready) {
 	    if (NULL != link->handler->error) {
 		link->handler->error(link->ctx);
 	    }
-	    ready_remove(ready, link);
+	    ready_check_remove(ready, link);
 	    continue;
 	}
     }
@@ -312,13 +319,13 @@ agoo_ready_go(agooErr err, agooReady ready) {
 	    pp = link->pp;
 	    if (0 != (pp->revents & POLLIN) && NULL != link->handler->read) {
 		if (!link->handler->read(ready, link->ctx)) {
-		    ready_remove(ready, link);
+		    ready_check_remove(ready, link);
 		    continue;
 		}
 	    }
 	    if (0 != (pp->revents & POLLOUT && NULL != link->handler->write)) {
 		if (!link->handler->write(link->ctx)) {
-		    ready_remove(ready, link);
+		    ready_check_remove(ready, link);
 		    continue;
 		}
 	    }
@@ -326,7 +333,7 @@ agoo_ready_go(agooErr err, agooReady ready) {
 		if (NULL != link->handler->error) {
 		    link->handler->error(link->ctx);
 		}
-		ready_remove(ready, link);
+		ready_check_remove(ready, link);
 		continue;
 	    }
 	}
@@ -337,10 +344,8 @@ agoo_ready_go(agooErr err, agooReady ready) {
     if (ready->next_check <= now) {
 	for (link = ready->links; NULL != link; link = next) {
 	    next = link->next;
-	    if (NULL != link->handler->check) {
-		if (!link->handler->check(link->ctx, now)) {
-		    ready_remove(ready, link);
-		}
+	    if (NULL != link->handler->check && link->handler->check(link->ctx, now)) {
+		ready_remove(ready, link);
 	    }
 	}
 	ready->next_check = dtime() + CHECK_FREQ;

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.11.0'
+  VERSION = '2.11.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-15 00:00:00.000000000 Z
+date: 2019-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj