monitoring (2)

Author: splitice

src/core/connection.cpp

@@ -242,7 +242,7 @@ int connection_open_listener(struct scache_bind ibind) {
 	return -1;
 }
 
-static scache_connection* connection_add(int fd, scache_connection_node* ctable) {
+static scache_connection* connection_add(int fd) {
 	scache_connection_node* node = &ctable[CONNECTION_HASH_KEY(fd)];
 	if (node->connection.client_sock != -1) {
 		while (node->next != NULL) {
@@ -263,7 +263,7 @@ static scache_connection* connection_add(int fd, scache_connection_node* ctable)
 	return &(node->connection);
 }
 
-static scache_connection* connection_get(int fd, scache_connection_node* ctable) {
+static scache_connection* connection_get(int fd) {
 	scache_connection_node* node = &ctable[CONNECTION_HASH_KEY(fd)];
 	if (node->connection.client_sock == -1) {
 		return NULL;
@@ -281,7 +281,7 @@ static scache_connection* connection_get(int fd, scache_connection_node* ctable)
 	return &(node->connection);
 }
 
-static bool connection_remove(int fd, scache_connection_node* ctable) {
+bool connection_remove(int fd) {
 	scache_connection_node* temp = NULL;
 	scache_connection_node* node = &ctable[CONNECTION_HASH_KEY(fd)];
 	if (node->connection.client_sock == -1) {
@@ -321,7 +321,7 @@ static bool connection_remove(int fd, scache_connection_node* ctable) {
 	return true;
 }
 
-static unsigned int connection_count(scache_connection_node* ctable) {
+static unsigned int connection_count() {
 	unsigned count = 0;
 	for (unsigned int i = 0; i < CONNECTION_HASH_ENTRIES; i++) {
 		scache_connection_node* target = &ctable[i];
@@ -337,7 +337,7 @@ static unsigned int connection_count(scache_connection_node* ctable) {
 	return count;
 }
 
-static unsigned int connection_any(scache_connection_node* ctable) {\
+static unsigned int connection_any() {\
 	for (unsigned int i = 0; i < CONNECTION_HASH_ENTRIES; i++) {
 		scache_connection_node* target = &ctable[i];
 		if (target->connection.client_sock != -1) return true;
@@ -547,7 +547,7 @@ void connection_event_loop(void (*connection_handler)(scache_connection* connect
 
 					//Handle connection
 					DEBUG("[#%d] A new %s socket was accepted %d\n", fd, listener_type_string(client_type), client_sock);
-					scache_connection* connection = connection_add(client_sock, ctable);
+					scache_connection* connection = connection_add(client_sock);
 					assert(connection->client_sock == client_sock);
 					connection->ltype = client_type;
 					connection_handler(connection);
@@ -569,7 +569,7 @@ void connection_event_loop(void (*connection_handler)(scache_connection* connect
 			if (fd != efd)
 			{
 				DEBUG("[#%d] Got socket event %d (in=%d, out=%d, hup=%d)\n", fd, events[n].events, events[n].events & EPOLLIN ? 1 : 0, events[n].events & EPOLLOUT ? 1 : 0, events[n].events & EPOLLHUP ? 1 : 0);
-				scache_connection* connection = connection_get(fd, ctable);
+				scache_connection* connection = connection_get(fd);
 				if (connection != NULL) {
 					assert(connection->client_sock == fd);
 					bool do_close = events[n].events & (EPOLLERR | EPOLLHUP | EPOLLRDHUP);
@@ -589,10 +589,10 @@ void connection_event_loop(void (*connection_handler)(scache_connection* connect
 						DEBUG("[#%d] Closing connection due to err:%d hup:%d rdhup:%d\n", fd, !! (events[n].events&EPOLLERR), !! (events[n].events&EPOLLHUP), !! (events[n].events&EPOLLRDHUP));
 						http_cleanup(connection);
 						assert(fd != 0 || (settings.daemon_mode && fd >= 0));
-						if(connection_remove(fd, ctable)){
-							assert(connection_get(fd, ctable) == NULL);
+						if(connection_remove(fd)){
+							assert(connection_get(fd) == NULL);
 		#ifdef DEBUG_BUILD
-							if (!connection_any(ctable)) {
+							if (!connection_any()) {
 								db_check_table_refs();
 							}
 		#endif

src/core/connection.h

@@ -11,6 +11,7 @@ void connection_close_listeners();
 void connection_event_loop(void(*connection_handler)(scache_connection* connection));
 void connection_setup(struct scache_binds cache_binds, struct scache_binds cache_monitor);
 void connection_cleanup();
+bool connection_remove(int fd);
 
 #define _DEBUG_CONNECTION_HANDLER
 #ifdef DEBUG_CONNECTION_HANDLER

src/core/http.h

@@ -83,7 +83,7 @@ static const char http_templates[][128] = {
 	"HTTP/1.1 400 Bad Request\r\nConnection: Close\r\nContent-Length: 19\r\n\r\nRequest too large\r\n",
 	"HTTP/1.1 400 Bad Request\r\nConnection: Close\r\nContent-Length: 17\r\n\r\nUnknown Request\r\n",
 	"HTTP/1.1 200 OK\r\nConnection: Keep-Alive\r\n\r\n",
-	"HTTP/1.1 200 OK\r\nConnection: Keep-Alive\r\nContent-Type: text/x-streaming\r\nTransfer-Encoding: chunked\r\n\r\n",
+	"HTTP/1.1 200 OK\r\nConnection: Keep-Alive\r\nContent-Type: text/x-streaming\r\n\r\n",
 	"HTTP/1.1 404 Not Found\r\nConnection: Keep-Alive\r\nContent-Length: 16\r\n\r\nPath Not Found\r\n",
 };
 

src/core/http_parse_mon.cpp

@@ -27,8 +27,9 @@
 #include "http_parse.h"
 #include "http_respond.h"
 
-static char monitoring_strings[0xffff][7] = {};
-static uint8_t monitoring_lens[0xffff] = {};
+#define MONITORING_DEFAULT_INTERVAL 5
+static char monitoring_strings[0x10000][7] = {};
+static uint8_t monitoring_lens[0x10000] = {};
 
 static state_action http_write_response_after_eol(scache_connection* connection, int http_template) {
 	CONNECTION_HANDLER(connection, http_handle_eolwritetoend);
@@ -76,8 +77,8 @@ state_action http_respond_writecount_starting(scache_connection* connection) {
 
 static state_action http_respond_start_to_count(scache_connection* connection) {
 	DEBUG("[#%d] Ready to start to count \n", connection->client_sock);
-	http_respond_cleanupafterwrite(connection);
 	monitoring_add(connection);
+	return http_respond_cleanupafterwrite(connection);
 }
 
 state_action http_mon_read_eol_inital(scache_connection* connection, char* buffer, int n, uint32_t& temporary) {
@@ -342,18 +343,6 @@ void monitoring_check(){
 
 		// Not yet time
 		if(timercmp(&conn->monitoring.scheduled, &current_time, >)) break;
-
-		// Add to output buffer
-		// this will override anything already there
-		// if we can't write in the time allocated just discard. It's not worth buffering.
-		conn->output_buffer = monitoring_strings[conn->monitoring.current];
-		conn->output_length = monitoring_lens[conn->monitoring.current];
-		conn->monitoring.current ++;
-		memcpy(&conn->monitoring.scheduled, (void*)&current_time, sizeof(current_time));
-		conn->monitoring.scheduled.tv_sec += 1;
-
-		// signal for write registration
-		connection_register_write(conn->client_sock);
 
 		// move on
 		mon_head = conn->monitoring.next;
@@ -367,6 +356,25 @@ void monitoring_check(){
 			mon_tail = mon_head = conn;
 			conn->monitoring.next = conn->monitoring.prev = NULL;
 		}
+
+		// If buffer wasnt cleared already, then we will need to disconnect
+		if(conn->output_buffer != NULL){
+			http_cleanup(conn);
+			connection_remove(conn->client_sock);
+			return;
+		}
+
+		// Add to output buffer
+		// this will override anything already there
+		// if we can't write in the time allocated just discard. It's not worth buffering.
+		conn->output_buffer = monitoring_strings[conn->monitoring.current];
+		conn->output_length = monitoring_lens[conn->monitoring.current];
+		conn->monitoring.current ++;
+		memcpy(&conn->monitoring.scheduled, (void*)&current_time, sizeof(current_time));
+		conn->monitoring.scheduled.tv_sec += MONITORING_DEFAULT_INTERVAL;
+
+		// signal for write registration
+		connection_register_write(conn->client_sock);
 	}
 }